Skip to content

Commit dd8ff38

Browse files
[MIG] partner_delivery_zone: Migration to 18.0
1 parent 85ecf1a commit dd8ff38

8 files changed

+33
-18
lines changed

partner_delivery_zone/README.rst

+9-5
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,13 @@ Partner Delivery Zone
1717
:target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
1818
:alt: License: AGPL-3
1919
.. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fdelivery--carrier-lightgray.png?logo=github
20-
:target: https://github.com/OCA/delivery-carrier/tree/17.0/partner_delivery_zone
20+
:target: https://github.com/OCA/delivery-carrier/tree/18.0/partner_delivery_zone
2121
:alt: OCA/delivery-carrier
2222
.. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png
23-
:target: https://translation.odoo-community.org/projects/delivery-carrier-17-0/delivery-carrier-17-0-partner_delivery_zone
23+
:target: https://translation.odoo-community.org/projects/delivery-carrier-18-0/delivery-carrier-18-0-partner_delivery_zone
2424
:alt: Translate me on Weblate
2525
.. |badge5| image:: https://img.shields.io/badge/runboat-Try%20me-875A7B.png
26-
:target: https://runboat.odoo-community.org/builds?repo=OCA/delivery-carrier&target_branch=17.0
26+
:target: https://runboat.odoo-community.org/builds?repo=OCA/delivery-carrier&target_branch=18.0
2727
:alt: Try me on Runboat
2828

2929
|badge1| |badge2| |badge3| |badge4| |badge5|
@@ -75,7 +75,7 @@ Bug Tracker
7575
Bugs are tracked on `GitHub Issues <https://github.com/OCA/delivery-carrier/issues>`_.
7676
In case of trouble, please check there if your issue has already been reported.
7777
If you spotted it first, help us to smash it by providing a detailed and welcomed
78-
`feedback <https://github.com/OCA/delivery-carrier/issues/new?body=module:%20partner_delivery_zone%0Aversion:%2017.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
78+
`feedback <https://github.com/OCA/delivery-carrier/issues/new?body=module:%20partner_delivery_zone%0Aversion:%2018.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
7979

8080
Do not contact contributors directly about support or help with technical issues.
8181

@@ -103,6 +103,10 @@ Contributors
103103
- Angel Moya Pardo <angel.moya@pesol.es>
104104
- Antonio J Rubio Lorente <antonio.rubio@pesol.es>
105105

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

@@ -116,6 +120,6 @@ OCA, or the Odoo Community Association, is a nonprofit organization whose
116120
mission is to support the collaborative development of Odoo features and
117121
promote its widespread use.
118122

119-
This module is part of the `OCA/delivery-carrier <https://github.com/OCA/delivery-carrier/tree/17.0/partner_delivery_zone>`_ project on GitHub.
123+
This module is part of the `OCA/delivery-carrier <https://github.com/OCA/delivery-carrier/tree/18.0/partner_delivery_zone>`_ project on GitHub.
120124

121125
You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.

