Commit 1354002f authored by Jérome Perrin's avatar Jérome Perrin

support filter by third party's roles on general ledger and trial balance

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@36267 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 9106a8ab
...@@ -93,6 +93,8 @@ if function:\n ...@@ -93,6 +93,8 @@ if function:\n
inventory_params[\'function\'] = function\n inventory_params[\'function\'] = function\n
if project:\n if project:\n
inventory_params[\'project\'] = project\n inventory_params[\'project\'] = project\n
if mirror_section_category:\n
inventory_params[\'mirror_section_category\'] = mirror_section_category\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
...@@ -773,7 +775,7 @@ return new_line_list\n ...@@ -773,7 +775,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, function=None, project=None, group_analytic=[], **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, group_analytic=[], mirror_section_category=None, **kw</string> </value>
</item> </item>
<item> <item>
<key> <string>errors</string> </key> <key> <string>errors</string> </key>
...@@ -793,7 +795,7 @@ return new_line_list\n ...@@ -793,7 +795,7 @@ return new_line_list\n
<dictionary> <dictionary>
<item> <item>
<key> <string>co_argcount</string> </key> <key> <string>co_argcount</string> </key>
<value> <int>15</int> </value> <value> <int>16</int> </value>
</item> </item>
<item> <item>
<key> <string>co_varnames</string> </key> <key> <string>co_varnames</string> </key>
...@@ -814,6 +816,7 @@ return new_line_list\n ...@@ -814,6 +816,7 @@ return new_line_list\n
<string>function</string> <string>function</string>
<string>project</string> <string>project</string>
<string>group_analytic</string> <string>group_analytic</string>
<string>mirror_section_category</string>
<string>kw</string> <string>kw</string>
<string>Products.PythonScripts.standard</string> <string>Products.PythonScripts.standard</string>
<string>Object</string> <string>Object</string>
...@@ -930,6 +933,7 @@ return new_line_list\n ...@@ -930,6 +933,7 @@ return new_line_list\n
<none/> <none/>
<none/> <none/>
<list/> <list/>
<none/>
</tuple> </tuple>
</value> </value>
</item> </item>
......
...@@ -71,6 +71,8 @@ section_uid = context.Base_getSectionUidListForSectionCategory(\n ...@@ -71,6 +71,8 @@ section_uid = context.Base_getSectionUidListForSectionCategory(\n
simulation_state = request[\'simulation_state\']\n simulation_state = request[\'simulation_state\']\n
hide_analytic = request[\'hide_analytic\']\n hide_analytic = request[\'hide_analytic\']\n
from_date = request.get(\'from_date\', None)\n from_date = request.get(\'from_date\', None)\n
mirror_section_category_list = request.get(\'mirror_section_category_list\',\n
None)\n
gap_list = []\n gap_list = []\n
for gap in request.get(\'gap_list\', ()):\n for gap in request.get(\'gap_list\', ()):\n
# XXX the field should maybe use base=1 on the category...\n # XXX the field should maybe use base=1 on the category...\n
...@@ -196,6 +198,11 @@ if gap_list or gap_root:\n ...@@ -196,6 +198,11 @@ if gap_list or gap_root:\n
params[\'node_category\'] = gap_list or gap_root\n params[\'node_category\'] = gap_list or gap_root\n
default_selection_params[\'node_category\'] = gap_list or gap_root\n default_selection_params[\'node_category\'] = gap_list or gap_root\n
\n \n
if mirror_section_category_list:\n
params[\'mirror_section_category\'] = mirror_section_category_list\n
default_selection_params[\'mirror_section_category\'] =\\\n
mirror_section_category_list\n
\n
report_section_list = []\n report_section_list = []\n
\n \n
existing_section_dict = dict()\n existing_section_dict = dict()\n
...@@ -491,6 +498,7 @@ return report_section_list\n ...@@ -491,6 +498,7 @@ return report_section_list\n
<string>hide_analytic</string> <string>hide_analytic</string>
<string>None</string> <string>None</string>
<string>from_date</string> <string>from_date</string>
<string>mirror_section_category_list</string>
<string>gap_list</string> <string>gap_list</string>
<string>_getiter_</string> <string>_getiter_</string>
<string>gap</string> <string>gap</string>
......
...@@ -65,6 +65,8 @@ if function_uid:\n ...@@ -65,6 +65,8 @@ if function_uid:\n
inventory_kw[\'function_uid\'] = function_uid\n inventory_kw[\'function_uid\'] = function_uid\n
if project_uid:\n if project_uid:\n
inventory_kw[\'project_uid\'] = project_uid\n inventory_kw[\'project_uid\'] = project_uid\n
if mirror_section_category:\n
inventory_kw[\'mirror_section_category\'] = mirror_section_category\n
\n \n
if node_category:\n if node_category:\n
# XXX if node category is passed, income or balance accounts are not\n # XXX if node category is passed, income or balance accounts are not\n
...@@ -117,7 +119,7 @@ return [Object(debit_price=debit, credit_price=credit)]\n ...@@ -117,7 +119,7 @@ return [Object(debit_price=debit, credit_price=credit)]\n
</item> </item>
<item> <item>
<key> <string>_params</string> </key> <key> <string>_params</string> </key>
<value> <string>section_uid, simulation_state, at_date, period_start_date, precision, node_category=None, function_uid=None, project_uid=None, from_date=\'ignored\', **kw</string> </value> <value> <string>section_uid, simulation_state, at_date, period_start_date, precision, node_category=None, function_uid=None, project_uid=None, from_date=\'ignored\', mirror_section_category=None, **kw</string> </value>
</item> </item>
<item> <item>
<key> <string>errors</string> </key> <key> <string>errors</string> </key>
...@@ -137,7 +139,7 @@ return [Object(debit_price=debit, credit_price=credit)]\n ...@@ -137,7 +139,7 @@ return [Object(debit_price=debit, credit_price=credit)]\n
<dictionary> <dictionary>
<item> <item>
<key> <string>co_argcount</string> </key> <key> <string>co_argcount</string> </key>
<value> <int>9</int> </value> <value> <int>10</int> </value>
</item> </item>
<item> <item>
<key> <string>co_varnames</string> </key> <key> <string>co_varnames</string> </key>
...@@ -152,6 +154,7 @@ return [Object(debit_price=debit, credit_price=credit)]\n ...@@ -152,6 +154,7 @@ return [Object(debit_price=debit, credit_price=credit)]\n
<string>function_uid</string> <string>function_uid</string>
<string>project_uid</string> <string>project_uid</string>
<string>from_date</string> <string>from_date</string>
<string>mirror_section_category</string>
<string>kw</string> <string>kw</string>
<string>Products.PythonScripts.standard</string> <string>Products.PythonScripts.standard</string>
<string>Object</string> <string>Object</string>
...@@ -183,6 +186,7 @@ return [Object(debit_price=debit, credit_price=credit)]\n ...@@ -183,6 +186,7 @@ return [Object(debit_price=debit, credit_price=credit)]\n
<none/> <none/>
<none/> <none/>
<string>ignored</string> <string>ignored</string>
<none/>
</tuple> </tuple>
</value> </value>
</item> </item>
......
...@@ -71,6 +71,7 @@ expand_accounts = request.get(\'expand_accounts\', False)\n ...@@ -71,6 +71,7 @@ expand_accounts = request.get(\'expand_accounts\', False)\n
show_empty_accounts = request[\'show_empty_accounts\']\n show_empty_accounts = request[\'show_empty_accounts\']\n
per_account_class_summary = request[\'per_account_class_summary\']\n per_account_class_summary = request[\'per_account_class_summary\']\n
gap_root = request.get(\'gap_root\', None)\n gap_root = request.get(\'gap_root\', None)\n
mirror_section_category = request.get(\'mirror_section_category_list\', None)\n
section_uid = portal.Base_getSectionUidListForSectionCategory(\n section_uid = portal.Base_getSectionUidListForSectionCategory(\n
request[\'section_category\'],\n request[\'section_category\'],\n
request[\'section_category_strict\'])\n request[\'section_category_strict\'])\n
...@@ -156,6 +157,8 @@ return [ ReportSection(\n ...@@ -156,6 +157,8 @@ return [ ReportSection(\n
precision=precision,\n precision=precision,\n
group_analytic=group_analytic_uid,\n group_analytic=group_analytic_uid,\n
node_uid=node_uid,\n node_uid=node_uid,\n
mirror_section_category=\n
mirror_section_category,\n
per_account_class_summary=\n per_account_class_summary=\n
per_account_class_summary,\n per_account_class_summary,\n
gap_root=gap_root,), )]\n gap_root=gap_root,), )]\n
...@@ -215,6 +218,7 @@ return [ ReportSection(\n ...@@ -215,6 +218,7 @@ return [ ReportSection(\n
<string>show_empty_accounts</string> <string>show_empty_accounts</string>
<string>per_account_class_summary</string> <string>per_account_class_summary</string>
<string>gap_root</string> <string>gap_root</string>
<string>mirror_section_category</string>
<string>section_uid</string> <string>section_uid</string>
<string>period_start_date</string> <string>period_start_date</string>
<string>currency</string> <string>currency</string>
......
...@@ -98,6 +98,7 @@ ...@@ -98,6 +98,7 @@
<string>your_currency</string> <string>your_currency</string>
<string>your_from_date</string> <string>your_from_date</string>
<string>your_at_date</string> <string>your_at_date</string>
<string>your_mirror_section_category_list</string>
<string>your_gap</string> <string>your_gap</string>
<string>your_gap_root</string> <string>your_gap_root</string>
<string>your_simulation_state</string> <string>your_simulation_state</string>
......
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
<global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
<tuple/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>delegated_list</string> </key>
<value>
<list/>
</value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>your_mirror_section_category_list</string> </value>
</item>
<item>
<key> <string>message_values</string> </key>
<value>
<dictionary>
<item>
<key> <string>external_validator_failed</string> </key>
<value> <string>The input failed the external validator.</string> </value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>overrides</string> </key>
<value>
<dictionary>
<item>
<key> <string>field_id</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>form_id</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>target</string> </key>
<value> <string></string> </value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>tales</string> </key>
<value>
<dictionary>
<item>
<key> <string>field_id</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>form_id</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>target</string> </key>
<value> <string></string> </value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>values</string> </key>
<value>
<dictionary>
<item>
<key> <string>field_id</string> </key>
<value> <string>your_mirror_section_category_list</string> </value>
</item>
<item>
<key> <string>form_id</string> </key>
<value> <string>AccountModule_viewReportFieldLibrary</string> </value>
</item>
<item>
<key> <string>target</string> </key>
<value> <string>Click to edit the target</string> </value>
</item>
</dictionary>
</value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
...@@ -101,6 +101,7 @@ ...@@ -101,6 +101,7 @@
<value> <value>
<list> <list>
<string>your_simulation_state</string> <string>your_simulation_state</string>
<string>your_mirror_section_category_list</string>
</list> </list>
</value> </value>
</item> </item>
......
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
<global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
<tuple/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>delegated_list</string> </key>
<value>
<list/>
</value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>your_mirror_section_category_list</string> </value>
</item>
<item>
<key> <string>message_values</string> </key>
<value>
<dictionary>
<item>
<key> <string>external_validator_failed</string> </key>
<value> <string>The input failed the external validator.</string> </value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>overrides</string> </key>
<value>
<dictionary>
<item>
<key> <string>field_id</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>form_id</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>target</string> </key>
<value> <string></string> </value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>tales</string> </key>
<value>
<dictionary>
<item>
<key> <string>field_id</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>form_id</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>target</string> </key>
<value> <string></string> </value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>values</string> </key>
<value>
<dictionary>
<item>
<key> <string>field_id</string> </key>
<value> <string>your_mirror_section_category_list</string> </value>
</item>
<item>
<key> <string>form_id</string> </key>
<value> <string>AccountModule_viewDialogFieldLibrary</string> </value>
</item>
<item>
<key> <string>target</string> </key>
<value> <string>Click to edit the target</string> </value>
</item>
</dictionary>
</value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
...@@ -98,6 +98,7 @@ ...@@ -98,6 +98,7 @@
<string>your_currency</string> <string>your_currency</string>
<string>your_from_date</string> <string>your_from_date</string>
<string>your_at_date</string> <string>your_at_date</string>
<string>your_mirror_section_category_list</string>
<string>your_gap_root</string> <string>your_gap_root</string>
<string>your_period_start_date</string> <string>your_period_start_date</string>
<string>your_portal_type</string> <string>your_portal_type</string>
......
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
<global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
<tuple/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>delegated_list</string> </key>
<value>
<list/>
</value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>your_mirror_section_category_list</string> </value>
</item>
<item>
<key> <string>message_values</string> </key>
<value>
<dictionary>
<item>
<key> <string>external_validator_failed</string> </key>
<value> <string>The input failed the external validator.</string> </value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>overrides</string> </key>
<value>
<dictionary>
<item>
<key> <string>field_id</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>form_id</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>target</string> </key>
<value> <string></string> </value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>tales</string> </key>
<value>
<dictionary>
<item>
<key> <string>field_id</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>form_id</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>target</string> </key>
<value> <string></string> </value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>values</string> </key>
<value>
<dictionary>
<item>
<key> <string>field_id</string> </key>
<value> <string>your_mirror_section_category_list</string> </value>
</item>
<item>
<key> <string>form_id</string> </key>
<value> <string>AccountModule_viewReportFieldLibrary</string> </value>
</item>
<item>
<key> <string>target</string> </key>
<value> <string>Click to edit the target</string> </value>
</item>
</dictionary>
</value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
...@@ -97,6 +97,7 @@ ...@@ -97,6 +97,7 @@
<list> <list>
<string>your_simulation_state</string> <string>your_simulation_state</string>
<string>your_portal_type</string> <string>your_portal_type</string>
<string>your_mirror_section_category_list</string>
<string>your_landscape</string> <string>your_landscape</string>
</list> </list>
</value> </value>
......
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
<global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
<tuple/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>delegated_list</string> </key>
<value>
<list/>
</value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>your_mirror_section_category_list</string> </value>
</item>
<item>
<key> <string>message_values</string> </key>
<value>
<dictionary>
<item>
<key> <string>external_validator_failed</string> </key>
<value> <string>The input failed the external validator.</string> </value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>overrides</string> </key>
<value>
<dictionary>
<item>
<key> <string>field_id</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>form_id</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>target</string> </key>
<value> <string></string> </value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>tales</string> </key>
<value>
<dictionary>
<item>
<key> <string>field_id</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>form_id</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>target</string> </key>
<value> <string></string> </value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>values</string> </key>
<value>
<dictionary>
<item>
<key> <string>field_id</string> </key>
<value> <string>your_mirror_section_category_list</string> </value>
</item>
<item>
<key> <string>form_id</string> </key>
<value> <string>AccountModule_viewDialogFieldLibrary</string> </value>
</item>
<item>
<key> <string>target</string> </key>
<value> <string>Click to edit the target</string> </value>
</item>
</dictionary>
</value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
...@@ -84,6 +84,8 @@ if node_category_strict_membership:\n ...@@ -84,6 +84,8 @@ if node_category_strict_membership:\n
params[\'node_category_strict_membership\'] = node_category_strict_membership\n params[\'node_category_strict_membership\'] = node_category_strict_membership\n
if node_category:\n if node_category:\n
params[\'node_category\'] = node_category\n params[\'node_category\'] = node_category\n
if mirror_section_category:\n
params[\'mirror_section_category\'] = mirror_section_category\n
\n \n
if not \'parent_portal_type\' in params:\n if not \'parent_portal_type\' in params:\n
params.setdefault(\'portal_type\', portal.getPortalAccountingMovementTypeList())\n params.setdefault(\'portal_type\', portal.getPortalAccountingMovementTypeList())\n
...@@ -230,7 +232,7 @@ return portal.portal_simulation.getMovementHistoryList(\n ...@@ -230,7 +232,7 @@ return portal.portal_simulation.getMovementHistoryList(\n
</item> </item>
<item> <item>
<key> <string>_params</string> </key> <key> <string>_params</string> </key>
<value> <string>selection=None, sort_on=[], node_category=None, node_category_strict_membership=None, from_date=None, selection_name=None, src__=0, **kw</string> </value> <value> <string>selection=None, sort_on=[], node_category=None, node_category_strict_membership=None, mirror_section_category=None, from_date=None, selection_name=None, src__=0, **kw</string> </value>
</item> </item>
<item> <item>
<key> <string>errors</string> </key> <key> <string>errors</string> </key>
...@@ -250,7 +252,7 @@ return portal.portal_simulation.getMovementHistoryList(\n ...@@ -250,7 +252,7 @@ return portal.portal_simulation.getMovementHistoryList(\n
<dictionary> <dictionary>
<item> <item>
<key> <string>co_argcount</string> </key> <key> <string>co_argcount</string> </key>
<value> <int>7</int> </value> <value> <int>8</int> </value>
</item> </item>
<item> <item>
<key> <string>co_varnames</string> </key> <key> <string>co_varnames</string> </key>
...@@ -260,6 +262,7 @@ return portal.portal_simulation.getMovementHistoryList(\n ...@@ -260,6 +262,7 @@ return portal.portal_simulation.getMovementHistoryList(\n
<string>sort_on</string> <string>sort_on</string>
<string>node_category</string> <string>node_category</string>
<string>node_category_strict_membership</string> <string>node_category_strict_membership</string>
<string>mirror_section_category</string>
<string>from_date</string> <string>from_date</string>
<string>selection_name</string> <string>selection_name</string>
<string>src__</string> <string>src__</string>
...@@ -312,6 +315,7 @@ return portal.portal_simulation.getMovementHistoryList(\n ...@@ -312,6 +315,7 @@ return portal.portal_simulation.getMovementHistoryList(\n
<none/> <none/>
<none/> <none/>
<none/> <none/>
<none/>
<int>0</int> <int>0</int>
</tuple> </tuple>
</value> </value>
......
...@@ -77,6 +77,8 @@ if kw.get(\'node_category_strict_membership\'):\n ...@@ -77,6 +77,8 @@ if kw.get(\'node_category_strict_membership\'):\n
kw[\'node_category_strict_membership\']\n kw[\'node_category_strict_membership\']\n
if kw.get(\'node_category\'):\n if kw.get(\'node_category\'):\n
params[\'node_category\'] = kw[\'node_category\']\n params[\'node_category\'] = kw[\'node_category\']\n
if kw.get(\'mirror_section_category\'):\n
params[\'mirror_section_category\'] = kw[\'mirror_section_category\']\n
\n \n
###\n ###\n
# Get the \'where_expression\' parameter\n # Get the \'where_expression\' parameter\n
......
1280 1285
\ 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