From a47d2d88d028d5a959650c9c8f62809340179fda Mon Sep 17 00:00:00 2001 From: Adrien Dieudonne Date: Wed, 19 Jul 2017 15:21:59 +0200 Subject: [PATCH] [FIX] *: wrong `color_field` attribute for m2m_tags This fix previous commit a29f7f671b. (1) Some objects have no color field. (2) There was an issue when two many2many tags were instantiated: If the first one had the 'color_field' attribute the second one had it too even if this attribute weren't specified. Now, it's fixed in data_manager --- addons/account/views/account_invoice_view.xml | 4 ++-- addons/account/views/account_view.xml | 8 +++---- addons/account/views/product_view.xml | 4 ++-- .../views/account_voucher_views.xml | 4 ++-- addons/delivery/views/delivery_view.xml | 4 ++-- addons/hr_expense/views/hr_expense_views.xml | 4 ++-- .../mass_mailing/views/mass_mailing_views.xml | 2 +- addons/membership/views/product_views.xml | 2 +- addons/mrp/views/mrp_bom_views.xml | 2 +- addons/mrp_repair/views/mrp_repair_views.xml | 8 +++---- addons/point_of_sale/views/pos_order_view.xml | 8 +++---- addons/purchase/views/purchase_views.xml | 6 ++--- addons/sale/views/sale_views.xml | 4 ++-- addons/stock/views/product_views.xml | 2 +- .../static/src/js/services/data_manager.js | 2 +- .../tests/fields/relational_fields_tests.js | 22 ++++++++++++++----- .../views/res_partner_views.xml | 2 +- 17 files changed, 50 insertions(+), 38 deletions(-) diff --git a/addons/account/views/account_invoice_view.xml b/addons/account/views/account_invoice_view.xml index d22030ce7c4..2160872d84a 100644 --- a/addons/account/views/account_invoice_view.xml +++ b/addons/account/views/account_invoice_view.xml @@ -273,7 +273,7 @@ - @@ -409,7 +409,7 @@ - diff --git a/addons/account/views/account_view.xml b/addons/account/views/account_view.xml index 8a23e35a578..134ce6f5e04 100644 --- a/addons/account/views/account_view.xml +++ b/addons/account/views/account_view.xml @@ -261,8 +261,8 @@
Keep empty for no control
- - + +
@@ -1892,8 +1892,8 @@ - - + + diff --git a/addons/account/views/product_view.xml b/addons/account/views/product_view.xml index 6543d318260..5dc56426ed3 100644 --- a/addons/account/views/product_view.xml +++ b/addons/account/views/product_view.xml @@ -14,13 +14,13 @@ - + - +
diff --git a/addons/account_voucher/views/account_voucher_views.xml b/addons/account_voucher/views/account_voucher_views.xml index ea279a24be2..ced7d16a4ef 100644 --- a/addons/account_voucher/views/account_voucher_views.xml +++ b/addons/account_voucher/views/account_voucher_views.xml @@ -253,7 +253,7 @@ - + @@ -369,7 +369,7 @@ - + diff --git a/addons/delivery/views/delivery_view.xml b/addons/delivery/views/delivery_view.xml index 2bc610a97e8..0148319cb26 100644 --- a/addons/delivery/views/delivery_view.xml +++ b/addons/delivery/views/delivery_view.xml @@ -107,8 +107,8 @@ - - + + diff --git a/addons/hr_expense/views/hr_expense_views.xml b/addons/hr_expense/views/hr_expense_views.xml index 7ede7d1efb7..baa339238a2 100644 --- a/addons/hr_expense/views/hr_expense_views.xml +++ b/addons/hr_expense/views/hr_expense_views.xml @@ -299,7 +299,7 @@ - + @@ -464,7 +464,7 @@