diff --git a/addons/point_of_sale/point_of_sale.py b/addons/point_of_sale/point_of_sale.py index d86d4c3d8ad..1d3d8f55157 100644 --- a/addons/point_of_sale/point_of_sale.py +++ b/addons/point_of_sale/point_of_sale.py @@ -1217,6 +1217,7 @@ class ean_wizard(osv.osv_memory): m = context.get('active_model') m_id = context.get('active_id') self.pool.get(m).write(cr,uid,[m_id],{'ean13':ean13}) + return { 'type' : 'ir.actions.act_window_close' } class product_product(osv.osv): _inherit = 'product.product' diff --git a/addons/point_of_sale/point_of_sale_view.xml b/addons/point_of_sale/point_of_sale_view.xml index 404ac2db759..5df958d1b25 100644 --- a/addons/point_of_sale/point_of_sale_view.xml +++ b/addons/point_of_sale/point_of_sale_view.xml @@ -631,9 +631,9 @@ - + diff --git a/addons/product/product.py b/addons/product/product.py index c7f22bb4ab9..ea2568a3e61 100644 --- a/addons/product/product.py +++ b/addons/product/product.py @@ -67,13 +67,12 @@ def sanitize_ean13(ean13): """Creates and returns a valid ean13 from an invalid one""" if not ean13: return "0000000000000" - ean13 = re.subs("[A-Za-z]","0",ean13); - ean13 = re.subs("[^0-9]","",ean13); + ean13 = re.sub("[A-Za-z]","0",ean13); + ean13 = re.sub("[^0-9]","",ean13); ean13 = ean13[:13] if len(ean13) < 13: ean13 = ean13 + '0' * (13-len(ean13)) - ean13[-1] = openerp.addons.product.product.ean_checksum(ean13) - return ean13 + return ean13[:-1] + str(ean_checksum(ean13)) #---------------------------------------------------------- # UOM