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

propagate function and project properly in trial balance report

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@29424 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 3a689637
...@@ -82,6 +82,10 @@ inventory_params = dict(section_uid=section_uid,\n ...@@ -82,6 +82,10 @@ inventory_params = dict(section_uid=section_uid,\n
group_by_resource=0)\n group_by_resource=0)\n
if portal_type and portal_type != portal.getPortalAccountingTransactionTypeList():\n if portal_type and portal_type != portal.getPortalAccountingTransactionTypeList():\n
inventory_params[\'parent_portal_type\'] = portal_type\n inventory_params[\'parent_portal_type\'] = portal_type\n
if function:\n
inventory_params[\'function\'] = function\n
if project:\n
inventory_params[\'project\'] = project\n
\n \n
if node_uid:\n if node_uid:\n
inventory_params[\'node_uid\'] = node_uid\n inventory_params[\'node_uid\'] = node_uid\n
...@@ -726,7 +730,7 @@ return new_line_list\n ...@@ -726,7 +730,7 @@ return new_line_list\n
</item> </item>
<item> <item>
<key> <string>_params</string> </key> <key> <string>_params</string> </key>
<value> <string>show_empty_accounts, expand_accounts, at_date, from_date, period_start_date, section_uid, simulation_state, precision, node_uid, gap_root=None, per_account_class_summary=0, portal_type=None, **kw</string> </value> <value> <string>show_empty_accounts, expand_accounts, at_date, from_date, period_start_date, section_uid, simulation_state, precision, node_uid, gap_root=None, per_account_class_summary=0, portal_type=None, function=None, project=None, **kw</string> </value>
</item> </item>
<item> <item>
<key> <string>errors</string> </key> <key> <string>errors</string> </key>
...@@ -746,7 +750,7 @@ return new_line_list\n ...@@ -746,7 +750,7 @@ return new_line_list\n
<dictionary> <dictionary>
<item> <item>
<key> <string>co_argcount</string> </key> <key> <string>co_argcount</string> </key>
<value> <int>12</int> </value> <value> <int>14</int> </value>
</item> </item>
<item> <item>
<key> <string>co_varnames</string> </key> <key> <string>co_varnames</string> </key>
...@@ -764,6 +768,8 @@ return new_line_list\n ...@@ -764,6 +768,8 @@ return new_line_list\n
<string>gap_root</string> <string>gap_root</string>
<string>per_account_class_summary</string> <string>per_account_class_summary</string>
<string>portal_type</string> <string>portal_type</string>
<string>function</string>
<string>project</string>
<string>kw</string> <string>kw</string>
<string>Products.PythonScripts.standard</string> <string>Products.PythonScripts.standard</string>
<string>Object</string> <string>Object</string>
...@@ -862,6 +868,8 @@ return new_line_list\n ...@@ -862,6 +868,8 @@ return new_line_list\n
<none/> <none/>
<int>0</int> <int>0</int>
<none/> <none/>
<none/>
<none/>
</tuple> </tuple>
</value> </value>
</item> </item>
......
...@@ -64,6 +64,8 @@ N_ = portal.Base_translateString\n ...@@ -64,6 +64,8 @@ N_ = portal.Base_translateString\n
at_date = request[\'at_date\']\n at_date = request[\'at_date\']\n
from_date = request.get(\'from_date\', None)\n from_date = request.get(\'from_date\', None)\n
portal_type = request.get(\'portal_type\', None)\n portal_type = request.get(\'portal_type\', None)\n
function = request.get(\'function\', None)\n
project = request.get(\'project\', None)\n
simulation_state = request[\'simulation_state\']\n simulation_state = request[\'simulation_state\']\n
expand_accounts = request.get(\'expand_accounts\', False)\n expand_accounts = request.get(\'expand_accounts\', False)\n
show_empty_accounts = request[\'show_empty_accounts\']\n show_empty_accounts = request[\'show_empty_accounts\']\n
...@@ -113,6 +115,8 @@ return [ ReportSection(\n ...@@ -113,6 +115,8 @@ return [ ReportSection(\n
period_start_date=\n period_start_date=\n
period_start_date.earliestTime(),\n period_start_date.earliestTime(),\n
section_uid=section_uid,\n section_uid=section_uid,\n
function=function,\n
project=project,\n
portal_type=portal_type,\n portal_type=portal_type,\n
simulation_state=simulation_state,\n simulation_state=simulation_state,\n
precision=precision,\n precision=precision,\n
...@@ -168,6 +172,8 @@ return [ ReportSection(\n ...@@ -168,6 +172,8 @@ return [ ReportSection(\n
<string>None</string> <string>None</string>
<string>from_date</string> <string>from_date</string>
<string>portal_type</string> <string>portal_type</string>
<string>function</string>
<string>project</string>
<string>simulation_state</string> <string>simulation_state</string>
<string>False</string> <string>False</string>
<string>expand_accounts</string> <string>expand_accounts</string>
......
987 988
\ 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