diff --git a/addons/product/__openerp__.py b/addons/product/__openerp__.py index fdadda2e4d4..c1799918b1b 100644 --- a/addons/product/__openerp__.py +++ b/addons/product/__openerp__.py @@ -67,5 +67,6 @@ Print product labels with barcode. 'installable': True, 'auto_install': False, 'images': ['images/product_uom.jpeg','images/product_pricelists.jpeg','images/products_categories.jpeg', 'images/products_form.jpeg'], + 'css': ['static/css/product.css'] } # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/product/product.py b/addons/product/product.py index ff67f5d5cc6..d807c1f916d 100644 --- a/addons/product/product.py +++ b/addons/product/product.py @@ -148,14 +148,14 @@ class product_uom(osv.osv): _sql_constraints = [ ('factor_gt_zero', 'CHECK (factor!=0)', 'The conversion ratio for a unit of measure cannot be 0!') ] - + def onchange_category_id(self, cr, uid, ids, category_id): - reference_uom = False - if category_id: - uom_ids = self.search(cr, uid, [('category_id', '=',category_id),('uom_type', '=', 'reference')]) - if uom_ids: - reference_uom = uom_ids[0] - return {'value':{'reference_uom_id': reference_uom}} + reference_uom = False + if category_id: + uom_ids = self.search(cr, uid, [('category_id', '=',category_id),('uom_type', '=', 'reference')]) + if uom_ids: + reference_uom = uom_ids[0] + return {'value':{'reference_uom_id': reference_uom}} def _compute_qty(self, cr, uid, from_uom_id, qty, to_uom_id=False): if not from_uom_id or not qty or not to_uom_id: diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml index e517fed6061..3672e6a6e68 100644 --- a/addons/product/product_view.xml +++ b/addons/product/product_view.xml @@ -468,7 +468,7 @@