[Erp5-report] r13861 - in /erp5/trunk/bt5/erp5_accounting: SkinTemplateItem/portal_skins/er...

[nobody at svn.erp5.org]

Author: jerome
Date: Mon Apr  2 18:02:51 2007
New Revision: 13861

URL: http://svn.erp5.org?rev=13861&view=rev
Log:
Add no_mirror_section_uid_cache parameter in ERP5Accounting_getParams, to prevent caching mirror_section_uid and payment_uid.
Use no_mirror_section_uid_cache in GL


Modified:
    erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_getGeneralLedgerReportSectionList.xml
    erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/ERP5Accounting_getParams.xml
    erp5/trunk/bt5/erp5_accounting/bt/revision

Modified: erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_getGeneralLedgerReportSectionList.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_getGeneralLedgerReportSectionList.xml?rev=13861&r1=13860&r2=13861&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_getGeneralLedgerReportSectionList.xml (original)
+++ erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_getGeneralLedgerReportSectionList.xml Mon Apr  2 18:02:51 2007
@@ -88,13 +88,12 @@
 \n
 request.other[\'is_accounting_report\'] = True\n
 \n
-params = { \'at_date\'                             : at_date\n
-         , \'section_category\'                    : section_category\n
-         , \'simulation_state\'                    : simulation_state\n
-         , \'accounting_transaction_line_currency\': None\n
-         , \'omit_grouping_reference\'             : omit_grouping_reference\n
-         , \'from_date_summary\'                   : True\n
-         }\n
+params = dict(at_date=at_date,\n
+              section_category=section_category,\n
+              simulation_state=simulation_state,\n
+              omit_grouping_reference=omit_grouping_reference,\n
+              from_date_summary=True,\n
+              no_mirror_section_uid_cache=1)\n
 \n
 if from_date:\n
   params[\'from_date\'] = from_date\n
@@ -302,6 +301,7 @@
                             <string>display_categories</string>
                             <string>omit_grouping_reference</string>
                             <string>_write_</string>
+                            <string>dict</string>
                             <string>params</string>
                             <string>result</string>
                             <string>account_columns</string>

Modified: erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/ERP5Accounting_getParams.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/ERP5Accounting_getParams.xml?rev=13861&r1=13860&r2=13861&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/ERP5Accounting_getParams.xml (original)
+++ erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/ERP5Accounting_getParams.xml Mon Apr  2 18:02:51 2007
@@ -132,13 +132,17 @@
 if precision is not None:\n
   params[\'precision\'] = precision\n
 \n
-mirror_section_uid = selection_params.get(\'mirror_section_uid\', None)\n
-if mirror_section_uid:\n
-  params[\'mirror_section_uid\'] = mirror_section_uid\n
-\n
-payment_uid = selection_params.get(\'payment_uid\', None)\n
-if payment_uid:\n
-  params[\'payment_uid\'] = payment_uid\n
+# Some reports, such as general ledger, uses different forms with different report\n
+# parameters, we don\'t want to accidentally fill the cache with mirror_section_uid \n
+# or payment_uid.\n
+if not selection_params.get(\'no_mirror_section_uid_cache\', 0):\n
+  mirror_section_uid = selection_params.get(\'mirror_section_uid\', None)\n
+  if mirror_section_uid:\n
+    params[\'mirror_section_uid\'] = mirror_section_uid\n
+\n
+  payment_uid = selection_params.get(\'payment_uid\', None)\n
+  if payment_uid:\n
+    params[\'payment_uid\'] = payment_uid\n
 \n
 simulation_state = selection_params.get(\'simulation_state\',\n
              preference.getPreferredAccountingTransactionSimulationStateList())\n

Modified: erp5/trunk/bt5/erp5_accounting/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_accounting/bt/revision?rev=13861&r1=13860&r2=13861&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_accounting/bt/revision (original)
+++ erp5/trunk/bt5/erp5_accounting/bt/revision Mon Apr  2 18:02:51 2007
@@ -1,1 +1,1 @@
-237
+238