From fdd7fc358628a8ba1ccafc51ba00f69b0f294b1d Mon Sep 17 00:00:00 2001
From: houssine <houssine.bakkali@gmail.com>
Date: Thu, 11 Jun 2020 09:21:16 +0200
Subject: [PATCH 1/5] [IMP] use qweb syntax

---
 .../views/subscription_templates.xml          | 46 +++++++++----------
 1 file changed, 23 insertions(+), 23 deletions(-)

diff --git a/beesdoo_easy_my_coop/views/subscription_templates.xml b/beesdoo_easy_my_coop/views/subscription_templates.xml
index 80e0bc4..2efa4cb 100644
--- a/beesdoo_easy_my_coop/views/subscription_templates.xml
+++ b/beesdoo_easy_my_coop/views/subscription_templates.xml
@@ -4,28 +4,28 @@
 
 <odoo>
 
-    <template id="beesdoo_easy_my_coop.becomecooperator"
-              name="Become Cooperator (in beesdoo_easy_my_coop)"
-              inherit_id="easy_my_coop_website.becomecooperator">
-        <xpath expr="//div[@id='data_policy_approved']" position="before">
-            <div id="info_session_confirmed" t-if="display_info_session"
-                 t-attf-class="form-group">
-                <label class="col-md-3 col-sm-4 control-label"
-                       for="info_session_confirmed">Info Session
-                </label>
-                <div class="col-md-9 col-sm-8">
-                    <div class="checkbox">
-                        <label for="info_session_confirmed">
-                            <input type="checkbox"
-                                   name="info_session_confirmed"
-                                   t-att="{'required': 'required'} if info_session_required else {}"
-                                   t-attf-value="#{data_policy_approved or ''}"/>
-                            <t t-raw="info_session_text"/>
-                        </label>
-                    </div>
-                </div>
-            </div>
-        </xpath>
-    </template>
+   <template id="beesdoo_easy_my_coop.becomecooperator"
+             name="Become Cooperator (in beesdoo_easy_my_coop)"
+             inherit_id="easy_my_coop_website.becomecooperator">
+		<xpath expr="//div[@id='data_policy_approved']" position="before">
+			<div id="info_session_confirmed" t-if="display_info_session" t-attf-class="form-group" >
+				<label class="col-md-3 col-sm-4 control-label" 
+				       for="info_session_confirmed">
+				       		Info Session
+				</label>
+				<div class="col-md-9 col-sm-8">
+					<div class="checkbox">
+						<label for="info_session_confirmed">
+							<input type="checkbox"
+							       name="info_session_confirmed"
+								   t-att-required="info_session_required"
+								   t-att-checked="data_policy_approved"/>
+							<t t-raw="info_session_text"/>
+						</label>
+					</div>
+				</div>
+			</div>
+		</xpath>
+  </template>
 
 </odoo>

From 6248d545105b0f822a8d8d5f01596fede5b1b0bf Mon Sep 17 00:00:00 2001
From: houssine <houssine.bakkali@gmail.com>
Date: Thu, 11 Jun 2020 17:23:58 +0200
Subject: [PATCH 2/5] [IMP] add missing info_session_confirmed field on partner
 view

---
 beesdoo_easy_my_coop/__manifest__.py       |  3 ++-
 beesdoo_easy_my_coop/views/res_partner.xml | 13 +++++++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)
 create mode 100644 beesdoo_easy_my_coop/views/res_partner.xml

diff --git a/beesdoo_easy_my_coop/__manifest__.py b/beesdoo_easy_my_coop/__manifest__.py
index f5d34e6..d0d2e65 100644
--- a/beesdoo_easy_my_coop/__manifest__.py
+++ b/beesdoo_easy_my_coop/__manifest__.py
@@ -4,7 +4,7 @@
     "author": "BEES coop, Coop IT Easy SCRLfs",
     "website": "https://github.com/beescoop/Obeesdoo",
     "category": "Cooperative management",
