add a "request.other[\'is_accounting_report\'] = True" in all accounting...

add a "request.other[\'is_accounting_report\'] = True" in all accounting reports, so that certain fields can be hidden in reports.



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

bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_getAccountStatementReportSectionList.xml

@@ -68,8 +68,7 @@
         </item>
         <item>
             <key> <string>_body</string> </key>
-            <value> <string>"""\n
-Get the report sections for account statement.\n
+            <value> <string>"""Get the report sections for account statement.\n
 Account is the combination of :\n
    - node (the Account in account module)\n
    - destination_section (the Entity in organisation / person module)\n
@@ -89,6 +88,8 @@ transaction_simulation_state = request[\'transaction_simulation_state\']\n
 from_date = request.get(\'from_date\', None)\n
 omit_grouping_reference = request.get(\'omit_grouping_reference\', 0)\n
 \n
+request.other[\'is_accounting_report\'] = True\n
+\n
 params = {\n
   \'at_date\'                      : at_date,\n
   \'section_category\'             : transaction_section_category,\n
@@ -99,16 +100,6 @@ params = {\n
   \'from_date_summary\' : 1\n
 }\n
 \n
-preferences = {\n
-  \'preferred_accounting_transaction_at_date\'          : at_date,\n
-  \'preferred_accounting_transaction_simulation_state\' :\n
-                    transaction_simulation_state,\n
-  \'preferred_accounting_transaction_section_category\' :\n
-                    transaction_section_category,\n
-  # XXX put omit_grouping_reference in preferences ?\n
-  \'preferred_accounting_omit_grouping_reference\' : omit_grouping_reference,\n
-}\n
-\n
 if from_date:\n
   params[\'from_date\'] = from_date\n
   preferences[\'preferred_accounting_transaction_from_date\'] = from_date\n
@@ -121,9 +112,6 @@ if destination_section :\n
 if account:\n
   params[\'node_uid\'] = context.restrictedTraverse(account).getUid()\n
 \n
-from Products.ERP5Type.Cache import clearCache\n
-clearCache() # for preferences\n
-\n
 result = []\n
 portal = context.portal_url.getPortalObject()\n
 \n
@@ -147,8 +135,8 @@ return [ReportSection(\n
               selection_params = params,\n
               selection_columns = account_columns,\n
               listbox_display_mode = \'FlatListMode\',\n
-              selection_sort_order = [(\'delivery.stop_date\', \'ascending\')],\n
-              preferences = preferences )]\n
+              selection_sort_order = [(\'delivery.stop_date\',\n
+                                       \'ascending\')],)]\n
 # vim: syntax=python\n
 </string> </value>
         </item>
@@ -213,11 +201,10 @@ return [ReportSection(\n
                             <string>transaction_simulation_state</string>
                             <string>from_date</string>
                             <string>omit_grouping_reference</string>
+                            <string>True</string>
+                            <string>_write_</string>
                             <string>params</string>
                             <string>preferences</string>
-                            <string>_write_</string>
-                            <string>Products.ERP5Type.Cache</string>
-                            <string>clearCache</string>
                             <string>result</string>
                             <string>portal</string>
                             <string>account_columns</string>

bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_getBankAccountsReportSectionList.xml

@@ -134,6 +134,12 @@ return result\n
               <none/>
             </value>
         </item>
+        <item>
+            <key> <string>_dav_writelocks</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+            </value>
+        </item>
         <item>
             <key> <string>_filepath</string> </key>
             <value>
@@ -216,4 +222,25 @@ return result\n
       </dictionary>
     </pickle>
   </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <tuple>
+        <tuple>
+          <string>Persistence</string>
+          <string>PersistentMapping</string>
+        </tuple>
+        <none/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>_container</string> </key>
+            <value>
+              <dictionary/>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
 </ZopeData>

bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_getOtherPartiesReportSectionList.xml

@@ -70,8 +70,7 @@
             <key> <string>_body</string> </key>
             <value> <string encoding="cdata"><![CDATA[
 
-"""\n
-  Client & vendors accounts.\n
+"""Client & vendors accounts.\n
 """\n
 \n
 from Products.ERP5Form.Report import ReportSection\n
@@ -84,6 +83,8 @@ role_filter_list = request.get(\'entity_role\', None)\n
 omit_balanced_accounts = request[\'omit_balanced_accounts\']\n
 from_date = request.get(\'from_date\', None)\n
 \n
+request.other[\'is_accounting_report\'] = True\n
+\n
 # role_filter_list == None means no filter on the role\n
 if role_filter_list == [\'\'] :\n
   role_filter_list = None\n
@@ -126,11 +127,17 @@ entity_columns = [\n
 # will tell wether this third party account is balanced or not.\n
 valid_node_uids = []\n
 if omit_balanced_accounts :\n
-  for account in portal.portal_categories.resolveCategory(\'account_type/asset/receivable\'\n
-                ).getAccountTypeRelatedValueList(strict_membership = 1, portal_type = "Account") :\n
+  for account in portal.portal_categories.resolveCategory(\n
+                    \'account_type/asset/receivable\'\n
+                ).getAccountTypeRelatedValueList(\n
+                    strict_membership=1,\n
+                    portal_type=\'Account\'):\n
     valid_node_uids.append(account.getUid())\n
-  for account in portal.portal_categories.resolveCategory(\'account_type/liability/payable\'\n
-                ).getAccountTypeRelatedValueList(strict_membership = 1, portal_type = "Account") :\n
+  for account in portal.portal_categories.resolveCategory(\n
+                    \'account_type/liability/payable\'\n
+                ).getAccountTypeRelatedValueList(\n
+                    strict_membership=1,\n
+                    portal_type=\'Account\'):\n
     valid_node_uids.append(account.getUid())\n
 \n
 if not params[\'hide_grouping\']  :\n
@@ -142,12 +149,15 @@ for party in context.Account_zDistinctSectionList():\n
   if role_filter_list and o.getProperty(\'role\', []) not in role_filter_list:\n
     continue\n
 \n
-  if o.getPortalType() == \'Person\' or not o.isMemberOf(transaction_section_category):\n
+  if o.getPortalType() == \'Person\' or\\\n
+      not o.isMemberOf(transaction_section_category):\n
         # don\'t show entities belonging to the group we are reporting\n
-    if omit_balanced_accounts and (simulation_tool.getInventoryAssetPrice(\n
-                    mirror_section_uid=o.uid, node_uid = valid_node_uids, **params) == 0) :\n
+    if omit_balanced_accounts and (\n
+            simulation_tool.getInventoryAssetPrice(\n
+                    mirror_section_uid=o.uid,\n
+                    node_uid=valid_node_uids, **params) == 0):\n
       pass\n
-    else :\n
+    else:\n
       title = o.getTitle()\n
       if o.getProperty(\'role\', None):\n
         title += \' (%s)\' % o.getRoleTitle()\n
@@ -234,9 +244,10 @@ return result\n
                             <string>role_filter_list</string>
                             <string>omit_balanced_accounts</string>
                             <string>from_date</string>
+                            <string>True</string>
+                            <string>_write_</string>
                             <string>result</string>
                             <string>params</string>
-                            <string>_write_</string>
                             <string>portal</string>
                             <string>simulation_tool</string>
                             <string>entity_columns</string>

bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_getTrialBalanceReportSectionList.xml

@@ -68,8 +68,7 @@
         </item>
         <item>
             <key> <string>_body</string> </key>
-            <value> <string>"""\n
-  Trial balance.\n
+            <value> <string>""" Trial balance.\n
 """\n
 from Products.ERP5Form.Report import ReportSection\n
 \n
@@ -85,6 +84,8 @@ from_date            = request.get(\'from_date\'           , None)\n
 expand_accounts      = request.get(\'expand_accounts\'     , False)\n
 show_parent_accounts = request.get(\'show_parent_accounts\', False)\n
 \n
+request.other[\'is_accounting_report\'] = True\n
+\n
 # flat_mode is a boolean that indicate wether we should use a report tree\n
 #   or a flat list of all accounts.\n
 if request.get(\'tree_mode\', False):\n
@@ -209,8 +210,9 @@ return result\n
                             <string>False</string>
                             <string>expand_accounts</string>
                             <string>show_parent_accounts</string>
-                            <string>result</string>
                             <string>True</string>
+                            <string>_write_</string>
+                            <string>result</string>
                             <string>params</string>
                             <string>balance_columns</string>
                           </tuple>

bt5/erp5_accounting/bt/revision

-22
+23
\ No newline at end of file