From d3a0009eeb8063b1999cb6c895c34bcd89c2237e Mon Sep 17 00:00:00 2001 From: Akim Juillerat Date: Fri, 24 Jul 2020 11:44:27 +0200 Subject: [PATCH 1/7] Add module server_environment_delivery --- server_environment_delivery/README.rst | 100 ++++ server_environment_delivery/__init__.py | 1 + server_environment_delivery/__manifest__.py | 13 + .../models/__init__.py | 1 + .../models/delivery_carrier.py | 15 + .../readme/CONFIGURE.rst | 16 + .../readme/CONTRIBUTORS.rst | 3 + .../readme/DESCRIPTION.rst | 1 + .../static/description/index.html | 444 ++++++++++++++++++ 9 files changed, 594 insertions(+) create mode 100644 server_environment_delivery/README.rst create mode 100644 server_environment_delivery/__init__.py create mode 100644 server_environment_delivery/__manifest__.py create mode 100644 server_environment_delivery/models/__init__.py create mode 100644 server_environment_delivery/models/delivery_carrier.py create mode 100644 server_environment_delivery/readme/CONFIGURE.rst create mode 100644 server_environment_delivery/readme/CONTRIBUTORS.rst create mode 100644 server_environment_delivery/readme/DESCRIPTION.rst create mode 100644 server_environment_delivery/static/description/index.html diff --git a/server_environment_delivery/README.rst b/server_environment_delivery/README.rst new file mode 100644 index 0000000000..2cfe9b5b0e --- /dev/null +++ b/server_environment_delivery/README.rst @@ -0,0 +1,100 @@ +=========================== +Server Environment Delivery +=========================== + +.. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + !! This file is generated by oca-gen-addon-readme !! + !! changes will be overwritten. !! + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + +.. |badge1| image:: https://img.shields.io/badge/maturity-Alpha-red.png + :target: https://odoo-community.org/page/development-status + :alt: Alpha +.. |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/13.0/server_environment_delivery + :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-13-0/delivery-carrier-13-0-server_environment_delivery + :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/13.0 + :alt: Try me on Runbot + +|badge1| |badge2| |badge3| |badge4| |badge5| + +This module allows to configure shipping methods according to server environment. + +.. IMPORTANT:: + This is an alpha version, the data model and design can change at any time without warning. + Only for development or testing purpose, do not use in production. + `More details on development status `_ + +**Table of contents** + +.. contents:: + :local: + +Configuration +============= + +At the moment, the module only allows to define the field prod_environment by +defining a `[delivery_carrier]` with `prod_environment` key as follows: + +Restrict usage of prod environment:: + + [delivery_carrier] + prod_environment=False + + +Force usage of prod environment:: + + [delivery_carrier] + prod_environment=False + + +If the key is not set, the user will still be able to switch the value. + +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 +~~~~~~~~~~~~ + +* Akim Juillerat +* Guewen Baconnier +* Simone Orsi + +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. + +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/server_environment_delivery/__init__.py b/server_environment_delivery/__init__.py new file mode 100644 index 0000000000..0650744f6b --- /dev/null +++ b/server_environment_delivery/__init__.py @@ -0,0 +1 @@ +from . import models diff --git a/server_environment_delivery/__manifest__.py b/server_environment_delivery/__manifest__.py new file mode 100644 index 0000000000..74e8b85e86 --- /dev/null +++ b/server_environment_delivery/__manifest__.py @@ -0,0 +1,13 @@ +# Copyright 2020 Camptocamp SA +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl) +{ + "name": "Server Environment Delivery", + "summary": "Configure prod environment for delivery carriers", + "version": "13.0.1.0.0", + "development_status": "Alpha", + "category": "Operations/Inventory/Delivery", + "website": "https://github.com/OCA/delivery-carrier", + "author": "Camptocamp, Odoo Community Association (OCA)", + "license": "AGPL-3", + "depends": ["delivery", "server_environment"], +} diff --git a/server_environment_delivery/models/__init__.py b/server_environment_delivery/models/__init__.py new file mode 100644 index 0000000000..0a1fe29fbd --- /dev/null +++ b/server_environment_delivery/models/__init__.py @@ -0,0 +1 @@ +from . import delivery_carrier diff --git a/server_environment_delivery/models/delivery_carrier.py b/server_environment_delivery/models/delivery_carrier.py new file mode 100644 index 0000000000..a782d45293 --- /dev/null +++ b/server_environment_delivery/models/delivery_carrier.py @@ -0,0 +1,15 @@ +# Copyright 2020 Camptocamp SA +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl) +from odoo import models + + +class DeliveryCarrier(models.Model): + _name = "delivery.carrier" + _inherit = ["delivery.carrier", "server.env.techname.mixin", "server.env.mixin"] + + @property + def _server_env_fields(self): + base_fields = super()._server_env_fields + delivery_fields = {"prod_environment": {}} + delivery_fields.update(base_fields) + return delivery_fields diff --git a/server_environment_delivery/readme/CONFIGURE.rst b/server_environment_delivery/readme/CONFIGURE.rst new file mode 100644 index 0000000000..67ab949313 --- /dev/null +++ b/server_environment_delivery/readme/CONFIGURE.rst @@ -0,0 +1,16 @@ +At the moment, the module only allows to define the field prod_environment by +defining a `[delivery_carrier]` with `prod_environment` key as follows: + +Restrict usage of prod environment:: + + [delivery_carrier] + prod_environment=False + + +Force usage of prod environment:: + + [delivery_carrier] + prod_environment=False + + +If the key is not set, the user will still be able to switch the value. diff --git a/server_environment_delivery/readme/CONTRIBUTORS.rst b/server_environment_delivery/readme/CONTRIBUTORS.rst new file mode 100644 index 0000000000..a83d5321c9 --- /dev/null +++ b/server_environment_delivery/readme/CONTRIBUTORS.rst @@ -0,0 +1,3 @@ +* Akim Juillerat +* Guewen Baconnier +* Simone Orsi diff --git a/server_environment_delivery/readme/DESCRIPTION.rst b/server_environment_delivery/readme/DESCRIPTION.rst new file mode 100644 index 0000000000..df94f09fd7 --- /dev/null +++ b/server_environment_delivery/readme/DESCRIPTION.rst @@ -0,0 +1 @@ +This module allows to configure shipping methods according to server environment. diff --git a/server_environment_delivery/static/description/index.html b/server_environment_delivery/static/description/index.html new file mode 100644 index 0000000000..02a51c182a --- /dev/null +++ b/server_environment_delivery/static/description/index.html @@ -0,0 +1,444 @@ + + + + + + +Server Environment Delivery + + + +
+

