Skip to content

Commit 9f815e3

Browse files
BhaveshHeliconiaBhaveshHeliconia
committed
[MIG] partner_delivery_zone: Migration to 18.0
1 parent 02988e5 commit 9f815e3

11 files changed

+34
-51
lines changed

‎partner_delivery_zone/README.rst

+4
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,10 @@ Contributors
102102
- Angel Moya Pardo <angel.moya@pesol.es>
103103
- Antonio J Rubio Lorente <antonio.rubio@pesol.es>
104104

105+
- `Heliconia Solutions Pvt. Ltd. <https://www.heliconia.io>`__
106+
107+
- Bhavesh Heliconia
108+
105109
Maintainers
106110
-----------
107111

‎partner_delivery_zone/__manifest__.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"name": "Partner Delivery Zone",
55
"summary": "This module allows to create partner "
66
"delivery zones for physical products",
7-
"version": "16.0.1.3.0",
7+
"version": "18.0.1.0.0",
88
"development_status": "Beta",
99
"category": "Delivery",
1010
"website": "https://github.com/OCA/delivery-carrier",

‎partner_delivery_zone/models/res_partner.py

-3
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,6 @@ class ResPartner(models.Model):
1919
def get_view(self, view_id=None, view_type="form", **options):
2020
"""The purpose of this is to write a context on "child_ids" field
2121
respecting other contexts on this field.
22-
There is a PR (https://github.com/odoo/odoo/pull/26607) to odoo for
23-
avoiding this. If merged, remove this method and add the attribute
24-
in the field.
2522
"""
2623
res = super().get_view(view_id, view_type, **options)
2724
if view_type == "form":

‎partner_delivery_zone/readme/CONTRIBUTORS.md

+2
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,5 @@
55
- [Pesol](https://www.pesol.es)
66
- Angel Moya Pardo \<<angel.moya@pesol.es>\>
77
- Antonio J Rubio Lorente \<<antonio.rubio@pesol.es>\>
8+
- [Heliconia Solutions Pvt. Ltd.](https://www.heliconia.io)
9+
- Bhavesh Heliconia

‎partner_delivery_zone/static/description/index.html

+4
Original file line numberDiff line numberDiff line change
@@ -452,6 +452,10 @@ <h2><a class="toc-backref" href="#toc-entry-7">Contributors</a></h2>
452452
<li>Antonio J Rubio Lorente &lt;<a class="reference external" href="mailto:antonio.rubio&#64;pesol.es">antonio.rubio&#64;pesol.es</a>&gt;</li>
453453
</ul>
454454
</li>
455+
<li><a class="reference external" href="https://www.heliconia.io">Heliconia Solutions Pvt. Ltd.</a><ul>
456+
<li>Bhavesh Heliconia</li>
457+
</ul>
458+
</li>
455459
</ul>
456460
</div>
457461
<div class="section" id="maintainers">

‎partner_delivery_zone/tests/test_partner_delivery_zone.py

+9-10
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,20 @@
22
# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
33
from lxml import etree
44

5-
from odoo.tests import TransactionCase
5+
from odoo import Command
6+
from odoo.tests import tagged
67

7-
from odoo.addons.base.tests.common import DISABLED_MAIL_CONTEXT
8+
from odoo.addons.base.tests.common import BaseCommon
89

910

10-
class TestPartnerDeliveryZone(TransactionCase):
11+
@tagged("post_install", "-at_install")
12+
class TestPartnerDeliveryZone(BaseCommon):
1113
at_install = False
1214
post_install = True
1315

1416
@classmethod
1517
def setUpClass(cls):
1618
super().setUpClass()
17-
cls.env = cls.env(context=dict(cls.env.context, **DISABLED_MAIL_CONTEXT))
1819
cls.warehouse = cls.env.ref("stock.warehouse0")
1920
cls.delivery_zone_a = cls.env["partner.delivery.zone"].create(
2021
{"name": "Delivery Zone A", "code": "10"}
@@ -30,16 +31,14 @@ def setUpClass(cls):
3031
{
3132
"partner_id": cls.partner.id,
3233
"order_line": [
33-
(
34-
0,
35-
0,
34+
Command.create(
3635
{
3736
"name": cls.product.name,
3837
"product_id": cls.product.id,
3938
"product_uom_qty": 10.0,
4039
"product_uom": cls.product.uom_id.id,
4140
"price_unit": 1000.00,
42-
},
41+
}
4342
)
4443
],
4544
}
@@ -87,11 +86,11 @@ def test_default_line_discount_value(self):
8786
"type": "form",
8887
"model": "res.partner",
8988
"arch": """
90-
<data>
89+
<form>
9190
<field name='child_ids'
9291
context="{'default_name': 'test'}">
9392
</field>
94-
</data>
93+
</form>
9594
""",
9695
}
9796
)

‎partner_delivery_zone/views/partner_delivery_zone_view.xml

+3-17
Original file line numberDiff line numberDiff line change
@@ -2,28 +2,14 @@
22
<!-- Copyright 2018 Tecnativa - Sergio Teruel
33
License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). -->
44
<odoo>
5-
<record id="view_partner_delivery_zone_form" model="ir.ui.view">
6-
<field name="name">partner.delivery.zone.form</field>
7-
<field name="model">partner.delivery.zone</field>
8-
<field name="arch" type="xml">
9-
<form string="Delivery Zone">
10-
<sheet>
11-
<group>
12-
<field name="code" />
13-
<field name="name" />
14-
</group>
15-
</sheet>
16-
</form>
17-
</field>
18-
</record>
195
<record id="view_partner_delivery_zone_tree" model="ir.ui.view">
206
<field name="name">partner.delivery.zone.tree</field>
217
<field name="model">partner.delivery.zone</field>
228
<field name="arch" type="xml">
23-
<tree>
9+
<list editable="top">
2410
<field name="code" />
2511
<field name="name" />
26-
</tree>
12+
</list>
2713
</field>
2814
</record>
2915
<record id="view_partner_delivery_zone_search" model="ir.ui.view">
@@ -39,7 +25,7 @@
3925
<record id="partner_delivery_zone_action" model="ir.actions.act_window">
4026
<field name="name">Delivery Zones</field>
4127
<field name="res_model">partner.delivery.zone</field>
42-
<field name="view_mode">tree,form</field>
28+
<field name="view_mode">list</field>
4329
<field name="view_id" ref="view_partner_delivery_zone_tree" />
4430
<field name="help" type="html">
4531
<p

