From 90da529eb7ebbd24d4cc0e38712c2958887d3d78 Mon Sep 17 00:00:00 2001
From: Pierre Masereel <pim@odoo.com>
Date: Fri, 28 Apr 2017 13:35:37 +0200
Subject: [PATCH] [REF] delivery, product, stock: packaging naming

"product packaging" -> "product packages"
"delivery packaging" -> "delivery packages"

Also adapt and simplify stock settings.
---
 addons/delivery/views/delivery_view.xml        |  4 ++--
 .../delivery/views/product_packaging_view.xml  |  4 ++--
 addons/product/models/product.py               |  4 ++--
 addons/product/models/product_template.py      |  2 +-
 addons/product/views/product_views.xml         |  4 ++--
 addons/sale_stock/models/sale_order.py         |  2 +-
 addons/stock/models/stock_config_settings.py   | 10 ++++------
 addons/stock/views/product_views.xml           |  2 +-
 .../views/stock_config_settings_views.xml      | 18 +++++++++---------
 9 files changed, 24 insertions(+), 26 deletions(-)

diff --git a/addons/delivery/views/delivery_view.xml b/addons/delivery/views/delivery_view.xml
index d0462dcf4d9..0148319cb26 100644
--- a/addons/delivery/views/delivery_view.xml
+++ b/addons/delivery/views/delivery_view.xml
@@ -4,7 +4,7 @@
         <menuitem id="menu_delivery" name="Delivery" parent="stock.menu_stock_config_settings" groups="stock.group_stock_manager" sequence="50"/>
 
         <record id="action_delivery_packaging_view" model="ir.actions.act_window">
-            <field name="name">Packagings</field>
+            <field name="name">Delivery Packages</field>
             <field name="res_model">product.packaging</field>
             <field name="domain">[('product_id', '=', False)]</field>
             <field name="view_ids" eval="[(5, 0, 0),
@@ -12,7 +12,7 @@
                 (0, 0, {'view_mode': 'form', 'view_id': ref('delivery.product_packaging_delivery_form')})]"/>
         </record>
 
-        <menuitem id="menu_delivery_packagings" name="Delivery Packaging" parent="stock.menu_packages_config" action="action_delivery_packaging_view" groups="stock.group_tracking_lot"/>
+        <menuitem id="menu_delivery_packagings" name="Delivery Packages" parent="stock.menu_packages_config" action="action_delivery_packaging_view" groups="stock.group_tracking_lot"/>
 
         <record id="view_delivery_carrier_tree" model="ir.ui.view">
             <field name="name">delivery.carrier.tree</field>
diff --git a/addons/delivery/views/product_packaging_view.xml b/addons/delivery/views/product_packaging_view.xml
index 7e010767961..31b78af3bec 100644
--- a/addons/delivery/views/product_packaging_view.xml
+++ b/addons/delivery/views/product_packaging_view.xml
@@ -31,10 +31,10 @@
     <field name="model">product.packaging</field>
     <field name="inherit_id" eval="False"/>
     <field name="arch" type="xml">
-        <tree string="Delivery Packagings">
+        <tree string="Delivery Packages">
             <field name="sequence" widget="handle"/>
             <field name="package_carrier_type"/>
-            <field name="name" string="Packaging"/>
+            <field name="name"/>
             <field name="height"/>
             <field name="width"/>
             <field name="length"/>
