From 09dda00b77bbc7ae1439b8a706a7d0c4cb59905f Mon Sep 17 00:00:00 2001 From: "Kuldeep Joshi (OpenERP)" Date: Sat, 14 Jul 2012 11:57:55 +0530 Subject: [PATCH] [IMP]mrp: revert change bzr revid: kjo@tinyerp.com-20120714062755-fyu9lqgn7xpmylz8 --- addons/mrp/mrp.py | 4 +- addons/mrp/mrp_view.xml | 290 +++++++++++++++++++++++----------------- 2 files changed, 168 insertions(+), 126 deletions(-) diff --git a/addons/mrp/mrp.py b/addons/mrp/mrp.py index e389299002a..56ac47095a1 100644 --- a/addons/mrp/mrp.py +++ b/addons/mrp/mrp.py @@ -206,7 +206,7 @@ class mrp_bom(osv.osv): 'product_id': fields.many2one('product.product', 'Product', required=True), 'product_uos_qty': fields.float('Product UOS Qty'), 'product_uos': fields.many2one('product.uom', 'Product UOS', help="Product UOS (Unit of Sale) is the unit of measurement for the invoicing and promotion of stock."), - 'product_qty': fields.float('Product Qty', required=True, digits_compute=dp.get_precision('Product Unit of Measure')), + 'product_qty': fields.float('Product Quantity', required=True, digits_compute=dp.get_precision('Product Unit of Measure')), 'product_uom': fields.many2one('product.uom', 'Product Unit of Measure', required=True, help="Unit of Measure (Unit of Measure) is the unit of measurement for the inventory control"), 'product_rounding': fields.float('Product Rounding', help="Rounding applied on the product quantity."), 'product_efficiency': fields.float('Manufacturing Efficiency', required=True, help="A factor of 0.9 means a loss of 10% within the production process."), @@ -456,7 +456,7 @@ class mrp_production(osv.osv): 'product_id': fields.many2one('product.product', 'Product', required=True, readonly=True, states={'draft':[('readonly',False)]}), '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_qty': fields.float('Product UoS Quantity', states={'draft':[('readonly',False)]}, readonly=True), 'product_uos': fields.many2one('product.uom', 'Product UoS', states={'draft':[('readonly',False)]}, readonly=True), 'location_src_id': fields.many2one('stock.location', 'Raw Materials Location', required=True, diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml index 0f71d6fc204..9e0c383c473 100644 --- a/addons/mrp/mrp_view.xml +++ b/addons/mrp/mrp_view.xml @@ -32,12 +32,14 @@ - Property Group + Property Groups ir.actions.act_window 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
- - - - - - - - - - - - + + + + + - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - - + + + + + + + + + + +