From 7efe3bb2d809888cbc6c7e0f51a96a0ba4f7e4b1 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@odoo.com>
Date: Thu, 31 Jul 2014 17:21:26 +0200
Subject: [PATCH] [FIX] point_of_sale: On product form : push on button 'Set a
 Custom Ean' on tab information raise an exception => Use a record action and
 clean python files

---
 addons/point_of_sale/point_of_sale.py       | 12 ------------
 addons/point_of_sale/point_of_sale_view.xml |  9 ++++++++-
 addons/point_of_sale/res_partner.py         | 12 ------------
 addons/point_of_sale/res_partner_view.xml   |  2 +-
 addons/point_of_sale/res_users.py           | 12 ------------
 addons/point_of_sale/res_users_view.xml     |  2 +-
 6 files changed, 10 insertions(+), 39 deletions(-)

diff --git a/addons/point_of_sale/point_of_sale.py b/addons/point_of_sale/point_of_sale.py
index c8cf81d062c..7ba4bb98180 100644
--- a/addons/point_of_sale/point_of_sale.py
+++ b/addons/point_of_sale/point_of_sale.py
@@ -1379,16 +1379,4 @@ class product_template(osv.osv):
         'available_in_pos': True,
     }
 
-    def edit_ean(self, cr, uid, ids, context):
-        return {
-            'name': _("Assign a Custom EAN"),
-            'type': 'ir.actions.act_window',
-            'view_type': 'form',
-            'view_mode': 'form',
-            'res_model': 'pos.ean_wizard',
-            'target' : 'new',
-            'view_id': False,
-            'context':context,
-        }
-
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/point_of_sale/point_of_sale_view.xml b/addons/point_of_sale/point_of_sale_view.xml
index 559fff5d7fc..7f43484603e 100644
--- a/addons/point_of_sale/point_of_sale_view.xml
+++ b/addons/point_of_sale/point_of_sale_view.xml
@@ -523,6 +523,13 @@
         <menuitem action="product_pos_category_action" id="menu_product_pos_category" parent="menu_point_of_sale_product" sequence="0" />
         <!-- END -->
 
+        <record id="action_edit_ean" model="ir.actions.act_window">
+            <field name="name">Edit Ean</field>
+            <field name="res_model">pos.ean_wizard</field>
+            <field name="target">new</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+        </record>
 
         <record id="product_template_form_view" model="ir.ui.view">
             <field name="name">product.template.form.inherit</field>
@@ -539,7 +546,7 @@
                     </group>
                 </group>
                 <field name="ean13" position="after">
-                    <button colspan="2" name="edit_ean" type="object" string="Set a Custom EAN" class="oe_link oe_edit_only"/>
+                    <button colspan="2" name="%(action_edit_ean)d" type="action" string="Set a Custom EAN" class="oe_link oe_edit_only"/>
                 </field>
             </field>
         </record>
diff --git a/addons/point_of_sale/res_partner.py b/addons/point_of_sale/res_partner.py
index d7969b0e21a..87ca525005b 100644
--- a/addons/point_of_sale/res_partner.py
+++ b/addons/point_of_sale/res_partner.py
@@ -18,18 +18,6 @@ class res_users(osv.osv):
             for user in self.browse(cr, uid, ids, context=context)
         )
 
-    def edit_ean(self, cr, uid, ids, context):
-        return {
-            'name': "Edit Ean",
-            'type': 'ir.actions.act_window',
-            'view_type': 'form',
-            'view_mode': 'form',
-            'res_model': 'pos.ean_wizard',
-            'target' : 'new',
-            'view_id': False,
-            'context':context,
-        }
-
     _constraints = [
         (_check_ean, "Error: Invalid ean code", ['ean13'],),
     ]
diff --git a/addons/point_of_sale/res_partner_view.xml b/addons/point_of_sale/res_partner_view.xml
index 4bd433adf28..f1aeccabf5b 100644
--- a/addons/point_of_sale/res_partner_view.xml
+++ b/addons/point_of_sale/res_partner_view.xml
@@ -11,7 +11,7 @@
                     <page string="Point of Sale"> 
                         <group>
                             <field name="ean13" />
-                            <button name="edit_ean" type="object" string="Edit" />
+                            <button name="%(action_edit_ean)d" type="action" string="Set a Custom EAN" />
                         </group>
                     </page>
                 </notebook>
diff --git a/addons/point_of_sale/res_users.py b/addons/point_of_sale/res_users.py
index ed2c6fae598..9198e33e1e9 100644
--- a/addons/point_of_sale/res_users.py
+++ b/addons/point_of_sale/res_users.py
@@ -19,18 +19,6 @@ class res_users(osv.osv):
             for user in self.browse(cr, uid, ids, context=context)
         )
 
-    def edit_ean(self, cr, uid, ids, context):
-        return {
-            'name': "Edit EAN",
-            'type': 'ir.actions.act_window',
-            'view_type': 'form',
-            'view_mode': 'form',
-            'res_model': 'pos.ean_wizard',
-            'target' : 'new',
-            'view_id': False,
-            'context':context,
-        }
-
     _constraints = [
         (_check_ean, "Error: Invalid ean code", ['ean13'],),
     ]
diff --git a/addons/point_of_sale/res_users_view.xml b/addons/point_of_sale/res_users_view.xml
index 11d37324ec9..03f3c986c2c 100644
--- a/addons/point_of_sale/res_users_view.xml
+++ b/addons/point_of_sale/res_users_view.xml
@@ -23,7 +23,7 @@
                     <group>
                         <field name="pos_config" />
                         <field name="ean13" />
-                        <button name="edit_ean" type="object" string="Edit EAN" class="oe_edit_only" />
+                        <button name="%(action_edit_ean)d" type="action" string="Set a Custom EAN" class="oe_edit_only" />
                     </group>
                 </page>
             </notebook>