From 7e89865ea1d6b2c08314e67beb4c32316471da2d Mon Sep 17 00:00:00 2001
From: Pierre Masereel <pim@odoo.com>
Date: Tue, 21 Nov 2017 15:29:29 +0100
Subject: [PATCH] [REF] product, stock: packages wording

---
 addons/product/models/product.py                 | 2 +-
 addons/product/models/res_config_settings.py     | 2 +-
 addons/product/views/product_views.xml           | 8 ++++----
 addons/stock/models/stock_picking.py             | 2 +-
 addons/stock/report/stock_report_views.xml       | 8 ++++----
 addons/stock/views/product_views.xml             | 2 +-
 addons/stock/views/res_config_settings_views.xml | 6 +++---
 addons/stock/views/stock_picking_views.xml       | 2 +-
 8 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/addons/product/models/product.py b/addons/product/models/product.py
index 62347b4cd06..057cbdf725a 100644
--- a/addons/product/models/product.py
+++ b/addons/product/models/product.py
@@ -556,7 +556,7 @@ class ProductPackaging(models.Model):
     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.")
+    qty = fields.Float('Contained Quantity', help="The total number of products you can have per pallet or box.")
     barcode = fields.Char('Barcode', copy=False, help="Barcode used for packaging identification.")
 
 
diff --git a/addons/product/models/res_config_settings.py b/addons/product/models/res_config_settings.py
index 1d08f2a9a4c..9fd8acfc626 100644
--- a/addons/product/models/res_config_settings.py
+++ b/addons/product/models/res_config_settings.py
@@ -14,7 +14,7 @@ class ResConfigSettings(models.TransientModel):
              " * Unchecked : Each company can see only its product (product where company is defined). Product not related to a company are visible for all companies.")
     group_uom = fields.Boolean("Units of Measure", implied_group='product.group_uom')
     group_product_variant = fields.Boolean("Attributes and Variants", implied_group='product.group_product_variant')
-    group_stock_packaging = fields.Boolean('Product Packages',
+    group_stock_packaging = fields.Boolean('Product Packagings',
         implied_group='product.group_stock_packaging')
     group_sale_pricelist = fields.Boolean("Use pricelists to adapt your price per customers",
         implied_group='product.group_sale_pricelist',
diff --git a/addons/product/views/product_views.xml b/addons/product/views/product_views.xml
index 5711fbdf6a0..5345158eb59 100644
--- a/addons/product/views/product_views.xml
+++ b/addons/product/views/product_views.xml
@@ -454,10 +454,10 @@
             <field name="name">product.packaging.tree.view</field>
             <field name="model">product.packaging</field>
             <field name="arch" type="xml">
-                <tree string="Product Packages">
+                <tree string="Product Packagings">
                     <field name="sequence" widget="handle"/>
                     <field name="product_id"/>
-                    <field name="name"/>
+                    <field name="name" string="Packaging"/>
                     <field name="qty"/>
                 </tree>
             </field>
@@ -469,7 +469,7 @@
             <field name="arch" type="xml">
                 <form string="Product Packaging">
                     <sheet>
-                        <label for="name"/>
+                        <label for="name" string="Packaging"/>
                         <h1>
                             <field name="name"/>
                         </h1>
@@ -489,7 +489,7 @@
         </record>
 
         <record model="ir.actions.act_window" id="action_packaging_view">
-            <field name="name">Product Packages</field>
+            <field name="name">Product Packagings</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/stock/models/stock_picking.py b/addons/stock/models/stock_picking.py
index a3100d0d791..cf1e7ba4c02 100644
--- a/addons/stock/models/stock_picking.py
+++ b/addons/stock/models/stock_picking.py
@@ -31,7 +31,7 @@ class PickingType(models.Model):
         help="This is the default destination location when you create a picking manually with this operation type. It is possible however to change it or that the routes put another location. If it is empty, it will check for the customer location on the partner. ")
     code = fields.Selection([('incoming', 'Vendors'), ('outgoing', 'Customers'), ('internal', 'Internal')], 'Type of Operation', required=True)
     return_picking_type_id = fields.Many2one('stock.picking.type', 'Operation Type for Returns')
-    show_entire_packs = fields.Boolean('Allow moving packs', help="If checked, this shows the packs to be moved as a whole in the Operations tab all the time, even if there was no entire pack reserved.")
+    show_entire_packs = fields.Boolean('Move Entire Packages', help="If checked, this shows the packs to be moved as a whole in the Operations tab all the time, even if there was no entire pack reserved.")
     warehouse_id = fields.Many2one(
         'stock.warehouse', 'Warehouse', ondelete='cascade',
         default=lambda self: self.env['stock.warehouse'].search([('company_id', '=', self.env.user.company_id.id)], limit=1))
diff --git a/addons/stock/report/stock_report_views.xml b/addons/stock/report/stock_report_views.xml
index e1f84bb2620..57bacfb09be 100644
--- a/addons/stock/report/stock_report_views.xml
+++ b/addons/stock/report/stock_report_views.xml
@@ -29,21 +29,21 @@
             print_report_name="'Inventory - %s' % (object.name)"
         />
         <report
-            string="Package BarCode with Contents"
+            string="Package Barcode with Contents"
             id="action_report_quant_package_barcode"
             model="stock.quant.package"
             report_type="qweb-pdf"
             name="stock.report_package_barcode"
             file="stock.report_package_barcode"/>
         <report
-            string="Package BarCode"
+            string="Package Barcode"
             id="action_report_quant_package_barcode_small"
             model="stock.quant.package"
             report_type="qweb-pdf"
             name="stock.report_package_barcode_small"
             file="stock.report_package_barcode"/>
         <report
-            string="Location BarCode"
+            string="Location Barcode"
             id="action_report_location_barcode"
             model="stock.location"
             report_type="qweb-pdf"
@@ -52,7 +52,7 @@
             print_report_name="'Location - %s' % object.name"
         />
         <report
-            string="Lot BarCode"
+            string="Lot Barcode"
             id="action_report_lot_barcode"
             model="stock.production.lot"
             report_type="qweb-pdf"
diff --git a/addons/stock/views/product_views.xml b/addons/stock/views/product_views.xml
index de86fda7a8b..4368d9570bd 100644
--- a/addons/stock/views/product_views.xml
+++ b/addons/stock/views/product_views.xml
@@ -336,7 +336,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 Packages" parent="stock.menu_product_in_config_stock" action="product.action_packaging_view" groups="product.group_stock_packaging"/>
+    <menuitem id="menu_product_packagings" name="Product Packagings" parent="stock.menu_product_in_config_stock" action="product.action_packaging_view" groups="product.group_stock_packaging"/>
 
     </data>
 </odoo>
diff --git a/addons/stock/views/res_config_settings_views.xml b/addons/stock/views/res_config_settings_views.xml
index 1fb913eba20..63aa5467458 100644
--- a/addons/stock/views/res_config_settings_views.xml
+++ b/addons/stock/views/res_config_settings_views.xml
@@ -166,18 +166,18 @@
                                     </div>
                                 </div>
                             </div>
-                            <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="col-xs-12 col-md-6 o_setting_box" title="Manage product packagings (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 packages (e.g. pack of 6 bottles, box of 10 pieces)
+                                        Manage product packagings (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"/>
+                                            <button name="%(product.action_packaging_view)d" icon="fa-arrow-right" type="action" string="Product Packagings" class="btn-link"/>
                                         </div>
                                     </div>
                                 </div>
diff --git a/addons/stock/views/stock_picking_views.xml b/addons/stock/views/stock_picking_views.xml
index aff53a05d25..d8d879ebfc1 100644
--- a/addons/stock/views/stock_picking_views.xml
+++ b/addons/stock/views/stock_picking_views.xml
@@ -51,7 +51,7 @@
                             </group>
                         </group>
                         <group>
-                            <group attrs='{"invisible": [("code", "not in", ["incoming", "outgoing", "internal"])]}' string="Packs and Lots" groups="stock.group_tracking_lot,stock.group_production_lot">
+                            <group attrs='{"invisible": [("code", "not in", ["incoming", "outgoing", "internal"])]}' string="Packages &amp; Traceability" groups="stock.group_tracking_lot,stock.group_production_lot">
                                 <field name="show_entire_packs" groups="stock.group_tracking_lot"/>
                                 <field name="use_create_lots" groups="stock.group_production_lot"/>
                                 <field name="use_existing_lots" groups="stock.group_production_lot"/>