Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
erp5
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
Laurent S
erp5
Commits
f99bb250
Commit
f99bb250
authored
Mar 13, 2017
by
Jérome Perrin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
accounting: finish renaming hide_grouping -> omit_grouping_reference
parent
2ee5f8f4
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
3 additions
and
5 deletions
+3
-5
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_getAccountStatementReportSectionList.py
...ing/AccountModule_getAccountStatementReportSectionList.py
+1
-1
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_getGeneralLedgerReportSectionList.py
...unting/AccountModule_getGeneralLedgerReportSectionList.py
+0
-1
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_getOtherPartiesReportSectionList.py
...ounting/AccountModule_getOtherPartiesReportSectionList.py
+1
-2
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Node_getAccountingTransactionList.py
...kins/erp5_accounting/Node_getAccountingTransactionList.py
+1
-1
No files found.
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_getAccountStatementReportSectionList.py
View file @
f99bb250
...
...
@@ -51,7 +51,7 @@ params = dict(at_date=at_date,
node_uid
=
traverse
(
node
).
getUid
(),
simulation_state
=
simulation_state
,
detailed_from_date_summary
=
detailed_from_date_summary
,
hide_grouping
=
omit_grouping_reference
,
omit_grouping_reference
=
omit_grouping_reference
,
from_date
=
None
,
payment_uid
=
None
,
mirror_section_uid
=
None
,)
...
...
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_getGeneralLedgerReportSectionList.py
View file @
f99bb250
...
...
@@ -93,7 +93,6 @@ default_selection_params = params.copy()
default_selection_params
[
'period_start_date'
]
=
period_start_date
default_selection_params
[
'movement_portal_type'
]
=
portal
.
getPortalAccountingMovementTypeList
()
default_selection_params
[
'no_mirror_section_uid_cache'
]
=
1
default_selection_params
[
'hide_grouping'
]
=
request
.
get
(
'omit_grouping_reference'
,
False
)
# XXX is this still used ?
# if user request report without grouping reference, don't show accounts that only have grouped lines in the period.
...
...
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_getOtherPartiesReportSectionList.py
View file @
f99bb250
...
...
@@ -35,7 +35,6 @@ params = {
,
'simulation_state'
:
simulation_state
}
params
[
'hide_grouping'
]
=
request
[
'omit_grouping_reference'
]
if
from_date
:
params
[
'from_date'
]
=
from_date
else
:
...
...
@@ -72,7 +71,7 @@ entity_columns = [
(
'running_total_price'
,
'Balance'
),
]
if
not
params
[
'hide_grouping'
]
:
if
not
request
[
'omit_grouping_reference'
]
:
entity_columns
.
append
((
'grouping_reference'
,
'Grouping Reference'
))
...
...
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Node_getAccountingTransactionList.py
View file @
f99bb250
...
...
@@ -88,7 +88,7 @@ period_start_date = params.pop('period_start_date', None)
if
is_pl_account
and
not
from_date
:
from_date
=
period_start_date
if
portal
.
portal_selections
.
getSelectionParamsFor
(
selection_name
).
get
(
'
hide_grouping
'
):
if
portal
.
portal_selections
.
getSelectionParamsFor
(
selection_name
).
get
(
'
omit_grouping_reference
'
):
if
params
.
get
(
'at_date'
):
params
[
'grouping_query'
]
=
ComplexQuery
(
Query
(
grouping_reference
=
None
),
...
...
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