From 478ccaa2792f162a289ae6f574af02d5d059b96b Mon Sep 17 00:00:00 2001
From: gregoire <gregoire@page-karma.com>
Date: Sat, 16 Apr 2016 12:48:49 +0200
Subject: [PATCH] refactor: Move code from beesdoo_simplified_view module to
 beesdoo_product, then delete beesdoo_simplified_view

---
 beesdoo_product/__openerp__.py            |   4 +-
 beesdoo_product/views/beesdoo_product.xml |  93 +++++++++++++-------
 beesdoo_simplified_view/__init__.py       |   1 -
 beesdoo_simplified_view/__openerp__.py    |  24 ------
 beesdoo_simplified_view/views/views.xml   | 100 ----------------------
 5 files changed, 64 insertions(+), 158 deletions(-)
 delete mode 100644 beesdoo_simplified_view/__init__.py
 delete mode 100644 beesdoo_simplified_view/__openerp__.py
 delete mode 100644 beesdoo_simplified_view/views/views.xml

diff --git a/beesdoo_product/__openerp__.py b/beesdoo_product/__openerp__.py
index cdf8dd5..2a994bd 100644
--- a/beesdoo_product/__openerp__.py
+++ b/beesdoo_product/__openerp__.py
@@ -20,7 +20,7 @@
     'version': '0.1',
 
     # any module necessary for this one to work correctly
-    'depends': ['beesdoo_base', 'product', 'point_of_sale'],
+    'depends': ['beesdoo_base', 'product', 'sale', 'purchase', 'point_of_sale'],
 
     # always loaded
     'data': [
@@ -30,4 +30,4 @@
     ],
     # only loaded in demonstration mode
     'demo': [],
-}
\ No newline at end of file
+}
diff --git a/beesdoo_product/views/beesdoo_product.xml b/beesdoo_product/views/beesdoo_product.xml
index b829117..e95f0b4 100644
--- a/beesdoo_product/views/beesdoo_product.xml
+++ b/beesdoo_product/views/beesdoo_product.xml
@@ -1,21 +1,66 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
-
-
-	<record model="ir.ui.view" id="beesdoo_product_form">
-		<field name="name">bees.product.template.form</field>
-		<field name="model">product.template</field>
-		<field name="inherit_id" ref="product.product_template_only_form_view" />
-		<field name="arch" type="xml">
-			<field name="barcode" position="after">
-				<field name="eco_label" />
-				<field name="local_label" />
-				<field name="fair_label" />
-				<field name="origin_label" />
-			</field>
-		</field>
-	</record>
-
+    <record model="ir.ui.view" id="beesdoo_product_form">
+        <field name="name">bees.product.template.form</field>
+        <field name="model">product.template</field>
+        <field name="inherit_id" ref="product.product_template_only_form_view"/>
+        <field name="arch" type="xml">
+            <field name="barcode" position="after">
+                <field name="eco_label"/>
+                <field name="local_label"/>
+                <field name="fair_label"/>
+                <field name="origin_label"/>
+            </field>
+            <field name="invoice_policy" position="replace">
+                <field name="invoice_policy" widget="radio" invisible="True"/>
+            </field>
+            <field name="purchase_method" position="replace">
+                <field name="purchase_method" widget="radio" invisible="True"/>
+            </field>
+            <field name="route_ids" position="replace">
+                <field name="route_ids" widget="radio" invisible="True"/>
+            </field>
+            <group name="sale_condition" position="replace">
+                <group name="sale_condition" widget="radio" invisible="True"/>
+            </group>
+            <field name="property_account_creditor_price_difference" position="replace">
+                <field name="property_account_creditor_price_difference" widget="radio" invisible="True"/>
+            </field>
+            <field name="property_account_expense_id" position="replace">
+                <field name="property_account_expense_id" widget="radio" invisible="True"/>
+            </field>
+            <field name="property_account_income_id" position="replace">
+                <field name="property_account_income_id" widget="radio" invisible="True"/>
+            </field>
+            <group name="description" position="replace">
+                <group name="description" invisible="False">
+                    <separator string="Description for picking" colspan="4"/>
+                    <field name="description_picking"
+                           placeholder="Description for Pickings (Rack, Row and Case Information)" nolabel="1"
+                           colspan="4" modifiers="{}"/>
+                    <field name="description_picking"
+                           placeholder="Description pour les devis" nolabel="1"
+                           colspan="4" modifiers="{}" invisible="True"/>
+                    <field name="description_picking"
+                           placeholder="Description for Vendors" nolabel="1"
+                           colspan="4" modifiers="{}" invisible="True"/>
+                </group>
+            </group>@
+        </field>
+    </record>
+    <record model="ir.ui.view" id="beesdoo_product_label_form">
+        <field name="name">bees.product.label.form</field>
+        <field name="model">beesdoo.product.label</field>
+        <field name="arch" type="xml">
+            <form>
+                <group>
+                    <field name="name"/>
+                    <field name="type"/>
+                    <field name="color_code"/>
+                </group>
+            </form>
+        </field>
+    </record>
 	<record model="ir.ui.view" id="beesdoo_product_form2">
 		<field name="name">bees.product.template.form2</field>
 		<field name="model">product.template</field>
