From 681c7ff5feb0d6400f3476fe44e7144f8fbf27e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Iv=C3=A0n=20Todorovich?= Date: Thu, 10 Jun 2021 12:15:14 -0300 Subject: [PATCH 1/6] [ADD] delivery_carrier_city --- delivery_carrier_city/__init__.py | 1 + delivery_carrier_city/__manifest__.py | 20 ++++ delivery_carrier_city/models/__init__.py | 1 + .../models/delivery_carrier.py | 22 ++++ delivery_carrier_city/readme/CONTRIBUTORS.rst | 3 + delivery_carrier_city/readme/DESCRIPTION.rst | 2 + delivery_carrier_city/tests/__init__.py | 1 + .../tests/test_delivery_carrier_city.py | 103 ++++++++++++++++++ .../views/delivery_carrier.xml | 18 +++ 9 files changed, 171 insertions(+) create mode 100644 delivery_carrier_city/__init__.py create mode 100644 delivery_carrier_city/__manifest__.py create mode 100644 delivery_carrier_city/models/__init__.py create mode 100644 delivery_carrier_city/models/delivery_carrier.py create mode 100644 delivery_carrier_city/readme/CONTRIBUTORS.rst create mode 100644 delivery_carrier_city/readme/DESCRIPTION.rst create mode 100644 delivery_carrier_city/tests/__init__.py create mode 100644 delivery_carrier_city/tests/test_delivery_carrier_city.py create mode 100644 delivery_carrier_city/views/delivery_carrier.xml diff --git a/delivery_carrier_city/__init__.py b/delivery_carrier_city/__init__.py new file mode 100644 index 0000000000..0650744f6b --- /dev/null +++ b/delivery_carrier_city/__init__.py @@ -0,0 +1 @@ +from . import models diff --git a/delivery_carrier_city/__manifest__.py b/delivery_carrier_city/__manifest__.py new file mode 100644 index 0000000000..a170364b26 --- /dev/null +++ b/delivery_carrier_city/__manifest__.py @@ -0,0 +1,20 @@ +# Copyright 2021 Camptocamp SA - Iván Todorovich +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + +{ + "name": "Delivery Carrier City", + "summary": "Integrates delivery with base_address_city", + "version": "14.0.1.0.0", + "category": "Delivery", + "website": "https://github.com/OCA/delivery-carrier", + "author": "Camptocamp, Odoo Community Association (OCA)", + "maintainers": ["ivantodorovich"], + "license": "AGPL-3", + "depends": [ + "delivery", + "base_address_city", + ], + "data": [ + "views/delivery_carrier.xml", + ], +} diff --git a/delivery_carrier_city/models/__init__.py b/delivery_carrier_city/models/__init__.py new file mode 100644 index 0000000000..0a1fe29fbd --- /dev/null +++ b/delivery_carrier_city/models/__init__.py @@ -0,0 +1 @@ +from . import delivery_carrier diff --git a/delivery_carrier_city/models/delivery_carrier.py b/delivery_carrier_city/models/delivery_carrier.py new file mode 100644 index 0000000000..a3dc06a8de --- /dev/null +++ b/delivery_carrier_city/models/delivery_carrier.py @@ -0,0 +1,22 @@ +# Copyright 2021 Camptocamp SA - Iván Todorovich +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + +from odoo import fields, models + + +class DeliveryCarrier(models.Model): + _inherit = "delivery.carrier" + + city_ids = fields.Many2many( + "res.city", + relation="delivery_carrier_city_rel", + column1="carrier_id", + column2="city_id", + string="Cities", + ) + + def _match_address(self, partner): + # Override to account for city_ids + if self.city_ids and partner.city_id not in self.city_ids: + return False + return super()._match_address(partner) diff --git a/delivery_carrier_city/readme/CONTRIBUTORS.rst b/delivery_carrier_city/readme/CONTRIBUTORS.rst new file mode 100644 index 0000000000..902e23b045 --- /dev/null +++ b/delivery_carrier_city/readme/CONTRIBUTORS.rst @@ -0,0 +1,3 @@ +* `Camptocamp `_ + + * Iván Todorovich diff --git a/delivery_carrier_city/readme/DESCRIPTION.rst b/delivery_carrier_city/readme/DESCRIPTION.rst new file mode 100644 index 0000000000..1142ed300d --- /dev/null +++ b/delivery_carrier_city/readme/DESCRIPTION.rst @@ -0,0 +1,2 @@ +Integrates delivery carrier with base_address_city, to allow to +use cities in the delivery methods' destination conditions. diff --git a/delivery_carrier_city/tests/__init__.py b/delivery_carrier_city/tests/__init__.py new file mode 100644 index 0000000000..18d97560fa --- /dev/null +++ b/delivery_carrier_city/tests/__init__.py @@ -0,0 +1 @@ +from . import test_delivery_carrier_city diff --git a/delivery_carrier_city/tests/test_delivery_carrier_city.py b/delivery_carrier_city/tests/test_delivery_carrier_city.py new file mode 100644 index 0000000000..c9af94bce8 --- /dev/null +++ b/delivery_carrier_city/tests/test_delivery_carrier_city.py @@ -0,0 +1,103 @@ +# Copyright 2021 Camptocamp SA - Iván Todorovich +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + +from odoo.tests import common + + +class TestDeliveryCarrierCity(common.SavepointCase): + @classmethod + def setUpClass(cls): + super().setUpClass() + cls.env = cls.env(context=dict(cls.env.context, tracking_disable=True)) + # Countries + cls.france = cls.env.ref("base.fr") + # States + cls.ile_de_france = cls.env["res.country.state"].create( + { + "name": "Île-de-France", + "code": "FR-IDF", + "country_id": cls.france.id, + } + ) + cls.cote_azur = cls.env["res.country.state"].create( + { + "name": "Provence-Alpes-Côte-d'Azur", + "code": "FR-PAC", + "country_id": cls.france.id, + } + ) + # Cities + cls.paris = cls.env["res.city"].create( + { + "name": "Paris", + "state_id": cls.ile_de_france.id, + "country_id": cls.france.id, + "zipcode": "75000", + } + ) + cls.nice = cls.env["res.city"].create( + { + "name": "Nice", + "state_id": cls.cote_azur.id, + "country_id": cls.france.id, + "zipcode": "06000", + } + ) + # Disable all other delivery methods + cls.env["delivery.carrier"].search([]).write({"active": False}) + # Create delivery methods + cls.product = cls.env["product.product"].create({"name": "Delivery"}) + cls.carrier_paris = cls.env["delivery.carrier"].create( + { + "name": "Delivery in Paris", + "product_id": cls.product.id, + "delivery_type": "fixed", + "fixed_price": 15, + "sequence": 10, + "country_ids": [(4, cls.france.id)], + "city_ids": [(4, cls.paris.id)], + } + ) + cls.carrier_france = cls.env["delivery.carrier"].create( + { + "name": "Delivery in France", + "product_id": cls.product.id, + "delivery_type": "fixed", + "fixed_price": 25, + "sequence": 20, + "country_ids": [(4, cls.france.id)], + } + ) + + def _get_available_carriers(self, partner): + return self.env["delivery.carrier"].search([]).available_carriers(partner) + + def test_00_delivery_carrier_city_match(self): + # Partner living in paris + partner = self.env["res.partner"].create( + { + "name": "Edgar Degas", + "city_id": self.paris.id, + "state_id": self.paris.state_id.id, + "country_id": self.paris.country_id.id, + } + ) + # Check available carriers + carriers = self._get_available_carriers(partner) + self.assertIn(self.carrier_france, carriers) + self.assertIn(self.carrier_paris, carriers) + + def test_01_delivery_carrier_city_not_match(self): + # Partner not living in paris + partner = self.env["res.partner"].create( + { + "name": "Henri Matisse", + "city_id": self.nice.id, + "state_id": self.nice.state_id.id, + "country_id": self.nice.country_id.id, + } + ) + # Check available carriers + carriers = self._get_available_carriers(partner) + self.assertIn(self.carrier_france, carriers) + self.assertNotIn(self.carrier_paris, carriers) diff --git a/delivery_carrier_city/views/delivery_carrier.xml b/delivery_carrier_city/views/delivery_carrier.xml new file mode 100644 index 0000000000..40861c54c6 --- /dev/null +++ b/delivery_carrier_city/views/delivery_carrier.xml @@ -0,0 +1,18 @@ + + + + + + delivery.carrier + + + + + + + + + From 9faa29c5a1be94c6a27064abacffe6ea1a32c79c Mon Sep 17 00:00:00 2001 From: oca-travis Date: Fri, 2 Jul 2021 10:29:46 +0000 Subject: [PATCH 2/6] [UPD] Update delivery_carrier_city.pot --- .../i18n/delivery_carrier_city.pot | 39 +++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 delivery_carrier_city/i18n/delivery_carrier_city.pot diff --git a/delivery_carrier_city/i18n/delivery_carrier_city.pot b/delivery_carrier_city/i18n/delivery_carrier_city.pot new file mode 100644 index 0000000000..1269990027 --- /dev/null +++ b/delivery_carrier_city/i18n/delivery_carrier_city.pot @@ -0,0 +1,39 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * delivery_carrier_city +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 14.0\n" +"Report-Msgid-Bugs-To: \n" +"Last-Translator: \n" +"Language-Team: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Plural-Forms: \n" + +#. module: delivery_carrier_city +#: model:ir.model.fields,field_description:delivery_carrier_city.field_delivery_carrier__city_ids +msgid "Cities" +msgstr "" + +#. module: delivery_carrier_city +#: model:ir.model.fields,field_description:delivery_carrier_city.field_delivery_carrier__display_name +msgid "Display Name" +msgstr "" + +#. module: delivery_carrier_city +#: model:ir.model.fields,field_description:delivery_carrier_city.field_delivery_carrier__id +msgid "ID" +msgstr "" + +#. module: delivery_carrier_city +#: model:ir.model.fields,field_description:delivery_carrier_city.field_delivery_carrier____last_update +msgid "Last Modified on" +msgstr "" + +#. module: delivery_carrier_city +#: model:ir.model,name:delivery_carrier_city.model_delivery_carrier +msgid "Shipping Methods" +msgstr "" From b11d6c322e9fc8381d58379be8ac480ad3e77d01 Mon Sep 17 00:00:00 2001 From: OCA-git-bot Date: Fri, 2 Jul 2021 10:33:57 +0000 Subject: [PATCH 3/6] [UPD] README.rst --- delivery_carrier_city/README.rst | 84 ++++ .../static/description/index.html | 425 ++++++++++++++++++ 2 files changed, 509 insertions(+) create mode 100644 delivery_carrier_city/README.rst create mode 100644 delivery_carrier_city/static/description/index.html diff --git a/delivery_carrier_city/README.rst b/delivery_carrier_city/README.rst new file mode 100644 index 0000000000..d2e2e629a5 --- /dev/null +++ b/delivery_carrier_city/README.rst @@ -0,0 +1,84 @@ +===================== +Delivery Carrier City +===================== + +.. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + !! This file is generated by oca-gen-addon-readme !! + !! changes will be overwritten. !! + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + +.. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png + :target: https://odoo-community.org/page/development-status + :alt: Beta +.. |badge2| image:: https://img.shields.io/badge/licence-AGPL--3-blue.png + :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html + :alt: License: AGPL-3 +.. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fdelivery--carrier-lightgray.png?logo=github + :target: https://github.com/OCA/delivery-carrier/tree/14.0/delivery_carrier_city + :alt: OCA/delivery-carrier +.. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png + :target: https://translation.odoo-community.org/projects/delivery-carrier-14-0/delivery-carrier-14-0-delivery_carrier_city + :alt: Translate me on Weblate +.. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png + :target: https://runbot.odoo-community.org/runbot/99/14.0 + :alt: Try me on Runbot + +|badge1| |badge2| |badge3| |badge4| |badge5| + +Integrates delivery carrier with base_address_city, to allow to +use cities in the delivery methods' destination conditions. + +**Table of contents** + +.. contents:: + :local: + +Bug Tracker +=========== + +Bugs are tracked on `GitHub Issues `_. +In case of trouble, please check there if your issue has already been reported. +If you spotted it first, help us smashing it by providing a detailed and welcomed +`feedback `_. + +Do not contact contributors directly about support or help with technical issues. + +Credits +======= + +Authors +~~~~~~~ + +* Camptocamp + +Contributors +~~~~~~~~~~~~ + +* `Camptocamp `_ + + * Iván Todorovich + +Maintainers +~~~~~~~~~~~ + +This module is maintained by the OCA. + +.. image:: https://odoo-community.org/logo.png + :alt: Odoo Community Association + :target: https://odoo-community.org + +OCA, or the Odoo Community Association, is a nonprofit organization whose +mission is to support the collaborative development of Odoo features and +promote its widespread use. + +.. |maintainer-ivantodorovich| image:: https://github.com/ivantodorovich.png?size=40px + :target: https://github.com/ivantodorovich + :alt: ivantodorovich + +Current `maintainer `__: + +|maintainer-ivantodorovich| + +This module is part of the `OCA/delivery-carrier `_ project on GitHub. + +You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute. diff --git a/delivery_carrier_city/static/description/index.html b/delivery_carrier_city/static/description/index.html new file mode 100644 index 0000000000..38d45d7eff --- /dev/null +++ b/delivery_carrier_city/static/description/index.html @@ -0,0 +1,425 @@ + + + + + + +Delivery Carrier City + + + +
+

