From dadd047d9293f965b96aeb362bc56030bce9ffcd Mon Sep 17 00:00:00 2001 From: Julien Muchembled Date: Wed, 17 Aug 2016 18:52:40 +0200 Subject: [PATCH] amount_generator: refresh "Trade Model" view on deliveries and delivery lines --- .../Invoice%20Line/view_trade_model.xml | 2 +- .../view_trade_model.xml | 2 +- .../view_trade_model.xml | 2 +- .../view_trade_model.xml | 6 +- .../Purchase%20Order/view_trade_model.xml | 6 +- .../Sale%20Order%20Line/view_trade_model.xml | 6 +- .../Sale%20Order/view_trade_model.xml | 6 +- .../Base_getAggregatedAmountList.py | 2 + .../Base_getAggregatedAmountList.xml | 62 +++++ .../erp5_trade/Base_getGeneratedAmountList.py | 2 + ...st.xml => Base_getGeneratedAmountList.xml} | 4 +- ...Base_getSpecialisedAggregatedAmountList.py | 9 - ....xml => Base_viewAggregatedAmountList.xml} | 8 +- .../listbox.xml | 43 ++-- .../listbox_base_application_title_list.xml | 0 .../listbox_base_contribution_title_list.xml | 0 .../listbox_price.xml | 0 .../listbox_quantity.xml | 0 .../listbox_total_price.xml | 0 .../listbox_use_title_list.xml | 0 .../my_title.xml | 0 ...t.xml => Base_viewGeneratedAmountList.xml} | 20 +- .../listbox.xml} | 35 +-- .../listbox.xml | 218 ------------------ .../listbox_base_application_title_list.xml | 90 -------- .../listbox_base_contribution_title_list.xml | 90 -------- .../listbox_price.xml | 90 -------- .../listbox_total_price.xml | 90 -------- .../my_title.xml | 90 -------- 29 files changed, 147 insertions(+), 736 deletions(-) create mode 100644 bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Base_getAggregatedAmountList.py create mode 100644 bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Base_getAggregatedAmountList.xml create mode 100644 bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Base_getGeneratedAmountList.py rename bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/{Base_getSpecialisedAggregatedAmountList.xml => Base_getGeneratedAmountList.xml} (92%) delete mode 100644 bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Base_getSpecialisedAggregatedAmountList.py rename bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/{Delivery_viewAggregatedAmountList.xml => Base_viewAggregatedAmountList.xml} (94%) rename bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/{Delivery_viewAggregatedAmountList => Base_viewAggregatedAmountList}/listbox.xml (86%) rename bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/{DeliveryLine_viewAggregatedAmountList => Base_viewAggregatedAmountList}/listbox_base_application_title_list.xml (100%) rename bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/{DeliveryLine_viewAggregatedAmountList => Base_viewAggregatedAmountList}/listbox_base_contribution_title_list.xml (100%) rename bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/{DeliveryLine_viewAggregatedAmountList => Base_viewAggregatedAmountList}/listbox_price.xml (100%) rename bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/{Delivery_viewAggregatedAmountList => Base_viewAggregatedAmountList}/listbox_quantity.xml (100%) rename bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/{DeliveryLine_viewAggregatedAmountList => Base_viewAggregatedAmountList}/listbox_total_price.xml (100%) rename bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/{Delivery_viewAggregatedAmountList => Base_viewAggregatedAmountList}/listbox_use_title_list.xml (100%) rename bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/{DeliveryLine_viewAggregatedAmountList => Base_viewAggregatedAmountList}/my_title.xml (100%) rename bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/{DeliveryLine_viewAggregatedAmountList.xml => Base_viewGeneratedAmountList.xml} (87%) rename bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/{DeliveryLine_viewAggregatedAmountList/listbox_quantity.xml => Base_viewGeneratedAmountList/listbox.xml} (81%) delete mode 100644 bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/DeliveryLine_viewAggregatedAmountList/listbox.xml delete mode 100644 bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Delivery_viewAggregatedAmountList/listbox_base_application_title_list.xml delete mode 100644 bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Delivery_viewAggregatedAmountList/listbox_base_contribution_title_list.xml delete mode 100644 bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Delivery_viewAggregatedAmountList/listbox_price.xml delete mode 100644 bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Delivery_viewAggregatedAmountList/listbox_total_price.xml delete mode 100644 bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Delivery_viewAggregatedAmountList/my_title.xml diff --git a/bt5/erp5_invoicing/ActionTemplateItem/portal_types/Invoice%20Line/view_trade_model.xml b/bt5/erp5_invoicing/ActionTemplateItem/portal_types/Invoice%20Line/view_trade_model.xml index 8a0f984b51b..310bf5f7a30 100644 --- a/bt5/erp5_invoicing/ActionTemplateItem/portal_types/Invoice%20Line/view_trade_model.xml +++ b/bt5/erp5_invoicing/ActionTemplateItem/portal_types/Invoice%20Line/view_trade_model.xml @@ -71,7 +71,7 @@ text - string:${object_url}/DeliveryLine_viewAggregatedAmountList + string:${object_url}/Base_viewAggregatedAmountList diff --git a/bt5/erp5_simplified_invoicing/ActionTemplateItem/portal_types/Purchase%20Invoice%20Transaction/view_trade_model.xml b/bt5/erp5_simplified_invoicing/ActionTemplateItem/portal_types/Purchase%20Invoice%20Transaction/view_trade_model.xml index d8c5e7d31a9..bfaabb346f4 100644 --- a/bt5/erp5_simplified_invoicing/ActionTemplateItem/portal_types/Purchase%20Invoice%20Transaction/view_trade_model.xml +++ b/bt5/erp5_simplified_invoicing/ActionTemplateItem/portal_types/Purchase%20Invoice%20Transaction/view_trade_model.xml @@ -71,7 +71,7 @@ text - string:${object_url}/Delivery_viewAggregatedAmountList + string:${object_url}/Base_viewAggregatedAmountList diff --git a/bt5/erp5_simplified_invoicing/ActionTemplateItem/portal_types/Sale%20Invoice%20Transaction/view_trade_model.xml b/bt5/erp5_simplified_invoicing/ActionTemplateItem/portal_types/Sale%20Invoice%20Transaction/view_trade_model.xml index d8c5e7d31a9..bfaabb346f4 100644 --- a/bt5/erp5_simplified_invoicing/ActionTemplateItem/portal_types/Sale%20Invoice%20Transaction/view_trade_model.xml +++ b/bt5/erp5_simplified_invoicing/ActionTemplateItem/portal_types/Sale%20Invoice%20Transaction/view_trade_model.xml @@ -71,7 +71,7 @@ text - string:${object_url}/Delivery_viewAggregatedAmountList + string:${object_url}/Base_viewAggregatedAmountList diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Order%20Line/view_trade_model.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Order%20Line/view_trade_model.xml index 8d3f58fb572..d9a10a4110b 100644 --- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Order%20Line/view_trade_model.xml +++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Order%20Line/view_trade_model.xml @@ -30,7 +30,9 @@ description - + + + icon @@ -71,7 +73,7 @@ text - string:${object_url}/DeliveryLine_viewAggregatedAmountList + string:${object_url}/Base_viewAggregatedAmountList diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Order/view_trade_model.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Order/view_trade_model.xml index d8c5e7d31a9..1baf4e6d331 100644 --- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Order/view_trade_model.xml +++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Order/view_trade_model.xml @@ -30,7 +30,9 @@ description - + + + icon @@ -71,7 +73,7 @@ text - string:${object_url}/Delivery_viewAggregatedAmountList + string:${object_url}/Base_viewAggregatedAmountList diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Order%20Line/view_trade_model.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Order%20Line/view_trade_model.xml index 8d3f58fb572..d9a10a4110b 100644 --- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Order%20Line/view_trade_model.xml +++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Order%20Line/view_trade_model.xml @@ -30,7 +30,9 @@ description - + + + icon @@ -71,7 +73,7 @@ text - string:${object_url}/DeliveryLine_viewAggregatedAmountList + string:${object_url}/Base_viewAggregatedAmountList diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Order/view_trade_model.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Order/view_trade_model.xml index d8c5e7d31a9..1baf4e6d331 100644 --- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Order/view_trade_model.xml +++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Order/view_trade_model.xml @@ -30,7 +30,9 @@ description - + + + icon @@ -71,7 +73,7 @@ text - string:${object_url}/Delivery_viewAggregatedAmountList + string:${object_url}/Base_viewAggregatedAmountList diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Base_getAggregatedAmountList.py b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Base_getAggregatedAmountList.py new file mode 100644 index 00000000000..d78f1f0809d --- /dev/null +++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Base_getAggregatedAmountList.py @@ -0,0 +1,2 @@ +return context.getAggregatedAmountList(rounding=rounding, + amount_generator_type_list=amount_generator_type_list) diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Base_getAggregatedAmountList.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Base_getAggregatedAmountList.xml new file mode 100644 index 00000000000..01e8ac6bb55 --- /dev/null +++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Base_getAggregatedAmountList.xml @@ -0,0 +1,62 @@ + + + + + + + + + + Script_magic + 3 + + + _bind_names + + + + + + + + + + _asgns + + + + name_container + container + + + name_context + context + + + name_m_self + script + + + name_subpath + traverse_subpath + + + + + + + + + + + _params + rounding=False, amount_generator_type_list=None, *args, **kw + + + id + Base_getAggregatedAmountList + + + + + diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Base_getGeneratedAmountList.py b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Base_getGeneratedAmountList.py new file mode 100644 index 00000000000..adcb86e5f89 --- /dev/null +++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Base_getGeneratedAmountList.py @@ -0,0 +1,2 @@ +return context.getGeneratedAmountList(rounding=rounding, + amount_generator_type_list=amount_generator_type_list) diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Base_getSpecialisedAggregatedAmountList.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Base_getGeneratedAmountList.xml similarity index 92% rename from bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Base_getSpecialisedAggregatedAmountList.xml rename to bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Base_getGeneratedAmountList.xml index 89eb9822ecf..f35c716d79e 100644 --- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Base_getSpecialisedAggregatedAmountList.xml +++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Base_getGeneratedAmountList.xml @@ -50,11 +50,11 @@ _params - *args, **kwargs + rounding=False, amount_generator_type_list=None, *args, **kw id - Base_getSpecialisedAggregatedAmountList + Base_getGeneratedAmountList diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Base_getSpecialisedAggregatedAmountList.py b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Base_getSpecialisedAggregatedAmountList.py deleted file mode 100644 index 63f751c0b81..00000000000 --- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Base_getSpecialisedAggregatedAmountList.py +++ /dev/null @@ -1,9 +0,0 @@ -specialise = context.getSpecialiseValue(portal_type=('Purchase Trade Condition', - 'Sale Trade Condition', - 'Internal Trade Condition',)) - -if specialise is not None: - rounding = kwargs.get('rounding', False) - return specialise.getAggregatedAmountList(context, rounding=rounding) - -return [] diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Delivery_viewAggregatedAmountList.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Base_viewAggregatedAmountList.xml similarity index 94% rename from bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Delivery_viewAggregatedAmountList.xml rename to bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Base_viewAggregatedAmountList.xml index adcb52578e0..8f9280a28ac 100644 --- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Delivery_viewAggregatedAmountList.xml +++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Base_viewAggregatedAmountList.xml @@ -117,7 +117,7 @@ id - Delivery_viewAggregatedAmountList + Base_viewAggregatedAmountList method @@ -141,7 +141,7 @@ title - Trade Model + Aggregated Amounts unicode_mode @@ -151,6 +151,10 @@ update_action + + update_action_title + + diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Delivery_viewAggregatedAmountList/listbox.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Base_viewAggregatedAmountList/listbox.xml similarity index 86% rename from bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Delivery_viewAggregatedAmountList/listbox.xml rename to bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Base_viewAggregatedAmountList/listbox.xml index c0b51711344..ce57ec5f96a 100644 --- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Delivery_viewAggregatedAmountList/listbox.xml +++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Base_viewAggregatedAmountList/listbox.xml @@ -12,8 +12,8 @@ columns editable_columns + lines list_method - sort title url_columns @@ -57,6 +57,14 @@ tales + + columns + + + + editable_columns + + field_id @@ -65,10 +73,22 @@ form_id + + lines + + + + list_method + + target + + title + + url_columns @@ -92,7 +112,7 @@ resource_title - Model + Resource quantity @@ -157,20 +177,13 @@ Base_viewTradeFieldLibrary - list_method - - AAAAAAAAAAM= - + lines + 0 - sort + list_method - - - float_index - float_index - - + AAAAAAAAAAM= @@ -179,7 +192,7 @@ title - Applied Model Lines + Aggregated Amounts url_columns @@ -214,7 +227,7 @@ method_name - Base_getSpecialisedAggregatedAmountList + Base_getAggregatedAmountList diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/DeliveryLine_viewAggregatedAmountList/listbox_base_application_title_list.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Base_viewAggregatedAmountList/listbox_base_application_title_list.xml similarity index 100% rename from bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/DeliveryLine_viewAggregatedAmountList/listbox_base_application_title_list.xml rename to bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Base_viewAggregatedAmountList/listbox_base_application_title_list.xml diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/DeliveryLine_viewAggregatedAmountList/listbox_base_contribution_title_list.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Base_viewAggregatedAmountList/listbox_base_contribution_title_list.xml similarity index 100% rename from bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/DeliveryLine_viewAggregatedAmountList/listbox_base_contribution_title_list.xml rename to bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Base_viewAggregatedAmountList/listbox_base_contribution_title_list.xml diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/DeliveryLine_viewAggregatedAmountList/listbox_price.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Base_viewAggregatedAmountList/listbox_price.xml similarity index 100% rename from bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/DeliveryLine_viewAggregatedAmountList/listbox_price.xml rename to bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Base_viewAggregatedAmountList/listbox_price.xml diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Delivery_viewAggregatedAmountList/listbox_quantity.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Base_viewAggregatedAmountList/listbox_quantity.xml similarity index 100% rename from bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Delivery_viewAggregatedAmountList/listbox_quantity.xml rename to bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Base_viewAggregatedAmountList/listbox_quantity.xml diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/DeliveryLine_viewAggregatedAmountList/listbox_total_price.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Base_viewAggregatedAmountList/listbox_total_price.xml similarity index 100% rename from bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/DeliveryLine_viewAggregatedAmountList/listbox_total_price.xml rename to bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Base_viewAggregatedAmountList/listbox_total_price.xml diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Delivery_viewAggregatedAmountList/listbox_use_title_list.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Base_viewAggregatedAmountList/listbox_use_title_list.xml similarity index 100% rename from bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Delivery_viewAggregatedAmountList/listbox_use_title_list.xml rename to bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Base_viewAggregatedAmountList/listbox_use_title_list.xml diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/DeliveryLine_viewAggregatedAmountList/my_title.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Base_viewAggregatedAmountList/my_title.xml similarity index 100% rename from bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/DeliveryLine_viewAggregatedAmountList/my_title.xml rename to bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Base_viewAggregatedAmountList/my_title.xml diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/DeliveryLine_viewAggregatedAmountList.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Base_viewGeneratedAmountList.xml similarity index 87% rename from bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/DeliveryLine_viewAggregatedAmountList.xml rename to bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Base_viewGeneratedAmountList.xml index 509a15af51a..b97af1eb908 100644 --- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/DeliveryLine_viewAggregatedAmountList.xml +++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Base_viewGeneratedAmountList.xml @@ -82,21 +82,13 @@ center - - my_title - + hidden - - listbox_price - listbox_total_price - listbox_base_application_title_list - listbox_quantity - listbox_base_contribution_title_list - + @@ -116,7 +108,7 @@ id - DeliveryLine_viewAggregatedAmountList + Base_viewGeneratedAmountList method @@ -140,7 +132,7 @@ title - Trade Model + Generated Amounts unicode_mode @@ -150,6 +142,10 @@ update_action + + update_action_title + + diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/DeliveryLine_viewAggregatedAmountList/listbox_quantity.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Base_viewGeneratedAmountList/listbox.xml similarity index 81% rename from bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/DeliveryLine_viewAggregatedAmountList/listbox_quantity.xml rename to bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Base_viewGeneratedAmountList/listbox.xml index a4743100e19..33789677eb6 100644 --- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/DeliveryLine_viewAggregatedAmountList/listbox_quantity.xml +++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Base_viewGeneratedAmountList/listbox.xml @@ -10,13 +10,14 @@ delegated_list - display_width + list_method + title id - listbox_quantity + listbox message_values @@ -52,12 +53,6 @@ tales - - display_width - - AAAAAAAAAAI= - - field_id @@ -77,22 +72,28 @@ values - - display_width - 20 - field_id - my_view_mode_listbox_read_only_quantity + listbox form_id - Base_viewTradeFieldLibrary + Base_viewAggregatedAmountList + + + list_method + + AAAAAAAAAAI= + target Click to edit the target + + title + Generated Amounts + @@ -101,13 +102,13 @@ - + - _text - python: preferences.getPreference(\'preferred_money_quantity_field_width\', 10) + method_name + Base_getGeneratedAmountList diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/DeliveryLine_viewAggregatedAmountList/listbox.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/DeliveryLine_viewAggregatedAmountList/listbox.xml deleted file mode 100644 index 00a2cb90f0d..00000000000 --- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/DeliveryLine_viewAggregatedAmountList/listbox.xml +++ /dev/null @@ -1,218 +0,0 @@ - - - - - - - - - - delegated_list - - - columns - editable_columns - list_method - sort - title - url_columns - - - - - id - listbox - - - message_values - - - - external_validator_failed - The input failed the external validator. - - - - - - overrides - - - - field_id - - - - form_id - - - - target - - - - - - - tales - - - - field_id - - - - form_id - - - - target - - - - url_columns - - AAAAAAAAAAI= - - - - - - - values - - - - columns - - - - reference - Reference - - - resource_title - Model - - - quantity - Base - - - price - Ratio - - - total_price - Amount - - - base_contribution_title_list - Base Contribution - - - base_application_title_list - Base Application - - - - - - editable_columns - - - - quantity - Base - - - price - Ratio - - - total_price - Amount - - - base_application_title_list - Base Application - - - base_contribution_title_list - Base Contribution - - - - - - field_id - my_view_mode_listbox - - - form_id - Base_viewTradeFieldLibrary - - - list_method - - AAAAAAAAAAM= - - - - sort - - - - float_index - float_index - - - - - - target - Click to edit the target - - - title - Applied Model Lines - - - url_columns - - - - - - - - - - - - - - - - - - _text - python:[(x[0], None) for x in field.get_orig_value(\'columns\')] - - - - - - - - - - - - method_name - Base_getSpecialisedAggregatedAmountList - - - - - diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Delivery_viewAggregatedAmountList/listbox_base_application_title_list.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Delivery_viewAggregatedAmountList/listbox_base_application_title_list.xml deleted file mode 100644 index f7d2ec030b7..00000000000 --- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Delivery_viewAggregatedAmountList/listbox_base_application_title_list.xml +++ /dev/null @@ -1,90 +0,0 @@ - - - - - - - - - - delegated_list - - - - - - id - listbox_base_application_title_list - - - message_values - - - - external_validator_failed - The input failed the external validator. - - - - - - overrides - - - - field_id - - - - form_id - - - - target - - - - - - - tales - - - - field_id - - - - form_id - - - - target - - - - - - - values - - - - field_id - my_view_mode_listbox_base_application_title_list - - - form_id - Base_viewTradeFieldLibrary - - - target - Click to edit the target - - - - - - - - diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Delivery_viewAggregatedAmountList/listbox_base_contribution_title_list.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Delivery_viewAggregatedAmountList/listbox_base_contribution_title_list.xml deleted file mode 100644 index 225c87ceeb8..00000000000 --- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Delivery_viewAggregatedAmountList/listbox_base_contribution_title_list.xml +++ /dev/null @@ -1,90 +0,0 @@ - - - - - - - - - - delegated_list - - - - - - id - listbox_base_contribution_title_list - - - message_values - - - - external_validator_failed - The input failed the external validator. - - - - - - overrides - - - - field_id - - - - form_id - - - - target - - - - - - - tales - - - - field_id - - - - form_id - - - - target - - - - - - - values - - - - field_id - my_view_mode_listbox_base_contribution_title_list - - - form_id - Base_viewTradeFieldLibrary - - - target - Click to edit the target - - - - - - - - diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Delivery_viewAggregatedAmountList/listbox_price.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Delivery_viewAggregatedAmountList/listbox_price.xml deleted file mode 100644 index 58f701a6105..00000000000 --- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Delivery_viewAggregatedAmountList/listbox_price.xml +++ /dev/null @@ -1,90 +0,0 @@ - - - - - - - - - - delegated_list - - - - - - id - listbox_price - - - message_values - - - - external_validator_failed - The input failed the external validator. - - - - - - overrides - - - - field_id - - - - form_id - - - - target - - - - - - - tales - - - - field_id - - - - form_id - - - - target - - - - - - - values - - - - field_id - my_view_mode_listbox_read_only_price - - - form_id - Base_viewTradeFieldLibrary - - - target - Click to edit the target - - - - - - - - diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Delivery_viewAggregatedAmountList/listbox_total_price.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Delivery_viewAggregatedAmountList/listbox_total_price.xml deleted file mode 100644 index f2296dd2c65..00000000000 --- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Delivery_viewAggregatedAmountList/listbox_total_price.xml +++ /dev/null @@ -1,90 +0,0 @@ - - - - - - - - - - delegated_list - - - - - - id - listbox_total_price - - - message_values - - - - external_validator_failed - The input failed the external validator. - - - - - - overrides - - - - field_id - - - - form_id - - - - target - - - - - - - tales - - - - field_id - - - - form_id - - - - target - - - - - - - values - - - - field_id - my_view_mode_listbox_total_price - - - form_id - Base_viewTradeFieldLibrary - - - target - Click to edit the target - - - - - - - - diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Delivery_viewAggregatedAmountList/my_title.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Delivery_viewAggregatedAmountList/my_title.xml deleted file mode 100644 index dcbf555a262..00000000000 --- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Delivery_viewAggregatedAmountList/my_title.xml +++ /dev/null @@ -1,90 +0,0 @@ - - - - - - - - - - delegated_list - - - - - - id - my_title - - - message_values - - - - external_validator_failed - The input failed the external validator. - - - - - - overrides - - - - field_id - - - - form_id - - - - target - - - - - - - tales - - - - field_id - - - - form_id - - - - target - - - - - - - values - - - - field_id - my_view_mode_read_only_title - - - form_id - Base_viewTradeFieldLibrary - - - target - Click to edit the target - - - - - - - - -- 2.30.9