partner_delivery_zone/__manifest__.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
{
44
"name": "Partner Delivery Zone",
55
"summary": "Enables partner delivery zones for physical products",
6-
"version": "17.0.1.0.0",
6+
"version": "18.0.1.0.0",
77
"development_status": "Beta",
88
"category": "Delivery",
99
"website": "https://github.com/OCA/delivery-carrier",

partner_delivery_zone/readme/CONTRIBUTORS.md

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

partner_delivery_zone/static/description/index.html

+7-3
Original file line numberDiff line numberDiff line change
@@ -369,7 +369,7 @@ <h1 class="title">Partner Delivery Zone</h1>
369369
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
370370
!! source digest: sha256:e8034c39eaeb3b3ebbf12bc1d446b4a57969352092097340afafe8e90fa032f7
371371
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
372-
<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/17.0/partner_delivery_zone"><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-17-0/delivery-carrier-17-0-partner_delivery_zone"><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=17.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
372+
<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/partner_delivery_zone"><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-partner_delivery_zone"><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>
373373
<p>This module allows to allocate delivery zones to customers. Information
374374
is shown on sale orders and stock pickings. It also allows to group and
375375
search by delivery zone in partners, sale orders and stock pickings
@@ -426,7 +426,7 @@ <h1><a class="toc-backref" href="#toc-entry-4">Bug Tracker</a></h1>
426426
<p>Bugs are tracked on <a class="reference external" href="https://github.com/OCA/delivery-carrier/issues">GitHub Issues</a>.
427427
In case of trouble, please check there if your issue has already been reported.
428428
If you spotted it first, help us to smash it by providing a detailed and welcomed
429-
<a class="reference external" href="https://github.com/OCA/delivery-carrier/issues/new?body=module:%20partner_delivery_zone%0Aversion:%2017.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**">feedback</a>.</p>
429+
<a class="reference external" href="https://github.com/OCA/delivery-carrier/issues/new?body=module:%20partner_delivery_zone%0Aversion:%2018.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**">feedback</a>.</p>
430430
<p>Do not contact contributors directly about support or help with technical issues.</p>
431431
</div>
432432
<div class="section" id="credits">
@@ -453,6 +453,10 @@ <h2><a class="toc-backref" href="#toc-entry-7">Contributors</a></h2>
453453
<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>
454454
</ul>
455455
</li>
456+
<li><a class="reference external" href="https://www.heliconia.io">Heliconia Solutions Pvt. Ltd.</a><ul>
457+
<li>Bhavesh Heliconia</li>
458+
</ul>
459+
</li>
456460
</ul>
457461
</div>
458462
<div class="section" id="maintainers">
@@ -464,7 +468,7 @@ <h2><a class="toc-backref" href="#toc-entry-8">Maintainers</a></h2>
464468
<p>OCA, or the Odoo Community Association, is a nonprofit organization whose
465469
mission is to support the collaborative development of Odoo features and
466470
promote its widespread use.</p>
467-
<p>This module is part of the <a class="reference external" href="https://github.com/OCA/delivery-carrier/tree/17.0/partner_delivery_zone">OCA/delivery-carrier</a> project on GitHub.</p>
471+
<p>This module is part of the <a class="reference external" href="https://github.com/OCA/delivery-carrier/tree/18.0/partner_delivery_zone">OCA/delivery-carrier</a> project on GitHub.</p>
468472
<p>You are welcome to contribute. To learn how please visit <a class="reference external" href="https://odoo-community.org/page/Contribute">https://odoo-community.org/page/Contribute</a>.</p>
469473
</div>
470474
</div>

partner_delivery_zone/views/partner_delivery_zone_view.xml

+3-3
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@
66
<field name="name">partner.delivery.zone.tree</field>
77
<field name="model">partner.delivery.zone</field>
88
<field name="arch" type="xml">
9-
<tree editable="top">
9+
<list editable="top">
1010
<field name="code" />
1111
<field name="name" />
12-
</tree>
12+
</list>
1313
</field>
1414
</record>
1515
<record id="view_partner_delivery_zone_search" model="ir.ui.view">
@@ -25,7 +25,7 @@
2525
<record id="partner_delivery_zone_action" model="ir.actions.act_window">
2626
<field name="name">Delivery Zones</field>
2727
<field name="res_model">partner.delivery.zone</field>
28-
<field name="view_mode">tree</field>
28+
<field name="view_mode">list</field>
2929
<field name="view_id" ref="view_partner_delivery_zone_tree" />
3030
<field name="help" type="html">
3131
<p

partner_delivery_zone/views/report_deliveryslip.xml

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

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 col-3 mw-100 mb-2">
7+
<div t-if="o.delivery_zone_id" class="col">
88
<strong>Zone</strong>
9-
<p t-field="o.delivery_zone_id" class="m-0" />
9+
<p t-field="o.delivery_zone_id" />
1010
</div>
1111
</xpath>
1212
</template>

partner_delivery_zone/views/stock_picking_view.xml

+8-3
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,14 @@
3939
<xpath expr="//field[@name='scheduled_date']" position="after">
4040
<field name="delivery_zone_id" />
4141
</xpath>
42-
<xpath expr="//div[hasclass('oe_kanban_bottom_left')]" position="inside">
43-
<div t-if="record.delivery_zone_id">
44-
<t t-esc="record.delivery_zone_id.value" />
42+
<xpath expr="//t[@t-name='card']//footer//div[1]" position="replace">
43+
<div class="d-flex">
44+
<div>
45+
<field name="partner_id" />
46+
</div>
47+
<div t-if="record.delivery_zone_id" class="ml8">
48+
<field name="delivery_zone_id" />
49+
</div>
4550
</div>
4651
</xpath>
4752
</field>

0 commit comments

Comments
 (0)