From d4ba7d2d1e7894fd678ffe706545a7b53a8e6e2a Mon Sep 17 00:00:00 2001 From: Florian da Costa Date: Mon, 14 Mar 2022 09:39:17 +0100 Subject: [PATCH 01/17] Migrate carrier_account_environment to 14 (renamed from carrier_environment) --- carrier_account_environment/README.rst | 118 +++++ carrier_account_environment/__init__.py | 1 + carrier_account_environment/__manifest__.py | 17 + .../i18n/carrier_environment.pot | 20 + .../models/__init__.py | 1 + .../models/carrier_account.py | 29 ++ .../readme/CONFIGURE.rst | 30 ++ .../readme/CONTRIBUTORS.rst | 2 + .../readme/DESCRIPTION.rst | 3 + carrier_account_environment/readme/USAGE.rst | 3 + .../static/description/icon.png | Bin 0 -> 9455 bytes .../static/description/index.html | 461 ++++++++++++++++++ 12 files changed, 685 insertions(+) create mode 100644 carrier_account_environment/README.rst create mode 100644 carrier_account_environment/__init__.py create mode 100644 carrier_account_environment/__manifest__.py create mode 100644 carrier_account_environment/i18n/carrier_environment.pot create mode 100644 carrier_account_environment/models/__init__.py create mode 100644 carrier_account_environment/models/carrier_account.py create mode 100644 carrier_account_environment/readme/CONFIGURE.rst create mode 100644 carrier_account_environment/readme/CONTRIBUTORS.rst create mode 100644 carrier_account_environment/readme/DESCRIPTION.rst create mode 100644 carrier_account_environment/readme/USAGE.rst create mode 100644 carrier_account_environment/static/description/icon.png create mode 100644 carrier_account_environment/static/description/index.html diff --git a/carrier_account_environment/README.rst b/carrier_account_environment/README.rst new file mode 100644 index 0000000000..6934da5dcd --- /dev/null +++ b/carrier_account_environment/README.rst @@ -0,0 +1,118 @@ +============================================= +Carrier configuration with server_environment +============================================= + +.. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + !! 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%2Fserver--env-lightgray.png?logo=github + :target: https://github.com/OCA/server-env/tree/12.0/carrier_environment + :alt: OCA/server-env +.. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png + :target: https://translation.odoo-community.org/projects/server-env-12-0/server-env-12-0-carrier_environment + :alt: Translate me on Weblate +.. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png + :target: https://runbot.odoo-community.org/runbot/254/12.0 + :alt: Try me on Runbot + +|badge1| |badge2| |badge3| |badge4| |badge5| + +This module allows to configure carrier informations +using the `server_environment` mechanism: you can then have different +servers for the production and the test environment. + +**Table of contents** + +.. contents:: + :local: + +Configuration +============= + +With this module installed, the delivery carrier are +configured in the `server_environment_files` module (which is a module +you should provide, see the documentation of `server_environment` for +more information). + +In the configuration file of each environment, you may first use the +section `[carrier_account]`. + +Then for each server, you can define additional values or override the +default values with a section named `[carrier_account.resource_name]` where "resource_name" is the name of the server. + +Example of config file :: + + + [carrier_account] + # here is the default format + file_format = 'ZPL' + + + [carrier_account.mycarrier] + name = mycarrier + account = 587 + password = 123promenons-nous-dans-les-bois456cueillir-des-saucisses + + + [carrier_account.mycarrier2] + name = mycarrier2 + account = 666 + password = wazaaaaa + file_format = PDF + +Usage +===== + +Once configured, Odoo will read the carrier values from the +configuration file related to each environment defined in the main +Odoo file or in carrier.account model. + +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 +~~~~~~~ + +* Akretion +* Camptocamp + +Contributors +~~~~~~~~~~~~ + +* David Béal +* Guewen Baconnier + +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/server-env `_ project on GitHub. + +You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute. diff --git a/carrier_account_environment/__init__.py b/carrier_account_environment/__init__.py new file mode 100644 index 0000000000..0650744f6b --- /dev/null +++ b/carrier_account_environment/__init__.py @@ -0,0 +1 @@ +from . import models diff --git a/carrier_account_environment/__manifest__.py b/carrier_account_environment/__manifest__.py new file mode 100644 index 0000000000..f8cf60c47e --- /dev/null +++ b/carrier_account_environment/__manifest__.py @@ -0,0 +1,17 @@ +# Copyright 2019 David BEAL @ Akretion +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). + +{ + "name": "Carrier accounts configuration with server_environment", + "version": "14.0.1.0.0", + "category": "Tools", + "summary": "Configure carriers with server_environment_files", + "maintainers": ["florian-dacosta"], + "author": "Akretion, Camptocamp, Odoo Community Association (OCA)", + "license": "AGPL-3", + "website": "https://github.com/OCA/delivery-carrier", + "depends": [ + "server_environment", + "base_delivery_carrier_label", + ], +} diff --git a/carrier_account_environment/i18n/carrier_environment.pot b/carrier_account_environment/i18n/carrier_environment.pot new file mode 100644 index 0000000000..ef4d90f71f --- /dev/null +++ b/carrier_account_environment/i18n/carrier_environment.pot @@ -0,0 +1,20 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * carrier_environment +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 12.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: carrier_environment +#: model:ir.model,name:carrier_environment.model_carrier_account +msgid "Base account datas" +msgstr "" + diff --git a/carrier_account_environment/models/__init__.py b/carrier_account_environment/models/__init__.py new file mode 100644 index 0000000000..2553ae394c --- /dev/null +++ b/carrier_account_environment/models/__init__.py @@ -0,0 +1 @@ +from . import carrier_account diff --git a/carrier_account_environment/models/carrier_account.py b/carrier_account_environment/models/carrier_account.py new file mode 100644 index 0000000000..a440c1503e --- /dev/null +++ b/carrier_account_environment/models/carrier_account.py @@ -0,0 +1,29 @@ +# Copyright 2019 David BEAL @ Akretion +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). + +from odoo import api, models + + +class CarrierAccount(models.Model): + _name = "carrier.account" + _inherit = ["carrier.account", "server.env.mixin"] + + @property + def _server_env_fields(self): + carrier_fields = super()._server_env_fields + carrier_fields.update( + { + "account": {}, + "password": {}, + "file_format": {}, + } + ) + return carrier_fields + + @api.model + def _server_env_global_section_name(self): + """Name of the global section in the configuration files + + Can be customized in your model + """ + return "carrier_account" diff --git a/carrier_account_environment/readme/CONFIGURE.rst b/carrier_account_environment/readme/CONFIGURE.rst new file mode 100644 index 0000000000..dac6425b9c --- /dev/null +++ b/carrier_account_environment/readme/CONFIGURE.rst @@ -0,0 +1,30 @@ +With this module installed, the delivery carrier are +configured in the `server_environment_files` module (which is a module +you should provide, see the documentation of `server_environment` for +more information). + +In the configuration file of each environment, you may first use the +section `[carrier_account]`. + +Then for each server, you can define additional values or override the +default values with a section named `[carrier_account.resource_name]` where "resource_name" is the name of the server. + +Example of config file :: + + + [carrier_account] + # here is the default format + file_format = 'ZPL' + + + [carrier_account.mycarrier] + name = mycarrier + account = 587 + password = 123promenons-nous-dans-les-bois456cueillir-des-saucisses + + + [carrier_account.mycarrier2] + name = mycarrier2 + account = 666 + password = wazaaaaa + file_format = PDF diff --git a/carrier_account_environment/readme/CONTRIBUTORS.rst b/carrier_account_environment/readme/CONTRIBUTORS.rst new file mode 100644 index 0000000000..088d72017a --- /dev/null +++ b/carrier_account_environment/readme/CONTRIBUTORS.rst @@ -0,0 +1,2 @@ +* David Béal +* Guewen Baconnier diff --git a/carrier_account_environment/readme/DESCRIPTION.rst b/carrier_account_environment/readme/DESCRIPTION.rst new file mode 100644 index 0000000000..caf6c6515f --- /dev/null +++ b/carrier_account_environment/readme/DESCRIPTION.rst @@ -0,0 +1,3 @@ +This module allows to configure carrier informations +using the `server_environment` mechanism: you can then have different +servers for the production and the test environment. diff --git a/carrier_account_environment/readme/USAGE.rst b/carrier_account_environment/readme/USAGE.rst new file mode 100644 index 0000000000..7ace055f8a --- /dev/null +++ b/carrier_account_environment/readme/USAGE.rst @@ -0,0 +1,3 @@ +Once configured, Odoo will read the carrier values from the +configuration file related to each environment defined in the main +Odoo file or in carrier.account model. diff --git a/carrier_account_environment/static/description/icon.png b/carrier_account_environment/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 diff --git a/carrier_account_environment/static/description/index.html b/carrier_account_environment/static/description/index.html new file mode 100644 index 0000000000..492db4366c --- /dev/null +++ b/carrier_account_environment/static/description/index.html @@ -0,0 +1,461 @@ + + + + + + +Carrier configuration with server_environment + + + +
+

