Skip to content

Commit 666ef19

Browse files
[MIG] delivery_package_type_number_parcels: Migration to 18.0
1 parent 5991365 commit 666ef19

9 files changed

+50
-29
lines changed

delivery_package_type_number_parcels/README.rst

+7
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,10 @@ if this latter is overkill.
3535

3636
This field is set manually by the user on package type.
3737

38+
The number of parcels is also displayed in the delivery package wizard
39+
when selecting a package type, giving users immediate visibility of the
40+
parcel count during the delivery process.
41+
3842
**Table of contents**
3943

4044
.. contents::
@@ -62,6 +66,9 @@ Contributors
6266
------------
6367

6468
- Hughes Damry <hughes.damry@acsone.eu>
69+
- `Heliconia Solutions Pvt. Ltd. <https://www.heliconia.io>`__
70+
71+
- Bhavesh Heliconia
6572

6673
Maintainers
6774
-----------

delivery_package_type_number_parcels/__manifest__.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@
44
{
55
"name": "Delivery Package Type Number Parcels",
66
"summary": "Number of parcels in a package type",
7-
"version": "16.0.1.0.2",
7+
"version": "18.0.1.0.0",
88
"license": "AGPL-3",
99
"author": "ACSONE SA/NV,Odoo Community Association (OCA)",
1010
"website": "https://github.com/OCA/delivery-carrier",
11-
"depends": ["delivery"],
11+
"depends": ["stock_delivery"],
1212
"data": [
1313
"views/stock_quant_package_views.xml",
1414
"views/stock_package_type_views.xml",
Original file line numberDiff line numberDiff line change
@@ -1 +1,3 @@
11
- Hughes Damry \<<hughes.damry@acsone.eu>\>
2+
- [Heliconia Solutions Pvt. Ltd.](https://www.heliconia.io)
3+
- Bhavesh Heliconia
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
1-
This module adds the number_of_parcels on package type and its related
2-
on package. As so it gives a simple way to have the number of
3-
pieces/boxes of the package type without playing with the package levels
4-
if this latter is overkill.
1+
This module adds the number_of_parcels on package type
2+
and its related on package. As so it gives a simple way
3+
to have the number of pieces/boxes of the package type
4+
without playing with the package levels if this latter
5+
is overkill.
56

67
This field is set manually by the user on package type.
8+
9+
The number of parcels is also displayed in the delivery package
10+
wizard when selecting a package type, giving users immediate
11+
visibility of the parcel count during the delivery process.

delivery_package_type_number_parcels/static/description/index.html

+7
Original file line numberDiff line numberDiff line change
@@ -375,6 +375,9 @@ <h1 class="title">Delivery Package Type Number Parcels</h1>
375375
pieces/boxes of the package type without playing with the package levels
376376
if this latter is overkill.</p>
377377
<p>This field is set manually by the user on package type.</p>
378+
<p>The number of parcels is also displayed in the delivery package wizard
379+
when selecting a package type, giving users immediate visibility of the
380+
parcel count during the delivery process.</p>
378381
<p><strong>Table of contents</strong></p>
379382
<div class="contents local topic" id="contents">
380383
<ul class="simple">
@@ -407,6 +410,10 @@ <h2><a class="toc-backref" href="#toc-entry-3">Authors</a></h2>
407410
<h2><a class="toc-backref" href="#toc-entry-4">Contributors</a></h2>
408411
<ul class="simple">
409412
<li>Hughes Damry &lt;<a class="reference external" href="mailto:hughes.damry&#64;acsone.eu">hughes.damry&#64;acsone.eu</a>&gt;</li>
413+
<li><a class="reference external" href="https://www.heliconia.io">Heliconia Solutions Pvt. Ltd.</a><ul>
414+
<li>Bhavesh Heliconia</li>
415+
</ul>
416+
</li>
410417
</ul>
411418
</div>
412419
<div class="section" id="maintainers">

delivery_package_type_number_parcels/tests/test_package_type_number_parcels.py

+15-12
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,9 @@ def setUpClass(cls):
1313
cls.product_test = cls.env["product.product"].create(
1414
{
1515
"name": "Product TEST",
16-
"type": "product",
16+
"type": "consu",
1717
"weight": 0.1,
18+
"is_storable": True,
1819
"uom_id": cls.uom_kg.id,
1920
"uom_po_id": cls.uom_kg.id,
2021
}
@@ -65,7 +66,7 @@ def test_put_in_pack_choose_carrier_wizard(self):
6566
"product_id": self.product_test.id,
6667
"product_uom_id": self.uom_kg.id,
6768
"picking_id": picking_ship.id,
68-
"qty_done": 5,
69+
"quantity": 5,
6970
"location_id": self.stock_location.id,
7071
"location_dest_id": self.customer_location.id,
7172
}
@@ -76,7 +77,7 @@ def test_put_in_pack_choose_carrier_wizard(self):
7677
# We make sure the correct action was returned
7778
self.assertEqual(pack_action_model, "choose.delivery.package")
7879
# check there is no package yet for the picking
79-
self.assertEqual(len(picking_ship.package_ids), 0)
80+
self.assertEqual(len(picking_ship.package_level_ids), 0)
8081
# We instanciate the wizard with the context of the action
8182
pack_wiz = (
8283
self.env["choose.delivery.package"]
@@ -91,21 +92,23 @@ def test_put_in_pack_choose_carrier_wizard(self):
9192
)
9293
pack_wiz.action_put_in_pack()
9394
# check that one package has been created with the same number of packages
94-
self.assertEqual(len(picking_ship.package_ids), 1)
95-
package1 = picking_ship.package_ids[0]
95+
self.assertEqual(len(picking_ship.package_level_ids), 1)
96+
package1 = picking_ship.package_level_ids[0]
9697
# check the related number_of_parcels is ok in the package
9798
self.assertEqual(
98-
package1.number_of_parcels, self.package_type.number_of_parcels
99+
package1.package_id.number_of_parcels, self.package_type.number_of_parcels
99100
)
100101
return package1
101102

102103
def test_manual_number_of_parcels(self):
103104
package = self.test_put_in_pack_choose_carrier_wizard()
104-
self.assertEqual(package.number_of_parcels, 7)
105+
self.assertEqual(package.package_id.number_of_parcels, 7)
105106
self.package_type.number_of_parcels = 8
106-
self.assertEqual(package.number_of_parcels, 7)
107-
package.number_of_parcels = 9
108-
self.assertEqual(package.number_of_parcels, 9)
107+
self.assertEqual(package.package_id.number_of_parcels, 7)
108+
package.package_id.number_of_parcels = 9
109+
self.assertEqual(package.package_id.number_of_parcels, 9)
109110
self.assertEqual(self.package_type.number_of_parcels, 8)
110-
package.package_type_id = self.package_type.copy({"number_of_parcels": 10})
111-
self.assertEqual(package.number_of_parcels, 10)
111+
package.package_id.package_type_id = self.package_type.copy(
112+
{"number_of_parcels": 10}
113+
)
114+
self.assertEqual(package.package_id.number_of_parcels, 10)

delivery_package_type_number_parcels/views/stock_package_type_views.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
<field
2727
name="number_of_parcels"
2828
optional="show"
29-
attrs="{'invisible': [('number_of_parcels', '=', 0)]}"
29+
invisible="number_of_parcels == 0"
3030
/>
3131
</xpath>
3232
</field>

delivery_package_type_number_parcels/views/stock_quant_package_views.xml

+2-5
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,7 @@
1010
<field name="inherit_id" ref="stock.view_quant_package_form" />
1111
<field name="arch" type="xml">
1212
<field name="package_type_id" position="after">
13-
<field
14-
name="number_of_parcels"
15-
attrs="{'invisible': [('number_of_parcels', '=', 0)]}"
16-
/>
13+
<field name="number_of_parcels" invisible="number_of_parcels == 0" />
1714
</field>
1815
</field>
1916
</record>
@@ -29,7 +26,7 @@
2926
<field
3027
name="number_of_parcels"
3128
optional="show"
32-
attrs="{'invisible': [('number_of_parcels', '=', 0)]}"
29+
invisible="number_of_parcels == 0"
3330
/>
3431
</field>
3532
</field>

delivery_package_type_number_parcels/wizards/choose_delivery_package_views.xml

+5-5
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@
55
name="name"
66
>choose.delivery.package.form (in delivery_package_type_number_parcels)</field>
77
<field name="model">choose.delivery.package</field>
8-
<field name="inherit_id" ref="delivery.choose_delivery_package_view_form" />
8+
<field
9+
name="inherit_id"
10+
ref="stock_delivery.choose_delivery_package_view_form"
11+
/>
912
<field name="arch" type="xml">
1013
<field name="delivery_package_type_id" position="after">
11-
<field
12-
name="number_of_parcels"
13-
attrs="{'invisible': [('number_of_parcels', '=', 0)]}"
14-
/>
14+
<field name="number_of_parcels" invisible="number_of_parcels == 0" />
1515
</field>
1616
</field>
1717
</record>

0 commit comments

Comments
 (0)