diff --git a/addons/product/models/product.py b/addons/product/models/product.py
index 7f80d5461fa..621f3636e5c 100644
--- a/addons/product/models/product.py
+++ b/addons/product/models/product.py
@@ -138,7 +138,7 @@ class ProductProduct(models.Model):
         'product.pricelist.item', 'Pricelist Items', compute='_get_pricelist_items')
 
     packaging_ids = fields.One2many(
-        'product.packaging', 'product_id', 'Packaging',
+        'product.packaging', 'product_id', 'Product Packages',
         help="Gives the different ways to package the same product.")
 
     _sql_constraints = [
@@ -550,7 +550,7 @@ class ProductPackaging(models.Model):
     _description = "Packaging"
     _order = 'sequence'
 
-    name = fields.Char('Packaging Type', required=True)
+    name = fields.Char('Package Type', required=True)
     sequence = fields.Integer('Sequence', default=1, help="The first in the sequence is the default one.")
     product_id = fields.Many2one('product.product', string='Product')
     qty = fields.Float('Quantity per Package', help="The total number of products you can have per pallet or box.")
diff --git a/addons/product/models/product_template.py b/addons/product/models/product_template.py
index 520878271c3..d8a48b88801 100644
--- a/addons/product/models/product_template.py
+++ b/addons/product/models/product_template.py
@@ -101,7 +101,7 @@ class ProductTemplate(models.Model):
         'res.company', 'Company',
         default=lambda self: self.env['res.company']._company_default_get('product.template'), index=1)
     packaging_ids = fields.One2many(
-        'product.packaging', string="Packaging", compute="_compute_packaging_ids", inverse="_set_packaging_ids",
+        'product.packaging', string="Product Packages", compute="_compute_packaging_ids", inverse="_set_packaging_ids",
         help="Gives the different ways to package the same product.")
     seller_ids = fields.One2many('product.supplierinfo', 'product_tmpl_id', 'Vendors')
 
diff --git a/addons/product/views/product_views.xml b/addons/product/views/product_views.xml
index 0f0ed604dc1..042bbcc4359 100644
--- a/addons/product/views/product_views.xml
+++ b/addons/product/views/product_views.xml
@@ -450,7 +450,7 @@
             <field name="name">product.packaging.tree.view</field>
             <field name="model">product.packaging</field>
             <field name="arch" type="xml">
-                <tree string="Product Packagings">
+                <tree string="Product Packages">
                     <field name="sequence" widget="handle"/>
                     <field name="product_id"/>
                     <field name="name"/>
@@ -485,7 +485,7 @@
         </record>
 
         <record model="ir.actions.act_window" id="action_packaging_view">
-            <field name="name">Packagings</field>
+            <field name="name">Product Packages</field>
             <field name="res_model">product.packaging</field>
             <field name="domain">[('product_id', '!=', False)]</field>
             <field name="view_ids" eval="[(5, 0, 0),
diff --git a/addons/sale_stock/models/sale_order.py b/addons/sale_stock/models/sale_order.py
index 5caca563138..98d3aef829b 100644
--- a/addons/sale_stock/models/sale_order.py
+++ b/addons/sale_stock/models/sale_order.py
@@ -86,7 +86,7 @@ class SaleOrder(models.Model):
 class SaleOrderLine(models.Model):
     _inherit = 'sale.order.line'
 
-    product_packaging = fields.Many2one('product.packaging', string='Packaging', default=False)
+    product_packaging = fields.Many2one('product.packaging', string='Package', default=False)
     route_id = fields.Many2one('stock.location.route', string='Route', domain=[('sale_selectable', '=', True)], ondelete='restrict')
 
     @api.depends('order_id.state')
diff --git a/addons/stock/models/stock_config_settings.py b/addons/stock/models/stock_config_settings.py
index ba5deae264f..8ead9a928f7 100644
--- a/addons/stock/models/stock_config_settings.py
+++ b/addons/stock/models/stock_config_settings.py
@@ -18,14 +18,12 @@ class StockConfigSettings(models.TransientModel):
         help="Reserving products manually in delivery orders or by running the scheduler is advised to better manage priorities in case of long customer lead times or/and frequent stock-outs.")
     module_product_expiry = fields.Boolean("Expiration Dates",
         help="Track following dates on lots & serial numbers: best before, removal, end of life, alert. \n Such dates are set automatically at lot/serial number creation based on values set on the product (in days).")
-    group_stock_packaging = fields.Boolean('Packaging',
-        implied_group='product.group_stock_packaging',
-        help="Select or scan the packaging used to transfer products in operations. This allows to update or check the unit # transferred (which must be a multiple of the unit # per package). Packaging types are set on product detail form.")
+    group_stock_packaging = fields.Boolean('Product Packages',
+        implied_group='product.group_stock_packaging')
     group_stock_production_lot = fields.Boolean("Lots & Serial Numbers",
         implied_group='stock.group_production_lot')
