From 9f1a77f152861cecbbf3dbea0ca9c84d2fbef110 Mon Sep 17 00:00:00 2001 From: Kirti Choudhary Date: Tue, 8 Aug 2017 14:32:28 +0530 Subject: [PATCH] [REF] stock_picking_wave: renamed string picking waves -> batch picking. This commit only rename every string from picking wave to batch picking. Model rename will only be pushed on master(saas-18) once the forward port will be done. --- addons/procurement/models/procurement.py | 2 +- addons/stock/models/stock_config_settings.py | 2 +- addons/stock_picking_wave/__manifest__.py | 6 +++--- .../data/stock_picking_wave_data.xml | 6 +++--- .../data/stock_picking_wave_demo.xml | 2 +- .../models/stock_picking_wave.py | 18 ++++++++--------- .../views/stock_picking_wave_views.xml | 20 +++++++++---------- .../wizard/stock_picking_to_wave.py | 6 +++--- .../wizard/stock_picking_to_wave_views.xml | 14 ++++++------- 9 files changed, 38 insertions(+), 38 deletions(-) diff --git a/addons/procurement/models/procurement.py b/addons/procurement/models/procurement.py index e0dc2e97889..840fb86f94b 100644 --- a/addons/procurement/models/procurement.py +++ b/addons/procurement/models/procurement.py @@ -21,7 +21,7 @@ class ProcurementGroup(models.Model): having the moves grouped into pickings that represent the sales order. Used in: sales order (to group delivery order lines like the so), pull/push - rules (to pack like the delivery order), on orderpoints (e.g. for wave picking + rules (to pack like the delivery order), on orderpoints (e.g. for batch picking all the similar products together). Grouping is made only if the source and the destination is the same. diff --git a/addons/stock/models/stock_config_settings.py b/addons/stock/models/stock_config_settings.py index 531047ec3ec..a1dbc055ef1 100644 --- a/addons/stock/models/stock_config_settings.py +++ b/addons/stock/models/stock_config_settings.py @@ -35,7 +35,7 @@ class StockConfigSettings(models.TransientModel): string="No Rescheduling Propagation", oldname='default_new_propagation_minimum_delta', help="Rescheduling applies to any chain of operations (e.g. Make To Order, Pick Pack Ship). In the case of MTO sales, a vendor delay (updated incoming date) impacts the expected delivery date to the customer. \n This option allows to not propagate the rescheduling if the change is not critical.") - module_stock_picking_wave = fields.Boolean("Picking Waves") + module_stock_picking_wave = fields.Boolean("Batch Pickings") module_stock_calendar = fields.Boolean("Vendor Calendar for Reordering", help='Scheduled dates of requests for quotation generated from reordering rules are based on vendor lead times (defined on products).\nBy default, such a scheduling is made on calendar days. This option allow to adapt the scheduling with vendor calendars to set on reordering rules.') module_stock_barcode = fields.Boolean("Barcode Scanner") diff --git a/addons/stock_picking_wave/__manifest__.py b/addons/stock_picking_wave/__manifest__.py index 4401f5dc6d6..c5a98ddf5ed 100644 --- a/addons/stock_picking_wave/__manifest__.py +++ b/addons/stock_picking_wave/__manifest__.py @@ -2,12 +2,12 @@ # Part of Odoo. See LICENSE file for full copyright and licensing details. { - 'name': 'Warehouse Management: Waves', + 'name': 'Warehouse Management: Batch Picking', 'version': '1.0', 'category': 'Warehouse', 'description': """ -This module adds the picking wave option in warehouse management -================================================================ +This module adds the batch picking option in warehouse management +================================================================= """, 'website': 'https://www.odoo.com/page/warehouse', 'depends': ['stock'], diff --git a/addons/stock_picking_wave/data/stock_picking_wave_data.xml b/addons/stock_picking_wave/data/stock_picking_wave_data.xml index bfc677faff6..54cc489db76 100644 --- a/addons/stock_picking_wave/data/stock_picking_wave_data.xml +++ b/addons/stock_picking_wave/data/stock_picking_wave_data.xml @@ -1,6 +1,6 @@ - + Stage Changed stock.picking.wave @@ -9,9 +9,9 @@ - Picking Wave + Batch Picking picking.wave - Wave/ + Batch/ 5 diff --git a/addons/stock_picking_wave/data/stock_picking_wave_demo.xml b/addons/stock_picking_wave/data/stock_picking_wave_demo.xml index 2d074370200..38970d7d550 100644 --- a/addons/stock_picking_wave/data/stock_picking_wave_demo.xml +++ b/addons/stock_picking_wave/data/stock_picking_wave_demo.xml @@ -1,7 +1,7 @@ Picking Dry for John diff --git a/addons/stock_picking_wave/models/stock_picking_wave.py b/addons/stock_picking_wave/models/stock_picking_wave.py index 8c70e7663bc..3932c4e6a1c 100644 --- a/addons/stock_picking_wave/models/stock_picking_wave.py +++ b/addons/stock_picking_wave/models/stock_picking_wave.py @@ -8,19 +8,19 @@ from odoo.exceptions import UserError class StockPickingWave(models.Model): _inherit = ['mail.thread'] _name = "stock.picking.wave" - _description = "Picking Wave" + _description = "Batch Picking" _order = "name desc" name = fields.Char( - string='Picking Wave Name', default='/', + string='Batch Picking Name', default='/', copy=False, required=True, - help='Name of the picking wave') + help='Name of the batch picking') user_id = fields.Many2one( 'res.users', string='Responsible', track_visibility='onchange', - help='Person responsible for this wave') + help='Person responsible for this batch picking') picking_ids = fields.One2many( 'stock.picking', 'wave_id', string='Pickings', - help='List of picking associated to this wave') + help='List of picking associated to this batch') state = fields.Selection([ ('draft', 'Draft'), ('in_progress', 'Running'), @@ -56,12 +56,12 @@ class StockPickingWave(models.Model): def done(self): pickings = self.mapped('picking_ids').filtered(lambda picking: picking.state not in ('cancel', 'done')) if any(picking.state != 'assigned' for picking in pickings): - raise UserError(_('Some pickings are still waiting for goods. Please check or force their availability before setting this wave to done.')) + raise UserError(_('Some pickings are still waiting for goods. Please check or force their availability before setting this batch to done.')) for picking in pickings: picking.message_post( body="%s: %s %s" % ( _("Transferred by"), - _("Picking Wave"), + _("Batch Picking"), picking.wave_id.id, picking.wave_id.name)) if pickings: @@ -78,6 +78,6 @@ class StockPicking(models.Model): _inherit = "stock.picking" wave_id = fields.Many2one( - 'stock.picking.wave', string='Picking Wave', + 'stock.picking.wave', string='Batch Picking', states={'done': [('readonly', True)], 'cancel': [('readonly', True)]}, - help='Picking wave associated to this picking') + help='Batch associated to this picking') diff --git a/addons/stock_picking_wave/views/stock_picking_wave_views.xml b/addons/stock_picking_wave/views/stock_picking_wave_views.xml index f31857ac07a..0cd30865ffa 100644 --- a/addons/stock_picking_wave/views/stock_picking_wave_views.xml +++ b/addons/stock_picking_wave/views/stock_picking_wave_views.xml @@ -4,7 +4,7 @@ picking.wave.form stock.picking.wave -
+