From ae1775212e79d4ed6328165291a7870f63c0ef72 Mon Sep 17 00:00:00 2001 From: valen Date: Mon, 14 Jun 2021 14:58:14 +0200 Subject: [PATCH 1/8] [ADD]Website Account Fiscal Position Partner Type --- .../__init__.py | 4 ++ .../__manifest__.py | 16 ++++++ .../controllers/__init__.py | 4 ++ .../controllers/main.py | 51 ++++++++++++++++++ .../readme/CONTRIBUTORS.rst | 4 ++ .../readme/DESCRIPTION.rst | 3 ++ .../readme/USAGE.rst | 5 ++ .../static/description/icon.png | Bin 0 -> 9455 bytes .../views/website_sale.xml | 36 +++++++++++++ 9 files changed, 123 insertions(+) create mode 100644 website_account_fiscal_position_partner_type/__init__.py create mode 100644 website_account_fiscal_position_partner_type/__manifest__.py create mode 100644 website_account_fiscal_position_partner_type/controllers/__init__.py create mode 100644 website_account_fiscal_position_partner_type/controllers/main.py create mode 100644 website_account_fiscal_position_partner_type/readme/CONTRIBUTORS.rst create mode 100644 website_account_fiscal_position_partner_type/readme/DESCRIPTION.rst create mode 100644 website_account_fiscal_position_partner_type/readme/USAGE.rst create mode 100644 website_account_fiscal_position_partner_type/static/description/icon.png create mode 100644 website_account_fiscal_position_partner_type/views/website_sale.xml diff --git a/website_account_fiscal_position_partner_type/__init__.py b/website_account_fiscal_position_partner_type/__init__.py new file mode 100644 index 0000000000..6b9e5664d3 --- /dev/null +++ b/website_account_fiscal_position_partner_type/__init__.py @@ -0,0 +1,4 @@ +# Copyright 2021 Valentin Vinagre +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). + +from . import controllers diff --git a/website_account_fiscal_position_partner_type/__manifest__.py b/website_account_fiscal_position_partner_type/__manifest__.py new file mode 100644 index 0000000000..e01edd7788 --- /dev/null +++ b/website_account_fiscal_position_partner_type/__manifest__.py @@ -0,0 +1,16 @@ +# Copyright 2021 Valentín Vinagre +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + +{ + "name": "Website Account Fiscal Position Partner Type", + "version": "13.0.0.0.1", + "category": "Website", + "website": "https://github.com/OCA/account-fiscal-rule", + "author": "Sygel Technology," "Odoo Community Association (OCA)", + "license": "AGPL-3", + "application": False, + "installable": True, + "development_status": "Beta", + "depends": ["account_fiscal_position_partner_type", "website_sale"], + "data": ["views/website_sale.xml"], +} diff --git a/website_account_fiscal_position_partner_type/controllers/__init__.py b/website_account_fiscal_position_partner_type/controllers/__init__.py new file mode 100644 index 0000000000..9c53ff8f86 --- /dev/null +++ b/website_account_fiscal_position_partner_type/controllers/__init__.py @@ -0,0 +1,4 @@ +# Copyright 2021 Valentin Vinagre +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). + +from . import main diff --git a/website_account_fiscal_position_partner_type/controllers/main.py b/website_account_fiscal_position_partner_type/controllers/main.py new file mode 100644 index 0000000000..62d4edaca1 --- /dev/null +++ b/website_account_fiscal_position_partner_type/controllers/main.py @@ -0,0 +1,51 @@ +# Copyright 2021 Valentin Vinagre +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). + +from odoo import http +from odoo.http import request + +from odoo.addons.website_sale.controllers.main import WebsiteSale + + +class WebsiteSale(WebsiteSale): + def values_postprocess(self, order, mode, values, errors, error_msg): + new_values, errors, error_msg = super(WebsiteSale, self).values_postprocess( + order=order, mode=mode, values=values, errors=errors, error_msg=error_msg + ) + if mode[1] in ("billing") and values.get("fiscal_position_type", False): + new_values.update( + {"fiscal_position_type": values.get("fiscal_position_type")} + ) + return new_values, errors, error_msg + + @http.route() + def address(self, **kw): + res = super(WebsiteSale, self).address(**kw) + if res.qcontext: + mode = res.qcontext.get("mode", False) + if mode and mode[1] == "billing": + # Get default position + def_fiscpostype = ( + request.website.company_id.default_fiscal_position_type or "b2c" + ) + # Get position if exist order + order = request.website.sale_get_order() + if order.partner_id: + def_fiscpostype = order.partner_id.fiscal_position_type + # if posted, get the last value + if kw.get("submitted", False): + if res.qcontext.get("error", False): + def_fiscpostype = kw.get( + "fiscal_position_type", def_fiscpostype + ) + # get all options + afp_obj = request.env["account.fiscal.position"].sudo() + res.qcontext.update( + { + "def_fiscpostype": def_fiscpostype, + "fiscpostypevalues": dict( + afp_obj._fields["fiscal_position_type"].selection + ), + } + ) + return res diff --git a/website_account_fiscal_position_partner_type/readme/CONTRIBUTORS.rst b/website_account_fiscal_position_partner_type/readme/CONTRIBUTORS.rst new file mode 100644 index 0000000000..8eaaf8c0bd --- /dev/null +++ b/website_account_fiscal_position_partner_type/readme/CONTRIBUTORS.rst @@ -0,0 +1,4 @@ +* `Sygel `_: + + * Harald Panten + * Valentin Vinagre diff --git a/website_account_fiscal_position_partner_type/readme/DESCRIPTION.rst b/website_account_fiscal_position_partner_type/readme/DESCRIPTION.rst new file mode 100644 index 0000000000..1594a96478 --- /dev/null +++ b/website_account_fiscal_position_partner_type/readme/DESCRIPTION.rst @@ -0,0 +1,3 @@ +This module allows e-commerce customers to select if they're end customers or companies. + +This module has been designed to be used according the EU One-Stop-Shop in combination with l10n_eu_oss for helping to differentiate which taxes have to be applied. diff --git a/website_account_fiscal_position_partner_type/readme/USAGE.rst b/website_account_fiscal_position_partner_type/readme/USAGE.rst new file mode 100644 index 0000000000..ac6fd8956b --- /dev/null +++ b/website_account_fiscal_position_partner_type/readme/USAGE.rst @@ -0,0 +1,5 @@ +After allowing e-commerce customers to a free sign up: + +#. Once the customer wants to buy a product in the e-commerce, he/she will have to specify the partner type field (End customer/company) before finishing the checkout. + +#. Depending on the partner type, the applied taxes to the products may change. diff --git a/website_account_fiscal_position_partner_type/static/description/icon.png b/website_account_fiscal_position_partner_type/static/description/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..3a0328b516c4980e8e44cdb63fd945757ddd132d GIT binary patch literal 9455 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 z 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 Xviia!U7SGha1wx#SCgwmn*{w2TRX*I literal 0 HcmV?d00001 diff --git a/website_account_fiscal_position_partner_type/views/website_sale.xml b/website_account_fiscal_position_partner_type/views/website_sale.xml new file mode 100644 index 0000000000..8d3ab7f35e --- /dev/null +++ b/website_account_fiscal_position_partner_type/views/website_sale.xml @@ -0,0 +1,36 @@ + + + + + From f4c64f4ef58dc6117d3a72051f66981d03f5e61b Mon Sep 17 00:00:00 2001 From: oca-travis Date: Fri, 2 Jul 2021 07:50:35 +0000 Subject: [PATCH 2/8] [UPD] Update website_account_fiscal_position_partner_type.pot --- ...e_account_fiscal_position_partner_type.pot | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 website_account_fiscal_position_partner_type/i18n/website_account_fiscal_position_partner_type.pot diff --git a/website_account_fiscal_position_partner_type/i18n/website_account_fiscal_position_partner_type.pot b/website_account_fiscal_position_partner_type/i18n/website_account_fiscal_position_partner_type.pot new file mode 100644 index 0000000000..bf14dcca1f --- /dev/null +++ b/website_account_fiscal_position_partner_type/i18n/website_account_fiscal_position_partner_type.pot @@ -0,0 +1,19 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * website_account_fiscal_position_partner_type +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 13.0\n" +"Report-Msgid-Bugs-To: \n" +"Last-Translator: \n" +"Language-Team: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Plural-Forms: \n" + +#. module: website_account_fiscal_position_partner_type +#: model_terms:ir.ui.view,arch_db:website_account_fiscal_position_partner_type.address_fiscal_position_type +msgid "Partner Type" +msgstr "" From dd4e24ef7e044105345e24f9cfb3e049a46064cf Mon Sep 17 00:00:00 2001 From: OCA-git-bot Date: Fri, 2 Jul 2021 08:31:06 +0000 Subject: [PATCH 3/8] [UPD] README.rst --- .../README.rst | 87 ++++ .../static/description/index.html | 436 ++++++++++++++++++ 2 files changed, 523 insertions(+) create mode 100644 website_account_fiscal_position_partner_type/README.rst create mode 100644 website_account_fiscal_position_partner_type/static/description/index.html diff --git a/website_account_fiscal_position_partner_type/README.rst b/website_account_fiscal_position_partner_type/README.rst new file mode 100644 index 0000000000..1ae4176898 --- /dev/null +++ b/website_account_fiscal_position_partner_type/README.rst @@ -0,0 +1,87 @@ +============================================ +Website Account Fiscal Position Partner Type +============================================ + +.. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + !! 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%2Fe--commerce-lightgray.png?logo=github + :target: https://github.com/OCA/e-commerce/tree/13.0/website_account_fiscal_position_partner_type + :alt: OCA/e-commerce +.. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png + :target: https://translation.odoo-community.org/projects/e-commerce-13-0/e-commerce-13-0-website_account_fiscal_position_partner_type + :alt: Translate me on Weblate +.. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png + :target: https://runbot.odoo-community.org/runbot/113/13.0 + :alt: Try me on Runbot + +|badge1| |badge2| |badge3| |badge4| |badge5| + +This module allows e-commerce customers to select if they're end customers or companies. + +This module has been designed to be used according the EU One-Stop-Shop in combination with l10n_eu_oss for helping to differentiate which taxes have to be applied. + +**Table of contents** + +.. contents:: + :local: + +Usage +===== + +After allowing e-commerce customers to a free sign up: + +#. Once the customer wants to buy a product in the e-commerce, he/she will have to specify the partner type field (End customer/company) before finishing the checkout. + +#. Depending on the partner type, the applied taxes to the products may change. + +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 +~~~~~~~ + +* Sygel Technology + +Contributors +~~~~~~~~~~~~ + +* `Sygel `_: + + * Harald Panten + * Valentin Vinagre + +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/e-commerce `_ project on GitHub. + +You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute. diff --git a/website_account_fiscal_position_partner_type/static/description/index.html b/website_account_fiscal_position_partner_type/static/description/index.html new file mode 100644 index 0000000000..f0eb279903 --- /dev/null +++ b/website_account_fiscal_position_partner_type/static/description/index.html @@ -0,0 +1,436 @@ + + + + + + +Website Account Fiscal Position Partner Type + + + +
+

