From bb93aa084cf7c7011271d83f13c046bbd9ea0d37 Mon Sep 17 00:00:00 2001
From: Raimon Esteve <raimon@nan-tic.com>
Date: Fri, 23 Dec 2016 10:20:30 +0100
Subject: [PATCH] Remove colors attribute + product form views

---
 product.py                              | 10 ----------
 product.xml                             |  9 ---------
 view/product_qty_form.xml               | 12 ------------
 view/template_qty_form.xml              | 12 ------------
 view/template_qty_manufacturer_tree.xml |  2 +-
 view/template_qty_purchase_tree.xml     |  2 +-
 view/template_qty_tree.xml              |  2 +-
 7 files changed, 3 insertions(+), 46 deletions(-)
 delete mode 100644 view/product_qty_form.xml
 delete mode 100644 view/template_qty_form.xml

diff --git a/product.py b/product.py
index 0cad56c..cd8f478 100644
--- a/product.py
+++ b/product.py
@@ -12,11 +12,6 @@ class Template:
     __metaclass__ = PoolMeta
     __name__ = 'product.template'
 
-    @classmethod
-    def view_attributes(cls):
-        return [('/tree', 'colors',
-                If(Less(Eval('quantity', 1), 1), 'red', 'black'))]
-
     def sum_product(self, name):
         Location = Pool().get('stock.location')
 
@@ -33,11 +28,6 @@ class Product:
     __metaclass__ = PoolMeta
     __name__ = 'product.product'
 
-    @classmethod
-    def view_attributes(cls):
-        return [('/tree', 'colors',
-                If(Less(Eval('quantity', 1), 1), 'red', 'black'))]
-
     @classmethod
     def get_quantity(cls, products, name):
         pool = Pool()
diff --git a/product.xml b/product.xml
index 08828c6..90a8635 100644
--- a/product.xml
+++ b/product.xml
@@ -9,12 +9,6 @@ The COPYRIGHT file at the top level of this repository contains the full copyrig
             <field name="type">tree</field>
             <field name="name">template_qty_tree</field>
         </record>
-        <record model="ir.ui.view" id="template_qty_view_form">
-            <field name="model">product.template</field>
-            <field name="type" eval="None"/>
-            <field name="inherit" ref="product.template_view_form"/>
-            <field name="name">template_qty_form</field>
-        </record>
 
         <record model="ir.action.act_window" id="act_template_qty_form">
             <field name="name">Qty Products</field>
@@ -46,7 +40,6 @@ The COPYRIGHT file at the top level of this repository contains the full copyrig
         </record>
         <record model="ir.ui.view" id="product_qty_view_form">
             <field name="model">product.product</field>
-            <field name="type" eval="None"/>
             <field name="inherit" ref="product.product_view_form"/>
             <field name="name">product_qty_form</field>
         </record>
@@ -97,7 +90,6 @@ The COPYRIGHT file at the top level of this repository contains the full copyrig
     <data depends="product_manufacturer">
         <record model="ir.ui.view" id="template_qty_manufacturer_view_tree">
             <field name="model">product.template</field>
-            <field name="type" eval="None"/>
             <field name="inherit" ref="template_qty_view_tree"/>
             <field name="name">template_qty_manufacturer_tree</field>
         </record>
@@ -106,7 +98,6 @@ The COPYRIGHT file at the top level of this repository contains the full copyrig
     <data depends="purchase">
         <record model="ir.ui.view" id="template_qty_purchase_view_tree">
             <field name="model">product.template</field>
-            <field name="type" eval="None"/>
             <field name="inherit" ref="template_qty_view_tree"/>
             <field name="name">template_qty_purchase_tree</field>
         </record>
diff --git a/view/product_qty_form.xml b/view/product_qty_form.xml
deleted file mode 100644
index 57e60fb..0000000
--- a/view/product_qty_form.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0"?>
-<!-- This file is part of product_kit module for Tryton.
-The COPYRIGHT file at the top level of this repository contains the full copyright notices and license terms. -->
-<data>
-    <xpath expr="/form/field[@name='description']" 
-            position="after">
-        <label name="quantity"/>
-        <field name="quantity"/>
-        <label name="forecast_quantity"/>
-        <field name="forecast_quantity"/>
-    </xpath>
-</data>
diff --git a/view/template_qty_form.xml b/view/template_qty_form.xml
deleted file mode 100644
index 6332476..0000000
--- a/view/template_qty_form.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0"?>
-<!-- The COPYRIGHT file at the top level of this repository contains the full
-     copyright notices and license terms. -->
-<data>
-    <xpath expr="/form/notebook/page[@id='general']/field[@name='cost_price_method']"
-            position="after">
-        <label name="quantity"/>
-        <field name="quantity"/>
-        <label name="forecast_quantity"/>
-        <field name="forecast_quantity"/>
-    </xpath>
-</data>
diff --git a/view/template_qty_manufacturer_tree.xml b/view/template_qty_manufacturer_tree.xml
index 3fb79de..a08dbdd 100644
--- a/view/template_qty_manufacturer_tree.xml
+++ b/view/template_qty_manufacturer_tree.xml
@@ -2,7 +2,7 @@
 <!-- This file is part product_qty module for Tryton.
 The COPYRIGHT file at the top level of this repository contains the full copyright notices and license terms. -->
 <data>
-    <xpath expr="/tree/field[@name=&quot;category&quot;]" position="after">
+    <xpath expr="/tree/field[@name=&quot;forecast_quantity&quot;]" position="after">
         <field name="manufacturer"/>
     </xpath>
 </data>
diff --git a/view/template_qty_purchase_tree.xml b/view/template_qty_purchase_tree.xml
index 5252344..cb4dcab 100644
--- a/view/template_qty_purchase_tree.xml
+++ b/view/template_qty_purchase_tree.xml
@@ -2,7 +2,7 @@
 <!-- This file is part product_qty module for Tryton.
 The COPYRIGHT file at the top level of this repository contains the full copyright notices and license terms. -->
 <data>
-    <xpath expr="/tree/field[@name=&quot;category&quot;]" position="after">
+    <xpath expr="/tree/field[@name=&quot;categories&quot;]" position="after">
         <field name="product_suppliers" tree_invisible="1"/>
     </xpath>
 </data>
diff --git a/view/template_qty_tree.xml b/view/template_qty_tree.xml
index 7acde97..e5cda38 100644
--- a/view/template_qty_tree.xml
+++ b/view/template_qty_tree.xml
@@ -6,9 +6,9 @@ The COPYRIGHT file at the top level of this repository contains the full copyrig
     <field name="list_price"/>
     <field name="cost_price"/>
     <field name="type"/>
-    <field name="category"/>
     <field name="default_uom"/>
     <field name="quantity"/>
     <field name="forecast_quantity"/>
     <field name="active" tree_invisible="1"/>
+    <field name="categories" tree_invisible="1"/>
 </tree>