@@ -26,18 +71,4 @@
 			</div>
 		</field>
 	</record>
-
-	<record model="ir.ui.view" id="beesdoo_product_label_form">
-		<field name="name">bees.product.label.form</field>
-		<field name="model">beesdoo.product.label</field>
-		<field name="arch" type="xml">
-			<form>
-				<group>
-					<field name="name" />
-					<field name="type" />
-					<field name="color_code" />
-				</group>
-			</form>
-		</field>
-	</record>
-</odoo>
\ No newline at end of file
+</odoo>
diff --git a/beesdoo_simplified_view/__init__.py b/beesdoo_simplified_view/__init__.py
deleted file mode 100644
index 40a96af..0000000
--- a/beesdoo_simplified_view/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-# -*- coding: utf-8 -*-
diff --git a/beesdoo_simplified_view/__openerp__.py b/beesdoo_simplified_view/__openerp__.py
deleted file mode 100644
index 0806f00..0000000
--- a/beesdoo_simplified_view/__openerp__.py
+++ /dev/null
@@ -1,24 +0,0 @@
-# -*- coding: utf-8 -*-
-{
-    'name': "beesdoo_simplified_view",
-
-    'description': """
-        Long description of module's purpose
-    """,
-
-    # Categories can be used to filter modules in modules listing
-    # Check https://github.com/odoo/odoo/blob/master/openerp/addons/base/module/module_data.xml
-    # for the full list
-    'category': 'Sales',
-    'version': '0.1',
-
-    # any module necessary for this one to work correctly
-    'depends': ['base', 'sale', 'purchase', ],
-
-    # always loaded
-    'data': [
-        # 'security/ir.model.access.csv',
-        'views/views.xml',
-    ],
-
-}
diff --git a/beesdoo_simplified_view/views/views.xml b/beesdoo_simplified_view/views/views.xml
deleted file mode 100644
index 0ca14c4..0000000
--- a/beesdoo_simplified_view/views/views.xml
+++ /dev/null
@@ -1,100 +0,0 @@
-<openerp>
-    <data>
-        <record model="ir.ui.view" id="beesdoo_simplified_product_view_form_sale">
-            <field name="name">beesdoo_simplified_view list</field>
-            <field name="model">product.template</field>
-            <field name="inherit_id" ref="sale.product_template_form_view_invoice_policy"/>
-            <field name="arch" type="xml">
-                <field name="invoice_policy" position="replace">
-                    <field name="invoice_policy" widget="radio" invisible="True"/>
-                </field>
-            </field>
-        </record>
-        <record model="ir.ui.view" id="beesdoo_simplified_product_view_form_purchase">
-            <field name="name">beesdoo_simplified_view list</field>
-            <field name="model">product.template</field>
-            <field name="inherit_id" ref="purchase.view_product_supplier_inherit"/>
-            <field name="arch" type="xml">
-                <field name="purchase_method" position="replace">
-                    <field name="purchase_method" widget="radio" invisible="True"/>
-                </field>
-            </field>
-        </record>
-        <record model="ir.ui.view" id="beesdoo_simplified_product_view_form_stock">
-            <field name="name">beesdoo_simplified_view list</field>
-            <field name="model">product.template</field>
-            <field name="inherit_id" ref="product.product_template_only_form_view"/>
-            <field name="arch" type="xml">
-                <field name="route_ids" position="replace">
-                    <field name="route_ids" widget="radio" invisible="True"/>
-                </field>
-            </field>
-        </record>
-        <record model="ir.ui.view" id="beesdoo_simplified_product_view_form_stock_sale_condition">
-            <field name="name">beesdoo_simplified_view list</field>
-            <field name="model">product.template</field>
-            <field name="inherit_id" ref="product.product_template_only_form_view"/>
-            <field name="arch" type="xml">
-                <group name="sale_condition" position="replace">
-                    <group name="sale_condition" widget="radio" invisible="True"/>
-                </group>
-            </field>
-        </record>
-        <record model="ir.ui.view" id="beesdoo_simplified_product_view_form_stock_difference">
-            <field name="name">beesdoo_simplified_view list</field>
-            <field name="model">product.template</field>
-            <field name="inherit_id" ref="product.product_template_only_form_view"/>
-            <field name="arch" type="xml">
-                <field name="property_account_creditor_price_difference" position="replace">
-                    <field name="property_account_creditor_price_difference" widget="radio" invisible="True"/>
-                </field>
-            </field>
-        </record>
-        <record model="ir.ui.view" id="beesdoo_simplified_product_view_form_stock_expense">
-            <field name="name">beesdoo_simplified_view list</field>
-            <field name="model">product.template</field>
-            <field name="inherit_id" ref="product.product_template_only_form_view"/>
-            <field name="arch" type="xml">
-                <field name="property_account_expense_id" position="replace">
-                    <field name="property_account_expense_id" widget="radio" invisible="True"/>
-                </field>
-            </field>
-        </record>
-        <record model="ir.ui.view" id="beesdoo_simplified_product_view_form_stock_income">
-            <field name="name">beesdoo_simplified_view list</field>
-            <field name="model">product.template</field>
-            <field name="inherit_id" ref="product.product_template_only_form_view"/>
-            <field name="arch" type="xml">
-                <field name="property_account_income_id" position="replace">
-                    <field name="property_account_income_id" widget="radio" invisible="True"/>
-                </field>
-            </field>
-        </record>
-        <record model="ir.ui.view" id="beesdoo_simplified_product_view_form_stock_description">
-            <field name="name">beesdoo_simplified_view list</field>
-            <field name="model">product.template</field>
-            <field name="inherit_id" ref="product.product_template_only_form_view"/>
-            <field name="arch" type="xml">
-                <group name="description" position="replace">
-                    <group name="description" invisible="False">
-
-
-
-
-                        <separator string="Description pour le ramassage" colspan="4"/>
-                        <field name="description_picking"
-                               placeholder="Description for Pickings (Rack, Row and Case Information)" nolabel="1"
-                               colspan="4" modifiers="{}"/>
-                        <field name="description_picking"
-                               placeholder="Description pour les devis" nolabel="1"
-                               colspan="4" modifiers="{}" invisible="True"/>
-                        <field name="description_picking"
-                               placeholder="Description for Vendors" nolabel="1"
-                               colspan="4" modifiers="{}" invisible="True"/>
-                    </group>
-                </group>
-            </field>
-        </record>
-
-    </data>
-</openerp>