[erp5_accouting] Allow more Actions - the ones using Selections and URL parameters

bt5/erp5_accounting/ActionTemplateItem/portal_types/Account/grouping_reference_fast_input.xml

@@ -16,13 +16,13 @@
             <key> <string>categories</string> </key>
             <value>
               <tuple>
-                <string>action_type/object_button</string>
+                <string>action_type/object_jio_button</string>
               </tuple>
             </value>
         </item>
         <item>
             <key> <string>category</string> </key>
-            <value> <string>object_button</string> </value>
+            <value> <string>object_jio_button</string> </value>
         </item>
         <item>
             <key> <string>condition</string> </key>

bt5/erp5_accounting/ActionTemplateItem/portal_types/Accounting%20Transaction%20Module/account_statement_export.xml

@@ -16,13 +16,13 @@
             <key> <string>categories</string> </key>
             <value>
               <tuple>
-                <string>action_type/object_exchange</string>
+                <string>action_type/object_jio_exchange</string>
               </tuple>
             </value>
         </item>
         <item>
             <key> <string>category</string> </key>
-            <value> <string>object_exchange</string> </value>
+            <value> <string>object_jio_exchange</string> </value>
         </item>
         <item>
             <key> <string>condition</string> </key>

bt5/erp5_accounting/ActionTemplateItem/portal_types/Accounting%20Transaction%20Module/accounting_line_export.xml

@@ -16,13 +16,13 @@
             <key> <string>categories</string> </key>
             <value>
               <tuple>
-                <string>action_type/object_exchange</string>
+                <string>action_type/object_jio_exchange</string>
               </tuple>
             </value>
         </item>
         <item>
             <key> <string>category</string> </key>
-            <value> <string>object_exchange</string> </value>
+            <value> <string>object_jio_exchange</string> </value>
         </item>
         <item>
             <key> <string>condition</string> </key>

bt5/erp5_accounting/ActionTemplateItem/portal_types/Accounting%20Transaction%20Module/aged_balance_export.xml

@@ -16,13 +16,13 @@
             <key> <string>categories</string> </key>
             <value>
               <tuple>
-                <string>action_type/object_exchange</string>
+                <string>action_type/object_jio_exchange</string>
               </tuple>
             </value>
         </item>
         <item>
             <key> <string>category</string> </key>
-            <value> <string>object_exchange</string> </value>
+            <value> <string>object_jio_exchange</string> </value>
         </item>
         <item>
             <key> <string>condition</string> </key>

bt5/erp5_accounting/ActionTemplateItem/portal_types/Accounting%20Transaction%20Module/create_related_payments.xml

@@ -16,13 +16,13 @@
             <key> <string>categories</string> </key>
             <value>
               <tuple>
-                <string>action_type/object_action</string>
+                <string>action_type/object_jio_action</string>
               </tuple>
             </value>
         </item>
         <item>
             <key> <string>category</string> </key>
-            <value> <string>object_action</string> </value>
+            <value> <string>object_jio_action</string> </value>
         </item>
         <item>
             <key> <string>condition</string> </key>

bt5/erp5_accounting/ActionTemplateItem/portal_types/Accounting%20Transaction%20Module/create_reversal.xml

@@ -16,13 +16,13 @@
             <key> <string>categories</string> </key>
             <value>
               <tuple>
-                <string>action_type/object_action</string>
+                <string>action_type/object_jio_action</string>
               </tuple>
             </value>
         </item>
         <item>
             <key> <string>category</string> </key>
-            <value> <string>object_action</string> </value>
+            <value> <string>object_jio_action</string> </value>
         </item>
         <item>
             <key> <string>condition</string> </key>

bt5/erp5_accounting/ActionTemplateItem/portal_types/Accounting%20Transaction%20Module/general_ledger_export.xml

@@ -16,13 +16,13 @@
             <key> <string>categories</string> </key>
             <value>
               <tuple>
-                <string>action_type/object_exchange</string>
+                <string>action_type/object_jio_exchange</string>
               </tuple>
             </value>
         </item>
         <item>
             <key> <string>category</string> </key>