Server Environment Delivery

+ + +

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

+

This module allows to configure shipping methods according to server environment.

+
+

Important

+

This is an alpha version, the data model and design can change at any time without warning. +Only for development or testing purpose, do not use in production. +More details on development status

+
+

Table of contents

+ +
+

Configuration

+

At the moment, the module only allows to define the field prod_environment by +defining a [delivery_carrier] with prod_environment key as follows:

+

Restrict usage of prod environment:

+
+[delivery_carrier]
+prod_environment=False
+
+

Force usage of prod environment:

+
+[delivery_carrier]
+prod_environment=False
+
+

If the key is not set, the user will still be able to switch the value.

+
+
+

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.

+

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 b61668f482cb45e402eb5afd4fe49bd3d9585db4 Mon Sep 17 00:00:00 2001 From: oca-travis Date: Fri, 2 Apr 2021 12:26:41 +0000 Subject: [PATCH 2/7] [UPD] Update server_environment_delivery.pot --- .../i18n/server_environment_delivery.pot | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 server_environment_delivery/i18n/server_environment_delivery.pot diff --git a/server_environment_delivery/i18n/server_environment_delivery.pot b/server_environment_delivery/i18n/server_environment_delivery.pot new file mode 100644 index 0000000000..77fd5dbfb2 --- /dev/null +++ b/server_environment_delivery/i18n/server_environment_delivery.pot @@ -0,0 +1,19 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * server_environment_delivery +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 13.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: server_environment_delivery +#: model:ir.model,name:server_environment_delivery.model_delivery_carrier +msgid "Shipping Methods" +msgstr "" From ed72b29a0a0a4f15c2329f70034632941ad15a35 Mon Sep 17 00:00:00 2001 From: OCA-git-bot Date: Fri, 2 Apr 2021 12:33:11 +0000 Subject: [PATCH 3/7] [ADD] icon.png --- .../static/description/icon.png | Bin 0 -> 9455 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 server_environment_delivery/static/description/icon.png diff --git a/server_environment_delivery/static/description/icon.png b/server_environment_delivery/static/description/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..3a0328b516c4980e8e44cdb63fd945757ddd132d GIT binary patch literal 9455 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 z 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 Xviia!U7SGha1wx#SCgwmn*{w2TRX*I literal 0 HcmV?d00001 From 0a9d3d7ef36bbb1fc1cb881fc43c655e57d9aa79 Mon Sep 17 00:00:00 2001 From: sonhd Date: Tue, 14 Sep 2021 11:31:24 +0700 Subject: [PATCH 4/7] [MIG] server_environment_delivery: Migration to 14.0 --- server_environment_delivery/README.rst | 6 +++--- server_environment_delivery/__manifest__.py | 2 +- .../i18n/server_environment_delivery.pot | 2 +- server_environment_delivery/models/delivery_carrier.py | 5 ++++- server_environment_delivery/readme/CONTRIBUTORS.rst | 2 ++ server_environment_delivery/readme/CREDITS.rst | 1 + server_environment_delivery/static/description/index.html | 4 ++-- 7 files changed, 14 insertions(+), 8 deletions(-) create mode 100644 server_environment_delivery/readme/CREDITS.rst diff --git a/server_environment_delivery/README.rst b/server_environment_delivery/README.rst index 2cfe9b5b0e..34a9ceff10 100644 --- a/server_environment_delivery/README.rst +++ b/server_environment_delivery/README.rst @@ -14,13 +14,13 @@ Server Environment Delivery :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/13.0/server_environment_delivery + :target: https://github.com/OCA/delivery-carrier/tree/14.0/server_environment_delivery :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-13-0/delivery-carrier-13-0-server_environment_delivery :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/13.0 + :target: https://runbot.odoo-community.org/runbot/99/14.0 :alt: Try me on Runbot |badge1| |badge2| |badge3| |badge4| |badge5| @@ -95,6 +95,6 @@ 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. -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/server_environment_delivery/__manifest__.py b/server_environment_delivery/__manifest__.py index 74e8b85e86..a0101ab8cb 100644 --- a/server_environment_delivery/__manifest__.py +++ b/server_environment_delivery/__manifest__.py @@ -3,7 +3,7 @@ { "name": "Server Environment Delivery", "summary": "Configure prod environment for delivery carriers", - "version": "13.0.1.0.0", + "version": "14.0.1.0.0", "development_status": "Alpha", "category": "Operations/Inventory/Delivery", "website": "https://github.com/OCA/delivery-carrier", diff --git a/server_environment_delivery/i18n/server_environment_delivery.pot b/server_environment_delivery/i18n/server_environment_delivery.pot index 77fd5dbfb2..f2967ea528 100644 --- a/server_environment_delivery/i18n/server_environment_delivery.pot +++ b/server_environment_delivery/i18n/server_environment_delivery.pot @@ -4,7 +4,7 @@ # msgid "" msgstr "" -"Project-Id-Version: Odoo Server 13.0\n" +"Project-Id-Version: Odoo Server 14.0\n" "Report-Msgid-Bugs-To: \n" "Last-Translator: \n" "Language-Team: \n" diff --git a/server_environment_delivery/models/delivery_carrier.py b/server_environment_delivery/models/delivery_carrier.py index a782d45293..303de68be5 100644 --- a/server_environment_delivery/models/delivery_carrier.py +++ b/server_environment_delivery/models/delivery_carrier.py @@ -1,12 +1,15 @@ # Copyright 2020 Camptocamp SA # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl) -from odoo import models + +from odoo import fields, models class DeliveryCarrier(models.Model): _name = "delivery.carrier" _inherit = ["delivery.carrier", "server.env.techname.mixin", "server.env.mixin"] + tech_name = fields.Char(required=False) + @property def _server_env_fields(self): base_fields = super()._server_env_fields diff --git a/server_environment_delivery/readme/CONTRIBUTORS.rst b/server_environment_delivery/readme/CONTRIBUTORS.rst index a83d5321c9..837de2ff96 100644 --- a/server_environment_delivery/readme/CONTRIBUTORS.rst +++ b/server_environment_delivery/readme/CONTRIBUTORS.rst @@ -1,3 +1,5 @@ * Akim Juillerat * Guewen Baconnier * Simone Orsi +* `Trobz `_: + * Son Ho diff --git a/server_environment_delivery/readme/CREDITS.rst b/server_environment_delivery/readme/CREDITS.rst new file mode 100644 index 0000000000..f37ebe7570 --- /dev/null +++ b/server_environment_delivery/readme/CREDITS.rst @@ -0,0 +1 @@ +The migration of this module from 13.0 to 14.0 was financially supported by Camptocamp diff --git a/server_environment_delivery/static/description/index.html b/server_environment_delivery/static/description/index.html index 02a51c182a..45b54cf45e 100644 --- a/server_environment_delivery/static/description/index.html +++ b/server_environment_delivery/static/description/index.html @@ -367,7 +367,7 @@

