diff options
| author | kum (Open ERP) <kum@tinyerp.co.in> | 2009-11-26 14:12:52 +0530 |
|---|---|---|
| committer | kum (Open ERP) <kum@tinyerp.co.in> | 2009-11-26 14:12:52 +0530 |
| commit | c9f87c4dc9ebceddb609c5cfc2e6fd15abc481e8 (patch) | |
| tree | 053269a0cc8d08a3d44694c3c73d38abadd6749e /addons/mrp/process/service_product_process.xml | |
| parent | 38caea46b0ba92d3a2db17c7c72ec4c290b3b334 (diff) | |
| parent | d8dc05715d93963f3c72b78a57d07ca9552ef45f (diff) | |
[IMP] English Improvement resolved conflicts
bzr revid: kum@tinyerp.co.in-20091125113147-pmsqovlrx4ia54hf
bzr revid: kum@tinyerp.co.in-20091126062538-149ru08q9obdlksy
bzr revid: kum@tinyerp.co.in-20091126084252-ml6pgh170e6f4r3f
Diffstat (limited to 'addons/mrp/process/service_product_process.xml')
| -rw-r--r-- | addons/mrp/process/service_product_process.xml | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/addons/mrp/process/service_product_process.xml b/addons/mrp/process/service_product_process.xml index d31a5e50948..60bf3b562b9 100644 --- a/addons/mrp/process/service_product_process.xml +++ b/addons/mrp/process/service_product_process.xml @@ -7,7 +7,7 @@ --> <record id="process_process_serviceproductprocess0" model="process.process"> - <field eval=""""Service Process"""" name="name"/> + <field eval=""""Service"""" name="name"/> <field name="model_id" ref="mrp.model_mrp_procurement"/> <field eval="1" name="active"/> </record> @@ -20,8 +20,8 @@ <field name="menu_id" ref="mrp.menu_mrp_procurement_action"/> <field name="model_id" ref="mrp.model_mrp_procurement"/> <field eval=""""state"""" name="kind"/> - <field eval=""""If Requisition is make to order"""" name="note"/> - <field eval=""""Service on Order"""" name="name"/> + <field eval=""""Assignment from Production or Purchase Order."""" name="note"/> + <field eval=""""Make to Order"""" name="name"/> <field name="process_id" ref="process_process_serviceproductprocess0"/> <field eval=""""object.state in ('draft', 'confirmed', 'cancel', 'exception', 'running', 'done', 'waiting')"""" name="model_states"/> <field eval="0" name="flow_start"/> @@ -31,7 +31,7 @@ <field name="menu_id" ref="mrp.menu_mrp_procurement_action"/> <field name="model_id" ref="mrp.model_mrp_procurement"/> <field eval=""""state"""" name="kind"/> - <field eval=""""Do nothing"""" name="note"/> + <field eval=""""Assignment from stock."""" name="note"/> <field eval=""""Make to stock"""" name="name"/> <field name="process_id" ref="process_process_serviceproductprocess0"/> <field eval=""""object.state in ('draft', 'confirmed', 'cancel', 'exception', 'running', 'done', 'waiting')"""" name="model_states"/> @@ -42,7 +42,7 @@ <field name="menu_id" ref="purchase.menu_purchase_form_action"/> <field name="model_id" ref="purchase.model_purchase_order"/> <field eval=""""subflow"""" name="kind"/> - <field eval=""""A purchase order is created for a sub-contracting demand."""" name="note"/> + <field eval=""""Request for Quotation."""" name="note"/> <field eval=""""RFQ"""" name="name"/> <field name="subflow_id" ref="purchase.process_process_purchaseprocess0"/> <field name="process_id" ref="process_process_serviceproductprocess0"/> @@ -57,8 +57,8 @@ <record id="process_transition_servicerfq0" model="process.transition"> <field eval="[(6,0,[])]" name="role_ids"/> <field eval="[(6,0,[])]" name="transition_ids"/> - <field eval=""""Stockable Order Request"""" name="name"/> - <field eval=""""If Requisition method is Make to order and supply method is buy"""" name="note"/> + <field eval=""""To Buy"""" name="name"/> + <field eval=""""If the service has a 'Buy' supply method, this creates a RFQ, a subcontracting demand for instance."""" name="note"/> <field model="process.node" name="target_node_id" ref="process_node_orderrfq0"/> <field model="process.node" name="source_node_id" ref="process_node_serviceonorder0"/> </record> |