-            <value> <string>object_exchange</string> </value>
+            <value> <string>object_jio_exchange</string> </value>
         </item>
         <item>
             <key> <string>condition</string> </key>

bt5/erp5_accounting/ActionTemplateItem/portal_types/Accounting%20Transaction%20Module/grouping_reference_fast_input.xml

@@ -16,13 +16,13 @@
             <key> <string>categories</string> </key>
             <value>
               <tuple>
-                <string>action_type/object_button</string>
+                <string>action_type/object_jio_button</string>
               </tuple>
             </value>
         </item>
         <item>
             <key> <string>category</string> </key>
-            <value> <string>object_button</string> </value>
+            <value> <string>object_jio_button</string> </value>
         </item>
         <item>
             <key> <string>condition</string> </key>

bt5/erp5_accounting/ActionTemplateItem/portal_types/Accounting%20Transaction%20Module/third_parties_export.xml

@@ -16,13 +16,13 @@
             <key> <string>categories</string> </key>
             <value>
               <tuple>
-                <string>action_type/object_exchange</string>
+                <string>action_type/object_jio_exchange</string>
               </tuple>
             </value>
         </item>
         <item>
             <key> <string>category</string> </key>
-            <value> <string>object_exchange</string> </value>
+            <value> <string>object_jio_exchange</string> </value>
         </item>
         <item>
             <key> <string>condition</string> </key>

bt5/erp5_accounting/ActionTemplateItem/portal_types/Accounting%20Transaction%20Module/trial_balance_export.xml

@@ -16,13 +16,13 @@
             <key> <string>categories</string> </key>
             <value>
               <tuple>
-                <string>action_type/object_exchange</string>
+                <string>action_type/object_jio_exchange</string>
               </tuple>
             </value>
         </item>
         <item>
             <key> <string>category</string> </key>
-            <value> <string>object_exchange</string> </value>
+            <value> <string>object_jio_exchange</string> </value>
         </item>
         <item>
             <key> <string>condition</string> </key>

bt5/erp5_accounting/ActionTemplateItem/portal_types/Organisation/account_statement_export.xml

@@ -16,13 +16,13 @@
             <key> <string>categories</string> </key>
             <value>
               <tuple>
-                <string>action_type/object_exchange</string>
+                <string>action_type/object_jio_exchange</string>
               </tuple>
             </value>
         </item>
         <item>
             <key> <string>category</string> </key>
-            <value> <string>object_exchange</string> </value>
+            <value> <string>object_jio_exchange</string> </value>
         </item>
         <item>
             <key> <string>condition</string> </key>

bt5/erp5_accounting/ActionTemplateItem/portal_types/Organisation/account_statement_report.xml

@@ -16,13 +16,13 @@
             <key> <string>categories</string> </key>
             <value>
               <tuple>
-                <string>action_type/object_report</string>
+                <string>action_type/object_jio_report</string>
               </tuple>
             </value>
         </item>
         <item>
             <key> <string>category</string> </key>
-            <value> <string>object_report</string> </value>
+            <value> <string>object_jio_report</string> </value>
         </item>
         <item>
             <key> <string>condition</string> </key>

bt5/erp5_accounting/ActionTemplateItem/portal_types/Organisation/general_ledger_export.xml

@@ -16,13 +16,13 @@
             <key> <string>categories</string> </key>
             <value>
               <tuple>
-                <string>action_type/object_exchange</string>
+                <string>action_type/object_jio_exchange</string>
               </tuple>
             </value>
         </item>
         <item>
             <key> <string>category</string> </key>
-            <value> <string>object_exchange</string> </value>
+            <value> <string>object_jio_exchange</string> </value>
         </item>
         <item>
             <key> <string>condition</string> </key>

bt5/erp5_accounting/ActionTemplateItem/portal_types/Organisation/general_ledger_report.xml

@@ -16,13 +16,13 @@
             <key> <string>categories</string> </key>
             <value>
               <tuple>
-                <string>action_type/object_report</string>
+                <string>action_type/object_jio_report</string>
               </tuple>
             </value>
         </item>
         <item>
             <key> <string>category</string> </key>
