Skip to content

Commit 61324bd

Browse files
committedJan 15, 2025
[MIG] delivery_package_number: Migration to 18.0
1 parent 2e1e942 commit 61324bd

6 files changed

+10
-10
lines changed
 

‎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-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<t t-call="web.basic_layout">
55
<t
66
t-set="move_ids"
7-
t-value="doc.move_ids._rollup_move_dests({doc.move_ids[:1].id})"
7+
t-value="doc.move_ids._rollup_move_dests()"
88
/>
99
<t
1010
t-set="dest_picking"

‎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)