Carrier configuration with server_environment

+ + +

Beta License: AGPL-3 OCA/server-env Translate me on Weblate Try me on Runbot

+

This module allows to configure carrier informations +using the server_environment mechanism: you can then have different +servers for the production and the test environment.

+

Table of contents

+ +
+

Configuration

+

With this module installed, the delivery carrier are +configured in the server_environment_files module (which is a module +you should provide, see the documentation of server_environment for +more information).

+

In the configuration file of each environment, you may first use the +section [carrier_account].

+

Then for each server, you can define additional values or override the +default values with a section named [carrier_account.resource_name] where “resource_name” is the name of the server.

+

Example of config file

+
+[carrier_account]
+# here is the default format
+file_format = 'ZPL'
+
+
+[carrier_account.mycarrier]
+name = mycarrier
+account = 587
+password = 123promenons-nous-dans-les-bois456cueillir-des-saucisses
+
+
+[carrier_account.mycarrier2]
+name = mycarrier2
+account = 666
+password = wazaaaaa
+file_format = PDF
+
+
+
+

Usage

+

Once configured, Odoo will read the carrier values from the +configuration file related to each environment defined in the main +Odoo file or in carrier.account model.

+
+
+

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

+
    +
  • Akretion
    • +
  • 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/server-env project on GitHub.

