- for consistency with other reports, don't take into account simulation in account module listbox

- stop using the no longer needed where expression hack

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

bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_getBalance.xml

@@ -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 @@ return portal.portal_simulation.getInventoryAssetPrice(\n
                             <string>portal</string>
                             <string>params</string>
                             <string>_write_</string>
+                            <string>True</string>
                             <string>_apply_</string>
                           </tuple>
                         </value>

bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_statBalance.xml

@@ -59,6 +59,8 @@ selection_params = context.portal_selections.getSelectionParamsFor(selection_nam
 \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
@@ -81,9 +83,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>
         </item>
@@ -133,6 +132,7 @@ return portal.portal_simulation.getInventoryAssetPrice( **params )\n
                             <string>params</string>
                             <string>selection_params</string>
                             <string>_write_</string>
+                            <string>True</string>
                             <string>selection_domain</string>
                             <string>selection_report</string>
                             <string>_getitem_</string>

bt5/erp5_accounting/bt/revision

-1082
\ No newline at end of file
+1083
\ No newline at end of file