diff --git a/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_getAccountStatementReportSectionList.xml b/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_getAccountStatementReportSectionList.xml index fd1fed3c7697c67776e24a7012d2ea75ca86b91f..7ff6697bc074d12f247920a836714687768683d6 100644 --- a/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_getAccountStatementReportSectionList.xml +++ b/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_getAccountStatementReportSectionList.xml @@ -138,8 +138,11 @@ selection_columns = (\n (\'Movement_getExplanationTitle\', \'Accounting Transaction Title\'), )\n if len(section_uid) > 1:\n selection_columns += ( (\'section_title\', \'Section\'), )\n -selection_columns += analytic_column_list + (\n - (\'Movement_getMirrorSectionTitle\', \'Third Party\'),\n +selection_columns += analytic_column_list\n +if not mirror_section:\n + selection_columns += ( (\'Movement_getMirrorSectionTitle\', \'Third Party\'), )\n +selection_columns += (\n + (\'Movement_getExplanationReference\', \'Document Reference\'),\n (\'debit_price\', \'Debit\'),\n (\'credit_price\', \'Credit\'),\n (\'running_total_price\', \'Net\'),)\n diff --git a/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_getGeneralLedgerReportSectionList.xml b/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_getGeneralLedgerReportSectionList.xml index 4e63aaa09991ee5be4b7382e36aa6a639754c0b5..df7a6c3ba66ff10f8126ae59dd5ac5b70de83793 100644 --- a/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_getGeneralLedgerReportSectionList.xml +++ b/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_getGeneralLedgerReportSectionList.xml @@ -121,7 +121,7 @@ account_columns = (\n (\'Movement_getExplanationTitle\', \'Title\'),\n (\'date\', \'Date\'),\n (\'Movement_getExplanationTranslatedPortalType\', \'Type\'),\n - (\'Movement_getExplanationReference\', \'Invoice Number\'),\n + (\'Movement_getExplanationReference\', \'Document Reference\'),\n (\'Movement_getMirrorSectionTitle\', \'Third Party\'),)\n if len(simulation_state) > 1:\n account_columns += (\n diff --git a/bt5/erp5_accounting/WorkflowTemplateItem/portal_workflow/accounting_workflow/scripts/Delivery_Build.xml b/bt5/erp5_accounting/WorkflowTemplateItem/portal_workflow/accounting_workflow/scripts/Delivery_Build.xml index 415ca5a4a2e7704a288464d764b08711eb1b07d1..cccf7b989a65da6e2d79c26526eff282a2473501 100644 --- a/bt5/erp5_accounting/WorkflowTemplateItem/portal_workflow/accounting_workflow/scripts/Delivery_Build.xml +++ b/bt5/erp5_accounting/WorkflowTemplateItem/portal_workflow/accounting_workflow/scripts/Delivery_Build.xml @@ -208,7 +208,6 @@ if builder_by_ptype.has_key(delivery_portal_type) :\n <string>order</string> <string>build_trade_model_tag</string> <string>build_accounting_tag</string> - <string>path</string> <string>update_applied_rule_tag</string> <string>dict</string> </tuple> diff --git a/bt5/erp5_accounting/bt/revision b/bt5/erp5_accounting/bt/revision index 5e8508317b2d902c264492cce5227ecd020d7799..1f5e025c5bdc767dc4eeb608a6ab3ab26b1b6a5e 100644 --- a/bt5/erp5_accounting/bt/revision +++ b/bt5/erp5_accounting/bt/revision @@ -1 +1 @@ -1294 \ No newline at end of file +1295 \ No newline at end of file