Skip to content

Commit 27e296b

Browse files
[MIG] delivery_carrier_deposit: Migration to 17.0
1 parent 52e00bb commit 27e296b

8 files changed

Lines changed: 19 additions & 58 deletions

File tree

delivery_carrier_deposit/README.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ Contributors
3030
* Alexis de Lattre <alexis.delattre@akretion.com>
3131
* Raphael Reverdy <raphael.reverdy@akretion.com>
3232
* MonsieurB <monsieurb@saaslys.com>
33+
* Heliconia Solutions Pvt. Ltd. <https://www.heliconia.io>
3334

3435
Maintainer
3536
----------

delivery_carrier_deposit/__manifest__.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33

44
{
55
"name": "Delivery Deposit",
6-
"version": "16.0.1.0.0",
6+
"version": "17.0.1.0.0",
77
"category": "Delivery",
88
"author": "Akretion,Odoo Community Association (OCA)",
99
"maintainer": "Akretion",
1010
"summary": "Create deposit slips",
1111
"depends": [
12-
"delivery",
12+
"stock_delivery",
1313
],
1414
"website": "https://github.com/OCA/delivery-carrier",
1515
"data": [

delivery_carrier_deposit/models/deposit_slip.py

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,7 @@ def _compute_weight_and_packages(self):
2525
deposit.weight = weight
2626
deposit.package_number = len(packages)
2727

28-
name = fields.Char(
29-
readonly=True, states={"draft": [("readonly", False)]}, default="/", copy=False
30-
)
28+
name = fields.Char(default="/", copy=False)
3129
delivery_type = fields.Selection(
3230
selection=lambda self: self.env["delivery.carrier"]
3331
._fields["delivery_type"]
@@ -37,8 +35,6 @@ def _compute_weight_and_packages(self):
3735
comodel_name="stock.picking",
3836
inverse_name="deposit_slip_id",
3937
string="Pickings",
40-
readonly=True,
41-
states={"draft": [("readonly", False)]},
4238
)
4339
state = fields.Selection(
4440
selection=[

delivery_carrier_deposit/report/report.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
<field
99
name="report_name"
1010
>delivery_carrier_deposit.report_generic_deposit_slip</field>
11-
<!-- <field name="report_file">auth_token.report.label_res_users</field>-->
1211
<field name="print_report_name">object.name + '_delivery_slip.pdf'</field>
1312
<field
1413
name="binding_model_id"

delivery_carrier_deposit/tests/models.py

Lines changed: 0 additions & 16 deletions
This file was deleted.

delivery_carrier_deposit/tests/test_deposit_slip.py

Lines changed: 7 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,44 +1,23 @@
11
# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
22

3-
from odoo_test_helper import FakeModelLoader
3+
from odoo.addons.base.tests.common import BaseCommon
44

5-
from odoo.tests.common import TransactionCase
65

7-
8-
class TestDepositSlip(TransactionCase):
6+
class TestDepositSlip(BaseCommon):
97
@classmethod
108
def setUpClass(cls):
119
super().setUpClass()
12-
cls.loader = FakeModelLoader(cls.env, cls.__module__)
13-
cls.loader.backup_registry()
14-
15-
# The fake class is imported here !! After the backup_registry
16-
from .models import FakeDeliveryCarrier
1710

18-
cls.loader.update_registry((FakeDeliveryCarrier,))
19-
20-
delivery_free_product = cls.env.ref("delivery.product_product_delivery")
21-
cls.carrier = cls.env["delivery.carrier"].create(
22-
{
23-
"name": "Test Carrier",
24-
"delivery_type": "test",
25-
"product_id": delivery_free_product.id,
26-
}
27-
)
11+
carrier_id = cls.env.ref("delivery.free_delivery_carrier")
2812
cls.delivery_order = cls.env.ref("stock.outgoing_shipment_main_warehouse4")
29-
cls.delivery_order.write({"carrier_id": cls.carrier.id})
30-
31-
@classmethod
32-
def tearDownClass(cls):
33-
cls.loader.restore_registry()
34-
super().tearDownClass()
13+
cls.delivery_order.write({"carrier_id": carrier_id.id})
3514

3615
def test_delivery_slip_creation(self):
37-
self.delivery_order.move_line_ids.qty_done = 16
38-
self.delivery_order._action_done()
16+
self.delivery_order.move_line_ids.quantity = 16
17+
self.delivery_order.button_validate()
3918
wizard = self.env["delivery.deposit.wizard"].create(
4019
{
41-
"delivery_type": "test",
20+
"delivery_type": "fixed",
4221
}
4322
)
4423
wizard.create_deposit_slip()

delivery_carrier_deposit/views/deposit_slip_view.xml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -67,15 +67,15 @@
6767
name="validate_deposit"
6868
string="Confirm"
6969
type="object"
70-
attrs="{'invisible' : ['|', ('state','!=','draft'), ('delivery_type', '=', False)]}"
70+
invisible="state != 'draft' or not delivery_type"
7171
class="oe_highlight"
7272
/>
7373
<button
7474
name="create_edi_file"
7575
string="Re-generate EDI file"
7676
type="object"
7777
confirm="Are you sure that you re-generate the EDI file ?"
78-
attrs="{'invisible': True}"
78+
invisible="1"
7979
/>
8080
<field
8181
name="state"
@@ -86,7 +86,7 @@
8686
</header>
8787
<sheet>
8888
<group name="main" col="4">
89-
<field name="name" />
89+
<field name="name" readonly="state != 'draft'" />
9090
<field name="weight" />
9191
<field name="package_number" />
9292
<field name="delivery_type" />
@@ -98,6 +98,7 @@
9898
colspan="2"
9999
widget="many2many"
100100
options="{'not_delete': True, 'no_create': True}"
101+
readonly="state != 'draft'"
101102
>
102103
<tree>
103104
<field name="name" />
@@ -106,7 +107,7 @@
106107
<field name="origin" />
107108
<field name="backorder_id" />
108109
<field name="date_done" />
109-
<field name="state" invisible="1" />
110+
<field name="state" column_invisible="1" />
110111
</tree>
111112
</field>
112113
</group>

delivery_carrier_deposit/views/stock_picking_view.xml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,13 @@
33

44
<record id="view_picking_withcarrier_out_form" model="ir.ui.view">
55
<field name="model">stock.picking</field>
6-
<field name="inherit_id" ref="delivery.view_picking_withcarrier_out_form" />
6+
<field name="inherit_id" ref="stock_delivery.view_picking_withcarrier_out_form" />
77
<field name="arch" type="xml">
88
<field name="carrier_id" position="after">
99
<field
1010
name="deposit_slip_id"
11-
attrs="{'readonly': True,'invisible': [('deposit_slip_id', '=', False)]}"
11+
readonly="1"
12+
invisible="not deposit_slip_id"
1213
/>
1314
</field>
1415
</field>

0 commit comments

Comments
 (0)