From 7f9855ee2c2f71a02ad6858ad5619845848d4d75 Mon Sep 17 00:00:00 2001 From: "Jagdish Panchal (Open ERP)" Date: Wed, 25 Apr 2012 12:38:25 +0530 Subject: [PATCH] [IMP] UOM to Unit of Measure everywhere in account and Picking and Invoicing Policy to Invoicing Policy in sale/res_config.py bzr revid: jap@tinyerp.com-20120425070825-r8z56xhz42dpthep --- addons/account/account_analytic_line.py | 2 +- addons/account/account_move_line.py | 2 +- addons/account/report/account_analytic_entries_report.py | 2 +- addons/account/report/account_analytic_entries_report_view.xml | 2 +- addons/account/report/account_entries_report.py | 2 +- addons/account/report/account_invoice_report.py | 2 +- addons/sale/res_config_view.xml | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/addons/account/account_analytic_line.py b/addons/account/account_analytic_line.py index da0bc96bda9..280b813380f 100644 --- a/addons/account/account_analytic_line.py +++ b/addons/account/account_analytic_line.py @@ -27,7 +27,7 @@ class account_analytic_line(osv.osv): _inherit = 'account.analytic.line' _description = 'Analytic Line' _columns = { - 'product_uom_id': fields.many2one('product.uom', 'UoM'), + 'product_uom_id': fields.many2one('product.uom', 'Unit of Measure'), 'product_id': fields.many2one('product.product', 'Product'), 'general_account_id': fields.many2one('account.account', 'General Account', required=True, ondelete='restrict'), 'move_id': fields.many2one('account.move.line', 'Move Line', ondelete='cascade', select=True), diff --git a/addons/account/account_move_line.py b/addons/account/account_move_line.py index 17120ee265e..573b8f17524 100644 --- a/addons/account/account_move_line.py +++ b/addons/account/account_move_line.py @@ -474,7 +474,7 @@ class account_move_line(osv.osv): _columns = { 'name': fields.char('Name', size=64, required=True), 'quantity': fields.float('Quantity', digits=(16,2), help="The optional quantity expressed by this line, eg: number of product sold. The quantity is not a legal requirement but is very useful for some reports."), - 'product_uom_id': fields.many2one('product.uom', 'UoM'), + 'product_uom_id': fields.many2one('product.uom', 'Unit of Measure'), 'product_id': fields.many2one('product.product', 'Product'), 'debit': fields.float('Debit', digits_compute=dp.get_precision('Account')), 'credit': fields.float('Credit', digits_compute=dp.get_precision('Account')), diff --git a/addons/account/report/account_analytic_entries_report.py b/addons/account/report/account_analytic_entries_report.py index 1b7e7f9a84b..02c1c508237 100644 --- a/addons/account/report/account_analytic_entries_report.py +++ b/addons/account/report/account_analytic_entries_report.py @@ -43,7 +43,7 @@ class analytic_entries_report(osv.osv): 'journal_id': fields.many2one('account.analytic.journal', 'Journal', required=True), 'move_id': fields.many2one('account.move.line', 'Move', required=True), 'product_id': fields.many2one('product.product', 'Product', required=True), - 'product_uom_id': fields.many2one('product.uom', 'Product UOM', required=True), + 'product_uom_id': fields.many2one('product.uom', 'Product Unit of Measure', required=True), 'amount': fields.float('Amount', readonly=True), 'unit_amount': fields.float('Quantity', readonly=True), 'nbr': fields.integer('#Entries', readonly=True), diff --git a/addons/account/report/account_analytic_entries_report_view.xml b/addons/account/report/account_analytic_entries_report_view.xml index 4e8f708b62e..b7fe606a83e 100644 --- a/addons/account/report/account_analytic_entries_report_view.xml +++ b/addons/account/report/account_analytic_entries_report_view.xml @@ -76,7 +76,7 @@ - + diff --git a/addons/account/report/account_entries_report.py b/addons/account/report/account_entries_report.py index 29e40c7d5ad..56085b13453 100644 --- a/addons/account/report/account_entries_report.py +++ b/addons/account/report/account_entries_report.py @@ -50,7 +50,7 @@ class account_entries_report(osv.osv): 'journal_id': fields.many2one('account.journal', 'Journal', readonly=True), 'fiscalyear_id': fields.many2one('account.fiscalyear', 'Fiscal Year', readonly=True), 'product_id': fields.many2one('product.product', 'Product', readonly=True), - 'product_uom_id': fields.many2one('product.uom', 'Product UOM', readonly=True), + 'product_uom_id': fields.many2one('product.uom', 'Product Unit of Measure', readonly=True), 'move_state': fields.selection([('draft','Unposted'), ('posted','Posted')], 'State', readonly=True), 'move_line_state': fields.selection([('draft','Unbalanced'), ('valid','Valid')], 'State of Move Line', readonly=True), 'reconcile_id': fields.many2one('account.move.reconcile', readonly=True), diff --git a/addons/account/report/account_invoice_report.py b/addons/account/report/account_invoice_report.py index 2fbe641dba3..f50ee46d63e 100644 --- a/addons/account/report/account_invoice_report.py +++ b/addons/account/report/account_invoice_report.py @@ -36,7 +36,7 @@ class account_invoice_report(osv.osv): ('10','October'), ('11','November'), ('12','December')], 'Month', readonly=True), 'product_id': fields.many2one('product.product', 'Product', readonly=True), 'product_qty':fields.float('Qty', readonly=True), - 'uom_name': fields.char('Reference UoM', size=128, readonly=True), + 'uom_name': fields.char('Reference Unit of Measure', size=128, readonly=True), 'payment_term': fields.many2one('account.payment.term', 'Payment Term', readonly=True), 'period_id': fields.many2one('account.period', 'Force Period', domain=[('state','<>','done')], readonly=True), 'fiscal_position': fields.many2one('account.fiscal.position', 'Fiscal Position', readonly=True), diff --git a/addons/sale/res_config_view.xml b/addons/sale/res_config_view.xml index 1e21a30f570..ac943d9a18c 100644 --- a/addons/sale/res_config_view.xml +++ b/addons/sale/res_config_view.xml @@ -9,7 +9,7 @@ - +