[Erp5-report] r31647 jerome - in /erp5/trunk/bt5/erp5_accounting: SkinTemplateItem/portal_s...

[nobody at svn.erp5.org]

Author: jerome
Date: Thu Jan  7 17:30:30 2010
New Revision: 31647

URL: http://svn.erp5.org?rev=31647&view=rev
Log:
- for consistency with other reports, don't take into account simulation in account module listbox
- stop using the no longer needed where expression hack

Modified:
    erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_getBalance.xml
    erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_statBalance.xml
    erp5/trunk/bt5/erp5_accounting/bt/revision

Modified: erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_getBalance.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_getBalance.xml?rev=31647&r1=31646&r2=31647&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_getBalance.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_getBalance.xml [utf8] Thu Jan  7 17:30:30 2010
@@ -57,9 +57,8 @@
 params = portal.ERP5Accounting_getParams(selection_name)\n
 params[\'omit_input\'] = omit_input\n
 params[\'omit_output\'] = omit_output\n
-\n
-# XXX this is a hack !\n
-params[\'where_expression\'] = " section.portal_type = \'Organisation\' "\n
+# For now, we omit simulation to be compatible with other reports.\n
+params[\'omit_simulation\'] = True\n
 \n
 return portal.portal_simulation.getInventoryAssetPrice(\n
                                           node_uid=brain.uid,\n
@@ -111,6 +110,7 @@
                             <string>portal</string>
                             <string>params</string>
                             <string>_write_</string>
+                            <string>True</string>
                             <string>_apply_</string>
                           </tuple>
                         </value>

Modified: erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_statBalance.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_statBalance.xml?rev=31647&r1=31646&r2=31647&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_statBalance.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_statBalance.xml [utf8] Thu Jan  7 17:30:30 2010
@@ -59,6 +59,8 @@
 \n
 params[\'omit_input\'] = omit_input\n
 params[\'omit_output\'] = omit_output\n
+# For now, we omit simulation to be compatible with other reports.\n
+params[\'omit_simulation\'] = True\n
 \n
 selection_domain = context.portal_selections.getSelectionDomainDictFor(selection_name)\n
 selection_report = context.portal_selections.getSelectionReportDictFor(selection_name)\n
@@ -80,9 +82,6 @@
 else:\n
   # make sure we only have Accounts as nodes\n
   params[\'node_category\'] = [\'account_type\',]\n
-\n
-# XXX this is a hack !\n
-params[\'where_expression\'] = " section.portal_type = \'Organisation\' "\n
 \n
 return portal.portal_simulation.getInventoryAssetPrice( **params )\n
 </string> </value>
@@ -133,6 +132,7 @@
                             <string>params</string>
                             <string>selection_params</string>
                             <string>_write_</string>
+                            <string>True</string>
                             <string>selection_domain</string>
                             <string>selection_report</string>
                             <string>_getitem_</string>

Modified: erp5/trunk/bt5/erp5_accounting/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_accounting/bt/revision?rev=31647&r1=31646&r2=31647&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_accounting/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_accounting/bt/revision [utf8] Thu Jan  7 17:30:30 2010
@@ -1,1 +1,1 @@
-1082
+1083