Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
erp5-Boxiang
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Hamza
erp5-Boxiang
Commits
06cabbd0
Commit
06cabbd0
authored
Sep 25, 2015
by
Jérome Perrin
Committed by
Vincent Pelletier
Sep 25, 2015
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
accounting: do not pass unhandled catalog parameters to inventory API
parent
59f14dea
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
6 deletions
+10
-6
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_getGeneralLedgerReportSectionList.xml
...nting/AccountModule_getGeneralLedgerReportSectionList.xml
+8
-6
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Node_getAccountingTransactionList.xml
...ins/erp5_accounting/Node_getAccountingTransactionList.xml
+2
-0
No files found.
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_getGeneralLedgerReportSectionList.xml
View file @
06cabbd0
...
@@ -99,10 +99,7 @@ request.other[\'is_accounting_report\'] = True\n
...
@@ -99,10 +99,7 @@ request.other[\'is_accounting_report\'] = True\n
params = dict(precision=precision,\n
params = dict(precision=precision,\n
section_uid=section_uid,\n
section_uid=section_uid,\n
simulation_state=simulation_state,\n
simulation_state=simulation_state,\n
period_start_date=period_start_date,\n
)\n
movement_portal_type=portal.getPortalAccountingMovementTypeList(),\n
no_mirror_section_uid_cache=1,\n
hide_grouping=request.get(\'omit_grouping_reference\', False))\n
project = request.get(\'project\')\n
project = request.get(\'project\')\n
if project:\n
if project:\n
if project == \'None\':\n
if project == \'None\':\n
...
@@ -137,6 +134,11 @@ if mirror_section:\n
...
@@ -137,6 +134,11 @@ if mirror_section:\n
params[\'mirror_section_uid\'] = mirror_section_uid\n
params[\'mirror_section_uid\'] = mirror_section_uid\n
\n
\n
default_selection_params = params.copy()\n
default_selection_params = params.copy()\n
default_selection_params[\'period_start_date\'] = period_start_date\n
default_selection_params[\'movement_portal_type\'] = portal.getPortalAccountingMovementTypeList()\n
default_selection_params[\'no_mirror_section_uid_cache\'] = 1\n
default_selection_params[\'hide_grouping\'] = request.get(\'omit_grouping_reference\', False) # XXX is this still used ?\n
\n
\n
\n
# if user request report without grouping reference, don\'t show accounts that only have grouped lines in the period.\n
# if user request report without grouping reference, don\'t show accounts that only have grouped lines in the period.\n
if request.get(\'omit_grouping_reference\', False):\n
if request.get(\'omit_grouping_reference\', False):\n
...
@@ -173,7 +175,7 @@ account_columns = (\n
...
@@ -173,7 +175,7 @@ account_columns = (\n
# export mode have a different layout\n
# export mode have a different layout\n
if export:\n
if export:\n
account_columns = context.AccountModule_getGeneralLedgerColumnItemList()\n
account_columns = context.AccountModule_getGeneralLedgerColumnItemList()\n
\n
\n
# utility functions\n
# utility functions\n
traverse = portal.restrictedTraverse\n
traverse = portal.restrictedTraverse\n
account_name_cache = {}\n
account_name_cache = {}\n
...
@@ -273,7 +275,7 @@ for inventory in portal.portal_simulation.getInventoryList(\n
...
@@ -273,7 +275,7 @@ for inventory in portal.portal_simulation.getInventoryList(\n
**params):\n
**params):\n
key = (inventory.node_relative_url, None, None)\n
key = (inventory.node_relative_url, None, None)\n
existing_section_dict[key] = True\n
existing_section_dict[key] = True\n
\n
\n
selection_params = default_selection_params.copy()\n
selection_params = default_selection_params.copy()\n
selection_params[\'from_date\'] = from_date\n
selection_params[\'from_date\'] = from_date\n
selection_params[\'at_date\'] = at_date\n
selection_params[\'at_date\'] = at_date\n
...
...
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Node_getAccountingTransactionList.xml
View file @
06cabbd0
...
@@ -132,6 +132,8 @@ if params.get(\'node_uid\'):\n
...
@@ -132,6 +132,8 @@ if params.get(\'node_uid\'):\n
is_pl_account = node.isMemberOf(\'account_type/expense\')\\\n
is_pl_account = node.isMemberOf(\'account_type/expense\')\\\n
or node.isMemberOf(\'account_type/income\')\n
or node.isMemberOf(\'account_type/income\')\n
\n
\n
# remove unknown catalog keys from params\n
params.pop(\'detailed_from_date_summary\', None)\n
\n
\n
period_start_date = params.pop(\'period_start_date\', None)\n
period_start_date = params.pop(\'period_start_date\', None)\n
if is_pl_account and not from_date:\n
if is_pl_account and not from_date:\n
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment