From dbdc9eb5d81040efe24bcb937aafb7bbd343fccf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ra=C3=BAl=20Mart=C3=ADn?= <raul.martin@braintec-group.com>
Date: Fri, 20 Oct 2017 13:31:57 +0200
Subject: [PATCH] =?UTF-8?q?Revert=20"Revert=20"Fixing=20some=20errors=20so?=
 =?UTF-8?q?=20that=20base=5Fcustom=5Fattributes=20and=20product=5Fcustom?=
 =?UTF-8?q?=5F=E2=80=A6""?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 base_custom_attributes/__openerp__.py                         | 2 +-
 product_custom_attributes/__openerp__.py                      | 2 +-
 product_custom_attributes/product.py                          | 2 +-
 product_custom_attributes/product_view.xml                    | 4 ++--
 .../wizard/open_product_by_attribute_set.py                   | 3 +--
 5 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/base_custom_attributes/__openerp__.py b/base_custom_attributes/__openerp__.py
index 06e6c59f424a..da77c81ec0aa 100644
--- a/base_custom_attributes/__openerp__.py
+++ b/base_custom_attributes/__openerp__.py
@@ -38,7 +38,7 @@
            'custom_attributes_view.xml',
     ],
     'demo_xml': [],
-    'installable': False,
+    'installable': True,
     'active': False,
     'external_dependencies' : {
         'python' : ['unidecode'],
diff --git a/product_custom_attributes/__openerp__.py b/product_custom_attributes/__openerp__.py
index e3f2591530ea..240ca7a796e2 100644
--- a/product_custom_attributes/__openerp__.py
+++ b/product_custom_attributes/__openerp__.py
@@ -41,7 +41,7 @@
            'wizard/open_product_by_attribute_set.xml',
     ],
     'demo_xml': [],
-    'installable': False,
+    'installable': True,
     'active': False,
 }
 
diff --git a/product_custom_attributes/product.py b/product_custom_attributes/product.py
index 3a705254cbdc..61a2e95a642d 100644
--- a/product_custom_attributes/product.py
+++ b/product_custom_attributes/product.py
@@ -23,7 +23,7 @@
 from openerp.osv import fields
 from openerp.osv.osv import except_osv
 from openerp.osv.orm import setup_modifiers
-from tools.translate import translate
+from openerp.tools.translate import translate
 from lxml import etree
 
 class product_template(Model):
diff --git a/product_custom_attributes/product_view.xml b/product_custom_attributes/product_view.xml
index 919df907bb79..7726cffbe0e6 100644
--- a/product_custom_attributes/product_view.xml
+++ b/product_custom_attributes/product_view.xml
@@ -12,9 +12,9 @@
         <record model="ir.ui.view" id="product_product_form_view_set_button">
             <field name="name">attributes.product.normal.form</field>
             <field name="model">product.product</field>
-            <field name="inherit_id" ref="product.product_normal_form_view" />
+            <field name="inherit_id" ref="product.product_template_only_form_view" />
             <field name="arch" type="xml">
-                <xpath expr="/form/sheet/notebook/page[@string='Information']/group/group/field[@name='variants']/.." position="after">
+                <xpath expr="//page[@name='variants']//field[@name='attribute_line_ids']" position="after">
                     <group name="attribute_fields">
                         <field name="attribute_set_id" />
                         <button name="open_attributes" string="Open Attributes" type="object" icon="gtk-ok" attrs="{'invisible':[('attribute_set_id', '=', False)]}"/>
diff --git a/product_custom_attributes/wizard/open_product_by_attribute_set.py b/product_custom_attributes/wizard/open_product_by_attribute_set.py
index db74afc549c5..d91665febb0c 100644
--- a/product_custom_attributes/wizard/open_product_by_attribute_set.py
+++ b/product_custom_attributes/wizard/open_product_by_attribute_set.py
@@ -21,8 +21,7 @@
 ###############################################################################
 
 from openerp.osv.orm import TransientModel
-from osv import fields
-
+from openerp.osv import fields
 
 class open_product_by_attribute_set(TransientModel):
     _name = 'open.product.by.attribute.set'