From 755f48fbf7bf9cc1ab2a72e36bd95ff8cbbaf11b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9my=20Taymans?= <remytaymans@gmail.com>
Date: Fri, 2 Feb 2018 17:12:21 +0100
Subject: [PATCH 01/10] [ADD] website_portal: Restrict modif personal info

On the website portal, users must only be able to modify their phone and
postal address.
---
 beesdoo_website_portal/__init__.py            |  2 ++
 beesdoo_website_portal/__openerp__.py         | 28 ++++++++++++++++
 .../controllers/__init__.py                   |  2 ++
 beesdoo_website_portal/controllers/main.py    | 27 ++++++++++++++++
 .../views/portal_website_templates.xml        | 32 +++++++++++++++++++
 5 files changed, 91 insertions(+)
 create mode 100644 beesdoo_website_portal/__init__.py
 create mode 100644 beesdoo_website_portal/__openerp__.py
 create mode 100644 beesdoo_website_portal/controllers/__init__.py
 create mode 100644 beesdoo_website_portal/controllers/main.py
 create mode 100644 beesdoo_website_portal/views/portal_website_templates.xml

diff --git a/beesdoo_website_portal/__init__.py b/beesdoo_website_portal/__init__.py
new file mode 100644
index 0000000..2fa08e5
--- /dev/null
+++ b/beesdoo_website_portal/__init__.py
@@ -0,0 +1,2 @@
+# -*- coding: utf8 -*-
+import controllers
diff --git a/beesdoo_website_portal/__openerp__.py b/beesdoo_website_portal/__openerp__.py
new file mode 100644
index 0000000..248ab3a
--- /dev/null
+++ b/beesdoo_website_portal/__openerp__.py
@@ -0,0 +1,28 @@
+# -*- coding: utf-8 -*-
+
+# Copyright 2018 Rémy Taymans <remytaymans@gmail.com>
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+{
+    'name': 'BEES coop Website Portal',
+
+    'description': """
+    Extension of the Website Portal that prevent modification of sensible data by the users
+    """,
+
+    'author': 'Rémy Taymans',
+    'license': 'AGPL-3',
+    'version': '9.0.1.0',
+    'website': "https://github.com/beescoop/Obeesdoo",
+
+    'category': 'Cooperative management',
+
+    'depends': [
+        'website',
+        'website_portal_extend',
+    ],
+
+    'data': [
+        'views/portal_website_templates.xml',
+    ]
+}
diff --git a/beesdoo_website_portal/controllers/__init__.py b/beesdoo_website_portal/controllers/__init__.py
new file mode 100644
index 0000000..757b12a
--- /dev/null
+++ b/beesdoo_website_portal/controllers/__init__.py
@@ -0,0 +1,2 @@
+# -*- coding: utf-8 -*-
+from . import main
diff --git a/beesdoo_website_portal/controllers/main.py b/beesdoo_website_portal/controllers/main.py
new file mode 100644
index 0000000..104f2a8
--- /dev/null
+++ b/beesdoo_website_portal/controllers/main.py
@@ -0,0 +1,27 @@
+# -*- coding: utf-8 -*-
+
+# Copyright 2017-2018 Rémy Taymans <remytaymans@gmail.com>
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+
+from openerp.addons.website_portal_extend.controllers.main import ExtendWebsiteAccountController
+
+
+class BeesdooAccountWebsiteController(ExtendWebsiteAccountController):
+
+    mandatory_billing_fields = [
+        "phone",
+        "city",
+        "country_id",
+        "street",
+        "zipcode",
+    ]
+    optional_billing_fields = [
+        "state_id",
+    ]
+
+    def _set_mandatory_fields(self, data):
+        """This is not useful as the field 'company_name' is not present
+        anymore.
+        """
+        pass
diff --git a/beesdoo_website_portal/views/portal_website_templates.xml b/beesdoo_website_portal/views/portal_website_templates.xml
new file mode 100644
index 0000000..19b0d5a
--- /dev/null
+++ b/beesdoo_website_portal/views/portal_website_templates.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright 2018 Rémy Taymans <remytaymans@gmail.com>
+     License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+-->
+<openerp>
+
+  <!-- Modifying the form -->
+  <template
+    id="beesdoo_website_portal_details_form"
+    name="Beesdoo Website Portal Details Form"
+    inherit_id="website_portal_extend.website_portal_details_form">
+    <xpath expr="//input[@name='name']/.." position="before">
+      <div class="col-md-12">
+        <div class="alert alert-info">
+          <strong>Info !</strong>
+          To modify information that is not present in this form,
+          please contact us.
+        </div>
+      </div>
+    </xpath>
+    <xpath expr="//input[@name='name']/.." position="replace">
+    </xpath>
+    <xpath expr="//input[@name='email']/.." position="replace">
+    </xpath>
+    <xpath expr="//input[@name='company_name']/.." position="replace">
+    </xpath>
+    <xpath expr="//input[@name='vat']/.." position="replace">
+    </xpath>
+  </template>
+
+</openerp>

From 39a5af482806acc96ea01a5ee4b867cc1dc77cce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9my=20Taymans?= <remytaymans@gmail.com>
Date: Mon, 23 Dec 2019 15:42:13 +0100
Subject: [PATCH 02/10] [ADD] b_w_portal: Total pos order amount for a user

---
 beesdoo_website_portal/controllers/main.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/beesdoo_website_portal/controllers/main.py b/beesdoo_website_portal/controllers/main.py
