From 7933b838fa1523d0c2ceaa083bc980f375a4b13b Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Mon, 16 Aug 2010 17:36:25 +0530
Subject: [PATCH] [IMP]  procurement: Add the menu [Fix] mrp: Fix the menu_id
 in process file

bzr revid: sbh@tinyerp.com-20100816120625-s5ytts6cr9vg4jgi
---
 addons/mrp/mrp_view.xml                          |   13 +++++++++++--
 addons/mrp/process/procurement_process.xml       |   14 +++++++-------
 addons/mrp/process/service_product_process.xml   |    4 ++--
 addons/mrp/process/stockable_product_process.xml |    4 ++--
 addons/procurement/__openerp__.py                |    2 +-
 addons/procurement/procurement_view.xml          |   15 +++++----------
 6 files changed, 28 insertions(+), 24 deletions(-)

diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index cc62bfb..cf952a2 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -4,6 +4,7 @@
 
         <menuitem icon="terp-mrp" id="base.menu_mrp_root" name="Manufacturing"
             groups="group_mrp_user,group_mrp_manager,base.group_system" sequence="8"/>
+            <menuitem id="menu_mrp_reordering" name="Automatic Procurements" parent="stock.menu_stock_root" sequence="5"/>
         <menuitem id="menu_mrp_reordering" name="Automatic Procurements" parent="stock.menu_stock_root" sequence="5"/>
         <menuitem id="menu_mrp_manufacturing" name="Manufacturing" parent="base.menu_mrp_root" sequence="1"/>
 
@@ -481,13 +482,13 @@
         Procurement
         -->
 
-        <menuitem action="procurement.procurement_action" id="menu_mrp_procurement_action"
+        <menuitem action="procurement.procurement_action" id="base.menu_mrp_procurement_action"
                   parent="mrp.menu_mrp_manufacturing" sequence="3" />
 <!--        <menuitem action="procurement.procurement_action5" id="menu_mrp_procurement_exception_action"-->
 <!--                  parent="mrp.menu_mrp_control" sequence="1" />-->
 
          <menuitem id="menu_mrp_scheduler" name="Schedulers" parent="base.menu_mrp_root" groups="base.group_system,mrp.group_mrp_user,mrp.group_mrp_manager" sequence="3"/>
-        <menuitem action="procurement.action_compute_schedulers" id="mrp_Sched_all" parent="mrp.menu_mrp_scheduler" sequence="90" groups="base.group_system,mrp.group_mrp_user,mrp.group_mrp_manager"/>
+        <menuitem action="procurement.action_compute_schedulers" id="base.mrp_Sched_all" parent="mrp.menu_mrp_scheduler" sequence="90" groups="base.group_system,mrp.group_mrp_user,mrp.group_mrp_manager"/>
 
         <!--
         Order Point
@@ -889,9 +890,17 @@
             <field name="inherit_id" ref="procurement.procurement_form_view"/>
             <field name="type">form</field>
             <field name="arch" type="xml">
+            <data>
                 <xpath expr="/form/notebook/page/field[@name='move_id']" position="before">
                     <field name="bom_id" domain="[('product_id','=',product_id),('bom_id','=',False)]"/>
                 </xpath>
+                <xpath expr="/form/notebook/page/field[@name='close_move']" position="after">
+					<group colspan="4"  groups="base.group_extended">
+					<separator colspan="4" string="Properties" />
+					<field colspan="4" name="property_ids" nolabel="1"/>
+	                 </group>
+                </xpath>
+               </data>
             </field>
         </record>
         <act_window
diff --git a/addons/mrp/process/procurement_process.xml b/addons/mrp/process/procurement_process.xml
index 16369ee..e490d30 100644
--- a/addons/mrp/process/procurement_process.xml
+++ b/addons/mrp/process/procurement_process.xml
@@ -3,7 +3,7 @@
     <data>
     
     	<record id="process_node_procureproducts0" model="process.node">
-            <field name="menu_id" ref="mrp.menu_mrp_procurement_action"/>
+            <field name="menu_id" ref="base.menu_mrp_procurement_action"/>
             <field name="model_id" ref="procurement.model_procurement_order"/>
             <field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
             <field eval="&quot;&quot;&quot;The way to procurement depends on the product type.&quot;&quot;&quot;" name="note"/>