-    group_stock_tracking_lot = fields.Boolean("Packages",
-        implied_group='stock.group_tracking_lot',
-        help="Put products in packages and get shipping labels per package unit thanks to shipping connectors.")
+    group_stock_tracking_lot = fields.Boolean("Delivery Packages",
+        implied_group='stock.group_tracking_lot')
     group_stock_tracking_owner = fields.Boolean("Consignment",
         implied_group='stock.group_tracking_owner')
     group_stock_adv_location = fields.Boolean("Multi-Step Routes",
diff --git a/addons/stock/views/product_views.xml b/addons/stock/views/product_views.xml
index ec562a89a73..f48ccd89a0c 100644
--- a/addons/stock/views/product_views.xml
+++ b/addons/stock/views/product_views.xml
@@ -418,7 +418,7 @@
         parent="stock.menu_stock_inventory_control" sequence="1"/>
     <menuitem id="product_product_menu" name="Product Variants" action="product.product_normal_action"
         parent="menu_stock_inventory_control" sequence="2" groups="product.group_product_variant"/>
-    <menuitem id="menu_product_packagings" name="Product Packaging" parent="stock.menu_packages_config" action="product.action_packaging_view" groups="product.group_stock_packaging"/>
+    <menuitem id="menu_product_packagings" name="Product Packages" parent="stock.menu_packages_config" action="product.action_packaging_view" groups="product.group_stock_packaging"/>
 
     </data>
 </odoo>
diff --git a/addons/stock/views/stock_config_settings_views.xml b/addons/stock/views/stock_config_settings_views.xml
index 8a714c446df..d1ef1ce1444 100644
--- a/addons/stock/views/stock_config_settings_views.xml
+++ b/addons/stock/views/stock_config_settings_views.xml
@@ -30,19 +30,14 @@
                                     </div>
                                 </div>
                             </div>
-                            <div class="col-xs-12 col-md-6 o_setting_box" title="Put products in packages and get shipping labels per package unit thanks to shipping connectors.">
+                            <div class="col-xs-12 col-md-6 o_setting_box" title="Put your products in packs (e.g. parcels, boxes) and track them">
                                 <div class="o_setting_left_pane">
                                     <field name="group_stock_tracking_lot"/>
                                 </div>
                                 <div class="o_setting_right_pane">
                                     <label for="group_stock_tracking_lot"/>
                                     <div class="text-muted">
-                                        Track product packages (e.g.pallets, boxes)
-                                    </div>
-                                    <div class="content-group">
-                                        <div class="mt16" attrs="{'invisible': [('group_stock_tracking_lot', '=', False)]}">
-                                            <button name="%(product.action_packaging_view)d" icon="fa-arrow-right" type="action" string="Package Types" class="btn-link"/>
-                                        </div>
+                                        Put your products in packs (e.g. parcels, boxes) and track them
                                     </div>
                                 </div>
                             </div>
@@ -170,14 +165,19 @@
                                     </div>
                                 </div>
                             </div>
-                            <div class="col-xs-12 col-md-6 o_setting_box" title="Select or scan the packaging used to transfer products in operations. This allows to update or check the unit # transferred (which must be a multiple of the unit # per package). Packaging types are set on product detail form.">
+                            <div class="col-xs-12 col-md-6 o_setting_box" title="Manage product packages (e.g. pack of 6 bottles, box of 10 pieces)">
                                 <div class="o_setting_left_pane">
                                     <field name="group_stock_packaging"/>
                                 </div>
                                 <div class="o_setting_right_pane">
                                     <label for="group_stock_packaging"/>
                                     <div class="text-muted">
-                                        Manage product packaging
+                                        Manage product packages (e.g. pack of 6 bottles, box of 10 pieces)
+                                    </div>
+                                    <div class="content-group">
+                                        <div class="mt16" attrs="{'invisible': [('group_stock_packaging', '=', False)]}">
+                                            <button name="%(product.action_packaging_view)d" icon="fa-arrow-right" type="action" string="Product Packages" class="btn-link"/>
+                                        </div>
                                     </div>
                                 </div>
                             </div>