Skip to content

erp5
erp5
Commit 6c15445f authored by Jérome Perrin's avatar Jérome Perrin
Browse files
Options

accounting: show all aggregates on the line 

not only payment transaction group
parent c18908ef
Show whitespace changes
Inline Side-by-side
Showing with 40 additions and 34 deletions
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionLine_view.xml
View file @ 6c15445f
...@@ -90,7 +90,7 @@ ...@@ -90,7 +90,7 @@
<string>my_source_project_title</string> <string>my_source_project_title</string>
<string>my_source_payment</string> <string>my_source_payment</string>
<string>my_payment_mode</string> <string>my_payment_mode</string>
<string>my_aggregate_title</string> <string>my_aggregate_title_list</string>
<string>your_analytic_category_list</string> <string>your_analytic_category_list</string>
</list> </list>
</value> </value>
......
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionLine_view/my_aggregate_title.xml → bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionLine_view/my_aggregate_title_list.xml
View file @ 6c15445f
...@@ -11,7 +11,6 @@ ...@@ -11,7 +11,6 @@
<value> <value>
<list> <list>
<string>columns</string> <string>columns</string>
<string>enabled</string>
<string>portal_type</string> <string>portal_type</string>
<string>proxy_listbox_ids</string> <string>proxy_listbox_ids</string>
<string>title</string> <string>title</string>
...@@ -20,7 +19,7 @@ ...@@ -20,7 +19,7 @@
</item> </item>
<item> <item>
<key> <string>id</string> </key> <key> <string>id</string> </key>
<value> <string>my_aggregate_title</string> </value> <value> <string>my_aggregate_title_list</string> </value>
</item> </item>
<item> <item>
<key> <string>message_values</string> </key> <key> <string>message_values</string> </key>
...@@ -60,12 +59,6 @@ ...@@ -60,12 +59,6 @@
<key> <string>columns</string> </key> <key> <string>columns</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
</item> </item>
<item>
<key> <string>enabled</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value>
</item>
<item> <item>
<key> <string>field_id</string> </key> <key> <string>field_id</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
...@@ -76,7 +69,9 @@ ...@@ -76,7 +69,9 @@
</item> </item>
<item> <item>
<key> <string>portal_type</string> </key> <key> <string>portal_type</string> </key>
<value> <string></string> </value> <value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value>
</item> </item>
<item> <item>
<key> <string>proxy_listbox_ids</string> </key> <key> <string>proxy_listbox_ids</string> </key>
...@@ -116,13 +111,9 @@ ...@@ -116,13 +111,9 @@
</list> </list>
</value> </value>
</item> </item>
<item>
<key> <string>enabled</string> </key>
<value> <int>1</int> </value>
</item>
<item> <item>
<key> <string>field_id</string> </key> <key> <string>field_id</string> </key>
<value> <string>my_relation_field</string> </value> <value> <string>my_multi_relation_field</string> </value>
</item> </item>
<item> <item>
<key> <string>form_id</string> </key> <key> <string>form_id</string> </key>
...@@ -136,6 +127,10 @@ ...@@ -136,6 +127,10 @@
<string>Payment Transaction Group</string> <string>Payment Transaction Group</string>
<string>Payment Transaction Group</string> <string>Payment Transaction Group</string>
</tuple> </tuple>
<tuple>
<string>Bank Reconciliation</string>
<string>Bank Reconciliation</string>
</tuple>
</list> </list>
</value> </value>
</item> </item>
...@@ -143,10 +138,18 @@ ...@@ -143,10 +138,18 @@
<key> <string>proxy_listbox_ids</string> </key> <key> <string>proxy_listbox_ids</string> </key>
<value> <value>
<list> <list>
<tuple>
<string>Base_viewRelatedObjectListBase/listbox</string>
<string>All</string>
</tuple>
<tuple> <tuple>
<string>PaymentTransactionGroupModule_viewPaymentTransactionGroupList/listbox</string> <string>PaymentTransactionGroupModule_viewPaymentTransactionGroupList/listbox</string>
<string>Payment Transaction Groups</string> <string>Payment Transaction Groups</string>
</tuple> </tuple>
<tuple>
<string>BankReconciliationModule_viewBankReconciliationList/listbox</string>
<string>Bank Reconciliations</string>
</tuple>
</list> </list>
</value> </value>
</item> </item>
...@@ -156,7 +159,7 @@ ...@@ -156,7 +159,7 @@
</item> </item>
<item> <item>
<key> <string>title</string> </key> <key> <string>title</string> </key>
<value> <string>Payment Transaction Group</string> </value> <value> <string>Aggregate</string> </value>
</item> </item>
</dictionary> </dictionary>
</value> </value>
...@@ -172,7 +175,7 @@ ...@@ -172,7 +175,7 @@
<dictionary> <dictionary>
<item> <item>
<key> <string>_text</string> </key> <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> </item>
</dictionary> </dictionary>
</pickle> </pickle>
......
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionLine_viewDestination.xml
View file @ 6c15445f
...@@ -90,7 +90,7 @@ ...@@ -90,7 +90,7 @@
<string>my_destination_project_title</string> <string>my_destination_project_title</string>
<string>my_destination_payment</string> <string>my_destination_payment</string>
<string>my_payment_mode</string> <string>my_payment_mode</string>
<string>my_aggregate_title</string> <string>my_aggregate_title_list</string>
<string>your_analytic_category_list</string> <string>your_analytic_category_list</string>
</list> </list>
</value> </value>
......
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionLine_viewDestination/my_aggregate_title.xml → bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionLine_viewDestination/my_aggregate_title_list.xml
View file @ 6c15445f
...@@ -11,7 +11,6 @@ ...@@ -11,7 +11,6 @@
<value> <value>
<list> <list>
<string>columns</string> <string>columns</string>
<string>enabled</string>
<string>portal_type</string> <string>portal_type</string>
<string>proxy_listbox_ids</string> <string>proxy_listbox_ids</string>
<string>title</string> <string>title</string>
...@@ -20,7 +19,7 @@ ...@@ -20,7 +19,7 @@
</item> </item>
<item> <item>
<key> <string>id</string> </key> <key> <string>id</string> </key>
<value> <string>my_aggregate_title</string> </value> <value> <string>my_aggregate_title_list</string> </value>
</item> </item>
<item> <item>
<key> <string>message_values</string> </key> <key> <string>message_values</string> </key>
...@@ -60,12 +59,6 @@ ...@@ -60,12 +59,6 @@
<key> <string>columns</string> </key> <key> <string>columns</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
</item> </item>
<item>
<key> <string>enabled</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value>
</item>
<item> <item>
<key> <string>field_id</string> </key> <key> <string>field_id</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
...@@ -76,7 +69,9 @@ ...@@ -76,7 +69,9 @@
</item> </item>
<item> <item>
<key> <string>portal_type</string> </key> <key> <string>portal_type</string> </key>
<value> <string></string> </value> <value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value>
</item> </item>
<item> <item>
<key> <string>proxy_listbox_ids</string> </key> <key> <string>proxy_listbox_ids</string> </key>
...@@ -116,13 +111,9 @@ ...@@ -116,13 +111,9 @@
</list> </list>
</value> </value>
</item> </item>
<item>
<key> <string>enabled</string> </key>
<value> <int>1</int> </value>
</item>
<item> <item>
<key> <string>field_id</string> </key> <key> <string>field_id</string> </key>
<value> <string>my_relation_field</string> </value> <value> <string>my_multi_relation_field</string> </value>
</item> </item>
<item> <item>
<key> <string>form_id</string> </key> <key> <string>form_id</string> </key>
...@@ -136,6 +127,10 @@ ...@@ -136,6 +127,10 @@
<string>Payment Transaction Group</string> <string>Payment Transaction Group</string>
<string>Payment Transaction Group</string> <string>Payment Transaction Group</string>
</tuple> </tuple>
<tuple>
<string>Bank Reconciliation</string>
<string>Bank Reconciliation</string>
</tuple>
</list> </list>
</value> </value>
</item> </item>
...@@ -143,10 +138,18 @@ ...@@ -143,10 +138,18 @@
<key> <string>proxy_listbox_ids</string> </key> <key> <string>proxy_listbox_ids</string> </key>
<value> <value>
<list> <list>
<tuple>
<string>Base_viewRelatedObjectListBase/listbox</string>
<string>All</string>
</tuple>
<tuple> <tuple>
<string>PaymentTransactionGroupModule_viewPaymentTransactionGroupList/listbox</string> <string>PaymentTransactionGroupModule_viewPaymentTransactionGroupList/listbox</string>
<string>Payment Transaction Groups</string> <string>Payment Transaction Groups</string>
</tuple> </tuple>
<tuple>
<string>BankReconciliationModule_viewBankReconciliationList/listbox</string>
<string>Bank Reconciliations</string>
</tuple>
</list> </list>
</value> </value>
</item> </item>
...@@ -156,7 +159,7 @@ ...@@ -156,7 +159,7 @@
</item> </item>
<item> <item>
<key> <string>title</string> </key> <key> <string>title</string> </key>
<value> <string>Payment Transaction Group</string> </value> <value> <string>Aggregate</string> </value>
</item> </item>
</dictionary> </dictionary>
</value> </value>
...@@ -172,7 +175,7 @@ ...@@ -172,7 +175,7 @@
<dictionary> <dictionary>
<item> <item>
<key> <string>_text</string> </key> <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> </item>
</dictionary> </dictionary>
</pickle> </pickle>
......
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