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 | |
| 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')
| -rwxr-xr-x | addons/mrp/process/procurement_process.xml | 82 | ||||
| -rw-r--r-- | addons/mrp/process/service_product_process.xml | 14 | ||||
| -rw-r--r-- | addons/mrp/process/stockable_product_process.xml | 24 |
3 files changed, 60 insertions, 60 deletions
diff --git a/addons/mrp/process/procurement_process.xml b/addons/mrp/process/procurement_process.xml index 8583d0ff84a..ccd353357d7 100755 --- a/addons/mrp/process/procurement_process.xml +++ b/addons/mrp/process/procurement_process.xml @@ -7,7 +7,7 @@ --> <record id="process_process_procurementprocess0" model="process.process"> - <field eval="""" Requisition Process"""" name="name"/> + <field eval=""""Requisition"""" name="name"/> <field name="model_id" ref="mrp.model_mrp_procurement"/> <field eval="1" name="active"/> </record> @@ -20,7 +20,7 @@ <field name="menu_id" ref="mrp.menu_mrp_procurement_action"/> <field name="model_id" ref="mrp.model_mrp_procurement"/> <field eval=""""subflow"""" name="kind"/> - <field eval=""""For stockable and consumable"""" name="note"/> + <field eval=""""For stockable products and consumables"""" name="note"/> <field eval=""""Stockable Product"""" name="name"/> <field name="process_id" ref="mrp.process_process_stockableproductprocess0"/> <field name="subflow_id" ref="process_process_procurementprocess0"/> @@ -32,7 +32,7 @@ <field name="menu_id" ref="mrp.menu_mrp_procurement_action"/> <field name="model_id" ref="mrp.model_mrp_procurement"/> <field eval=""""subflow"""" name="kind"/> - <field eval=""""If Product type is service"""" name="note"/> + <field eval=""""For Services."""" name="note"/> <field eval=""""Service"""" name="name"/> <field name="process_id" ref="mrp.process_process_serviceproductprocess0"/> <field name="subflow_id" ref="process_process_procurementprocess0"/> @@ -44,7 +44,7 @@ <field name="menu_id" ref="mrp.menu_mrp_production_action"/> <field name="model_id" ref="mrp.model_mrp_production"/> <field eval=""""state"""" name="kind"/> - <field eval="""" Requisition for raw materials."""" name="note"/> + <field eval=""""Drives the requisition orders for raw material."""" name="note"/> <field eval=""""Production Order"""" name="name"/> <field name="process_id" ref="process_process_procurementprocess0"/> <field eval=""""object.state in ('draft', 'picking_except', 'confirmed', 'ready', 'in_production', 'cancel', 'done')"""" name="model_states"/> @@ -55,8 +55,8 @@ <field name="menu_id" ref="mrp.menu_action_orderpoint_form"/> <field name="model_id" ref="mrp.model_stock_warehouse_orderpoint"/> <field eval=""""state"""" name="kind"/> - <field eval="""" Requisition is created if the product quantity is lower than the minimum limit."""" name="note"/> - <field eval=""""Minimum Stock Rule"""" name="name"/> + <field eval=""""Linked to the 'Minimum stock rule' supplying method."""" name="note"/> + <field eval=""""Minimum Stock"""" name="name"/> <field name="process_id" ref="process_process_procurementprocess0"/> <field eval="1" name="flow_start"/> </record> @@ -65,7 +65,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=""""Central document to Requisition of products"""" name="note"/> + <field eval=""""The way to requisition depends on the product type."""" name="note"/> <field eval=""""Procure Products"""" name="name"/> <field name="process_id" ref="process_process_procurementprocess0"/> <field eval=""""object.state in ('draft', 'confirmed', 'cancel', 'exception', 'running', 'done', 'waiting')"""" name="model_states"/> @@ -76,7 +76,7 @@ <field name="menu_id" ref="mrp.menu_mrp_procurement_action"/> <field name="model_id" ref="mrp.model_mrp_procurement"/> <field eval=""""subflow"""" name="kind"/> - <field eval=""""For stockable and consumable"""" name="note"/> + <field eval=""""Product type is Stockable or Consumable."""" name="note"/> <field eval=""""Stockable Product"""" name="name"/> <field name="subflow_id" ref="process_process_stockableproductprocess0"/> <field name="process_id" ref="process_process_procurementprocess0"/> @@ -88,8 +88,8 @@ <field name="menu_id" ref="mrp.menu_mrp_procurement_action"/> <field name="model_id" ref="mrp.model_mrp_procurement"/> <field eval=""""subflow"""" name="kind"/> - <field eval=""""If Product type is service"""" name="note"/> - <field eval=""""Service"""" name="name"/> + <field eval=""""Product type is service"""" name="note"/> + <field eval=""""Service Product"""" name="name"/> <field name="subflow_id" ref="process_process_serviceproductprocess0"/> <field name="process_id" ref="process_process_procurementprocess0"/> <field eval=""""object.state in ('draft', 'confirmed', 'cancel', 'exception', 'running', 'done', 'waiting')"""" name="model_states"/> @@ -100,8 +100,8 @@ <field name="menu_id" ref="mrp.menu_mrp_procurement_action"/> <field name="model_id" ref="mrp.model_mrp_procurement"/> <field eval=""""subflow"""" name="kind"/> - <field eval="""" Requisitions"""" name="name"/> - <field eval="""" Requisition orders"""" name="note"/> + <field eval=""""Procurement Orders"""" name="name"/> + <field eval=""""For purchased material"""" name="note"/> <field name="subflow_id" ref="process_process_procurementprocess0"/> <field name="process_id" ref="purchase.process_process_purchaseprocess0"/> <field eval="1" name="flow_start"/> @@ -111,8 +111,8 @@ <field name="menu_id" ref="mrp.menu_action_orderpoint_form"/> <field name="model_id" ref="mrp.model_stock_warehouse_orderpoint"/> <field eval=""""state"""" name="kind"/> - <field eval=""""Minimum stock rule"""" name="name"/> - <field eval=""""Create minimum stock rules"""" name="note"/> + <field eval=""""Minimum Stock"""" name="name"/> + <field eval=""""Automatic procurement rule"""" name="note"/> <field name="process_id" ref="product.process_process_productprocess0"/> <field eval="0" name="flow_start"/> </record> @@ -122,7 +122,7 @@ <field name="model_id" ref="mrp.model_mrp_routing"/> <field eval=""""state"""" name="kind"/> <field eval=""""Routing"""" name="name"/> - <field eval=""""Define a routing to describe the manufacturing steps."""" name="note"/> + <field eval=""""Manufacturing Steps."""" name="note"/> <field name="process_id" ref="product.process_process_productprocess0"/> <field eval="0" name="flow_start"/> </record> @@ -131,8 +131,8 @@ <field name="menu_id" ref="mrp.menu_mrp_bom_form_action"/> <field name="model_id" ref="mrp.model_mrp_bom"/> <field eval=""""state"""" name="kind"/> - <field eval=""""Bill of Materials"""" name="name"/> - <field eval=""""Define the product structure, with sub-products and/or components."""" name="note"/> + <field eval=""""Bill of Material"""" name="name"/> + <field eval=""""Product's structure"""" name="note"/> <field name="process_id" ref="product.process_process_productprocess0"/> <field eval="0" name="flow_start"/> </record> @@ -144,8 +144,8 @@ <record id="process_transition_servicemto0" model="process.transition"> <field eval="[(6,0,[])]" name="role_ids"/> <field eval="[(6,0,[])]" name="transition_ids"/> - <field eval=""""Serivce Stockable Order"""" name="name"/> - <field eval=""""If product type is service and requisition method is Make to order"""" name="note"/> + <field eval=""""Make to Order"""" name="name"/> + <field eval=""""If the service has a 'Produce' supply method, this creates a task in the project management module of OpenERP."""" name="note"/> <field model="process.node" name="target_node_id" ref="mrp.process_node_serviceonorder0"/> <field model="process.node" name="source_node_id" ref="process_node_serviceproduct1"/> </record> @@ -153,8 +153,8 @@ <record id="process_transition_servicemts0" model="process.transition"> <field eval="[(6,0,[])]" name="role_ids"/> <field eval="[(6,0,[])]" name="transition_ids"/> - <field eval=""""Service Make to Stock"""" name="name"/> - <field eval=""""If Product type is service and requisition method is Make to stock"""" name="note"/> + <field eval=""""Make to Stock"""" name="name"/> + <field eval=""""This is used in case of a service without any impact in the system, a training session for instance."""" name="note"/> <field model="process.node" name="target_node_id" ref="mrp.process_node_servicemts0"/> <field model="process.node" name="source_node_id" ref="process_node_serviceproduct1"/> </record> @@ -162,8 +162,8 @@ <record id="process_transition_stockmts0" model="process.transition"> <field eval="[(6,0,[])]" name="role_ids"/> <field eval="[(6,0,[])]" name="transition_ids"/> - <field eval=""""Stockable Make to Stock"""" name="name"/> - <field eval=""""If Product type is Stockable and requisition method is make to stock"""" name="note"/> + <field eval=""""Make to Stock"""" name="name"/> + <field eval=""""The system waits for the products to be available in the stock. These products are typically procured manually or through a minimum stock rule."""" name="note"/> <field model="process.node" name="target_node_id" ref="mrp.process_node_mts0"/> <field model="process.node" name="source_node_id" ref="process_node_stockproduct1"/> </record> @@ -171,8 +171,8 @@ <record id="process_transition_stockproduct0" model="process.transition"> <field eval="[(6,0,[])]" name="role_ids"/> <field eval="[(6,0,[])]" name="transition_ids"/> - <field eval=""""Stockable Product Stock"""" name="name"/> - <field eval=""""Product type is Stockable and Requisition method is make to stock"""" name="note"/> + <field eval=""""Make to Order"""" name="name"/> + <field eval=""""The system creates an order (production or purchased) depending on the sold quantity and the products parameters."""" name="note"/> <field model="process.node" name="target_node_id" ref="mrp.process_node_stock0"/> <field model="process.node" name="source_node_id" ref="process_node_stockproduct1"/> </record> @@ -180,8 +180,8 @@ <record id="process_transition_productionprocureproducts0" model="process.transition"> <field eval="[(6,0,[])]" name="role_ids"/> <field eval="[(6,0,[])]" name="transition_ids"/> - <field eval=""""Production Requisition Products"""" name="name"/> - <field eval=""""When any procuere products, it comes into the prpcurement orders"""" name="note"/> + <field eval=""""Requisition of raw material"""" name="name"/> + <field eval=""""In order to supply raw material (to be purchased or produced), the production order creates as much requisition orders as components listed in the BOM, through a run of the schedulers (MRP)."""" name="note"/> <field model="process.node" name="target_node_id" ref="process_node_procureproducts0"/> <field model="process.node" name="source_node_id" ref="process_node_productionorder0"/> </record> @@ -189,8 +189,8 @@ <record id="process_transition_minimumstockprocure0" model="process.transition"> <field eval="[(6,0,[])]" name="role_ids"/> <field eval="[(6,0,[])]" name="transition_ids"/> - <field eval=""""Minimum Stock Procure"""" name="name"/> - <field eval=""""From minimum stock rules, it goes for procure product."""" name="note"/> + <field eval=""""'Minimum stock rule' material"""" name="name"/> + <field eval=""""The 'Minimum stock rule' allows the system to create procurement orders automatically as soon as the minimum stock is reached."""" name="note"/> <field model="process.node" name="target_node_id" ref="process_node_procureproducts0"/> <field model="process.node" name="source_node_id" ref="process_node_minimumstockrule0"/> </record> @@ -198,8 +198,8 @@ <record id="process_transition_procurestockableproduct0" model="process.transition"> <field eval="[(6,0,[])]" name="role_ids"/> <field eval="[(6,0,[])]" name="transition_ids"/> - <field eval=""""Procure Stockable Product"""" name="name"/> - <field eval=""""if Product type is Stockable in procurement order"""" name="note"/> + <field eval=""""Procurement of stockable Products"""" name="name"/> + <field eval=""""Depending on the chosen method to supply the stockable products, the procurement order creates a RFQ, a production order, ... """" name="note"/> <field model="process.node" name="target_node_id" ref="process_node_stockproduct0"/> <field model="process.node" name="source_node_id" ref="process_node_procureproducts0"/> </record> @@ -207,8 +207,8 @@ <record id="process_transition_procureserviceproduct0" model="process.transition"> <field eval="[(6,0,[])]" name="role_ids"/> <field eval="[(6,0,[])]" name="transition_ids"/> - <field eval=""""Procure Service"""" name="name"/> - <field eval=""""In procurement order, if product type is service"""" name="note"/> + <field eval=""""Requisition of services"""" name="name"/> + <field eval=""""Depending on the chosen method to 'supply' the service, the requisition order creates a RFQ for a subcontracting purchase order or waits until the service is done (= the delivery of the products)."""" name="note"/> <field model="process.node" name="target_node_id" ref="process_node_serviceproduct0"/> <field model="process.node" name="source_node_id" ref="process_node_procureproducts0"/> </record> @@ -216,8 +216,8 @@ <record id="process_transition_purchaseprocure0" model="process.transition"> <field eval="[(6,0,[])]" name="role_ids"/> <field eval="[(6,0,[])]" name="transition_ids"/> - <field eval=""""Procurement Purchase"""" name="name"/> - <field eval=""""Procurement convert into the draft purchase order."""" name="note"/> + <field eval=""""Automatic RFQ"""" name="name"/> + <field eval=""""The system launches automatically a RFQ to the preferred supplier."""" name="note"/> <field model="process.node" name="target_node_id" ref="purchase.process_node_draftpurchaseorder0"/> <field model="process.node" name="source_node_id" ref="process_node_purchaseprocure0"/> </record> @@ -225,8 +225,8 @@ <record id="process_transition_producttostockrules0" model="process.transition"> <field eval="[(6,0,[])]" name="role_ids"/> <field eval="[(6,0,[])]" name="transition_ids"/> - <field eval=""""Product to stock rules"""" name="name"/> - <field eval=""""you can see the minimum stock rules from product"""" name="note"/> + <field eval=""""Procurement rule"""" name="name"/> + <field eval=""""The Minimum Stock Rule is an automatic procurement rule based on a mini and maxi quantity. It's available in the Stock management menu and configured by product."""" name="note"/> <field model="process.node" name="target_node_id" ref="process_node_productminimumstockrule0"/> <field model="process.node" name="source_node_id" ref="product.process_node_product0"/> </record> @@ -234,8 +234,8 @@ <record id="process_transition_billofmaterialrouting0" model="process.transition"> <field eval="[(6,0,[])]" name="role_ids"/> <field eval="[(6,0,[])]" name="transition_ids"/> - <field eval=""""Material routing"""" name="name"/> - <field eval=""""An entry is being made from billing material to routing."""" name="note"/> + <field eval=""""Material Routing"""" name="name"/> + <field eval=""""The Bill of Material is linked to a routing, i.e. the succession of work centers."""" name="note"/> <field model="process.node" name="target_node_id" ref="process_node_routing0"/> <field model="process.node" name="source_node_id" ref="process_node_billofmaterial0"/> </record> @@ -243,8 +243,8 @@ <record id="process_transition_bom0" model="process.transition"> <field eval="[(6,0,[])]" name="role_ids"/> <field eval="[(6,0,[])]" name="transition_ids"/> - <field eval=""""BOM"""" name="name"/> - <field eval=""""You can see its bill of material which are used to make product"""" name="note"/> + <field eval=""""Manufacturing decomposition"""" name="name"/> + <field eval=""""The Bill of Material is the product's decomposition. The components (that are products themselves) can also have their own Bill of Material (multi-level)."""" name="note"/> <field model="process.node" name="target_node_id" ref="process_node_billofmaterial0"/> <field model="process.node" name="source_node_id" ref="product.process_node_product0"/> </record> 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> diff --git a/addons/mrp/process/stockable_product_process.xml b/addons/mrp/process/stockable_product_process.xml index 107374a3e36..c053103f476 100644 --- a/addons/mrp/process/stockable_product_process.xml +++ b/addons/mrp/process/stockable_product_process.xml @@ -7,7 +7,7 @@ --> <record id="process_process_stockableproductprocess0" model="process.process"> - <field eval=""""Stockable Product Process"""" name="name"/> + <field eval=""""Stockable Product"""" name="name"/> <field name="model_id" ref="mrp.model_mrp_procurement"/> <field eval="1" name="active"/> </record> @@ -20,7 +20,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=""""The systems awaits requests for products in stock."""" name="note"/> + <field eval=""""Assignment from stock."""" name="note"/> <field eval=""""Make to Stock"""" name="name"/> <field name="process_id" ref="process_process_stockableproductprocess0"/> <field eval=""""object.state in ('draft', 'confirmed', 'cancel', 'exception', 'running', 'done', 'waiting')"""" name="model_states"/> @@ -31,18 +31,18 @@ <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=""""Wait for available products for reservation"""" name="note"/> - <field eval=""""Stockable Stock"""" 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_stockableproductprocess0"/> <field eval=""""object.state in ('draft', 'confirmed', 'cancel', 'exception', 'running', 'done', 'waiting')"""" name="model_states"/> <field eval="0" name="flow_start"/> </record> <record id="process_node_rfq0" model="process.node"> - <field name="menu_id" ref="purchase.menu_purchase_order_draft"/> + <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 Request for Quotation is created and sent to the supplier."""" 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_stockableproductprocess0"/> @@ -54,7 +54,7 @@ <field name="menu_id" ref="mrp.menu_mrp_production_action"/> <field name="model_id" ref="mrp.model_mrp_production"/> <field eval=""""state"""" name="kind"/> - <field eval=""""Production orders are created for product manufacturing."""" name="note"/> + <field eval=""""Manufacturing Plan."""" name="note"/> <field eval=""""Production Order"""" name="name"/> <field name="process_id" ref="process_process_stockableproductprocess0"/> <field eval=""""object.state=='confirmed'"""" name="model_states"/> @@ -68,8 +68,8 @@ <record id="process_transition_stockrfq0" model="process.transition"> <field eval="[(6,0,[])]" name="role_ids"/> <field eval="[(6,0,[])]" name="transition_ids"/> - <field eval=""""Stockable Request"""" name="name"/> - <field eval=""""If Product type is Stockable and Requisition method is make to stock"""" name="note"/> + <field eval=""""To Buy"""" name="name"/> + <field eval=""""In case the Supply method of the product is Buy, the system creates a purchase order."""" name="note"/> <field model="process.node" name="target_node_id" ref="process_node_rfq0"/> <field model="process.node" name="source_node_id" ref="process_node_stock0"/> </record> @@ -77,11 +77,11 @@ <record id="process_transition_stockproduction0" model="process.transition"> <field eval="[(6,0,[])]" name="role_ids"/> <field eval="[(6,0,[])]" name="transition_ids"/> - <field eval=""""Stockable Production Order"""" name="name"/> - <field eval=""""If Requisition method is Make to order and supply method is produce"""" name="note"/> + <field eval=""""To Produce"""" name="name"/> + <field eval=""""In case the Supply method of the product is Produce, the system creates a production order."""" name="note"/> <field model="process.node" name="target_node_id" ref="process_node_production0"/> <field model="process.node" name="source_node_id" ref="process_node_stock0"/> </record> </data> -</openerp>
\ No newline at end of file +</openerp> |