Server Environment Delivery

!! This file is generated by oca-gen-addon-readme !! !! changes will be overwritten. !! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! --> -

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

+

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

This module allows to configure shipping methods according to server environment.

Important

@@ -435,7 +435,7 @@

Maintainers

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.

-

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.

From c78e0b54a17824d73464d2cd2ea2b50c9ef2b1c8 Mon Sep 17 00:00:00 2001 From: oca-travis Date: Thu, 7 Oct 2021 09:48:46 +0000 Subject: [PATCH 5/7] [UPD] Update server_environment_delivery.pot --- .../i18n/server_environment_delivery.pot | 30 +++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/server_environment_delivery/i18n/server_environment_delivery.pot b/server_environment_delivery/i18n/server_environment_delivery.pot index f2967ea528..33028a97a9 100644 --- a/server_environment_delivery/i18n/server_environment_delivery.pot +++ b/server_environment_delivery/i18n/server_environment_delivery.pot @@ -13,7 +13,37 @@ msgstr "" "Content-Transfer-Encoding: \n" "Plural-Forms: \n" +#. module: server_environment_delivery +#: model:ir.model.fields,field_description:server_environment_delivery.field_delivery_carrier__display_name +msgid "Display Name" +msgstr "" + +#. module: server_environment_delivery +#: model:ir.model.fields,field_description:server_environment_delivery.field_delivery_carrier__id +msgid "ID" +msgstr "" + +#. module: server_environment_delivery +#: model:ir.model.fields,field_description:server_environment_delivery.field_delivery_carrier____last_update +msgid "Last Modified on" +msgstr "" + +#. module: server_environment_delivery +#: model:ir.model.fields,field_description:server_environment_delivery.field_delivery_carrier__server_env_defaults +msgid "Server Env Defaults" +msgstr "" + #. module: server_environment_delivery #: model:ir.model,name:server_environment_delivery.model_delivery_carrier msgid "Shipping Methods" msgstr "" + +#. module: server_environment_delivery +#: model:ir.model.fields,field_description:server_environment_delivery.field_delivery_carrier__tech_name +msgid "Tech Name" +msgstr "" + +#. module: server_environment_delivery +#: model:ir.model.fields,help:server_environment_delivery.field_delivery_carrier__tech_name +msgid "Unique name for technical purposes. Eg: server env keys." +msgstr "" From a0fb2b02d0327c1d5d31fcf874e68d6195020d2a Mon Sep 17 00:00:00 2001 From: OCA-git-bot Date: Thu, 7 Oct 2021 10:01:22 +0000 Subject: [PATCH 6/7] [UPD] README.rst --- server_environment_delivery/README.rst | 11 ++++++++-- .../static/description/index.html | 21 +++++++++++++++---- 2 files changed, 26 insertions(+), 6 deletions(-) diff --git a/server_environment_delivery/README.rst b/server_environment_delivery/README.rst index 34a9ceff10..c29eb56010 100644 --- a/server_environment_delivery/README.rst +++ b/server_environment_delivery/README.rst @@ -17,7 +17,7 @@ Server Environment Delivery :target: https://github.com/OCA/delivery-carrier/tree/14.0/server_environment_delivery :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-13-0/delivery-carrier-13-0-server_environment_delivery + :target: https://translation.odoo-community.org/projects/delivery-carrier-14-0/delivery-carrier-14-0-server_environment_delivery :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 @@ -63,7 +63,7 @@ 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 `_. +`feedback `_. Do not contact contributors directly about support or help with technical issues. @@ -81,6 +81,13 @@ Contributors * Akim Juillerat * Guewen Baconnier * Simone Orsi +* `Trobz `_: + * Son Ho + +Other credits +~~~~~~~~~~~~~ + +The migration of this module from 13.0 to 14.0 was financially supported by Camptocamp Maintainers ~~~~~~~~~~~ diff --git a/server_environment_delivery/static/description/index.html b/server_environment_delivery/static/description/index.html index 45b54cf45e..81995b6999 100644 --- a/server_environment_delivery/static/description/index.html +++ b/server_environment_delivery/static/description/index.html @@ -367,7 +367,7 @@

