From 905884beb3ab120016c477e6aa03c9a85b4d58f1 Mon Sep 17 00:00:00 2001 From: Aungkokolin1997 Date: Fri, 9 Jun 2023 15:17:13 +0630 Subject: [PATCH] fix pre-commit --- .pre-commit-config.yaml | 1 - base_country_state_translatable/README.rst | 162 ++-- base_country_state_translatable/__init__.py | 2 +- .../__manifest__.py | 28 +- base_country_state_translatable/i18n/ca.po | 70 +- base_country_state_translatable/i18n/da.po | 70 +- base_country_state_translatable/i18n/de.po | 70 +- base_country_state_translatable/i18n/es.po | 76 +- base_country_state_translatable/i18n/fr.po | 70 +- base_country_state_translatable/i18n/hr.po | 68 +- base_country_state_translatable/i18n/hr_HR.po | 74 +- base_country_state_translatable/i18n/it.po | 70 +- base_country_state_translatable/i18n/pt_BR.po | 78 +- base_country_state_translatable/i18n/sl.po | 72 +- .../models/__init__.py | 2 +- .../models/res_country.py | 20 +- .../readme/CONTRIBUTORS.rst | 8 +- .../readme/DESCRIPTION.rst | 2 +- .../readme/USAGE.rst | 2 +- mail_outbound_static/README.rst | 226 +++--- mail_outbound_static/__init__.py | 8 +- mail_outbound_static/__manifest__.py | 32 +- mail_outbound_static/i18n/es.po | 146 ++-- mail_outbound_static/models/__init__.py | 8 +- mail_outbound_static/models/ir_mail_server.py | 302 +++---- mail_outbound_static/readme/CONTRIBUTORS.rst | 18 +- mail_outbound_static/readme/DESCRIPTION.rst | 48 +- mail_outbound_static/readme/USAGE.rst | 6 +- mail_outbound_static/tests/__init__.py | 8 +- mail_outbound_static/tests/test.msg | 140 ++-- .../tests/test_ir_mail_server.py | 738 +++++++++--------- .../views/ir_mail_server_view.xml | 40 +- purchase_analytic/views/purchase_views.xml | 5 +- purchase_order_owner/models/purchase_order.py | 1 + .../views/purchase_order_views.xml | 14 +- purchase_report_shipping_address/README.rst | 158 ++-- purchase_report_shipping_address/__init__.py | 2 +- .../__manifest__.py | 34 +- .../models/__init__.py | 2 +- .../models/stock_warehouse.py | 24 +- .../readme/CONFIGURE.rst | 6 +- .../readme/DESCRIPTION.rst | 10 +- .../reports/purchase_order_templates.xml | 52 +- .../reports/purchase_quotation_templates.xml | 52 +- .../views/stock_warehouse_views.xml | 26 +- .../README.rst | 146 ++-- .../__init__.py | 2 +- .../__manifest__.py | 24 +- .../models/__init__.py | 2 +- .../models/res_company.py | 26 +- .../readme/DESCRIPTION.rst | 12 +- report_csv/models/ir_report.py | 6 +- report_csv/report/report_csv.py | 4 +- report_csv/views/ir_actions_views.xml | 14 +- stock_owner_restriction/models/stock_move.py | 5 +- stock_picking_accounting_date/__manifest__.py | 2 +- stock_split_picking/models/stock_picking.py | 4 +- web_widget_open_tab/models/ir_ui_view.py | 2 +- 58 files changed, 1656 insertions(+), 1644 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index ffa66ce0..36be2f76 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,4 +1,3 @@ - exclude: | (?x) # NOT INSTALLABLE ADDONS diff --git a/base_country_state_translatable/README.rst b/base_country_state_translatable/README.rst index ecd9d484..73e7828a 100644 --- a/base_country_state_translatable/README.rst +++ b/base_country_state_translatable/README.rst @@ -1,81 +1,81 @@ -======================== -Translate Country States -======================== - -.. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! - !! 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%2Fpartner--contact-lightgray.png?logo=github - :target: https://github.com/OCA/partner-contact/tree/16.0/base_country_state_translatable - :alt: OCA/partner-contact -.. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png - :target: https://translation.odoo-community.org/projects/partner-contact-16-0/partner-contact-16-0-base_country_state_translatable - :alt: Translate me on Weblate -.. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png - :target: https://runbot.odoo-community.org/runbot/134/16.0 - :alt: Try me on Runbot - -|badge1| |badge2| |badge3| |badge4| |badge5| - -This module allows to translate the country states names. - -**Table of contents** - -.. contents:: - :local: - -Usage -===== - -Inherit this module in your l10n_xx_country_states Module and translate the states names. - -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 -~~~~~~~ - -* initOS GmbH - -Contributors -~~~~~~~~~~~~ - -* Rami Alwafaie -* Dhara Solanki -* Numigi (tm) and all its contributors (https://bit.ly/numigiens) -* Moaad Bourhim - -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/partner-contact `_ project on GitHub. - -You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute. +======================== +Translate Country States +======================== + +.. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + !! 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%2Fpartner--contact-lightgray.png?logo=github + :target: https://github.com/OCA/partner-contact/tree/16.0/base_country_state_translatable + :alt: OCA/partner-contact +.. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png + :target: https://translation.odoo-community.org/projects/partner-contact-16-0/partner-contact-16-0-base_country_state_translatable + :alt: Translate me on Weblate +.. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png + :target: https://runbot.odoo-community.org/runbot/134/16.0 + :alt: Try me on Runbot + +|badge1| |badge2| |badge3| |badge4| |badge5| + +This module allows to translate the country states names. + +**Table of contents** + +.. contents:: + :local: + +Usage +===== + +Inherit this module in your l10n_xx_country_states Module and translate the states names. + +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 +~~~~~~~ + +* initOS GmbH + +Contributors +~~~~~~~~~~~~ + +* Rami Alwafaie +* Dhara Solanki +* Numigi (tm) and all its contributors (https://bit.ly/numigiens) +* Moaad Bourhim + +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/partner-contact `_ project on GitHub. + +You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute. diff --git a/base_country_state_translatable/__init__.py b/base_country_state_translatable/__init__.py index 7f0969ed..0650744f 100644 --- a/base_country_state_translatable/__init__.py +++ b/base_country_state_translatable/__init__.py @@ -1 +1 @@ -from . import models +from . import models diff --git a/base_country_state_translatable/__manifest__.py b/base_country_state_translatable/__manifest__.py index a2c37370..0ff0007a 100644 --- a/base_country_state_translatable/__manifest__.py +++ b/base_country_state_translatable/__manifest__.py @@ -1,14 +1,14 @@ -# Copyright 2017 initOS GmbH -# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). - -{ - "name": "Translate Country States", - "version": "16.0.1.0.0", - "depends": ["base"], - "website": "https://github.com/OCA/partner-contact", - "summary": "Translate Country States", - "author": "initOS GmbH, Odoo Community Association (OCA)", - "category": "Localization", - "license": "AGPL-3", - "installable": True, -} +# Copyright 2017 initOS GmbH +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). + +{ + "name": "Translate Country States", + "version": "16.0.1.0.0", + "depends": ["base"], + "website": "https://github.com/OCA/partner-contact", + "summary": "Translate Country States", + "author": "initOS GmbH, Odoo Community Association (OCA)", + "category": "Localization", + "license": "AGPL-3", + "installable": True, +} diff --git a/base_country_state_translatable/i18n/ca.po b/base_country_state_translatable/i18n/ca.po index fe2d5bbf..b0953bc1 100644 --- a/base_country_state_translatable/i18n/ca.po +++ b/base_country_state_translatable/i18n/ca.po @@ -1,35 +1,35 @@ -# Translation of Odoo Server. -# This file contains the translation of the following modules: -# * base_country_state_translatable -# -msgid "" -msgstr "" -"Project-Id-Version: Odoo Server 15.0\n" -"Report-Msgid-Bugs-To: \n" -"PO-Revision-Date: 2022-04-22 12:05+0000\n" -"Last-Translator: pablontura \n" -"Language-Team: none\n" -"Language: ca\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: \n" -"Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Generator: Weblate 4.3.2\n" - -#. module: base_country_state_translatable -#: model:ir.model.fields,help:base_country_state_translatable.field_res_country_state__name -msgid "" -"Administrative divisions of a country. E.g. Fed. State, Departement, Canton" -msgstr "" -"Divisions administratives d'un país. Per exemple. Fed. Estat, Departament, " -"Cantó" - -#. module: base_country_state_translatable -#: model:ir.model,name:base_country_state_translatable.model_res_country_state -msgid "Country state" -msgstr "País estat" - -#. module: base_country_state_translatable -#: model:ir.model.fields,field_description:base_country_state_translatable.field_res_country_state__name -msgid "State Name" -msgstr "Nom de l'estat" +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * base_country_state_translatable +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 15.0\n" +"Report-Msgid-Bugs-To: \n" +"PO-Revision-Date: 2022-04-22 12:05+0000\n" +"Last-Translator: pablontura \n" +"Language-Team: none\n" +"Language: ca\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Weblate 4.3.2\n" + +#. module: base_country_state_translatable +#: model:ir.model.fields,help:base_country_state_translatable.field_res_country_state__name +msgid "" +"Administrative divisions of a country. E.g. Fed. State, Departement, Canton" +msgstr "" +"Divisions administratives d'un país. Per exemple. Fed. Estat, Departament, " +"Cantó" + +#. module: base_country_state_translatable +#: model:ir.model,name:base_country_state_translatable.model_res_country_state +msgid "Country state" +msgstr "País estat" + +#. module: base_country_state_translatable +#: model:ir.model.fields,field_description:base_country_state_translatable.field_res_country_state__name +msgid "State Name" +msgstr "Nom de l'estat" diff --git a/base_country_state_translatable/i18n/da.po b/base_country_state_translatable/i18n/da.po index 308e61d1..1ee6545e 100644 --- a/base_country_state_translatable/i18n/da.po +++ b/base_country_state_translatable/i18n/da.po @@ -1,35 +1,35 @@ -# Translation of Odoo Server. -# This file contains the translation of the following modules: -# * base_country_state_translatable -# -# Translators: -# OCA Transbot , 2017 -msgid "" -msgstr "" -"Project-Id-Version: Odoo Server 10.0\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-11-21 01:48+0000\n" -"PO-Revision-Date: 2017-11-21 01:48+0000\n" -"Last-Translator: OCA Transbot , 2017\n" -"Language-Team: Danish (https://www.transifex.com/oca/teams/23907/da/)\n" -"Language: da\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: \n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" - -#. module: base_country_state_translatable -#: model:ir.model.fields,help:base_country_state_translatable.field_res_country_state__name -msgid "" -"Administrative divisions of a country. E.g. Fed. State, Departement, Canton" -msgstr "" - -#. module: base_country_state_translatable -#: model:ir.model,name:base_country_state_translatable.model_res_country_state -msgid "Country state" -msgstr "Delstat/region" - -#. module: base_country_state_translatable -#: model:ir.model.fields,field_description:base_country_state_translatable.field_res_country_state__name -msgid "State Name" -msgstr "" +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * base_country_state_translatable +# +# Translators: +# OCA Transbot , 2017 +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 10.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-11-21 01:48+0000\n" +"PO-Revision-Date: 2017-11-21 01:48+0000\n" +"Last-Translator: OCA Transbot , 2017\n" +"Language-Team: Danish (https://www.transifex.com/oca/teams/23907/da/)\n" +"Language: da\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#. module: base_country_state_translatable +#: model:ir.model.fields,help:base_country_state_translatable.field_res_country_state__name +msgid "" +"Administrative divisions of a country. E.g. Fed. State, Departement, Canton" +msgstr "" + +#. module: base_country_state_translatable +#: model:ir.model,name:base_country_state_translatable.model_res_country_state +msgid "Country state" +msgstr "Delstat/region" + +#. module: base_country_state_translatable +#: model:ir.model.fields,field_description:base_country_state_translatable.field_res_country_state__name +msgid "State Name" +msgstr "" diff --git a/base_country_state_translatable/i18n/de.po b/base_country_state_translatable/i18n/de.po index 23d6e7e7..e27ec33f 100644 --- a/base_country_state_translatable/i18n/de.po +++ b/base_country_state_translatable/i18n/de.po @@ -1,35 +1,35 @@ -# Translation of Odoo Server. -# This file contains the translation of the following modules: -# * base_country_state_translatable -# -# Translators: -# OCA Transbot , 2017 -msgid "" -msgstr "" -"Project-Id-Version: Odoo Server 10.0\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-11-21 01:48+0000\n" -"PO-Revision-Date: 2017-11-21 01:48+0000\n" -"Last-Translator: OCA Transbot , 2017\n" -"Language-Team: German (https://www.transifex.com/oca/teams/23907/de/)\n" -"Language: de\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: \n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" - -#. module: base_country_state_translatable -#: model:ir.model.fields,help:base_country_state_translatable.field_res_country_state__name -msgid "" -"Administrative divisions of a country. E.g. Fed. State, Departement, Canton" -msgstr "" - -#. module: base_country_state_translatable -#: model:ir.model,name:base_country_state_translatable.model_res_country_state -msgid "Country state" -msgstr "Bundesland" - -#. module: base_country_state_translatable -#: model:ir.model.fields,field_description:base_country_state_translatable.field_res_country_state__name -msgid "State Name" -msgstr "" +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * base_country_state_translatable +# +# Translators: +# OCA Transbot , 2017 +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 10.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-11-21 01:48+0000\n" +"PO-Revision-Date: 2017-11-21 01:48+0000\n" +"Last-Translator: OCA Transbot , 2017\n" +"Language-Team: German (https://www.transifex.com/oca/teams/23907/de/)\n" +"Language: de\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#. module: base_country_state_translatable +#: model:ir.model.fields,help:base_country_state_translatable.field_res_country_state__name +msgid "" +"Administrative divisions of a country. E.g. Fed. State, Departement, Canton" +msgstr "" + +#. module: base_country_state_translatable +#: model:ir.model,name:base_country_state_translatable.model_res_country_state +msgid "Country state" +msgstr "Bundesland" + +#. module: base_country_state_translatable +#: model:ir.model.fields,field_description:base_country_state_translatable.field_res_country_state__name +msgid "State Name" +msgstr "" diff --git a/base_country_state_translatable/i18n/es.po b/base_country_state_translatable/i18n/es.po index 44049982..1c0ef567 100644 --- a/base_country_state_translatable/i18n/es.po +++ b/base_country_state_translatable/i18n/es.po @@ -1,38 +1,38 @@ -# Translation of Odoo Server. -# This file contains the translation of the following modules: -# * base_country_state_translatable -# -# Translators: -# OCA Transbot , 2017 -msgid "" -msgstr "" -"Project-Id-Version: Odoo Server 10.0\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-11-21 01:48+0000\n" -"PO-Revision-Date: 2021-07-08 14:48+0000\n" -"Last-Translator: Esteka Digital \n" -"Language-Team: Spanish (https://www.transifex.com/oca/teams/23907/es/)\n" -"Language: es\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: \n" -"Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Generator: Weblate 4.3.2\n" - -#. module: base_country_state_translatable -#: model:ir.model.fields,help:base_country_state_translatable.field_res_country_state__name -msgid "" -"Administrative divisions of a country. E.g. Fed. State, Departement, Canton" -msgstr "" -"Divisiones administrativas de un país. Por ejemplo Provincia, Departamento, " -"Cantón" - -#. module: base_country_state_translatable -#: model:ir.model,name:base_country_state_translatable.model_res_country_state -msgid "Country state" -msgstr "Provincia" - -#. module: base_country_state_translatable -#: model:ir.model.fields,field_description:base_country_state_translatable.field_res_country_state__name -msgid "State Name" -msgstr "Nombre de la provincia" +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * base_country_state_translatable +# +# Translators: +# OCA Transbot , 2017 +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 10.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-11-21 01:48+0000\n" +"PO-Revision-Date: 2021-07-08 14:48+0000\n" +"Last-Translator: Esteka Digital \n" +"Language-Team: Spanish (https://www.transifex.com/oca/teams/23907/es/)\n" +"Language: es\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Weblate 4.3.2\n" + +#. module: base_country_state_translatable +#: model:ir.model.fields,help:base_country_state_translatable.field_res_country_state__name +msgid "" +"Administrative divisions of a country. E.g. Fed. State, Departement, Canton" +msgstr "" +"Divisiones administrativas de un país. Por ejemplo Provincia, Departamento, " +"Cantón" + +#. module: base_country_state_translatable +#: model:ir.model,name:base_country_state_translatable.model_res_country_state +msgid "Country state" +msgstr "Provincia" + +#. module: base_country_state_translatable +#: model:ir.model.fields,field_description:base_country_state_translatable.field_res_country_state__name +msgid "State Name" +msgstr "Nombre de la provincia" diff --git a/base_country_state_translatable/i18n/fr.po b/base_country_state_translatable/i18n/fr.po index 81ed1339..357f80b7 100644 --- a/base_country_state_translatable/i18n/fr.po +++ b/base_country_state_translatable/i18n/fr.po @@ -1,35 +1,35 @@ -# Translation of Odoo Server. -# This file contains the translation of the following modules: -# * base_country_state_translatable -# -# Translators: -# Quentin THEURET , 2018 -msgid "" -msgstr "" -"Project-Id-Version: Odoo Server 11.0\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-02-28 03:45+0000\n" -"PO-Revision-Date: 2018-02-28 03:45+0000\n" -"Last-Translator: Quentin THEURET , 2018\n" -"Language-Team: French (https://www.transifex.com/oca/teams/23907/fr/)\n" -"Language: fr\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: \n" -"Plural-Forms: nplurals=2; plural=(n > 1);\n" - -#. module: base_country_state_translatable -#: model:ir.model.fields,help:base_country_state_translatable.field_res_country_state__name -msgid "" -"Administrative divisions of a country. E.g. Fed. State, Departement, Canton" -msgstr "" - -#. module: base_country_state_translatable -#: model:ir.model,name:base_country_state_translatable.model_res_country_state -msgid "Country state" -msgstr "État" - -#. module: base_country_state_translatable -#: model:ir.model.fields,field_description:base_country_state_translatable.field_res_country_state__name -msgid "State Name" -msgstr "" +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * base_country_state_translatable +# +# Translators: +# Quentin THEURET , 2018 +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 11.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2018-02-28 03:45+0000\n" +"PO-Revision-Date: 2018-02-28 03:45+0000\n" +"Last-Translator: Quentin THEURET , 2018\n" +"Language-Team: French (https://www.transifex.com/oca/teams/23907/fr/)\n" +"Language: fr\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Plural-Forms: nplurals=2; plural=(n > 1);\n" + +#. module: base_country_state_translatable +#: model:ir.model.fields,help:base_country_state_translatable.field_res_country_state__name +msgid "" +"Administrative divisions of a country. E.g. Fed. State, Departement, Canton" +msgstr "" + +#. module: base_country_state_translatable +#: model:ir.model,name:base_country_state_translatable.model_res_country_state +msgid "Country state" +msgstr "État" + +#. module: base_country_state_translatable +#: model:ir.model.fields,field_description:base_country_state_translatable.field_res_country_state__name +msgid "State Name" +msgstr "" diff --git a/base_country_state_translatable/i18n/hr.po b/base_country_state_translatable/i18n/hr.po index 5e3cc9df..43fc6224 100644 --- a/base_country_state_translatable/i18n/hr.po +++ b/base_country_state_translatable/i18n/hr.po @@ -1,34 +1,34 @@ -# Translation of Odoo Server. -# This file contains the translation of the following modules: -# * base_country_state_translatable -# -msgid "" -msgstr "" -"Project-Id-Version: Odoo Server 12.0\n" -"Report-Msgid-Bugs-To: \n" -"PO-Revision-Date: 2023-01-31 05:56+0000\n" -"Last-Translator: Bole \n" -"Language-Team: none\n" -"Language: hr\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: \n" -"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" -"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" -"X-Generator: Weblate 4.14.1\n" - -#. module: base_country_state_translatable -#: model:ir.model.fields,help:base_country_state_translatable.field_res_country_state__name -msgid "" -"Administrative divisions of a country. E.g. Fed. State, Departement, Canton" -msgstr "Administrativna jedinica države, npr. Županija, Kanton isl" - -#. module: base_country_state_translatable -#: model:ir.model,name:base_country_state_translatable.model_res_country_state -msgid "Country state" -msgstr "Županija" - -#. module: base_country_state_translatable -#: model:ir.model.fields,field_description:base_country_state_translatable.field_res_country_state__name -msgid "State Name" -msgstr "Naziv županije" +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * base_country_state_translatable +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 12.0\n" +"Report-Msgid-Bugs-To: \n" +"PO-Revision-Date: 2023-01-31 05:56+0000\n" +"Last-Translator: Bole \n" +"Language-Team: none\n" +"Language: hr\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" +"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" +"X-Generator: Weblate 4.14.1\n" + +#. module: base_country_state_translatable +#: model:ir.model.fields,help:base_country_state_translatable.field_res_country_state__name +msgid "" +"Administrative divisions of a country. E.g. Fed. State, Departement, Canton" +msgstr "Administrativna jedinica države, npr. Županija, Kanton isl" + +#. module: base_country_state_translatable +#: model:ir.model,name:base_country_state_translatable.model_res_country_state +msgid "Country state" +msgstr "Županija" + +#. module: base_country_state_translatable +#: model:ir.model.fields,field_description:base_country_state_translatable.field_res_country_state__name +msgid "State Name" +msgstr "Naziv županije" diff --git a/base_country_state_translatable/i18n/hr_HR.po b/base_country_state_translatable/i18n/hr_HR.po index 161a675f..4da920f2 100644 --- a/base_country_state_translatable/i18n/hr_HR.po +++ b/base_country_state_translatable/i18n/hr_HR.po @@ -1,37 +1,37 @@ -# Translation of Odoo Server. -# This file contains the translation of the following modules: -# * base_country_state_translatable -# -# Translators: -# OCA Transbot , 2017 -msgid "" -msgstr "" -"Project-Id-Version: Odoo Server 10.0\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-11-21 01:48+0000\n" -"PO-Revision-Date: 2017-11-21 01:48+0000\n" -"Last-Translator: OCA Transbot , 2017\n" -"Language-Team: Croatian (Croatia) (https://www.transifex.com/oca/teams/23907/" -"hr_HR/)\n" -"Language: hr_HR\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: \n" -"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" -"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" - -#. module: base_country_state_translatable -#: model:ir.model.fields,help:base_country_state_translatable.field_res_country_state__name -msgid "" -"Administrative divisions of a country. E.g. Fed. State, Departement, Canton" -msgstr "" - -#. module: base_country_state_translatable -#: model:ir.model,name:base_country_state_translatable.model_res_country_state -msgid "Country state" -msgstr "Oblast/Županija" - -#. module: base_country_state_translatable -#: model:ir.model.fields,field_description:base_country_state_translatable.field_res_country_state__name -msgid "State Name" -msgstr "" +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * base_country_state_translatable +# +# Translators: +# OCA Transbot , 2017 +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 10.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-11-21 01:48+0000\n" +"PO-Revision-Date: 2017-11-21 01:48+0000\n" +"Last-Translator: OCA Transbot , 2017\n" +"Language-Team: Croatian (Croatia) (https://www.transifex.com/oca/teams/23907/" +"hr_HR/)\n" +"Language: hr_HR\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" +"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" + +#. module: base_country_state_translatable +#: model:ir.model.fields,help:base_country_state_translatable.field_res_country_state__name +msgid "" +"Administrative divisions of a country. E.g. Fed. State, Departement, Canton" +msgstr "" + +#. module: base_country_state_translatable +#: model:ir.model,name:base_country_state_translatable.model_res_country_state +msgid "Country state" +msgstr "Oblast/Županija" + +#. module: base_country_state_translatable +#: model:ir.model.fields,field_description:base_country_state_translatable.field_res_country_state__name +msgid "State Name" +msgstr "" diff --git a/base_country_state_translatable/i18n/it.po b/base_country_state_translatable/i18n/it.po index dc2ecdd2..3379eae8 100644 --- a/base_country_state_translatable/i18n/it.po +++ b/base_country_state_translatable/i18n/it.po @@ -1,35 +1,35 @@ -# Translation of Odoo Server. -# This file contains the translation of the following modules: -# * base_country_state_translatable -# -# Translators: -# OCA Transbot , 2017 -msgid "" -msgstr "" -"Project-Id-Version: Odoo Server 10.0\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-11-21 01:48+0000\n" -"PO-Revision-Date: 2017-11-21 01:48+0000\n" -"Last-Translator: OCA Transbot , 2017\n" -"Language-Team: Italian (https://www.transifex.com/oca/teams/23907/it/)\n" -"Language: it\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: \n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" - -#. module: base_country_state_translatable -#: model:ir.model.fields,help:base_country_state_translatable.field_res_country_state__name -msgid "" -"Administrative divisions of a country. E.g. Fed. State, Departement, Canton" -msgstr "" - -#. module: base_country_state_translatable -#: model:ir.model,name:base_country_state_translatable.model_res_country_state -msgid "Country state" -msgstr "Provincia Paese" - -#. module: base_country_state_translatable -#: model:ir.model.fields,field_description:base_country_state_translatable.field_res_country_state__name -msgid "State Name" -msgstr "" +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * base_country_state_translatable +# +# Translators: +# OCA Transbot , 2017 +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 10.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-11-21 01:48+0000\n" +"PO-Revision-Date: 2017-11-21 01:48+0000\n" +"Last-Translator: OCA Transbot , 2017\n" +"Language-Team: Italian (https://www.transifex.com/oca/teams/23907/it/)\n" +"Language: it\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#. module: base_country_state_translatable +#: model:ir.model.fields,help:base_country_state_translatable.field_res_country_state__name +msgid "" +"Administrative divisions of a country. E.g. Fed. State, Departement, Canton" +msgstr "" + +#. module: base_country_state_translatable +#: model:ir.model,name:base_country_state_translatable.model_res_country_state +msgid "Country state" +msgstr "Provincia Paese" + +#. module: base_country_state_translatable +#: model:ir.model.fields,field_description:base_country_state_translatable.field_res_country_state__name +msgid "State Name" +msgstr "" diff --git a/base_country_state_translatable/i18n/pt_BR.po b/base_country_state_translatable/i18n/pt_BR.po index 4abdf924..d484c51a 100644 --- a/base_country_state_translatable/i18n/pt_BR.po +++ b/base_country_state_translatable/i18n/pt_BR.po @@ -1,39 +1,39 @@ -# Translation of Odoo Server. -# This file contains the translation of the following modules: -# * base_country_state_translatable -# -# Translators: -# OCA Transbot , 2017 -msgid "" -msgstr "" -"Project-Id-Version: Odoo Server 10.0\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-11-21 01:48+0000\n" -"PO-Revision-Date: 2019-09-23 14:24+0000\n" -"Last-Translator: Rodrigo Macedo \n" -"Language-Team: Portuguese (Brazil) (https://www.transifex.com/oca/" -"teams/23907/pt_BR/)\n" -"Language: pt_BR\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: \n" -"Plural-Forms: nplurals=2; plural=n > 1;\n" -"X-Generator: Weblate 3.8\n" - -#. module: base_country_state_translatable -#: model:ir.model.fields,help:base_country_state_translatable.field_res_country_state__name -msgid "" -"Administrative divisions of a country. E.g. Fed. State, Departement, Canton" -msgstr "" -"Divisões administrativas de um país. Por exemplo. Fed. Estado, Departamento, " -"Distrito" - -#. module: base_country_state_translatable -#: model:ir.model,name:base_country_state_translatable.model_res_country_state -msgid "Country state" -msgstr "Estado" - -#. module: base_country_state_translatable -#: model:ir.model.fields,field_description:base_country_state_translatable.field_res_country_state__name -msgid "State Name" -msgstr "Nome do Estado" +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * base_country_state_translatable +# +# Translators: +# OCA Transbot , 2017 +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 10.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-11-21 01:48+0000\n" +"PO-Revision-Date: 2019-09-23 14:24+0000\n" +"Last-Translator: Rodrigo Macedo \n" +"Language-Team: Portuguese (Brazil) (https://www.transifex.com/oca/" +"teams/23907/pt_BR/)\n" +"Language: pt_BR\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Plural-Forms: nplurals=2; plural=n > 1;\n" +"X-Generator: Weblate 3.8\n" + +#. module: base_country_state_translatable +#: model:ir.model.fields,help:base_country_state_translatable.field_res_country_state__name +msgid "" +"Administrative divisions of a country. E.g. Fed. State, Departement, Canton" +msgstr "" +"Divisões administrativas de um país. Por exemplo. Fed. Estado, Departamento, " +"Distrito" + +#. module: base_country_state_translatable +#: model:ir.model,name:base_country_state_translatable.model_res_country_state +msgid "Country state" +msgstr "Estado" + +#. module: base_country_state_translatable +#: model:ir.model.fields,field_description:base_country_state_translatable.field_res_country_state__name +msgid "State Name" +msgstr "Nome do Estado" diff --git a/base_country_state_translatable/i18n/sl.po b/base_country_state_translatable/i18n/sl.po index 73ccd14a..c8cdaa18 100644 --- a/base_country_state_translatable/i18n/sl.po +++ b/base_country_state_translatable/i18n/sl.po @@ -1,36 +1,36 @@ -# Translation of Odoo Server. -# This file contains the translation of the following modules: -# * base_country_state_translatable -# -# Translators: -# OCA Transbot , 2017 -msgid "" -msgstr "" -"Project-Id-Version: Odoo Server 10.0\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-11-21 01:48+0000\n" -"PO-Revision-Date: 2017-11-21 01:48+0000\n" -"Last-Translator: OCA Transbot , 2017\n" -"Language-Team: Slovenian (https://www.transifex.com/oca/teams/23907/sl/)\n" -"Language: sl\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: \n" -"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n" -"%100==4 ? 2 : 3);\n" - -#. module: base_country_state_translatable -#: model:ir.model.fields,help:base_country_state_translatable.field_res_country_state__name -msgid "" -"Administrative divisions of a country. E.g. Fed. State, Departement, Canton" -msgstr "" - -#. module: base_country_state_translatable -#: model:ir.model,name:base_country_state_translatable.model_res_country_state -msgid "Country state" -msgstr "Zvezna država" - -#. module: base_country_state_translatable -#: model:ir.model.fields,field_description:base_country_state_translatable.field_res_country_state__name -msgid "State Name" -msgstr "" +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * base_country_state_translatable +# +# Translators: +# OCA Transbot , 2017 +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 10.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-11-21 01:48+0000\n" +"PO-Revision-Date: 2017-11-21 01:48+0000\n" +"Last-Translator: OCA Transbot , 2017\n" +"Language-Team: Slovenian (https://www.transifex.com/oca/teams/23907/sl/)\n" +"Language: sl\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n" +"%100==4 ? 2 : 3);\n" + +#. module: base_country_state_translatable +#: model:ir.model.fields,help:base_country_state_translatable.field_res_country_state__name +msgid "" +"Administrative divisions of a country. E.g. Fed. State, Departement, Canton" +msgstr "" + +#. module: base_country_state_translatable +#: model:ir.model,name:base_country_state_translatable.model_res_country_state +msgid "Country state" +msgstr "Zvezna država" + +#. module: base_country_state_translatable +#: model:ir.model.fields,field_description:base_country_state_translatable.field_res_country_state__name +msgid "State Name" +msgstr "" diff --git a/base_country_state_translatable/models/__init__.py b/base_country_state_translatable/models/__init__.py index 2be8633e..11573766 100644 --- a/base_country_state_translatable/models/__init__.py +++ b/base_country_state_translatable/models/__init__.py @@ -1 +1 @@ -from . import res_country +from . import res_country diff --git a/base_country_state_translatable/models/res_country.py b/base_country_state_translatable/models/res_country.py index c3fced44..01b7cced 100644 --- a/base_country_state_translatable/models/res_country.py +++ b/base_country_state_translatable/models/res_country.py @@ -1,10 +1,10 @@ -# Copyright 2017 initOS GmbH -# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). - -from odoo import fields, models - - -class CountryState(models.Model): - _inherit = "res.country.state" - - name = fields.Char(translate=True) +# Copyright 2017 initOS GmbH +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). + +from odoo import fields, models + + +class CountryState(models.Model): + _inherit = "res.country.state" + + name = fields.Char(translate=True) diff --git a/base_country_state_translatable/readme/CONTRIBUTORS.rst b/base_country_state_translatable/readme/CONTRIBUTORS.rst index 87a21655..7750ce9d 100644 --- a/base_country_state_translatable/readme/CONTRIBUTORS.rst +++ b/base_country_state_translatable/readme/CONTRIBUTORS.rst @@ -1,4 +1,4 @@ -* Rami Alwafaie -* Dhara Solanki -* Numigi (tm) and all its contributors (https://bit.ly/numigiens) -* Moaad Bourhim +* Rami Alwafaie +* Dhara Solanki +* Numigi (tm) and all its contributors (https://bit.ly/numigiens) +* Moaad Bourhim diff --git a/base_country_state_translatable/readme/DESCRIPTION.rst b/base_country_state_translatable/readme/DESCRIPTION.rst index 24a5e37f..1a641094 100644 --- a/base_country_state_translatable/readme/DESCRIPTION.rst +++ b/base_country_state_translatable/readme/DESCRIPTION.rst @@ -1 +1 @@ -This module allows to translate the country states names. +This module allows to translate the country states names. diff --git a/base_country_state_translatable/readme/USAGE.rst b/base_country_state_translatable/readme/USAGE.rst index b02f469b..6b012bbf 100644 --- a/base_country_state_translatable/readme/USAGE.rst +++ b/base_country_state_translatable/readme/USAGE.rst @@ -1 +1 @@ -Inherit this module in your l10n_xx_country_states Module and translate the states names. +Inherit this module in your l10n_xx_country_states Module and translate the states names. diff --git a/mail_outbound_static/README.rst b/mail_outbound_static/README.rst index c575b94e..1bd2d055 100644 --- a/mail_outbound_static/README.rst +++ b/mail_outbound_static/README.rst @@ -1,113 +1,113 @@ -==================== -Mail Outbound Static -==================== - -.. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! - !! 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-LGPL--3-blue.png - :target: http://www.gnu.org/licenses/lgpl-3.0-standalone.html - :alt: License: LGPL-3 -.. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fsocial-lightgray.png?logo=github - :target: https://github.com/OCA/social/tree/16.0/mail_outbound_static - :alt: OCA/social -.. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png - :target: https://translation.odoo-community.org/projects/social-16-0/social-16-0-mail_outbound_static - :alt: Translate me on Weblate -.. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png - :target: https://runbot.odoo-community.org/runbot/205/16.0 - :alt: Try me on Runbot - -|badge1| |badge2| |badge3| |badge4| |badge5| - -This module brings Odoo outbound emails in to strict compliance with RFC-2822 -by allowing for a dynamically configured From header, with the sender's e-mail -being appended into the proper Sender header instead. To accomplish this we: - -* Add a domain whitelist field in the mail server model. This one represent an - allowed Domains list separated by commas. If there is not given SMTP server - it will let us to search the proper mail server to be used to send the messages - where the message 'From' email domain match with the domain whitelist. If - there is not mail server that matches then will use the default mail server to - send the message. - -* Add a Email From field that will let us to email from a specific address taking - into account this conditions: - - 1) If the sender domain match with the domain whitelist then the original - message's 'From' will remain as it is and will not be changed because the - mail server is able to send in the name of the sender domain. - - 2) If the original message's 'From' does not match with the domain whitelist - then the email From is replaced with the Email From field value. - -* Add compatibility to define the smtp information in Odoo config file. Both - smtp_from and smtp_whitelist_domain values will be used if there is not mail - server configured in the system. - -**Table of contents** - -.. contents:: - :local: - -Usage -===== - -* Navigate to an Outbound Email Server -* Set the `Email From` option to an email address -* Set the `Domain Whitelist` option with the domain whitelist - -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 -~~~~~~~ - -* brain-tec AG -* LasLabs -* Adhoc SA - -Contributors -~~~~~~~~~~~~ - -* Frédéric Garbely -* Dave Lasley -* Lorenzo Battistini -* Pierre Pizzetta -* Katherine Zaoral -* Juan José Scarafía -* `Quartile `__: - - * Yoshi Tashiro - -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/social `_ project on GitHub. - -You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute. +==================== +Mail Outbound Static +==================== + +.. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + !! 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-LGPL--3-blue.png + :target: http://www.gnu.org/licenses/lgpl-3.0-standalone.html + :alt: License: LGPL-3 +.. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fsocial-lightgray.png?logo=github + :target: https://github.com/OCA/social/tree/16.0/mail_outbound_static + :alt: OCA/social +.. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png + :target: https://translation.odoo-community.org/projects/social-16-0/social-16-0-mail_outbound_static + :alt: Translate me on Weblate +.. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png + :target: https://runbot.odoo-community.org/runbot/205/16.0 + :alt: Try me on Runbot + +|badge1| |badge2| |badge3| |badge4| |badge5| + +This module brings Odoo outbound emails in to strict compliance with RFC-2822 +by allowing for a dynamically configured From header, with the sender's e-mail +being appended into the proper Sender header instead. To accomplish this we: + +* Add a domain whitelist field in the mail server model. This one represent an + allowed Domains list separated by commas. If there is not given SMTP server + it will let us to search the proper mail server to be used to send the messages + where the message 'From' email domain match with the domain whitelist. If + there is not mail server that matches then will use the default mail server to + send the message. + +* Add a Email From field that will let us to email from a specific address taking + into account this conditions: + + 1) If the sender domain match with the domain whitelist then the original + message's 'From' will remain as it is and will not be changed because the + mail server is able to send in the name of the sender domain. + + 2) If the original message's 'From' does not match with the domain whitelist + then the email From is replaced with the Email From field value. + +* Add compatibility to define the smtp information in Odoo config file. Both + smtp_from and smtp_whitelist_domain values will be used if there is not mail + server configured in the system. + +**Table of contents** + +.. contents:: + :local: + +Usage +===== + +* Navigate to an Outbound Email Server +* Set the `Email From` option to an email address +* Set the `Domain Whitelist` option with the domain whitelist + +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 +~~~~~~~ + +* brain-tec AG +* LasLabs +* Adhoc SA + +Contributors +~~~~~~~~~~~~ + +* Frédéric Garbely +* Dave Lasley +* Lorenzo Battistini +* Pierre Pizzetta +* Katherine Zaoral +* Juan José Scarafía +* `Quartile `__: + + * Yoshi Tashiro + +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/social `_ project on GitHub. + +You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute. diff --git a/mail_outbound_static/__init__.py b/mail_outbound_static/__init__.py index a374a375..0639de1b 100644 --- a/mail_outbound_static/__init__.py +++ b/mail_outbound_static/__init__.py @@ -1,4 +1,4 @@ -# Copyright 2017 LasLabs Inc. -# License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html). - -from . import models +# Copyright 2017 LasLabs Inc. +# License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html). + +from . import models diff --git a/mail_outbound_static/__manifest__.py b/mail_outbound_static/__manifest__.py index c68433e2..ca406813 100644 --- a/mail_outbound_static/__manifest__.py +++ b/mail_outbound_static/__manifest__.py @@ -1,16 +1,16 @@ -# Copyright 2016-2022 LasLabs Inc. -# License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html). - -{ - "name": "Mail Outbound Static", - "summary": "Allows you to configure the from header for a mail server.", - "version": "16.0.1.0.0", - "category": "Discuss", - "website": "https://github.com/OCA/social", - "author": "brain-tec AG, LasLabs, Adhoc SA, Odoo Community Association (OCA)", - "license": "LGPL-3", - "application": False, - "installable": True, - "depends": ["base"], - "data": ["views/ir_mail_server_view.xml"], -} +# Copyright 2016-2022 LasLabs Inc. +# License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html). + +{ + "name": "Mail Outbound Static", + "summary": "Allows you to configure the from header for a mail server.", + "version": "16.0.1.0.0", + "category": "Discuss", + "website": "https://github.com/OCA/social", + "author": "brain-tec AG, LasLabs, Adhoc SA, Odoo Community Association (OCA)", + "license": "LGPL-3", + "application": False, + "installable": True, + "depends": ["base"], + "data": ["views/ir_mail_server_view.xml"], +} diff --git a/mail_outbound_static/i18n/es.po b/mail_outbound_static/i18n/es.po index 5af66a4b..8e0d9567 100644 --- a/mail_outbound_static/i18n/es.po +++ b/mail_outbound_static/i18n/es.po @@ -1,73 +1,73 @@ -# Translation of Odoo Server. -# This file contains the translation of the following modules: -# * mail_outbound_static -# -msgid "" -msgstr "" -"Project-Id-Version: Odoo Server 13.0\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-09-03 12:53+0000\n" -"PO-Revision-Date: 2020-09-03 12:53+0000\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: mail_outbound_static -#: code:addons/mail_outbound_static/models/ir_mail_server.py:0 -#, python-format -msgid "" -"%s is not a valid domain. Please define a list of valid domains separated by" -" comma" -msgstr "" -"%s no es un dominio válido. Por favor defina una lista de dominios validos separados por" -" comas" - -#. module: mail_outbound_static -#: model:ir.model.fields,help:mail_outbound_static.field_ir_mail_server__domain_whitelist -msgid "" -"Allowed Domains list separated by commas. If there is not given SMTP server " -"it will let us to search the proper mail server to be used to sent the " -"messages where the message 'From' email domain match with the domain " -"whitelist." -msgstr "" -"Lista de dominios permitidos separados por comas. Si no se ha seleccionado " -"un servidor SMTP nos permitirá seleccionar el servidor de mail apropiado " -"para enviar los mensajes donde el dominio del email del 'De' coincida con la" -" lista blanca de dominios." - -#. module: mail_outbound_static -#: model:ir.model.fields,field_description:mail_outbound_static.field_ir_mail_server__domain_whitelist -msgid "Domain Whitelist" -msgstr "Lista blanca de dominios" - -#. module: mail_outbound_static -#: model:ir.model.fields,field_description:mail_outbound_static.field_ir_mail_server__smtp_from -msgid "Email From" -msgstr "Email De" - -#. module: mail_outbound_static -#: model:ir.model,name:mail_outbound_static.model_ir_mail_server -msgid "Mail Server" -msgstr "Servidor de correo" - -#. module: mail_outbound_static -#: code:addons/mail_outbound_static/models/ir_mail_server.py:0 -#, python-format -msgid "Not a valid Email From" -msgstr "No es un Email De válido" - -#. module: mail_outbound_static -#: model:ir.model.fields,help:mail_outbound_static.field_ir_mail_server__smtp_from -msgid "" -"Set this in order to email from a specific address. If the original " -"message's 'From' does not match with the domain whitelist then it is " -"replaced with this value. If does match with the domain whitelist then the " -"original message's 'From' will not change" -msgstr "" -"Definalo para usar un dirección de correo 'De' especifica. Si el 'De' del " -"mensaje original no coincide con la lista blanca de dominios entonces este " -"será remplazado con este valor. Si coincide con la lista blanca de dominios " -"entonces el 'De' del mensajee original no cambiará" +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * mail_outbound_static +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 13.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2020-09-03 12:53+0000\n" +"PO-Revision-Date: 2020-09-03 12:53+0000\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: mail_outbound_static +#: code:addons/mail_outbound_static/models/ir_mail_server.py:0 +#, python-format +msgid "" +"%s is not a valid domain. Please define a list of valid domains separated by" +" comma" +msgstr "" +"%s no es un dominio válido. Por favor defina una lista de dominios validos separados por" +" comas" + +#. module: mail_outbound_static +#: model:ir.model.fields,help:mail_outbound_static.field_ir_mail_server__domain_whitelist +msgid "" +"Allowed Domains list separated by commas. If there is not given SMTP server " +"it will let us to search the proper mail server to be used to sent the " +"messages where the message 'From' email domain match with the domain " +"whitelist." +msgstr "" +"Lista de dominios permitidos separados por comas. Si no se ha seleccionado " +"un servidor SMTP nos permitirá seleccionar el servidor de mail apropiado " +"para enviar los mensajes donde el dominio del email del 'De' coincida con la" +" lista blanca de dominios." + +#. module: mail_outbound_static +#: model:ir.model.fields,field_description:mail_outbound_static.field_ir_mail_server__domain_whitelist +msgid "Domain Whitelist" +msgstr "Lista blanca de dominios" + +#. module: mail_outbound_static +#: model:ir.model.fields,field_description:mail_outbound_static.field_ir_mail_server__smtp_from +msgid "Email From" +msgstr "Email De" + +#. module: mail_outbound_static +#: model:ir.model,name:mail_outbound_static.model_ir_mail_server +msgid "Mail Server" +msgstr "Servidor de correo" + +#. module: mail_outbound_static +#: code:addons/mail_outbound_static/models/ir_mail_server.py:0 +#, python-format +msgid "Not a valid Email From" +msgstr "No es un Email De válido" + +#. module: mail_outbound_static +#: model:ir.model.fields,help:mail_outbound_static.field_ir_mail_server__smtp_from +msgid "" +"Set this in order to email from a specific address. If the original " +"message's 'From' does not match with the domain whitelist then it is " +"replaced with this value. If does match with the domain whitelist then the " +"original message's 'From' will not change" +msgstr "" +"Definalo para usar un dirección de correo 'De' especifica. Si el 'De' del " +"mensaje original no coincide con la lista blanca de dominios entonces este " +"será remplazado con este valor. Si coincide con la lista blanca de dominios " +"entonces el 'De' del mensajee original no cambiará" diff --git a/mail_outbound_static/models/__init__.py b/mail_outbound_static/models/__init__.py index 0283950d..fbf8a561 100644 --- a/mail_outbound_static/models/__init__.py +++ b/mail_outbound_static/models/__init__.py @@ -1,4 +1,4 @@ -# Copyright 2017 LasLabs Inc. -# License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html). - -from . import ir_mail_server +# Copyright 2017 LasLabs Inc. +# License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html). + +from . import ir_mail_server diff --git a/mail_outbound_static/models/ir_mail_server.py b/mail_outbound_static/models/ir_mail_server.py index fa2bb5a5..cde06bad 100644 --- a/mail_outbound_static/models/ir_mail_server.py +++ b/mail_outbound_static/models/ir_mail_server.py @@ -1,151 +1,151 @@ -# Copyright 2017 LasLabs Inc. -# License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html). - -import re -from email.utils import formataddr, parseaddr - -from odoo import _, api, fields, models, tools -from odoo.exceptions import ValidationError - - -class IrMailServer(models.Model): - - _inherit = "ir.mail_server" - - smtp_from = fields.Char( - string="Email From", - help="Set this in order to email from a specific address." - " If the original message's 'From' does not match with the domain" - " whitelist then it is replaced with this value. If does match with the" - " domain whitelist then the original message's 'From' will not change", - ) - domain_whitelist = fields.Char( - help="Allowed Domains list separated by commas. If there is not given" - " SMTP server it will let us to search the proper mail server to be" - " used to sent the messages where the message 'From' email domain" - " match with the domain whitelist." - ) - - @api.constrains("domain_whitelist") - def check_valid_domain_whitelist(self): - if self.domain_whitelist: - domains = list(self.domain_whitelist.split(",")) - for domain in domains: - if not self._is_valid_domain(domain): - raise ValidationError( - _( - "%s is not a valid domain. Please define a list of" - " valid domains separated by comma" - ) - % (domain) - ) - - @api.constrains("smtp_from") - def check_valid_smtp_from(self): - if self.smtp_from: - match = re.match( - r"^[_a-z0-9-]+(\.[_a-z0-9-]+)*@[a-z0-9-]+(\.[a-z0-9-]+)*(\." - r"[a-z]{2,4})$", - self.smtp_from, - ) - if match is None: - raise ValidationError(_("Not a valid Email From")) - - def _is_valid_domain(self, domain_name): - domain_regex = ( - r"(([\da-zA-Z])([_\w-]{,62})\.){,127}(([\da-zA-Z])" - r"[_\w-]{,61})?([\da-zA-Z]\.((xn\-\-[a-zA-Z\d]+)|([a-zA-Z\d]{2,})))" - ) - domain_regex = "{}$".format(domain_regex) - valid_domain_name_regex = re.compile(domain_regex, re.IGNORECASE) - domain_name = domain_name.lower().strip() - return True if re.match(valid_domain_name_regex, domain_name) else False - - @api.model - def _get_domain_whitelist(self, domain_whitelist_string): - res = domain_whitelist_string.split(",") if domain_whitelist_string else [] - res = [item.strip() for item in res] - return res - - def _prepare_email_message(self, message, smtp_session): - smtp_from, smtp_to_list, message = super()._prepare_email_message( - message, smtp_session - ) - name_from = self._context.get("name_from") - email_from = self._context.get("email_from") - email_domain = self._context.get("email_domain") - mail_server = self.browse(self._context.get("mail_server_id")) - domain_whitelist = mail_server.domain_whitelist or tools.config.get( - "smtp_domain_whitelist" - ) - domain_whitelist = self._get_domain_whitelist(domain_whitelist) - # Replace the From only if needed - if mail_server.smtp_from and ( - not domain_whitelist or email_domain not in domain_whitelist - ): - email_from = formataddr((name_from, mail_server.smtp_from)) - message.replace_header("From", email_from) - smtp_from = email_from - if not self._get_default_bounce_address(): - # then, bounce handling is disabled and we want - # Return-Path = From - if "Return-Path" in message: - message.replace_header("Return-Path", email_from) - else: - message.add_header("Return-Path", email_from) - return smtp_from, smtp_to_list, message - - @api.model - def send_email( - self, message, mail_server_id=None, smtp_server=None, *args, **kwargs - ): - # Get email_from and name_from - if message["From"].count("<") > 1: - split_from = message["From"].rsplit(" <", 1) - name_from = split_from[0] - email_from = split_from[-1].replace(">", "") - else: - name_from, email_from = parseaddr(message["From"]) - email_domain = email_from.split("@")[1] - # Replicate logic from core to get mail server - # Get proper mail server to use - if not smtp_server and not mail_server_id: - mail_server_id = self._get_mail_sever(email_domain) - self = self.with_context( - name_from=name_from, - email_from=email_from, - email_domain=email_domain, - mail_server_id=mail_server_id, - ) - return super(IrMailServer, self).send_email( - message, mail_server_id, smtp_server, *args, **kwargs - ) - - @tools.ormcache("email_domain") - def _get_mail_sever(self, email_domain): - """return the mail server id that match with the domain_whitelist - If not match then return the default mail server id available one""" - mail_server_id = None - for item in self.sudo().search( - [("domain_whitelist", "!=", False)], order="sequence" - ): - domain_whitelist = self._get_domain_whitelist(item.domain_whitelist) - if email_domain in domain_whitelist: - mail_server_id = item.id - break - if not mail_server_id: - mail_server_id = self.sudo().search([], order="sequence", limit=1).id - return mail_server_id - - @api.model - def create(self, values): - self.clear_caches() - return super().create(values) - - def write(self, values): - self.clear_caches() - return super().write(values) - - def unlink(self): - self.clear_caches() - return super().unlink() +# Copyright 2017 LasLabs Inc. +# License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html). + +import re +from email.utils import formataddr, parseaddr + +from odoo import _, api, fields, models, tools +from odoo.exceptions import ValidationError + + +class IrMailServer(models.Model): + + _inherit = "ir.mail_server" + + smtp_from = fields.Char( + string="Email From", + help="Set this in order to email from a specific address." + " If the original message's 'From' does not match with the domain" + " whitelist then it is replaced with this value. If does match with the" + " domain whitelist then the original message's 'From' will not change", + ) + domain_whitelist = fields.Char( + help="Allowed Domains list separated by commas. If there is not given" + " SMTP server it will let us to search the proper mail server to be" + " used to sent the messages where the message 'From' email domain" + " match with the domain whitelist." + ) + + @api.constrains("domain_whitelist") + def check_valid_domain_whitelist(self): + if self.domain_whitelist: + domains = list(self.domain_whitelist.split(",")) + for domain in domains: + if not self._is_valid_domain(domain): + raise ValidationError( + _( + "%s is not a valid domain. Please define a list of" + " valid domains separated by comma" + ) + % (domain) + ) + + @api.constrains("smtp_from") + def check_valid_smtp_from(self): + if self.smtp_from: + match = re.match( + r"^[_a-z0-9-]+(\.[_a-z0-9-]+)*@[a-z0-9-]+(\.[a-z0-9-]+)*(\." + r"[a-z]{2,4})$", + self.smtp_from, + ) + if match is None: + raise ValidationError(_("Not a valid Email From")) + + def _is_valid_domain(self, domain_name): + domain_regex = ( + r"(([\da-zA-Z])([_\w-]{,62})\.){,127}(([\da-zA-Z])" + r"[_\w-]{,61})?([\da-zA-Z]\.((xn\-\-[a-zA-Z\d]+)|([a-zA-Z\d]{2,})))" + ) + domain_regex = "{}$".format(domain_regex) + valid_domain_name_regex = re.compile(domain_regex, re.IGNORECASE) + domain_name = domain_name.lower().strip() + return True if re.match(valid_domain_name_regex, domain_name) else False + + @api.model + def _get_domain_whitelist(self, domain_whitelist_string): + res = domain_whitelist_string.split(",") if domain_whitelist_string else [] + res = [item.strip() for item in res] + return res + + def _prepare_email_message(self, message, smtp_session): + smtp_from, smtp_to_list, message = super()._prepare_email_message( + message, smtp_session + ) + name_from = self._context.get("name_from") + email_from = self._context.get("email_from") + email_domain = self._context.get("email_domain") + mail_server = self.browse(self._context.get("mail_server_id")) + domain_whitelist = mail_server.domain_whitelist or tools.config.get( + "smtp_domain_whitelist" + ) + domain_whitelist = self._get_domain_whitelist(domain_whitelist) + # Replace the From only if needed + if mail_server.smtp_from and ( + not domain_whitelist or email_domain not in domain_whitelist + ): + email_from = formataddr((name_from, mail_server.smtp_from)) + message.replace_header("From", email_from) + smtp_from = email_from + if not self._get_default_bounce_address(): + # then, bounce handling is disabled and we want + # Return-Path = From + if "Return-Path" in message: + message.replace_header("Return-Path", email_from) + else: + message.add_header("Return-Path", email_from) + return smtp_from, smtp_to_list, message + + @api.model + def send_email( + self, message, mail_server_id=None, smtp_server=None, *args, **kwargs + ): + # Get email_from and name_from + if message["From"].count("<") > 1: + split_from = message["From"].rsplit(" <", 1) + name_from = split_from[0] + email_from = split_from[-1].replace(">", "") + else: + name_from, email_from = parseaddr(message["From"]) + email_domain = email_from.split("@")[1] + # Replicate logic from core to get mail server + # Get proper mail server to use + if not smtp_server and not mail_server_id: + mail_server_id = self._get_mail_sever(email_domain) + self = self.with_context( + name_from=name_from, + email_from=email_from, + email_domain=email_domain, + mail_server_id=mail_server_id, + ) + return super(IrMailServer, self).send_email( + message, mail_server_id, smtp_server, *args, **kwargs + ) + + @tools.ormcache("email_domain") + def _get_mail_sever(self, email_domain): + """return the mail server id that match with the domain_whitelist + If not match then return the default mail server id available one""" + mail_server_id = None + for item in self.sudo().search( + [("domain_whitelist", "!=", False)], order="sequence" + ): + domain_whitelist = self._get_domain_whitelist(item.domain_whitelist) + if email_domain in domain_whitelist: + mail_server_id = item.id + break + if not mail_server_id: + mail_server_id = self.sudo().search([], order="sequence", limit=1).id + return mail_server_id + + @api.model + def create(self, values): + self.clear_caches() + return super().create(values) + + def write(self, values): + self.clear_caches() + return super().write(values) + + def unlink(self): + self.clear_caches() + return super().unlink() diff --git a/mail_outbound_static/readme/CONTRIBUTORS.rst b/mail_outbound_static/readme/CONTRIBUTORS.rst index 024f2373..96f9e785 100644 --- a/mail_outbound_static/readme/CONTRIBUTORS.rst +++ b/mail_outbound_static/readme/CONTRIBUTORS.rst @@ -1,9 +1,9 @@ -* Frédéric Garbely -* Dave Lasley -* Lorenzo Battistini -* Pierre Pizzetta -* Katherine Zaoral -* Juan José Scarafía -* `Quartile `__: - - * Yoshi Tashiro +* Frédéric Garbely +* Dave Lasley +* Lorenzo Battistini +* Pierre Pizzetta +* Katherine Zaoral +* Juan José Scarafía +* `Quartile `__: + + * Yoshi Tashiro diff --git a/mail_outbound_static/readme/DESCRIPTION.rst b/mail_outbound_static/readme/DESCRIPTION.rst index ebb919ff..b4ffa0ac 100644 --- a/mail_outbound_static/readme/DESCRIPTION.rst +++ b/mail_outbound_static/readme/DESCRIPTION.rst @@ -1,24 +1,24 @@ -This module brings Odoo outbound emails in to strict compliance with RFC-2822 -by allowing for a dynamically configured From header, with the sender's e-mail -being appended into the proper Sender header instead. To accomplish this we: - -* Add a domain whitelist field in the mail server model. This one represent an - allowed Domains list separated by commas. If there is not given SMTP server - it will let us to search the proper mail server to be used to send the messages - where the message 'From' email domain match with the domain whitelist. If - there is not mail server that matches then will use the default mail server to - send the message. - -* Add a Email From field that will let us to email from a specific address taking - into account this conditions: - - 1) If the sender domain match with the domain whitelist then the original - message's 'From' will remain as it is and will not be changed because the - mail server is able to send in the name of the sender domain. - - 2) If the original message's 'From' does not match with the domain whitelist - then the email From is replaced with the Email From field value. - -* Add compatibility to define the smtp information in Odoo config file. Both - smtp_from and smtp_whitelist_domain values will be used if there is not mail - server configured in the system. +This module brings Odoo outbound emails in to strict compliance with RFC-2822 +by allowing for a dynamically configured From header, with the sender's e-mail +being appended into the proper Sender header instead. To accomplish this we: + +* Add a domain whitelist field in the mail server model. This one represent an + allowed Domains list separated by commas. If there is not given SMTP server + it will let us to search the proper mail server to be used to send the messages + where the message 'From' email domain match with the domain whitelist. If + there is not mail server that matches then will use the default mail server to + send the message. + +* Add a Email From field that will let us to email from a specific address taking + into account this conditions: + + 1) If the sender domain match with the domain whitelist then the original + message's 'From' will remain as it is and will not be changed because the + mail server is able to send in the name of the sender domain. + + 2) If the original message's 'From' does not match with the domain whitelist + then the email From is replaced with the Email From field value. + +* Add compatibility to define the smtp information in Odoo config file. Both + smtp_from and smtp_whitelist_domain values will be used if there is not mail + server configured in the system. diff --git a/mail_outbound_static/readme/USAGE.rst b/mail_outbound_static/readme/USAGE.rst index 6d5f3b5a..195f5a93 100644 --- a/mail_outbound_static/readme/USAGE.rst +++ b/mail_outbound_static/readme/USAGE.rst @@ -1,3 +1,3 @@ -* Navigate to an Outbound Email Server -* Set the `Email From` option to an email address -* Set the `Domain Whitelist` option with the domain whitelist +* Navigate to an Outbound Email Server +* Set the `Email From` option to an email address +* Set the `Domain Whitelist` option with the domain whitelist diff --git a/mail_outbound_static/tests/__init__.py b/mail_outbound_static/tests/__init__.py index b4138019..8b601d0b 100644 --- a/mail_outbound_static/tests/__init__.py +++ b/mail_outbound_static/tests/__init__.py @@ -1,4 +1,4 @@ -# Copyright 2017 LasLabs Inc. -# License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html). - -from . import test_ir_mail_server +# Copyright 2017 LasLabs Inc. +# License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html). + +from . import test_ir_mail_server diff --git a/mail_outbound_static/tests/test.msg b/mail_outbound_static/tests/test.msg index d2413c4b..1f0b96da 100644 --- a/mail_outbound_static/tests/test.msg +++ b/mail_outbound_static/tests/test.msg @@ -1,70 +1,70 @@ -Delivered-To: test@gmail.com -Received: by 10.74.138.167 with SMTP id m36csp7226976ooj; - Tue, 12 Sep 2017 10:37:56 -0700 (PDT) -X-Google-Smtp-Source: AOwi7QDKSb3BE6lIhVXub9wcPA/HxFKKpnNPconNr9f1L35SVw+EIm8itVQkbOdAW6TohImypmrF -X-Received: by 10.28.158.208 with SMTP id h199mr250060wme.47.1505237876258; - Tue, 12 Sep 2017 10:37:56 -0700 (PDT) -ARC-Seal: i=1; a=rsa-sha256; t=1505237876; cv=none; - d=google.com; s=arc-20160816; - b=E2B6KUxHOJQk1YrT12BpitEMCgkxyqEXcFlwPWKjA/i/Xyvlh+09spNOF4VPmD/ZJm - 5lkY6hYyxvIH2RpRPeZVPkRIYhaEASkMIygdJu9Gd4weBdO2rd8iP/zSGHYyAmO/hLN2 - 64hXtKexrWnO/YNWlpfhAo1kiwgSRVnZx55EopbWP49cy7BzKfwr1kHN0T9A5Lw1w+BW - ZrXdCX6LRxHS2USKHb76PAVt0bhwsM/ZznBauR2zNKYcPxAWzdpN/vK3BDmWUdqbbSaB - BOKINjuI9EmWynogDZE7Riu+sbc5QafE3owla1/2d0Bogp9FLtJe0YyQeW2qLvZKcmlI - ftSQ== -ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; - h=to:list-archive:list-unsubscribe:list-subscribe:precedence - :list-post:list-id:date:reply-to:from:subject:references:message-id - :mime-version:arc-authentication-results; - bh=DwvSiw5K7ryb4S8O/8HcIaGhJqbOxcXKsnPAr63iQZ4=; - b=U0Ac9Rqvv+tfqO9fCx+F79oZknn3rOv9N9ekViEuL5DtjpJxKDDkO1xw//sV3eRILT - nqGuxd2yQXwC4U+WAwraBwoLC3ScHb/9gWtzlrLCgv6WbNE7HZi5g6L8c0LWRN24cIe9 - AOdc/8fOdGoaL8yajrGEHgMz9B2KMltA9tZyxFOeKsyODxJ6iWjXcG1BSQTxERwosV3h - ch8AznQr7xLLvc/u9VTEqC5ome3RqsxKRxOGenEqIbCOr11sxwpZQdQcNR6faNRom3+2 - 6gz++4tVIV9cqYX1j9eEU/ufoUzBJ6Uzm0jMGZZQOHAF+YX3tZUEsPmc75PsvRCAIWby - urMg== -ARC-Authentication-Results: i=1; mx.google.com; - spf=pass (google.com: domain of postmaster-odoo@odoo-community.org designates 2a01:4f8:a0:430d::2 as permitted sender) smtp.mailfrom=postmaster-odoo@odoo-community.org; - dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=QUARANTINE) header.from=laslabs.com -Return-Path: -Received: from odoo-community.org (odoo-community.org. [2a01:4f8:a0:430d::2]) - by mx.google.com with ESMTP id j72si1795626wmg.60.2017.09.12.10.37.55 - for ; - Tue, 12 Sep 2017 10:37:56 -0700 (PDT) -Received-SPF: pass (google.com: domain of postmaster-odoo@odoo-community.org designates 2a01:4f8:a0:430d::2 as permitted sender) client-ip=2a01:4f8:a0:430d::2; -Authentication-Results: mx.google.com; - spf=pass (google.com: domain of postmaster-odoo@odoo-community.org designates 2a01:4f8:a0:430d::2 as permitted sender) smtp.mailfrom=postmaster-odoo@odoo-community.org; - dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=QUARANTINE) header.from=laslabs.com -Received: from odoo.odoo-community.org (localhost.localdomain [127.0.0.1]) - by odoo-community.org (Postfix) with ESMTP id DB5DC2EC2277; - Tue, 12 Sep 2017 19:37:53 +0200 (CEST) -Content-Type: multipart/mixed; boundary="===============7439524030966430607==" -MIME-Version: 1.0 -Message-Id: -references: <0db43737-b846-4890-6801-44ff9617e3b3@camptocamp.com> -Subject: Re: OCA Code sprint: sprint topics -From: Dave Lasley -Reply-To: "Odoo Community Association \(OCA\) Contributors" - -Date: Tue, 12 Sep 2017 17:37:53 -0000 -List-Id: contributors.odoo-community.org -List-Post: -Precedence: list -X-Auto-Response-Suppress: OOF -List-Subscribe: -List-Unsubscribe: -List-Archive: -To: "Contributors" - ---===============7439524030966430607== -Content-Type: multipart/alternative; - boundary="===============8317593469411551167==" -MIME-Version: 1.0 - ---===============8317593469411551167== -Content-Type: text/plain; charset="utf-8" -MIME-Version: 1.0 -Content-Transfer-Encoding: base64 - -VGhpcyBpcyBhIGZha2UsIHRlc3QgbWVzc2FnZQ== ---===============7439524030966430607==-- +Delivered-To: test@gmail.com +Received: by 10.74.138.167 with SMTP id m36csp7226976ooj; + Tue, 12 Sep 2017 10:37:56 -0700 (PDT) +X-Google-Smtp-Source: AOwi7QDKSb3BE6lIhVXub9wcPA/HxFKKpnNPconNr9f1L35SVw+EIm8itVQkbOdAW6TohImypmrF +X-Received: by 10.28.158.208 with SMTP id h199mr250060wme.47.1505237876258; + Tue, 12 Sep 2017 10:37:56 -0700 (PDT) +ARC-Seal: i=1; a=rsa-sha256; t=1505237876; cv=none; + d=google.com; s=arc-20160816; + b=E2B6KUxHOJQk1YrT12BpitEMCgkxyqEXcFlwPWKjA/i/Xyvlh+09spNOF4VPmD/ZJm + 5lkY6hYyxvIH2RpRPeZVPkRIYhaEASkMIygdJu9Gd4weBdO2rd8iP/zSGHYyAmO/hLN2 + 64hXtKexrWnO/YNWlpfhAo1kiwgSRVnZx55EopbWP49cy7BzKfwr1kHN0T9A5Lw1w+BW + ZrXdCX6LRxHS2USKHb76PAVt0bhwsM/ZznBauR2zNKYcPxAWzdpN/vK3BDmWUdqbbSaB + BOKINjuI9EmWynogDZE7Riu+sbc5QafE3owla1/2d0Bogp9FLtJe0YyQeW2qLvZKcmlI + ftSQ== +ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; + h=to:list-archive:list-unsubscribe:list-subscribe:precedence + :list-post:list-id:date:reply-to:from:subject:references:message-id + :mime-version:arc-authentication-results; + bh=DwvSiw5K7ryb4S8O/8HcIaGhJqbOxcXKsnPAr63iQZ4=; + b=U0Ac9Rqvv+tfqO9fCx+F79oZknn3rOv9N9ekViEuL5DtjpJxKDDkO1xw//sV3eRILT + nqGuxd2yQXwC4U+WAwraBwoLC3ScHb/9gWtzlrLCgv6WbNE7HZi5g6L8c0LWRN24cIe9 + AOdc/8fOdGoaL8yajrGEHgMz9B2KMltA9tZyxFOeKsyODxJ6iWjXcG1BSQTxERwosV3h + ch8AznQr7xLLvc/u9VTEqC5ome3RqsxKRxOGenEqIbCOr11sxwpZQdQcNR6faNRom3+2 + 6gz++4tVIV9cqYX1j9eEU/ufoUzBJ6Uzm0jMGZZQOHAF+YX3tZUEsPmc75PsvRCAIWby + urMg== +ARC-Authentication-Results: i=1; mx.google.com; + spf=pass (google.com: domain of postmaster-odoo@odoo-community.org designates 2a01:4f8:a0:430d::2 as permitted sender) smtp.mailfrom=postmaster-odoo@odoo-community.org; + dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=QUARANTINE) header.from=laslabs.com +Return-Path: +Received: from odoo-community.org (odoo-community.org. [2a01:4f8:a0:430d::2]) + by mx.google.com with ESMTP id j72si1795626wmg.60.2017.09.12.10.37.55 + for ; + Tue, 12 Sep 2017 10:37:56 -0700 (PDT) +Received-SPF: pass (google.com: domain of postmaster-odoo@odoo-community.org designates 2a01:4f8:a0:430d::2 as permitted sender) client-ip=2a01:4f8:a0:430d::2; +Authentication-Results: mx.google.com; + spf=pass (google.com: domain of postmaster-odoo@odoo-community.org designates 2a01:4f8:a0:430d::2 as permitted sender) smtp.mailfrom=postmaster-odoo@odoo-community.org; + dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=QUARANTINE) header.from=laslabs.com +Received: from odoo.odoo-community.org (localhost.localdomain [127.0.0.1]) + by odoo-community.org (Postfix) with ESMTP id DB5DC2EC2277; + Tue, 12 Sep 2017 19:37:53 +0200 (CEST) +Content-Type: multipart/mixed; boundary="===============7439524030966430607==" +MIME-Version: 1.0 +Message-Id: +references: <0db43737-b846-4890-6801-44ff9617e3b3@camptocamp.com> +Subject: Re: OCA Code sprint: sprint topics +From: Dave Lasley +Reply-To: "Odoo Community Association \(OCA\) Contributors" + +Date: Tue, 12 Sep 2017 17:37:53 -0000 +List-Id: contributors.odoo-community.org +List-Post: +Precedence: list +X-Auto-Response-Suppress: OOF +List-Subscribe: +List-Unsubscribe: +List-Archive: +To: "Contributors" + +--===============7439524030966430607== +Content-Type: multipart/alternative; + boundary="===============8317593469411551167==" +MIME-Version: 1.0 + +--===============8317593469411551167== +Content-Type: text/plain; charset="utf-8" +MIME-Version: 1.0 +Content-Transfer-Encoding: base64 + +VGhpcyBpcyBhIGZha2UsIHRlc3QgbWVzc2FnZQ== +--===============7439524030966430607==-- diff --git a/mail_outbound_static/tests/test_ir_mail_server.py b/mail_outbound_static/tests/test_ir_mail_server.py index 0004aec2..c5f05b0d 100644 --- a/mail_outbound_static/tests/test_ir_mail_server.py +++ b/mail_outbound_static/tests/test_ir_mail_server.py @@ -1,369 +1,369 @@ -# Copyright 2017 LasLabs Inc. -# License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html). - -import logging -import os -from email import message_from_string - -import odoo.tools as tools -from odoo.exceptions import ValidationError -from odoo.tests.common import TransactionCase - -from odoo.addons.base.tests.common import MockSmtplibCase - -_logger = logging.getLogger(__name__) - - -class TestIrMailServer(TransactionCase, MockSmtplibCase): - @classmethod - def setUpClass(cls): - super().setUpClass() - cls.email_from = "derp@example.com" - cls.email_from_another = "another@example.com" - cls.IrMailServer = cls.env["ir.mail_server"] - cls.parameter_model = cls.env["ir.config_parameter"] - cls._delete_mail_servers() - cls.IrMailServer.create( - { - "name": "localhost", - "smtp_host": "localhost", - "smtp_from": cls.email_from, - } - ) - message_file = os.path.join( - os.path.dirname(os.path.realpath(__file__)), "test.msg" - ) - with open(message_file, "r") as fh: - cls.message = message_from_string(fh.read()) - - @classmethod - def _delete_mail_servers(cls): - """Delete all available mail servers""" - all_mail_servers = cls.IrMailServer.search([]) - if all_mail_servers: - all_mail_servers.unlink() - - def _init_mail_server_domain_whilelist_based(self): - self._delete_mail_servers() - self.assertFalse(self.IrMailServer.search([])) - self.mail_server_domainone = self.IrMailServer.create( - { - "name": "sandbox domainone", - "smtp_host": "localhost", - "smtp_from": "notifications@domainone.com", - "domain_whitelist": "domainone.com", - } - ) - self.mail_server_domaintwo = self.IrMailServer.create( - { - "name": "sandbox domaintwo", - "smtp_host": "localhost", - "smtp_from": "hola@domaintwo.com", - "domain_whitelist": "domaintwo.com", - } - ) - self.mail_server_domainthree = self.IrMailServer.create( - { - "name": "sandbox domainthree", - "smtp_host": "localhost", - "smtp_from": "notifications@domainthree.com", - "domain_whitelist": "domainthree.com,domainmulti.com", - } - ) - - def _skip_test(self, reason): - _logger.warning(reason) - self.skipTest(reason) - - def _send_mail( - self, - message, - mail_server_id=None, - smtp_server=None, - smtp_port=None, - smtp_user=None, - smtp_password=None, - smtp_encryption=None, - smtp_ssl_certificate=None, - smtp_ssl_private_key=None, - smtp_debug=False, - smtp_session=None, - ): - smtp = smtp_session - if not smtp: - smtp = self.IrMailServer.connect( - smtp_server, - smtp_port, - smtp_user, - smtp_password, - smtp_encryption, - smtp_from=message["From"], - ssl_certificate=smtp_ssl_certificate, - ssl_private_key=smtp_ssl_private_key, - smtp_debug=smtp_debug, - mail_server_id=mail_server_id, - ) - - send_from, send_to, message_string = self.IrMailServer._prepare_email_message( - message, smtp - ) - self.IrMailServer.send_email(message) - return message_string - - def test_send_email_injects_from_no_canonical(self): - """It should inject the FROM header correctly when no canonical name.""" - self.message.replace_header("From", "test@example.com") - # A mail server is configured for the email - with self.mock_smtplib_connection(): - message = self._send_mail(self.message) - self.assertEqual(message["From"], self.email_from) - - def test_send_email_injects_from_with_canonical(self): - """It should inject the FROM header correctly with a canonical name. - - Note that there is an extra `<` in the canonical name to test for - proper handling in the split. - """ - user = "Test < User" - self.message.replace_header("From", "%s " % user) - bounce_parameter = self.parameter_model.search( - [("key", "=", "mail.bounce.alias")] - ) - if bounce_parameter: - # Remove mail.bounce.alias to test Return-Path - bounce_parameter.unlink() - # Also check passing mail_server_id - mail_server_id = ( - self.IrMailServer.sudo().search([], order="sequence", limit=1)[0].id - ) - # A mail server is configured for the email - with self.mock_smtplib_connection(): - message = self._send_mail(self.message, mail_server_id=mail_server_id) - self.assertEqual(message["From"], '"{}" <{}>'.format(user, self.email_from)) - self.assertEqual( - message["Return-Path"], '"{}" <{}>'.format(user, self.email_from) - ) - - def test_01_from_outgoing_server_domainone(self): - self._init_mail_server_domain_whilelist_based() - domain = "domainone.com" - email_from = "Mitchell Admin " % domain - expected_mail_server = self.mail_server_domainone - - self.message.replace_header("From", email_from) - # A mail server is configured for the email - with self.mock_smtplib_connection(): - message = self._send_mail(self.message) - self.assertEqual(message["From"], email_from) - - used_mail_server = self.IrMailServer._get_mail_sever(domain) - used_mail_server = self.IrMailServer.browse(used_mail_server) - self.assertEqual( - used_mail_server, - expected_mail_server, - "It using %s but we expect to use %s" - % (used_mail_server.name, expected_mail_server.name), - ) - - def test_02_from_outgoing_server_domaintwo(self): - self._init_mail_server_domain_whilelist_based() - domain = "domaintwo.com" - email_from = "Mitchell Admin " % domain - expected_mail_server = self.mail_server_domaintwo - - self.message.replace_header("From", email_from) - # A mail server is configured for the email - with self.mock_smtplib_connection(): - message = self._send_mail(self.message) - self.assertEqual(message["From"], email_from) - - used_mail_server = self.IrMailServer._get_mail_sever(domain) - used_mail_server = self.IrMailServer.browse(used_mail_server) - self.assertEqual( - used_mail_server, - expected_mail_server, - "It using %s but we expect to use %s" - % (used_mail_server.name, expected_mail_server.name), - ) - - def test_03_from_outgoing_server_another(self): - self._init_mail_server_domain_whilelist_based() - domain = "example.com" - email_from = "Mitchell Admin " % domain - expected_mail_server = self.mail_server_domainone - - self.message.replace_header("From", email_from) - # A mail server is configured for the email - with self.mock_smtplib_connection(): - message = self._send_mail(self.message) - self.assertEqual( - message["From"], "Mitchell Admin <%s>" % expected_mail_server.smtp_from - ) - - used_mail_server = self.IrMailServer._get_mail_sever(domain) - used_mail_server = self.IrMailServer.browse(used_mail_server) - self.assertEqual( - used_mail_server, - expected_mail_server, - "It using %s but we expect to use %s" - % (used_mail_server.name, expected_mail_server.name), - ) - - def test_04_from_outgoing_server_none_use_config(self): - self._init_mail_server_domain_whilelist_based() - domain = "example.com" - email_from = "Mitchell Admin " % domain - - self._delete_mail_servers() - self.assertFalse(self.IrMailServer.search([])) - # Find config values - config_smtp_from = tools.config.get("smtp_from") - config_smtp_domain_whitelist = tools.config.get("smtp_domain_whitelist") - if not config_smtp_from or not config_smtp_domain_whitelist: - self._skip_test( - "Cannot test transactions because there is not either smtp_from" - " or smtp_domain_whitelist." - ) - - self.message.replace_header("From", email_from) - # A mail server is configured for the email - with self.mock_smtplib_connection(): - message = self._send_mail(self.message) - self.assertEqual(message["From"], "Mitchell Admin <%s>" % config_smtp_from) - - used_mail_server = self.IrMailServer._get_mail_sever("example.com") - used_mail_server = self.IrMailServer.browse(used_mail_server) - self.assertFalse( - used_mail_server, "using this mail server %s" % (used_mail_server.name) - ) - - def test_05_from_outgoing_server_none_same_domain(self): - self._init_mail_server_domain_whilelist_based() - - # Find config values - config_smtp_from = tools.config.get("smtp_from") - config_smtp_domain_whitelist = domain = tools.config.get( - "smtp_domain_whitelist" - ) - if not config_smtp_from or not config_smtp_domain_whitelist: - self._skip_test( - "Cannot test transactions because there is not either smtp_from" - " or smtp_domain_whitelist." - ) - - email_from = "Mitchell Admin " % domain - - self._delete_mail_servers() - self.assertFalse(self.IrMailServer.search([])) - self.message.replace_header("From", email_from) - # A mail server is configured for the email - with self.mock_smtplib_connection(): - message = self._send_mail(self.message) - self.assertEqual(message["From"], email_from) - - used_mail_server = self.IrMailServer._get_mail_sever(domain) - used_mail_server = self.IrMailServer.browse(used_mail_server) - self.assertFalse(used_mail_server) - - def test_06_from_outgoing_server_no_name_from(self): - self._init_mail_server_domain_whilelist_based() - domain = "example.com" - email_from = "test@%s" % domain - expected_mail_server = self.mail_server_domainone - - self.message.replace_header("From", email_from) - # A mail server is configured for the email - with self.mock_smtplib_connection(): - message = self._send_mail(self.message) - self.assertEqual(message["From"], expected_mail_server.smtp_from) - - used_mail_server = self.IrMailServer._get_mail_sever(domain) - used_mail_server = self.IrMailServer.browse(used_mail_server) - self.assertEqual( - used_mail_server, - expected_mail_server, - "It using %s but we expect to use %s" - % (used_mail_server.name, expected_mail_server.name), - ) - - def test_07_from_outgoing_server_multidomain_1(self): - self._init_mail_server_domain_whilelist_based() - domain = "domainthree.com" - email_from = "Mitchell Admin " % domain - expected_mail_server = self.mail_server_domainthree - - self.message.replace_header("From", email_from) - # A mail server is configured for the email - with self.mock_smtplib_connection(): - message = self._send_mail(self.message) - self.assertEqual(message["From"], email_from) - - used_mail_server = self.IrMailServer._get_mail_sever(domain) - used_mail_server = self.IrMailServer.browse(used_mail_server) - self.assertEqual( - used_mail_server, - expected_mail_server, - "It using %s but we expect to use %s" - % (used_mail_server.name, expected_mail_server.name), - ) - - def test_08_from_outgoing_server_multidomain_3(self): - self._init_mail_server_domain_whilelist_based() - domain = "domainmulti.com" - email_from = "test@%s" % domain - expected_mail_server = self.mail_server_domainthree - - self.message.replace_header("From", email_from) - # A mail server is configured for the email - with self.mock_smtplib_connection(): - message = self._send_mail(self.message) - self.assertEqual(message["From"], email_from) - - used_mail_server = self.IrMailServer._get_mail_sever(domain) - used_mail_server = self.IrMailServer.browse(used_mail_server) - self.assertEqual( - used_mail_server, - expected_mail_server, - "It using %s but we expect to use %s" - % (used_mail_server.name, expected_mail_server.name), - ) - - def test_09_not_valid_domain_whitelist(self): - self._init_mail_server_domain_whilelist_based() - mail_server = self.mail_server_domainone - mail_server.domain_whitelist = "example.com" - error_msg = ( - "%s is not a valid domain. Please define a list of valid" - " domains separated by comma" - ) - - with self.assertRaisesRegex(ValidationError, error_msg % "asdasd"): - mail_server.domain_whitelist = "asdasd" - - with self.assertRaisesRegex(ValidationError, error_msg % "asdasd"): - mail_server.domain_whitelist = "example.com, asdasd" - - with self.assertRaisesRegex(ValidationError, error_msg % "invalid"): - mail_server.domain_whitelist = "example.com; invalid" - - with self.assertRaisesRegex(ValidationError, error_msg % ";"): - mail_server.domain_whitelist = ";" - - with self.assertRaisesRegex(ValidationError, error_msg % "."): - mail_server.domain_whitelist = "hola.com,." - - def test_10_not_valid_smtp_from(self): - self._init_mail_server_domain_whilelist_based() - mail_server = self.mail_server_domainone - error_msg = "Not a valid Email From" - - with self.assertRaisesRegex(ValidationError, error_msg): - mail_server.smtp_from = "asdasd" - - with self.assertRaisesRegex(ValidationError, error_msg): - mail_server.smtp_from = "example.com" - - with self.assertRaisesRegex(ValidationError, error_msg): - mail_server.smtp_from = "." - - mail_server.smtp_from = "notifications@test.com" +# Copyright 2017 LasLabs Inc. +# License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html). + +import logging +import os +from email import message_from_string + +import odoo.tools as tools +from odoo.exceptions import ValidationError +from odoo.tests.common import TransactionCase + +from odoo.addons.base.tests.common import MockSmtplibCase + +_logger = logging.getLogger(__name__) + + +class TestIrMailServer(TransactionCase, MockSmtplibCase): + @classmethod + def setUpClass(cls): + super().setUpClass() + cls.email_from = "derp@example.com" + cls.email_from_another = "another@example.com" + cls.IrMailServer = cls.env["ir.mail_server"] + cls.parameter_model = cls.env["ir.config_parameter"] + cls._delete_mail_servers() + cls.IrMailServer.create( + { + "name": "localhost", + "smtp_host": "localhost", + "smtp_from": cls.email_from, + } + ) + message_file = os.path.join( + os.path.dirname(os.path.realpath(__file__)), "test.msg" + ) + with open(message_file, "r") as fh: + cls.message = message_from_string(fh.read()) + + @classmethod + def _delete_mail_servers(cls): + """Delete all available mail servers""" + all_mail_servers = cls.IrMailServer.search([]) + if all_mail_servers: + all_mail_servers.unlink() + + def _init_mail_server_domain_whilelist_based(self): + self._delete_mail_servers() + self.assertFalse(self.IrMailServer.search([])) + self.mail_server_domainone = self.IrMailServer.create( + { + "name": "sandbox domainone", + "smtp_host": "localhost", + "smtp_from": "notifications@domainone.com", + "domain_whitelist": "domainone.com", + } + ) + self.mail_server_domaintwo = self.IrMailServer.create( + { + "name": "sandbox domaintwo", + "smtp_host": "localhost", + "smtp_from": "hola@domaintwo.com", + "domain_whitelist": "domaintwo.com", + } + ) + self.mail_server_domainthree = self.IrMailServer.create( + { + "name": "sandbox domainthree", + "smtp_host": "localhost", + "smtp_from": "notifications@domainthree.com", + "domain_whitelist": "domainthree.com,domainmulti.com", + } + ) + + def _skip_test(self, reason): + _logger.warning(reason) + self.skipTest(reason) + + def _send_mail( + self, + message, + mail_server_id=None, + smtp_server=None, + smtp_port=None, + smtp_user=None, + smtp_password=None, + smtp_encryption=None, + smtp_ssl_certificate=None, + smtp_ssl_private_key=None, + smtp_debug=False, + smtp_session=None, + ): + smtp = smtp_session + if not smtp: + smtp = self.IrMailServer.connect( + smtp_server, + smtp_port, + smtp_user, + smtp_password, + smtp_encryption, + smtp_from=message["From"], + ssl_certificate=smtp_ssl_certificate, + ssl_private_key=smtp_ssl_private_key, + smtp_debug=smtp_debug, + mail_server_id=mail_server_id, + ) + + send_from, send_to, message_string = self.IrMailServer._prepare_email_message( + message, smtp + ) + self.IrMailServer.send_email(message) + return message_string + + def test_send_email_injects_from_no_canonical(self): + """It should inject the FROM header correctly when no canonical name.""" + self.message.replace_header("From", "test@example.com") + # A mail server is configured for the email + with self.mock_smtplib_connection(): + message = self._send_mail(self.message) + self.assertEqual(message["From"], self.email_from) + + def test_send_email_injects_from_with_canonical(self): + """It should inject the FROM header correctly with a canonical name. + + Note that there is an extra `<` in the canonical name to test for + proper handling in the split. + """ + user = "Test < User" + self.message.replace_header("From", "%s " % user) + bounce_parameter = self.parameter_model.search( + [("key", "=", "mail.bounce.alias")] + ) + if bounce_parameter: + # Remove mail.bounce.alias to test Return-Path + bounce_parameter.unlink() + # Also check passing mail_server_id + mail_server_id = ( + self.IrMailServer.sudo().search([], order="sequence", limit=1)[0].id + ) + # A mail server is configured for the email + with self.mock_smtplib_connection(): + message = self._send_mail(self.message, mail_server_id=mail_server_id) + self.assertEqual(message["From"], '"{}" <{}>'.format(user, self.email_from)) + self.assertEqual( + message["Return-Path"], '"{}" <{}>'.format(user, self.email_from) + ) + + def test_01_from_outgoing_server_domainone(self): + self._init_mail_server_domain_whilelist_based() + domain = "domainone.com" + email_from = "Mitchell Admin " % domain + expected_mail_server = self.mail_server_domainone + + self.message.replace_header("From", email_from) + # A mail server is configured for the email + with self.mock_smtplib_connection(): + message = self._send_mail(self.message) + self.assertEqual(message["From"], email_from) + + used_mail_server = self.IrMailServer._get_mail_sever(domain) + used_mail_server = self.IrMailServer.browse(used_mail_server) + self.assertEqual( + used_mail_server, + expected_mail_server, + "It using %s but we expect to use %s" + % (used_mail_server.name, expected_mail_server.name), + ) + + def test_02_from_outgoing_server_domaintwo(self): + self._init_mail_server_domain_whilelist_based() + domain = "domaintwo.com" + email_from = "Mitchell Admin " % domain + expected_mail_server = self.mail_server_domaintwo + + self.message.replace_header("From", email_from) + # A mail server is configured for the email + with self.mock_smtplib_connection(): + message = self._send_mail(self.message) + self.assertEqual(message["From"], email_from) + + used_mail_server = self.IrMailServer._get_mail_sever(domain) + used_mail_server = self.IrMailServer.browse(used_mail_server) + self.assertEqual( + used_mail_server, + expected_mail_server, + "It using %s but we expect to use %s" + % (used_mail_server.name, expected_mail_server.name), + ) + + def test_03_from_outgoing_server_another(self): + self._init_mail_server_domain_whilelist_based() + domain = "example.com" + email_from = "Mitchell Admin " % domain + expected_mail_server = self.mail_server_domainone + + self.message.replace_header("From", email_from) + # A mail server is configured for the email + with self.mock_smtplib_connection(): + message = self._send_mail(self.message) + self.assertEqual( + message["From"], "Mitchell Admin <%s>" % expected_mail_server.smtp_from + ) + + used_mail_server = self.IrMailServer._get_mail_sever(domain) + used_mail_server = self.IrMailServer.browse(used_mail_server) + self.assertEqual( + used_mail_server, + expected_mail_server, + "It using %s but we expect to use %s" + % (used_mail_server.name, expected_mail_server.name), + ) + + def test_04_from_outgoing_server_none_use_config(self): + self._init_mail_server_domain_whilelist_based() + domain = "example.com" + email_from = "Mitchell Admin " % domain + + self._delete_mail_servers() + self.assertFalse(self.IrMailServer.search([])) + # Find config values + config_smtp_from = tools.config.get("smtp_from") + config_smtp_domain_whitelist = tools.config.get("smtp_domain_whitelist") + if not config_smtp_from or not config_smtp_domain_whitelist: + self._skip_test( + "Cannot test transactions because there is not either smtp_from" + " or smtp_domain_whitelist." + ) + + self.message.replace_header("From", email_from) + # A mail server is configured for the email + with self.mock_smtplib_connection(): + message = self._send_mail(self.message) + self.assertEqual(message["From"], "Mitchell Admin <%s>" % config_smtp_from) + + used_mail_server = self.IrMailServer._get_mail_sever("example.com") + used_mail_server = self.IrMailServer.browse(used_mail_server) + self.assertFalse( + used_mail_server, "using this mail server %s" % (used_mail_server.name) + ) + + def test_05_from_outgoing_server_none_same_domain(self): + self._init_mail_server_domain_whilelist_based() + + # Find config values + config_smtp_from = tools.config.get("smtp_from") + config_smtp_domain_whitelist = domain = tools.config.get( + "smtp_domain_whitelist" + ) + if not config_smtp_from or not config_smtp_domain_whitelist: + self._skip_test( + "Cannot test transactions because there is not either smtp_from" + " or smtp_domain_whitelist." + ) + + email_from = "Mitchell Admin " % domain + + self._delete_mail_servers() + self.assertFalse(self.IrMailServer.search([])) + self.message.replace_header("From", email_from) + # A mail server is configured for the email + with self.mock_smtplib_connection(): + message = self._send_mail(self.message) + self.assertEqual(message["From"], email_from) + + used_mail_server = self.IrMailServer._get_mail_sever(domain) + used_mail_server = self.IrMailServer.browse(used_mail_server) + self.assertFalse(used_mail_server) + + def test_06_from_outgoing_server_no_name_from(self): + self._init_mail_server_domain_whilelist_based() + domain = "example.com" + email_from = "test@%s" % domain + expected_mail_server = self.mail_server_domainone + + self.message.replace_header("From", email_from) + # A mail server is configured for the email + with self.mock_smtplib_connection(): + message = self._send_mail(self.message) + self.assertEqual(message["From"], expected_mail_server.smtp_from) + + used_mail_server = self.IrMailServer._get_mail_sever(domain) + used_mail_server = self.IrMailServer.browse(used_mail_server) + self.assertEqual( + used_mail_server, + expected_mail_server, + "It using %s but we expect to use %s" + % (used_mail_server.name, expected_mail_server.name), + ) + + def test_07_from_outgoing_server_multidomain_1(self): + self._init_mail_server_domain_whilelist_based() + domain = "domainthree.com" + email_from = "Mitchell Admin " % domain + expected_mail_server = self.mail_server_domainthree + + self.message.replace_header("From", email_from) + # A mail server is configured for the email + with self.mock_smtplib_connection(): + message = self._send_mail(self.message) + self.assertEqual(message["From"], email_from) + + used_mail_server = self.IrMailServer._get_mail_sever(domain) + used_mail_server = self.IrMailServer.browse(used_mail_server) + self.assertEqual( + used_mail_server, + expected_mail_server, + "It using %s but we expect to use %s" + % (used_mail_server.name, expected_mail_server.name), + ) + + def test_08_from_outgoing_server_multidomain_3(self): + self._init_mail_server_domain_whilelist_based() + domain = "domainmulti.com" + email_from = "test@%s" % domain + expected_mail_server = self.mail_server_domainthree + + self.message.replace_header("From", email_from) + # A mail server is configured for the email + with self.mock_smtplib_connection(): + message = self._send_mail(self.message) + self.assertEqual(message["From"], email_from) + + used_mail_server = self.IrMailServer._get_mail_sever(domain) + used_mail_server = self.IrMailServer.browse(used_mail_server) + self.assertEqual( + used_mail_server, + expected_mail_server, + "It using %s but we expect to use %s" + % (used_mail_server.name, expected_mail_server.name), + ) + + def test_09_not_valid_domain_whitelist(self): + self._init_mail_server_domain_whilelist_based() + mail_server = self.mail_server_domainone + mail_server.domain_whitelist = "example.com" + error_msg = ( + "%s is not a valid domain. Please define a list of valid" + " domains separated by comma" + ) + + with self.assertRaisesRegex(ValidationError, error_msg % "asdasd"): + mail_server.domain_whitelist = "asdasd" + + with self.assertRaisesRegex(ValidationError, error_msg % "asdasd"): + mail_server.domain_whitelist = "example.com, asdasd" + + with self.assertRaisesRegex(ValidationError, error_msg % "invalid"): + mail_server.domain_whitelist = "example.com; invalid" + + with self.assertRaisesRegex(ValidationError, error_msg % ";"): + mail_server.domain_whitelist = ";" + + with self.assertRaisesRegex(ValidationError, error_msg % "."): + mail_server.domain_whitelist = "hola.com,." + + def test_10_not_valid_smtp_from(self): + self._init_mail_server_domain_whilelist_based() + mail_server = self.mail_server_domainone + error_msg = "Not a valid Email From" + + with self.assertRaisesRegex(ValidationError, error_msg): + mail_server.smtp_from = "asdasd" + + with self.assertRaisesRegex(ValidationError, error_msg): + mail_server.smtp_from = "example.com" + + with self.assertRaisesRegex(ValidationError, error_msg): + mail_server.smtp_from = "." + + mail_server.smtp_from = "notifications@test.com" diff --git a/mail_outbound_static/views/ir_mail_server_view.xml b/mail_outbound_static/views/ir_mail_server_view.xml index cb20e4d8..5b533e96 100644 --- a/mail_outbound_static/views/ir_mail_server_view.xml +++ b/mail_outbound_static/views/ir_mail_server_view.xml @@ -1,20 +1,20 @@ - - - - - - IR Mail Server - From Address - ir.mail_server - - - - - - - - - - + + + + + + IR Mail Server - From Address + ir.mail_server + + + + + + + + + + diff --git a/purchase_analytic/views/purchase_views.xml b/purchase_analytic/views/purchase_views.xml index 118d4463..d5b4f234 100644 --- a/purchase_analytic/views/purchase_views.xml +++ b/purchase_analytic/views/purchase_views.xml @@ -38,10 +38,7 @@ - + diff --git a/purchase_order_owner/models/purchase_order.py b/purchase_order_owner/models/purchase_order.py index aab1bad0..637761a6 100644 --- a/purchase_order_owner/models/purchase_order.py +++ b/purchase_order_owner/models/purchase_order.py @@ -2,6 +2,7 @@ # License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl). from odoo import fields, models + from odoo.addons.purchase.models.purchase import PurchaseOrder diff --git a/purchase_order_owner/views/purchase_order_views.xml b/purchase_order_owner/views/purchase_order_views.xml index 3037ec76..df2e43a0 100644 --- a/purchase_order_owner/views/purchase_order_views.xml +++ b/purchase_order_owner/views/purchase_order_views.xml @@ -39,7 +39,12 @@ - + @@ -52,7 +57,12 @@ - + diff --git a/purchase_report_shipping_address/README.rst b/purchase_report_shipping_address/README.rst index f8d06e18..d93f62cc 100644 --- a/purchase_report_shipping_address/README.rst +++ b/purchase_report_shipping_address/README.rst @@ -1,79 +1,79 @@ -================================ -Purchase Report Shipping Address -================================ - -.. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! - !! 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%2Fpurchase--reporting-lightgray.png?logo=github - :target: https://github.com/OCA/purchase-reporting/tree/16.0/purchase_report_shipping_address - :alt: OCA/purchase-reporting -.. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png - :target: https://translation.odoo-community.org/projects/purchase-reporting-16-0/purchase-reporting-16-0-purchase_report_shipping_address - :alt: Translate me on Weblate -.. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png - :target: https://runbot.odoo-community.org/runbot/141/16.0 - :alt: Try me on Runbot - -|badge1| |badge2| |badge3| |badge4| |badge5| - -This module adds the translatable Warehouse Address Details field in warehouse to show in purchase reports. - -Purchase documents are printed in supplier's language, however Odoo by default does not -come with the ability to present the warehouse address in different languages. -This module intends to take care of this shortcoming. - -**Table of contents** - -.. contents:: - :local: - -Configuration -============= - -#. Go to *Inventory > Configuration > Warehouses* and open a warehouse record for which -the address presentation should be adjusted for purchase reports. -#. Update Warehouse Address Details field. - -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 -~~~~~~~ - -* Quartile Limited - -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/purchase-reporting `_ project on GitHub. - -You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute. +================================ +Purchase Report Shipping Address +================================ + +.. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + !! 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%2Fpurchase--reporting-lightgray.png?logo=github + :target: https://github.com/OCA/purchase-reporting/tree/16.0/purchase_report_shipping_address + :alt: OCA/purchase-reporting +.. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png + :target: https://translation.odoo-community.org/projects/purchase-reporting-16-0/purchase-reporting-16-0-purchase_report_shipping_address + :alt: Translate me on Weblate +.. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png + :target: https://runbot.odoo-community.org/runbot/141/16.0 + :alt: Try me on Runbot + +|badge1| |badge2| |badge3| |badge4| |badge5| + +This module adds the translatable Warehouse Address Details field in warehouse to show in purchase reports. + +Purchase documents are printed in supplier's language, however Odoo by default does not +come with the ability to present the warehouse address in different languages. +This module intends to take care of this shortcoming. + +**Table of contents** + +.. contents:: + :local: + +Configuration +============= + +#. Go to *Inventory > Configuration > Warehouses* and open a warehouse record for which +the address presentation should be adjusted for purchase reports. +#. Update Warehouse Address Details field. + +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 +~~~~~~~ + +* Quartile Limited + +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/purchase-reporting `_ project on GitHub. + +You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute. diff --git a/purchase_report_shipping_address/__init__.py b/purchase_report_shipping_address/__init__.py index 7f0969ed..0650744f 100644 --- a/purchase_report_shipping_address/__init__.py +++ b/purchase_report_shipping_address/__init__.py @@ -1 +1 @@ -from . import models +from . import models diff --git a/purchase_report_shipping_address/__manifest__.py b/purchase_report_shipping_address/__manifest__.py index b500c544..fec6c36e 100644 --- a/purchase_report_shipping_address/__manifest__.py +++ b/purchase_report_shipping_address/__manifest__.py @@ -1,17 +1,17 @@ -# Copyright 2023 Quartile Limited -# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). -{ - "name": "Purchase Report Shipping Address", - "version": "16.0.1.0.0", - "category": "Reporting", - "website": "https://github.com/OCA/purchase-reporting", - "license": "AGPL-3", - "author": "Quartile Limited, Odoo Community Association (OCA)", - "depends": ["purchase_stock"], - "data": [ - "views/stock_warehouse_views.xml", - "reports/purchase_order_templates.xml", - "reports/purchase_quotation_templates.xml", - ], - "installable": True, -} +# Copyright 2023 Quartile Limited +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). +{ + "name": "Purchase Report Shipping Address", + "version": "16.0.1.0.0", + "category": "Reporting", + "website": "https://github.com/OCA/purchase-reporting", + "license": "AGPL-3", + "author": "Quartile Limited, Odoo Community Association (OCA)", + "depends": ["purchase_stock"], + "data": [ + "views/stock_warehouse_views.xml", + "reports/purchase_order_templates.xml", + "reports/purchase_quotation_templates.xml", + ], + "installable": True, +} diff --git a/purchase_report_shipping_address/models/__init__.py b/purchase_report_shipping_address/models/__init__.py index ac73c116..413e27de 100644 --- a/purchase_report_shipping_address/models/__init__.py +++ b/purchase_report_shipping_address/models/__init__.py @@ -1 +1 @@ -from . import stock_warehouse +from . import stock_warehouse diff --git a/purchase_report_shipping_address/models/stock_warehouse.py b/purchase_report_shipping_address/models/stock_warehouse.py index fd9c894d..58386d25 100644 --- a/purchase_report_shipping_address/models/stock_warehouse.py +++ b/purchase_report_shipping_address/models/stock_warehouse.py @@ -1,12 +1,12 @@ -# Copyright 2023 Quartile Limited -# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). - -from odoo import fields, models - - -class StockWarehouse(models.Model): - _inherit = "stock.warehouse" - - warehouse_address_details = fields.Html( - translate=True, - ) +# Copyright 2023 Quartile Limited +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). + +from odoo import fields, models + + +class StockWarehouse(models.Model): + _inherit = "stock.warehouse" + + warehouse_address_details = fields.Html( + translate=True, + ) diff --git a/purchase_report_shipping_address/readme/CONFIGURE.rst b/purchase_report_shipping_address/readme/CONFIGURE.rst index 644b9352..569fed6c 100644 --- a/purchase_report_shipping_address/readme/CONFIGURE.rst +++ b/purchase_report_shipping_address/readme/CONFIGURE.rst @@ -1,3 +1,3 @@ -#. Go to *Inventory > Configuration > Warehouses* and open a warehouse record for which -the address presentation should be adjusted for purchase reports. -#. Update Warehouse Address Details field. +#. Go to *Inventory > Configuration > Warehouses* and open a warehouse record for which +the address presentation should be adjusted for purchase reports. +#. Update Warehouse Address Details field. diff --git a/purchase_report_shipping_address/readme/DESCRIPTION.rst b/purchase_report_shipping_address/readme/DESCRIPTION.rst index 195306e7..827bff73 100644 --- a/purchase_report_shipping_address/readme/DESCRIPTION.rst +++ b/purchase_report_shipping_address/readme/DESCRIPTION.rst @@ -1,5 +1,5 @@ -This module adds the translatable Warehouse Address Details field in warehouse to show in purchase reports. - -Purchase documents are printed in supplier's language, however Odoo by default does not -come with the ability to present the warehouse address in different languages. -This module intends to take care of this shortcoming. +This module adds the translatable Warehouse Address Details field in warehouse to show in purchase reports. + +Purchase documents are printed in supplier's language, however Odoo by default does not +come with the ability to present the warehouse address in different languages. +This module intends to take care of this shortcoming. diff --git a/purchase_report_shipping_address/reports/purchase_order_templates.xml b/purchase_report_shipping_address/reports/purchase_order_templates.xml index 8defadcb..c28bc0ad 100644 --- a/purchase_report_shipping_address/reports/purchase_order_templates.xml +++ b/purchase_report_shipping_address/reports/purchase_order_templates.xml @@ -1,26 +1,26 @@ - - - - + + + + diff --git a/purchase_report_shipping_address/reports/purchase_quotation_templates.xml b/purchase_report_shipping_address/reports/purchase_quotation_templates.xml index a1c3b6a9..e8e6f1f6 100644 --- a/purchase_report_shipping_address/reports/purchase_quotation_templates.xml +++ b/purchase_report_shipping_address/reports/purchase_quotation_templates.xml @@ -1,26 +1,26 @@ - - - - + + + + diff --git a/purchase_report_shipping_address/views/stock_warehouse_views.xml b/purchase_report_shipping_address/views/stock_warehouse_views.xml index f53dcbb3..2e11c508 100644 --- a/purchase_report_shipping_address/views/stock_warehouse_views.xml +++ b/purchase_report_shipping_address/views/stock_warehouse_views.xml @@ -1,13 +1,13 @@ - - - - stock.warehouse - stock.warehouse - - - - - - - - + + + + stock.warehouse + stock.warehouse + + + + + + + + diff --git a/report_company_details_translatable/README.rst b/report_company_details_translatable/README.rst index d4cd6edf..a80b5497 100644 --- a/report_company_details_translatable/README.rst +++ b/report_company_details_translatable/README.rst @@ -1,73 +1,73 @@ -=================================== -Report Company Details Translatable -=================================== - -.. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! - !! 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%2Freporting--engine-lightgray.png?logo=github - :target: https://github.com/OCA/reporting-engine/tree/16.0/report_company_details_translatable - :alt: OCA/reporting-engine -.. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png - :target: https://translation.odoo-community.org/projects/reporting-engine-16-0/reporting-engine-16-0-report_company_details_translatable - :alt: Translate me on Weblate -.. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png - :target: https://runbot.odoo-community.org/runbot/143/16.0 - :alt: Try me on Runbot - -|badge1| |badge2| |badge3| |badge4| |badge5| - -This module allows to translate the company details to show in PDF reports. - -In some countries where the dominant language is not based on Roman alphabet, -it is often necessary to be able to print the company details according to the partner's language. -In case of Japan, typically Japanese for domestic transactions, and English for international ones, for example. -This module intends to cater to this requirement. - -**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 -~~~~~~~ - -* Quartile Limited - -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/reporting-engine `_ project on GitHub. - -You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute. +=================================== +Report Company Details Translatable +=================================== + +.. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + !! 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%2Freporting--engine-lightgray.png?logo=github + :target: https://github.com/OCA/reporting-engine/tree/16.0/report_company_details_translatable + :alt: OCA/reporting-engine +.. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png + :target: https://translation.odoo-community.org/projects/reporting-engine-16-0/reporting-engine-16-0-report_company_details_translatable + :alt: Translate me on Weblate +.. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png + :target: https://runbot.odoo-community.org/runbot/143/16.0 + :alt: Try me on Runbot + +|badge1| |badge2| |badge3| |badge4| |badge5| + +This module allows to translate the company details to show in PDF reports. + +In some countries where the dominant language is not based on Roman alphabet, +it is often necessary to be able to print the company details according to the partner's language. +In case of Japan, typically Japanese for domestic transactions, and English for international ones, for example. +This module intends to cater to this requirement. + +**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 +~~~~~~~ + +* Quartile Limited + +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/reporting-engine `_ project on GitHub. + +You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute. diff --git a/report_company_details_translatable/__init__.py b/report_company_details_translatable/__init__.py index 7f0969ed..0650744f 100644 --- a/report_company_details_translatable/__init__.py +++ b/report_company_details_translatable/__init__.py @@ -1 +1 @@ -from . import models +from . import models diff --git a/report_company_details_translatable/__manifest__.py b/report_company_details_translatable/__manifest__.py index a41a797e..92a6d4ad 100644 --- a/report_company_details_translatable/__manifest__.py +++ b/report_company_details_translatable/__manifest__.py @@ -1,12 +1,12 @@ -# Copyright 2022 Quartile Limited -# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). -{ - "name": "Report Company Details Translatable", - "version": "16.0.1.0.0", - "category": "Reporting", - "website": "https://github.com/OCA/reporting-engine", - "license": "AGPL-3", - "author": "Quartile Limited, Odoo Community Association (OCA)", - "depends": ["base"], - "installable": True, -} +# Copyright 2022 Quartile Limited +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). +{ + "name": "Report Company Details Translatable", + "version": "16.0.1.0.0", + "category": "Reporting", + "website": "https://github.com/OCA/reporting-engine", + "license": "AGPL-3", + "author": "Quartile Limited, Odoo Community Association (OCA)", + "depends": ["base"], + "installable": True, +} diff --git a/report_company_details_translatable/models/__init__.py b/report_company_details_translatable/models/__init__.py index f5d111c1..aff44f33 100644 --- a/report_company_details_translatable/models/__init__.py +++ b/report_company_details_translatable/models/__init__.py @@ -1 +1 @@ -from . import res_company +from . import res_company diff --git a/report_company_details_translatable/models/res_company.py b/report_company_details_translatable/models/res_company.py index c33ba4de..1977d800 100644 --- a/report_company_details_translatable/models/res_company.py +++ b/report_company_details_translatable/models/res_company.py @@ -1,13 +1,13 @@ -# Copyright 2022 Quartile Limited -# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). - -from odoo import fields, models - - -class ResCompany(models.Model): - _inherit = "res.company" - - company_details = fields.Html( - translate=True, - sanitize=False, - ) +# Copyright 2022 Quartile Limited +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). + +from odoo import fields, models + + +class ResCompany(models.Model): + _inherit = "res.company" + + company_details = fields.Html( + translate=True, + sanitize=False, + ) diff --git a/report_company_details_translatable/readme/DESCRIPTION.rst b/report_company_details_translatable/readme/DESCRIPTION.rst index 600142c8..6f3b2de0 100644 --- a/report_company_details_translatable/readme/DESCRIPTION.rst +++ b/report_company_details_translatable/readme/DESCRIPTION.rst @@ -1,6 +1,6 @@ -This module allows to translate the company details to show in PDF reports. - -In some countries where the dominant language is not based on Roman alphabet, -it is often necessary to be able to print the company details according to the partner's language. -In case of Japan, typically Japanese for domestic transactions, and English for international ones, for example. -This module intends to cater to this requirement. +This module allows to translate the company details to show in PDF reports. + +In some countries where the dominant language is not based on Roman alphabet, +it is often necessary to be able to print the company details according to the partner's language. +In case of Japan, typically Japanese for domestic transactions, and English for international ones, for example. +This module intends to cater to this requirement. diff --git a/report_csv/models/ir_report.py b/report_csv/models/ir_report.py index b6eeca1d..71277c51 100644 --- a/report_csv/models/ir_report.py +++ b/report_csv/models/ir_report.py @@ -10,8 +10,8 @@ class ReportAction(models.Model): report_type = fields.Selection( selection_add=[("csv", "csv")], ondelete={"csv": "set default"} ) - encoding = fields.Char(help="Encoding to be applied to the generated CSV file. " - "e.g. cp932" + encoding = fields.Char( + help="Encoding to be applied to the generated CSV file. " "e.g. cp932" ) encode_error_handling = fields.Selection( selection=[("ignore", "Ignore"), ("replace", "Replace")], @@ -27,7 +27,7 @@ def _render_csv(self, report_ref, docids, data): return report_model.with_context( active_model=report_sudo.model, encoding=self.encoding, - encode_error_handling=self.encode_error_handling + encode_error_handling=self.encode_error_handling, ).create_csv_report(docids, data) @api.model diff --git a/report_csv/report/report_csv.py b/report_csv/report/report_csv.py index 6d7bd19f..82fff524 100644 --- a/report_csv/report/report_csv.py +++ b/report_csv/report/report_csv.py @@ -55,10 +55,10 @@ def create_csv_report(self, docids, data): return file_data.read().encode(encoding, errors=error_handling), "csv" try: return file_data.read().encode(encoding), "csv" - except Exception: + except Exception as e: raise UserError( _("Failed to encode the data with the encoding set in the report.") - ) + ) from e def csv_report_options(self): """ diff --git a/report_csv/views/ir_actions_views.xml b/report_csv/views/ir_actions_views.xml index 0250efae..d76fbeaf 100644 --- a/report_csv/views/ir_actions_views.xml +++ b/report_csv/views/ir_actions_views.xml @@ -1,13 +1,19 @@ - + ir.actions.report ir.actions.report - + - - + + diff --git a/stock_owner_restriction/models/stock_move.py b/stock_owner_restriction/models/stock_move.py index 8909adcd..6e0d5802 100644 --- a/stock_owner_restriction/models/stock_move.py +++ b/stock_owner_restriction/models/stock_move.py @@ -18,18 +18,17 @@ def _get_moves_to_assign_with_standard_behavior(self): return self.filtered( lambda m: m.picking_type_id.owner_restriction == "standard_behavior" ) - + def _get_owner_for_assign(self): """This method is expected to be extended as necessary. e.g. different logic needs to be applied for moves in manufacturing orders. """ self.ensure_one() partner = self.move_dest_ids.picking_id.owner_id - # partner = self.move_dest_ids.picking_id.owner_id or self.move_dest_ids.picking_id.partner_id if not partner: partner = self.picking_id.owner_id or self.picking_id.partner_id return partner - + def _action_assign(self, force_qty=False): # Split moves by picking type owner behavior restriction to process # moves depending of their owners diff --git a/stock_picking_accounting_date/__manifest__.py b/stock_picking_accounting_date/__manifest__.py index a000fe3e..5854e6ab 100644 --- a/stock_picking_accounting_date/__manifest__.py +++ b/stock_picking_accounting_date/__manifest__.py @@ -3,7 +3,7 @@ { "name": "Stock Picking Accounting Date", "version": "16.0.1.0.0", - "author": "Quartile Limited", + "author": "Quartile Limited, Odoo Community Association (OCA)", "website": "https://www.quartile.co", "category": "Stock", "license": "AGPL-3", diff --git a/stock_split_picking/models/stock_picking.py b/stock_split_picking/models/stock_picking.py index d54d4a5b..53c1adf0 100644 --- a/stock_split_picking/models/stock_picking.py +++ b/stock_split_picking/models/stock_picking.py @@ -82,8 +82,8 @@ def _create_split_backorder(self, default=None): ) self.message_post( body=_( - 'The backorder %s has been created.' - , backorder_picking._get_html_link()) + "The backorder %s has been created.", backorder_picking._get_html_link() + ) ) return backorder_picking diff --git a/web_widget_open_tab/models/ir_ui_view.py b/web_widget_open_tab/models/ir_ui_view.py index 8fc199f5..4004fe8d 100644 --- a/web_widget_open_tab/models/ir_ui_view.py +++ b/web_widget_open_tab/models/ir_ui_view.py @@ -16,7 +16,7 @@ def _get_view(self, view_id=None, view_type="form", **options): if view_type == "tree" and model.add_open_tab_field: id_elem = """""" id_elem = etree.fromstring(id_elem) - tree = arch.xpath('//tree')[0] + tree = arch.xpath("//tree")[0] name_field = tree.xpath('./field[@name="name"]') if name_field: tree.insert(name_field[0].getparent().index(name_field[0]) + 1, id_elem)