@@ -25,7 +25,7 @@
         </record>
 
         <record id="process_node_procureproducts0" model="process.node">
-            <field name="menu_id" ref="mrp.menu_mrp_procurement_action"/>
+            <field name="menu_id" ref="base.menu_mrp_procurement_action"/>
             <field name="model_id" ref="mrp.model_procurement_order"/>
             <field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
             <field eval="&quot;&quot;&quot;The way to procurement depends on the product type.&quot;&quot;&quot;" name="note"/>
@@ -46,7 +46,7 @@
         </record>
 
         <record id="process_node_stockproduct0" model="process.node">
-            <field name="menu_id" ref="mrp.menu_mrp_procurement_action"/>
+            <field name="menu_id" ref="base.menu_mrp_procurement_action"/>
             <field name="model_id" ref="mrp.model_procurement_order"/>
             <field eval="&quot;&quot;&quot;subflow&quot;&quot;&quot;" name="kind"/>
             <field eval="&quot;&quot;&quot;Product type is Stockable or Consumable.&quot;&quot;&quot;" name="note"/>
@@ -58,7 +58,7 @@
         </record>
         
         <record id="process_node_stockproduct1" model="process.node">
-            <field name="menu_id" ref="mrp.menu_mrp_procurement_action"/>
+            <field name="menu_id" ref="base.menu_mrp_procurement_action"/>
             <field name="model_id" ref="mrp.model_procurement_order"/>
             <field eval="&quot;&quot;&quot;subflow&quot;&quot;&quot;" name="kind"/>
             <field eval="&quot;&quot;&quot;For stockable products and consumables&quot;&quot;&quot;" name="note"/>
@@ -70,7 +70,7 @@
         </record>
 
         <record id="process_node_serviceproduct0" model="process.node">
-            <field name="menu_id" ref="mrp.menu_mrp_procurement_action"/>
+            <field name="menu_id" ref="base.menu_mrp_procurement_action"/>
             <field name="model_id" ref="mrp.model_procurement_order"/>
             <field eval="&quot;&quot;&quot;subflow&quot;&quot;&quot;" name="kind"/>
             <field eval="&quot;&quot;&quot;Product type is service&quot;&quot;&quot;" name="note"/>
@@ -82,7 +82,7 @@
         </record>
         
         <record id="process_node_serviceproduct1" model="process.node">
-            <field name="menu_id" ref="mrp.menu_mrp_procurement_action"/>
+            <field name="menu_id" ref="base.menu_mrp_procurement_action"/>
             <field name="model_id" ref="mrp.model_procurement_order"/>
             <field eval="&quot;&quot;&quot;subflow&quot;&quot;&quot;" name="kind"/>
             <field eval="&quot;&quot;&quot;For Services.&quot;&quot;&quot;" name="note"/>
@@ -94,7 +94,7 @@
         </record>
 
         <record id="process_node_purchaseprocure0" model="process.node">
-            <field name="menu_id" ref="mrp.menu_mrp_procurement_action"/>
+            <field name="menu_id" ref="base.menu_mrp_procurement_action"/>
             <field name="model_id" ref="mrp.model_procurement_order"/>
             <field eval="&quot;&quot;&quot;subflow&quot;&quot;&quot;" name="kind"/>
             <field eval="&quot;&quot;&quot;Procurement Orders&quot;&quot;&quot;" name="name"/>
diff --git a/addons/mrp/process/service_product_process.xml b/addons/mrp/process/service_product_process.xml
index a96a7a7..5c8fc10 100644
--- a/addons/mrp/process/service_product_process.xml
+++ b/addons/mrp/process/service_product_process.xml
@@ -17,7 +17,7 @@
 		-->
 
 		<record id="process_node_serviceonorder0" model="process.node">
-			<field name="menu_id" ref="mrp.menu_mrp_procurement_action"/>
+			<field name="menu_id" ref="base.menu_mrp_procurement_action"/>
 			<field name="model_id" ref="mrp.model_procurement_order"/>
 			<field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
 			<field eval="&quot;&quot;&quot;Assignment from Production or Purchase Order.&quot;&quot;&quot;" name="note"/>
@@ -28,7 +28,7 @@
 		</record>
 
 		<record id="process_node_servicemts0" model="process.node">
