From 71777e5380bfcc7b9b6f862cdbe44bd3b27c7f2f Mon Sep 17 00:00:00 2001
From: "Mayur Maheshwari (OpenERP)" <mma@tinyerp.com>
Date: Fri, 5 Oct 2012 12:11:59 +0530
Subject: [PATCH] [FIX]product  : improve procurment help message and update
 views

bzr revid: mma@tinyerp.com-20121005064159-nxevkdhc058c2u5k
---
 addons/procurement/procurement_view.xml | 44 ++++++++++++-------------
 addons/product/product_view.xml         | 25 ++------------
 addons/purchase/purchase_view.xml       |  8 +++++
 addons/stock/product_view.xml           |  2 +-
 4 files changed, 33 insertions(+), 46 deletions(-)

diff --git a/addons/procurement/procurement_view.xml b/addons/procurement/procurement_view.xml
index 8c3ae9a2336..67747e2f1ad 100644
--- a/addons/procurement/procurement_view.xml
+++ b/addons/procurement/procurement_view.xml
@@ -307,28 +307,28 @@
                     <field name="procure_method" groups="base.group_user"/>
                     <field name="supply_method" groups="base.group_user"/> 
                 </xpath>
-                <xpath expr="//group[@name='procurement_help']" position="inside">
-                <group name="procurement_help" class="oe_grey" col="1" groups="base.group_user">
-                    <p attrs="{'invisible': [('type','&lt;&gt;','service'),('procure_method','&lt;&gt;','make_to_stock')]}">
-                        When you sell this service, nothing special will be trigered
-                        to deliver the customer, as you set the procurement method as
-                        'Make to Stock'.
-                    </p>
-                    <p attrs="{'invisible': [('type','&lt;&gt;','product'),('procure_method','&lt;&gt;','make_to_stock')]}">
-                        When you sell this product, OpenERP will <b>use the available
-                        inventory</b> for the delivery order.
-                        <br/><br/>
-                        If there are not enough quantities available, the delivery order
-                        will wait for new products. To fulfill the inventory, you should
-                        create others rules like orderpoints.
-                    </p>
-                    <p attrs="{'invisible': [('type','&lt;&gt;','consu'),('procure_method','&lt;&gt;','make_to_stock')]}">
-                        When you sell this product, a delivery order will be created.
-                        OpenERP will consider that the <b>required quantities are always
-                        available</b> as it's a consumable (as a result of this, the quantity
-                        on hand may become negative).
-                    </p>
-                </group>
+                <xpath expr="//group[@name='general']" position="after" >
+                   <group name="procurement_help" class="oe_grey" col="1" groups="base.group_user" version="7.0">
+                       <p attrs="{'invisible': [('type','&lt;&gt;','service'),('procure_method','&lt;&gt;','make_to_stock')]}">
+                           When you sell this service, nothing special will be trigered
+                           to deliver the customer, as you set the procurement method as
+                           'Make to Stock'.
+                       </p>
+                       <p attrs="{'invisible': [('type','&lt;&gt;','product'),('procure_method','&lt;&gt;','make_to_stock')]}">
+                           When you sell this product, OpenERP will <b>use the available
+                           inventory</b> for the delivery order.
+                           <br/><br/>
+                           If there are not enough quantities available, the delivery order
+                           will wait for new products. To fulfill the inventory, you should
+                           create others rules like orderpoints.
+                       </p>
+                       <p attrs="{'invisible': [('type','&lt;&gt;','consu'),('procure_method','&lt;&gt;','make_to_stock')]}">
+                           When you sell this product, a delivery order will be created.
+                           OpenERP will consider that the <b>required quantities are always
+                           available</b> as it's a consumable (as a result of this, the quantity
+                           on hand may become negative).
+                       </p>
+                   </group>
                 </xpath>
             </field>
         </record>
diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index 14571fbcc55..9f38ef443e3 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -100,32 +100,11 @@
                             </page>
                             <page string="Procurements" groups="base.group_user">
                                 <group name="procurement">
-                                    <group>
+                                    <group name="general">
                                         <field name="cost_method" groups="product.group_costing_method"/>
                                         <field name="standard_price" attrs="{'readonly':[('cost_method','=','average')]}"/>
                                     </group>
-                                    <group name="procurement_help" class="oe_grey" col="1" groups="base.group_user">
-                                        <p attrs="{'invisible': [('type','&lt;&gt;','service')]}">
-                                            When you sell this service, nothing special will be trigered
-                                            to deliver the customer, as you set the procurement method as
-                                            'Make to Stock'.
-                                        </p>
-                                        <p attrs="{'invisible': [('type','&lt;&gt;','product')]}">
-                                            When you sell this product, OpenERP will <b>use the available
-                                            inventory</b> for the delivery order.
-                                            <br/><br/>
-                                            If there are not enough quantities available, the delivery order
-                                            will wait for new products. To fulfill the inventory, you should
-                                            create others rules like orderpoints.
-                                        </p>
-                                        <p attrs="{'invisible': [('type','&lt;&gt;','consu')]}">
-                                            When you sell this product, a delivery order will be created.
-                                            OpenERP will consider that the <b>required quantities are always
-                                            available</b> as it's a consumable (as a result of this, the quantity
-                                            on hand may become negative).
-                                        </p>
-                                    </group>
-                                    <group groups="product.group_uom">
+                                    <group name="procurement_uom" groups="product.group_uom">
                                         <field name="uom_po_id"/>
                                     </group>
                                 </group>
diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index 7ca3fb1055c..8e7096c19d1 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -597,6 +597,14 @@
                      <separator string="Suppliers"/>
                      <field name="seller_ids" context="{'uom_id': uom_id}"/>
                 </group>
+            </field>
+        </record>
+
+        <record id="product_product_normal_form_procurement_help_view" model="ir.ui.view">
+            <field name="name">product.normal.form.procurement.help.inherit</field>
+            <field name="model">product.product</field>
+            <field name="inherit_id" ref="procurement.product_form_view_procurement_button"/>
+            <field name="arch" type="xml">
                 <group name="procurement_help" position="inside">
                     <p attrs="{'invisible': [('type','&lt;&gt;','service'),('procure_method','&lt;&gt;','make_to_order'),('supply_method','&lt;&gt;','buy')]}">
                         When you sell this service to a customer, <b>a draft purchase order</b>
diff --git a/addons/stock/product_view.xml b/addons/stock/product_view.xml
index aaa16844b9e..9c44b18cee4 100644
--- a/addons/stock/product_view.xml
+++ b/addons/stock/product_view.xml
@@ -66,7 +66,7 @@
             <field name="model">product.product</field>
             <field name="inherit_id" ref="product.product_normal_form_view"/>
             <field name="arch" type="xml">
-                <group name="procurement_help" position="after">
+                <group name="procurement_uom" position="before">
                     <group name="delay" string="Delays">
                         <label for="produce_delay" attrs="{'invisible':[('type','=','service')]}"/>
                         <div attrs="{'invisible':[('type','=','service')]}">