Commit eaa82215 authored by Jérome Perrin's avatar Jérome Perrin

Repair stat columns on Third Parties report

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@17300 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 48d6bf25
...@@ -3,11 +3,8 @@ ...@@ -3,11 +3,8 @@
<record id="1" aka="AAAAAAAAAAE="> <record id="1" aka="AAAAAAAAAAE=">
<pickle> <pickle>
<tuple> <tuple>
<tuple> <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
<string>Products.PythonScripts.PythonScript</string> <tuple/>
<string>PythonScript</string>
</tuple>
<none/>
</tuple> </tuple>
</pickle> </pickle>
<pickle> <pickle>
...@@ -77,8 +74,8 @@ from Products.ERP5Form.Report import ReportSection\n ...@@ -77,8 +74,8 @@ from Products.ERP5Form.Report import ReportSection\n
\n \n
request = context.REQUEST\n request = context.REQUEST\n
at_date = request[\'at_date\']\n at_date = request[\'at_date\']\n
transaction_section_category = request[\'transaction_section_category\']\n section_category = request[\'section_category\']\n
transaction_simulation_state = request[\'transaction_simulation_state\']\n simulation_state = request[\'simulation_state\']\n
role_filter_list = request.get(\'entity_role\', None)\n role_filter_list = request.get(\'entity_role\', None)\n
omit_balanced_accounts = request[\'omit_balanced_accounts\']\n omit_balanced_accounts = request[\'omit_balanced_accounts\']\n
from_date = request.get(\'from_date\', None)\n from_date = request.get(\'from_date\', None)\n
...@@ -93,9 +90,8 @@ result = []\n ...@@ -93,9 +90,8 @@ result = []\n
\n \n
params = {\n params = {\n
\'at_date\' : at_date\n \'at_date\' : at_date\n
, \'transaction_section_category\': transaction_section_category\n , \'section_category\': section_category\n
, \'section_category\' : transaction_section_category\n , \'simulation_state\': simulation_state\n
, \'simulation_state\' : transaction_simulation_state\n
, \'report_depth\' : 5\n , \'report_depth\' : 5\n
#, \'where_expression\' : " section.portal_type = \'Organisation\' "\n #, \'where_expression\' : " section.portal_type = \'Organisation\' "\n
}\n }\n
...@@ -117,8 +113,8 @@ entity_columns = [\n ...@@ -117,8 +113,8 @@ entity_columns = [\n
(\'Movement_getExplanationTitle\', \'Title\'),\n (\'Movement_getExplanationTitle\', \'Title\'),\n
(\'Movement_getSpecificReference\', \'Reference\'),\n (\'Movement_getSpecificReference\', \'Reference\'),\n
(\'getTranslatedSimulationStateTitle\', \'State\'),\n (\'getTranslatedSimulationStateTitle\', \'State\'),\n
(\'Movement_getDebitPrice\', \'Debit\'),\n (\'debit\', \'Debit\'),\n
(\'Movement_getCreditPrice\', \'Credit\'),\n (\'credit\', \'Credit\'),\n
(\'running_total_price\', \'Balance\'),\n (\'running_total_price\', \'Balance\'),\n
]\n ]\n
\n \n
...@@ -150,7 +146,7 @@ for party in context.Account_zDistinctSectionList():\n ...@@ -150,7 +146,7 @@ for party in context.Account_zDistinctSectionList():\n
continue\n continue\n
\n \n
if o.getPortalType() == \'Person\' or\\\n if o.getPortalType() == \'Person\' or\\\n
not o.isMemberOf(transaction_section_category):\n not o.isMemberOf(section_category):\n
# don\'t show entities belonging to the group we are reporting\n # don\'t show entities belonging to the group we are reporting\n
if omit_balanced_accounts and (\n if omit_balanced_accounts and (\n
simulation_tool.getInventoryAssetPrice(\n simulation_tool.getInventoryAssetPrice(\n
...@@ -232,8 +228,8 @@ return result\n ...@@ -232,8 +228,8 @@ return result\n
<string>request</string> <string>request</string>
<string>_getitem_</string> <string>_getitem_</string>
<string>at_date</string> <string>at_date</string>
<string>transaction_section_category</string> <string>section_category</string>
<string>transaction_simulation_state</string> <string>simulation_state</string>
<string>None</string> <string>None</string>
<string>role_filter_list</string> <string>role_filter_list</string>
<string>omit_balanced_accounts</string> <string>omit_balanced_accounts</string>
...@@ -252,6 +248,7 @@ return result\n ...@@ -252,6 +248,7 @@ return result\n
<string>o</string> <string>o</string>
<string>_apply_</string> <string>_apply_</string>
<string>title</string> <string>title</string>
<string>_inplacevar_</string>
</tuple> </tuple>
</value> </value>
</item> </item>
......
458 459
\ No newline at end of file \ No newline at end of file
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment