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 @@ - Packagings + Delivery Packages product.packaging [('product_id', '=', False)] - + delivery.carrier.tree 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 @@ product.packaging - + - + 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 @@ product.packaging.tree.view product.packaging - + @@ -485,7 +485,7 @@ - Packagings + Product Packages product.packaging [('product_id', '!=', False)] - + 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 @@ - + - Track product packages (e.g.pallets, boxes) - - - - - + Put your products in packs (e.g. parcels, boxes) and track them @@ -170,14 +165,19 @@ - + - Manage product packaging + Manage product packages (e.g. pack of 6 bottles, box of 10 pieces) + + + + +