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

fix Other Parties report with new Entity_viewAccountingTransactionList column names


git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@10525 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent b9d1f7ab
...@@ -97,7 +97,7 @@ params = {\n ...@@ -97,7 +97,7 @@ params = {\n
, \'section_category\' : transaction_section_category\n , \'section_category\' : transaction_section_category\n
, \'simulation_state\' : transaction_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
\n \n
params[\'hide_grouping\'] = request[\'omit_grouped_references\']\n params[\'hide_grouping\'] = request[\'omit_grouped_references\']\n
...@@ -111,15 +111,15 @@ simulation_tool = portal.portal_simulation\n ...@@ -111,15 +111,15 @@ simulation_tool = portal.portal_simulation\n
\n \n
entity_columns = [\n entity_columns = [\n
(\'date\', \'Date\'),\n (\'date\', \'Date\'),\n
(\'parent_portal_type\', \'Type\'),\n (\'Movement_getExplanationTranslatedPortalType\', \'Type\'),\n
(\'Entity_getAccountingTransactionGapId\', \'GAP\'),\n (\'Movement_getNodeGapId\', \'GAP\'),\n
(\'parent_reference\', \'Invoice No\'),\n (\'Movement_getExplanationReference\', \'Invoice No\'),\n
(\'parent_title\', \'Title\'),\n (\'Movement_getExplanationTitle\', \'Title\'),\n
(\'parent_specific_reference\', \'Reference\'),\n (\'Movement_getSpecificReference\', \'Reference\'),\n
(\'translated_simulation_state_title\', \'State\'),\n (\'getTranslatedSimulationStateTitle\', \'State\'),\n
(\'debit\', \'Debit\'),\n (\'Movement_getDebitPrice\', \'Debit\'),\n
(\'credit\', \'Credit\'),\n (\'Movement_getCreditPrice\', \'Credit\'),\n
(\'net_balance\', \'Balance\'),\n (\'running_total_price\', \'Balance\'),\n
]\n ]\n
\n \n
# build a list of all accounts which _strictly_ belongs to categories \n # build a list of all accounts which _strictly_ belongs to categories \n
...@@ -166,11 +166,11 @@ for party in context.Account_zDistinctSectionList():\n ...@@ -166,11 +166,11 @@ for party in context.Account_zDistinctSectionList():\n
level=1,\n level=1,\n
path=o.getPhysicalPath(),\n path=o.getPhysicalPath(),\n
form_id=\'Entity_viewAccountingTransactionList\',\n form_id=\'Entity_viewAccountingTransactionList\',\n
selection_name = \'accounting_selection\',\n selection_name = \'other_parties_report_selection\',\n
selection_params = params,\n selection_params = params,\n
selection_columns = entity_columns,\n selection_columns = entity_columns,\n
selection_sort_order=[(\'delivery.stop_date\',\n selection_sort_order=[(\'stock.date\', \'ascending\'),\n
\'ascending\')], ) )\n (\'stock.uid\', \'ascending\'),],))\n
\n \n
return result\n return result\n
......
...@@ -76,6 +76,15 @@ ...@@ -76,6 +76,15 @@
<string>transaction_section_category</string> <string>transaction_section_category</string>
<string>transaction_simulation_state</string> <string>transaction_simulation_state</string>
<string>at_date</string> <string>at_date</string>
<string>my_entity_role</string>
<string>my_from_date</string>
<string>my_node_category</string>
<string>my_omit_balanced_accounts</string>
<string>my_omit_empty_accounts</string>
<string>my_omit_grouped_references</string>
<string>my_to_date</string>
<string>my_transaction_section_category</string>
<string>my_transaction_simulation_state</string>
</list> </list>
</value> </value>
</item> </item>
......
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