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 | |
| 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')
| -rw-r--r-- | addons/mrp/mrp.py | 9 | ||||
| -rw-r--r-- | addons/mrp/mrp_view.xml | 70 | ||||
| -rw-r--r-- | addons/mrp/mrp_wizard.xml | 3 | ||||
| -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 |
6 files changed, 98 insertions, 104 deletions
diff --git a/addons/mrp/mrp.py b/addons/mrp/mrp.py index 261758908b9..56edccd582a 100644 --- a/addons/mrp/mrp.py +++ b/addons/mrp/mrp.py @@ -434,8 +434,9 @@ class mrp_production(osv.osv): 'move_created_ids': fields.one2many('stock.move', 'production_id', 'Moves Created'), 'product_lines': fields.one2many('mrp.production.product.line', 'production_id', 'Scheduled goods'), 'workcenter_lines': fields.one2many('mrp.production.workcenter.line', 'production_id', 'Workcenters Utilisation'), - - 'state': fields.selection([('draft','Draft'),('picking_except', 'Picking Exception'),('confirmed','Waiting Goods'),('ready','Ready to Produce'),('in_production','In Production'),('cancel','Cancelled'),('done','Done')],'Status', readonly=True), + 'state': fields.selection([('draft','Draft'),('picking_except', 'Picking Exception'),('confirmed','Waiting Goods'),('ready','Ready to Produce'),('in_production','In Production'),('cancel','Cancelled'),('done','Done')],'State', readonly=True, + help='When the production order is created the state is set to \'Draft\'.\n If the order is confirmed the state is set to \'Waiting Goods\'.\n If any exceptions are there, the state is set to \'Packing Exception\'.\ + \nIf the stock is available then the state is set to \'Ready to Produce\'.\n When the production get started then the state is set to \'In Production\'.\n When the production is over, the state is set to \'Done\'.'), 'hour_total': fields.function(_production_calc, method=True, type='float', string='Total Hours', multi='workorder'), 'cycle_total': fields.function(_production_calc, method=True, type='float', string='Total Cycles', multi='workorder'), @@ -820,7 +821,9 @@ class mrp_procurement(osv.osv): ('cancel','Cancel'), ('ready','Ready'), ('done','Done'), - ('waiting','Waiting')], 'Status', required=True), + ('waiting','Waiting')], 'State', required=True, + help='When a procurement is created the state is set to \'Draft\'.\n If the procurement is confirmed, the state is set to \'Confirmed\'.\ + \nAfter confirming the state is set to \'Running\'.\n If any exception arises in the order then the state is set to \'Exception\'.\n Once the exception is removed the state becomes \'Ready\'.\n It is in \'Waiting\'. state when the procurement is waiting for another one to finish.'), 'note' : fields.text('Note'), } _defaults = { diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml index b4c52271515..c415a12d7c3 100644 --- a/addons/mrp/mrp_view.xml +++ b/addons/mrp/mrp_view.xml @@ -7,8 +7,8 @@ <menuitem id="menu_mrp_reordering" name="Automatic Requisitions" parent="stock.menu_stock_root" sequence="4"/> <!-- - Property / Property Group - --> + Property / Property Group + --> <record id="mrp_property_group_form_view" model="ir.ui.view"> <field name="name">mrp.property.group.form</field> @@ -33,7 +33,8 @@ id="menu_mrp_configuration" name="Configuration" parent="menu_mrp_root" - groups="group_mrp_manager"/> + groups="group_mrp_manager" + sequence="-50" /> <menuitem id="menu_mrp_property_group_action_prop" name="Properties" @@ -84,8 +85,8 @@ parent="menu_mrp_property_group_action_prop"/> <!-- - Workcenters - --> + Workcenters + --> <record id="mrp_workcenter_tree_view" model="ir.ui.view"> <field name="name">mrp.workcenter.tree</field> @@ -144,11 +145,11 @@ <field name="view_type">form</field> <field name="view_id" ref="mrp_workcenter_tree_view"/> </record> - <menuitem action="mrp_workcenter_action" id="menu_mrp_workcenter_action" parent="menu_mrp_configuration"/> + <menuitem action="mrp_workcenter_action" id="menu_mrp_workcenter_action" parent="menu_mrp_configuration" groups="base.group_extended" /> <!-- - Routings - --> + Routings + --> <record id="mrp_routing_workcenter_tree_view" model="ir.ui.view"> <field name="name">mrp.routing.workcenter.tree</field> @@ -218,11 +219,11 @@ <field name="view_type">form</field> <field name="view_id" ref="mrp_routing_tree_view"/> </record> - <menuitem action="mrp_routing_action" id="menu_mrp_routing_action" parent="menu_mrp_configuration"/> + <menuitem action="mrp_routing_action" id="menu_mrp_routing_action" parent="menu_mrp_configuration" groups="base.group_extended"/> <!-- - Bill of Materials - --> + Bill of Materials + --> <record id="mrp_bom_form_view" model="ir.ui.view"> <field name="name">mrp.bom.form</field> @@ -230,12 +231,14 @@ <field name="type">form</field> <field name="arch" type="xml"> <form string="Bill of Material"> - <field name="product_id" on_change="onchange_product_id(product_id, name)" select="1"/> + <group colspan="4" col="6"> + <field name="product_id" on_change="onchange_product_id(product_id, name)" select="1"/> + <field name="name" select="1"/> + <field name="code" select="1"/> + </group> <newline/> <field name="product_uom"/> <field name="product_qty"/> - <field name="name" select="1"/> - <field name="code" select="1"/> <newline/> <field name="product_uos" groups="product.group_uos"/> <field name="product_uos_qty" groups="product.group_uos"/> @@ -530,10 +533,10 @@ <filter icon="terp-mrp" string="In Production" domain="[('state','=','in_production')]" help="Production orders which are in production"/> <separator orientation="vertical"/> <field name="name" select='1'/> - <field name="product_id" select='1'/> - <field name="routing_id" select='1'/> + <field name="product_id" select='1'/> + <field name="routing_id" select='1'/> <field name="origin" select='1'/> - </group> + </group> </search> </field> </record> @@ -547,7 +550,7 @@ <field name="view_id" eval="False"/> <field name="search_view_id" ref="view_mrp_production_filter"/> </record> - <menuitem action="mrp_production_action" id="menu_mrp_production_action" parent="menu_mrp_root"/> + <menuitem action="mrp_production_action" id="menu_mrp_production_action" parent="menu_mrp_root" sequence="-30"/> <record id="mrp_production_action2_gantt" model="ir.actions.act_window"> <field name="name">Production Orders Planning</field> @@ -557,11 +560,6 @@ <field name="view_mode">gantt,tree,form,calendar,graph</field> <field name="domain">[('state','in',('ready','confirmed','in_production'))]</field> </record> - <menuitem - action="mrp_production_action2_gantt" - id="menu_production_orders_start_gantt" - parent="menu_mrp_production_action" - sequence="20" icon="terp-calendar"/> <record id="mrp_production_action2" model="ir.actions.act_window"> <field name="name">Production Orders To Start</field> @@ -573,7 +571,7 @@ <field name="filter" eval="True"/> <field name="search_view_id" ref="view_mrp_production_filter"/> </record> - <menuitem action="mrp_production_action2" id="menu_production_orders_start" parent="menu_mrp_production_action" groups="base.group_useability_extended" /> + <record id="mrp_production_action3" model="ir.actions.act_window"> <field name="name">Production Orders in Progress</field> <field name="type">ir.actions.act_window</field> @@ -584,7 +582,7 @@ <field name="filter" eval="True"/> <field name="search_view_id" ref="view_mrp_production_filter"/> </record> - <menuitem action="mrp_production_action3" id="menu_mrp_production_action3" parent="menu_mrp_production_action" groups="base.group_useability_extended"/> + <record id="mrp_production_action4" model="ir.actions.act_window"> <field name="name">Production Orders Waiting Products</field> <field name="type">ir.actions.act_window</field> @@ -595,7 +593,6 @@ <field name="filter" eval="True"/> <field name="search_view_id" ref="view_mrp_production_filter"/> </record> - <menuitem action="mrp_production_action4" id="menu_production_orders_waiting4" parent="mrp.menu_mrp_production_action" groups="base.group_useability_extended"/> <record id="mrp_production_new" model="ir.actions.act_window"> <field name="name">New Production Order</field> @@ -604,7 +601,6 @@ <field name="view_type">form</field> <field name="view_mode">form,tree,calendar,graph,gantt</field> </record> - <menuitem action="mrp_production_new" id="menu_production_orders_new" parent="mrp.menu_mrp_production_action"/> <record id="mrp_production_lot_form_view" model="ir.ui.view"> <field name="name">mrp.production.lot.line.form</field> @@ -754,15 +750,15 @@ <field name="type">search</field> <field name="arch" type="xml"> <search string="Search Requisition"> - <group col='8' colspan='4'> - <filter icon="terp-mrp" string="Exceptions" domain="[('state','=','exception')]" help="Procurement orders with exceptions"/> + <group col='8' colspan='4'> + <filter icon="terp-mrp" string="Exceptions" domain="[('state','=','exception')]" help="Requisition orders with exceptions"/> <separator orientation="vertical"/> <field name="name" select='1'/> - <field name="product_id" select='1'/> - <field name="date_planned" select='1'/> + <field name="product_id" select='1'/> + <field name="date_planned" select='1'/> <field name="state" select='1'/> - </group> - </search> + </group> + </search> </field> </record> <record id="mrp_procurement_action" model="ir.actions.act_window"> @@ -773,7 +769,8 @@ <field name="view_id" eval="False"/> <field name="search_view_id" ref="view_mrp_procurement_filter"/> </record> - <menuitem action="mrp_procurement_action" id="menu_mrp_procurement_action" parent="mrp.menu_mrp_root" groups="base.group_extended" /> + <menuitem action="mrp_procurement_action" id="menu_mrp_procurement_action" parent="mrp.menu_mrp_root" + sequence="-40" /> <record id="mrp_procurement_action3" model="ir.actions.act_window"> <field name="name">Unscheduled Requisitions</field> @@ -783,7 +780,6 @@ <field name="view_mode">tree,form</field> <field name="domain">[('state','=','confirmed')]</field> </record> - <menuitem action="mrp_procurement_action3" id="menu_mrp_procurement_action3" parent="mrp.menu_mrp_procurement_action" groups="base.group_useability_extended"/> <record id="mrp_procurement_action5" model="ir.actions.act_window"> <field name="name">Requisition Exceptions</field> @@ -793,7 +789,6 @@ <field name="view_mode">tree,form</field> <field name="domain">[('state','=','exception')]</field> </record> - <menuitem action="mrp_procurement_action5" id="menu_mrp_procurement_action5" parent="menu_mrp_reordering" groups="base.group_useability_extended"/> <record id="mrp_procurement_action4" model="ir.actions.act_window"> <field name="name">Requisition Exceptions to Fix</field> @@ -804,7 +799,6 @@ <field name="domain">[('state','=','exception'), ('message', '<>', '')]</field> <field name="filter" eval="True"/> </record> - <menuitem action="mrp_procurement_action4" id="menu_mrp_procurement_action4" parent="mrp.menu_mrp_procurement_action5" groups="base.group_useability_extended"/> <record id="mrp_procurement_action11" model="ir.actions.act_window"> <field name="name">Temporary Requisition Exceptions</field> @@ -814,7 +808,6 @@ <field name="view_mode">tree,form</field> <field name="domain">[('state','=','exception'), ('message', '=', '')]</field> </record> - <menuitem action="mrp_procurement_action11" id="menu_mrp_procurement_action11" parent="mrp.menu_mrp_procurement_action5" groups="base.group_useability_extended"/> <record id="mrp_procurement_new" model="ir.actions.act_window"> <field name="name">New Requisition</field> @@ -823,7 +816,6 @@ <field name="view_type">form</field> <field name="view_mode">form,tree</field> </record> - <menuitem action="mrp_procurement_new" id="menu_mrp_procurement_new" parent="mrp.menu_mrp_procurement_action"/> <!-- Order Point --> <record id="view_warehouse_orderpoint_tree" model="ir.ui.view"> diff --git a/addons/mrp/mrp_wizard.xml b/addons/mrp/mrp_wizard.xml index af0d7bd91e6..06c9f7aae3a 100644 --- a/addons/mrp/mrp_wizard.xml +++ b/addons/mrp/mrp_wizard.xml @@ -2,8 +2,7 @@ <openerp> <data> <wizard id="wiz_mrp_proc0" model="mrp.procurement" string="Compute All Schedulers" name="mrp.procurement.compute.all"/> - <menuitem action="wiz_mrp_proc0" id="mrp_Sched_all" parent="mrp.menu_mrp_root" type="wizard" sequence="100"/> - + <menuitem action="wiz_mrp_proc0" id="mrp_Sched_all" parent="mrp.menu_mrp_root" type="wizard" sequence="-49"/> <wizard id="wiz_mrp_proc1" model="mrp.procurement" string="Compute Requisitions Only" name="mrp.procurement.compute"/> <menuitem action="wiz_mrp_proc1" id="menu_wiz_mrp_proc1" parent="mrp.mrp_Sched_all" type="wizard"/> 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> |