From ca7e7604d5ff6b6f34c8c2fbd00fee4465c2dc3b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20Krier?= <ced@b2ck.com>
Date: Sun, 30 Jan 2022 01:32:51 +0100
Subject: [PATCH] Add packages weight

issue11123
review373001002
---
 CHANGELOG                      |  1 +
 __init__.py                    |  2 ++
 stock.py                       | 20 +++++++++++++++
 stock.xml                      | 47 ++++++++++++++++++++++++++++++++++
 view/shipment_form.xml         | 13 ++++++++++
 view/shipment_form_package.xml |  9 +++++++
 view/shipment_list_package.xml |  8 ++++++
 7 files changed, 100 insertions(+)
 create mode 100644 view/shipment_form.xml
 create mode 100644 view/shipment_form_package.xml
 create mode 100644 view/shipment_list_package.xml

diff --git a/CHANGELOG b/CHANGELOG
index af9df97998..2f84fb1a68 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,4 @@
+* Add packages weight
 * Add support for Python 3.10
 * Remove support for Python 3.6
 
diff --git a/__init__.py b/__init__.py
index c7603f3abf..4e58eb23db 100644
--- a/__init__.py
+++ b/__init__.py
@@ -18,6 +18,8 @@ def register():
         module='stock_shipment_measurements', type_='model')
     Pool.register(
         stock.Package,
+        stock.ShipmentOutPackage,
+        stock.ShipmentInReturnPackage,
         module='stock_shipment_measurements', type_='model',
         depends=['stock_package'])
     Pool.register(
diff --git a/stock.py b/stock.py
index de05144e72..974c893e5c 100644
--- a/stock.py
+++ b/stock.py
@@ -294,3 +294,23 @@ class Package(MeasurementsMixin, object, metaclass=PoolMeta):
                     self.packaging_weight_uom, self.packaging_weight, kg,
                     round=False)
         return measurement
+
+
+class MeasurementsPackageMixin:
+    __slots__ = ()
+
+    packages_weight = fields.Function(
+        fields.Float("Packages Weight", digits=None,
+            help="The total weight of the packages in kg."),
+        'get_packages_weight')
+
+    def get_packages_weight(self, name):
+        return sum(p.total_weight for p in self.root_packages)
+
+
+class ShipmentOutPackage(MeasurementsPackageMixin, metaclass=PoolMeta):
+    __name__ = 'stock.shipment.out'
+
+
+class ShipmentInReturnPackage(MeasurementsPackageMixin, metaclass=PoolMeta):
+    __name__ = 'stock.shipment.in.return'
diff --git a/stock.xml b/stock.xml
index 058614fc81..9809872111 100644
--- a/stock.xml
+++ b/stock.xml
@@ -8,21 +8,42 @@ this repository contains the full copyright notices and license terms. -->
             <field name="inherit" ref="stock.shipment_in_view_tree"/>
             <field name="name">shipment_list</field>
         </record>
+        <record model="ir.ui.view" id="shipment_in_view_form">
+            <field name="model">stock.shipment.in</field>
+            <field name="inherit" ref="stock.shipment_in_view_form"/>
+            <field name="name">shipment_form</field>
+        </record>
         <record model="ir.ui.view" id="shipment_in_return_view_list">
             <field name="model">stock.shipment.in.return</field>
             <field name="inherit" ref="stock.shipment_in_return_view_tree"/>
             <field name="name">shipment_list</field>
         </record>
+        <record model="ir.ui.view" id="shipment_in_return_view_form">
+            <field name="model">stock.shipment.in.return</field>
+            <field name="inherit" ref="stock.shipment_in_return_view_form"/>
+            <field name="name">shipment_form</field>
+        </record>
         <record model="ir.ui.view" id="shipment_out_view_list">
             <field name="model">stock.shipment.out</field>
             <field name="inherit" ref="stock.shipment_out_view_tree"/>
             <field name="name">shipment_list</field>
         </record>
