From 67f8d94124082db7fb115b5646fa02682f17851c Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Wed, 7 Jul 2010 20:02:20 +0530
Subject: [PATCH] [Fix] the workflow of procurement and revert the changed of 
 mrp properties

bzr revid: sbh@tinyerp.com-20100707143220-fvws4qxruwhmm4qg
---
 addons/mrp/mrp_view.xml                         | 16 ----------------
 addons/mrp/security/ir.model.access.csv         |  4 ----
 addons/procurement/procurement_view.xml         |  4 ++++
 addons/procurement/procurement_workflow.xml     |  2 ++
 addons/procurement/security/ir.model.access.csv |  5 +++++
 5 files changed, 11 insertions(+), 20 deletions(-)

diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index 4e705502529..1bd0724a003 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -885,22 +885,6 @@
                 </xpath>
             </field>
         </record>
-        
-         
-         <record id="view_procurement_form_inherit_property" model="ir.ui.view">
-            <field name="name">procurement.order.form.inherit</field>
-            <field name="model">procurement.order</field>
-            <field name="inherit_id" ref="procurement.procurement_form_view"/>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                <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>
-            </field>
-        </record>
         <act_window
             id="action_product_bom_structure"
             name="Product BoM Structure"
diff --git a/addons/mrp/security/ir.model.access.csv b/addons/mrp/security/ir.model.access.csv
index b618f930abb..e823bd036d8 100644
--- a/addons/mrp/security/ir.model.access.csv
+++ b/addons/mrp/security/ir.model.access.csv
@@ -28,7 +28,3 @@
 "access_report_workcenter_load","report.workcenter.load","model_report_workcenter_load","mrp.group_mrp_manager",1,0,0,0
 "access_report_mrp_inout","report.mrp.inout","model_report_mrp_inout","mrp.group_mrp_manager",1,0,0,0
 "access_product_product_manager","product.product manager","model_product_product","mrp.group_mrp_manager",1,1,1,1
-"access_mrp_property_group","mrp.property.group","model_mrp_property_group","stock.group_stock_manager",1,1,1,1
-"access_mrp_property","mrp.property","model_mrp_property","stock.group_stock_manager",1,1,1,1
-"access_mrp_property_group","mrp.property.group","model_mrp_property_group","base.group_user",1,0,0,0
-"access_mrp_property","mrp.property","model_mrp_property","base.group_user",1,0,0,0
diff --git a/addons/procurement/procurement_view.xml b/addons/procurement/procurement_view.xml
index f250209cda9..fff13e36330 100644
--- a/addons/procurement/procurement_view.xml
+++ b/addons/procurement/procurement_view.xml
@@ -67,6 +67,10 @@
                         <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" />
diff --git a/addons/procurement/procurement_workflow.xml b/addons/procurement/procurement_workflow.xml
index 17979868a03..d28b1a035f8 100644
--- a/addons/procurement/procurement_workflow.xml
+++ b/addons/procurement/procurement_workflow.xml
@@ -183,6 +183,8 @@
             <field name="act_from" ref="act_make_done"/>
             <field name="act_to" ref="act_done"/>
             <field name="condition">action_check_finnished()</field>
+			<field name="trigger_model">stock.move</field>
+            <field name="trigger_expr_id">[move_id.id]</field>            
         </record>
         <record id="trans_make_done_confirm" model="workflow.transition">
             <field name="act_from" ref="act_make_done"/>
diff --git a/addons/procurement/security/ir.model.access.csv b/addons/procurement/security/ir.model.access.csv
index 18991cf9c90..03930c47407 100644
--- a/addons/procurement/security/ir.model.access.csv
+++ b/addons/procurement/security/ir.model.access.csv
@@ -1,3 +1,8 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
 "access_procurement","procurement.order","model_procurement_order","base.group_user",1,0,0,0
 "access_stock_warehouse_orderpoint","stock.warehouse.orderpoint","model_stock_warehouse_orderpoint","stock.group_stock_manager",1,1,1,1
+"access_mrp_property_group","mrp.property.group","model_mrp_property_group","stock.group_stock_manager",1,1,1,1
+"access_mrp_property","mrp.property","model_mrp_property","stock.group_stock_manager",1,1,1,1
+"access_mrp_property_group","mrp.property.group","model_mrp_property_group","base.group_user",1,0,0,0
+"access_mrp_property","mrp.property","model_mrp_property","base.group_user",1,0,0,0
+