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
Matevz Golob
erp5
Commits
c6737d27
Commit
c6737d27
authored
Jan 18, 2018
by
Tomáš Peterka
Committed by
Tomáš Peterka
Jan 29, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[accounting] Necessary changes to make RenderJS (and functional) tests to pass
parent
2edc14b4
Changes
17
Hide whitespace changes
Inline
Side-by-side
Showing
17 changed files
with
73 additions
and
37 deletions
+73
-37
bt5/erp5_accounting/ActionTemplateItem/portal_types/Accounting%20Transaction%20Module/account_statement_report.xml
...nting%20Transaction%20Module/account_statement_report.xml
+5
-3
bt5/erp5_accounting/ActionTemplateItem/portal_types/Accounting%20Transaction%20Module/aged_balance_report.xml
...Accounting%20Transaction%20Module/aged_balance_report.xml
+2
-2
bt5/erp5_accounting/ActionTemplateItem/portal_types/Accounting%20Transaction%20Module/balance_sheet_report.xml
...ccounting%20Transaction%20Module/balance_sheet_report.xml
+5
-3
bt5/erp5_accounting/ActionTemplateItem/portal_types/Accounting%20Transaction%20Module/bank_accounts_report.xml
...ccounting%20Transaction%20Module/bank_accounts_report.xml
+5
-3
bt5/erp5_accounting/ActionTemplateItem/portal_types/Accounting%20Transaction%20Module/create_related_payments.xml
...unting%20Transaction%20Module/create_related_payments.xml
+5
-3
bt5/erp5_accounting/ActionTemplateItem/portal_types/Accounting%20Transaction%20Module/general_ledger_report.xml
...counting%20Transaction%20Module/general_ledger_report.xml
+2
-2
bt5/erp5_accounting/ActionTemplateItem/portal_types/Accounting%20Transaction%20Module/journal_report.xml
...ypes/Accounting%20Transaction%20Module/journal_report.xml
+5
-3
bt5/erp5_accounting/ActionTemplateItem/portal_types/Accounting%20Transaction%20Module/profit_and_loss_report.xml
...ounting%20Transaction%20Module/profit_and_loss_report.xml
+5
-3
bt5/erp5_accounting/ActionTemplateItem/portal_types/Accounting%20Transaction%20Module/third_parties_report.xml
...ccounting%20Transaction%20Module/third_parties_report.xml
+5
-3
bt5/erp5_accounting/ActionTemplateItem/portal_types/Accounting%20Transaction%20Module/trial_balance_report.xml
...ccounting%20Transaction%20Module/trial_balance_report.xml
+5
-3
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_getOtherPartiesReportSectionList.py
...ounting/AccountModule_getOtherPartiesReportSectionList.py
+1
-1
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_viewTrialBalanceReportDialog/your_from_date.xml
...untModule_viewTrialBalanceReportDialog/your_from_date.xml
+7
-1
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Account_getAccountingTransactionList.py
...s/erp5_accounting/Account_getAccountingTransactionList.py
+12
-1
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Account_getAccountingTransactionList.xml
.../erp5_accounting/Account_getAccountingTransactionList.xml
+1
-1
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_getJournalReportSectionList.py
...ccountingTransactionModule_getJournalReportSectionList.py
+2
-1
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransaction_addAccountingTransactionLine.py
...ing/AccountingTransaction_addAccountingTransactionLine.py
+5
-3
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Movement_getNodeGapId.xml
...em/portal_skins/erp5_accounting/Movement_getNodeGapId.xml
+1
-1
No files found.
bt5/erp5_accounting/ActionTemplateItem/portal_types/Accounting%20Transaction%20Module/account_statement_report.xml
View file @
c6737d27
...
@@ -16,13 +16,13 @@
...
@@ -16,13 +16,13 @@
<key>
<string>
categories
</string>
</key>
<key>
<string>
categories
</string>
</key>
<value>
<value>
<tuple>
<tuple>
<string>
action_type/object_report
</string>
<string>
action_type/object_
jio_
report
</string>
</tuple>
</tuple>
</value>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
category
</string>
</key>
<key>
<string>
category
</string>
</key>
<value>
<string>
object_report
</string>
</value>
<value>
<string>
object_
jio_
report
</string>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
condition
</string>
</key>
<key>
<string>
condition
</string>
</key>
...
@@ -30,7 +30,9 @@
...
@@ -30,7 +30,9 @@
</item>
</item>
<item>
<item>
<key>
<string>
description
</string>
</key>
<key>
<string>
description
</string>
</key>
<value>
<string></string>
</value>
<value>
<none/>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
icon
</string>
</key>
<key>
<string>
icon
</string>
</key>
...
...
bt5/erp5_accounting/ActionTemplateItem/portal_types/Accounting%20Transaction%20Module/aged_balance_report.xml
View file @
c6737d27
...
@@ -16,13 +16,13 @@
...
@@ -16,13 +16,13 @@
<key>
<string>
categories
</string>
</key>
<key>
<string>
categories
</string>
</key>
<value>
<value>
<tuple>
<tuple>
<string>
action_type/object_report
</string>
<string>
action_type/object_
jio_
report
</string>
</tuple>
</tuple>
</value>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
category
</string>
</key>
<key>
<string>
category
</string>
</key>
<value>
<string>
object_report
</string>
</value>
<value>
<string>
object_
jio_
report
</string>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
condition
</string>
</key>
<key>
<string>
condition
</string>
</key>
...
...
bt5/erp5_accounting/ActionTemplateItem/portal_types/Accounting%20Transaction%20Module/balance_sheet_report.xml
View file @
c6737d27
...
@@ -16,13 +16,13 @@
...
@@ -16,13 +16,13 @@
<key>
<string>
categories
</string>
</key>
<key>
<string>
categories
</string>
</key>
<value>
<value>
<tuple>
<tuple>
<string>
action_type/object_report
</string>
<string>
action_type/object_
jio_
report
</string>
</tuple>
</tuple>
</value>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
category
</string>
</key>
<key>
<string>
category
</string>
</key>
<value>
<string>
object_report
</string>
</value>
<value>
<string>
object_
jio_
report
</string>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
condition
</string>
</key>
<key>
<string>
condition
</string>
</key>
...
@@ -30,7 +30,9 @@
...
@@ -30,7 +30,9 @@
</item>
</item>
<item>
<item>
<key>
<string>
description
</string>
</key>
<key>
<string>
description
</string>
</key>
<value>
<string></string>
</value>
<value>
<none/>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
icon
</string>
</key>
<key>
<string>
icon
</string>
</key>
...
...
bt5/erp5_accounting/ActionTemplateItem/portal_types/Accounting%20Transaction%20Module/bank_accounts_report.xml
View file @
c6737d27
...
@@ -16,13 +16,13 @@
...
@@ -16,13 +16,13 @@
<key>
<string>
categories
</string>
</key>
<key>
<string>
categories
</string>
</key>
<value>
<value>
<tuple>
<tuple>
<string>
action_type/object_report
</string>
<string>
action_type/object_
jio_
report
</string>
</tuple>
</tuple>
</value>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
category
</string>
</key>
<key>
<string>
category
</string>
</key>
<value>
<string>
object_report
</string>
</value>
<value>
<string>
object_
jio_
report
</string>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
condition
</string>
</key>
<key>
<string>
condition
</string>
</key>
...
@@ -30,7 +30,9 @@
...
@@ -30,7 +30,9 @@
</item>
</item>
<item>
<item>
<key>
<string>
description
</string>
</key>
<key>
<string>
description
</string>
</key>
<value>
<string></string>
</value>
<value>
<none/>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
icon
</string>
</key>
<key>
<string>
icon
</string>
</key>
...
...
bt5/erp5_accounting/ActionTemplateItem/portal_types/Accounting%20Transaction%20Module/create_related_payments.xml
View file @
c6737d27
...
@@ -16,13 +16,13 @@
...
@@ -16,13 +16,13 @@
<key>
<string>
categories
</string>
</key>
<key>
<string>
categories
</string>
</key>
<value>
<value>
<tuple>
<tuple>
<string>
action_type/object_action
</string>
<string>
action_type/object_
jio_
action
</string>
</tuple>
</tuple>
</value>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
category
</string>
</key>
<key>
<string>
category
</string>
</key>
<value>
<string>
object_action
</string>
</value>
<value>
<string>
object_
jio_
action
</string>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
condition
</string>
</key>
<key>
<string>
condition
</string>
</key>
...
@@ -30,7 +30,9 @@
...
@@ -30,7 +30,9 @@
</item>
</item>
<item>
<item>
<key>
<string>
description
</string>
</key>
<key>
<string>
description
</string>
</key>
<value>
<string></string>
</value>
<value>
<none/>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
icon
</string>
</key>
<key>
<string>
icon
</string>
</key>
...
...
bt5/erp5_accounting/ActionTemplateItem/portal_types/Accounting%20Transaction%20Module/general_ledger_report.xml
View file @
c6737d27
...
@@ -16,13 +16,13 @@
...
@@ -16,13 +16,13 @@
<key>
<string>
categories
</string>
</key>
<key>
<string>
categories
</string>
</key>
<value>
<value>
<tuple>
<tuple>
<string>
action_type/object_report
</string>
<string>
action_type/object_
jio_
report
</string>
</tuple>
</tuple>
</value>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
category
</string>
</key>
<key>
<string>
category
</string>
</key>
<value>
<string>
object_report
</string>
</value>
<value>
<string>
object_
jio_
report
</string>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
condition
</string>
</key>
<key>
<string>
condition
</string>
</key>
...
...
bt5/erp5_accounting/ActionTemplateItem/portal_types/Accounting%20Transaction%20Module/journal_report.xml
View file @
c6737d27
...
@@ -16,13 +16,13 @@
...
@@ -16,13 +16,13 @@
<key>
<string>
categories
</string>
</key>
<key>
<string>
categories
</string>
</key>
<value>
<value>
<tuple>
<tuple>
<string>
action_type/object_report
</string>
<string>
action_type/object_
jio_
report
</string>
</tuple>
</tuple>
</value>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
category
</string>
</key>
<key>
<string>
category
</string>
</key>
<value>
<string>
object_report
</string>
</value>
<value>
<string>
object_
jio_
report
</string>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
condition
</string>
</key>
<key>
<string>
condition
</string>
</key>
...
@@ -30,7 +30,9 @@
...
@@ -30,7 +30,9 @@
</item>
</item>
<item>
<item>
<key>
<string>
description
</string>
</key>
<key>
<string>
description
</string>
</key>
<value>
<string></string>
</value>
<value>
<none/>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
icon
</string>
</key>
<key>
<string>
icon
</string>
</key>
...
...
bt5/erp5_accounting/ActionTemplateItem/portal_types/Accounting%20Transaction%20Module/profit_and_loss_report.xml
View file @
c6737d27
...
@@ -16,13 +16,13 @@
...
@@ -16,13 +16,13 @@
<key>
<string>
categories
</string>
</key>
<key>
<string>
categories
</string>
</key>
<value>
<value>
<tuple>
<tuple>
<string>
action_type/object_report
</string>
<string>
action_type/object_
jio_
report
</string>
</tuple>
</tuple>
</value>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
category
</string>
</key>
<key>
<string>
category
</string>
</key>
<value>
<string>
object_report
</string>
</value>
<value>
<string>
object_
jio_
report
</string>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
condition
</string>
</key>
<key>
<string>
condition
</string>
</key>
...
@@ -30,7 +30,9 @@
...
@@ -30,7 +30,9 @@
</item>
</item>
<item>
<item>
<key>
<string>
description
</string>
</key>
<key>
<string>
description
</string>
</key>
<value>
<string></string>
</value>
<value>
<none/>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
icon
</string>
</key>
<key>
<string>
icon
</string>
</key>
...
...
bt5/erp5_accounting/ActionTemplateItem/portal_types/Accounting%20Transaction%20Module/third_parties_report.xml
View file @
c6737d27
...
@@ -16,13 +16,13 @@
...
@@ -16,13 +16,13 @@
<key>
<string>
categories
</string>
</key>
<key>
<string>
categories
</string>
</key>
<value>
<value>
<tuple>
<tuple>
<string>
action_type/object_report
</string>
<string>
action_type/object_
jio_
report
</string>
</tuple>
</tuple>
</value>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
category
</string>
</key>
<key>
<string>
category
</string>
</key>
<value>
<string>
object_report
</string>
</value>
<value>
<string>
object_
jio_
report
</string>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
condition
</string>
</key>
<key>
<string>
condition
</string>
</key>
...
@@ -30,7 +30,9 @@
...
@@ -30,7 +30,9 @@
</item>
</item>
<item>
<item>
<key>
<string>
description
</string>
</key>
<key>
<string>
description
</string>
</key>
<value>
<string></string>
</value>
<value>
<none/>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
icon
</string>
</key>
<key>
<string>
icon
</string>
</key>
...
...
bt5/erp5_accounting/ActionTemplateItem/portal_types/Accounting%20Transaction%20Module/trial_balance_report.xml
View file @
c6737d27
...
@@ -16,13 +16,13 @@
...
@@ -16,13 +16,13 @@
<key>
<string>
categories
</string>
</key>
<key>
<string>
categories
</string>
</key>
<value>
<value>
<tuple>
<tuple>
<string>
action_type/object_report
</string>
<string>
action_type/object_
jio_
report
</string>
</tuple>
</tuple>
</value>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
category
</string>
</key>
<key>
<string>
category
</string>
</key>
<value>
<string>
object_report
</string>
</value>
<value>
<string>
object_
jio_
report
</string>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
condition
</string>
</key>
<key>
<string>
condition
</string>
</key>
...
@@ -30,7 +30,9 @@
...
@@ -30,7 +30,9 @@
</item>
</item>
<item>
<item>
<key>
<string>
description
</string>
</key>
<key>
<string>
description
</string>
</key>
<value>
<string></string>
</value>
<value>
<none/>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
icon
</string>
</key>
<key>
<string>
icon
</string>
</key>
...
...
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_getOtherPartiesReportSectionList.py
View file @
c6737d27
...
@@ -5,7 +5,7 @@ portal = context.portal_url.getPortalObject()
...
@@ -5,7 +5,7 @@ portal = context.portal_url.getPortalObject()
from
Products.ERP5Form.Report
import
ReportSection
from
Products.ERP5Form.Report
import
ReportSection
request
=
context
.
REQUEST
request
=
context
.
REQUEST
at_date
=
request
[
'at_date'
]
at_date
=
request
[
'at_date'
]
.
latestTime
()
section_category
=
request
[
'section_category'
]
section_category
=
request
[
'section_category'
]
simulation_state
=
request
[
'simulation_state'
]
simulation_state
=
request
[
'simulation_state'
]
role_filter_list
=
request
.
get
(
'mirror_section_category_list'
,
None
)
role_filter_list
=
request
.
get
(
'mirror_section_category_list'
,
None
)
...
...
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_viewTrialBalanceReportDialog/your_from_date.xml
View file @
c6737d27
...
@@ -9,7 +9,9 @@
...
@@ -9,7 +9,9 @@
<item>
<item>
<key>
<string>
delegated_list
</string>
</key>
<key>
<string>
delegated_list
</string>
</key>
<value>
<value>
<list/>
<list>
<string>
required
</string>
</list>
</value>
</value>
</item>
</item>
<item>
<item>
...
@@ -77,6 +79,10 @@
...
@@ -77,6 +79,10 @@
<key>
<string>
form_id
</string>
</key>
<key>
<string>
form_id
</string>
</key>
<value>
<string>
AccountModule_viewDialogFieldLibrary
</string>
</value>
<value>
<string>
AccountModule_viewDialogFieldLibrary
</string>
</value>
</item>
</item>
<item>
<key>
<string>
required
</string>
</key>
<value>
<int>
1
</int>
</value>
</item>
<item>
<item>
<key>
<string>
target
</string>
</key>
<key>
<string>
target
</string>
</key>
<value>
<string>
Click to edit the target
</string>
</value>
<value>
<string>
Click to edit the target
</string>
</value>
...
...
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Account_getAccountingTransactionList.py
View file @
c6737d27
"""Returns Accounting Transactions where this account is node.
"""Returns Accounting Transactions where this account is node.
"""
"""
kw
[
'node_uid'
]
=
context
.
getUid
()
kw
.
update
(
dict
(
node_uid
=
context
.
getUid
(),
# this line is the reason for this whole script
# the rest is here to specify explicitely script's parameters and pass them through transparently
selection_name
=
selection_name
,
omit_grouping_reference
=
omit_grouping_reference
,
analytic_column_list
=
analytic_column_list
,
node_category
=
node_category
,
node_category_strict_membership
=
node_category_strict_membership
,
mirror_section_category
=
mirror_section_category
,
# from_date=from_date, # if added from_date terrible things start to happen
))
return
context
.
Node_getAccountingTransactionList
(
**
kw
)
return
context
.
Node_getAccountingTransactionList
(
**
kw
)
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Account_getAccountingTransactionList.xml
View file @
c6737d27
...
@@ -50,7 +50,7 @@
...
@@ -50,7 +50,7 @@
</item>
</item>
<item>
<item>
<key>
<string>
_params
</string>
</key>
<key>
<string>
_params
</string>
</key>
<value>
<string>
**kw
</string>
</value>
<value>
<string>
node_category=None, node_category_strict_membership=None, mirror_section_category=None, omit_grouping_reference=None, selection_name=None, analytic_column_list=(),
**kw
</string>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
id
</string>
</key>
<key>
<string>
id
</string>
</key>
...
...
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_getJournalReportSectionList.py
View file @
c6737d27
...
@@ -3,7 +3,8 @@ request = container.REQUEST
...
@@ -3,7 +3,8 @@ request = container.REQUEST
Base_translateString
=
container
.
Base_translateString
Base_translateString
=
container
.
Base_translateString
portal
=
context
.
getPortalObject
()
portal
=
context
.
getPortalObject
()
# We have to obtain parameters from request because of "generic" implementation
# https://lab.nexedi.com/nexedi/erp5/blob/master/product/ERP5Form/ReportBox.py#L71
portal_type
=
request
[
'portal_type'
]
portal_type
=
request
[
'portal_type'
]
simulation_state
=
request
[
'simulation_state'
]
simulation_state
=
request
[
'simulation_state'
]
hide_analytic
=
request
[
'hide_analytic'
]
hide_analytic
=
request
[
'hide_analytic'
]
...
...
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransaction_addAccountingTransactionLine.py
View file @
c6737d27
...
@@ -8,6 +8,8 @@ request = container.REQUEST
...
@@ -8,6 +8,8 @@ request = container.REQUEST
for
_
in
range
(
line_count
):
for
_
in
range
(
line_count
):
context
.
newContent
(
portal_type
=
line_portal_type
)
context
.
newContent
(
portal_type
=
line_portal_type
)
request
.
set
(
'portal_status_message'
,
return
context
.
Base_redirect
(
translateString
(
'Accounting Transaction Lines added.'
),)
form_id
,
return
getattr
(
context
,
form_id
)()
keep_items
=
{
'portal_status_message'
:
translateString
(
'Accounting Transaction Lines added.'
)
})
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Movement_getNodeGapId.xml
View file @
c6737d27
...
@@ -50,7 +50,7 @@
...
@@ -50,7 +50,7 @@
</item>
</item>
<item>
<item>
<key>
<string>
_params
</string>
</key>
<key>
<string>
_params
</string>
</key>
<value>
<string>
brain
=None
, selection=None, **kw
</string>
</value>
<value>
<string>
brain, selection=None, **kw
</string>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
id
</string>
</key>
<key>
<string>
id
</string>
</key>
...
...
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