From 6c15445fa12c8c1b8b309ddc47890377f17f68cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9rome=20Perrin?= <jerome@nexedi.com> Date: Wed, 19 Nov 2014 18:27:11 +0100 Subject: [PATCH] accounting: show all aggregates on the line not only payment transaction group --- .../AccountingTransactionLine_view.xml | 2 +- ..._title.xml => my_aggregate_title_list.xml} | 35 ++++++++++--------- ...ountingTransactionLine_viewDestination.xml | 2 +- ..._title.xml => my_aggregate_title_list.xml} | 35 ++++++++++--------- 4 files changed, 40 insertions(+), 34 deletions(-) rename bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionLine_view/{my_aggregate_title.xml => my_aggregate_title_list.xml} (85%) rename bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionLine_viewDestination/{my_aggregate_title.xml => my_aggregate_title_list.xml} (85%) diff --git a/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionLine_view.xml b/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionLine_view.xml index 82a8792052..d2bf520274 100644 --- a/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionLine_view.xml +++ b/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionLine_view.xml @@ -90,7 +90,7 @@ <string>my_source_project_title</string> <string>my_source_payment</string> <string>my_payment_mode</string> - <string>my_aggregate_title</string> + <string>my_aggregate_title_list</string> <string>your_analytic_category_list</string> </list> </value> diff --git a/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionLine_view/my_aggregate_title.xml b/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionLine_view/my_aggregate_title_list.xml similarity index 85% rename from bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionLine_view/my_aggregate_title.xml rename to bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionLine_view/my_aggregate_title_list.xml index 57bee4580d..c0d7716cf9 100644 --- a/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionLine_view/my_aggregate_title.xml +++ b/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionLine_view/my_aggregate_title_list.xml @@ -11,7 +11,6 @@ <value> <list> <string>columns</string> - <string>enabled</string> <string>portal_type</string> <string>proxy_listbox_ids</string> <string>title</string> @@ -20,7 +19,7 @@ </item> <item> <key> <string>id</string> </key> - <value> <string>my_aggregate_title</string> </value> + <value> <string>my_aggregate_title_list</string> </value> </item> <item> <key> <string>message_values</string> </key> @@ -60,12 +59,6 @@ <key> <string>columns</string> </key> <value> <string></string> </value> </item> - <item> - <key> <string>enabled</string> </key> - <value> - <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent> - </value> - </item> <item> <key> <string>field_id</string> </key> <value> <string></string> </value> @@ -76,7 +69,9 @@ </item> <item> <key> <string>portal_type</string> </key> - <value> <string></string> </value> + <value> + <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent> + </value> </item> <item> <key> <string>proxy_listbox_ids</string> </key> @@ -116,13 +111,9 @@ </list> </value> </item> - <item> - <key> <string>enabled</string> </key> - <value> <int>1</int> </value> - </item> <item> <key> <string>field_id</string> </key> - <value> <string>my_relation_field</string> </value> + <value> <string>my_multi_relation_field</string> </value> </item> <item> <key> <string>form_id</string> </key> @@ -136,6 +127,10 @@ <string>Payment Transaction Group</string> <string>Payment Transaction Group</string> </tuple> + <tuple> + <string>Bank Reconciliation</string> + <string>Bank Reconciliation</string> + </tuple> </list> </value> </item> @@ -143,10 +138,18 @@ <key> <string>proxy_listbox_ids</string> </key> <value> <list> + <tuple> + <string>Base_viewRelatedObjectListBase/listbox</string> + <string>All</string> + </tuple> <tuple> <string>PaymentTransactionGroupModule_viewPaymentTransactionGroupList/listbox</string> <string>Payment Transaction Groups</string> </tuple> + <tuple> + <string>BankReconciliationModule_viewBankReconciliationList/listbox</string> + <string>Bank Reconciliations</string> + </tuple> </list> </value> </item> @@ -156,7 +159,7 @@ </item> <item> <key> <string>title</string> </key> - <value> <string>Payment Transaction Group</string> </value> + <value> <string>Aggregate</string> </value> </item> </dictionary> </value> @@ -172,7 +175,7 @@ <dictionary> <item> <key> <string>_text</string> </key> - <value> <string>python:here.getSourceValue(portal_type = \'Account\') is not None and here.getSourceValue(portal_type = \'Account\').isMemberOf(\'account_type/asset/cash\') and context.Base_checkPermission(\'payment_transaction_group_module\', \'View\')</string> </value> + <value> <string>python: list(context.getPortalItemTypeList()) + (\'Payment Transaction Group\', )</string> </value> </item> </dictionary> </pickle> diff --git a/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionLine_viewDestination.xml b/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionLine_viewDestination.xml index b25642329f..0b0b44ac31 100644 --- a/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionLine_viewDestination.xml +++ b/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionLine_viewDestination.xml @@ -90,7 +90,7 @@ <string>my_destination_project_title</string> <string>my_destination_payment</string> <string>my_payment_mode</string> - <string>my_aggregate_title</string> + <string>my_aggregate_title_list</string> <string>your_analytic_category_list</string> </list> </value> diff --git a/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionLine_viewDestination/my_aggregate_title.xml b/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionLine_viewDestination/my_aggregate_title_list.xml similarity index 85% rename from bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionLine_viewDestination/my_aggregate_title.xml rename to bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionLine_viewDestination/my_aggregate_title_list.xml index 373b306456..c0d7716cf9 100644 --- a/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionLine_viewDestination/my_aggregate_title.xml +++ b/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionLine_viewDestination/my_aggregate_title_list.xml @@ -11,7 +11,6 @@ <value> <list> <string>columns</string> - <string>enabled</string> <string>portal_type</string> <string>proxy_listbox_ids</string> <string>title</string> @@ -20,7 +19,7 @@ </item> <item> <key> <string>id</string> </key> - <value> <string>my_aggregate_title</string> </value> + <value> <string>my_aggregate_title_list</string> </value> </item> <item> <key> <string>message_values</string> </key> @@ -60,12 +59,6 @@ <key> <string>columns</string> </key> <value> <string></string> </value> </item> - <item> - <key> <string>enabled</string> </key> - <value> - <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent> - </value> - </item> <item> <key> <string>field_id</string> </key> <value> <string></string> </value> @@ -76,7 +69,9 @@ </item> <item> <key> <string>portal_type</string> </key> - <value> <string></string> </value> + <value> + <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent> + </value> </item> <item> <key> <string>proxy_listbox_ids</string> </key> @@ -116,13 +111,9 @@ </list> </value> </item> - <item> - <key> <string>enabled</string> </key> - <value> <int>1</int> </value> - </item> <item> <key> <string>field_id</string> </key> - <value> <string>my_relation_field</string> </value> + <value> <string>my_multi_relation_field</string> </value> </item> <item> <key> <string>form_id</string> </key> @@ -136,6 +127,10 @@ <string>Payment Transaction Group</string> <string>Payment Transaction Group</string> </tuple> + <tuple> + <string>Bank Reconciliation</string> + <string>Bank Reconciliation</string> + </tuple> </list> </value> </item> @@ -143,10 +138,18 @@ <key> <string>proxy_listbox_ids</string> </key> <value> <list> + <tuple> + <string>Base_viewRelatedObjectListBase/listbox</string> + <string>All</string> + </tuple> <tuple> <string>PaymentTransactionGroupModule_viewPaymentTransactionGroupList/listbox</string> <string>Payment Transaction Groups</string> </tuple> + <tuple> + <string>BankReconciliationModule_viewBankReconciliationList/listbox</string> + <string>Bank Reconciliations</string> + </tuple> </list> </value> </item> @@ -156,7 +159,7 @@ </item> <item> <key> <string>title</string> </key> - <value> <string>Payment Transaction Group</string> </value> + <value> <string>Aggregate</string> </value> </item> </dictionary> </value> @@ -172,7 +175,7 @@ <dictionary> <item> <key> <string>_text</string> </key> - <value> <string>python:here.getDestinationValue(portal_type = \'Account\') is not None and here.getDestinationValue(portal_type = \'Account\').isMemberOf(\'account_type/asset/cash\') and context.Base_checkPermission(\'payment_transaction_group_module\', \'View\')</string> </value> + <value> <string>python: list(context.getPortalItemTypeList()) + (\'Payment Transaction Group\', )</string> </value> </item> </dictionary> </pickle> -- 2.30.9