-            <value> <string>object_report</string> </value>
+            <value> <string>object_jio_report</string> </value>
         </item>
         <item>
             <key> <string>condition</string> </key>

bt5/erp5_accounting/ActionTemplateItem/portal_types/Organisation/grouping_reference_fast_input.xml

@@ -16,13 +16,13 @@
             <key> <string>categories</string> </key>
             <value>
               <tuple>
-                <string>action_type/object_button</string>
+                <string>action_type/object_jio_button</string>
               </tuple>
             </value>
         </item>
         <item>
             <key> <string>category</string> </key>
-            <value> <string>object_button</string> </value>
+            <value> <string>object_jio_button</string> </value>
         </item>
         <item>
             <key> <string>condition</string> </key>

bt5/erp5_accounting/ActionTemplateItem/portal_types/Person/account_statement_export.xml

@@ -16,13 +16,13 @@
             <key> <string>categories</string> </key>
             <value>
               <tuple>
-                <string>action_type/object_exchange</string>
+                <string>action_type/object_jio_exchange</string>
               </tuple>
             </value>
         </item>
         <item>
             <key> <string>category</string> </key>
-            <value> <string>object_exchange</string> </value>
+            <value> <string>object_jio_exchange</string> </value>
         </item>
         <item>
             <key> <string>condition</string> </key>

bt5/erp5_accounting/ActionTemplateItem/portal_types/Person/account_statement_report.xml

@@ -16,13 +16,13 @@
             <key> <string>categories</string> </key>
             <value>
               <tuple>
-                <string>action_type/object_report</string>
+                <string>action_type/object_jio_report</string>
               </tuple>
             </value>
         </item>
         <item>
             <key> <string>category</string> </key>
-            <value> <string>object_report</string> </value>
+            <value> <string>object_jio_report</string> </value>
         </item>
         <item>
             <key> <string>condition</string> </key>

bt5/erp5_accounting/ActionTemplateItem/portal_types/Person/general_ledger_export.xml

@@ -16,13 +16,13 @@
             <key> <string>categories</string> </key>
             <value>
               <tuple>
-                <string>action_type/object_exchange</string>
+                <string>action_type/object_jio_exchange</string>
               </tuple>
             </value>
         </item>
         <item>
             <key> <string>category</string> </key>
-            <value> <string>object_exchange</string> </value>
+            <value> <string>object_jio_exchange</string> </value>
         </item>
         <item>
             <key> <string>condition</string> </key>

bt5/erp5_accounting/ActionTemplateItem/portal_types/Person/general_ledger_report.xml

@@ -16,13 +16,13 @@
             <key> <string>categories</string> </key>
             <value>
               <tuple>
-                <string>action_type/object_report</string>
+                <string>action_type/object_jio_report</string>
               </tuple>
             </value>
         </item>
         <item>
             <key> <string>category</string> </key>
-            <value> <string>object_report</string> </value>
+            <value> <string>object_jio_report</string> </value>
         </item>
         <item>
             <key> <string>condition</string> </key>

bt5/erp5_accounting/ActionTemplateItem/portal_types/Person/grouping_reference_fast_input.xml

@@ -16,13 +16,13 @@
             <key> <string>categories</string> </key>
             <value>
               <tuple>
-                <string>action_type/object_button</string>
+                <string>action_type/object_jio_button</string>
               </tuple>
             </value>
         </item>
         <item>
             <key> <string>category</string> </key>
-            <value> <string>object_button</string> </value>
+            <value> <string>object_jio_button</string> </value>
         </item>
         <item>
             <key> <string>condition</string> </key>

bt5/erp5_accounting/ActionTemplateItem/portal_types/Purchase%20Invoice%20Transaction/add_purchase_invoice_transaction_line.xml

@@ -16,13 +16,13 @@
             <key> <string>categories</string> </key>
             <value>
               <tuple>
-                <string>action_type/object_action</string>
+                <string>action_type/object_jio_action</string>
               </tuple>
             </value>
         </item>
         <item>
             <key> <string>category</string> </key>
