From 448ba01ae93ca4e21e7090544b1d543085a26951 Mon Sep 17 00:00:00 2001 From: Tejas Shahu Date: Fri, 30 Nov 2018 09:32:56 +0000 Subject: [PATCH] [IMP] stock, sale_stock: label & tooltip clarification Rename shipping policy in the UI. Also adapt the stock picking state's tooltip in order to explain the reservation process according to shipping policy closes odoo/odoo#24039 --- addons/sale_stock/models/sale_order.py | 4 ++-- addons/stock/models/stock_picking.py | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/addons/sale_stock/models/sale_order.py b/addons/sale_stock/models/sale_order.py index 430c3cc52d9..7960476005b 100644 --- a/addons/sale_stock/models/sale_order.py +++ b/addons/sale_stock/models/sale_order.py @@ -21,8 +21,8 @@ class SaleOrder(models.Model): 'account.incoterms', 'Incoterms', help="International Commercial Terms are a series of predefined commercial terms used in international transactions.") picking_policy = fields.Selection([ - ('direct', 'Deliver each product when available'), - ('one', 'Deliver all products at once')], + ('direct', 'As soon as possible'), + ('one', 'When all products are ready')], string='Shipping Policy', required=True, readonly=True, default='direct', states={'draft': [('readonly', False)], 'sent': [('readonly', False)]} ,help="If you deliver all products at once, the delivery order will be scheduled based on the greatest " diff --git a/addons/stock/models/stock_picking.py b/addons/stock/models/stock_picking.py index c9b30ae0c89..c92e5ab87dc 100644 --- a/addons/stock/models/stock_picking.py +++ b/addons/stock/models/stock_picking.py @@ -200,12 +200,12 @@ class Picking(models.Model): ('cancel', 'Cancelled'), ], string='Status', compute='_compute_state', copy=False, index=True, readonly=True, store=True, track_visibility='onchange', - help=" * Draft: not confirmed yet and will not be scheduled until confirmed.\n" - " * Waiting Another Operation: waiting for another move to proceed before it becomes automatically available (e.g. in Make-To-Order flows).\n" - " * Waiting: if it is not ready to be sent because the required products could not be reserved.\n" - " * Ready: products are reserved and ready to be sent. If the shipping policy is 'As soon as possible' this happens as soon as anything is reserved.\n" - " * Done: has been processed, can't be modified or cancelled anymore.\n" - " * Cancelled: has been cancelled, can't be confirmed anymore.") + help=" * Draft: The transfer is not confirmed yet. Reservation doesn't apply.\n" + " * Waiting another operation: This transfer is waiting for another operation before being ready.\n" + " * Waiting: The transfer is waiting for the availability of some products.\n(a) The shipping policy is \"As soon as possible\": no product could be reserved.\n(b) The shipping policy is \"When all products are ready\": not all the products could be reserved.\n" + " * Ready: The transfer is ready to be processed.\n(a) The shipping policy is \"As soon as possible\": at least one product has been reserved.\n(b) The shipping policy is \"When all products are ready\": all product have been reserved.\n" + " * Done: The transfer has been processed.\n" + " * Cancelled: The transfer has been cancelled.") group_id = fields.Many2one( 'procurement.group', 'Procurement Group',