inserted weight_manual_uom_id, gross_weight_uom_id and volume_uom_id …

…in invoice
SimoneVagile · Sep 10, 2021 · 7171ad8 · 7171ad8
1 parent b6443af
commit 7171ad8
Show file tree

Hide file tree

Showing 6 changed files with 62 additions and 6 deletions.
diff --git a/l10n_it_ddt/__manifest__.py b/l10n_it_ddt/__manifest__.py
@@ -21,6 +21,7 @@
         'stock_account',
         'stock_picking_package_preparation_line',
         'product_expiry',
+        'uom',
     ],
     'data': [
         'security/ir.model.access.csv',

diff --git a/l10n_it_ddt/models/account.py b/l10n_it_ddt/models/account.py
@@ -32,6 +32,18 @@ class AccountInvoice(models.Model):
     weight = fields.Float(string="Weight")
     gross_weight = fields.Float(string="Gross Weight")
     volume = fields.Float('Volume')
+    weight_manual_uom_id = fields.Many2one(
+        'uom.uom', 'Net Weight UoM',
+        default=lambda self: self.env.ref(
+            'uom.product_uom_kgm', raise_if_not_found=False))
+    gross_weight_uom_id = fields.Many2one(
+        'uom.uom', 'Gross Weight UoM',
+        default=lambda self: self.env.ref(
+            'uom.product_uom_kgm', raise_if_not_found=False))
+    volume_uom_id = fields.Many2one(
+        'uom.uom', 'Volume UoM',
+        default=lambda self: self.env.ref(
+            'uom.product_uom_litre', raise_if_not_found=False))
     ddt_ids = fields.One2many(
         'stock.picking.package.preparation', 'invoice_id', string='TD')
 

diff --git a/l10n_it_ddt/models/sale.py b/l10n_it_ddt/models/sale.py
@@ -58,6 +58,19 @@ def _compute_ddt_ids(self):
              "invoiced from DDT. This parameter can be set on partners and "
              "automatically applied to Sale Orders.")
 
+    weight_manual_uom_id = fields.Many2one(
+        'uom.uom', 'Net Weight UoM',
+        default=lambda self: self.env.ref(
+            'uom.product_uom_kgm', raise_if_not_found=False))
+    gross_weight_uom_id = fields.Many2one(
+        'uom.uom', 'Gross Weight UoM',
+        default=lambda self: self.env.ref(
+            'uom.product_uom_kgm', raise_if_not_found=False))
+    volume_uom_id = fields.Many2one(
+        'uom.uom', 'Volume UoM',
+        default=lambda self: self.env.ref(
+            'uom.product_uom_litre', raise_if_not_found=False))
+
     @api.multi
     @api.onchange('partner_id')
     def onchange_partner_id(self):
@@ -90,6 +103,9 @@ def _prepare_invoice(self):
             'weight': self.weight,
             'gross_weight': self.gross_weight,
             'volume': self.volume,
+            'weight_manual_uom_id': self.weight_manual_uom_id.id,
+            'gross_weight_uom_id': self.gross_weight_uom_id.id,
+            'volume_uom_id': self.volume_uom_id.id,
         })
         return vals
 

diff --git a/l10n_it_ddt/models/stock_picking_package_preparation.py b/l10n_it_ddt/models/stock_picking_package_preparation.py
@@ -381,6 +381,9 @@ def _prepare_invoice(self):
             'weight': self.weight,
             'gross_weight': self.gross_weight,
             'volume': self.volume,
+            'weight_manual_uom_id': self.weight_manual_uom_id.id,
+            'gross_weight_uom_id': self.gross_weight_uom_id.id,
+            'volume_uom_id': self.volume_uom_id.id,
         })
         return res
 

diff --git a/l10n_it_ddt/views/account.xml b/l10n_it_ddt/views/account.xml
@@ -23,9 +23,21 @@
                             <field name="carrier_tracking_ref" />
                             <field name="dimension" />
                             <field name="parcels" />
-                            <field name="weight" />
-                            <field name="gross_weight" />
-                            <field name="volume" />
+                            <label for="weight"/>
+                            <div class="o_row">
+                                <field name="weight"/>
+                                <field name="weight_manual_uom_id" groups="uom.group_uom" widget="selection"/>
+                            </div>
+                            <label for="gross_weight"/>
+                            <div class="o_row">
+                                <field name="gross_weight"/>
+                                <field name="gross_weight_uom_id" groups="uom.group_uom" widget="selection"/>
+                            </div>
+                            <label for="volume"/>
+                            <div class="o_row">
+                                <field name="volume"/>
+                                <field name="volume_uom_id" groups="uom.group_uom" widget="selection"/>
+                            </div>
                         </group>
                         <newline/>
                         <group string="TD" name="ddt">

diff --git a/l10n_it_ddt/views/sale.xml b/l10n_it_ddt/views/sale.xml
@@ -22,9 +22,21 @@
                                     widget="selection"/>
                                 <field name="ddt_carrier_id" />
                                 <field name="parcels" />
-                                <field name="weight" />
-                                <field name="gross_weight"/>
-                                <field name="volume" />
+                                <label for="weight"/>
+                                <div class="o_row">
+                                    <field name="weight"/>
+                                    <field name="weight_manual_uom_id" groups="uom.group_uom" widget="selection"/>
+                                </div>
+                                <label for="gross_weight"/>
+                                <div class="o_row">
+                                    <field name="gross_weight"/>
+                                    <field name="gross_weight_uom_id" groups="uom.group_uom" widget="selection"/>
+                                </div>
+                                <label for="volume"/>
+                                <div class="o_row">
+                                    <field name="volume"/>
+                                    <field name="volume_uom_id" groups="uom.group_uom" widget="selection"/>
+                                </div>
                             </group>
                             <group>
                                 <field name="create_ddt"/>