-			<field name="menu_id" ref="mrp.menu_mrp_procurement_action"/>
+			<field name="menu_id" ref="base.menu_mrp_procurement_action"/>
 			<field name="model_id" ref="mrp.model_procurement_order"/>
 			<field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
 			<field eval="&quot;&quot;&quot;Assignment from stock.&quot;&quot;&quot;" name="note"/>
diff --git a/addons/mrp/process/stockable_product_process.xml b/addons/mrp/process/stockable_product_process.xml
index bb5c36a..9dc45f0 100644
--- a/addons/mrp/process/stockable_product_process.xml
+++ b/addons/mrp/process/stockable_product_process.xml
@@ -17,7 +17,7 @@
 		-->
 
 		<record id="process_node_mts0" model="process.node">
-			<field name="menu_id" ref="mrp.menu_mrp_procurement_action"/>
+			<field name="menu_id" ref="base.menu_mrp_procurement_action"/>
 			<field name="model_id" ref="mrp.model_procurement_order"/>
 			<field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
 			<field eval="&quot;&quot;&quot;Assignment from stock.&quot;&quot;&quot;" name="note"/>
@@ -28,7 +28,7 @@
 		</record>
 
 		<record id="process_node_stock0" model="process.node">
-			<field name="menu_id" ref="mrp.menu_mrp_procurement_action"/>
+			<field name="menu_id" ref="base.menu_mrp_procurement_action"/>
 			<field name="model_id" ref="mrp.model_procurement_order"/>
 			<field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
 			<field eval="&quot;&quot;&quot;Assignment from Production or Purchase Order.&quot;&quot;&quot;" name="note"/>
diff --git a/addons/procurement/__openerp__.py b/addons/procurement/__openerp__.py
index 1f11ebc..1cdc146 100644
--- a/addons/procurement/__openerp__.py
+++ b/addons/procurement/__openerp__.py
@@ -38,8 +38,8 @@
         'wizard/make_procurement_view.xml',
         'wizard/mrp_procurement_view.xml',
         'wizard/orderpoint_procurement_view.xml',
-        'procurement_view.xml',
         'wizard/schedulers_all_view.xml',
+        'procurement_view.xml',
         'procurement_workflow.xml',
         'process/procurement_process.xml',
         "company_view.xml",
diff --git a/addons/procurement/procurement_view.xml b/addons/procurement/procurement_view.xml
index a8afe30..cb34068 100644
--- a/addons/procurement/procurement_view.xml
+++ b/addons/procurement/procurement_view.xml
@@ -4,6 +4,7 @@
 		<!--
         Procurement
         -->
+		
 
         <record id="procurement_tree_view" model="ir.ui.view">
             <field name="name">procurement.order.tree</field>
@@ -67,10 +68,6 @@
                         <field name="move_id" groups="base.group_extended"/>
                         <field name="date_close"/>
                         <field name="close_move" groups="base.group_extended"/>
-                    	<group colspan="4"  groups="base.group_extended">
-                    		<separator colspan="4" string="Properties" />
-                        	<field colspan="4" name="property_ids" nolabel="1"/>
-	                 </group>
                     </page>
                     <page string="Notes">
                         <separator colspan="4" string="Note" />
@@ -263,12 +260,10 @@
             res_model="stock.warehouse.orderpoint"
             src_model="procurement.order"/>
 
-<!--        <act_window-->
-<!--            domain="[('id', '=', product_id)]"-->
-<!--            id="act_product_product_2_stock_warehouse_orderpoint"-->
-<!--            name="Product"-->
-<!--            res_model="product.product"-->
-<!--            src_model="procurement.order"/>-->
+		<menuitem id="base.menu_mrp_scheduler" name="Schedulers" parent="stock.menu_stock_root" groups="base.group_system" sequence="10"/>
+		<menuitem action="action_compute_schedulers" id="base.mrp_Sched_all" parent="base.menu_mrp_scheduler" sequence="50" groups="base.group_system"/>
+		<menuitem action="procurement.procurement_action" id="base.menu_mrp_procurement_action" parent="stock.menu_stock_warehouse_mgmt" sequence="9" groups="base.group_system"/>		
+		
 
     </data>
 </openerp>
-- 
1.7.10.4