update delivery_schenker

Author: mt-software-de

delivery_schenker/README.rst

@@ -7,7 +7,7 @@ Delivery Schenker
    !! This file is generated by oca-gen-addon-readme !!
    !! changes will be overwritten.                   !!
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-   !! source digest: sha256:d4bb07ec262f28ebf12722c6b529cee813a3022a5f73e4010970171abe752de3
+   !! source digest: sha256:4f0a596c6bac6914af4ecc42714c6f39e446a09b4404bca36651af0fd55792ff
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 .. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png

delivery_schenker/__manifest__.py

@@ -11,7 +11,7 @@
     "license": "AGPL-3",
     "application": False,
     "installable": True,
-    "depends": ["delivery_package_number", "delivery_state"],
+    "depends": ["delivery_state"],
     "external_dependencies": {"python": ["zeep"]},
     "data": [
         "views/delivery_schenker_view.xml",

delivery_schenker/models/delivery_carrier.py

@@ -404,7 +404,7 @@ def _schenker_shipping_information_with_packages(self, picking):
             for package in picking.package_ids
         ]
 
-    def _schenker_shipping_information_without_packages_volume(self, picking):
+    def _schenker_shipping_information_without_packages_volume(self, move_lines):
         # Obviously products should be well configured. This parameter is mandatory.
         return sum(
             [
@@ -414,13 +414,16 @@ def _schenker_shipping_information_without_packages_volume(self, picking):
                         ml.qty_done, ml.product_id.uom_id
                     ),
                 )
-                for ml in picking.move_line_ids
+                for ml in move_lines
                 if not ml.result_package_id
             ]
         )
 
     def _schenker_shipping_information_without_packages(self, picking):
-        if all(move_line.result_package_id for move_line in picking.move_line_ids):
+        move_lines_without_package = picking.move_line_ids.filtered(
+            lambda ml: not ml.result_package_id
+        )
+        if not move_lines_without_package:
             return []
         weight = picking.shipping_weight or picking.weight
         return [
@@ -429,15 +432,15 @@ def _schenker_shipping_information_without_packages(self, picking):
                 "dgr": False,
                 "cargoDesc": picking.name,
                 # For a more complex solution use packaging properly
-                "grossWeight": self._schenker_shipping_information_round_weight(
-                    weight / picking.number_of_packages
-                ),
+                "grossWeight": self._schenker_shipping_information_round_weight(weight),
                 "volume": self._schenker_shipping_information_round_volume(
-                    self._schenker_shipping_information_without_packages_volume(picking)
+                    self._schenker_shipping_information_without_packages_volume(
+                        move_lines_without_package
+                    )
                 ),
                 "packageType": self.schenker_default_packaging_id.shipper_package_code,
                 "stackable": self.schenker_default_packaging_id.schenker_stackable,
-                "pieces": picking.number_of_packages,
+                "pieces": 1,
             }
         ]
 

delivery_schenker/static/description/index.html

@@ -367,7 +367,7 @@ <h1 class="title">Delivery Schenker</h1>
 !! This file is generated by oca-gen-addon-readme !!
 !! changes will be overwritten.                   !!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-!! source digest: sha256:d4bb07ec262f28ebf12722c6b529cee813a3022a5f73e4010970171abe752de3
+!! source digest: sha256:4f0a596c6bac6914af4ecc42714c6f39e446a09b4404bca36651af0fd55792ff
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
 <p><a class="reference external image-reference" href="https://odoo-community.org/page/development-status"><img alt="Beta" src="https://img.shields.io/badge/maturity-Beta-yellow.png" /></a> <a class="reference external image-reference" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/OCA/delivery-carrier/tree/14.0/delivery_schenker"><img alt="OCA/delivery-carrier" src="https://img.shields.io/badge/github-OCA%2Fdelivery--carrier-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/delivery-carrier-14-0/delivery-carrier-14-0-delivery_schenker"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external image-reference" href="https://runboat.odoo-community.org/builds?repo=OCA/delivery-carrier&amp;target_branch=14.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
 <p>This module links the <a class="reference external" href="https://www.dbschenker.com">DB Schenker</a> booking and tracking