Skip to content

Commit 079aaf5

Browse files
mt-software-demt-software-de
committed
Don't Merge
PR: #786 [FIX] Unittests base_delivery_carrier_label: Separate github test run For dependents addons
1 parent 1ec5420 commit 079aaf5

File tree

18 files changed

+55
-27
lines changed

18 files changed

+55
-27
lines changed

‎.github/workflows/test.yml

+12
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,18 @@ jobs:
3737
include:
3838
- container: ghcr.io/oca/oca-ci/py3.6-odoo14.0:latest
3939
name: test with Odoo
40+
exclude: "base_delivery_carrier_label,delivery_carrier_label_batch,delivery_roulier,delivery_roulier_option,delivery_roulier_laposte_fr,delivery_roulier_chronopost_fr,carrier_account_environment"
4041
- container: ghcr.io/oca/oca-ci/py3.6-ocb14.0:latest
4142
name: test with OCB
4243
makepot: "true"
44+
exclude: "base_delivery_carrier_label,delivery_carrier_label_batch,delivery_roulier,delivery_roulier_option,delivery_roulier_laposte_fr,delivery_roulier_chronopost_fr,carrier_account_environment"
45+
- container: ghcr.io/oca/oca-ci/py3.6-odoo14.0:latest
46+
name: test with Odoo
47+
include: "base_delivery_carrier_label,delivery_carrier_label_batch,delivery_roulier,delivery_roulier_option,delivery_roulier_laposte_fr,delivery_roulier_chronopost_fr,carrier_account_environment"
48+
- container: ghcr.io/oca/oca-ci/py3.6-ocb14.0:latest
49+
name: test with OCB
50+
makepot: "true"
51+
include: "base_delivery_carrier_label,delivery_carrier_label_batch,delivery_roulier,delivery_roulier_option,delivery_roulier_laposte_fr,delivery_roulier_chronopost_fr,carrier_account_environment"
4352
services:
4453
postgres:
4554
image: postgres:9.6
@@ -49,6 +58,9 @@ jobs:
4958
POSTGRES_DB: odoo
5059
ports:
5160
- 5432:5432
61+
env:
62+
INCLUDE: "${{ matrix.include }}"
63+
EXCLUDE: "${{ matrix.exclude }}"
5264
steps:
5365
- uses: actions/checkout@v3
5466
with:

‎delivery_cttexpress/README.rst

+3-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ Delivery CTT Express
77
!! This file is generated by oca-gen-addon-readme !!
88
!! changes will be overwritten. !!
99
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
10-
!! source digest: sha256:efe5b3f4a10b36fe4716430005bf493c7dff939003e6298cdd8839f2a9f5687d
10+
!! source digest: sha256:99cdf17bfe832d52ac72ec2c8b8f2b3a96b0b1a518fce0c0b1d3725c424311fd
1111
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
1212
1313
.. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png
@@ -132,6 +132,8 @@ Contributors
132132

133133
* David Vidal
134134

135+
* Michael Tietz (MT Software) <mtietz@mt-software.de>
136+
135137
Other credits
136138
~~~~~~~~~~~~~
137139

