From f519499af60ae35ab10f270b795e587ff78a0238 Mon Sep 17 00:00:00 2001 From: Georgios Dagkakis <georgios.dagkakis@nexedi.com> Date: Thu, 12 Jan 2017 12:49:31 +0000 Subject: [PATCH] erp5_payment_mean: rename PythonScripts Methods used in PaymentTransactionGroup_view Always returned Accounting Transaction Lines (there is no Payment Transaction Line portal type) that were sub-objects of Payment Transactions. But now they can be also sub-objects of Accounting Transactions. So used '...AccountingTransactionLine...' instead of '...PaymentTransactionLine...' --- ...aymentTransactionGroup_countAccountingTransactionLine.py | 2 ++ ...mentTransactionGroup_countAccountingTransactionLine.xml} | 2 +- .../PaymentTransactionGroup_countPaymentTransactionLine.py | 2 -- ...actionGroup_getAccountingTransactionLineCountAndStat.py} | 0 ...ctionGroup_getAccountingTransactionLineCountAndStat.xml} | 2 +- ...entTransactionGroup_getAccountingTransactionLineList.py} | 0 ...ntTransactionGroup_getAccountingTransactionLineList.xml} | 2 +- ...entTransactionGroup_statAccountingTransactionLineList.py | 3 +++ ...tTransactionGroup_statAccountingTransactionLineList.xml} | 2 +- ...aymentTransactionGroup_statPaymentTransactionLineList.py | 3 --- .../PaymentTransactionGroup_view/listbox.xml | 6 +++--- 11 files changed, 12 insertions(+), 12 deletions(-) create mode 100644 bt5/erp5_payment_mean/SkinTemplateItem/portal_skins/erp5_payment_mean/PaymentTransactionGroup_countAccountingTransactionLine.py rename bt5/erp5_payment_mean/SkinTemplateItem/portal_skins/erp5_payment_mean/{PaymentTransactionGroup_getPaymentTransactionLineList.xml => PaymentTransactionGroup_countAccountingTransactionLine.xml} (95%) delete mode 100644 bt5/erp5_payment_mean/SkinTemplateItem/portal_skins/erp5_payment_mean/PaymentTransactionGroup_countPaymentTransactionLine.py rename bt5/erp5_payment_mean/SkinTemplateItem/portal_skins/erp5_payment_mean/{PaymentTransactionGroup_getPaymentTransactionLineCountAndStat.py => PaymentTransactionGroup_getAccountingTransactionLineCountAndStat.py} (100%) rename bt5/erp5_payment_mean/SkinTemplateItem/portal_skins/erp5_payment_mean/{PaymentTransactionGroup_getPaymentTransactionLineCountAndStat.xml => PaymentTransactionGroup_getAccountingTransactionLineCountAndStat.xml} (95%) rename bt5/erp5_payment_mean/SkinTemplateItem/portal_skins/erp5_payment_mean/{PaymentTransactionGroup_getPaymentTransactionLineList.py => PaymentTransactionGroup_getAccountingTransactionLineList.py} (100%) rename bt5/erp5_payment_mean/SkinTemplateItem/portal_skins/erp5_payment_mean/{PaymentTransactionGroup_countPaymentTransactionLine.xml => PaymentTransactionGroup_getAccountingTransactionLineList.xml} (95%) create mode 100644 bt5/erp5_payment_mean/SkinTemplateItem/portal_skins/erp5_payment_mean/PaymentTransactionGroup_statAccountingTransactionLineList.py rename bt5/erp5_payment_mean/SkinTemplateItem/portal_skins/erp5_payment_mean/{PaymentTransactionGroup_statPaymentTransactionLineList.xml => PaymentTransactionGroup_statAccountingTransactionLineList.xml} (95%) delete mode 100644 bt5/erp5_payment_mean/SkinTemplateItem/portal_skins/erp5_payment_mean/PaymentTransactionGroup_statPaymentTransactionLineList.py diff --git a/bt5/erp5_payment_mean/SkinTemplateItem/portal_skins/erp5_payment_mean/PaymentTransactionGroup_countAccountingTransactionLine.py b/bt5/erp5_payment_mean/SkinTemplateItem/portal_skins/erp5_payment_mean/PaymentTransactionGroup_countAccountingTransactionLine.py new file mode 100644 index 0000000000..48becee3ca --- /dev/null +++ b/bt5/erp5_payment_mean/SkinTemplateItem/portal_skins/erp5_payment_mean/PaymentTransactionGroup_countAccountingTransactionLine.py @@ -0,0 +1,2 @@ +count, _ = context.PaymentTransactionGroup_getAccountingTransactionLineCountAndStat(kw.get('selection_name')) +return ((count, ), ) diff --git a/bt5/erp5_payment_mean/SkinTemplateItem/portal_skins/erp5_payment_mean/PaymentTransactionGroup_getPaymentTransactionLineList.xml b/bt5/erp5_payment_mean/SkinTemplateItem/portal_skins/erp5_payment_mean/PaymentTransactionGroup_countAccountingTransactionLine.xml similarity index 95% rename from bt5/erp5_payment_mean/SkinTemplateItem/portal_skins/erp5_payment_mean/PaymentTransactionGroup_getPaymentTransactionLineList.xml rename to bt5/erp5_payment_mean/SkinTemplateItem/portal_skins/erp5_payment_mean/PaymentTransactionGroup_countAccountingTransactionLine.xml index 6a423e158b..da34f2925d 100644 --- a/bt5/erp5_payment_mean/SkinTemplateItem/portal_skins/erp5_payment_mean/PaymentTransactionGroup_getPaymentTransactionLineList.xml +++ b/bt5/erp5_payment_mean/SkinTemplateItem/portal_skins/erp5_payment_mean/PaymentTransactionGroup_countAccountingTransactionLine.xml @@ -54,7 +54,7 @@ </item> <item> <key> <string>id</string> </key> - <value> <string>PaymentTransactionGroup_getPaymentTransactionLineList</string> </value> + <value> <string>PaymentTransactionGroup_countAccountingTransactionLine</string> </value> </item> </dictionary> </pickle> diff --git a/bt5/erp5_payment_mean/SkinTemplateItem/portal_skins/erp5_payment_mean/PaymentTransactionGroup_countPaymentTransactionLine.py b/bt5/erp5_payment_mean/SkinTemplateItem/portal_skins/erp5_payment_mean/PaymentTransactionGroup_countPaymentTransactionLine.py deleted file mode 100644 index b614b19fdd..0000000000 --- a/bt5/erp5_payment_mean/SkinTemplateItem/portal_skins/erp5_payment_mean/PaymentTransactionGroup_countPaymentTransactionLine.py +++ /dev/null @@ -1,2 +0,0 @@ -count, _ = context.PaymentTransactionGroup_getPaymentTransactionLineCountAndStat(kw.get('selection_name')) -return ((count, ), ) diff --git a/bt5/erp5_payment_mean/SkinTemplateItem/portal_skins/erp5_payment_mean/PaymentTransactionGroup_getPaymentTransactionLineCountAndStat.py b/bt5/erp5_payment_mean/SkinTemplateItem/portal_skins/erp5_payment_mean/PaymentTransactionGroup_getAccountingTransactionLineCountAndStat.py similarity index 100% rename from bt5/erp5_payment_mean/SkinTemplateItem/portal_skins/erp5_payment_mean/PaymentTransactionGroup_getPaymentTransactionLineCountAndStat.py rename to bt5/erp5_payment_mean/SkinTemplateItem/portal_skins/erp5_payment_mean/PaymentTransactionGroup_getAccountingTransactionLineCountAndStat.py diff --git a/bt5/erp5_payment_mean/SkinTemplateItem/portal_skins/erp5_payment_mean/PaymentTransactionGroup_getPaymentTransactionLineCountAndStat.xml b/bt5/erp5_payment_mean/SkinTemplateItem/portal_skins/erp5_payment_mean/PaymentTransactionGroup_getAccountingTransactionLineCountAndStat.xml similarity index 95% rename from bt5/erp5_payment_mean/SkinTemplateItem/portal_skins/erp5_payment_mean/PaymentTransactionGroup_getPaymentTransactionLineCountAndStat.xml rename to bt5/erp5_payment_mean/SkinTemplateItem/portal_skins/erp5_payment_mean/PaymentTransactionGroup_getAccountingTransactionLineCountAndStat.xml index 44618527f0..1da080215a 100644 --- a/bt5/erp5_payment_mean/SkinTemplateItem/portal_skins/erp5_payment_mean/PaymentTransactionGroup_getPaymentTransactionLineCountAndStat.xml +++ b/bt5/erp5_payment_mean/SkinTemplateItem/portal_skins/erp5_payment_mean/PaymentTransactionGroup_getAccountingTransactionLineCountAndStat.xml @@ -54,7 +54,7 @@ </item> <item> <key> <string>id</string> </key> - <value> <string>PaymentTransactionGroup_getPaymentTransactionLineCountAndStat</string> </value> + <value> <string>PaymentTransactionGroup_getAccountingTransactionLineCountAndStat</string> </value> </item> </dictionary> </pickle> diff --git a/bt5/erp5_payment_mean/SkinTemplateItem/portal_skins/erp5_payment_mean/PaymentTransactionGroup_getPaymentTransactionLineList.py b/bt5/erp5_payment_mean/SkinTemplateItem/portal_skins/erp5_payment_mean/PaymentTransactionGroup_getAccountingTransactionLineList.py similarity index 100% rename from bt5/erp5_payment_mean/SkinTemplateItem/portal_skins/erp5_payment_mean/PaymentTransactionGroup_getPaymentTransactionLineList.py rename to bt5/erp5_payment_mean/SkinTemplateItem/portal_skins/erp5_payment_mean/PaymentTransactionGroup_getAccountingTransactionLineList.py diff --git a/bt5/erp5_payment_mean/SkinTemplateItem/portal_skins/erp5_payment_mean/PaymentTransactionGroup_countPaymentTransactionLine.xml b/bt5/erp5_payment_mean/SkinTemplateItem/portal_skins/erp5_payment_mean/PaymentTransactionGroup_getAccountingTransactionLineList.xml similarity index 95% rename from bt5/erp5_payment_mean/SkinTemplateItem/portal_skins/erp5_payment_mean/PaymentTransactionGroup_countPaymentTransactionLine.xml rename to bt5/erp5_payment_mean/SkinTemplateItem/portal_skins/erp5_payment_mean/PaymentTransactionGroup_getAccountingTransactionLineList.xml index d4305d8136..8e077c54e9 100644 --- a/bt5/erp5_payment_mean/SkinTemplateItem/portal_skins/erp5_payment_mean/PaymentTransactionGroup_countPaymentTransactionLine.xml +++ b/bt5/erp5_payment_mean/SkinTemplateItem/portal_skins/erp5_payment_mean/PaymentTransactionGroup_getAccountingTransactionLineList.xml @@ -54,7 +54,7 @@ </item> <item> <key> <string>id</string> </key> - <value> <string>PaymentTransactionGroup_countPaymentTransactionLine</string> </value> + <value> <string>PaymentTransactionGroup_getAccountingTransactionLineList</string> </value> </item> </dictionary> </pickle> diff --git a/bt5/erp5_payment_mean/SkinTemplateItem/portal_skins/erp5_payment_mean/PaymentTransactionGroup_statAccountingTransactionLineList.py b/bt5/erp5_payment_mean/SkinTemplateItem/portal_skins/erp5_payment_mean/PaymentTransactionGroup_statAccountingTransactionLineList.py new file mode 100644 index 0000000000..47e05554a7 --- /dev/null +++ b/bt5/erp5_payment_mean/SkinTemplateItem/portal_skins/erp5_payment_mean/PaymentTransactionGroup_statAccountingTransactionLineList.py @@ -0,0 +1,3 @@ +from Products.PythonScripts.standard import Object +_, total_quantity = context.PaymentTransactionGroup_getAccountingTransactionLineCountAndStat(kw.get('selection_name')) +return Object(total_quantity=total_quantity), diff --git a/bt5/erp5_payment_mean/SkinTemplateItem/portal_skins/erp5_payment_mean/PaymentTransactionGroup_statPaymentTransactionLineList.xml b/bt5/erp5_payment_mean/SkinTemplateItem/portal_skins/erp5_payment_mean/PaymentTransactionGroup_statAccountingTransactionLineList.xml similarity index 95% rename from bt5/erp5_payment_mean/SkinTemplateItem/portal_skins/erp5_payment_mean/PaymentTransactionGroup_statPaymentTransactionLineList.xml rename to bt5/erp5_payment_mean/SkinTemplateItem/portal_skins/erp5_payment_mean/PaymentTransactionGroup_statAccountingTransactionLineList.xml index 6658cf72fa..475b44a367 100644 --- a/bt5/erp5_payment_mean/SkinTemplateItem/portal_skins/erp5_payment_mean/PaymentTransactionGroup_statPaymentTransactionLineList.xml +++ b/bt5/erp5_payment_mean/SkinTemplateItem/portal_skins/erp5_payment_mean/PaymentTransactionGroup_statAccountingTransactionLineList.xml @@ -54,7 +54,7 @@ </item> <item> <key> <string>id</string> </key> - <value> <string>PaymentTransactionGroup_statPaymentTransactionLineList</string> </value> + <value> <string>PaymentTransactionGroup_statAccountingTransactionLineList</string> </value> </item> </dictionary> </pickle> diff --git a/bt5/erp5_payment_mean/SkinTemplateItem/portal_skins/erp5_payment_mean/PaymentTransactionGroup_statPaymentTransactionLineList.py b/bt5/erp5_payment_mean/SkinTemplateItem/portal_skins/erp5_payment_mean/PaymentTransactionGroup_statPaymentTransactionLineList.py deleted file mode 100644 index 9a1c534b19..0000000000 --- a/bt5/erp5_payment_mean/SkinTemplateItem/portal_skins/erp5_payment_mean/PaymentTransactionGroup_statPaymentTransactionLineList.py +++ /dev/null @@ -1,3 +0,0 @@ -from Products.PythonScripts.standard import Object -_, total_quantity = context.PaymentTransactionGroup_getPaymentTransactionLineCountAndStat(kw.get('selection_name')) -return Object(total_quantity=total_quantity), diff --git a/bt5/erp5_payment_mean/SkinTemplateItem/portal_skins/erp5_payment_mean/PaymentTransactionGroup_view/listbox.xml b/bt5/erp5_payment_mean/SkinTemplateItem/portal_skins/erp5_payment_mean/PaymentTransactionGroup_view/listbox.xml index c935560a09..b609b343db 100644 --- a/bt5/erp5_payment_mean/SkinTemplateItem/portal_skins/erp5_payment_mean/PaymentTransactionGroup_view/listbox.xml +++ b/bt5/erp5_payment_mean/SkinTemplateItem/portal_skins/erp5_payment_mean/PaymentTransactionGroup_view/listbox.xml @@ -208,7 +208,7 @@ <dictionary> <item> <key> <string>method_name</string> </key> - <value> <string>PaymentTransactionGroup_countPaymentTransactionLine</string> </value> + <value> <string>PaymentTransactionGroup_countAccountingTransactionLine</string> </value> </item> </dictionary> </pickle> @@ -221,7 +221,7 @@ <dictionary> <item> <key> <string>method_name</string> </key> - <value> <string>PaymentTransactionGroup_getPaymentTransactionLineList</string> </value> + <value> <string>PaymentTransactionGroup_getAccountingTransactionLineList</string> </value> </item> </dictionary> </pickle> @@ -234,7 +234,7 @@ <dictionary> <item> <key> <string>method_name</string> </key> - <value> <string>PaymentTransactionGroup_statPaymentTransactionLineList</string> </value> + <value> <string>PaymentTransactionGroup_statAccountingTransactionLineList</string> </value> </item> </dictionary> </pickle> -- 2.30.9