Server Environment Delivery

!! This file is generated by oca-gen-addon-readme !! !! changes will be overwritten. !! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! --> -

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

+

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

This module allows to configure shipping methods according to server environment.

Important

@@ -383,7 +383,8 @@

Server Environment Delivery

  • Credits
    • @@ -409,7 +410,7 @@

    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.

    +feedback.

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

    @@ -426,10 +427,22 @@

    Contributors

  • Akim Juillerat <akim.juillerat@camptocamp.com>
  • Guewen Baconnier <guewen.baconnier@camptocamp.com>
  • Simone Orsi <simahawk@gmail.com>
    • +
  • +
    Trobz:
    +
    +
    +
    +
    • + +
    +
    +

    Other credits

    +

    The migration of this module from 13.0 to 14.0 was financially supported by Camptocamp

    -

    Maintainers

    +

    Maintainers

    This module is maintained by the OCA.

    Odoo Community Association

    OCA, or the Odoo Community Association, is a nonprofit organization whose From 21a5d5389438defed846a282311baf7b819049d5 Mon Sep 17 00:00:00 2001 From: MmeQuignon Date: Thu, 30 Mar 2023 15:51:26 +0200 Subject: [PATCH 7/7] server_environment_delivery: migration to 16.0 --- server_environment_delivery/__manifest__.py | 2 +- .../odoo/addons/server_environment_delivery | 1 + setup/server_environment_delivery/setup.py | 6 ++++++ 3 files changed, 8 insertions(+), 1 deletion(-) create mode 120000 setup/server_environment_delivery/odoo/addons/server_environment_delivery create mode 100644 setup/server_environment_delivery/setup.py diff --git a/server_environment_delivery/__manifest__.py b/server_environment_delivery/__manifest__.py index a0101ab8cb..ec7868ddc0 100644 --- a/server_environment_delivery/__manifest__.py +++ b/server_environment_delivery/__manifest__.py @@ -3,7 +3,7 @@ { "name": "Server Environment Delivery", "summary": "Configure prod environment for delivery carriers", - "version": "14.0.1.0.0", + "version": "16.0.1.0.0", "development_status": "Alpha", "category": "Operations/Inventory/Delivery", "website": "https://github.com/OCA/delivery-carrier", diff --git a/setup/server_environment_delivery/odoo/addons/server_environment_delivery b/setup/server_environment_delivery/odoo/addons/server_environment_delivery new file mode 120000 index 0000000000..f61a12df39 --- /dev/null +++ b/setup/server_environment_delivery/odoo/addons/server_environment_delivery @@ -0,0 +1 @@ +../../../../server_environment_delivery \ No newline at end of file diff --git a/setup/server_environment_delivery/setup.py b/setup/server_environment_delivery/setup.py new file mode 100644 index 0000000000..28c57bb640 --- /dev/null +++ b/setup/server_environment_delivery/setup.py @@ -0,0 +1,6 @@ +import setuptools + +setuptools.setup( + setup_requires=['setuptools-odoo'], + odoo_addon=True, +)