‎delivery_cttexpress/models/delivery_carrier.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
# Copyright 2022 Tecnativa - David Vidal
2+
# Copyright 2024 Michael Tietz (MT Software) <mtietz@mt-software.de>
23
# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
34
from odoo import _, api, fields, models
45
from odoo.exceptions import UserError
@@ -168,7 +169,7 @@ def _prepare_cttexpress_shipping(self, picking):
168169
return {
169170
"ClientReference": reference, # Optional
170171
"ClientDepartmentCode": None, # Optional (no core field matches)
171-
"ItemsCount": picking.number_of_packages,
172+
"ItemsCount": picking.number_of_packages or 1,
172173
"IsClientPodScanRequired": None, # Optional
173174
"RecipientAddress": recipient.street,
174175
"RecipientCountry": recipient.country_id.code,

‎delivery_cttexpress/readme/CONTRIBUTORS.rst

+2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
11
* `Tecnativa <https://www.tecnativa.com>`_:
22

33
* David Vidal
4+
5+
* Michael Tietz (MT Software) <mtietz@mt-software.de>

‎delivery_cttexpress/static/description/index.html

+2-1
Original file line numberDiff line numberDiff line change
@@ -367,7 +367,7 @@ <h1 class="title">Delivery CTT Express</h1>
367367
!! This file is generated by oca-gen-addon-readme !!
368368
!! changes will be overwritten. !!
369369
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
370-
!! source digest: sha256:efe5b3f4a10b36fe4716430005bf493c7dff939003e6298cdd8839f2a9f5687d
370+
!! source digest: sha256:99cdf17bfe832d52ac72ec2c8b8f2b3a96b0b1a518fce0c0b1d3725c424311fd
371371
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
372372
<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_cttexpress"><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_cttexpress"><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>
373373
<p>CTT Express Iberic Web Services API intration with Odoo. Valid for Portugal and Spain.</p>
@@ -479,6 +479,7 @@ <h2><a class="toc-backref" href="#toc-entry-8">Contributors</a></h2>
479479
<li>David Vidal</li>
480480
</ul>
481481
</li>
482+
<li>Michael Tietz (MT Software) &lt;<a class="reference external" href="mailto:mtietz&#64;mt-software.de">mtietz&#64;mt-software.de</a>&gt;</li>
482483
</ul>
483484
</div>
484485
<div class="section" id="other-credits">

‎delivery_package_fee/README.rst

+2-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ Delivery Package Fees
77
!! This file is generated by oca-gen-addon-readme !!
88
!! changes will be overwritten. !!
99
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
10-
!! source digest: sha256:1bd03bdc59edfe4e2046329326afe107e8738bee72bd01862cae29fadd798647
10+
!! source digest: sha256:2a7faf7ca4a955b3296dc72b61d0a72871437d1a453ce7677128fb30aaef8335
1111
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
1212
1313
.. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png
@@ -79,6 +79,7 @@ Contributors
7979
~~~~~~~~~~~~
8080

8181
* Guewen Baconnier <guewen.baconnier@camptocamp.com>
82+
* Michael Tietz (MT Software) <mtietz@mt-software.de>
8283

8384
Maintainers
8485
~~~~~~~~~~~

‎delivery_package_fee/readme/CONTRIBUTORS.rst

+1
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
11
* Guewen Baconnier <guewen.baconnier@camptocamp.com>
2+
* Michael Tietz (MT Software) <mtietz@mt-software.de>

‎delivery_package_fee/static/description/index.html

+2-1
Original file line numberDiff line numberDiff line change
@@ -367,7 +367,7 @@ <h1 class="title">Delivery Package Fees</h1>
367367
!! This file is generated by oca-gen-addon-readme !!
368368
!! changes will be overwritten. !!
369369
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
370-
!! source digest: sha256:1bd03bdc59edfe4e2046329326afe107e8738bee72bd01862cae29fadd798647
370+
!! source digest: sha256:2a7faf7ca4a955b3296dc72b61d0a72871437d1a453ce7677128fb30aaef8335
371371
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
372372
<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_package_fee"><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_package_fee"><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>
373373
<p>Add delivery fees on Sales Orders based on the delivered packages.</p>
@@ -424,6 +424,7 @@ <h2><a class="toc-backref" href="#toc-entry-4">Authors</a></h2>
424424
<h2><a class="toc-backref" href="#toc-entry-5">Contributors</a></h2>
425425
<ul class="simple">
426426
<li>Guewen Baconnier &lt;<a class="reference external" href="mailto:guewen.baconnier&#64;camptocamp.com">guewen.baconnier&#64;camptocamp.com</a>&gt;</li>
427+
<li>Michael Tietz (MT Software) &lt;<a class="reference external" href="mailto:mtietz&#64;mt-software.de">mtietz&#64;mt-software.de</a>&gt;</li>
427428
</ul>
428429
</div>
429430
<div class="section" id="maintainers">

‎delivery_package_fee/tests/test_package_fee.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
# Copyright 2020 Camptocamp
2+
# Copyright 2024 Michael Tietz (MT Software) <mtietz@mt-software.de>
23
# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
34

45
from odoo.tests.common import Form, SavepointCase
@@ -322,7 +323,7 @@ def test_package_no_package(self):
322323
self.assertEqual(picking.state, "assigned")
323324
picking.move_line_ids[0].qty_done = 10.0
324325
picking.move_line_ids[1].qty_done = 10.0
325-
picking.with_context(set_default_package=False)._action_done()
326+
picking._action_done()
326327
self.assertEqual(picking.state, "done")
327328

328329
self.assertRecordValues(

‎delivery_package_number/README.rst

+3-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ Stock Picking Package Number
77
!! This file is generated by oca-gen-addon-readme !!
88
!! changes will be overwritten. !!
99
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
10-
!! source digest: sha256:3ed5adf0029e78322866727bc33ad34c20aeca25abb3ddf4604e85cd60d13d8c
10+
!! source digest: sha256:ff9990b646408ab222fbcb027456d78cccc6319f52302959c9e7cae8965931fc
1111
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
1212
1313
.. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png
@@ -89,6 +89,8 @@ Contributors
8989

9090
* Ángel García de la Chica Herrera <angel.garcia@sygel.es>
9191

92+
* Michael Tietz (MT Software) <mtietz@mt-software.de>
93+
9294
Maintainers
9395
~~~~~~~~~~~
9496

‎delivery_package_number/readme/CONTRIBUTORS.rst

+2
Original file line numberDiff line numberDiff line change
@@ -8,3 +8,5 @@
88
* `Sygel <https://www.sygel.es>`_:
99

1010
* Ángel García de la Chica Herrera <angel.garcia@sygel.es>
11+
12+
* Michael Tietz (MT Software) <mtietz@mt-software.de>

‎delivery_package_number/static/description/index.html

+4-1
Original file line numberDiff line numberDiff line change
@@ -367,7 +367,7 @@ <h1 class="title">Stock Picking Package Number</h1>
367367
!! This file is generated by oca-gen-addon-readme !!
368368
!! changes will be overwritten. !!
369369
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
370-
!! source digest: sha256:3ed5adf0029e78322866727bc33ad34c20aeca25abb3ddf4604e85cd60d13d8c
370+
!! source digest: sha256:ff9990b646408ab222fbcb027456d78cccc6319f52302959c9e7cae8965931fc
371371
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
372372
<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_package_number"><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_package_number"><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>
373373
<p>This module recovers the number of packages field that was present in previous
@@ -440,6 +440,9 @@ <h2><a class="toc-backref" href="#toc-entry-5">Contributors</a></h2>
440440
</ul>
441441
</blockquote>
442442
</blockquote>
443+
<ul class="simple">
444+
<li>Michael Tietz (MT Software) &lt;<a class="reference external" href="mailto:mtietz&#64;mt-software.de">mtietz&#64;mt-software.de</a>&gt;</li>
445+
</ul>
443446
</div>
444447
<div class="section" id="maintainers">
445448
<h2><a class="toc-backref" href="#toc-entry-6">Maintainers</a></h2>

‎delivery_package_number/wizard/stock_backorder_confirmation.py

+2-4
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
# Copyright 2023 Ángel García de la Chica Herrera <angel.garcia@sygel.es>
2+
# Copyright 2024 Michael Tietz (MT Software) <mtietz@mt-software.de>
23
# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
34

45
from odoo import api, fields, models
@@ -24,7 +25,4 @@ def _compute_ask_number_of_packages(self):
2425
def process(self):
2526
if self.number_of_packages:
2627
self.pick_ids.write({"number_of_packages": self.number_of_packages})
27-
# put context key for avoiding `base_delivery_carrier_label` auto-packaging feature
28-
return super(
29-
StockBackorderConfirmation, self.with_context(set_default_package=False)
30-
).process()
28+
return super().process()

‎delivery_package_number/wizard/stock_inmediate_transfer.py

+2-4
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
# Copyright 2020 Tecnativa - David Vidal
2+
# Copyright 2024 Michael Tietz (MT Software) <mtietz@mt-software.de>
23
# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
34
from odoo import api, fields, models
45

@@ -23,7 +24,4 @@ def _compute_ask_number_of_packages(self):
2324
def process(self):
2425
if self.number_of_packages:
2526
self.pick_ids.write({"number_of_packages": self.number_of_packages})
26-
# put context key for avoiding `base_delivery_carrier_label` auto-packaging feature
27-
return super(
28-
StockImmediateTransfer, self.with_context(set_default_package=False)
29-
).process()
27+
return super().process()

‎delivery_schenker/README.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ Delivery Schenker
77
!! This file is generated by oca-gen-addon-readme !!
88
!! changes will be overwritten. !!
99
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
10-
!! source digest: sha256:d4bb07ec262f28ebf12722c6b529cee813a3022a5f73e4010970171abe752de3
10+
!! source digest: sha256:4f0a596c6bac6914af4ecc42714c6f39e446a09b4404bca36651af0fd55792ff
1111
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
1212
1313
.. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png

‎delivery_schenker/__manifest__.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"license": "AGPL-3",
1212
"application": False,
1313
"installable": True,
14-
"depends": ["delivery_package_number", "delivery_state"],
14+
"depends": ["delivery_state"],
1515
"external_dependencies": {"python": ["zeep"]},
1616
"data": [
1717
"views/delivery_schenker_view.xml",

‎delivery_schenker/models/delivery_carrier.py

+11-8
Original file line numberDiff line numberDiff line change
@@ -404,7 +404,7 @@ def _schenker_shipping_information_with_packages(self, picking):
404404
for package in picking.package_ids
405405
]
406406

407-
def _schenker_shipping_information_without_packages_volume(self, picking):
407+
def _schenker_shipping_information_without_packages_volume(self, move_lines):
408408
# Obviously products should be well configured. This parameter is mandatory.
409409
return sum(
410410
[
@@ -414,13 +414,16 @@ def _schenker_shipping_information_without_packages_volume(self, picking):
414414
ml.qty_done, ml.product_id.uom_id
415415
),
416416
)
417-
for ml in picking.move_line_ids
417+
for ml in move_lines
418418
if not ml.result_package_id
419419
]
420420
)
421421