+        <record model="ir.ui.view" id="shipment_out_view_form">
+            <field name="model">stock.shipment.out</field>
+            <field name="inherit" ref="stock.shipment_out_view_form"/>
+            <field name="name">shipment_form</field>
+        </record>
         <record model="ir.ui.view" id="shipment_out_return_view_list">
             <field name="model">stock.shipment.out.return</field>
             <field name="inherit" ref="stock.shipment_out_return_view_tree"/>
             <field name="name">shipment_list</field>
         </record>
+        <record model="ir.ui.view" id="shipment_out_return_view_form">
+            <field name="model">stock.shipment.out.return</field>
+            <field name="inherit" ref="stock.shipment_out_return_view_form"/>
+            <field name="name">shipment_form</field>
+        </record>
+
     </data>
     <data depends="stock_package">
         <record model="ir.ui.view" id="package_view_tree">
@@ -40,5 +61,31 @@ this repository contains the full copyright notices and license terms. -->
             <field name="inherit" ref="stock_package.package_view_form"/>
             <field name="name">package_form</field>
         </record>
+
+        <record model="ir.ui.view" id="shipment_in_return_view_list_package">
+            <field name="model">stock.shipment.in.return</field>
+            <field name="inherit" ref="stock.shipment_in_return_view_tree"/>
+            <field name="priority" eval="20"/>
+            <field name="name">shipment_list_package</field>
+        </record>
+        <record model="ir.ui.view" id="shipment_in_return_view_form_package">
+            <field name="model">stock.shipment.in.return</field>
+            <field name="inherit" ref="stock.shipment_in_return_view_form"/>
+            <field name="priority" eval="20"/>
+            <field name="name">shipment_form_package</field>
+        </record>
+
+        <record model="ir.ui.view" id="shipment_out_view_list_package">
+            <field name="model">stock.shipment.out</field>
+            <field name="inherit" ref="stock.shipment_out_view_tree"/>
+            <field name="priority" eval="20"/>
+            <field name="name">shipment_list_package</field>
+        </record>
+        <record model="ir.ui.view" id="shipment_out_view_form_package">
+            <field name="model">stock.shipment.out</field>
+            <field name="inherit" ref="stock.shipment_out_view_form"/>
+            <field name="priority" eval="20"/>
+            <field name="name">shipment_form_package</field>
+        </record>
     </data>
 </tryton>
diff --git a/view/shipment_form.xml b/view/shipment_form.xml
new file mode 100644
index 0000000000..26a6c4468c
--- /dev/null
+++ b/view/shipment_form.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0"?>
+<!-- This file is part of Tryton.  The COPYRIGHT file at the top level of
+this repository contains the full copyright notices and license terms. -->
+<data>
+    <xpath expr="//page[@id='other']" position="inside">
+        <separator id="measurements" colspan="4" string="Measurements"/>
+        <label name="weight"/>
+        <field name="weight"/>
+        <label name="volume"/>
+        <field name="volume"/>
+        <newline/>
+    </xpath>
+</data>
diff --git a/view/shipment_form_package.xml b/view/shipment_form_package.xml
new file mode 100644
index 0000000000..edcf4f0040
--- /dev/null
+++ b/view/shipment_form_package.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0"?>
+<!-- This file is part of Tryton.  The COPYRIGHT file at the top level of
+this repository contains the full copyright notices and license terms. -->
+<data>
+    <xpath expr="//field[@name='weight']" position="after">
+        <label name="packages_weight"/>
+        <field name="packages_weight"/>
+    </xpath>
+</data>
diff --git a/view/shipment_list_package.xml b/view/shipment_list_package.xml
new file mode 100644
index 0000000000..a9fbf209c1
--- /dev/null
+++ b/view/shipment_list_package.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<!-- This file is part of Tryton.  The COPYRIGHT file at the top level of
+this repository contains the full copyright notices and license terms. -->
+<data>
+    <xpath expr="/tree/field[@name='weight']" position="after">
+        <field name="packages_weight"/>
+    </xpath>
+</data>