diff --git a/bt5/erp5_accounting/ActionTemplateItem/portal_types/Accounting%20Transaction%20Module/account_statement_report.xml b/bt5/erp5_accounting/ActionTemplateItem/portal_types/Accounting%20Transaction%20Module/account_statement_report.xml index 2cab9a0d7846ee1ac6cedecdfd8f808e2a1b2cd5..e6ab515404366fc3ea7f744b1f5af1a4266c7ba4 100644 --- a/bt5/erp5_accounting/ActionTemplateItem/portal_types/Accounting%20Transaction%20Module/account_statement_report.xml +++ b/bt5/erp5_accounting/ActionTemplateItem/portal_types/Accounting%20Transaction%20Module/account_statement_report.xml @@ -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> diff --git a/bt5/erp5_accounting/ActionTemplateItem/portal_types/Accounting%20Transaction%20Module/aged_balance_report.xml b/bt5/erp5_accounting/ActionTemplateItem/portal_types/Accounting%20Transaction%20Module/aged_balance_report.xml index 96e7ceb6498a5f432be0b910d6fda588ba553de1..7f720dcd8adadfcf64207c998d96b42cb6289f15 100644 --- a/bt5/erp5_accounting/ActionTemplateItem/portal_types/Accounting%20Transaction%20Module/aged_balance_report.xml +++ b/bt5/erp5_accounting/ActionTemplateItem/portal_types/Accounting%20Transaction%20Module/aged_balance_report.xml @@ -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> diff --git a/bt5/erp5_accounting/ActionTemplateItem/portal_types/Accounting%20Transaction%20Module/balance_sheet_report.xml b/bt5/erp5_accounting/ActionTemplateItem/portal_types/Accounting%20Transaction%20Module/balance_sheet_report.xml index df6fad1be3abd332f3375cc2ad113f84a7e2f66c..0f9455330fd2c1351ef8e00f06cbd0cd9bada96d 100644 --- a/bt5/erp5_accounting/ActionTemplateItem/portal_types/Accounting%20Transaction%20Module/balance_sheet_report.xml +++ b/bt5/erp5_accounting/ActionTemplateItem/portal_types/Accounting%20Transaction%20Module/balance_sheet_report.xml @@ -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> diff --git a/bt5/erp5_accounting/ActionTemplateItem/portal_types/Accounting%20Transaction%20Module/bank_accounts_report.xml b/bt5/erp5_accounting/ActionTemplateItem/portal_types/Accounting%20Transaction%20Module/bank_accounts_report.xml index 2d17190ea157e54f937e54d2da0af7d31ec94b5a..bf1260eefaf16b853831b4914c3f72c1956f883e 100644 --- a/bt5/erp5_accounting/ActionTemplateItem/portal_types/Accounting%20Transaction%20Module/bank_accounts_report.xml +++ b/bt5/erp5_accounting/ActionTemplateItem/portal_types/Accounting%20Transaction%20Module/bank_accounts_report.xml @@ -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> diff --git a/bt5/erp5_accounting/ActionTemplateItem/portal_types/Accounting%20Transaction%20Module/create_related_payments.xml b/bt5/erp5_accounting/ActionTemplateItem/portal_types/Accounting%20Transaction%20Module/create_related_payments.xml index 71bcbfbe25eef20bb57f9ed681eb455fa7dddefa..6def8187e8ec5352a14cda9f60365220d654e8b8 100644 --- a/bt5/erp5_accounting/ActionTemplateItem/portal_types/Accounting%20Transaction%20Module/create_related_payments.xml +++ b/bt5/erp5_accounting/ActionTemplateItem/portal_types/Accounting%20Transaction%20Module/create_related_payments.xml @@ -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> diff --git a/bt5/erp5_accounting/ActionTemplateItem/portal_types/Accounting%20Transaction%20Module/general_ledger_report.xml b/bt5/erp5_accounting/ActionTemplateItem/portal_types/Accounting%20Transaction%20Module/general_ledger_report.xml index 64d010b44a5abe001ba5fb9af3405d1096fa49f3..93a1ffb82b7300dea866b49a3e7af989859c4fe5 100644 --- a/bt5/erp5_accounting/ActionTemplateItem/portal_types/Accounting%20Transaction%20Module/general_ledger_report.xml +++ b/bt5/erp5_accounting/ActionTemplateItem/portal_types/Accounting%20Transaction%20Module/general_ledger_report.xml @@ -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> diff --git a/bt5/erp5_accounting/ActionTemplateItem/portal_types/Accounting%20Transaction%20Module/journal_report.xml b/bt5/erp5_accounting/ActionTemplateItem/portal_types/Accounting%20Transaction%20Module/journal_report.xml index a2cf89a1e31acd500059546b1ae8783ac444808b..c71454f6faec4e494bda63cd88d1faf86e8874bd 100644 --- a/bt5/erp5_accounting/ActionTemplateItem/portal_types/Accounting%20Transaction%20Module/journal_report.xml +++ b/bt5/erp5_accounting/ActionTemplateItem/portal_types/Accounting%20Transaction%20Module/journal_report.xml @@ -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> diff --git a/bt5/erp5_accounting/ActionTemplateItem/portal_types/Accounting%20Transaction%20Module/profit_and_loss_report.xml b/bt5/erp5_accounting/ActionTemplateItem/portal_types/Accounting%20Transaction%20Module/profit_and_loss_report.xml index 5d779bbae5959dcc2519c82107d94801ebb78860..b4242892258ed4c2b0c24fb6e94dbaec7c47b797 100644 --- a/bt5/erp5_accounting/ActionTemplateItem/portal_types/Accounting%20Transaction%20Module/profit_and_loss_report.xml +++ b/bt5/erp5_accounting/ActionTemplateItem/portal_types/Accounting%20Transaction%20Module/profit_and_loss_report.xml @@ -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> diff --git a/bt5/erp5_accounting/ActionTemplateItem/portal_types/Accounting%20Transaction%20Module/third_parties_report.xml b/bt5/erp5_accounting/ActionTemplateItem/portal_types/Accounting%20Transaction%20Module/third_parties_report.xml index f4bc783c811caa829d7b6db84d2b66ebcc795da5..25c3d3547c65e5e260f7a9521efaca12028bb5cc 100644 --- a/bt5/erp5_accounting/ActionTemplateItem/portal_types/Accounting%20Transaction%20Module/third_parties_report.xml +++ b/bt5/erp5_accounting/ActionTemplateItem/portal_types/Accounting%20Transaction%20Module/third_parties_report.xml @@ -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> diff --git a/bt5/erp5_accounting/ActionTemplateItem/portal_types/Accounting%20Transaction%20Module/trial_balance_report.xml b/bt5/erp5_accounting/ActionTemplateItem/portal_types/Accounting%20Transaction%20Module/trial_balance_report.xml index 20622de869733aac0880b7e5e042e35428a69d99..d2cdf249601c5e0f2f50d0298b0be7b5cbcc0a7e 100644 --- a/bt5/erp5_accounting/ActionTemplateItem/portal_types/Accounting%20Transaction%20Module/trial_balance_report.xml +++ b/bt5/erp5_accounting/ActionTemplateItem/portal_types/Accounting%20Transaction%20Module/trial_balance_report.xml @@ -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> diff --git a/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_getOtherPartiesReportSectionList.py b/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_getOtherPartiesReportSectionList.py index 755f07681f5f5613ec15ae8a417aef9675c456d5..f2794c26d2b36c34fee4f32403732e3be3bacf25 100644 --- a/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_getOtherPartiesReportSectionList.py +++ b/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_getOtherPartiesReportSectionList.py @@ -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) diff --git a/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_viewTrialBalanceReportDialog/your_from_date.xml b/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_viewTrialBalanceReportDialog/your_from_date.xml index 2a898e0a9065f27eca1a04731a2148315ddfeb9b..c3689d29569fcedb3c1c04724267ef6f6ab1c046 100644 --- a/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_viewTrialBalanceReportDialog/your_from_date.xml +++ b/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_viewTrialBalanceReportDialog/your_from_date.xml @@ -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> diff --git a/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Account_getAccountingTransactionList.py b/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Account_getAccountingTransactionList.py index b06a7809cadc6dbe0a70c096204cf2dd3361b2c1..dd0e925fd7f8b8612fdcd84759f27cf496d8a37b 100644 --- a/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Account_getAccountingTransactionList.py +++ b/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Account_getAccountingTransactionList.py @@ -1,4 +1,15 @@ """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) diff --git a/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Account_getAccountingTransactionList.xml b/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Account_getAccountingTransactionList.xml index 0169c5d00f93d4523b20291c106646ab4ed7ca11..ae8b5acb61a35c3e63ab5e201a8226dab09eea7c 100644 --- a/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Account_getAccountingTransactionList.xml +++ b/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Account_getAccountingTransactionList.xml @@ -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> diff --git a/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_getJournalReportSectionList.py b/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_getJournalReportSectionList.py index b07db5a7a0d33bb959095f1dd4c8c7ba1b089521..6ed622ef848125d398f558b44e2f6367c6f9182f 100644 --- a/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_getJournalReportSectionList.py +++ b/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_getJournalReportSectionList.py @@ -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'] diff --git a/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransaction_addAccountingTransactionLine.py b/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransaction_addAccountingTransactionLine.py index 64eadc71ff9a7ebc18702a767a4aac06b99d20ff..9c711f0f9161eef8153e12421b81ed3f0a453271 100644 --- a/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransaction_addAccountingTransactionLine.py +++ b/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransaction_addAccountingTransactionLine.py @@ -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.') + }) diff --git a/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Movement_getNodeGapId.xml b/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Movement_getNodeGapId.xml index b5cad23d830995891d22228cbabd4d1f3c0ea5dc..3687a1170d30449c58cca197bbe0e003a1120dc8 100644 --- a/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Movement_getNodeGapId.xml +++ b/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Movement_getNodeGapId.xml @@ -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>