From 51fa6f018e09730d76122f7eb763d912e73d64e6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20BEAU?= <sebastien.beau@akretion.com>
Date: Wed, 4 Oct 2017 15:59:06 +0200
Subject: [PATCH] [REF] refactor code, attribute improvement view should be all
 in attribute_view instead of 2 modules

---
 attribute_usability/view.xml                  | 39 +++++++++++++++-
 product_variant_usability/__openerp__.py      |  2 +-
 .../views/product_attribute_view.xml          | 44 -------------------
 3 files changed, 39 insertions(+), 46 deletions(-)
 delete mode 100644 product_variant_usability/views/product_attribute_view.xml

diff --git a/attribute_usability/view.xml b/attribute_usability/view.xml
index 2687459..ab02f5f 100644
--- a/attribute_usability/view.xml
+++ b/attribute_usability/view.xml
@@ -7,8 +7,45 @@
         <field name="view_mode">tree,form</field>
     </record>
 
+    <record id="product_attribute_view_form" model="ir.ui.view">
+        <field name="model">product.attribute</field>
+        <field name="arch" type="xml">
+            <form string="Product Attribute">
+                <sheet>
+                    <div class="oe_title" style="width: 390px;">
+                        <label class="oe_edit_only" for="name" string="Product Name"/>
+                        <h1><field name="name" class="oe_inline"/></h1>
+                    </div>
+                    <group>
+                        <field name="value_ids" colspan="4" nolabel="1"
+                               context="{'hide_attribute_id': True}"/>
+                    </group>
+                </sheet>
+            </form>
+        </field>
+    </record>
+
+    <record id="attribute_tree_view" model="ir.ui.view">
+        <field name="model">product.attribute</field>
+        <field name="inherit_id" ref="product.attribute_tree_view"/>
+        <field name="arch" type="xml">
+            <xpath expr="//tree" position="attributes">
+                <attribute name="editable"></attribute>
+            </xpath>
+        </field>
+    </record>
+
+    <record id="variants_tree_view" model="ir.ui.view">
+        <field name="model">product.attribute.value</field>
+        <field name="inherit_id" ref="product.variants_tree_view"/>
+        <field name="arch" type="xml">
+             <field name="attribute_id" position="attributes">
+                <attribute name="invisible">context.get('hide_attribute_id')</attribute>
+             </field>
+        </field>
+    </record>
+
     <record id="product.attribute_action" model="ir.actions.act_window">
-        <field name="res_model">product.attribute</field>
         <field name="view_mode">tree,form</field>
     </record>
 
diff --git a/product_variant_usability/__openerp__.py b/product_variant_usability/__openerp__.py
index 8acbc67..5236916 100644
--- a/product_variant_usability/__openerp__.py
+++ b/product_variant_usability/__openerp__.py
@@ -18,11 +18,11 @@
         "bin": [],
     },
     "depends": [
+        "attribute_usability",
         "product_variant_inactive",
     ],
     "data": [
         "views/product_view.xml",
-        "views/product_attribute_view.xml",
     ],
     "demo": [
     ],
diff --git a/product_variant_usability/views/product_attribute_view.xml b/product_variant_usability/views/product_attribute_view.xml
deleted file mode 100644
index a9cea28..0000000
--- a/product_variant_usability/views/product_attribute_view.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<openerp>
-    <data>
-
-<record id="product_attribute_view_form" model="ir.ui.view">
-    <field name="model">product.attribute</field>
-    <field name="arch" type="xml">
-        <form string="Product Attribute">
-            <sheet>
-                <div class="oe_title" style="width: 390px;">
-                    <label class="oe_edit_only" for="name" string="Product Name"/>
-                    <h1><field name="name" class="oe_inline"/></h1>
-                </div>
-                <group>
-                    <field name="code"/>
-                    <field name="value_ids" colspan="4" nolabel="1">
-                        <tree editable="bottom">
-                            <field name="name"/>
-                            <field name="code"/>
-                            <field name="comment"/>
-                        </tree>
-                    </field>
-                </group>
-            </sheet>
-        </form>
-    </field>
-</record>
-
-<record id="attribute_tree_view" model="ir.ui.view">
-    <field name="model">product.attribute</field>
-    <field name="inherit_id" ref="product.attribute_tree_view"/>
-    <field name="arch" type="xml">
-        <xpath expr="//tree" position="attributes">
-            <attribute name="editable"></attribute>
-        </xpath>
-    </field>
-</record>
-
-<record id="product.attribute_action" model="ir.actions.act_window">
-    <field name="view_mode">tree,form</field>
-</record>
-
-    </data>
-</openerp>