422422
def _schenker_shipping_information_without_packages(self, picking):
423-
if all(move_line.result_package_id for move_line in picking.move_line_ids):
423+
move_lines_without_package = picking.move_line_ids.filtered(
424+
lambda ml: not ml.result_package_id
425+
)
426+
if not move_lines_without_package:
424427
return []
425428
weight = picking.shipping_weight or picking.weight
426429
return [
@@ -429,15 +432,15 @@ def _schenker_shipping_information_without_packages(self, picking):
429432
"dgr": False,
430433
"cargoDesc": picking.name,
431434
# For a more complex solution use packaging properly
432-
"grossWeight": self._schenker_shipping_information_round_weight(
433-
weight / picking.number_of_packages
434-
),
435+
"grossWeight": self._schenker_shipping_information_round_weight(weight),
435436
"volume": self._schenker_shipping_information_round_volume(
436-
self._schenker_shipping_information_without_packages_volume(picking)
437+
self._schenker_shipping_information_without_packages_volume(
438+
move_lines_without_package
439+
)
437440
),
438441
"packageType": self.schenker_default_packaging_id.shipper_package_code,
439442
"stackable": self.schenker_default_packaging_id.schenker_stackable,
440-
"pieces": picking.number_of_packages,
443+
"pieces": 1,
441444
}
442445
]
443446

‎delivery_schenker/static/description/index.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -367,7 +367,7 @@ <h1 class="title">Delivery Schenker</h1>
367367
!! This file is generated by oca-gen-addon-readme !!
368368
!! changes will be overwritten. !!
369369
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
370-
!! source digest: sha256:d4bb07ec262f28ebf12722c6b529cee813a3022a5f73e4010970171abe752de3
370+
!! source digest: sha256:4f0a596c6bac6914af4ecc42714c6f39e446a09b4404bca36651af0fd55792ff
371371
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
372372
<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>
373373
<p>This module links the <a class="reference external" href="https://www.dbschenker.com">DB Schenker</a> booking and tracking

0 commit comments

Comments
 (0)