Skip to content

erp5-Boxiang
erp5-Boxiang
Commit c6737d27 authored by Tomáš Peterka's avatar Tomáš Peterka Committed by Tomáš Peterka
Browse files
Options

[accounting] Necessary changes to make RenderJS (and functional) tests to pass

parent 2edc14b4
Hide whitespace changes
Inline Side-by-side
Showing with 73 additions and 37 deletions
bt5/erp5_accounting/ActionTemplateItem/portal_types/Accounting%20Transaction%20Module/account_statement_report.xml
View file @ c6737d27
......@@ -16,13 +16,13 @@
<key> <string>categories</string> </key>
<value>
<tuple>
<string>action_type/object_report</string>
<string>action_type/object_jio_report</string>
</tuple>
</value>
</item>
<item>
<key> <string>category</string> </key>
<value> <string>object_report</string> </value>
<value> <string>object_jio_report</string> </value>
</item>
<item>
<key> <string>condition</string> </key>
......@@ -30,7 +30,9 @@
</item>
<item>
<key> <string>description</string> </key>
<value> <string></string> </value>
<value>
<none/>
</value>
</item>
<item>
<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 @@
<key> <string>categories</string> </key>
<value>
<tuple>
<string>action_type/object_report</string>
<string>action_type/object_jio_report</string>
</tuple>
</value>
</item>
<item>
<key> <string>category</string> </key>
<value> <string>object_report</string> </value>
<value> <string>object_jio_report</string> </value>
</item>
<item>
<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 @@
<key> <string>categories</string> </key>
<value>
<tuple>
<string>action_type/object_report</string>
<string>action_type/object_jio_report</string>
</tuple>
</value>
</item>
<item>
<key> <string>category</string> </key>
<value> <string>object_report</string> </value>
<value> <string>object_jio_report</string> </value>
</item>
<item>
<key> <string>condition</string> </key>
......@@ -30,7 +30,9 @@
</item>
<item>
<key> <string>description</string> </key>
<value> <string></string> </value>
<value>
<none/>
</value>
</item>
<item>
<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 @@
<key> <string>categories</string> </key>
<value>
<tuple>
<string>action_type/object_report</string>
<string>action_type/object_jio_report</string>
</tuple>
</value>
</item>
<item>
<key> <string>category</string> </key>
<value> <string>object_report</string> </value>
<value> <string>object_jio_report</string> </value>
</item>
<item>
<key> <string>condition</string> </key>
......@@ -30,7 +30,9 @@
</item>
<item>
<key> <string>description</string> </key>
<value> <string></string> </value>
<value>
<none/>
</value>
</item>
<item>
<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 @@
<key> <string>categories</string> </key>
<value>
<tuple>
<string>action_type/object_action</string>
<string>action_type/object_jio_action</string>
</tuple>
</value>
</item>
<item>
<key> <string>category</string> </key>
<value> <string>object_action</string> </value>
<value> <string>object_jio_action</string> </value>
</item>
<item>
<key> <string>condition</string> </key>
......@@ -30,7 +30,9 @@
</item>
<item>
<key> <string>description</string> </key>
<value> <string></string> </value>
<value>
<none/>
</value>
</item>
<item>
<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 @@
<key> <string>categories</string> </key>
<value>
<tuple>
<string>action_type/object_report</string>
<string>action_type/object_jio_report</string>
</tuple>
</value>
</item>
<item>
<key> <string>category</string> </key>
<value> <string>object_report</string> </value>
<value> <string>object_jio_report</string> </value>
</item>
<item>
<key> <string>condition</string> </key>
......
bt5/erp5_accounting/ActionTemplateItem/portal_types/Accounting%20Transaction%20Module/journal_report.xml
View file @ c6737d27
......@@ -16,13 +16,13 @@
<key> <string>categories</string> </key>
<value>
<tuple>
<string>action_type/object_report</string>
<string>action_type/object_jio_report</string>
</tuple>
</value>
</item>
<item>
<key> <string>category</string> </key>
<value> <string>object_report</string> </value>
<value> <string>object_jio_report</string> </value>
</item>
<item>
<key> <string>condition</string> </key>
......@@ -30,7 +30,9 @@
</item>
<item>
<key> <string>description</string> </key>
<value> <string></string> </value>
<value>
<none/>
</value>
</item>
<item>
<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 @@
<key> <string>categories</string> </key>
<value>
<tuple>
<string>action_type/object_report</string>
<string>action_type/object_jio_report</string>
</tuple>
</value>
</item>
<item>
<key> <string>category</string> </key>
<value> <string>object_report</string> </value>
<value> <string>object_jio_report</string> </value>
</item>
<item>
<key> <string>condition</string> </key>
......@@ -30,7 +30,9 @@
</item>
<item>
<key> <string>description</string> </key>
<value> <string></string> </value>
<value>
<none/>
</value>
</item>
<item>
<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 @@
<key> <string>categories</string> </key>
<value>
<tuple>
<string>action_type/object_report</string>
<string>action_type/object_jio_report</string>
</tuple>
</value>
</item>
<item>
<key> <string>category</string> </key>
<value> <string>object_report</string> </value>
<value> <string>object_jio_report</string> </value>
</item>
<item>
<key> <string>condition</string> </key>
......@@ -30,7 +30,9 @@
</item>
<item>
<key> <string>description</string> </key>
<value> <string></string> </value>
<value>
<none/>
</value>
</item>
<item>
<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 @@
<key> <string>categories</string> </key>
<value>
<tuple>
<string>action_type/object_report</string>
<string>action_type/object_jio_report</string>
</tuple>
</value>
</item>
<item>
<key> <string>category</string> </key>
<value> <string>object_report</string> </value>
<value> <string>object_jio_report</string> </value>
</item>
<item>
<key> <string>condition</string> </key>
......@@ -30,7 +30,9 @@
</item>
<item>
<key> <string>description</string> </key>
<value> <string></string> </value>
<value>
<none/>
</value>
</item>
<item>
<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()
from Products.ERP5Form.Report import ReportSection
request = context.REQUEST
at_date = request['at_date']
at_date = request['at_date'].latestTime()
section_category = request['section_category']
simulation_state = request['simulation_state']
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 @@
<item>
<key> <string>delegated_list</string> </key>
<value>
<list/>
<list>
<string>required</string>
</list>
</value>
</item>
<item>
......@@ -77,6 +79,10 @@
<key> <string>form_id</string> </key>
<value> <string>AccountModule_viewDialogFieldLibrary</string> </value>
</item>
<item>
<key> <string>required</string> </key>
<value> <int>1</int> </value>
</item>
<item>
<key> <string>target</string> </key>
<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.
"""
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)
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Account_getAccountingTransactionList.xml
View file @ c6737d27
......@@ -50,7 +50,7 @@
</item>
<item>
<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>
<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
Base_translateString = container.Base_translateString
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']
simulation_state = request['simulation_state']
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
for _ in range(line_count):
context.newContent(portal_type=line_portal_type)
request.set('portal_status_message',
translateString('Accounting Transaction Lines added.'),)
return getattr(context, form_id)()
return context.Base_redirect(
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 @@
</item>
<item>
<key> <string>_params</string> </key>
<value> <string>brain=None, selection=None, **kw</string> </value>
<value> <string>brain, selection=None, **kw</string> </value>
</item>
<item>
<key> <string>id</string> </key>
......
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