index 104f2a8..21568a2 100644
--- a/beesdoo_website_portal/controllers/main.py
+++ b/beesdoo_website_portal/controllers/main.py
@@ -5,6 +5,7 @@
 
 
 from openerp.addons.website_portal_extend.controllers.main import ExtendWebsiteAccountController
+from openerp.http import request
 
 
 class BeesdooAccountWebsiteController(ExtendWebsiteAccountController):

From 96e53b11c5a0d5cc8bc9affcb703a88fc8ef246a Mon Sep 17 00:00:00 2001
From: Vincent Van Rossem <vvrossem@gmail.com>
Date: Mon, 8 Jun 2020 18:44:28 +0200
Subject: [PATCH 03/10] [MIG] beesdoo_website_portal: 9.0 -> 10.0 - followed
 main oca guidelines - not tested on odoo 10.0

---
 beesdoo_website_portal/__init__.py            |  2 +-
 .../{__openerp__.py => __manifest__.py}       | 20 ++++++++-----------
 beesdoo_website_portal/controllers/main.py    | 10 +++++-----
 .../views/portal_website_templates.xml        |  4 ++--
 4 files changed, 16 insertions(+), 20 deletions(-)
 rename beesdoo_website_portal/{__openerp__.py => __manifest__.py} (54%)

diff --git a/beesdoo_website_portal/__init__.py b/beesdoo_website_portal/__init__.py
index 2fa08e5..35b969a 100644
--- a/beesdoo_website_portal/__init__.py
+++ b/beesdoo_website_portal/__init__.py
@@ -1,2 +1,2 @@
 # -*- coding: utf8 -*-
-import controllers
+from . import controllers
diff --git a/beesdoo_website_portal/__openerp__.py b/beesdoo_website_portal/__manifest__.py
similarity index 54%
rename from beesdoo_website_portal/__openerp__.py
rename to beesdoo_website_portal/__manifest__.py
index 248ab3a..9f7fa9f 100644
--- a/beesdoo_website_portal/__openerp__.py
+++ b/beesdoo_website_portal/__manifest__.py
@@ -1,28 +1,24 @@
 # -*- coding: utf-8 -*-
-
-# Copyright 2018 Rémy Taymans <remytaymans@gmail.com>
-# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+# Copyright 2017 - Today Coop IT Easy SCRLfs (<http://www.coopiteasy.be>)
+# - Rémy Taymans  <remy@coopiteasy.be>
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
 
 {
     'name': 'BEES coop Website Portal',
-
     'description': """
     Extension of the Website Portal that prevent modification of sensible data by the users
     """,
-
-    'author': 'Rémy Taymans',
+    'author': 'Coop IT Easy SCRLfs',
     'license': 'AGPL-3',
-    'version': '9.0.1.0',
-    'website': "https://github.com/beescoop/Obeesdoo",
-
+    'version': '10.0.1.0.0',
+    'website': "https://www.coopiteasy.be",
     'category': 'Cooperative management',
-
     'depends': [
         'website',
         'website_portal_extend',
     ],
-
     'data': [
         'views/portal_website_templates.xml',
-    ]
+    ],
+    'installable': True,
 }
diff --git a/beesdoo_website_portal/controllers/main.py b/beesdoo_website_portal/controllers/main.py
index 21568a2..aa67dfe 100644
--- a/beesdoo_website_portal/controllers/main.py
+++ b/beesdoo_website_portal/controllers/main.py
@@ -1,11 +1,11 @@
 # -*- coding: utf-8 -*-
+# Copyright 2017 - Today Coop IT Easy SCRLfs (<http://www.coopiteasy.be>)
+# - Rémy Taymans  <remy@coopiteasy.be>
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
 
-# Copyright 2017-2018 Rémy Taymans <remytaymans@gmail.com>
-# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
-
-from openerp.addons.website_portal_extend.controllers.main import ExtendWebsiteAccountController
-from openerp.http import request
+from odoo.addons.website_portal_extend.controllers.main import ExtendWebsiteAccountController
+from odoo.http import request
 
 
 class BeesdooAccountWebsiteController(ExtendWebsiteAccountController):
diff --git a/beesdoo_website_portal/views/portal_website_templates.xml b/beesdoo_website_portal/views/portal_website_templates.xml
index 19b0d5a..2fa6201 100644
--- a/beesdoo_website_portal/views/portal_website_templates.xml
+++ b/beesdoo_website_portal/views/portal_website_templates.xml
@@ -3,7 +3,7 @@
      Copyright 2018 Rémy Taymans <remytaymans@gmail.com>
      License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 -->
-<openerp>
+<odoo>
 
   <!-- Modifying the form -->
   <template
@@ -29,4 +29,4 @@
     </xpath>
   </template>
 
-</openerp>
+</odoo>

From 5d75b53dad3eff62a73dffd1d17c754555685a56 Mon Sep 17 00:00:00 2001
From: Vincent Van Rossem <vvrossem@gmail.com>
Date: Mon, 8 Jun 2020 18:46:28 +0200
Subject: [PATCH 04/10] [MIG] beesdoo_website_portal: 10.0 -> 11.0 - followed
 main oca guidelines - not tested on odoo 11.0

---
 beesdoo_website_portal/__init__.py             | 1 -
 beesdoo_website_portal/__manifest__.py         | 3 +--
 beesdoo_website_portal/controllers/__init__.py | 1 -
 beesdoo_website_portal/controllers/main.py     | 1 -
 4 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/beesdoo_website_portal/__init__.py b/beesdoo_website_portal/__init__.py
