diff --git a/modules/price/price.py b/modules/price/price.py index 2ff92f6..ac764d0 100755 --- a/modules/price/price.py +++ b/modules/price/price.py @@ -44,7 +44,7 @@ class Price( price_composite = fields.One2Many('price.composite','price',"Composites") price_product = fields.One2Many('price.product', 'price', "Product") price_ct_size = fields.Numeric("Ct size") - + def get_qt(self,nb_ct,unit): Uom = Pool().get('product.uom') return round(Decimal(Uom.compute_qty(self.price_unit, float(self.price_ct_size * nb_ct), unit)),4) @@ -136,3 +136,20 @@ class Product(ModelSQL,ModelView): __name__ = 'price.product' price = fields.Many2One('price.price',"Price index") product = fields.Many2One('product.product',"Product") + attribute = fields.Many2One('product.attribute',"Attribute",domain=[ + ('sets', '=', Eval('attribute_set')), + ], + states={ + 'readonly': ~Eval('attribute_set'), + }, + depends=['product', 'attribute_set']) + attribute_set = fields.Function( + fields.Many2One('product.attribute.set', "Attribute Set"), + 'on_change_with_attribute_set' + ) + + @fields.depends('product') + def on_change_with_attribute_set(self, name=None): + if self.product and self.product.template and self.product.template.attribute_set: + return self.product.template.attribute_set.id + diff --git a/modules/price/view/product_tree_sequence.xml b/modules/price/view/product_tree_sequence.xml index c95e6ca..ce13a5a 100755 --- a/modules/price/view/product_tree_sequence.xml +++ b/modules/price/view/product_tree_sequence.xml @@ -1,4 +1,5 @@ +