+

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

+
+
+
+ + From d717bf6ffa21dd59263f86b8d5744d595b63c6a7 Mon Sep 17 00:00:00 2001 From: oca-travis Date: Mon, 14 Mar 2022 10:19:46 +0000 Subject: [PATCH 02/17] [UPD] Update carrier_account_environment.pot --- .../i18n/carrier_account_environment.pot | 39 +++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 carrier_account_environment/i18n/carrier_account_environment.pot diff --git a/carrier_account_environment/i18n/carrier_account_environment.pot b/carrier_account_environment/i18n/carrier_account_environment.pot new file mode 100644 index 0000000000..f539e1dc19 --- /dev/null +++ b/carrier_account_environment/i18n/carrier_account_environment.pot @@ -0,0 +1,39 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * carrier_account_environment +# +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: carrier_account_environment +#: model:ir.model,name:carrier_account_environment.model_carrier_account +msgid "Base account datas" +msgstr "" + +#. module: carrier_account_environment +#: model:ir.model.fields,field_description:carrier_account_environment.field_carrier_account__display_name +msgid "Display Name" +msgstr "" + +#. module: carrier_account_environment +#: model:ir.model.fields,field_description:carrier_account_environment.field_carrier_account__id +msgid "ID" +msgstr "" + +#. module: carrier_account_environment +#: model:ir.model.fields,field_description:carrier_account_environment.field_carrier_account____last_update +msgid "Last Modified on" +msgstr "" + +#. module: carrier_account_environment +#: model:ir.model.fields,field_description:carrier_account_environment.field_carrier_account__server_env_defaults +msgid "Server Env Defaults" +msgstr "" From a9bb29f8e87d644a2fbfed1f8c9d0c330d5ead18 Mon Sep 17 00:00:00 2001 From: OCA-git-bot Date: Mon, 14 Mar 2022 10:26:32 +0000 Subject: [PATCH 03/17] [UPD] README.rst --- carrier_account_environment/README.rst | 34 ++++++++++++------- .../static/description/index.html | 16 +++++---- 2 files changed, 30 insertions(+), 20 deletions(-) diff --git a/carrier_account_environment/README.rst b/carrier_account_environment/README.rst index 6934da5dcd..b761e1094a 100644 --- a/carrier_account_environment/README.rst +++ b/carrier_account_environment/README.rst @@ -1,6 +1,6 @@ -============================================= -Carrier configuration with server_environment -============================================= +====================================================== +Carrier accounts configuration with server_environment +====================================================== .. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! !! This file is generated by oca-gen-addon-readme !! @@ -13,20 +13,20 @@ Carrier configuration with server_environment .. |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%2Fserver--env-lightgray.png?logo=github - :target: https://github.com/OCA/server-env/tree/12.0/carrier_environment - :alt: OCA/server-env +.. |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/carrier_account_environment + :alt: OCA/delivery-carrier .. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png - :target: https://translation.odoo-community.org/projects/server-env-12-0/server-env-12-0-carrier_environment + :target: https://translation.odoo-community.org/projects/delivery-carrier-14-0/delivery-carrier-14-0-carrier_account_environment :alt: Translate me on Weblate .. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png - :target: https://runbot.odoo-community.org/runbot/254/12.0 + :target: https://runbot.odoo-community.org/runbot/99/14.0 :alt: Try me on Runbot |badge1| |badge2| |badge3| |badge4| |badge5| -This module allows to configure carrier informations -using the `server_environment` mechanism: you can then have different +This module allows to configure carrier informations +using the `server_environment` mechanism: you can then have different servers for the production and the test environment. **Table of contents** @@ -78,10 +78,10 @@ Odoo file or in carrier.account model. Bug Tracker =========== -Bugs are tracked on `GitHub Issues `_. +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. @@ -113,6 +113,14 @@ 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/server-env `_ project on GitHub. +.. |maintainer-florian-dacosta| image:: https://github.com/florian-dacosta.png?size=40px + :target: https://github.com/florian-dacosta + :alt: florian-dacosta + +Current `maintainer `__: + +|maintainer-florian-dacosta| + +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/carrier_account_environment/static/description/index.html b/carrier_account_environment/static/description/index.html index 492db4366c..72819eca61 100644 --- a/carrier_account_environment/static/description/index.html +++ b/carrier_account_environment/static/description/index.html @@ -4,7 +4,7 @@ -Carrier configuration with server_environment +Carrier accounts configuration with server_environment -
-