-    "version": "12.0.1.0.0",
+    "version": "12.0.1.0.1",
     "depends": [
         "beesdoo_base",
         "beesdoo_shift",
@@ -14,6 +14,7 @@
     ],
     "data": [
         "views/res_company.xml",
+        'views/res_partner.xml',
         "views/subscription_request.xml",
         "views/subscription_templates.xml",
         "views/product.xml",
diff --git a/beesdoo_easy_my_coop/views/res_partner.xml b/beesdoo_easy_my_coop/views/res_partner.xml
new file mode 100644
index 0000000..289f1b0
--- /dev/null
+++ b/beesdoo_easy_my_coop/views/res_partner.xml
@@ -0,0 +1,13 @@
+<odoo>
+    <record id="view_partner_form_easy_my_coop" model="ir.ui.view">
+        <field name="name">res.partner.form.easy_my_coop</field>
+        <field name="model">res.partner</field>
+        <field name="inherit_id" ref="easy_my_coop.view_partner_form_easy_my_coop"/>
+        <field name="arch" type="xml">
+            <field name="data_policy_approved" position="after">
+                <field name="info_session_confirmed"
+                       attrs="{'invisible':[('member','=',False)]}"/>
+            </field>
+        </field>
+    </record>
+</odoo>
\ No newline at end of file

From e5cab3f3fd0e9cadda0335b5131181fa983934bc Mon Sep 17 00:00:00 2001
From: houssine <houssine.bakkali@gmail.com>
Date: Thu, 11 Jun 2020 20:24:35 +0200
Subject: [PATCH 3/5] [FIX] conflict work around move the view to another file.

two different PR create the res_partner.xm so I move temporarily the
view to another xml file
---
 beesdoo_easy_my_coop/views/res_partner.xml          | 13 -------------
 beesdoo_easy_my_coop/views/subscription_request.xml | 11 +++++++++++
 2 files changed, 11 insertions(+), 13 deletions(-)
 delete mode 100644 beesdoo_easy_my_coop/views/res_partner.xml

diff --git a/beesdoo_easy_my_coop/views/res_partner.xml b/beesdoo_easy_my_coop/views/res_partner.xml
deleted file mode 100644
index 289f1b0..0000000
--- a/beesdoo_easy_my_coop/views/res_partner.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<odoo>
-    <record id="view_partner_form_easy_my_coop" model="ir.ui.view">
-        <field name="name">res.partner.form.easy_my_coop</field>
-        <field name="model">res.partner</field>
-        <field name="inherit_id" ref="easy_my_coop.view_partner_form_easy_my_coop"/>
-        <field name="arch" type="xml">
-            <field name="data_policy_approved" position="after">
-                <field name="info_session_confirmed"
-                       attrs="{'invisible':[('member','=',False)]}"/>
-            </field>
-        </field>
-    </record>
-</odoo>
\ No newline at end of file
diff --git a/beesdoo_easy_my_coop/views/subscription_request.xml b/beesdoo_easy_my_coop/views/subscription_request.xml
index 1b75719..683b73b 100644
--- a/beesdoo_easy_my_coop/views/subscription_request.xml
+++ b/beesdoo_easy_my_coop/views/subscription_request.xml
@@ -3,6 +3,17 @@
      License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). -->
 
 <odoo>
+	<record id="view_partner_form_easy_my_coop" model="ir.ui.view">
+        <field name="name">res.partner.form.easy_my_coop</field>
+        <field name="model">res.partner</field>
+        <field name="inherit_id" ref="easy_my_coop.view_partner_form_easy_my_coop"/>
+        <field name="arch" type="xml">
+            <field name="data_policy_approved" position="after">
+                <field name="info_session_confirmed"
+                       attrs="{'invisible':[('member','=',False)]}"/>
+            </field>
+        </field>
+    </record>
 
     <record model="ir.ui.view" id="subscription_request_form_view">
         <field name="name">subscription.request.form (in beesdoo_easy_my_coop)</field>

From 2811829ca3aa63021f67516af6947f2db789211e Mon Sep 17 00:00:00 2001
From: houssine <houssine.bakkali@gmail.com>
Date: Wed, 17 Jun 2020 17:20:17 +0200
Subject: [PATCH 4/5] [IMP] move view to dedicated file

---
 beesdoo_easy_my_coop/views/res_partner.xml      | 17 +++++++++++++++++
 .../views/subscription_request.xml              | 11 -----------
 2 files changed, 17 insertions(+), 11 deletions(-)
 create mode 100644 beesdoo_easy_my_coop/views/res_partner.xml

diff --git a/beesdoo_easy_my_coop/views/res_partner.xml b/beesdoo_easy_my_coop/views/res_partner.xml
new file mode 100644
index 0000000..02e9000
--- /dev/null
+++ b/beesdoo_easy_my_coop/views/res_partner.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2019 Coop IT Easy SCRLfs
+     License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). -->
+
+<odoo>
+    <record id="view_partner_form_easy_my_coop" model="ir.ui.view">
+        <field name="name">res.partner.form.easy_my_coop</field>
+        <field name="model">res.partner</field>
+        <field name="inherit_id" ref="easy_my_coop.view_partner_form_easy_my_coop"/>
+        <field name="arch" type="xml">
+            <field name="data_policy_approved" position="after">
+                <field name="info_session_confirmed"
+                       attrs="{'invisible':[('member','=',False)]}"/>
+            </field>
+        </field>
+    </record>
+</odoo> 
\ No newline at end of file
diff --git a/beesdoo_easy_my_coop/views/subscription_request.xml b/beesdoo_easy_my_coop/views/subscription_request.xml
index 683b73b..1b75719 100644
--- a/beesdoo_easy_my_coop/views/subscription_request.xml
+++ b/beesdoo_easy_my_coop/views/subscription_request.xml
@@ -3,17 +3,6 @@
      License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). -->
 
 <odoo>
