[wip] point_of_sale: ean template last fixes

bzr revid: fva@openerp.com-20120725125115-dnvslwyo6m6q0xw7

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'

addons/point_of_sale/point_of_sale_view.xml

@@ -631,9 +631,9 @@
                         <field name="expense_pdt"/>
                     </group>
                 </group>
-                <!-- <field name="ean13" position="after">
+                <field name="ean13" position="after">
                     <button name="add_ean13" type="object" string="Edit" />
-                </field> -->
+                </field>
             </field>
         </record>
 

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