comment some log

some style change
add more field for report

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@14807 20353a03-c40f-0410-a6d1-a30d3c3de9de

bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/Baobab_getRemainingOperationList.xml

@@ -78,7 +78,8 @@ if portal_type is not None:\n
   kwd_source[\'portal_type\'] = portal_type\n
   kwd_destination[\'portal_type\'] = portal_type\n
 # as destination\n
-operation_list = list(context.portal_catalog(**kwd_source)) + list(context.portal_catalog(**kwd_destination))\n
+operation_list = list(context.portal_catalog(**kwd_source)) + \\\n
+                      list(context.portal_catalog(**kwd_destination))\n
 operation_list_object = [x.getObject() for x in operation_list]\n
 \n
 return operation_list_object\n

bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/Baobab_getUserAssignmentList.xml

@@ -87,7 +87,7 @@ if len(assignment_list) == 0:\n
   return []\n
 \n
 valid_assignment_list = []\n
-context.log("Baobab_getUserAssignmentList", "assignment_list = %s" %(assignment_list,))\n
+#context.log("Baobab_getUserAssignmentList", "assignment_list = %s" %(assignment_list,))\n
 for a in assignment_list:\n
   if a.getValidationState() == \'open\':\n
     stop  = a.getStopDate()\n

bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/BaseCategory_view.xml

@@ -113,6 +113,7 @@
                         <string>my_acquisition_base_category_list</string>
                         <string>my_acquisition_portal_type_list</string>
                         <string>my_fallback_base_category_list</string>
+                        <string>my_category_type_list</string>
                       </list>
                     </value>
                 </item>
@@ -124,7 +125,6 @@
                         <string>my_acquisition_mask_value</string>
                         <string>my_acquisition_append_value</string>
                         <string>my_acquisition_sync_value</string>
-                        <string>my_category_type_list </string>
                       </list>
                     </value>
                 </item>

bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/BaseCategory_view/my_category_type_list%20.xml → bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/BaseCategory_view/my_category_type_list.xml

@@ -17,7 +17,7 @@
         </item>
         <item>
             <key> <string>id</string> </key>
-            <value> <string>my_category_type_list </string> </value>
+            <value> <string>my_category_type_list</string> </value>
         </item>
         <item>
             <key> <string>message_values</string> </key>
@@ -210,7 +210,7 @@
                 </item>
                 <item>
                     <key> <string>enabled</string> </key>
-                    <value> <int>1</int> </value>
+                    <value> <int>0</int> </value>
                 </item>
                 <item>
                     <key> <string>external_validator</string> </key>

bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CounterDate_getRemainingOperationList.xml

@@ -127,6 +127,12 @@ return operation_list\n
             <key> <string>_params</string> </key>
             <value> <string>site=None,**kw</string> </value>
         </item>
+        <item>
+            <key> <string>_proxy_roles</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
         <item>
             <key> <string>errors</string> </key>
             <value>

bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CounterModule_getVaultTransactionList.xml

@@ -160,10 +160,10 @@ vault_inventory_list = context.portal_simulation.getCurrentInventoryList( node=v
                                                                  , ignore_variation=0\n
                                                                  ,**inventory_kw\n
                                                                  )\n
-context.log(\'CounterMOdule_getVaultTransactionList, sql src:\',context.portal_simulation.getCurrentInventoryList( node=vault_url_list\n
-                                                                , ignore_variation=0,src__=1\n
-                                                               ,**inventory_kw\n
-                                                              ))\n
+#context.log(\'CounterMOdule_getVaultTransactionList, sql src:\',context.portal_simulation.getCurrentInventoryList( node=vault_url_list\n
+#                                                                , ignore_variation=0,src__=1\n
+#                                                               ,**inventory_kw\n
+#                                                              ))\n
 \n
 if summarise:\n
   total_quantity = 0\n
@@ -236,13 +236,14 @@ for resource in resource_dict.keys():\n
   if current_resource_portal_type not in resource_portal_type:\n
     continue\n
   if len(resource)==3: # case of history\n
-    context.log(\'movement uid before error\',resource[2])\n
+    #context.log(\'movement uid before error\',resource[2])\n
     #movement = context.portal_catalog.getObject(resource[2])\n
     movement = portal.restrictedTraverse(resource[2])\n
-    #context.log(\'movement\',movement)\n
+    #context.log(\'CounterModule_getVaultTransactionList\', \'movement = %s\' %movement)\n
     explanation_value = movement\n
     if getattr(movement,\'getExplanationValue\',None) is not None:\n
       explanation_value = movement.getExplanationValue()\n
+    #context.log(\'CounterModule_getVaultTransactionList\', \'explanation_value = %s\' %explanation_value)\n
     tmp_dict[\'explanation_relative_url\'] = explanation_value.getRelativeUrl()\n
     source_reference = explanation_value.getSourceReference() or \'\'\n
     tmp_dict[\'source_reference\'] = source_reference\n

bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CounterModule_viewVaultReport.xml

@@ -50,7 +50,7 @@
         </item>
         <item>
             <key> <string>action</string> </key>
-            <value> <string></string> </value>
+            <value> <string>CounterModule_viewVaultReport</string> </value>
         </item>
         <item>
             <key> <string>encoding</string> </key>
@@ -64,7 +64,7 @@
             <key> <string>group_list</string> </key>
             <value>
               <list>
-                <string>bottom</string>
+                <string>left</string>
                 <string>hidden</string>
               </list>
             </value>
@@ -74,19 +74,19 @@
             <value>
               <dictionary>
                 <item>
-                    <key> <string>bottom</string> </key>
+                    <key>                 <string>hidden</string> </key>
                     <value>
-                      <list>
-                        <string>listbox</string>
-                      </list>
+                      <list/>
                     </value>
                 </item>
                 <item>
-                    <key> <string>hidden</string> </key>
+                    <key>                 <string>left</string> </key>
                     <value>
                       <list>
-                        <string>listbox_total_price</string>
-                        <string>listbox_total_quantity</string>
+                        <string>my_vault</string>
+                        <string>my_vault_report_type</string>
+                        <string>my_from_date</string>
+                        <string>my_to_date</string>
                       </list>
                     </value>
                 </item>
@@ -103,11 +103,11 @@
         </item>
         <item>
             <key> <string>name</string> </key>
-            <value> <string>CounterModule_viewVaultReport</string> </value>
+            <value> <string>CounterModule_viewReportDialog</string> </value>
         </item>
         <item>
             <key> <string>pt</string> </key>
-            <value> <string>form_list</string> </value>
+            <value> <string>form_dialog</string> </value>
         </item>
         <item>
             <key> <string>row_length</string> </key>
@@ -119,7 +119,7 @@
         </item>
         <item>
             <key> <string>title</string> </key>
-            <value> <string>Vault Report</string> </value>
+            <value> <string>Report</string> </value>
         </item>
         <item>
             <key> <string>unicode_mode</string> </key>

bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/counter_date_workflow/scripts/closeAllCounter.xml

@@ -69,7 +69,7 @@
 from Products.DCWorkflow.DCWorkflow import ValidationFailed\n
 from Products.ERP5Type.Message import Message\n
 \n
-transaction = state_change.object\n
+transaction = state_change[\'object\']\n
 \n
 site = transaction.getSiteValue()\n
 while True:\n
@@ -151,8 +151,9 @@ for counter in counter_list:\n
                             <string>ValidationFailed</string>
                             <string>Products.ERP5Type.Message</string>
                             <string>Message</string>
-                            <string>_getattr_</string>
+                            <string>_getitem_</string>
                             <string>transaction</string>
+                            <string>_getattr_</string>
                             <string>site</string>
                             <string>True</string>
                             <string>hasattr</string>

bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/counter_workflow/scripts/cancelRemainingOperation.xml

@@ -71,7 +71,7 @@ from Products.ERP5Type.Message import Message\n
 # XXX maybe raise other exception as otherwise the transition will passed even if\n
 # check fail\n
 \n
-transaction = state_change.object\n
+transaction = state_change[\'object\']\n
 site = transaction.Baobab_getVaultSite(vault=transaction.getSiteValue())\n
 \n
 # get the current counter date\n
@@ -140,8 +140,9 @@ for operation in operation_list_object:\n
                             <string>ValidationFailed</string>
                             <string>Products.ERP5Type.Message</string>
                             <string>Message</string>
-                            <string>_getattr_</string>
+                            <string>_getitem_</string>
                             <string>transaction</string>
+                            <string>_getattr_</string>
                             <string>site</string>
                             <string>kwd</string>
                             <string>append</string>
@@ -155,7 +156,6 @@ for operation in operation_list_object:\n
                             <string>current_date</string>
                             <string>len</string>
                             <string>msg</string>
-                            <string>_getitem_</string>
                             <string>site_uid</string>
                             <string>operation_list_object</string>
                             <string>operation</string>

bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/counter_workflow/scripts/checkDateOpened.xml

@@ -69,7 +69,7 @@
 from Products.DCWorkflow.DCWorkflow import ValidationFailed\n
 from Products.ERP5Type.Message import Message\n
 \n
-transaction = state_change.object\n
+transaction = state_change[\'object\']\n
 site = transaction.getSiteValue()\n
 \n
 while True:\n
@@ -135,8 +135,9 @@ if len(date_list) == 0:\n
                             <string>ValidationFailed</string>
                             <string>Products.ERP5Type.Message</string>
                             <string>Message</string>
-                            <string>_getattr_</string>
+                            <string>_getitem_</string>
                             <string>transaction</string>
+                            <string>_getattr_</string>
                             <string>site</string>
                             <string>True</string>
                             <string>hasattr</string>

bt5/erp5_banking_core/bt/revision

-277
\ No newline at end of file
+278
\ No newline at end of file