Carrier configuration with server_environment

+
+

Carrier accounts configuration with server_environment

-

Beta License: AGPL-3 OCA/server-env Translate me on Weblate Try me on Runbot

+

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

This module allows to configure carrier informations using the server_environment mechanism: you can then have different servers for the production and the test environment.

@@ -423,10 +423,10 @@

Usage

Bug Tracker

-

Bugs are tracked on GitHub Issues. +

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.

@@ -452,7 +452,9 @@

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/server-env project on GitHub.

+

Current maintainer:

+

florian-dacosta

+

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 3c691dce749354140ac76bbbc62fc57b96d71d2e Mon Sep 17 00:00:00 2001 From: OCA-git-bot Date: Mon, 14 Mar 2022 10:26:33 +0000 Subject: [PATCH 04/17] carrier_account_environment 14.0.1.0.1 --- carrier_account_environment/__manifest__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/carrier_account_environment/__manifest__.py b/carrier_account_environment/__manifest__.py index f8cf60c47e..f8b722bed7 100644 --- a/carrier_account_environment/__manifest__.py +++ b/carrier_account_environment/__manifest__.py @@ -3,7 +3,7 @@ { "name": "Carrier accounts configuration with server_environment", - "version": "14.0.1.0.0", + "version": "14.0.1.0.1", "category": "Tools", "summary": "Configure carriers with server_environment_files", "maintainers": ["florian-dacosta"], From d0b9626c86d43455814869051f2ab697d47cfc16 Mon Sep 17 00:00:00 2001 From: Florian da Costa Date: Sun, 11 Dec 2022 20:18:09 +0100 Subject: [PATCH 05/17] [16][MIG] Migrate carrier_account_environment to v16 --- carrier_account_environment/__manifest__.py | 5 ++--- carrier_account_environment/models/carrier_account.py | 1 - 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/carrier_account_environment/__manifest__.py b/carrier_account_environment/__manifest__.py index f8b722bed7..f537567614 100644 --- a/carrier_account_environment/__manifest__.py +++ b/carrier_account_environment/__manifest__.py @@ -1,9 +1,8 @@ -# Copyright 2019 David BEAL @ Akretion # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). { "name": "Carrier accounts configuration with server_environment", - "version": "14.0.1.0.1", + "version": "16.0.1.0.0", "category": "Tools", "summary": "Configure carriers with server_environment_files", "maintainers": ["florian-dacosta"], @@ -12,6 +11,6 @@ "website": "https://github.com/OCA/delivery-carrier", "depends": [ "server_environment", - "base_delivery_carrier_label", + "delivery_carrier_account", ], } diff --git a/carrier_account_environment/models/carrier_account.py b/carrier_account_environment/models/carrier_account.py index a440c1503e..5effe45a75 100644 --- a/carrier_account_environment/models/carrier_account.py +++ b/carrier_account_environment/models/carrier_account.py @@ -15,7 +15,6 @@ def _server_env_fields(self): { "account": {}, "password": {}, - "file_format": {}, } ) return carrier_fields From c340c81eaf82018c576894ace1ebf3ab87c30a05 Mon Sep 17 00:00:00 2001 From: Florian da Costa Date: Mon, 19 Jun 2023 11:46:37 +0200 Subject: [PATCH 06/17] [IMP] Add an explanation about server_environment_data_encryption as an alternative to server_environment_file in the readme --- carrier_account_environment/readme/CONFIGURE.rst | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/carrier_account_environment/readme/CONFIGURE.rst b/carrier_account_environment/readme/CONFIGURE.rst index dac6425b9c..360c71263c 100644 --- a/carrier_account_environment/readme/CONFIGURE.rst +++ b/carrier_account_environment/readme/CONFIGURE.rst @@ -28,3 +28,9 @@ Example of config file :: account = 666 password = wazaaaaa file_format = PDF + + +As an alternative of `server_environment_files`, there is also a module named `server_environment_data_encryption` +which allow to set the environement dependent values directly in the database, by the user itself. +It will be encrypted, to avoid security issues with secrets, see the documentationn of `server_environment_data_encryption` for more information. +The advantage of setting the environment dependent value directly in the database is that it does not require a developper/odoo administrator to change a carrier account. From 57c277cf02e7ffda5b5b4dbee69f6a90bb66b7fd Mon Sep 17 00:00:00 2001 From: oca-ci Date: Tue, 3 Oct 2023 12:06:35 +0000 Subject: [PATCH 07/17] [UPD] Update carrier_account_environment.pot --- .../i18n/carrier_account_environment.pot | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/carrier_account_environment/i18n/carrier_account_environment.pot b/carrier_account_environment/i18n/carrier_account_environment.pot index f539e1dc19..30a4bfc60e 100644 --- a/carrier_account_environment/i18n/carrier_account_environment.pot +++ b/carrier_account_environment/i18n/carrier_account_environment.pot @@ -4,7 +4,7 @@ # msgid "" msgstr "" -"Project-Id-Version: Odoo Server 14.0\n" +"Project-Id-Version: Odoo Server 16.0\n" "Report-Msgid-Bugs-To: \n" "Last-Translator: \n" "Language-Team: \n" @@ -18,21 +18,6 @@ msgstr "" msgid "Base account datas" msgstr "" -#. module: carrier_account_environment -#: model:ir.model.fields,field_description:carrier_account_environment.field_carrier_account__display_name -msgid "Display Name" -msgstr "" - -#. module: carrier_account_environment -#: model:ir.model.fields,field_description:carrier_account_environment.field_carrier_account__id -msgid "ID" -msgstr "" - -#. module: carrier_account_environment -#: model:ir.model.fields,field_description:carrier_account_environment.field_carrier_account____last_update -msgid "Last Modified on" -msgstr "" - #. module: carrier_account_environment #: model:ir.model.fields,field_description:carrier_account_environment.field_carrier_account__server_env_defaults msgid "Server Env Defaults" From bcef4d6c47c6bc54f8139319918b288122377486 Mon Sep 17 00:00:00 2001 From: OCA-git-bot Date: Tue, 3 Oct 2023 12:11:15 +0000 Subject: [PATCH 08/17] [BOT] post-merge updates --- carrier_account_environment/README.rst | 29 +++++++---- .../static/description/index.html | 52 +++++++++++-------- 2 files changed, 48 insertions(+), 33 deletions(-) diff --git a/carrier_account_environment/README.rst b/carrier_account_environment/README.rst index b761e1094a..0c19ffd41c 100644 --- a/carrier_account_environment/README.rst +++ b/carrier_account_environment/README.rst @@ -2,10 +2,13 @@ Carrier accounts configuration with server_environment ====================================================== -.. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +.. + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! !! This file is generated by oca-gen-addon-readme !! !! changes will be overwritten. !! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + !! source digest: sha256:15c18b3a9f9749e2a79ca683e39b3f1d2dde711298fd126fe7aab57058705e88 + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! .. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png :target: https://odoo-community.org/page/development-status @@ -14,16 +17,16 @@ Carrier accounts configuration with server_environment :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/carrier_account_environment + :target: https://github.com/OCA/delivery-carrier/tree/16.0/carrier_account_environment :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-carrier_account_environment + :target: https://translation.odoo-community.org/projects/delivery-carrier-16-0/delivery-carrier-16-0-carrier_account_environment :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=16.0 + :alt: Try me on Runboat -|badge1| |badge2| |badge3| |badge4| |badge5| +|badge1| |badge2| |badge3| |badge4| |badge5| This module allows to configure carrier informations using the `server_environment` mechanism: you can then have different @@ -68,6 +71,12 @@ Example of config file :: password = wazaaaaa file_format = PDF + +As an alternative of `server_environment_files`, there is also a module named `server_environment_data_encryption` +which allow to set the environement dependent values directly in the database, by the user itself. +It will be encrypted, to avoid security issues with secrets, see the documentationn of `server_environment_data_encryption` for more information. +The advantage of setting the environment dependent value directly in the database is that it does not require a developper/odoo administrator to change a carrier account. + Usage ===== @@ -80,8 +89,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. @@ -121,6 +130,6 @@ Current `maintainer `__: |maintainer-florian-dacosta| -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/carrier_account_environment/static/description/index.html b/carrier_account_environment/static/description/index.html index 72819eca61..8d93c69d4a 100644 --- a/carrier_account_environment/static/description/index.html +++ b/carrier_account_environment/static/description/index.html @@ -1,20 +1,20 @@ - + - + Carrier accounts configuration with server_environment