‎partner_delivery_zone/views/report_shipping.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
<odoo>
55
<template id="report_picking" inherit_id="stock.report_picking">
66
<xpath expr="//div[@name='div_sched_date']" position="after">
7-
<div t-if="o.delivery_zone_id" class="col-auto">
7+
<div t-if="o.delivery_zone_id" class="col-auto col-3 mw-100 mb-2">
88
<strong>Zone</strong>
9-
<span t-field="o.delivery_zone_id" />
9+
<p t-field="o.delivery_zone_id" class="m-0" />
1010
</div>
1111
</xpath>
1212
</template>

‎partner_delivery_zone/views/res_partner_view.xml

+1-4
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,7 @@
1414
expr="//field[@name='child_ids']/form//field[@name='mobile']"
1515
position="after"
1616
>
17-
<field
18-
name="delivery_zone_id"
19-
attrs="{'invisible': [('type','!=', 'delivery')]}"
20-
/>
17+
<field name="delivery_zone_id" invisible="type != 'delivery'" />
2118
</xpath>
2219
</field>
2320
</record>

‎partner_delivery_zone/views/sale_order_view.xml

+2-5
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,7 @@
88
<field name="inherit_id" ref="sale.view_order_form" />
99
<field name="arch" type="xml">
1010
<xpath expr="//field[@name='payment_term_id']" position="after">
11-
<field
12-
name="delivery_zone_id"
13-
attrs="{'readonly':[('state','in', ['done', 'cancel'])]}"
14-
/>
11+
<field name="delivery_zone_id" readonly="state in ['sale', 'cancel']" />
1512
</xpath>
1613
</field>
1714
</record>
@@ -22,7 +19,7 @@
2219
<xpath expr="//field[@name='company_id']" position="before">
2320
<field
2421
name="delivery_zone_id"
25-
attrs="{'readonly':[('state','in', ['done', 'cancel'])]}"
22+
readonly="state in ['sale', 'cancel']"
2623
optional="hidden"
2724
/>
2825
</xpath>

‎partner_delivery_zone/views/stock_picking_view.xml

+6-9
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,7 @@
88
<field name="arch" type="xml">
99
<xpath expr="//page[@name='extra']" position="inside">
1010
<group name="delivery_zone">
11-
<field
12-
name="delivery_zone_id"
13-
attrs="{'readonly': [('state', '=', 'done')]}"
14-
/>
11+
<field name="delivery_zone_id" readonly="state == 'done'" />
1512
</group>
1613
</xpath>
1714
</field>
@@ -42,13 +39,13 @@
4239
<xpath expr="//field[@name='scheduled_date']" position="after">
4340
<field name="delivery_zone_id" />
4441
</xpath>
45-
<xpath expr="//div[hasclass('oe_kanban_bottom_left')]" position="replace">
46-
<div class="oe_kanban_bottom_left">
42+
<xpath expr="//t[@t-name='card']//footer//div[1]" position="replace">
43+
<div class="d-flex">
4744
<div>
48-
<t t-esc="record.partner_id.value" />
45+
<field name="partner_id" />
4946
</div>
50-
<div t-if="record.delivery_zone_id">
51-
<t t-esc="record.delivery_zone_id.value" />
47+
<div t-if="record.delivery_zone_id" class="ml8">
48+
<field name="delivery_zone_id" />
5249
</div>
5350
</div>
5451
</xpath>

0 commit comments

Comments
 (0)