Skip to content

Commit 5331e6a

Browse files
CarlosRoca13CarlosRoca13
committed
[MIG] delivery_package_number: Migration to 18.0
1 parent 2e1e942 commit 5331e6a

9 files changed

+26
-29
lines changed

‎delivery_package_number/README.rst

+12-12
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,13 @@ Stock Picking Package Number
1717
:target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
1818
:alt: License: AGPL-3
1919
.. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fdelivery--carrier-lightgray.png?logo=github
20-
:target: https://github.com/OCA/delivery-carrier/tree/17.0/delivery_package_number
20+
:target: https://github.com/OCA/delivery-carrier/tree/18.0/delivery_package_number
2121
:alt: OCA/delivery-carrier
2222
.. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png
23-
:target: https://translation.odoo-community.org/projects/delivery-carrier-17-0/delivery-carrier-17-0-delivery_package_number
23+
:target: https://translation.odoo-community.org/projects/delivery-carrier-18-0/delivery-carrier-18-0-delivery_package_number
2424
:alt: Translate me on Weblate
2525
.. |badge5| image:: https://img.shields.io/badge/runboat-Try%20me-875A7B.png
26-
:target: https://runboat.odoo-community.org/builds?repo=OCA/delivery-carrier&target_branch=17.0
26+
:target: https://runboat.odoo-community.org/builds?repo=OCA/delivery-carrier&target_branch=18.0
2727
:alt: Try me on Runboat
2828

2929
|badge1| |badge2| |badge3| |badge4| |badge5|
@@ -64,7 +64,7 @@ Bug Tracker
6464
Bugs are tracked on `GitHub Issues <https://github.com/OCA/delivery-carrier/issues>`_.
6565
In case of trouble, please check there if your issue has already been reported.
6666
If you spotted it first, help us to smash it by providing a detailed and welcomed
67-
`feedback <https://github.com/OCA/delivery-carrier/issues/new?body=module:%20delivery_package_number%0Aversion:%2017.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
67+
`feedback <https://github.com/OCA/delivery-carrier/issues/new?body=module:%20delivery_package_number%0Aversion:%2018.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
6868

6969
Do not contact contributors directly about support or help with technical issues.
7070

@@ -79,20 +79,20 @@ Authors
7979
Contributors
8080
------------
8181

82-
- `Tecnativa <https://www.tecnativa.com>`__:
82+
- `Tecnativa <https://www.tecnativa.com>`__:
8383

84-
- Pedro M. Baeza
85-
- David Vidal
86-
- Marçal Isern
87-
- Carlos Roca
84+
- Pedro M. Baeza
85+
- David Vidal
86+
- Marçal Isern
87+
- Carlos Roca
8888

8989
..
9090
91-
- `Sygel <https://www.sygel.es>`__:
91+
- `Sygel <https://www.sygel.es>`__:
9292

9393
..
9494
95-
- Ángel García de la Chica Herrera <angel.garcia@sygel.es>
95+
- Ángel García de la Chica Herrera <angel.garcia@sygel.es>
9696

9797
Maintainers
9898
-----------
@@ -107,6 +107,6 @@ OCA, or the Odoo Community Association, is a nonprofit organization whose
107107
mission is to support the collaborative development of Odoo features and
108108
promote its widespread use.
109109

110-
This module is part of the `OCA/delivery-carrier <https://github.com/OCA/delivery-carrier/tree/17.0/delivery_package_number>`_ project on GitHub.
110+
This module is part of the `OCA/delivery-carrier <https://github.com/OCA/delivery-carrier/tree/18.0/delivery_package_number>`_ project on GitHub.
111111

112112
You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.

‎delivery_package_number/__manifest__.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
{
44
"name": "Stock Picking Package Number",
55
"summary": "Set or compute number of packages for a picking",
6-
"version": "17.0.1.0.0",
6+
"version": "18.0.1.0.0",
77
"category": "Delivery",
88
"website": "https://github.com/OCA/delivery-carrier",
99
"author": "Tecnativa, Odoo Community Association (OCA)",

‎delivery_package_number/models/stock_picking.py

+5-4
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,12 @@ class StockPicking(models.Model):
1818
)
1919
ask_number_of_packages = fields.Boolean(compute="_compute_ask_number_of_packages")
2020

21-
@api.depends("package_ids")
21+
@api.depends("move_line_ids", "move_line_ids.result_package_id")
2222
def _compute_number_of_packages(self):
2323
for picking in self:
24-
if picking.package_ids:
25-
picking.number_of_packages = len(picking.package_ids)
24+
packages = picking.move_line_ids.result_package_id
25+
if packages:
26+
picking.number_of_packages = len(packages)
2627

2728
def _action_generate_number_of_packages_wizard(self):
2829
view = self.env.ref("delivery_package_number.view_number_package_validate")
@@ -44,7 +45,7 @@ def _compute_ask_number_of_packages(self):
4445
for picking in self:
4546
picking.ask_number_of_packages = bool(
4647
picking.carrier_id
47-
and not picking.package_ids
48+
and not picking.move_line_ids.result_package_id
4849
or picking.picking_type_id.force_set_number_of_packages
4950
)
5051

