From 29918c64184ff2812d602db062ab18eed3c2f933 Mon Sep 17 00:00:00 2001 From: "Jagdish Panchal (Open ERP)" Date: Wed, 25 Apr 2012 17:39:08 +0530 Subject: [PATCH] [IMP] rename UOM to Unit of Measure everywhere in sale,stock,purchase,project_long_term and project_planning bzr revid: jap@tinyerp.com-20120425120908-z13f1k2an7q01b8j --- addons/project_long_term/project_long_term.py | 2 +- addons/project_planning/project_planning.py | 4 ++-- addons/purchase/purchase.py | 6 +++--- addons/purchase/report/purchase_report.py | 2 +- .../purchase/report/purchase_report_view.xml | 2 +- addons/purchase/res_config.py | 2 +- .../purchase_requisition.py | 4 ++-- addons/sale/report/sale_report.py | 2 +- addons/sale/report/sale_report_view.xml | 2 +- addons/sale/sale.py | 2 +- addons/sale/sale_view.xml | 6 +++--- addons/sale_layout/sale_layout.py | 4 ++-- addons/sale_layout/sale_layout_view.xml | 2 +- addons/stock/product.py | 8 ++++---- addons/stock/report/report_stock_move.py | 2 +- addons/stock/res_config.py | 4 ++-- addons/stock/stock.py | 12 +++++------ addons/stock/stock_view.xml | 20 +++++++++---------- .../stock/wizard/stock_change_product_qty.py | 2 +- addons/stock/wizard/stock_move.py | 10 +++++----- addons/stock/wizard/stock_partial_picking.py | 4 ++-- addons/stock/wizard/stock_return_picking.py | 2 +- addons/stock/wizard/stock_splitinto.py | 2 +- addons/stock_planning/stock_planning.py | 16 +++++++-------- addons/stock_planning/stock_planning_view.xml | 2 +- 25 files changed, 62 insertions(+), 62 deletions(-) diff --git a/addons/project_long_term/project_long_term.py b/addons/project_long_term/project_long_term.py index 612bd784bb0..b29bd8cbf22 100644 --- a/addons/project_long_term/project_long_term.py +++ b/addons/project_long_term/project_long_term.py @@ -110,7 +110,7 @@ class project_phase(osv.osv): 'previous_phase_ids': fields.many2many('project.phase', 'project_phase_rel', 'next_phase_id', 'prv_phase_id', 'Previous Phases', states={'cancelled':[('readonly',True)]}), 'sequence': fields.integer('Sequence', select=True, help="Gives the sequence order when displaying a list of phases."), 'duration': fields.float('Duration', required=True, help="By default in days", states={'done':[('readonly',True)], 'cancelled':[('readonly',True)]}), - 'product_uom': fields.many2one('product.uom', 'Duration UoM', required=True, help="UoM (Unit of Measure) is the unit of measurement for Duration", states={'done':[('readonly',True)], 'cancelled':[('readonly',True)]}), + 'product_uom': fields.many2one('product.uom', 'Duration Unit of Measure', required=True, help="Unit of Measure (Unit of Measure) is the unit of measurement for Duration", states={'done':[('readonly',True)], 'cancelled':[('readonly',True)]}), 'task_ids': fields.one2many('project.task', 'phase_id', "Project Tasks", states={'done':[('readonly',True)], 'cancelled':[('readonly',True)]}), 'user_force_ids': fields.many2many('res.users', string='Force Assigned Users'), 'user_ids': fields.one2many('project.user.allocation', 'phase_id', "Assigned Users",states={'done':[('readonly',True)], 'cancelled':[('readonly',True)]}, diff --git a/addons/project_planning/project_planning.py b/addons/project_planning/project_planning.py index 4787aa2603b..25850a8dd8c 100644 --- a/addons/project_planning/project_planning.py +++ b/addons/project_planning/project_planning.py @@ -204,9 +204,9 @@ class report_account_analytic_planning_line(osv.osv): 'planning_id': fields.many2one('report_account_analytic.planning', 'Planning', required=True, ondelete='cascade'), 'user_id': fields.many2one('res.users', 'User', select=True), 'amount': fields.float('Quantity', required=True), - 'amount_unit': fields.many2one('product.uom', 'Qty UoM', required=True), + 'amount_unit': fields.many2one('product.uom', 'Qty Unit of Measure', required=True), 'note': fields.text('Note', size=64), - 'amount_in_base_uom': fields.function(_amount_base_uom, string='Quantity in base uom', store=True), + 'amount_in_base_uom': fields.function(_amount_base_uom, string='Quantity in base Unit of Measure', store=True), 'task_ids': fields.one2many('project.task', 'planning_line_id', 'Planning Tasks'), } _order = 'user_id, account_id' diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py index 687221f371b..35c46352f12 100644 --- a/addons/purchase/purchase.py +++ b/addons/purchase/purchase.py @@ -716,10 +716,10 @@ class purchase_order_line(osv.osv): _columns = { 'name': fields.char('Description', size=256, required=True), - 'product_qty': fields.float('Quantity', digits_compute=dp.get_precision('Product UoM'), required=True), + 'product_qty': fields.float('Quantity', digits_compute=dp.get_precision('Product Unit of Measure'), required=True), 'date_planned': fields.date('Scheduled Date', required=True, select=True), 'taxes_id': fields.many2many('account.tax', 'purchase_order_taxe', 'ord_id', 'tax_id', 'Taxes'), - 'product_uom': fields.many2one('product.uom', 'Product UOM', required=True), + 'product_uom': fields.many2one('product.uom', 'Product Unit of Measure', required=True), 'product_id': fields.many2one('product.product', 'Product', domain=[('purchase_ok','=',True)], change_default=True), 'move_ids': fields.one2many('stock.move', 'purchase_line_id', 'Reservation', readonly=True, ondelete='set null'), 'move_dest_id': fields.many2one('stock.move', 'Reservation Destination', ondelete='set null'), @@ -825,7 +825,7 @@ class purchase_order_line(osv.osv): uom_id = product_uom_po_id if product.uom_id.category_id.id != product_uom.browse(cr, uid, uom_id, context=context).category_id.id: - res['warning'] = {'title': _('Warning'), 'message': _('Selected UOM does not belong to the same category as the product UOM')} + res['warning'] = {'title': _('Warning'), 'message': _('Selected Unit of Measure does not belong to the same category as the product Unit of Measure')} uom_id = product_uom_po_id res['value'].update({'product_uom': uom_id}) diff --git a/addons/purchase/report/purchase_report.py b/addons/purchase/report/purchase_report.py index 99692907591..f7d73bfb739 100644 --- a/addons/purchase/report/purchase_report.py +++ b/addons/purchase/report/purchase_report.py @@ -50,7 +50,7 @@ class purchase_report(osv.osv): 'date_approve':fields.date('Date Approved', readonly=True), 'expected_date':fields.date('Expected Date', readonly=True), 'validator' : fields.many2one('res.users', 'Validated By', readonly=True), - 'product_uom' : fields.many2one('product.uom', 'Reference UoM', required=True), + 'product_uom' : fields.many2one('product.uom', 'Reference Unit of Measure', required=True), 'company_id':fields.many2one('res.company', 'Company', readonly=True), 'user_id':fields.many2one('res.users', 'Responsible', readonly=True), 'delay':fields.float('Days to Validate', digits=(16,2), readonly=True), diff --git a/addons/purchase/report/purchase_report_view.xml b/addons/purchase/report/purchase_report_view.xml index 0ac69172612..0d3a84f189b 100644 --- a/addons/purchase/report/purchase_report_view.xml +++ b/addons/purchase/report/purchase_report_view.xml @@ -102,7 +102,7 @@ - + diff --git a/addons/purchase/res_config.py b/addons/purchase/res_config.py index 9ee5e8a97de..7ce5c2c5534 100644 --- a/addons/purchase/res_config.py +++ b/addons/purchase/res_config.py @@ -37,7 +37,7 @@ class purchase_config_settings(osv.osv_memory): implied_group='product.group_purchase_pricelist', help="""Allows to manage different prices based on rules per category of Supplier. Example: 10% for retailers, promotion of 5 EUR on this product, etc."""), - 'group_uom':fields.boolean("Manage Different UoM for Products", + 'group_uom':fields.boolean("Manage Different Unit of Measure for Products", implied_group='product.group_uom', help="""Allows you to select and maintain different units of measure for products."""), 'module_purchase_analytic_plans': fields.boolean('Purchase Analytic Plan', diff --git a/addons/purchase_requisition/purchase_requisition.py b/addons/purchase_requisition/purchase_requisition.py index 43cfe2de069..51aca3adeb8 100644 --- a/addons/purchase_requisition/purchase_requisition.py +++ b/addons/purchase_requisition/purchase_requisition.py @@ -175,8 +175,8 @@ class purchase_requisition_line(osv.osv): _columns = { 'product_id': fields.many2one('product.product', 'Product' ), - 'product_uom_id': fields.many2one('product.uom', 'Product UoM'), - 'product_qty': fields.float('Quantity', digits_compute=dp.get_precision('Product UoM')), + 'product_uom_id': fields.many2one('product.uom', 'Product Unit of Measure'), + 'product_qty': fields.float('Quantity', digits_compute=dp.get_precision('Product Unit of Measure')), 'requisition_id' : fields.many2one('purchase.requisition','Purchase Requisition', ondelete='cascade'), 'company_id': fields.related('requisition_id','company_id',type='many2one',relation='res.company',string='Company', store=True, readonly=True), } diff --git a/addons/sale/report/sale_report.py b/addons/sale/report/sale_report.py index 42e090d54e5..d347da84adc 100644 --- a/addons/sale/report/sale_report.py +++ b/addons/sale/report/sale_report.py @@ -38,7 +38,7 @@ class sale_report(osv.osv): ('10', 'October'), ('11', 'November'), ('12', 'December')], 'Month', readonly=True), 'day': fields.char('Day', size=128, readonly=True), 'product_id': fields.many2one('product.product', 'Product', readonly=True), - 'product_uom': fields.many2one('product.uom', 'UoM', readonly=True), + 'product_uom': fields.many2one('product.uom', 'Unit of Measure', readonly=True), 'product_uom_qty': fields.float('# of Qty', readonly=True), 'partner_id': fields.many2one('res.partner', 'Partner', readonly=True), diff --git a/addons/sale/report/sale_report_view.xml b/addons/sale/report/sale_report_view.xml index 4c1a85a7b86..dd289dd1dfc 100644 --- a/addons/sale/report/sale_report_view.xml +++ b/addons/sale/report/sale_report_view.xml @@ -99,7 +99,7 @@ - + diff --git a/addons/sale/sale.py b/addons/sale/sale.py index 9caaa86878c..6bb456ec8a3 100644 --- a/addons/sale/sale.py +++ b/addons/sale/sale.py @@ -1016,7 +1016,7 @@ class sale_order_line(osv.osv): help="If 'on order', it triggers a procurement when the sale order is confirmed to create a task, purchase order or manufacturing order linked to this sale order line."), 'property_ids': fields.many2many('mrp.property', 'sale_order_line_property_rel', 'order_id', 'property_id', 'Properties', readonly=True, states={'draft': [('readonly', False)]}), 'address_allotment_id': fields.many2one('res.partner', 'Allotment Partner'), - 'product_uom_qty': fields.float('Quantity (UoM)', digits_compute= dp.get_precision('Product UoS'), required=True, readonly=True, states={'draft': [('readonly', False)]}), + 'product_uom_qty': fields.float('Quantity (Unit of Measure)', digits_compute= dp.get_precision('Product UoS'), required=True, readonly=True, states={'draft': [('readonly', False)]}), 'product_uom': fields.many2one('product.uom', 'Unit of Measure ', required=True, readonly=True, states={'draft': [('readonly', False)]}), 'product_uos_qty': fields.float('Quantity (UoS)' ,digits_compute= dp.get_precision('Product UoS'), readonly=True, states={'draft': [('readonly', False)]}), 'product_uos': fields.many2one('product.uom', 'Product UoS'), diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml index 3d597b80dea..c04360eaca5 100644 --- a/addons/sale/sale_view.xml +++ b/addons/sale/sale_view.xml @@ -199,8 +199,8 @@ - - + + @@ -369,7 +369,7 @@ - + diff --git a/addons/sale_layout/sale_layout.py b/addons/sale_layout/sale_layout.py index 15531e76e1d..9e2052b134c 100644 --- a/addons/sale_layout/sale_layout.py +++ b/addons/sale_layout/sale_layout.py @@ -120,8 +120,8 @@ class sale_order_line(osv.osv): ,'Line Type', select=True, required=True), 'sequence': fields.integer('Line Sequence', select=True), 'price_unit': fields.float('Unit Price', required=True, digits_compute= dp.get_precision('Sale Price'), readonly=True, states={'draft': [('readonly', False)]}), - 'product_uom_qty': fields.float('Quantity (UoM)', digits=(16,2)), - 'product_uom': fields.many2one('product.uom', 'Product UoM'), + 'product_uom_qty': fields.float('Quantity (Unit of Measure)', digits=(16,2)), + 'product_uom': fields.many2one('product.uom', 'Product Unit of Measure'), # Override the field to call the overridden _amount_line function 'price_subtotal': fields.function(_amount_line, method=True, string='Subtotal', digits_compute= dp.get_precision('Sale Price')), } diff --git a/addons/sale_layout/sale_layout_view.xml b/addons/sale_layout/sale_layout_view.xml index d43ecdaf4d6..96e80224b86 100644 --- a/addons/sale_layout/sale_layout_view.xml +++ b/addons/sale_layout/sale_layout_view.xml @@ -100,7 +100,7 @@ - + diff --git a/addons/stock/product.py b/addons/stock/product.py index c1de7074a3d..e7838bb490a 100644 --- a/addons/stock/product.py +++ b/addons/stock/product.py @@ -332,7 +332,7 @@ class product_product(osv.osv): _columns = { 'qty_available': fields.function(_product_available, multi='qty_available', - type='float', digits_compute=dp.get_precision('Product UoM'), + type='float', digits_compute=dp.get_precision('Product Unit of Measure'), string='Quantity On Hand', help="Current quantity of products.\n" "In a context with a single Stock Location, this includes " @@ -346,7 +346,7 @@ class product_product(osv.osv): "Otherwise, this includes goods stored in any Stock Location " "typed as 'internal'."), 'virtual_available': fields.function(_product_available, multi='qty_available', - type='float', digits_compute=dp.get_precision('Product UoM'), + type='float', digits_compute=dp.get_precision('Product Unit of Measure'), string='Quantity Available', help="Forecast quantity (computed as Quantity On Hand " "- Outgoing + Incoming)\n" @@ -361,7 +361,7 @@ class product_product(osv.osv): "Otherwise, this includes goods stored in any Stock Location " "typed as 'internal'."), 'incoming_qty': fields.function(_product_available, multi='qty_available', - type='float', digits_compute=dp.get_precision('Product UoM'), + type='float', digits_compute=dp.get_precision('Product Unit of Measure'), string='Incoming', help="Quantity of products that are planned to arrive.\n" "In a context with a single Stock Location, this includes " @@ -375,7 +375,7 @@ class product_product(osv.osv): "Otherwise, this includes goods arriving to any Stock " "Location typed as 'internal'."), 'outgoing_qty': fields.function(_product_available, multi='qty_available', - type='float', digits_compute=dp.get_precision('Product UoM'), + type='float', digits_compute=dp.get_precision('Product Unit of Measure'), string='Outgoing', help="Quantity of products that are planned to leave.\n" "In a context with a single Stock Location, this includes " diff --git a/addons/stock/report/report_stock_move.py b/addons/stock/report/report_stock_move.py index da6be7873c3..8f7ad9207f4 100644 --- a/addons/stock/report/report_stock_move.py +++ b/addons/stock/report/report_stock_move.py @@ -160,7 +160,7 @@ class report_stock_inventory(osv.osv): 'location_id': fields.many2one('stock.location', 'Location', readonly=True), 'prodlot_id': fields.many2one('stock.production.lot', 'Lot', readonly=True), 'company_id': fields.many2one('res.company', 'Company', readonly=True), - 'product_qty':fields.float('Quantity', digits_compute=dp.get_precision('Product UoM'), readonly=True), + 'product_qty':fields.float('Quantity', digits_compute=dp.get_precision('Product Unit of Measure'), readonly=True), 'value' : fields.float('Total Value', digits_compute=dp.get_precision('Account'), required=True), 'state': fields.selection([('draft', 'Draft'), ('waiting', 'Waiting'), ('confirmed', 'Confirmed'), ('assigned', 'Available'), ('done', 'Done'), ('cancel', 'Cancelled')], 'State', readonly=True, select=True, help='When the stock move is created it is in the \'Draft\' state.\n After that it is set to \'Confirmed\' state.\n If stock is available state is set to \'Avaiable\'.\n When the picking it done the state is \'Done\'.\ diff --git a/addons/stock/res_config.py b/addons/stock/res_config.py index 1d5ab4d1232..1ea660b4a93 100644 --- a/addons/stock/res_config.py +++ b/addons/stock/res_config.py @@ -52,10 +52,10 @@ class stock_config_settings(osv.osv_memory): manage product manufacturing chains, manage default locations per product, define routes within your warehouse according to business needs, etc. This installs the module stock_location."""), - 'group_uom': fields.boolean("Manage Different UoM for Products", + 'group_uom': fields.boolean("Manage Different Unit of Measure for Products", implied_group='product.group_uom', help="""Allows you to select and maintain different units of measure for products."""), - 'group_uos': fields.boolean("Manage Secondary UoM (for Sale)", + 'group_uos': fields.boolean("Manage Secondary Unit of Measure (for Sale)", implied_group='product.group_uos', help="""Allows you to sell units of a product, but invoice based on a different unit of measure. For instance, you can sell pieces of meat that you invoice based on their weight."""), diff --git a/addons/stock/stock.py b/addons/stock/stock.py index 9c42aa346b6..17ad971ea6b 100644 --- a/addons/stock/stock.py +++ b/addons/stock/stock.py @@ -1484,7 +1484,7 @@ class stock_production_lot(osv.osv): 'date': fields.datetime('Creation Date', required=True), 'stock_available': fields.function(_get_stock, fnct_search=_stock_search, type="float", string="Available", select=True, help="Current quantity of products with this Production Lot Number available in company warehouses", - digits_compute=dp.get_precision('Product UoM')), + digits_compute=dp.get_precision('Product Unit of Measure')), 'revisions': fields.one2many('stock.production.lot.revision', 'lot_id', 'Revisions'), 'company_id': fields.many2one('res.company', 'Company', select=True), 'move_ids': fields.one2many('stock.move', 'prodlot_id', 'Moves for this Serial Number', readonly=True), @@ -1610,9 +1610,9 @@ class stock_move(osv.osv): 'date_expected': fields.datetime('Scheduled Date', states={'done': [('readonly', True)]},required=True, select=True, help="Scheduled date for the processing of this move"), 'product_id': fields.many2one('product.product', 'Product', required=True, select=True, domain=[('type','<>','service')],states={'done': [('readonly', True)]}), - 'product_qty': fields.float('Quantity', digits_compute=dp.get_precision('Product UoM'), required=True,states={'done': [('readonly', True)]}), + 'product_qty': fields.float('Quantity', digits_compute=dp.get_precision('Product Unit of Measure'), required=True,states={'done': [('readonly', True)]}), 'product_uom': fields.many2one('product.uom', 'Unit of Measure', required=True,states={'done': [('readonly', True)]}), - 'product_uos_qty': fields.float('Quantity (UOS)', digits_compute=dp.get_precision('Product UoM'), states={'done': [('readonly', True)]}), + 'product_uos_qty': fields.float('Quantity (UOS)', digits_compute=dp.get_precision('Product Unit of Measure'), states={'done': [('readonly', True)]}), 'product_uos': fields.many2one('product.uom', 'Product UOS', states={'done': [('readonly', True)]}), 'product_packaging': fields.many2one('product.packaging', 'Packaging', help="It specifies attributes of packaging like type, quantity of packaging,etc."), @@ -1737,7 +1737,7 @@ class stock_move(osv.osv): if move.state == 'done': if frozen_fields.intersection(vals): raise osv.except_osv(_('Operation forbidden'), - _('Quantities, UoMs, Products and Locations cannot be modified on stock moves that have already been processed (except by the Administrator)')) + _('Quantities, Unit of Measures, Products and Locations cannot be modified on stock moves that have already been processed (except by the Administrator)')) return super(stock_move, self).write(cr, uid, ids, vals, context=context) def copy(self, cr, uid, id, default=None, context=None): @@ -2778,8 +2778,8 @@ class stock_inventory_line(osv.osv): 'inventory_id': fields.many2one('stock.inventory', 'Inventory', ondelete='cascade', select=True), 'location_id': fields.many2one('stock.location', 'Location', required=True), 'product_id': fields.many2one('product.product', 'Product', required=True, select=True), - 'product_uom': fields.many2one('product.uom', 'Product UOM', required=True), - 'product_qty': fields.float('Quantity', digits_compute=dp.get_precision('Product UoM')), + 'product_uom': fields.many2one('product.uom', 'Product Unit of Measure', required=True), + 'product_qty': fields.float('Quantity', digits_compute=dp.get_precision('Product Unit of Measure')), 'company_id': fields.related('inventory_id','company_id',type='many2one',relation='res.company',string='Company',store=True, select=True, readonly=True), 'prod_lot_id': fields.many2one('stock.production.lot', 'Serial Number', domain="[('product_id','=',product_id)]"), 'state': fields.related('inventory_id','state',type='char',string='State',readonly=True), diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml index d489d369579..b37bbd063e6 100644 --- a/addons/stock/stock_view.xml +++ b/addons/stock/stock_view.xml @@ -145,7 +145,7 @@ - +