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
8e461687
Commit
8e461687
authored
Jul 05, 2017
by
Jérome Perrin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
accounting: fix some indentation / coding style
parent
098f2527
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
51 additions
and
48 deletions
+51
-48
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_getAvailableGapList.py
...kins/erp5_accounting/AccountModule_getAvailableGapList.py
+3
-3
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_getBankAccountsReportSectionList.py
...ounting/AccountModule_getBankAccountsReportSectionList.py
+33
-30
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_getOtherPartiesReportSectionList.py
...ounting/AccountModule_getOtherPartiesReportSectionList.py
+15
-15
No files found.
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_getAvailableGapList.py
View file @
8e461687
# Return the list of gap roots that can be used.
# gap category is typically organized such as :
# gap category is typically organized such as :
# gap / country / gap_name
# so we always use as "root" the category of depth 2.
item_list
=
[(
''
,
''
)]
countries
=
context
.
portal_categories
.
gap
.
objectValues
()
for
country
in
countries
:
for
gap
in
country
.
objectValues
()
:
for
country
in
countries
:
for
gap
in
country
.
objectValues
():
path
=
gap
.
getRelativeUrl
()
item_list
.
append
(
((
country
.
getTranslatedTitle
()
+
'/'
+
gap
.
getTranslatedTitle
()),
...
...
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_getBankAccountsReportSectionList.py
View file @
8e461687
...
...
@@ -12,12 +12,12 @@ from_date = request.get('from_date', None)
result
=
[]
params
=
{
'to_date'
:
to_date
,
'section_category'
:
transaction_section_category
,
'simulation_state'
:
transaction_simulation_state
,
'accounting_transaction_line_currency'
:
None
,
'report_depth'
:
5
}
'to_date'
:
to_date
,
'section_category'
:
transaction_section_category
,
'simulation_state'
:
transaction_simulation_state
,
'accounting_transaction_line_currency'
:
None
,
'report_depth'
:
5
}
if
from_date
:
params
[
'from_date'
]
=
from_date
...
...
@@ -25,34 +25,37 @@ if from_date:
groupCategory
=
context
.
portal_categories
.
restrictedTraverse
(
transaction_section_category
)
entities
=
groupCategory
.
getGroupRelatedValueList
(
portal_type
=
(
'Organisation'
,
'Person'
))
entity_columns
=
(
(
'title'
,
'Title'
),
(
'getStopDate'
,
'Date'
),
(
'reference'
,
'Invoice No'
),
(
'getDestinationSectionTitle'
,
'Third Party'
),
(
'source_reference'
,
'Reference'
),
(
'simulation_state'
,
'State'
),
(
'source_debit'
,
'Debit'
),
(
'source_credit'
,
'Credit'
),
(
'source_balance'
,
'Balance'
),
)
entity_columns
=
(
(
'title'
,
'Title'
),
(
'getStopDate'
,
'Date'
),
(
'reference'
,
'Invoice No'
),
(
'getDestinationSectionTitle'
,
'Third Party'
),
(
'source_reference'
,
'Reference'
),
(
'simulation_state'
,
'State'
),
(
'source_debit'
,
'Debit'
),
(
'source_credit'
,
'Credit'
),
(
'source_balance'
,
'Balance'
),
)
for
entity
in
entities
:
result
.
append
(
ReportSection
(
path
=
context
.
getPhysicalPath
(),
title
=
'Bank accounts for %s'
%
entity
.
getTitle
(),
level
=
1
,
form_id
=
None
)
)
result
.
append
(
ReportSection
(
path
=
context
.
getPhysicalPath
(),
title
=
'Bank accounts for %s'
%
entity
.
getTitle
(),
level
=
1
,
form_id
=
None
)
)
for
bank
in
entity
.
searchFolder
(
portal_type
=
'Bank Account'
):
o
=
bank
.
getObject
()
result
.
append
(
ReportSection
(
title
=
'%s (%s)'
%
(
o
.
getTitle
(),
entity
.
getTitle
()),
level
=
2
,
path
=
o
.
getPhysicalPath
(),
form_id
=
'BankAccount_viewAccountingTransactionList'
,
## XXX Here we must use accounting_selection, because stat scripts read this selection
selection_name
=
'accounting_selection'
,
selection_params
=
params
,
selection_columns
=
entity_columns
)
)
ReportSection
(
title
=
'%s (%s)'
%
(
o
.
getTitle
(),
entity
.
getTitle
()),
level
=
2
,
path
=
o
.
getPhysicalPath
(),
form_id
=
'BankAccount_viewAccountingTransactionList'
,
## XXX Here we must use accounting_selection, because stat scripts read this selection
selection_name
=
'accounting_selection'
,
selection_params
=
params
,
selection_columns
=
entity_columns
,))
return
result
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_getOtherPartiesReportSectionList.py
View file @
8e461687
...
...
@@ -25,14 +25,14 @@ if role_filter_list == [''] :
role_filter_list
=
None
section_uid
=
context
.
Base_getSectionUidListForSectionCategory
(
request
[
'section_category'
],
request
[
'section_category_strict'
])
request
[
'section_category'
],
request
[
'section_category_strict'
])
result
=
[]
params
=
{
'at_date'
:
at_date
,
'section_uid'
:
section_uid
,
'simulation_state'
:
simulation_state
'at_date'
:
at_date
,
'section_uid'
:
section_uid
,
'simulation_state'
:
simulation_state
}
if
from_date
:
...
...
@@ -59,16 +59,16 @@ if ledger:
simulation_tool
=
portal
.
portal_simulation
entity_columns
=
[
(
'date'
,
'Date'
),
(
'Movement_getExplanationTranslatedPortalType'
,
'Type'
),
(
'Movement_getNodeGapId'
,
'GAP'
),
(
'Movement_getExplanationReference'
,
'Invoice No'
),
(
'Movement_getExplanationTitle'
,
'Title'
),
(
'Movement_getSpecificReference'
,
'Reference'
),
(
'getTranslatedSimulationStateTitle'
,
'State'
),
(
'debit_price'
,
'Debit'
),
(
'credit_price'
,
'Credit'
),
(
'running_total_price'
,
'Balance'
),
(
'date'
,
'Date'
),
(
'Movement_getExplanationTranslatedPortalType'
,
'Type'
),
(
'Movement_getNodeGapId'
,
'GAP'
),
(
'Movement_getExplanationReference'
,
'Invoice No'
),
(
'Movement_getExplanationTitle'
,
'Title'
),
(
'Movement_getSpecificReference'
,
'Reference'
),
(
'getTranslatedSimulationStateTitle'
,
'State'
),
(
'debit_price'
,
'Debit'
),
(
'credit_price'
,
'Credit'
),
(
'running_total_price'
,
'Balance'
),
]
if
not
request
[
'omit_grouping_reference'
]:
...
...
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