Skip to content

erp5
erp5
Commit 1354002f authored by Jérome Perrin's avatar Jérome Perrin
Browse files
Options

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
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 722 additions and 7 deletions
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_getAccountListForTrialBalance.xml
View file @ 1354002f
......@@ -93,6 +93,8 @@ if function:\n
inventory_params[\'function\'] = function\n
if project:\n
inventory_params[\'project\'] = project\n
if mirror_section_category:\n
inventory_params[\'mirror_section_category\'] = mirror_section_category\n
\n
if node_uid:\n
inventory_params[\'node_uid\'] = node_uid\n
......@@ -773,7 +775,7 @@ return new_line_list\n
</item>
<item>
<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>
<key> <string>errors</string> </key>
......@@ -793,7 +795,7 @@ return new_line_list\n
<dictionary>
<item>
<key> <string>co_argcount</string> </key>
<value> <int>15</int> </value>
<value> <int>16</int> </value>
</item>
<item>
<key> <string>co_varnames</string> </key>
......@@ -814,6 +816,7 @@ return new_line_list\n
<string>function</string>
<string>project</string>
<string>group_analytic</string>
<string>mirror_section_category</string>
<string>kw</string>
<string>Products.PythonScripts.standard</string>
<string>Object</string>
......@@ -930,6 +933,7 @@ return new_line_list\n
<none/>
<none/>
<list/>
<none/>
</tuple>
</value>
</item>
......
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_getGeneralLedgerReportSectionList.xml
View file @ 1354002f
......@@ -71,6 +71,8 @@ section_uid = context.Base_getSectionUidListForSectionCategory(\n
simulation_state = request[\'simulation_state\']\n
hide_analytic = request[\'hide_analytic\']\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
for gap in request.get(\'gap_list\', ()):\n
# XXX the field should maybe use base=1 on the category...\n
......@@ -196,6 +198,11 @@ if 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
\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
\n
existing_section_dict = dict()\n
......@@ -491,6 +498,7 @@ return report_section_list\n
<string>hide_analytic</string>
<string>None</string>
<string>from_date</string>
<string>mirror_section_category_list</string>
<string>gap_list</string>
<string>_getiter_</string>
<string>gap</string>
......
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_getGeneralLedgerSummary.xml
View file @ 1354002f
......@@ -65,6 +65,8 @@ if function_uid:\n
inventory_kw[\'function_uid\'] = function_uid\n
if 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
if node_category:\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
</item>
<item>
<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>
<key> <string>errors</string> </key>
......@@ -137,7 +139,7 @@ return [Object(debit_price=debit, credit_price=credit)]\n
<dictionary>
<item>
<key> <string>co_argcount</string> </key>
<value> <int>9</int> </value>
<value> <int>10</int> </value>
</item>
<item>
<key> <string>co_varnames</string> </key>
......@@ -152,6 +154,7 @@ return [Object(debit_price=debit, credit_price=credit)]\n
<string>function_uid</string>
<string>project_uid</string>
<string>from_date</string>
<string>mirror_section_category</string>
<string>kw</string>
<string>Products.PythonScripts.standard</string>
<string>Object</string>
......@@ -183,6 +186,7 @@ return [Object(debit_price=debit, credit_price=credit)]\n
<none/>
<none/>
<string>ignored</string>
<none/>
</tuple>
</value>
</item>
......
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_getTrialBalanceReportSectionList.xml
View file @ 1354002f
......@@ -71,6 +71,7 @@ expand_accounts = request.get(\'expand_accounts\', False)\n
show_empty_accounts = request[\'show_empty_accounts\']\n
per_account_class_summary = request[\'per_account_class_summary\']\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
request[\'section_category\'],\n
request[\'section_category_strict\'])\n
......@@ -156,6 +157,8 @@ return [ ReportSection(\n
precision=precision,\n
group_analytic=group_analytic_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
gap_root=gap_root,), )]\n
......@@ -215,6 +218,7 @@ return [ ReportSection(\n
<string>show_empty_accounts</string>
<string>per_account_class_summary</string>
<string>gap_root</string>
<string>mirror_section_category</string>
<string>section_uid</string>
<string>period_start_date</string>
<string>currency</string>
......
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_viewGeneralLedgerReport.xml
View file @ 1354002f
......@@ -98,6 +98,7 @@
<string>your_currency</string>
<string>your_from_date</string>
<string>your_at_date</string>
<string>your_mirror_section_category_list</string>
<string>your_gap</string>
<string>your_gap_root</string>
<string>your_simulation_state</string>
......
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_viewGeneralLedgerReport/your_mirror_section_category_list.xml 0 → 100644
View file @ 1354002f
<?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>
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_viewGeneralLedgerReportDialog.xml
View file @ 1354002f
......@@ -101,6 +101,7 @@
<value>
<list>
<string>your_simulation_state</string>
<string>your_mirror_section_category_list</string>
</list>
</value>
</item>
......
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_viewGeneralLedgerReportDialog/your_mirror_section_category_list.xml 0 → 100644
View file @ 1354002f
<?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>
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_viewTrialBalanceReport.xml
View file @ 1354002f
......@@ -98,6 +98,7 @@
<string>your_currency</string>
<string>your_from_date</string>
<string>your_at_date</string>
<string>your_mirror_section_category_list</string>
<string>your_gap_root</string>
<string>your_period_start_date</string>
<string>your_portal_type</string>
......
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_viewTrialBalanceReport/your_mirror_section_category_list.xml 0 → 100644
View file @ 1354002f
<?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>
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_viewTrialBalanceReportDialog.xml
View file @ 1354002f
......@@ -97,6 +97,7 @@
<list>
<string>your_simulation_state</string>
<string>your_portal_type</string>
<string>your_mirror_section_category_list</string>
<string>your_landscape</string>
</list>
</value>
......
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_viewTrialBalanceReportDialog/your_mirror_section_category_list.xml 0 → 100644
View file @ 1354002f
<?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>
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Node_getAccountingTransactionList.xml
View file @ 1354002f
......@@ -84,6 +84,8 @@ if node_category_strict_membership:\n
params[\'node_category_strict_membership\'] = node_category_strict_membership\n
if node_category:\n
params[\'node_category\'] = node_category\n
if mirror_section_category:\n
params[\'mirror_section_category\'] = mirror_section_category\n
\n
if not \'parent_portal_type\' in params:\n
params.setdefault(\'portal_type\', portal.getPortalAccountingMovementTypeList())\n
......@@ -230,7 +232,7 @@ return portal.portal_simulation.getMovementHistoryList(\n
</item>
<item>
<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>
<key> <string>errors</string> </key>
......@@ -250,7 +252,7 @@ return portal.portal_simulation.getMovementHistoryList(\n
<dictionary>
<item>
<key> <string>co_argcount</string> </key>
<value> <int>7</int> </value>
<value> <int>8</int> </value>
</item>
<item>
<key> <string>co_varnames</string> </key>
......@@ -260,6 +262,7 @@ return portal.portal_simulation.getMovementHistoryList(\n
<string>sort_on</string>
<string>node_category</string>
<string>node_category_strict_membership</string>
<string>mirror_section_category</string>
<string>from_date</string>
<string>selection_name</string>
<string>src__</string>
......@@ -312,6 +315,7 @@ return portal.portal_simulation.getMovementHistoryList(\n
<none/>
<none/>
<none/>
<none/>
<int>0</int>
</tuple>
</value>
......
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Node_statAccountingBalance.xml
View file @ 1354002f
......@@ -77,6 +77,8 @@ if kw.get(\'node_category_strict_membership\'):\n
kw[\'node_category_strict_membership\']\n
if kw.get(\'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
# Get the \'where_expression\' parameter\n
......
bt5/erp5_accounting/bt/revision
View file @ 1354002f
1280
\ No newline at end of file
1285
\ 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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7