‎delivery_package_number/reports/report_package_number.xml

+1-4
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,7 @@
22
<odoo>
33
<template id="delivery_package_number_document">
44
<t t-call="web.basic_layout">
5-
<t
6-
t-set="move_ids"
7-
t-value="doc.move_ids._rollup_move_dests({doc.move_ids[:1].id})"
8-
/>
5+
<t t-set="move_ids" t-value="doc.move_ids._rollup_move_dests()" />
96
<t
107
t-set="dest_picking"
118
t-value="doc.move_ids.browse(move_ids).filtered('sale_line_id')[:1].picking_id"

‎delivery_package_number/static/description/index.html

+3-3
Original file line numberDiff line numberDiff line change
@@ -369,7 +369,7 @@ <h1 class="title">Stock Picking Package Number</h1>
369369
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
370370
!! source digest: sha256:a11704398060fb7a09c7964e7653f3c5e98d222a404dec84e8dfe64a2908985e
371371
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
372-
<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/17.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-17-0/delivery-carrier-17-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=17.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
372+
<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/18.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-18-0/delivery-carrier-18-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=18.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
374374
previous versions of Odoo, that can be either be set manually by the
375375
user, but also allows to be computed when the delivery packages flow is
@@ -410,7 +410,7 @@ <h1><a class="toc-backref" href="#toc-entry-2">Bug Tracker</a></h1>
410410
<p>Bugs are tracked on <a class="reference external" href="https://github.com/OCA/delivery-carrier/issues">GitHub Issues</a>.
411411
In case of trouble, please check there if your issue has already been reported.
412412
If you spotted it first, help us to smash it by providing a detailed and welcomed
413-
<a class="reference external" href="https://github.com/OCA/delivery-carrier/issues/new?body=module:%20delivery_package_number%0Aversion:%2017.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**">feedback</a>.</p>
413+
<a class="reference external" href="https://github.com/OCA/delivery-carrier/issues/new?body=module:%20delivery_package_number%0Aversion:%2018.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**">feedback</a>.</p>
414414
<p>Do not contact contributors directly about support or help with technical issues.</p>
415415
</div>
416416
<div class="section" id="credits">
@@ -454,7 +454,7 @@ <h2><a class="toc-backref" href="#toc-entry-6">Maintainers</a></h2>
454454
<p>OCA, or the Odoo Community Association, is a nonprofit organization whose
455455
mission is to support the collaborative development of Odoo features and
456456
promote its widespread use.</p>
457-
<p>This module is part of the <a class="reference external" href="https://github.com/OCA/delivery-carrier/tree/17.0/delivery_package_number">OCA/delivery-carrier</a> project on GitHub.</p>
457+
<p>This module is part of the <a class="reference external" href="https://github.com/OCA/delivery-carrier/tree/18.0/delivery_package_number">OCA/delivery-carrier</a> project on GitHub.</p>
458458
<p>You are welcome to contribute. To learn how please visit <a class="reference external" href="https://odoo-community.org/page/Contribute">https://odoo-community.org/page/Contribute</a>.</p>
459459
</div>
460460
</div>

‎delivery_package_number/tests/test_delivery_package_number.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ class TestDeliveryPackageNumber(TransactionCase):
1010
def setUpClass(cls):
1111
super().setUpClass()
1212
cls.product = cls.env["product.product"].create(
13-
{"name": "Test product", "type": "product"}
13+
{"name": "Test product", "type": "consu", "is_storable": True}
1414
)
1515
cls.partner = cls.env["res.partner"].create({"name": "Test partner"})
1616
cls.wh1 = cls.env["stock.warehouse"].create(

‎delivery_package_number/views/stock_picking_type_views.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<field name="model">stock.picking.type</field>
55
<field name="inherit_id" ref="stock.view_picking_type_form" />
66
<field name="arch" type="xml">
7-
<xpath expr="//field[@name='default_location_src_id']/.." position="after">
7+
<xpath expr="//group[@name='locations']" position="after">
88
<group string="Number of packages">
99
<field name="force_set_number_of_packages" />
1010
<field name="report_number_of_packages" />

‎delivery_package_number/views/stock_picking_views.xml

-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
/>
99
<field name="arch" type="xml">
1010
<xpath expr="//group[@name='carrier_data']" position="inside">
11-
<field name="package_ids" invisible="1" />
1211
<field name="number_of_packages" readonly="state == 'done'" />
1312
</xpath>
1413
</field>

‎delivery_package_number/wizard/stock_number_package_validate_wiz_view.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,15 @@
1717
invisible="not stock_number_package_validation_line_ids"
1818
nolabel="1"
1919
>
20-
<tree create="0" delete="0" editable="1">
20+
<list create="0" delete="0" editable="bottom">
2121
<field
2222
name="picking_id"
2323
options="{'no_open': True}"
2424
readonly="1"
2525
force_save="1"
2626
/>
2727
<field name="number_of_packages" />
28-
</tree>
28+
</list>
2929
</field>
3030
<footer>
3131
<button

0 commit comments

Comments
 (0)