summaryrefslogtreecommitdiff
path: root/addons/delivery/models
diff options
context:
space:
mode:
authorPierre Masereel <pim@odoo.com>2019-04-23 13:40:54 +0000
committerPierre Masereel <pim@odoo.com>2020-02-04 12:57:52 +0000
commit2c079fcd107caec3a25e2a78d4d0e5af1d8237da (patch)
tree6cc71298daf06f665879719e475656cda3f8514f /addons/delivery/models
parentbd1edc62f31f5426549bb88615486934ceff389c (diff)
[IMP] product,delivery: improve unit of measure display
Diffstat (limited to 'addons/delivery/models')
-rw-r--r--addons/delivery/models/product_packaging.py18
1 files changed, 18 insertions, 0 deletions
diff --git a/addons/delivery/models/product_packaging.py b/addons/delivery/models/product_packaging.py
index 7e98ebf7cff..939a6dd0bdf 100644
--- a/addons/delivery/models/product_packaging.py
+++ b/addons/delivery/models/product_packaging.py
@@ -7,12 +7,21 @@ from odoo import models, fields, api
class ProductPackaging(models.Model):
_inherit = 'product.packaging'
+
+ def _get_default_length_uom(self):
+ return self.env['product.template']._get_length_uom_name_from_ir_config_parameter()
+
+ def _get_default_weight_uom(self):
+ return self.env['product.template']._get_weight_uom_name_from_ir_config_parameter()
+
height = fields.Integer('Height')
width = fields.Integer('Width')
packaging_length = fields.Integer('Length')
max_weight = fields.Float('Max Weight', help='Maximum weight shippable in this packaging')
shipper_package_code = fields.Char('Package Code')
package_carrier_type = fields.Selection([('none', 'No carrier integration')], string='Carrier', default='none')
+ weight_uom_name = fields.Char(string='Weight unit of measure label', compute='_compute_weight_uom_name', default=_get_default_weight_uom)
+ length_uom_name = fields.Char(string='Length unit of measure label', compute='_compute_length_uom_name', default=_get_default_length_uom)
_sql_constraints = [
('positive_height', 'CHECK(height>=0)', 'Height must be positive'),
@@ -28,3 +37,12 @@ class ProductPackaging(models.Model):
self.shipper_package_code = carrier_id._get_default_custom_package_code()
else:
self.shipper_package_code = False
+
+
+ def _compute_length_uom_name(self):
+ for packaging in self:
+ packaging.length_uom_name = self.env['product.template']._get_length_uom_name_from_ir_config_parameter()
+
+ def _compute_weight_uom_name(self):
+ for packaging in self:
+ packaging.weight_uom_name = self.env['product.template']._get_weight_uom_name_from_ir_config_parameter()