From b747b05fa64e5fb2fc19b5e3cf726bca9e539950 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= Date: Mon, 18 Jul 2016 13:48:46 +0200 Subject: [PATCH] [REF] product, template: remove unused is_product_variant computed field, probably from old implementation --- addons/hr_expense/views/hr_expense_views.xml | 1 - addons/product/models/product.py | 4 ---- addons/product/models/product_template.py | 7 ------- addons/product/views/product_template_views.xml | 1 - addons/product/views/product_views.xml | 1 - 5 files changed, 14 deletions(-) diff --git a/addons/hr_expense/views/hr_expense_views.xml b/addons/hr_expense/views/hr_expense_views.xml index 80eb63eac85..b9a907ebfa3 100644 --- a/addons/hr_expense/views/hr_expense_views.xml +++ b/addons/hr_expense/views/hr_expense_views.xml @@ -285,7 +285,6 @@
-
diff --git a/addons/product/models/product.py b/addons/product/models/product.py index 02eb87c4c02..6508f785603 100644 --- a/addons/product/models/product.py +++ b/addons/product/models/product.py @@ -238,9 +238,6 @@ class product_product(osv.osv): res[p.id] = (data['code'] and ('['+data['code']+'] ') or '') + (data['name'] or '') return res - def _is_product_variant_impl(self, cr, uid, ids, name, arg, context=None): - return dict.fromkeys(ids, True) - def _get_image_variant(self, cr, uid, ids, name, args, context=None): result = dict.fromkeys(ids, False) for obj in self.browse(cr, uid, ids, context=context): @@ -317,7 +314,6 @@ class product_product(osv.osv): 'product_tmpl_id': fields.many2one('product.template', 'Product Template', required=True, ondelete="cascade", select=True, auto_join=True), 'barcode': fields.char('Barcode', help="International Article Number used for product identification.", oldname='ean13', copy=False), 'attribute_value_ids': fields.many2many('product.attribute.value', id1='prod_id', id2='att_id', string='Attributes', ondelete='restrict'), - 'is_product_variant': fields.function( _is_product_variant_impl, type='boolean', string='Is a product variant'), # image: all image fields are base64 encoded and PIL-supported 'image_variant': fields.binary("Variant Image", attachment=True, help="This field holds the image used as image for the product variant, limited to 1024x1024px."), diff --git a/addons/product/models/product_template.py b/addons/product/models/product_template.py index f3f17b575ee..6b54b141bfb 100644 --- a/addons/product/models/product_template.py +++ b/addons/product/models/product_template.py @@ -23,12 +23,6 @@ class product_template(osv.osv): _description = "Product Template" _order = "name" - def _is_product_variant(self, cr, uid, ids, name, arg, context=None): - return self._is_product_variant_impl(cr, uid, ids, name, arg, context=context) - - def _is_product_variant_impl(self, cr, uid, ids, name, arg, context=None): - return dict.fromkeys(ids, False) - def _product_template_price(self, cr, uid, ids, name, arg, context=None): plobj = self.pool.get('product.pricelist') res = {} @@ -164,7 +158,6 @@ class product_template(osv.osv): 'active': fields.boolean('Active', help="If unchecked, it will allow you to hide the product without removing it."), 'color': fields.integer('Color Index'), - 'is_product_variant': fields.function(_is_product_variant, type='boolean', string='Is a product variant'), 'attribute_line_ids': fields.one2many('product.attribute.line', 'product_tmpl_id', 'Product Attributes'), 'product_variant_ids': fields.one2many('product.product', 'product_tmpl_id', 'Products', required=True), diff --git a/addons/product/views/product_template_views.xml b/addons/product/views/product_template_views.xml index 0a4cf4e6161..956b9c30b82 100644 --- a/addons/product/views/product_template_views.xml +++ b/addons/product/views/product_template_views.xml @@ -66,7 +66,6 @@ - diff --git a/addons/product/views/product_views.xml b/addons/product/views/product_views.xml index 263dbcaf4d6..f2280b78077 100644 --- a/addons/product/views/product_views.xml +++ b/addons/product/views/product_views.xml @@ -15,7 +15,6 @@ groups="product.group_product_variant"/> -