Delivery Carrier City

+ + +

Beta License: AGPL-3 OCA/delivery-carrier Translate me on Weblate Try me on Runbot

+

Integrates delivery carrier with base_address_city, to allow to +use cities in the delivery methods’ destination conditions.

+

Table of contents

+ +
+

Bug Tracker

+

Bugs are tracked on GitHub Issues. +In case of trouble, please check there if your issue has already been reported. +If you spotted it first, help us smashing it by providing a detailed and welcomed +feedback.

+

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

+
+
+

Credits

+
+

Authors

+
    +
  • Camptocamp
    • +
+
+
+

Contributors

+ +
+
+

Maintainers

+

This module is maintained by the OCA.

+Odoo Community Association +

OCA, or the Odoo Community Association, is a nonprofit organization whose +mission is to support the collaborative development of Odoo features and +promote its widespread use.

+

Current maintainer:

+

ivantodorovich

+

This module is part of the OCA/delivery-carrier project on GitHub.

+

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

+
+
+
+ + From df4fcd1a5e5189e885de847f179afa8edd6d8eb0 Mon Sep 17 00:00:00 2001 From: OCA-git-bot Date: Fri, 2 Jul 2021 10:33:57 +0000 Subject: [PATCH 4/6] [ADD] icon.png --- .../static/description/icon.png | Bin 0 -> 9455 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 delivery_carrier_city/static/description/icon.png diff --git a/delivery_carrier_city/static/description/icon.png b/delivery_carrier_city/static/description/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..3a0328b516c4980e8e44cdb63fd945757ddd132d GIT binary patch literal 9455 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 z z?n?eq1XP>p-IM$Z^C;2L3itnbJZAip*Zo0aw2bs8@(s^~*8T9go!%dHcAz2lM;`yp zD=7&xjFV$S&5uDaiScyD?B-i1ze`+CoRtz`Wn+Zl&#s4&}MO{@N!ufrzjG$B79)Y2d3tBk&)TxUTw@QS0TEL_?njX|@vq?Uz(nBFK5Pq7*xj#u*R&i|?7+6# z+|r_n#SW&LXhtheZdah{ZVoqwyT{D>MC3nkFF#N)xLi{p7J1jXlmVeb;cP5?e(=f# zuT7fvjSbjS781v?7{)-X3*?>tq?)Yd)~|1{BDS(pqC zC}~H#WXlkUW*H5CDOo<)#x7%RY)A;ShGhI5s*#cRDA8YgqG(HeKDx+#(ZQ?386dv! zlXCO)w91~Vw4AmOcATuV653fa9R$fyK8ul%rG z-wfS zihugoZyr38Im?Zuh6@RcF~t1anQu7>#lPpb#}4cOA!EM11`%f*07RqOVkmX{p~KJ9 z^zP;K#|)$`^Rb{rnHGH{~>1(fawV0*Z#)}M`m8-?ZJV<+e}s9wE# z)l&az?w^5{)`S(%MRzxdNqrs1n*-=jS^_jqE*5XDrA0+VE`5^*p3CuM<&dZEeCjoz zR;uu_H9ZPZV|fQq`Cyw4nscrVwi!fE6ciMmX$!_hN7uF;jjKG)d2@aC4ropY)8etW=xJvni)8eHi`H$%#zn^WJ5NLc-rqk|u&&4Z6fD_m&JfSI1Bvb?b<*n&sfl0^t z=HnmRl`XrFvMKB%9}>PaA`m-fK6a0(8=qPkWS5bb4=v?XcWi&hRY?O5HdulRi4?fN zlsJ*N-0Qw+Yic@s0(2uy%F@ib;GjXt01Fmx5XbRo6+n|pP(&nodMoap^z{~q ziEeaUT@Mxe3vJSfI6?uLND(CNr=#^W<1b}jzW58bIfyWTDle$mmS(|x-0|2UlX+9k zQ^EX7Nw}?EzVoBfT(-LT|=9N@^hcn-_p&sqG z&*oVs2JSU+N4ZD`FhCAWaS;>|wH2G*Id|?pa#@>tyxX`+4HyIArWDvVrX)2WAOQff z0qyHu&-S@i^MS-+j--!pr4fPBj~_8({~e1bfcl0wI1kaoN>mJL6KUPQm5N7lB(ui1 zE-o%kq)&djzWJ}ob<-GfDlkB;F31j-VHKvQUGQ3sp`CwyGJk_i!y^sD0fqC@$9|jO zOqN!r!8-p==F@ZVP=U$qSpY(gQ0)59P1&t@y?5rvg<}E+GB}26NYPp4f2YFQrQtot5mn3wu_qprZ=>Ig-$ zbW26Ws~IgY>}^5w`vTB(G`PTZaDiGBo5o(tp)qli|NeV( z@H_=R8V39rt5J5YB2Ky?4eJJ#b`_iBe2ot~6%7mLt5t8Vwi^Jy7|jWXqa3amOIoRb zOr}WVFP--DsS`1WpN%~)t3R!arKF^Q$e12KEqU36AWwnCBICpH4XCsfnyrHr>$I$4 z!DpKX$OKLWarN7nv@!uIA+~RNO)l$$w}p(;b>mx8pwYvu;dD_unryX_NhT8*Tj>BTrTTL&!?O+%Rv;b?B??gSzdp?6Uug9{ zd@V08Z$BdI?fpoCS$)t4mg4rT8Q_I}h`0d-vYZ^|dOB*Q^S|xqTV*vIg?@fVFSmMpaw0qtTRbx} z({Pg?#{2`sc9)M5N$*N|4;^t$+QP?#mov zGVC@I*lBVrOU-%2y!7%)fAKjpEFsgQc4{amtiHb95KQEwvf<(3T<9-Zm$xIew#P22 zc2Ix|App^>v6(3L_MCU0d3W##AB0M~3D00EWoKZqsJYT(#@w$Y_H7G22M~ApVFTRHMI_3be)Lkn#0F*V8Pq zc}`Cjy$bE;FJ6H7p=0y#R>`}-m4(0F>%@P|?7fx{=R^uFdISRnZ2W_xQhD{YuR3t< z{6yxu=4~JkeA;|(J6_nv#>Nvs&FuLA&PW^he@t(UwFFE8)|a!R{`E`K`i^ZnyE4$k z;(749Ix|oi$c3QbEJ3b~D_kQsPz~fIUKym($a_7dJ?o+40*OLl^{=&oq$<#Q(yyrp z{J-FAniyAw9tPbe&IhQ|a`DqFTVQGQ&Gq3!C2==4x{6EJwiPZ8zub-iXoUtkJiG{} zPaR&}_fn8_z~(=;5lD-aPWD3z8PZS@AaUiomF!G8I}Mf>e~0g#BelA-5#`cj;O5>N Xviia!U7SGha1wx#SCgwmn*{w2TRX*I literal 0 HcmV?d00001 From 07e3a1b13e0d8d370014753f8cfa9911ce87deb3 Mon Sep 17 00:00:00 2001 From: Ruchir Shukla Date: Mon, 16 Sep 2024 12:04:39 +0530 Subject: [PATCH 5/6] [IMP] delivery_carrier_city: black, isort, prettier --- delivery_carrier_city/README.rst | 23 +++++---- .../static/description/index.html | 48 ++++++++++--------- .../odoo/addons/delivery_carrier_city | 1 + setup/delivery_carrier_city/setup.py | 6 +++ 4 files changed, 46 insertions(+), 32 deletions(-) create mode 120000 setup/delivery_carrier_city/odoo/addons/delivery_carrier_city create mode 100644 setup/delivery_carrier_city/setup.py diff --git a/delivery_carrier_city/README.rst b/delivery_carrier_city/README.rst index d2e2e629a5..bc18214e0a 100644 --- a/delivery_carrier_city/README.rst +++ b/delivery_carrier_city/README.rst @@ -2,10 +2,13 @@ Delivery Carrier City ===================== -.. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +.. + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! !! This file is generated by oca-gen-addon-readme !! !! changes will be overwritten. !! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + !! source digest: sha256:8401e76feccaa3a2b703e44076a605638c786a92a3ce0c2a65f9cd7f445687a8 + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! .. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png :target: https://odoo-community.org/page/development-status @@ -14,16 +17,16 @@ Delivery Carrier City :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html :alt: License: AGPL-3 .. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fdelivery--carrier-lightgray.png?logo=github - :target: https://github.com/OCA/delivery-carrier/tree/14.0/delivery_carrier_city + :target: https://github.com/OCA/delivery-carrier/tree/15.0/delivery_carrier_city :alt: OCA/delivery-carrier .. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png - :target: https://translation.odoo-community.org/projects/delivery-carrier-14-0/delivery-carrier-14-0-delivery_carrier_city + :target: https://translation.odoo-community.org/projects/delivery-carrier-15-0/delivery-carrier-15-0-delivery_carrier_city :alt: Translate me on Weblate -.. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png - :target: https://runbot.odoo-community.org/runbot/99/14.0 - :alt: Try me on Runbot +.. |badge5| image:: https://img.shields.io/badge/runboat-Try%20me-875A7B.png + :target: https://runboat.odoo-community.org/builds?repo=OCA/delivery-carrier&target_branch=15.0 + :alt: Try me on Runboat -|badge1| |badge2| |badge3| |badge4| |badge5| +|badge1| |badge2| |badge3| |badge4| |badge5| Integrates delivery carrier with base_address_city, to allow to use cities in the delivery methods' destination conditions. @@ -38,8 +41,8 @@ Bug Tracker Bugs are tracked on `GitHub Issues `_. In case of trouble, please check there if your issue has already been reported. -If you spotted it first, help us smashing it by providing a detailed and welcomed -`feedback `_. +If you spotted it first, help us to smash it by providing a detailed and welcomed +`feedback `_. Do not contact contributors directly about support or help with technical issues. @@ -79,6 +82,6 @@ Current `maintainer `__: |maintainer-ivantodorovich| -This module is part of the `OCA/delivery-carrier `_ project on GitHub. +This module is part of the `OCA/delivery-carrier `_ project on GitHub. You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute. diff --git a/delivery_carrier_city/static/description/index.html b/delivery_carrier_city/static/description/index.html index 38d45d7eff..113eb729c5 100644 --- a/delivery_carrier_city/static/description/index.html +++ b/delivery_carrier_city/static/description/index.html @@ -1,20 +1,20 @@ - - + Delivery Carrier City