Website Account Fiscal Position Partner Type

+ + +

Beta License: AGPL-3 OCA/e-commerce Translate me on Weblate Try me on Runbot

+

This module allows e-commerce customers to select if they’re end customers or companies.

+

This module has been designed to be used according the EU One-Stop-Shop in combination with l10n_eu_oss for helping to differentiate which taxes have to be applied.

+

Table of contents

+ +
+

Usage

+

After allowing e-commerce customers to a free sign up:

+
    +
  1. Once the customer wants to buy a product in the e-commerce, he/she will have to specify the partner type field (End customer/company) before finishing the checkout.
    2. +
  2. Depending on the partner type, the applied taxes to the products may change.
    3. +
+
+
+

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

+
    +
  • Sygel Technology
    • +
+
+
+

Contributors

+
    +

  • Sygel:

    +
    +
      +
    • Harald Panten
      • +
    • Valentin Vinagre
      • +
    +
    +
    • +
+
+
+

Maintainers

+

This module is maintained by the OCA.

+Odoo Community Association +

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

+

This module is part of the OCA/e-commerce project on GitHub.

+

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

+
+
+
+ + From 0b9ae60f3a71b16642dd92ecb38398a44bf42db4 Mon Sep 17 00:00:00 2001 From: Harald Panten Date: Wed, 20 Oct 2021 11:37:31 +0000 Subject: [PATCH 4/8] Added translation using Weblate (Spanish) --- .../i18n/es.po | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 website_account_fiscal_position_partner_type/i18n/es.po diff --git a/website_account_fiscal_position_partner_type/i18n/es.po b/website_account_fiscal_position_partner_type/i18n/es.po new file mode 100644 index 0000000000..47824e6442 --- /dev/null +++ b/website_account_fiscal_position_partner_type/i18n/es.po @@ -0,0 +1,20 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * website_account_fiscal_position_partner_type +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 13.0\n" +"Report-Msgid-Bugs-To: \n" +"Last-Translator: Automatically generated\n" +"Language-Team: none\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" + +#. module: website_account_fiscal_position_partner_type +#: model_terms:ir.ui.view,arch_db:website_account_fiscal_position_partner_type.address_fiscal_position_type +msgid "Partner Type" +msgstr "" From 67eba799efb27b86f1f4fecd7077ab4efc48cff5 Mon Sep 17 00:00:00 2001 From: Harald Panten Date: Wed, 20 Oct 2021 11:38:05 +0000 Subject: [PATCH 5/8] Translated using Weblate (Spanish) Currently translated at 100.0% (1 of 1 strings) Translation: e-commerce-13.0/e-commerce-13.0-website_account_fiscal_position_partner_type Translate-URL: https://translation.odoo-community.org/projects/e-commerce-13-0/e-commerce-13-0-website_account_fiscal_position_partner_type/es/ --- website_account_fiscal_position_partner_type/i18n/es.po | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/website_account_fiscal_position_partner_type/i18n/es.po b/website_account_fiscal_position_partner_type/i18n/es.po index 47824e6442..c8628ae5d9 100644 --- a/website_account_fiscal_position_partner_type/i18n/es.po +++ b/website_account_fiscal_position_partner_type/i18n/es.po @@ -6,15 +6,17 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Server 13.0\n" "Report-Msgid-Bugs-To: \n" -"Last-Translator: Automatically generated\n" +"PO-Revision-Date: 2021-10-20 14:35+0000\n" +"Last-Translator: Harald Panten \n" "Language-Team: none\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: website_account_fiscal_position_partner_type #: model_terms:ir.ui.view,arch_db:website_account_fiscal_position_partner_type.address_fiscal_position_type msgid "Partner Type" -msgstr "" +msgstr "Tipo de cliente" From 3135fd925719c149e56726a67e76961ff95e92b2 Mon Sep 17 00:00:00 2001 From: "Pedro M. Baeza" Date: Fri, 13 May 2022 09:27:07 +0200 Subject: [PATCH 6/8] [IMP] Update dotfiles + switch to GH actions --- website_account_fiscal_position_partner_type/__manifest__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website_account_fiscal_position_partner_type/__manifest__.py b/website_account_fiscal_position_partner_type/__manifest__.py index e01edd7788..f3412bf10f 100644 --- a/website_account_fiscal_position_partner_type/__manifest__.py +++ b/website_account_fiscal_position_partner_type/__manifest__.py @@ -5,7 +5,7 @@ "name": "Website Account Fiscal Position Partner Type", "version": "13.0.0.0.1", "category": "Website", - "website": "https://github.com/OCA/account-fiscal-rule", + "website": "https://github.com/OCA/e-commerce", "author": "Sygel Technology," "Odoo Community Association (OCA)", "license": "AGPL-3", "application": False, From efbf7d9684474714d0fab62c69cb7e04ced164b7 Mon Sep 17 00:00:00 2001 From: manu Date: Wed, 23 Aug 2023 10:49:18 +0200 Subject: [PATCH 7/8] [IMP] website_account_fiscal_position_partner_type: black, isort, prettier --- .../addons/website_account_fiscal_position_partner_type | 1 + setup/website_account_fiscal_position_partner_type/setup.py | 6 ++++++ 2 files changed, 7 insertions(+) create mode 120000 setup/website_account_fiscal_position_partner_type/odoo/addons/website_account_fiscal_position_partner_type create mode 100644 setup/website_account_fiscal_position_partner_type/setup.py diff --git a/setup/website_account_fiscal_position_partner_type/odoo/addons/website_account_fiscal_position_partner_type b/setup/website_account_fiscal_position_partner_type/odoo/addons/website_account_fiscal_position_partner_type new file mode 120000 index 0000000000..ffd37fffd6 --- /dev/null +++ b/setup/website_account_fiscal_position_partner_type/odoo/addons/website_account_fiscal_position_partner_type @@ -0,0 +1 @@ +../../../../website_account_fiscal_position_partner_type \ No newline at end of file diff --git a/setup/website_account_fiscal_position_partner_type/setup.py b/setup/website_account_fiscal_position_partner_type/setup.py new file mode 100644 index 0000000000..28c57bb640 --- /dev/null +++ b/setup/website_account_fiscal_position_partner_type/setup.py @@ -0,0 +1,6 @@ +import setuptools + +setuptools.setup( + setup_requires=['setuptools-odoo'], + odoo_addon=True, +) From bca696cf08dafd5ff5956f7453edbdbed5ad738d Mon Sep 17 00:00:00 2001 From: manu Date: Wed, 23 Aug 2023 10:54:57 +0200 Subject: [PATCH 8/8] [MIG+IMP]website_account_fiscal_position_partner_type: Standard migration to 15.0, show fiscal position type in additional portal views --- .../__init__.py | 1 + .../__manifest__.py | 8 ++- .../controllers/__init__.py | 1 + .../controllers/main.py | 60 ++++++++++++++++++- .../controllers/portal.py | 44 ++++++++++++++ .../models/__init__.py | 5 ++ .../models/res_partner.py | 15 +++++ .../models/res_users.py | 29 +++++++++ .../views/auth_signup_login_templates.xml | 35 +++++++++++ .../views/portal_templates.xml | 37 ++++++++++++ .../views/website_sale.xml | 2 + 11 files changed, 234 insertions(+), 3 deletions(-) create mode 100644 website_account_fiscal_position_partner_type/controllers/portal.py create mode 100644 website_account_fiscal_position_partner_type/models/__init__.py create mode 100644 website_account_fiscal_position_partner_type/models/res_partner.py create mode 100644 website_account_fiscal_position_partner_type/models/res_users.py create mode 100644 website_account_fiscal_position_partner_type/views/auth_signup_login_templates.xml create mode 100644 website_account_fiscal_position_partner_type/views/portal_templates.xml diff --git a/website_account_fiscal_position_partner_type/__init__.py b/website_account_fiscal_position_partner_type/__init__.py index 6b9e5664d3..b1973aa9f6 100644 --- a/website_account_fiscal_position_partner_type/__init__.py +++ b/website_account_fiscal_position_partner_type/__init__.py @@ -2,3 +2,4 @@ # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). from . import controllers +from . import models diff --git a/website_account_fiscal_position_partner_type/__manifest__.py b/website_account_fiscal_position_partner_type/__manifest__.py index f3412bf10f..5d093d041c 100644 --- a/website_account_fiscal_position_partner_type/__manifest__.py +++ b/website_account_fiscal_position_partner_type/__manifest__.py @@ -3,7 +3,7 @@ { "name": "Website Account Fiscal Position Partner Type", - "version": "13.0.0.0.1", + "version": "15.0.1.0.0", "category": "Website", "website": "https://github.com/OCA/e-commerce", "author": "Sygel Technology," "Odoo Community Association (OCA)", @@ -12,5 +12,9 @@ "installable": True, "development_status": "Beta", "depends": ["account_fiscal_position_partner_type", "website_sale"], - "data": ["views/website_sale.xml"], + "data": [ + "views/website_sale.xml", + "views/portal_templates.xml", + "views/auth_signup_login_templates.xml", + ], } diff --git a/website_account_fiscal_position_partner_type/controllers/__init__.py b/website_account_fiscal_position_partner_type/controllers/__init__.py index 9c53ff8f86..65fa27a301 100644 --- a/website_account_fiscal_position_partner_type/controllers/__init__.py +++ b/website_account_fiscal_position_partner_type/controllers/__init__.py @@ -2,3 +2,4 @@ # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). from . import main +from . import portal diff --git a/website_account_fiscal_position_partner_type/controllers/main.py b/website_account_fiscal_position_partner_type/controllers/main.py index 62d4edaca1..cbbba80934 100644 --- a/website_account_fiscal_position_partner_type/controllers/main.py +++ b/website_account_fiscal_position_partner_type/controllers/main.py @@ -1,9 +1,10 @@ # Copyright 2021 Valentin Vinagre # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). -from odoo import http +from odoo import _, http from odoo.http import request +from odoo.addons.auth_signup.controllers.main import AuthSignupHome from odoo.addons.website_sale.controllers.main import WebsiteSale @@ -18,6 +19,39 @@ def values_postprocess(self, order, mode, values, errors, error_msg): ) return new_values, errors, error_msg + def checkout_form_validate(self, mode, all_form_values, data): + old_context = request.context + request.context = dict( + request.context, + fiscal_position_type=all_form_values.get("fiscal_position_type"), + ) + error, error_message = super().checkout_form_validate( + mode, all_form_values, data + ) + request.context = old_context + if data.get("fiscal_position_type"): + partner_su = ( + request.env["res.partner"] + .sudo() + .browse(int(data["partner_id"])) + .exists() + ) + fiscal_position_type_change = ( + partner_su + and "fiscal_position_type" in data + and data["fiscal_position_type"] != partner_su.fiscal_position_type + ) + if fiscal_position_type_change and not partner_su.can_edit_vat(): + error["fiscal_position_type"] = "error" + error_message.append( + _( + "Changing partner type is not allowed once invoices have " + "been issued for your account. Please contact us directly" + " for this operation." + ) + ) + return error, error_message + @http.route() def address(self, **kw): res = super(WebsiteSale, self).address(**kw) @@ -49,3 +83,27 @@ def address(self, **kw): } ) return res + + +class AuthSignupHome(AuthSignupHome): + def get_auth_signup_qcontext(self): + qcontext = super().get_auth_signup_qcontext() + qcontext.update( + {k: v for (k, v) in request.params.items() if k in {"fiscal_position_type"}} + ) + afp_obj = request.env["account.fiscal.position"].sudo() + qcontext["fiscpostypevalues"] = dict( + afp_obj._fields["fiscal_position_type"].selection + ) + if not qcontext.get("fiscal_position_type_selected"): + def_fiscpostype = ( + request.website.company_id.default_fiscal_position_type or "b2c" + ) + qcontext["fiscal_position_type_selected"] = def_fiscpostype + return qcontext + + def _prepare_signup_values(self, qcontext): + values = super()._prepare_signup_values(qcontext) + if "fiscal_position_type" in qcontext: + values["fiscal_position_type"] = qcontext["fiscal_position_type"] + return values diff --git a/website_account_fiscal_position_partner_type/controllers/portal.py b/website_account_fiscal_position_partner_type/controllers/portal.py new file mode 100644 index 0000000000..ca0b6c085a --- /dev/null +++ b/website_account_fiscal_position_partner_type/controllers/portal.py @@ -0,0 +1,44 @@ +# Copyright 2023 Manuel Regidor +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). + +from odoo import _ +from odoo.http import request + +from odoo.addons.portal.controllers.portal import CustomerPortal + + +class CustomerPortal(CustomerPortal): + + CustomerPortal.OPTIONAL_BILLING_FIELDS += ["fiscal_position_type"] + + def details_form_validate(self, data): + error, error_message = super().details_form_validate(data) + partner = request.env.user.partner_id + if ( + not partner.can_edit_vat() + and "fiscal_position_type" in data + and data.get("fiscal_position_type") != partner.fiscal_position_type + ): + error["fiscal_position_type"] = "error" + error_message.append( + _( + "Changing Partner Type is not allowed once document(s) have " + "been issued for your account. Please contact us directly for" + " this operation." + ) + ) + return error, error_message + + def _prepare_portal_layout_values(self): + vals = super()._prepare_portal_layout_values() + afp_obj = request.env["account.fiscal.position"].sudo() + partner = request.env.user.partner_id + vals.update( + { + "fiscpostypevalues": dict( + afp_obj._fields["fiscal_position_type"].selection + ), + "fiscal_position_type_selected": partner.fiscal_position_type, + } + ) + return vals diff --git a/website_account_fiscal_position_partner_type/models/__init__.py b/website_account_fiscal_position_partner_type/models/__init__.py new file mode 100644 index 0000000000..a227d7676d --- /dev/null +++ b/website_account_fiscal_position_partner_type/models/__init__.py @@ -0,0 +1,5 @@ +# Copyright 2023 Manuel Regidor +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). + +from . import res_users +from . import res_partner diff --git a/website_account_fiscal_position_partner_type/models/res_partner.py b/website_account_fiscal_position_partner_type/models/res_partner.py new file mode 100644 index 0000000000..cf29672283 --- /dev/null +++ b/website_account_fiscal_position_partner_type/models/res_partner.py @@ -0,0 +1,15 @@ +# Copyright 2023 Manuel Regidor +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl-3). + +from odoo import api, models + + +class Partner(models.Model): + _inherit = "res.partner" + + @api.model + def signup_retrieve_info(self, token): + res = super().signup_retrieve_info(token) + partner = self._signup_retrieve_partner(token, raise_exception=True) + res.update({"fiscal_position_type_selected": partner.fiscal_position_type}) + return res diff --git a/website_account_fiscal_position_partner_type/models/res_users.py b/website_account_fiscal_position_partner_type/models/res_users.py new file mode 100644 index 0000000000..88a1cd97ea --- /dev/null +++ b/website_account_fiscal_position_partner_type/models/res_users.py @@ -0,0 +1,29 @@ +# Copyright 2023 Manuel Regidor +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl-3). + +from odoo import api, models + + +class ResUsers(models.Model): + _inherit = "res.users" + + @api.model + def signup(self, values, token=None): + if token: + partner = self.env["res.partner"]._signup_retrieve_partner( + token, check_validity=True, raise_exception=True + ) + partner_user = partner.user_ids and partner.user_ids[0] or False + # Don't update fiscal_position_type if partner related to user + # exists (i.e. when resetting password) + if partner_user: + values.pop("fiscal_position_type", None) + return super().signup(values, token) + + def _create_user_from_template(self, values): + user = super()._create_user_from_template(values) + if user and user.partner_id and values.get("fiscal_position_type"): + user.partner_id.write( + {"fiscal_position_type": values.get("fiscal_position_type")} + ) + return user diff --git a/website_account_fiscal_position_partner_type/views/auth_signup_login_templates.xml b/website_account_fiscal_position_partner_type/views/auth_signup_login_templates.xml new file mode 100644 index 0000000000..ae76fcee76 --- /dev/null +++ b/website_account_fiscal_position_partner_type/views/auth_signup_login_templates.xml @@ -0,0 +1,35 @@ + + + + + diff --git a/website_account_fiscal_position_partner_type/views/portal_templates.xml b/website_account_fiscal_position_partner_type/views/portal_templates.xml new file mode 100644 index 0000000000..9b694d31bb --- /dev/null +++ b/website_account_fiscal_position_partner_type/views/portal_templates.xml @@ -0,0 +1,37 @@ + + + + + diff --git a/website_account_fiscal_position_partner_type/views/website_sale.xml b/website_account_fiscal_position_partner_type/views/website_sale.xml index 8d3ab7f35e..fd78c53e18 100644 --- a/website_account_fiscal_position_partner_type/views/website_sale.xml +++ b/website_account_fiscal_position_partner_type/views/website_sale.xml @@ -20,6 +20,8 @@ id="fiscal_position_type" name="fiscal_position_type" class="form-control" + t-att-disabled="'1' if not can_edit_vat else None" + t-attf-class="form-control #{error.get('fiscal_position_type') and 'is-invalid' or ''}" >