[FIX] version_modules: possibility to change product version selectin…

…g other value in version value lines (#92)
avanzosc · May 25, 2021 · 458bd4a · 458bd4a
1 parent c1ec9ec
commit 458bd4a
Show file tree

Hide file tree

Showing 15 changed files with 28 additions and 458 deletions.
diff --git a/mrp_production_custom_variants_inherited_attributes/__manifest__.py b/mrp_production_custom_variants_inherited_attributes/__manifest__.py
@@ -2,7 +2,7 @@
 # License AGPL-3 - See http://www.gnu.org/licenses/agpl-3.0.html
 {
     "name": "Production inherited attributes",
-    "version": "12.0.1.0.2",
+    "version": "12.0.1.0.3",
     "license": "AGPL-3",
     "depends": [
         "mrp_hook", "mrp_scheduled_products", "product_variant_custom",

diff --git a/mrp_production_custom_variants_inherited_attributes/models/mrp_production.py b/mrp_production_custom_variants_inherited_attributes/models/mrp_production.py
@@ -23,13 +23,11 @@ class MrpProduction(models.Model):
         related=False, states={'draft': [('readonly', False)]})
     product_version_id = fields.Many2one(comodel_name="product.version",
                                          name="Product Version")
-    version_value_ids = fields.One2many(
-        comodel_name="product.version.line",
-        related="product_version_id.custom_value_ids")
     custom_value_ids = fields.One2many(
         comodel_name="production.product.version.custom.line",
         string="Custom Values",
-        inverse_name="line_id", copy=True)
+        inverse_name="line_id", copy=True, readonly=True,
+        states={'draft': [('readonly', False)]},)
     product_attribute_ids = fields.One2many(
         comodel_name='mrp.production.attribute', inverse_name='mrp_production',
         string='Product attributes', copy=True, readonly=True,
@@ -120,8 +118,8 @@ def _set_custom_lines(self):
     def product_version_id_change(self):
         if self.product_version_id:
             self.product_id = self.product_version_id.product_id
-        self.custom_value_ids = self._delete_custom_lines()
-        self.custom_value_ids = self._set_custom_lines()
+            self.custom_value_ids = self._delete_custom_lines()
+            self.custom_value_ids = self._set_custom_lines()
 
     @api.multi
     def _onchange_bom_id(self):
@@ -409,9 +407,6 @@ class MrpProductionProductLine(models.Model):
         copy=True)
     product_version_id = fields.Many2one(comodel_name="product.version",
                                          name="Product Version")
-    version_value_ids = fields.One2many(
-        comodel_name="product.version.line",
-        related="product_version_id.custom_value_ids")
     custom_value_ids = fields.One2many(
         comodel_name="mrp.production.product.version.custom.line",
         string="Custom Values",

diff --git a/mrp_production_custom_variants_inherited_attributes/models/mrp_production.py.bak b/mrp_production_custom_variants_inherited_attributes/models/mrp_production.py.bak
diff --git a/mrp_production_custom_variants_inherited_attributes/views/mrp_production_view.xml b/mrp_production_custom_variants_inherited_attributes/views/mrp_production_view.xml
@@ -22,11 +22,8 @@
                                 <field name="possible_value_ids" invisible="1" />
                             </tree>
                         </field>
-                     <field name="version_value_ids" context="{'show_attribute': False}"
-                           attrs="{'invisible': [('product_version_id','=',False)], 'readonly': 1}"/>
                     <!--<field name="possible_attribute_ids" invisible="1"/>-->
-                    <field name="custom_value_ids" context="{'show_attribute': False}"
-                           attrs="{'invisible': [('product_version_id','!=',False)]}">
+                    <field name="custom_value_ids" context="{'show_attribute': False}">
                         <tree string="Product Version Line" editable="bottom" create="false">
                             <!--<field name="attribute_id" domain="[('id', 'in', parent.possible_attribute_ids[0][2])]"/>-->
                             <field name="attribute_id"/>
@@ -55,6 +52,9 @@
                 <field name="product_id" position="attributes">
                     <attribute name="string">Product Variants</attribute>
                 </field>
+                <field name="product_id" position="after">
+                    <field name="product_version_id" />
+                </field>
             </field>
         </record>
 
@@ -123,11 +123,8 @@
                                 <field name="possible_value_ids" invisible="1" />
                             </tree>
                         </field>
-                     <field name="version_value_ids" context="{'show_attribute': False}"
-                           attrs="{'invisible': [('product_version_id','=',False)], 'readonly': 1}"/>
                     <!--<field name="possible_attribute_ids" invisible="1"/>-->
-                    <field name="custom_value_ids" context="{'show_attribute': False}"
-                           attrs="{'invisible': [('product_version_id','!=',False)]}">
+                    <field name="custom_value_ids" context="{'show_attribute': False}">
                         <tree string="Product Version Line" editable="bottom" create="false">
                             <!--<field name="attribute_id" domain="[('id', 'in', parent.possible_attribute_ids[0][2])]"/>-->
                             <field name="attribute_id"/>

diff --git a/product_variant_custom/i18n/es.po b/product_variant_custom/i18n/es.po
@@ -66,7 +66,7 @@ msgstr "El valor personalizado es mayor que el máximo permitido para este valor
 #: code:addons/product_variant_custom/models/product_version.py:70
 #, python-format
 msgid "Custom value is smaller than minimum allowed for this value"
-msgstr "El valor personalizado es menor que el máximo permitido para este valor"
+msgstr "El valor personalizado es menor que el mínimo permitido para este valor"
 
 #. module: product_variant_custom
 #: model:ir.model.fields,field_description:product_variant_custom.field_product_version__partner_id

diff --git a/product_variant_custom_purchase/__manifest__.py b/product_variant_custom_purchase/__manifest__.py
@@ -2,7 +2,7 @@
 # License AGPL-3 - See http://www.gnu.org/licenses/agpl-3.0.html
 {
     "name": "Purchase Product Version",
-    "version": "12.0.1.0.2",
+    "version": "12.0.1.0.3",
     "license": "AGPL-3",
     "depends": [
         "purchase", "product_variant_custom",

diff --git a/product_variant_custom_purchase/models/purchase.py b/product_variant_custom_purchase/models/purchase.py
@@ -50,12 +50,10 @@ class PurchaseOrderLine(models.Model):
         inverse_name='purchase_line_id',
         string='Product attributes', copy=True, readonly=True,
         states={'draft': [('readonly', False)], 'sent': [('readonly', False)]})
-    version_value_ids = fields.One2many(
-        comodel_name="product.version.line",
-        related="product_version_id.custom_value_ids")
     custom_value_ids = fields.One2many(
         comodel_name="purchase.version.custom.line", string="Custom Values",
-        inverse_name="line_id", copy=True)
+        inverse_name="line_id", copy=True, readonly=True,
+        states={'draft': [('readonly', False)], 'sent': [('readonly', False)]})
     state = fields.Selection(default='draft')
 
     def _delete_product_attribute_ids(self):
@@ -154,9 +152,9 @@ def _get_purchase_line_description(self):
     def product_version_id_change(self):
         if self.product_version_id:
             self.product_id = self.product_version_id.product_id
-            self.name = self._get_purchase_line_description()
-        self.custom_value_ids = self._delete_custom_lines()
-        self.custom_value_ids = self._set_custom_lines()
+            self.custom_value_ids = self._delete_custom_lines()
+            self.custom_value_ids = self._set_custom_lines()
+        self.name = self._get_purchase_line_description()
 
     @api.onchange('custom_value_ids')
     def onchange_version_lines(self):

diff --git a/product_variant_custom_purchase/views/purchase_order_view.xml b/product_variant_custom_purchase/views/purchase_order_view.xml
@@ -20,11 +20,8 @@
                         </tree>
                     </field>
                     <field name="product_version_id" domain="[('product_id','=',product_id)]"/>
-                    <field name="version_value_ids" context="{'show_attribute': False}"
-                           attrs="{'invisible': [('product_version_id','=',False)], 'readonly': 1}"/>
                     <!--<field name="possible_attribute_ids" invisible="1"/>-->
-                    <field name="custom_value_ids" context="{'show_attribute': False}"
-                           attrs="{'invisible': [('product_version_id','!=',False)]}">
+                    <field name="custom_value_ids" context="{'show_attribute': False}">
                         <tree string="Product Version Line" editable="bottom" create="false">
                             <!--<field name="attribute_id" domain="[('id', 'in', parent.possible_attribute_ids[0][2])]"/>-->
                             <field name="attribute_id"/>

diff --git a/product_variant_custom_sale/__manifest__.py b/product_variant_custom_sale/__manifest__.py
@@ -2,7 +2,7 @@
 # License AGPL-3 - See http://www.gnu.org/licenses/agpl-3.0.html
 {
     "name": "Sale Product Version",
-    "version": "12.0.1.0.4",
+    "version": "12.0.1.0.5",
     "license": "AGPL-3",
     "depends": [
         "sale",

diff --git a/product_variant_custom_sale/models/sale.py b/product_variant_custom_sale/models/sale.py
@@ -51,12 +51,10 @@ class SaleOrderLine(models.Model):
         comodel_name='sale.line.attribute', inverse_name='sale_line_id',
         string='Product attributes', copy=True, readonly=True,
         states={'draft': [('readonly', False)], 'sent': [('readonly', False)]})
-    version_value_ids = fields.One2many(
-        comodel_name="product.version.line",
-        related="product_version_id.custom_value_ids")
     custom_value_ids = fields.One2many(
         comodel_name="sale.version.custom.line", string="Custom Values",
-        inverse_name="line_id", copy=True)
+        inverse_name="line_id", copy=True, readonly=True,
+        states={'draft': [('readonly', False)], 'sent': [('readonly', False)]})
     # possible_attribute_ids = fields.Many2many(
     #     comodel_name="product.attribute",
     #     compute="_compute_possible_attribute_ids")
@@ -247,8 +245,8 @@ def product_version_id_change(self):
         if self.product_version_id:
             self.product_id = self.product_version_id.product_id
             self.name = self._get_sale_line_description()
-        self.custom_value_ids = self._delete_custom_lines()
-        self.custom_value_ids = self._set_custom_lines()
+            self.custom_value_ids = self._delete_custom_lines()
+            self.custom_value_ids = self._set_custom_lines()
         self.name = self._get_sale_line_description()
 
     @api.onchange('custom_value_ids')

diff --git a/product_variant_custom_sale/views/sale_order_view.xml b/product_variant_custom_sale/views/sale_order_view.xml
@@ -44,14 +44,9 @@
                     </field>
                     <field name="product_version_id"
                                domain="[('product_id','=',product_id)]"/>
-                    <label for="version_value_ids" attrs="{'invisible': [('product_version_id','=',False)]}" colspan="2" />
-                    <field name="version_value_ids" context="{'show_attribute': False}"
-                           attrs="{'invisible': [('product_version_id','=',False)], 'readonly': 1}"
-                           nolabel="1" colspan="2"/>
                     <!--<field name="possible_attribute_ids" invisible="1"/>-->
-                    <label for="custom_value_ids" attrs="{'invisible': [('product_version_id','!=',False)]}" colspan="2" />
-                    <field name="custom_value_ids" context="{'show_attribute': False}"
-                           attrs="{'invisible': [('product_version_id','!=',False)]}" nolabel="1" colspan="2">
+                    <label for="custom_value_ids" colspan="2" />
+                    <field name="custom_value_ids" context="{'show_attribute': False}" nolabel="1" colspan="2">
                         <tree string="Product Version Line" editable="bottom"
                               create="false">
                             <!--<field name="attribute_id" domain="[('id', 'in', parent.possible_attribute_ids[0][2])]"/>-->

diff --git a/product_variant_custom_stock/__manifest__.py b/product_variant_custom_stock/__manifest__.py
@@ -2,7 +2,7 @@
 # License AGPL-3 - See http://www.gnu.org/licenses/agpl-3.0.html
 {
     "name": "Stock Product Version Stock",
-    "version": "12.0.1.0.1",
+    "version": "12.0.1.0.2",
     "license": "AGPL-3",
     "depends": [
         "product_variant_custom",

diff --git a/product_variant_custom_stock/models/stock_production_lot.py b/product_variant_custom_stock/models/stock_production_lot.py
@@ -8,9 +8,6 @@ class StockMove(models.Model):
 
     product_version_id = fields.Many2one(comodel_name="product.version",
                                          name="Product Version")
-    version_value_ids = fields.One2many(
-        comodel_name="product.version.line",
-        related="product_version_id.custom_value_ids")
     custom_value_ids = fields.One2many(
         comodel_name="lot.version.custom.line", string="Custom Values",
         inverse_name="line_id", copy=True)

diff --git a/product_variant_custom_stock/views/stock_production_lot_view.xml b/product_variant_custom_stock/views/stock_production_lot_view.xml
@@ -9,11 +9,8 @@
                 <xpath expr="//field[@name='product_id']"
                        position="after">
                     <field name="product_version_id" domain="[('product_id','=',product_id)]"/>
-                    <field name="version_value_ids"
-                           attrs="{'invisible': [('product_version_id','=',False)], 'readonly': 1}"/>
                     <!--<field name="possible_attribute_ids" invisible="1"/>-->
-                    <field name="custom_value_ids"
-                           attrs="{'invisible': [('product_version_id','!=',False)]}">
+                    <field name="custom_value_ids">
                         <tree string="Product Version Line" editable="bottom" create="false">
                             <!--<field name="attribute_id" domain="[('id', 'in', parent.possible_attribute_ids[0][2])]"/>-->
                             <field name="attribute_id"/>

diff --git a/product_variant_custom_stock/views/stock_view.xml b/product_variant_custom_stock/views/stock_view.xml
@@ -9,11 +9,8 @@
                 <xpath expr="//field[@name='product_id']"
                        position="after">
                     <field name="product_version_id" domain="[('product_id','=',product_id)]"/>
-                    <field name="version_value_ids"
-                           attrs="{'invisible': [('product_version_id','=',False)], 'readonly': 1}"/>
                     <!--<field name="possible_attribute_ids" invisible="1"/>-->
-                    <field name="custom_value_ids"
-                           attrs="{'invisible': [('product_version_id','!=',False)]}">
+                    <field name="custom_value_ids">
                         <tree string="Product Version Line" editable="bottom" create="false">
                             <!--<field name="attribute_id" domain="[('id', 'in', parent.possible_attribute_ids[0][2])]"/>-->
                             <field name="attribute_id"/>