-            <value> <string>object_action</string> </value>
+            <value> <string>object_jio_action</string> </value>
         </item>
         <item>
             <key> <string>condition</string> </key>

bt5/erp5_accounting/ActionTemplateItem/portal_types/Sale%20Invoice%20Transaction/add_sale_invoice_transaction_line.xml

@@ -16,13 +16,13 @@
             <key> <string>categories</string> </key>
             <value>
               <tuple>
-                <string>action_type/object_action</string>
+                <string>action_type/object_jio_action</string>
               </tuple>
             </value>
         </item>
         <item>
             <key> <string>category</string> </key>
-            <value> <string>object_action</string> </value>
+            <value> <string>object_jio_action</string> </value>
         </item>
         <item>
             <key> <string>condition</string> </key>

bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionLine_view/my_aggregate_title_list.xml

@@ -175,7 +175,7 @@
       <dictionary>
         <item>
             <key> <string>_text</string> </key>
-            <value> <string>python: list(context.getPortalItemTypeList()) + (\'Payment Transaction Group\', )</string> </value>
+            <value> <string>python: list(context.getPortalItemTypeList()) + [\'Payment Transaction Group\', ]</string> </value>
         </item>
       </dictionary>
     </pickle>

bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_createRelatedPaymentTransactionList.py

@@ -4,9 +4,13 @@ portal = context.getPortalObject()
 countMessage = portal.portal_activities.countMessage
 invoice_type_list = portal.getPortalInvoiceTypeList()
 
-portal.portal_selections.updateSelectionCheckedUidList(selection_name, listbox_uid, uids)
-selection_uid_list = portal.portal_selections.getSelectionCheckedUidsFor(
+if selection_name:
+  portal.portal_selections.updateSelectionCheckedUidList(selection_name, listbox_uid, uids)
+  selection_uid_list = portal.portal_selections.getSelectionCheckedUidsFor(
                                                          selection_name)
+else:
+  selection_uid_list = uids
+
 if selection_uid_list:
   object_list = [brain.getObject() for brain in portal.portal_catalog(uid=selection_uid_list)]
 else:
@@ -20,10 +24,9 @@ portal.portal_selections.setSelectionParamsFor('accounting_create_related_paymen
 
 # XXX prevent to call this on the whole module:
 if len(object_list) >= 1000:
-  return context.Base_redirect(
-      form_id,
-      keep_items={'portal_status_message': translateString(
-          'Refusing to process more than 1000 objects, check your selection.')})
+  return context.Base_renderMessage(
+    translateString('Refusing to process more than 1000 objects, check your selection.'),
+    'warning')
 
 tag = 'payment_creation_%s' % random.randint(0, 1000)
 activated = 0
@@ -51,6 +54,7 @@ if not activated:
           'No invoice in your selection.')})
 
 # activate something on the folder
+# Kato: Why?
 context.activate(after_tag=tag).getTitle()
 
 return context.Base_redirect(

bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_createReversalTransactionList.py

@@ -3,9 +3,13 @@ from zExceptions import Redirect
 portal = context.getPortalObject()
 countMessage = portal.portal_activities.countMessage
 
-portal.portal_selections.updateSelectionCheckedUidList(selection_name, listbox_uid, uids)
-selection_uid_list = portal.portal_selections.getSelectionCheckedUidsFor(
+if selection_name:
+  portal.portal_selections.updateSelectionCheckedUidList(selection_name, listbox_uid, uids)
+  selection_uid_list = portal.portal_selections.getSelectionCheckedUidsFor(
                                                          selection_name)
+else:
+  selection_uid_list = uids
+
 if selection_uid_list:
   object_list = [brain.getObject() for brain in portal.portal_catalog(uid=selection_uid_list)]
 else:
@@ -24,9 +28,9 @@ for obj in object_list:
   obj = obj.getObject()
   if countMessage(path=obj.getPath(),
                   method_id='AccountingTransaction_createReversalTransaction'):
-    raise Redirect, "%s/view?portal_status_message=%s" % (
-              context.absolute_url(), translateString(
-      'Reversal creation already in progress, abandon.'))
+    return context.Base_renderMessage(
+      translateString('Reversal creation already in progress, abandon.'),
+      level='error')
   obj.activate(tag=tag).AccountingTransaction_createReversalTransaction(
                                 cancellation_amount=cancellation_amount,
                                 date=date,
@@ -34,11 +38,11 @@ for obj in object_list:
   activated += 1
 
 if not activated:
-  return context.Base_redirect(form_id,
-     keep_items=dict(portal_status_message=
-          translateString('No valid transaction in your selection.')))
+  return context.Base_renderMessage(
+    translateString('No valid transaction in your selection.'), 'error')
 
 # activate something on the folder
+# Kato: ehm ... why?
 context.activate(after_tag=tag).getTitle()
 
 return context.Base_redirect(form_id,

bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_getAccountingTransactionList.py

@@ -114,6 +114,7 @@ params['select_dict'] = select_dict
 if not params.get('accounting_transaction.section_uid'):
   params.setdefault('group_by', ('uid',))
 
+# Kato: Be explicit! You have no idea what is in the **params!
 if stat:
   return context.countFolder(**params)
 return context.searchFolder(**params)

bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_setGroupingReference.py

@@ -8,11 +8,13 @@ psm = Base_translateString('Nothing matches.')
 request = container.REQUEST
 
 # update selected uids 
-portal.portal_selections.updateSelectionCheckedUidList(
+if list_selection_name:
+  portal.portal_selections.updateSelectionCheckedUidList(
       list_selection_name, uids=uids, listbox_uid=listbox_uid, REQUEST=request)
-uids = portal.portal_selections.getSelectionCheckedUidsFor(list_selection_name)
+  uids = portal.portal_selections.getSelectionCheckedUidsFor(list_selection_name)
 
 # XXX when should it be validated ?
+# Kato: It is already validated because this is Form Dialog script
 if node == '':
   node = context.REQUEST.get('field_your_node', node)
 if mirror_section == '':
@@ -22,9 +24,9 @@ if grouping == '':
   grouping = request.get('your_grouping',
                          request.get('field_your_grouping',
                                      grouping))
-
-# edit selection for dialog parameters
-portal.portal_selections.setSelectionParamsFor(
+if list_selection_name:
+  # edit selection for dialog parameters
+  portal.portal_selections.setSelectionParamsFor(
                 'grouping_reference_fast_input_selection',
                 params=dict(node=node,
                             grouping=grouping,
@@ -42,8 +44,7 @@ if uids:
 request.set('total_selected_amount', total_selected_amount)
 
 if update:
-  request.set('portal_status_message', Base_translateString('Updated'))
-  return context.AccountingTransactionModule_viewGroupingFastInputDialog(request)
+  return context.Base_renderForm('AccountingTransactionModule_viewGroupingFastInputDialog')
 
 
 # otherwise, try to group...
@@ -53,7 +54,7 @@ if grouping == 'grouping':
   if grouped_line_list:
     psm = Base_translateString('${grouped_line_count} lines grouped.',
                                mapping=dict(grouped_line_count=len(grouped_line_list)))
-
+    if list_selection_name:
       # make sure nothing will be checked next time
       portal.portal_selections.setSelectionCheckedUidsFor(list_selection_name, [])
 
@@ -119,8 +120,9 @@ else:
   psm = Base_translateString('${ungrouped_line_count} lines ungrouped.',
                              mapping=dict(ungrouped_line_count=len(ungrouped_line_list)))
 
+  if list_selection_name:
     # make sure nothing will be checked next time
     portal.portal_selections.setSelectionCheckedUidsFor(list_selection_name, [])
 
 request.set('portal_status_message', psm)
-return context.AccountingTransactionModule_viewGroupingFastInputDialog(request)
+return context.Base_renderForm('AccountingTransactionModule_viewGroupingFastInputDialog')

bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_viewAgedBalanceReportDialog/your_account_type.xml

@@ -223,7 +223,7 @@
                 </item>
                 <item>
                     <key> <string>first_item</string> </key>
-                    <value> <int>0</int> </value>
+                    <value> <int>1</int> </value>
                 </item>
                 <item>
                     <key> <string>hidden</string> </key>