From e64d8c2d89c6340f276c439b96828e26b7a90bf9 Mon Sep 17 00:00:00 2001 From: Raphael Collet Date: Wed, 9 May 2012 15:24:01 +0200 Subject: [PATCH] [IMP] stock: fix English in usage of 'serial numbers' bzr revid: rco@openerp.com-20120509132401-fzbtrvorg7sd7vuc --- addons/stock/report/report_stock.py | 4 +-- addons/stock/res_config.py | 9 +++---- addons/stock/security/stock_security.xml | 4 +-- addons/stock/stock.py | 10 +++---- addons/stock/stock_sequence.xml | 4 +-- addons/stock/stock_view.xml | 26 +++++++++---------- .../wizard/stock_inventory_line_split.py | 6 ++--- addons/stock/wizard/stock_move.py | 10 +++---- addons/stock/wizard/stock_move_view.xml | 4 +-- addons/stock/wizard/stock_partial_picking.py | 2 +- 10 files changed, 39 insertions(+), 40 deletions(-) diff --git a/addons/stock/report/report_stock.py b/addons/stock/report/report_stock.py index b45669e0498..e16b7ca6e6d 100644 --- a/addons/stock/report/report_stock.py +++ b/addons/stock/report/report_stock.py @@ -26,7 +26,7 @@ from tools.sql import drop_view_if_exists class stock_report_prodlots(osv.osv): _name = "stock.report.prodlots" - _description = "Stock report by Serial Number" + _description = "Stock report by serial number" _auto = False _columns = { 'qty': fields.float('Quantity', readonly=True), @@ -82,7 +82,7 @@ stock_report_prodlots() class stock_report_tracklots(osv.osv): _name = "stock.report.tracklots" - _description = "Stock report by Logistic Serial Number" + _description = "Stock report by logistic serial number" _auto = False _columns = { 'name': fields.float('Quantity', readonly=True), diff --git a/addons/stock/res_config.py b/addons/stock/res_config.py index 67cb914c6a6..dcd4fd64f09 100644 --- a/addons/stock/res_config.py +++ b/addons/stock/res_config.py @@ -26,8 +26,7 @@ class stock_config_settings(osv.osv_memory): _inherit = 'res.config.settings' _columns = { - - 'module_claim_from_delivery': fields.boolean("Allows Claims on Delivery Orders", + 'module_claim_from_delivery': fields.boolean("Allow Claims on Delivery Orders", help="""Adds a Claim link to the delivery order. This installs the module claim_from_delivery."""), 'module_stock_invoice_directly': fields.boolean("Invoice Directly from the Picking", @@ -35,7 +34,7 @@ class stock_config_settings(osv.osv_memory): to be invoiced when you send or deliver goods. This installs the module stock_invoice_directly."""), 'module_product_expiry': fields.boolean("Expiry Date on Lots", - help="""Track different dates on products and Serial Number. + help="""Track different dates on products and serial numbers. The following dates can be tracked: - end of life - best before date @@ -47,7 +46,7 @@ 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 Unit of Measure for Products", + 'group_uom': fields.boolean("Manage Different Units 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 Unit of Measure (for Sale)", @@ -66,7 +65,7 @@ class stock_config_settings(osv.osv_memory): help="""Allows you to get the upstream or downstream traceability of the products contained in lot."""), 'group_stock_inventory_valuation': fields.boolean("Generate Accounting Entries per Stock Movement", implied_group='stock.group_inventory_valuation', - help="""This allows to split stock inventory lines according to Serial Number."""), + help="""This allows to split stock inventory lines according to serial numbers."""), 'group_stock_multiple_locations': fields.boolean("Manage Multiple Locations and Warehouses", implied_group='stock.group_locations', help="""This allows to configure and use multiple stock locations and warehouses, diff --git a/addons/stock/security/stock_security.xml b/addons/stock/security/stock_security.xml index a1e08ebfec4..c9f8a03a378 100644 --- a/addons/stock/security/stock_security.xml +++ b/addons/stock/security/stock_security.xml @@ -14,12 +14,12 @@ - Manage Serial Number + Manage Serial Numbers - Manage Logistic Serial Number + Manage Logistic Serial Numbers diff --git a/addons/stock/stock.py b/addons/stock/stock.py index 17ad971ea6b..3f7beacb493 100644 --- a/addons/stock/stock.py +++ b/addons/stock/stock.py @@ -1487,7 +1487,7 @@ class stock_production_lot(osv.osv): 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), + 'move_ids': fields.one2many('stock.move', 'prodlot_id', 'Moves for this serial number', readonly=True), } _defaults = { 'date': lambda *a: time.strftime('%Y-%m-%d %H:%M:%S'), @@ -1512,7 +1512,7 @@ stock_production_lot() class stock_production_lot_revision(osv.osv): _name = 'stock.production.lot.revision' - _description = 'Serial Number revisions' + _description = 'Serial Number Revision' _columns = { 'name': fields.char('Revision Name', size=64, required=True), @@ -1578,7 +1578,7 @@ class stock_move(osv.osv): return res def _check_tracking(self, cr, uid, ids, context=None): - """ Checks if Serial Number is assigned to stock move or not. + """ Checks if serial number is assigned to stock move or not. @return: True or False """ for move in self.browse(cr, uid, ids, context=context): @@ -1620,7 +1620,7 @@ class stock_move(osv.osv): 'location_dest_id': fields.many2one('stock.location', 'Destination Location', required=True,states={'done': [('readonly', True)]}, select=True, help="Location where the system will stock the finished products."), 'partner_id': fields.many2one('res.partner', 'Destination Address ', states={'done': [('readonly', True)]}, help="Optional address where goods are to be delivered, specifically used for allotment"), - 'prodlot_id': fields.many2one('stock.production.lot', 'Serial Number', states={'done': [('readonly', True)]}, help="Serial Number is used to put a serial number on the production", select=True), + 'prodlot_id': fields.many2one('stock.production.lot', 'Serial Number', states={'done': [('readonly', True)]}, help="Serial number is used to put a serial number on the production", select=True), 'tracking_id': fields.many2one('stock.tracking', 'Pack', select=True, states={'done': [('readonly', True)]}, help="Logistical shipping unit: pallet, box, pack ..."), 'auto_validate': fields.boolean('Auto Validate'), @@ -1650,7 +1650,7 @@ class stock_move(osv.osv): _constraints = [ (_check_tracking, - 'You must assign a Serial Number for this product', + 'You must assign a serial number for this product', ['prodlot_id']), (_check_location, 'You can not move products from or to a location of the type view.', ['location_id','location_dest_id']), diff --git a/addons/stock/stock_sequence.xml b/addons/stock/stock_sequence.xml index bb895b13cd3..6c0b3e84cf2 100644 --- a/addons/stock/stock_sequence.xml +++ b/addons/stock/stock_sequence.xml @@ -52,11 +52,11 @@ Sequences from tracking numbers --> - Serial Number + Serial Numbers stock.lot.serial - Serial Number + Serial Numbers stock.lot.serial 7 diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml index 3be6916d84d..f52ce7e664f 100644 --- a/addons/stock/stock_view.xml +++ b/addons/stock/stock_view.xml @@ -116,7 +116,7 @@ - + @@ -147,7 +147,7 @@ -