diff --git a/addons/mrp/mrp.py b/addons/mrp/mrp.py index 3214cad5a5c..22d493a7d48 100644 --- a/addons/mrp/mrp.py +++ b/addons/mrp/mrp.py @@ -454,7 +454,7 @@ class mrp_production(osv.osv): 'priority': fields.selection([('0','Not urgent'),('1','Normal'),('2','Urgent'),('3','Very Urgent')], 'Priority', select=True), 'product_id': fields.many2one('product.product', 'Product', required=True, readonly=True, states={'draft':[('readonly',False)]}), - 'product_qty': fields.float('Product Qty', digits_compute=dp.get_precision('Product Unit of Measure'), required=True, states={'draft':[('readonly',False)]}, readonly=True), + 'product_qty': fields.float('Product Quantity', digits_compute=dp.get_precision('Product Unit of Measure'), required=True, states={'draft':[('readonly',False)]}, readonly=True), 'product_uom': fields.many2one('product.uom', 'Product Unit of Measure', required=True, states={'draft':[('readonly',False)]}, readonly=True), 'product_uos_qty': fields.float('Product UoS Qty', states={'draft':[('readonly',False)]}, readonly=True), 'product_uos': fields.many2one('product.uom', 'Product UoS', states={'draft':[('readonly',False)]}, readonly=True), @@ -466,13 +466,13 @@ class mrp_production(osv.osv): 'date_planned_end': fields.function(_production_date_end, type='date', string='Scheduled End Date'), 'date_planned_date': fields.function(_production_date, type='date', string='Scheduled Date'), - 'date_planned': fields.datetime('Scheduled date', required=True, select=1), + 'date_planned': fields.datetime('Scheduled Date', required=True, select=1), 'date_start': fields.datetime('Start Date', select=True), 'date_finished': fields.datetime('End Date', select=True), 'bom_id': fields.many2one('mrp.bom', 'Bill of Material', domain=[('bom_id','=',False)], readonly=True, states={'draft':[('readonly',False)]}), 'routing_id': fields.many2one('mrp.routing', string='Routing', on_delete='set null', readonly=True, states={'draft':[('readonly',False)]}, help="The list of operations (list of work centers) to produce the finished product. The routing is mainly used to compute work center costs during operations and to plan future loads on work centers based on production plannification."), - 'picking_id': fields.many2one('stock.picking', 'Picking list', readonly=True, ondelete="restrict", + 'picking_id': fields.many2one('stock.picking', 'Picking List', readonly=True, ondelete="restrict", help="This is the Internal Picking List that brings the finished product to the production plan"), 'move_prod_id': fields.many2one('stock.move', 'Move product', readonly=True), 'move_lines': fields.many2many('stock.move', 'mrp_production_move_ids', 'production_id', 'move_id', 'Products to Consume', domain=[('state','not in', ('done', 'cancel'))], states={'done':[('readonly',True)]}), @@ -1094,8 +1094,8 @@ class mrp_production_workcenter_line(osv.osv): _columns = { 'name': fields.char('Work Order', size=64, required=True), 'workcenter_id': fields.many2one('mrp.workcenter', 'Work Center', required=True), - 'cycle': fields.float('Nbr of cycles', digits=(16,2)), - 'hour': fields.float('Nbr of hours', digits=(16,2)), + 'cycle': fields.float('Number of Cycles', digits=(16,2)), + 'hour': fields.float('Number of Hours', digits=(16,2)), 'sequence': fields.integer('Sequence', required=True, help="Gives the sequence order when displaying a list of work orders."), 'production_id': fields.many2one('mrp.production', 'Production Order', select=True, ondelete='cascade', required=True), } @@ -1112,7 +1112,7 @@ class mrp_production_product_line(osv.osv): _columns = { 'name': fields.char('Name', size=64, required=True), 'product_id': fields.many2one('product.product', 'Product', required=True), - 'product_qty': fields.float('Product Qty', digits_compute=dp.get_precision('Product Unit of Measure'), required=True), + 'product_qty': fields.float('Product Quantity', digits_compute=dp.get_precision('Product Unit of Measure'), required=True), 'product_uom': fields.many2one('product.uom', 'Product Unit of Measure', required=True), 'product_uos_qty': fields.float('Product UOS Qty'), 'product_uos': fields.many2one('product.uom', 'Product UOS'), diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml index 9b1079dc34e..47c70636eef 100644 --- a/addons/mrp/mrp_view.xml +++ b/addons/mrp/mrp_view.xml @@ -37,7 +37,9 @@ mrp.property.group form tree,form - Define specific property groups that can be assigned to the properties of your bill of materials. + + Define specific property groups that can be assigned to the properties of your bill of materials. + form tree,form - The Properties in OpenERP are used to select the right bill of materials for manufacturing a product when you have different ways of building the same product. You can assign several properties to each Bill of Materials. When a sales person creates a sales order, he can relate it to several properties and OpenERP will automatically select the BoM to use according the needs. + + The Properties in OpenERP are used to select the right bill of materials for manufacturing + a product when you have different ways of building the same product. + You can assign several properties to each bill of materials. + When a salesperson creates a sale order, they can relate it to several properties + and OpenERP will automatically select the BoM to use according the needs. + form - Routings allow you to create and manage the manufacturing operations that should be followed within your work centers in order to produce a product. They are attached to bills of materials that will define the required raw materials. + + Routings allow you to create and manage the manufacturing operations that should be + followed within your work centers in order to produce a product. + They are attached to bills of materials that will define the required raw materials. + @@ -321,65 +333,65 @@ form
- -
@@ -423,7 +435,7 @@ - + @@ -445,7 +457,7 @@ - + @@ -461,7 +473,13 @@ form [('bom_id','=',False)] - Master Bills of Materials allow you to create and manage the list of necessary raw materials used to make a finished product. OpenERP will use these BoMs to automatically propose manufacturing orders according to product needs. You can either create a bill of materials to define specific production steps or define a single multi-level bill of materials. + + Master Bills of Materials allow you to create and manage the list of necessary + raw materials used to make a finished product. + OpenERP uses these BoMs to automatically propose manufacturing orders according to product needs. + You can either create a bill of materials to define specific production steps, + or define a single multi-level bill of materials. + Bill of Material Components @@ -470,7 +488,10 @@ form [('bom_id','!=',False)] - Bills of materials components are components and sub-products used to create master bills of materials. Use this menu to search in which BoM a specific component is used. + + Bills of materials components are components and sub-products used to create master bills of materials. + Use this menu to search in which BoM a specific component is used. + @@ -541,13 +562,13 @@ mrp.production tree - + - + @@ -603,9 +624,9 @@
-
-