Skip to content

Commit b63dde3

Browse files
BhaveshHeliconiaBhaveshHeliconia
committed
[MIG] delivery_package_type_number_parcels: Migration to 18.0
1 parent 5991365 commit b63dde3

9 files changed

+73
-42
lines changed

‎delivery_package_type_number_parcels/README.rst

+18-6
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,19 @@ Delivery Package Type Number Parcels
2828

2929
|badge1| |badge2| |badge3| |badge4| |badge5|
3030

31-
This module adds the number_of_parcels on package type and its related
32-
on package. As so it gives a simple way to have the number of
33-
pieces/boxes of the package type without playing with the package levels
34-
if this latter is overkill.
35-
36-
This field is set manually by the user on package type.
31+
This module allows to pre-configure a number of parcels on the delivery
32+
package type. When creating a delivery package and associating a package
33+
type, the number of parcels of the package will be initialized from the
34+
delivery package type. You can create one package type per possible
35+
number of parcels, like "1 parcel", "2 parcels", "3 parcels"... When
36+
packing, select or scan the package type barcode to make a package for
37+
all picked lines with the right declared amount of parcels. This
38+
prevents you to declare which picked line and corresponding quantity is
39+
in which parcel.
40+
41+
The number of parcels is also displayed in the delivery package wizard
42+
when selecting a package type, giving users immediate visibility of the
43+
parcel count during the delivery process.
3744

3845
**Table of contents**
3946

@@ -57,11 +64,16 @@ Authors
5764
-------
5865

5966
* ACSONE SA/NV
67+
* BCIM
6068

6169
Contributors
6270
------------
6371

6472
- Hughes Damry <hughes.damry@acsone.eu>
73+
- Jacques-Etienne Baudoux (BCIM) je@bcim.be
74+
- `Heliconia Solutions Pvt. Ltd. <https://www.heliconia.io>`__
75+
76+
- Bhavesh Heliconia
6577

6678
Maintainers
6779
-----------

‎delivery_package_type_number_parcels/__manifest__.py

+3-3
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",
9-
"author": "ACSONE SA/NV,Odoo Community Association (OCA)",
9+
"author": "ACSONE SA/NV,BCIM,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",

‎delivery_package_type_number_parcels/readme/CONTRIBUTORS.md

+3
Original file line numberDiff line numberDiff line change
@@ -1 +1,4 @@
11
- Hughes Damry \<<hughes.damry@acsone.eu>\>
2+
- Jacques-Etienne Baudoux (BCIM) <je@bcim.be>
3+
- [Heliconia Solutions Pvt. Ltd.](https://www.heliconia.io)
4+
- Bhavesh Heliconia

‎delivery_package_type_number_parcels/readme/DESCRIPTION.md

+8-5
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
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 allows to pre-configure a number of parcels on the delivery package type.
2+
When creating a delivery package and associating a package type, the number of parcels of the package will be initialized from the delivery package type.
3+
You can create one package type per possible number of parcels, like "1 parcel", "2 parcels", "3 parcels"...
4+
When packing, select or scan the package type barcode to make a package for all picked lines with the right declared amount of parcels.
5+
This prevents you to declare which picked line and corresponding quantity is in which parcel.
56

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

‎delivery_package_type_number_parcels/static/description/index.html

+18-5
Original file line numberDiff line numberDiff line change
@@ -370,11 +370,18 @@ <h1 class="title">Delivery Package Type Number Parcels</h1>
370370
!! source digest: sha256:b89957d7d07f4d3269e752c71675921b863468114cfd1c19987f589d0c3227fd
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/18.0/delivery_package_type_number_parcels"><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_type_number_parcels"><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>
373-
<p>This module adds the number_of_parcels on package type and its related
374-
on package. As so it gives a simple way to have the number of
375-
pieces/boxes of the package type without playing with the package levels
376-
if this latter is overkill.</p>
377-
<p>This field is set manually by the user on package type.</p>
373+
<p>This module allows to pre-configure a number of parcels on the delivery
374+
package type. When creating a delivery package and associating a package
375+
type, the number of parcels of the package will be initialized from the
376+
delivery package type. You can create one package type per possible
377+
number of parcels, like “1 parcel”, “2 parcels”, “3 parcels”… When
378+
packing, select or scan the package type barcode to make a package for
379+
all picked lines with the right declared amount of parcels. This
380+
prevents you to declare which picked line and corresponding quantity is
381+
in which parcel.</p>
382+
<p>The number of parcels is also displayed in the delivery package wizard
383+
when selecting a package type, giving users immediate visibility of the
384+
parcel count during the delivery process.</p>
378385
<p><strong>Table of contents</strong></p>
379386
<div class="contents local topic" id="contents">
380387
<ul class="simple">
@@ -401,12 +408,18 @@ <h1><a class="toc-backref" href="#toc-entry-2">Credits</a></h1>
401408
<h2><a class="toc-backref" href="#toc-entry-3">Authors</a></h2>
402409
<ul class="simple">
403410
<li>ACSONE SA/NV</li>
411+
<li>BCIM</li>
404412
</ul>
405413
</div>
406414
<div class="section" id="contributors">
407415
<h2><a class="toc-backref" href="#toc-entry-4">Contributors</a></h2>
408416
<ul class="simple">
409417
<li>Hughes Damry &lt;<a class="reference external" href="mailto:hughes.damry&#64;acsone.eu">hughes.damry&#64;acsone.eu</a>&gt;</li>
418+
<li>Jacques-Etienne Baudoux (BCIM) <a class="reference external" href="mailto:je&#64;bcim.be">je&#64;bcim.be</a></li>
419+
<li><a class="reference external" href="https://www.heliconia.io">Heliconia Solutions Pvt. Ltd.</a><ul>
420+
<li>Bhavesh Heliconia</li>
421+
</ul>
422+
</li>
410423
</ul>
411424
</div>
412425
<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)