index 35b969a..e046e49 100644
--- a/beesdoo_website_portal/__init__.py
+++ b/beesdoo_website_portal/__init__.py
@@ -1,2 +1 @@
-# -*- coding: utf8 -*-
 from . import controllers
diff --git a/beesdoo_website_portal/__manifest__.py b/beesdoo_website_portal/__manifest__.py
index 9f7fa9f..d83276c 100644
--- a/beesdoo_website_portal/__manifest__.py
+++ b/beesdoo_website_portal/__manifest__.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Copyright 2017 - Today Coop IT Easy SCRLfs (<http://www.coopiteasy.be>)
 # - Rémy Taymans  <remy@coopiteasy.be>
 # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
@@ -10,7 +9,7 @@
     """,
     'author': 'Coop IT Easy SCRLfs',
     'license': 'AGPL-3',
-    'version': '10.0.1.0.0',
+    'version': '11.0.1.0.0',
     'website': "https://www.coopiteasy.be",
     'category': 'Cooperative management',
     'depends': [
diff --git a/beesdoo_website_portal/controllers/__init__.py b/beesdoo_website_portal/controllers/__init__.py
index 757b12a..12a7e52 100644
--- a/beesdoo_website_portal/controllers/__init__.py
+++ b/beesdoo_website_portal/controllers/__init__.py
@@ -1,2 +1 @@
-# -*- coding: utf-8 -*-
 from . import main
diff --git a/beesdoo_website_portal/controllers/main.py b/beesdoo_website_portal/controllers/main.py
index aa67dfe..3477f58 100644
--- a/beesdoo_website_portal/controllers/main.py
+++ b/beesdoo_website_portal/controllers/main.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Copyright 2017 - Today Coop IT Easy SCRLfs (<http://www.coopiteasy.be>)
 # - Rémy Taymans  <remy@coopiteasy.be>
 # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).

From 2fec347d8cd108638815e8a09e984d2e948e4b23 Mon Sep 17 00:00:00 2001
From: Vincent Van Rossem <vvrossem@gmail.com>
Date: Tue, 9 Jun 2020 09:44:41 +0200
Subject: [PATCH 05/10] [MIG] beesdoo_website_portal: 11.0 -> 12.0

---
 beesdoo_website_portal/__manifest__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/beesdoo_website_portal/__manifest__.py b/beesdoo_website_portal/__manifest__.py
index d83276c..f3e33ec 100644
--- a/beesdoo_website_portal/__manifest__.py
+++ b/beesdoo_website_portal/__manifest__.py
@@ -9,7 +9,7 @@
     """,
     'author': 'Coop IT Easy SCRLfs',
     'license': 'AGPL-3',
-    'version': '11.0.1.0.0',
+    'version': '12.0.1.0.0',
     'website': "https://www.coopiteasy.be",
     'category': 'Cooperative management',
     'depends': [

From a6bebc8cbd0c4cde1e312f04a61cd8a0152d2070 Mon Sep 17 00:00:00 2001
From: Vincent Van Rossem <vvrossem@gmail.com>
Date: Tue, 9 Jun 2020 11:36:15 +0200
Subject: [PATCH 06/10] [MIG] beesdoo_website_portal: adaptation to 12.0

---
 beesdoo_website_portal/__manifest__.py        |  8 +--
 beesdoo_website_portal/controllers/main.py    | 35 +++++++------
 .../views/portal_website_templates.xml        | 49 ++++++++++---------
 3 files changed, 51 insertions(+), 41 deletions(-)

diff --git a/beesdoo_website_portal/__manifest__.py b/beesdoo_website_portal/__manifest__.py
index f3e33ec..26e3d3a 100644
--- a/beesdoo_website_portal/__manifest__.py
+++ b/beesdoo_website_portal/__manifest__.py
@@ -4,8 +4,8 @@
 
 {
     'name': 'BEES coop Website Portal',
-    'description': """
-    Extension of the Website Portal that prevent modification of sensible data by the users
+    'summary': """
+    Extension of the Portal that prevent modification of sensible data by the users
     """,
     'author': 'Coop IT Easy SCRLfs',
     'license': 'AGPL-3',
@@ -13,8 +13,8 @@
     'website': "https://www.coopiteasy.be",
     'category': 'Cooperative management',
     'depends': [
-        'website',
-        'website_portal_extend',
+        'portal',
+        'website'
     ],
     'data': [
         'views/portal_website_templates.xml',
diff --git a/beesdoo_website_portal/controllers/main.py b/beesdoo_website_portal/controllers/main.py
index 3477f58..c221bb3 100644
--- a/beesdoo_website_portal/controllers/main.py
+++ b/beesdoo_website_portal/controllers/main.py
@@ -3,25 +3,32 @@
 # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
 
 
-from odoo.addons.website_portal_extend.controllers.main import ExtendWebsiteAccountController
-from odoo.http import request
+from odoo.addons.portal.controllers.portal import CustomerPortal
 
 
-class BeesdooAccountWebsiteController(ExtendWebsiteAccountController):
-
-    mandatory_billing_fields = [
-        "phone",
+class BeesdooAccountWebsiteController(CustomerPortal):
+    # override from `portal` module
+    CustomerPortal.MANDATORY_BILLING_FIELDS = [
         "city",
         "country_id",
+        "phone",
         "street",
         "zipcode",
     ]
-    optional_billing_fields = [
-        "state_id",
-    ]
+    CustomerPortal.OPTIONAL_BILLING_FIELDS = ["state_id"]
+
+    def details_form_validate(self, data):
+        error, error_message = super().details_form_validate(data)
+
+        # since we override mandatory and optional billing fields,
+        # parent method will insert the following key/value in `error` dict and `error_message` list,
+        # preventing from saving the form. Workaround is to clear both dict and list.
+        if (
+            error.get("common")
+            and error["common"] == "Unknown field"
+            and "Unknown field 'name,email,company_name,vat'" in error_message
+        ):
+            error.pop("common")
+            error_message.remove("Unknown field 'name,email,company_name,vat'")
 
-    def _set_mandatory_fields(self, data):
-        """This is not useful as the field 'company_name' is not present
-        anymore.
-        """
-        pass
+        return error, error_message
diff --git a/beesdoo_website_portal/views/portal_website_templates.xml b/beesdoo_website_portal/views/portal_website_templates.xml
index 2fa6201..721235d 100644
--- a/beesdoo_website_portal/views/portal_website_templates.xml
+++ b/beesdoo_website_portal/views/portal_website_templates.xml
@@ -5,28 +5,31 @@
 -->
 <odoo>
 
-  <!-- Modifying the form -->
-  <template
-    id="beesdoo_website_portal_details_form"
-    name="Beesdoo Website Portal Details Form"
-    inherit_id="website_portal_extend.website_portal_details_form">
-    <xpath expr="//input[@name='name']/.." position="before">
-      <div class="col-md-12">
-        <div class="alert alert-info">
-          <strong>Info !</strong>
-          To modify information that is not present in this form,
-          please contact us.
-        </div>
-      </div>
-    </xpath>
-    <xpath expr="//input[@name='name']/.." position="replace">
-    </xpath>
-    <xpath expr="//input[@name='email']/.." position="replace">
-    </xpath>
-    <xpath expr="//input[@name='company_name']/.." position="replace">
-    </xpath>
-    <xpath expr="//input[@name='vat']/.." position="replace">
-    </xpath>
-  </template>
+    <!-- Modifying the form -->
+    <template id="beesdoo_website_portal_details_form"
+              name="Beesdoo Website Portal Details Form"
+              inherit_id="portal.portal_my_details">
+        <xpath expr="//input[@name='name']/.." position="before">
+            <div class="col-lg-12">
+                <div class="alert alert-info">
+                    <strong>Info !</strong>
+                    To modify information that cannot be edited in this form,
+                    please contact us.
+                </div>
+            </div>
+        </xpath>
+        <xpath expr="//input[@name='name']" position="attributes">
+            <attribute name="t-att-readonly">True</attribute>
+        </xpath>
+        <xpath expr="//input[@name='email']" position="attributes">
+            <attribute name="t-att-readonly">True</attribute>
+        </xpath>
+        <xpath expr="//input[@name='company_name']" position="attributes">
+            <attribute name="t-att-readonly">True</attribute>
+        </xpath>
+        <xpath expr="//input[@name='vat']" position="attributes">
+            <attribute name="t-att-readonly">True</attribute>
+        </xpath>
+    </template>
 
 </odoo>

From 748e198ba0ef2865b641fc9febfd0b15a5595ee4 Mon Sep 17 00:00:00 2001
From: Vincent Van Rossem <vvrossem@gmail.com>
Date: Tue, 9 Jun 2020 11:36:47 +0200
Subject: [PATCH 07/10] [IMP] beesdoo_website_portal: black formatter

---
 beesdoo_website_portal/__manifest__.py | 25 ++++++++++---------------
 1 file changed, 10 insertions(+), 15 deletions(-)

diff --git a/beesdoo_website_portal/__manifest__.py b/beesdoo_website_portal/__manifest__.py
index 26e3d3a..bbfae4a 100644
--- a/beesdoo_website_portal/__manifest__.py
+++ b/beesdoo_website_portal/__manifest__.py
@@ -3,21 +3,16 @@
 # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
 
 {
-    'name': 'BEES coop Website Portal',
-    'summary': """
+    "name": "BEES coop Website Portal",
+    "summary": """
     Extension of the Portal that prevent modification of sensible data by the users
     """,
-    'author': 'Coop IT Easy SCRLfs',
-    'license': 'AGPL-3',
-    'version': '12.0.1.0.0',
-    'website': "https://www.coopiteasy.be",
-    'category': 'Cooperative management',
-    'depends': [
-        'portal',
-        'website'
-    ],
-    'data': [
-        'views/portal_website_templates.xml',
-    ],
-    'installable': True,
+    "author": "Coop IT Easy SCRLfs",
+    "license": "AGPL-3",
+    "version": "12.0.1.0.0",
+    "website": "https://www.coopiteasy.be",
+    "category": "Cooperative management",
+    "depends": ["portal", "website"],
+    "data": ["views/portal_website_templates.xml",],
+    "installable": True,
 }

From 687417d44e441647843e2b6dc702775bc7fd4345 Mon Sep 17 00:00:00 2001
From: Vincent Van Rossem <vvrossem@gmail.com>
Date: Tue, 9 Jun 2020 11:44:36 +0200
Subject: [PATCH 08/10] [REF] beesdoo_website_portal ->
 website_portal_restrict_modification

---
 .../__init__.py                                    |  0
 .../__manifest__.py                                | 14 +++++++-------
 .../controllers/__init__.py                        |  0
 .../controllers/main.py                            |  2 +-
 .../views/portal_website_templates.xml             |  4 ++--
 5 files changed, 10 insertions(+), 10 deletions(-)
 rename {beesdoo_website_portal => website_portal_restrict_modification}/__init__.py (100%)
 rename {beesdoo_website_portal => website_portal_restrict_modification}/__manifest__.py (58%)
 rename {beesdoo_website_portal => website_portal_restrict_modification}/controllers/__init__.py (100%)
 rename {beesdoo_website_portal => website_portal_restrict_modification}/controllers/main.py (95%)
 rename {beesdoo_website_portal => website_portal_restrict_modification}/views/portal_website_templates.xml (91%)

diff --git a/beesdoo_website_portal/__init__.py b/website_portal_restrict_modification/__init__.py
similarity index 100%
rename from beesdoo_website_portal/__init__.py
rename to website_portal_restrict_modification/__init__.py
diff --git a/beesdoo_website_portal/__manifest__.py b/website_portal_restrict_modification/__manifest__.py
similarity index 58%
rename from beesdoo_website_portal/__manifest__.py
rename to website_portal_restrict_modification/__manifest__.py
index bbfae4a..5ffe4fb 100644
--- a/beesdoo_website_portal/__manifest__.py
+++ b/website_portal_restrict_modification/__manifest__.py
@@ -3,16 +3,16 @@
 # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
 
 {
-    "name": "BEES coop Website Portal",
+    "name": "Website Portal Restrict Modification",
+    "version": "12.0.1.0.0",
+    "depends": ["portal", "website"],
     "summary": """
-    Extension of the Portal that prevent modification of sensible data by the users
+    Portal extension preventing modification of sensible data by the users
     """,
     "author": "Coop IT Easy SCRLfs",
     "license": "AGPL-3",
-    "version": "12.0.1.0.0",
-    "website": "https://www.coopiteasy.be",
-    "category": "Cooperative management",
-    "depends": ["portal", "website"],
-    "data": ["views/portal_website_templates.xml",],
+    "website": "https://coopiteasy.be/",
+    "category": "Cooperative Management",
+    "data": ["views/portal_website_templates.xml"],
     "installable": True,
 }
diff --git a/beesdoo_website_portal/controllers/__init__.py b/website_portal_restrict_modification/controllers/__init__.py
similarity index 100%
rename from beesdoo_website_portal/controllers/__init__.py
rename to website_portal_restrict_modification/controllers/__init__.py
diff --git a/beesdoo_website_portal/controllers/main.py b/website_portal_restrict_modification/controllers/main.py
similarity index 95%
rename from beesdoo_website_portal/controllers/main.py
rename to website_portal_restrict_modification/controllers/main.py
index c221bb3..68da976 100644
--- a/beesdoo_website_portal/controllers/main.py
+++ b/website_portal_restrict_modification/controllers/main.py
@@ -6,7 +6,7 @@
 from odoo.addons.portal.controllers.portal import CustomerPortal
 
 
-class BeesdooAccountWebsiteController(CustomerPortal):
+class CustomerPortalRestrictModification(CustomerPortal):
     # override from `portal` module
     CustomerPortal.MANDATORY_BILLING_FIELDS = [
         "city",
diff --git a/beesdoo_website_portal/views/portal_website_templates.xml b/website_portal_restrict_modification/views/portal_website_templates.xml
similarity index 91%
rename from beesdoo_website_portal/views/portal_website_templates.xml
rename to website_portal_restrict_modification/views/portal_website_templates.xml
index 721235d..0810362 100644
--- a/beesdoo_website_portal/views/portal_website_templates.xml
+++ b/website_portal_restrict_modification/views/portal_website_templates.xml
@@ -6,8 +6,8 @@
 <odoo>
 
     <!-- Modifying the form -->
-    <template id="beesdoo_website_portal_details_form"
-              name="Beesdoo Website Portal Details Form"
+    <template id="website_portal_restrict_my_details"
+              name="Website Portal Restrict Modification"
               inherit_id="portal.portal_my_details">
         <xpath expr="//input[@name='name']/.." position="before">
             <div class="col-lg-12">

From 5fa0ab1cbe6d83180962ca6f77cd69d2555c2b5a Mon Sep 17 00:00:00 2001
From: Vincent Van Rossem <vvrossem@gmail.com>
Date: Tue, 9 Jun 2020 11:50:45 +0200
Subject: [PATCH 09/10] [IMP] website_portal_restrict_modification: readme

---
 .../README.rst                                |  58 +++
 .../readme/CONTRIBUTORS.rst                   |   2 +
 .../readme/DESCRIPTION.rst                    |   1 +
 .../static/description/index.html             | 415 ++++++++++++++++++
 4 files changed, 476 insertions(+)
 create mode 100644 website_portal_restrict_modification/README.rst
 create mode 100644 website_portal_restrict_modification/readme/CONTRIBUTORS.rst
 create mode 100644 website_portal_restrict_modification/readme/DESCRIPTION.rst
 create mode 100644 website_portal_restrict_modification/static/description/index.html

diff --git a/website_portal_restrict_modification/README.rst b/website_portal_restrict_modification/README.rst
new file mode 100644
index 0000000..9e28229
--- /dev/null
+++ b/website_portal_restrict_modification/README.rst
@@ -0,0 +1,58 @@
+====================================
+Website Portal Restrict Modification
+====================================
+
+.. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+   !! 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-beescoop%2Fobeesdoo-lightgray.png?logo=github
+    :target: https://github.com/beescoop/obeesdoo/tree/12.0/website_portal_restrict_modification
+    :alt: beescoop/obeesdoo
+
+|badge1| |badge2| |badge3| 
+
+Prevent modification of sensible data by the users
+
+**Table of contents**
+
+.. contents::
+   :local:
+
+Bug Tracker
+===========
+
+Bugs are tracked on `GitHub Issues <https://github.com/beescoop/obeesdoo/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 <https://github.com/beescoop/obeesdoo/issues/new?body=module:%20website_portal_restrict_modification%0Aversion:%2012.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
+
+Do not contact contributors directly about support or help with technical issues.
+
+Credits
+=======
+
+Authors
+~~~~~~~
+
+* Coop IT Easy SCRLfs
+
+Contributors
+~~~~~~~~~~~~
+
+* Rémy TAYMANS <remy@coopiteasy.be>
+* Vincent VAN ROSSEM <vincent@coopiteasy.be>
+
+Maintainers
+~~~~~~~~~~~
+
+This module is part of the `beescoop/obeesdoo <https://github.com/beescoop/obeesdoo/tree/12.0/website_portal_restrict_modification>`_ project on GitHub.
+
+You are welcome to contribute.
diff --git a/website_portal_restrict_modification/readme/CONTRIBUTORS.rst b/website_portal_restrict_modification/readme/CONTRIBUTORS.rst
new file mode 100644
index 0000000..ff3ee17
--- /dev/null
+++ b/website_portal_restrict_modification/readme/CONTRIBUTORS.rst
@@ -0,0 +1,2 @@
+* Rémy TAYMANS <remy@coopiteasy.be>
+* Vincent VAN ROSSEM <vincent@coopiteasy.be>
diff --git a/website_portal_restrict_modification/readme/DESCRIPTION.rst b/website_portal_restrict_modification/readme/DESCRIPTION.rst
new file mode 100644
index 0000000..53c34dc
--- /dev/null
+++ b/website_portal_restrict_modification/readme/DESCRIPTION.rst
@@ -0,0 +1 @@
+Prevent modification of sensible data by the users
diff --git a/website_portal_restrict_modification/static/description/index.html b/website_portal_restrict_modification/static/description/index.html
new file mode 100644
index 0000000..f1ecf8f
--- /dev/null
+++ b/website_portal_restrict_modification/static/description/index.html
@@ -0,0 +1,415 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+<meta name="generator" content="Docutils 0.15.1: http://docutils.sourceforge.net/" />
+<title>Website Portal Restrict Modification</title>
+<style type="text/css">
+
+/*
+:Author: David Goodger (goodger@python.org)
+:Id: $Id: html4css1.css 7952 2016-07-26 18:15:59Z milde $
+:Copyright: This stylesheet has been placed in the public domain.
+
+Default cascading style sheet for the HTML output of Docutils.
+
+See http://docutils.sf.net/docs/howto/html-stylesheets.html for how to
+customize this style sheet.
+*/
+
+/* used to remove borders from tables and images */
+.borderless, table.borderless td, table.borderless th {
+  border: 0 }
+
+table.borderless td, table.borderless th {
+  /* Override padding for "table.docutils td" with "! important".
+     The right padding separates the table cells. */
+  padding: 0 0.5em 0 0 ! important }
+
+.first {
+  /* Override more specific margin styles with "! important". */
+  margin-top: 0 ! important }
+
+.last, .with-subtitle {
+  margin-bottom: 0 ! important }
+
+.hidden {
+  display: none }
+
+.subscript {
+  vertical-align: sub;
+  font-size: smaller }
+
+.superscript {
+  vertical-align: super;
+  font-size: smaller }
+
+a.toc-backref {
+  text-decoration: none ;
+  color: black }
+
+blockquote.epigraph {
+  margin: 2em 5em ; }
+
+dl.docutils dd {
+  margin-bottom: 0.5em }
+
+object[type="image/svg+xml"], object[type="application/x-shockwave-flash"] {
+  overflow: hidden;
+}
+
+/* Uncomment (and remove this text!) to get bold-faced definition list terms
+dl.docutils dt {
+  font-weight: bold }
+*/
+
+div.abstract {
+  margin: 2em 5em }
+
+div.abstract p.topic-title {
+  font-weight: bold ;
+  text-align: center }
+
+div.admonition, div.attention, div.caution, div.danger, div.error,
+div.hint, div.important, div.note, div.tip, div.warning {
+  margin: 2em ;
+  border: medium outset ;
+  padding: 1em }
+
+div.admonition p.admonition-title, div.hint p.admonition-title,
+div.important p.admonition-title, div.note p.admonition-title,
+div.tip p.admonition-title {
+  font-weight: bold ;
+  font-family: sans-serif }
+
+div.attention p.admonition-title, div.caution p.admonition-title,
+div.danger p.admonition-title, div.error p.admonition-title,
+div.warning p.admonition-title, .code .error {
+  color: red ;
+  font-weight: bold ;
+  font-family: sans-serif }
+
+/* Uncomment (and remove this text!) to get reduced vertical space in
+   compound paragraphs.
+div.compound .compound-first, div.compound .compound-middle {
+  margin-bottom: 0.5em }
+
+div.compound .compound-last, div.compound .compound-middle {
+  margin-top: 0.5em }
+*/
+
+div.dedication {
+  margin: 2em 5em ;
+  text-align: center ;
+  font-style: italic }
+
+div.dedication p.topic-title {
+  font-weight: bold ;
+  font-style: normal }
+
+div.figure {
+  margin-left: 2em ;
+  margin-right: 2em }
+
+div.footer, div.header {
+  clear: both;
+  font-size: smaller }
+
+div.line-block {
+  display: block ;
+  margin-top: 1em ;
+  margin-bottom: 1em }
+
+div.line-block div.line-block {
+  margin-top: 0 ;
+  margin-bottom: 0 ;
+  margin-left: 1.5em }
+
+div.sidebar {
+  margin: 0 0 0.5em 1em ;
+  border: medium outset ;
+  padding: 1em ;
+  background-color: #ffffee ;
+  width: 40% ;
+  float: right ;
+  clear: right }
+
+div.sidebar p.rubric {
+  font-family: sans-serif ;
+  font-size: medium }
+
+div.system-messages {
+  margin: 5em }
+
+div.system-messages h1 {
+  color: red }
+
+div.system-message {
+  border: medium outset ;
+  padding: 1em }
+
+div.system-message p.system-message-title {
+  color: red ;
+  font-weight: bold }
+
+div.topic {
+  margin: 2em }
+
+h1.section-subtitle, h2.section-subtitle, h3.section-subtitle,
+h4.section-subtitle, h5.section-subtitle, h6.section-subtitle {
+  margin-top: 0.4em }
+
+h1.title {
+  text-align: center }
+
+h2.subtitle {
+  text-align: center }
+
+hr.docutils {
+  width: 75% }
+
+img.align-left, .figure.align-left, object.align-left, table.align-left {
+  clear: left ;
+  float: left ;
+  margin-right: 1em }
+
+img.align-right, .figure.align-right, object.align-right, table.align-right {
+  clear: right ;
+  float: right ;
+  margin-left: 1em }
+
+img.align-center, .figure.align-center, object.align-center {
+  display: block;
+  margin-left: auto;
+  margin-right: auto;
+}
+
+table.align-center {
+  margin-left: auto;
+  margin-right: auto;
+}
+
+.align-left {
+  text-align: left }
+
+.align-center {
+  clear: both ;
+  text-align: center }
+
+.align-right {
+  text-align: right }
+
+/* reset inner alignment in figures */
+div.align-right {
+  text-align: inherit }
+
+/* div.align-center * { */
+/*   text-align: left } */
+
+.align-top    {
+  vertical-align: top }
+
+.align-middle {
+  vertical-align: middle }
+
+.align-bottom {
+  vertical-align: bottom }
+
+ol.simple, ul.simple {
+  margin-bottom: 1em }
+
+ol.arabic {
+  list-style: decimal }
+
+ol.loweralpha {
+  list-style: lower-alpha }
+
+ol.upperalpha {
+  list-style: upper-alpha }
+
+ol.lowerroman {
+  list-style: lower-roman }
+
+ol.upperroman {
+  list-style: upper-roman }
+
+p.attribution {
+  text-align: right ;
+  margin-left: 50% }
+
+p.caption {
+  font-style: italic }
+
+p.credits {
+  font-style: italic ;
+  font-size: smaller }
+
+p.label {
+  white-space: nowrap }
+
+p.rubric {
+  font-weight: bold ;
+  font-size: larger ;
+  color: maroon ;
+  text-align: center }
+
+p.sidebar-title {
+  font-family: sans-serif ;
+  font-weight: bold ;
+  font-size: larger }
+
+p.sidebar-subtitle {
+  font-family: sans-serif ;
+  font-weight: bold }
+
+p.topic-title {
+  font-weight: bold }
+
+pre.address {
+  margin-bottom: 0 ;
+  margin-top: 0 ;
+  font: inherit }
+
+pre.literal-block, pre.doctest-block, pre.math, pre.code {
+  margin-left: 2em ;
+  margin-right: 2em }
+
+pre.code .ln { color: grey; } /* line numbers */
+pre.code, code { background-color: #eeeeee }
+pre.code .comment, code .comment { color: #5C6576 }
+pre.code .keyword, code .keyword { color: #3B0D06; font-weight: bold }
+pre.code .literal.string, code .literal.string { color: #0C5404 }
+pre.code .name.builtin, code .name.builtin { color: #352B84 }
+pre.code .deleted, code .deleted { background-color: #DEB0A1}
+pre.code .inserted, code .inserted { background-color: #A3D289}
+
+span.classifier {
+  font-family: sans-serif ;
+  font-style: oblique }
+
+span.classifier-delimiter {
+  font-family: sans-serif ;
+  font-weight: bold }
+
+span.interpreted {
+  font-family: sans-serif }
+
+span.option {
+  white-space: nowrap }
+
+span.pre {
+  white-space: pre }
+
+span.problematic {
+  color: red }
+
+span.section-subtitle {
+  /* font-size relative to parent (h1..h6 element) */
+  font-size: 80% }
+
+table.citation {
+  border-left: solid 1px gray;
+  margin-left: 1px }
+
+table.docinfo {
+  margin: 2em 4em }
+
+table.docutils {
+  margin-top: 0.5em ;
+  margin-bottom: 0.5em }
+
+table.footnote {
+  border-left: solid 1px black;
+  margin-left: 1px }
+
+table.docutils td, table.docutils th,
+table.docinfo td, table.docinfo th {
+  padding-left: 0.5em ;
+  padding-right: 0.5em ;
+  vertical-align: top }
+
+table.docutils th.field-name, table.docinfo th.docinfo-name {
+  font-weight: bold ;
+  text-align: left ;
+  white-space: nowrap ;
+  padding-left: 0 }
+
+/* "booktabs" style (no vertical lines) */
+table.docutils.booktabs {
+  border: 0px;
+  border-top: 2px solid;
+  border-bottom: 2px solid;
+  border-collapse: collapse;
+}
+table.docutils.booktabs * {
+  border: 0px;
+}
+table.docutils.booktabs th {
+  border-bottom: thin solid;
+  text-align: left;
+}
+
+h1 tt.docutils, h2 tt.docutils, h3 tt.docutils,
+h4 tt.docutils, h5 tt.docutils, h6 tt.docutils {
+  font-size: 100% }
+
+ul.auto-toc {
+  list-style-type: none }
+
+</style>
+</head>
+<body>
+<div class="document" id="website-portal-restrict-modification">
+<h1 class="title">Website Portal Restrict Modification</h1>
+
+<!-- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!! This file is generated by oca-gen-addon-readme !!
+!! changes will be overwritten.                   !!
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
+<p><a class="reference external" href="https://odoo-community.org/page/development-status"><img alt="Beta" src="https://img.shields.io/badge/maturity-Beta-yellow.png" /></a> <a class="reference external" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external" href="https://github.com/beescoop/obeesdoo/tree/12.0/website_portal_restrict_modification"><img alt="beescoop/obeesdoo" src="https://img.shields.io/badge/github-beescoop%2Fobeesdoo-lightgray.png?logo=github" /></a></p>
+<p>Prevent modification of sensible data by the users</p>
+<p><strong>Table of contents</strong></p>
+<div class="contents local topic" id="contents">
+<ul class="simple">
+<li><a class="reference internal" href="#bug-tracker" id="id1">Bug Tracker</a></li>
+<li><a class="reference internal" href="#credits" id="id2">Credits</a><ul>
+<li><a class="reference internal" href="#authors" id="id3">Authors</a></li>
+<li><a class="reference internal" href="#contributors" id="id4">Contributors</a></li>
+<li><a class="reference internal" href="#maintainers" id="id5">Maintainers</a></li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="section" id="bug-tracker">
+<h1><a class="toc-backref" href="#id1">Bug Tracker</a></h1>
+<p>Bugs are tracked on <a class="reference external" href="https://github.com/beescoop/obeesdoo/issues">GitHub Issues</a>.
+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
+<a class="reference external" href="https://github.com/beescoop/obeesdoo/issues/new?body=module:%20website_portal_restrict_modification%0Aversion:%2012.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**">feedback</a>.</p>
+<p>Do not contact contributors directly about support or help with technical issues.</p>
+</div>
+<div class="section" id="credits">
+<h1><a class="toc-backref" href="#id2">Credits</a></h1>
+<div class="section" id="authors">
+<h2><a class="toc-backref" href="#id3">Authors</a></h2>
+<ul class="simple">
+<li>Coop IT Easy SCRLfs</li>
+</ul>
+</div>
+<div class="section" id="contributors">
+<h2><a class="toc-backref" href="#id4">Contributors</a></h2>
+<ul class="simple">
+<li>Rémy TAYMANS &lt;<a class="reference external" href="mailto:remy&#64;coopiteasy.be">remy&#64;coopiteasy.be</a>&gt;</li>
+<li>Vincent VAN ROSSEM &lt;<a class="reference external" href="mailto:vincent&#64;coopiteasy.be">vincent&#64;coopiteasy.be</a>&gt;</li>
+</ul>
+</div>
+<div class="section" id="maintainers">
+<h2><a class="toc-backref" href="#id5">Maintainers</a></h2>
+<p>This module is part of the <a class="reference external" href="https://github.com/beescoop/obeesdoo/tree/12.0/website_portal_restrict_modification">beescoop/obeesdoo</a> project on GitHub.</p>
+<p>You are welcome to contribute.</p>
+</div>
+</div>
+</div>
+</body>
+</html>

From 3e235cdcf9436c4dccd8346f022cf26660a2ddc5 Mon Sep 17 00:00:00 2001
From: Vincent Van Rossem <vvrossem@gmail.com>
Date: Tue, 9 Jun 2020 18:38:24 +0200
Subject: [PATCH 10/10] [FIX] website_portal_restrict_modification: generic
 field order

---
 website_portal_restrict_modification/controllers/main.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/website_portal_restrict_modification/controllers/main.py b/website_portal_restrict_modification/controllers/main.py
index 68da976..d1d0c34 100644
--- a/website_portal_restrict_modification/controllers/main.py
+++ b/website_portal_restrict_modification/controllers/main.py
@@ -22,13 +22,13 @@ class CustomerPortalRestrictModification(CustomerPortal):
 
         # since we override mandatory and optional billing fields,
         # parent method will insert the following key/value in `error` dict and `error_message` list,
-        # preventing from saving the form. Workaround is to clear both dict and list.
+        # preventing from saving the form. Workaround is to remove them from both dict and list.
         if (
             error.get("common")
-            and error["common"] == "Unknown field"
-            and "Unknown field 'name,email,company_name,vat'" in error_message
+            and error["common"].lower() == "unknown field"
+            and any("unknown field" in s.lower() for s in error_message)
         ):
             error.pop("common")
-            error_message.remove("Unknown field 'name,email,company_name,vat'")
+            error_message = [s for s in error_message if "unknown field" not in s.lower()]
 
         return error, error_message