summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKirti Choudhary <kic@odoo.com>2017-08-08 14:32:28 +0530
committeramoyaux <arm@odoo.com>2017-08-25 14:04:59 +0200
commit9f1a77f152861cecbbf3dbea0ca9c84d2fbef110 (patch)
treee7f5e588fe425be97fe620367a5ec1dcc5f8f2c7
parentbfd8224dd4a1fc55b88d3841f61b8869bdf73c83 (diff)
[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.
-rw-r--r--addons/procurement/models/procurement.py2
-rw-r--r--addons/stock/models/stock_config_settings.py2
-rw-r--r--addons/stock_picking_wave/__manifest__.py6
-rw-r--r--addons/stock_picking_wave/data/stock_picking_wave_data.xml6
-rw-r--r--addons/stock_picking_wave/data/stock_picking_wave_demo.xml2
-rw-r--r--addons/stock_picking_wave/models/stock_picking_wave.py18
-rw-r--r--addons/stock_picking_wave/views/stock_picking_wave_views.xml20
-rw-r--r--addons/stock_picking_wave/wizard/stock_picking_to_wave.py6
-rw-r--r--addons/stock_picking_wave/wizard/stock_picking_to_wave_views.xml14
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 @@
<?xml version="1.0" encoding="utf-8"?>
<odoo>
- <!-- Picking Wave related subtypes for messaging / Chatter -->
+ <!-- Batch Picking related subtypes for messaging / Chatter -->
<record id="mt_wave_state" model="mail.message.subtype">
<field name="name">Stage Changed</field>
<field name="res_model">stock.picking.wave</field>
@@ -9,9 +9,9 @@
</record>
<record id="seq_picking_wave" model="ir.sequence">
- <field name="name">Picking Wave</field>
+ <field name="name">Batch Picking</field>
<field name="code">picking.wave</field>
- <field name="prefix">Wave/</field>
+ <field name="prefix">Batch/</field>
<field name="padding">5</field>
<field name="company_id" eval="False"/>
</record>
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 @@
<?xml version="1.0" encoding="utf-8"?>
<odoo>
<!--
- Add picking wave
+ Add batch picking
-->
<record id="stock_picking_wave_dry_1" model="stock.picking.wave">
<field name="name">Picking Dry for John</field>
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="<b>%s:</b> %s <a href=#id=%s&view_type=form&model=stock.picking.wave>%s</a>" % (
_("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 @@
<field name="name">picking.wave.form</field>
<field name="model">stock.picking.wave</field>
<field name="arch" type="xml">
- <form string="Stock Picking Waves">
+ <form string="Stock Batch Picking">
<header>
<button name="confirm_picking" states="draft" string="Confirm" type="object" class="oe_highlight"/>
<button name="print_picking" string="Print" type="object" class="oe_highlight"/>
@@ -49,7 +49,7 @@
<field name="name">picking.wave.tree</field>
<field name="model">stock.picking.wave</field>
<field name="arch" type="xml">
- <tree string="Stock Picking Waves" decoration-muted="state=='cancel'">
+ <tree string="Stock Batch Picking" decoration-muted="state=='cancel'">
<field name="name"/>
<field name="user_id"/>
<field name="state"/>
@@ -90,9 +90,9 @@
<field name="name">picking.wave.filter</field>
<field name="model">stock.picking.wave</field>
<field name="arch" type="xml">
- <search string="Search Picking Waves">
- <field name="name" string="Picking Wave"/>
- <filter name="in_progress" string="In Progress" domain="[('state','=', 'in_progress')]" help="Picking Waves not finished"/>
+ <search string="Search Batch Picking">
+ <field name="name" string="Batch Picking"/>
+ <filter name="in_progress" string="In Progress" domain="[('state','=', 'in_progress')]" help="Batch Picking not finished"/>
<field name="user_id"/>
<group expand="0" string="Group By">
<filter string="User" domain="[]" context="{'group_by':'user_id'}"/>
@@ -103,7 +103,7 @@
</record>
<record id="action_picking_wave" model="ir.actions.act_window">
- <field name="name">Picking Waves</field>
+ <field name="name">Batch Picking</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">stock.picking.wave</field>
<field name="view_type">form</field>
@@ -112,11 +112,11 @@
<field name="search_view_id" ref="view_picking_wave_filter"/>
<field name="help" type="html">
<p class="oe_view_nocontent_create">
- Click to create a Picking Wave.
+ Click to create a Batch Picking.
</p><p>
- The goal of the picking waves is to group operations that may
+ The goal of the Batch Picking is to group operations that may
(needs to) be done together in order to increase their efficiency.
- It may also be useful to assign jobs (one person = one wave) or
+ It may also be useful to assign jobs (one person = one batch) or
help the timing management of operations (tasks to be done at 1pm).
</p>
</field>
@@ -149,7 +149,7 @@
<field name="inherit_id" ref="stock.view_picking_internal_search"/>
<field name="arch" type="xml">
<xpath expr="//filter[@name='picking_type']" position="after">
- <filter string="Wave" domain="[]" context="{'group_by':'wave_id'}"/>
+ <filter string="Batch" domain="[]" context="{'group_by':'wave_id'}"/>
</xpath>
<xpath expr="//field[@name='picking_type_id']" position="after">
<field name="wave_id"/>
diff --git a/addons/stock_picking_wave/wizard/stock_picking_to_wave.py b/addons/stock_picking_wave/wizard/stock_picking_to_wave.py
index 69b53578018..cd02ca984e8 100644
--- a/addons/stock_picking_wave/wizard/stock_picking_to_wave.py
+++ b/addons/stock_picking_wave/wizard/stock_picking_to_wave.py
@@ -6,13 +6,13 @@ from odoo import api, fields, models
class StockPickingToWave(models.TransientModel):
_name = 'stock.picking.to.wave'
- _description = 'Add pickings to a picking wave'
+ _description = 'Add pickings to a batch picking'
- wave_id = fields.Many2one('stock.picking.wave', string='Picking Wave', required=True)
+ wave_id = fields.Many2one('stock.picking.wave', string='Batch Picking', required=True)
@api.multi
def attach_pickings(self):
- # use active_ids to add picking line to the selected wave
+ # use active_ids to add picking line to the selected batch
self.ensure_one()
picking_ids = self.env.context.get('active_ids')
return self.env['stock.picking'].browse(picking_ids).write({'wave_id': self.wave_id.id})
diff --git a/addons/stock_picking_wave/wizard/stock_picking_to_wave_views.xml b/addons/stock_picking_wave/wizard/stock_picking_to_wave_views.xml
index a8ed7dd8bdf..78662f6942a 100644
--- a/addons/stock_picking_wave/wizard/stock_picking_to_wave_views.xml
+++ b/addons/stock_picking_wave/wizard/stock_picking_to_wave_views.xml
@@ -1,25 +1,25 @@
<?xml version="1.0" encoding="utf-8"?>
<odoo>
- <!-- add picking to wave -->
+ <!-- add picking to batch -->
<record model="ir.ui.view" id="picking_to_wave_form">
<field name="name">stock.picking.to.wave.form</field>
<field name="model">stock.picking.to.wave</field>
<field name="arch" type="xml">
- <form string="Add pickings to wave">
- <separator string="Select a wave"/>
+ <form string="Add pickings to batch">
+ <separator string="Select a batch"/>
<field name="wave_id" class="oe_inline"/>
<footer>
- <button name="attach_pickings" type="object" string="Add to Wave" class="btn-primary"/>
+ <button name="attach_pickings" type="object" string="Add to Batch" class="btn-primary"/>
<button string="Cancel" class="btn-default" special="cancel"/>
</footer>
</form>
</field>
</record>
- <!-- add picking to wave action -->
+ <!-- add picking to batch action -->
<record model="ir.actions.act_window" id="picking_to_wave_act">
- <field name="name">Add to Wave</field>
+ <field name="name">Add to Batch</field>
<field name="res_model">stock.picking.to.wave</field>
<field name="view_type">form</field>
<field name="view_mode">form</field>
@@ -29,7 +29,7 @@
<act_window id="action_picking_to_wave"
multi="True"
- key2="client_action_multi" name="Add to Wave"
+ key2="client_action_multi" name="Add to Batch"
res_model="stock.picking.to.wave" src_model="stock.picking"
view_mode="form" target="new" view_type="form"
/>