Merge 478ccaa279 into 7bbbc48c44

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': [

beesdoo_product/views/beesdoo_product.xml

@@ -1,7 +1,5 @@
 <?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>
@@ -13,20 +11,43 @@
                 <field name="fair_label"/>
                 <field name="origin_label"/>
             </field>
+            <field name="invoice_policy" position="replace">
+                <field name="invoice_policy" widget="radio" invisible="True"/>
             </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>
-		<field name="inherit_id" ref="product.product_template_form_view" />
-		<field name="arch" type="xml">
-			<div name="weight" position="after">
-					<field name="main_seller_id" string="Fournisseur Principal" />
-			</div>
+            <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>
@@ -40,4 +61,14 @@
             </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>
+		<field name="inherit_id" ref="product.product_template_form_view" />
+		<field name="arch" type="xml">
+			<div name="weight" position="after">
+					<field name="main_seller_id" string="Fournisseur Principal" />
+			</div>
+		</field>
+	</record>
 </odoo>