-	<record id="view_partner_form_easy_my_coop" model="ir.ui.view">
-        <field name="name">res.partner.form.easy_my_coop</field>
-        <field name="model">res.partner</field>
-        <field name="inherit_id" ref="easy_my_coop.view_partner_form_easy_my_coop"/>
-        <field name="arch" type="xml">
-            <field name="data_policy_approved" position="after">
-                <field name="info_session_confirmed"
-                       attrs="{'invisible':[('member','=',False)]}"/>
-            </field>
-        </field>
-    </record>
 
     <record model="ir.ui.view" id="subscription_request_form_view">
         <field name="name">subscription.request.form (in beesdoo_easy_my_coop)</field>

From ec5c8998ac59ef9a242248e2bc6c0b2e68b61481 Mon Sep 17 00:00:00 2001
From: Manuel Claeys Bouuaert <manuel.claeys.b@gmail.com>
Date: Tue, 4 Aug 2020 17:03:11 +0200
Subject: [PATCH 5/5] [REF] beesdoo_easy_my_coop: place info_session_confirmed
 before internal_rules_approved

---
 beesdoo_easy_my_coop/views/res_company.xml            | 2 +-
 beesdoo_easy_my_coop/views/res_partner.xml            | 4 ++--
 beesdoo_easy_my_coop/views/subscription_request.xml   | 2 +-
 beesdoo_easy_my_coop/views/subscription_templates.xml | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/beesdoo_easy_my_coop/views/res_company.xml b/beesdoo_easy_my_coop/views/res_company.xml
index 9e4ac9d..ce1f082 100644
--- a/beesdoo_easy_my_coop/views/res_company.xml
+++ b/beesdoo_easy_my_coop/views/res_company.xml
@@ -9,7 +9,7 @@
         <field name="model">res.company</field>
         <field name="inherit_id" ref="easy_my_coop.view_company_inherit_form2"/>
         <field name="arch" type="xml">
-            <xpath expr="//group[@name='coop_grp']//field[@name='display_data_policy_approval']"
+            <xpath expr="//group[@name='coop_grp']//field[@name='display_internal_rules_approval']"
                    position="before">
                 <field name="display_info_session_confirmation"/>
                 <field name="info_session_confirmation_required"/>
diff --git a/beesdoo_easy_my_coop/views/res_partner.xml b/beesdoo_easy_my_coop/views/res_partner.xml
index 02e9000..4a838e2 100644
--- a/beesdoo_easy_my_coop/views/res_partner.xml
+++ b/beesdoo_easy_my_coop/views/res_partner.xml
@@ -8,10 +8,10 @@
         <field name="model">res.partner</field>
         <field name="inherit_id" ref="easy_my_coop.view_partner_form_easy_my_coop"/>
         <field name="arch" type="xml">
-            <field name="data_policy_approved" position="after">
+            <field name="internal_rules_approved" position="before">
                 <field name="info_session_confirmed"
                        attrs="{'invisible':[('member','=',False)]}"/>
             </field>
         </field>
     </record>
-</odoo> 
\ No newline at end of file
+</odoo> 
diff --git a/beesdoo_easy_my_coop/views/subscription_request.xml b/beesdoo_easy_my_coop/views/subscription_request.xml
index 1b75719..b9546f0 100644
--- a/beesdoo_easy_my_coop/views/subscription_request.xml
+++ b/beesdoo_easy_my_coop/views/subscription_request.xml
@@ -9,7 +9,7 @@
         <field name="model">subscription.request</field>
         <field name="inherit_id" ref="easy_my_coop.subscription_request_form"/>
         <field name="arch" type="xml">
-            <field name="data_policy_approved" position="before">
+            <field name="internal_rules_approved" position="before">
                 <field name="info_session_confirmed"/>
             </field>
         </field>
diff --git a/beesdoo_easy_my_coop/views/subscription_templates.xml b/beesdoo_easy_my_coop/views/subscription_templates.xml
index 2efa4cb..cd1ed60 100644
--- a/beesdoo_easy_my_coop/views/subscription_templates.xml
+++ b/beesdoo_easy_my_coop/views/subscription_templates.xml
@@ -7,7 +7,7 @@
    <template id="beesdoo_easy_my_coop.becomecooperator"
              name="Become Cooperator (in beesdoo_easy_my_coop)"
              inherit_id="easy_my_coop_website.becomecooperator">
-		<xpath expr="//div[@id='data_policy_approved']" position="before">
+		<xpath expr="//div[@id='internal_rules_approved']" position="before">
 			<div id="info_session_confirmed" t-if="display_info_session" t-attf-class="form-group" >
 				<label class="col-md-3 col-sm-4 control-label" 
 				       for="info_session_confirmed">