From 3eeb77414ba18527497cdbc3ff75c9eb37352c74 Mon Sep 17 00:00:00 2001
From: Nicolas Martinelli <nim@odoo.com>
Date: Tue, 22 Jan 2019 11:16:28 +0000
Subject: [PATCH] [FIX] delivery: package UOM

Since it is now possible to select the default UOM, do not hardcode `kg`
in the view.

opw-1920809

closes odoo/odoo#30427
---
 addons/delivery/wizard/choose_delivery_package.py        | 7 +++++++
 addons/delivery/wizard/choose_delivery_package_views.xml | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/addons/delivery/wizard/choose_delivery_package.py b/addons/delivery/wizard/choose_delivery_package.py
index 70c06f06dac29..e7ad1d75292c4 100644
--- a/addons/delivery/wizard/choose_delivery_package.py
+++ b/addons/delivery/wizard/choose_delivery_package.py
@@ -21,6 +21,7 @@ class ChooseDeliveryPackage(models.TransientModel):
         string='Shipping Weight',
         default=lambda self: self._default_shipping_weight()
     )
+    weight_uom_name = fields.Char(string='Weight unit of measure label', compute='_compute_weight_uom_name')
 
     def _default_stock_quant_package_id(self):
         if self.env.context.get('default_stock_quant_package_id'):
@@ -45,6 +46,12 @@ def _default_shipping_weight(self):
             total_weight = sum([po.qty_done * po.product_id.weight for po in move_line_ids])
             return total_weight
 
+    @api.depends('stock_quant_package_id', 'delivery_packaging_id')
+    def _compute_weight_uom_name(self):
+        weight_uom_id = self.env['product.template']._get_weight_uom_id_from_ir_config_parameter()
+        for package in self:
+            package.weight_uom_name = weight_uom_id.name
+
     @api.onchange('delivery_packaging_id', 'shipping_weight')
     def _onchange_packaging_weight(self):
         if self.delivery_packaging_id.max_weight and self.shipping_weight > self.delivery_packaging_id.max_weight:
diff --git a/addons/delivery/wizard/choose_delivery_package_views.xml b/addons/delivery/wizard/choose_delivery_package_views.xml
index c37231ed38d56..72e5074def3e4 100644
--- a/addons/delivery/wizard/choose_delivery_package_views.xml
+++ b/addons/delivery/wizard/choose_delivery_package_views.xml
@@ -11,7 +11,7 @@
                     <label for="shipping_weight" attrs="{'invisible': [('delivery_packaging_id', '=', False)]}"/>
                     <div class="o_row" attrs="{'invisible': [('delivery_packaging_id', '=', False)]}">
                         <field name="shipping_weight"/>
-                        <span>kg</span>
+                        <field name="weight_uom_name"/>
                     </div>
                 </group>
                 <footer>