From 339e8ad65c3da10cad695c2fba19c456f5eb4d7f Mon Sep 17 00:00:00 2001
From: Josse Colpaert <jco@openerp.com>
Date: Wed, 10 Jul 2013 17:44:48 +0200
Subject: [PATCH] [WIP] Remove type_proc and remove procure method texts in
 purchase product view

bzr revid: jco@openerp.com-20130710154448-w6azswkdxi2tp5yu
---
 addons/purchase/purchase_view.xml       | 14 ++------------
 addons/stock_location/stock_location.py |  3 +--
 2 files changed, 3 insertions(+), 14 deletions(-)

diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index 17f12cb04f7..00bcba8c708 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -564,18 +564,8 @@
             <field name="inherit_id" ref="stock.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>
-                        will be created in order to subcontract the job 
-                        <i attrs="{'invisible': [('seller_id','=',False)]}">to 
-                        <field name="seller_id" class="oe_inline"/></i>.
-                    </p>
-                    <p attrs="{'invisible': ['|','|',('type','=','service'),('procure_method','&lt;&gt;','make_to_order'),('supply_method','&lt;&gt;','buy')]}">
-                        When you sell this product, OpenERP will trigger <b>a draft
-                        purchase order</b> to buy the required quantities to the supplier.
-                        The delivery order will be ready after having received the
-                        products.
-                    </p>
+                    <!--TODO: Should add some procurement help here (something like route.description)-->
+                    <p> Procurement help </p>
                 </group>
             </field>
         </record>
diff --git a/addons/stock_location/stock_location.py b/addons/stock_location/stock_location.py
index 674ae0d8768..0e3b7226cf9 100644
--- a/addons/stock_location/stock_location.py
+++ b/addons/stock_location/stock_location.py
@@ -111,7 +111,7 @@ class procurement_rule(osv.osv):
             help="If route_id is False, the rule is global"),
         'delay': fields.integer('Number of Hours'),
         'procure_method': fields.selection([('make_to_stock','Make to Stock'),('make_to_order','Make to Order')], 'Procure Method', required=True, help="'Make to Stock': When needed, take from the stock or wait until re-supplying. 'Make to Order': When needed, purchase or produce for the procurement request."),
-        'type_proc': fields.selection([('produce','Produce'),('buy','Buy'),('move','Move')], 'Type of Procurement', required=True),
+        #'type_proc': fields.selection([('produce','Produce'),('buy','Buy'),('move','Move')], 'Type of Procurement', required=True),
         'partner_address_id': fields.many2one('res.partner', 'Partner Address'),
         'invoice_state': fields.selection([
             ("invoiced", "Invoiced"),
@@ -121,7 +121,6 @@ class procurement_rule(osv.osv):
     }
     _defaults = {
         'procure_method': 'make_to_stock',
-        'type_proc': 'move',
         'invoice_state': 'none',
     }