[MERGE]: Merge with lp:openobject-addons

bzr revid: rpa@tinyerp.com-20100416050540-9s0mmz9fmx4t23eu

1 files changed, 4 insertions, 29 deletions

diff --git a/addons/project_mrp/process/project_mrp_process.xml b/addons/project_mrp/process/project_mrp_process.xml
index b087883618f..78c858f43dc 100755
--- a/addons/project_mrp/process/project_mrp_process.xml
+++ b/addons/project_mrp/process/project_mrp_process.xml
@@ -6,7 +6,7 @@
         Process Node
     -->
 
-    	<record id="process_node_procuretasktask0" model="process.node">
+        <record id="process_node_procuretasktask0" model="process.node">
             <field name="menu_id" ref="project.menu_action_view_task"/>
             <field name="model_id" ref="project.model_project_task"/>
             <field eval="&quot;&quot;&quot;subflow&quot;&quot;&quot;" name="kind"/>
@@ -46,9 +46,9 @@
         Process Transition
     -->
 
-    	<record id="process_transition_procuretask0" model="process.transition">
+        <record id="process_transition_procuretask0" model="process.transition">
             <field eval="[(6,0,[])]" name="transition_ids"/>
-            <field eval="&quot;&quot;&quot;	Requisition Task&quot;&quot;&quot;" name="name"/>
+            <field eval="&quot;&quot;&quot;Procurement Task&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;if product type is 'service' then it creates the task.&quot;&quot;&quot;" name="note"/>
             <field model="process.node" name="target_node_id" ref="process_node_procuretasktask0"/>
             <field model="process.node" name="source_node_id" ref="sale.process_node_saleprocurement0"/>
@@ -65,35 +65,10 @@
         <record id="process_transition_ordertask0" model="process.transition">
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;Order Task&quot;&quot;&quot;" name="name"/>
-            <field eval="&quot;&quot;&quot;If Requisition method is Make to order and supply method is produce&quot;&quot;&quot;" name="note"/>
+            <field eval="&quot;&quot;&quot;If procurement method is Make to order and supply method is produce&quot;&quot;&quot;" name="note"/>
             <field model="process.node" name="target_node_id" ref="process_node_mrptask0"/>
             <field model="process.node" name="source_node_id" ref="mrp.process_node_serviceonorder0"/>
         </record>
 
-        <!--
-        	Process Action
-    	-->
-
-<!--        <record id="process_transition_action_orderconfirmtask0" model="process.transition.action">-->
-<!--            <field eval="&quot;&quot;&quot;action_confirm&quot;&quot;&quot;" name="action"/>-->
-<!--            <field eval="&quot;&quot;&quot;object&quot;&quot;&quot;" name="state"/>-->
-<!--            <field eval="&quot;&quot;&quot;Confirm&quot;&quot;&quot;" name="name"/>-->
-<!--            <field name="transition_id" ref="process_transition_ordertask0"/>-->
-<!--        </record>-->
-<!--        -->
-<!--        <record id="process_transition_action_ordercanceltask0" model="process.transition.action">-->
-<!--            <field eval="&quot;&quot;&quot;action_cancel&quot;&quot;&quot;" name="action"/>-->
-<!--            <field eval="&quot;&quot;&quot;object&quot;&quot;&quot;" name="state"/>-->
-<!--            <field eval="&quot;&quot;&quot;Cancel&quot;&quot;&quot;" name="name"/>-->
-<!--            <field name="transition_id" ref="process_transition_ordertask0"/>-->
-<!--        </record>-->
-<!--        -->
-<!--        <record id="process_transition_action_taskrunprocurement0" model="process.transition.action">-->
-<!--            <field eval="&quot;&quot;&quot;write({'state':'exception'})&quot;&quot;&quot;" name="action"/>-->
-<!--            <field eval="&quot;&quot;&quot;object&quot;&quot;&quot;" name="state"/>-->
-<!--            <field eval="&quot;&quot;&quot;Run Requisition&quot;&quot;&quot;" name="name"/>-->
-<!--            <field name="transition_id" ref="process_transition_ordertask0"/>-->
-<!--        </record>-->
-
     </data>
 </openerp>