From 2dd0a8a3c9a3a83d30fee42f5e23fa16b1b668cd Mon Sep 17 00:00:00 2001
From: Manuel Claeys Bouuaert <manuel.claeys.b@gmail.com>
Date: Tue, 4 Aug 2020 17:04:26 +0200
Subject: [PATCH] [REF] easy_my_coop_website: order Internal rules, Data
 policy, Financial risk

---
 easy_my_coop/views/res_company_view.xml       |  6 ++--
 easy_my_coop/views/res_partner_view.xml       |  4 +--
 .../views/subscription_request_view.xml       |  2 +-
 .../views/subscription_template.xml           | 32 +++++++++----------
 4 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/easy_my_coop/views/res_company_view.xml b/easy_my_coop/views/res_company_view.xml
index 1ae5efe..f113dee 100644
--- a/easy_my_coop/views/res_company_view.xml
+++ b/easy_my_coop/views/res_company_view.xml
@@ -22,12 +22,12 @@
                     <field name="default_lang_id"/>
                     <field name="board_representative"/>
                     <field name="signature_scan"/>
-                    <field name="display_data_policy_approval"/>
-                    <field name="data_policy_approval_required"/>
-                    <field name="data_policy_approval_text"/>
                     <field name="display_internal_rules_approval"/>
                     <field name="internal_rules_approval_required"/>
                     <field name="internal_rules_approval_text"/>
+                    <field name="display_data_policy_approval"/>
+                    <field name="data_policy_approval_required"/>
+                    <field name="data_policy_approval_text"/>
                     <field name="display_financial_risk_approval"/>
                     <field name="financial_risk_approval_required"/>
                     <field name="financial_risk_approval_text"/>
diff --git a/easy_my_coop/views/res_partner_view.xml b/easy_my_coop/views/res_partner_view.xml
index 8b4c3cf..be1c97f 100644
--- a/easy_my_coop/views/res_partner_view.xml
+++ b/easy_my_coop/views/res_partner_view.xml
@@ -53,10 +53,10 @@
                                    attrs="{'invisible':[('is_company','=',True)]}"/>
                         </group>
                         <group name="approvals">
-                            <field name="data_policy_approved"
-                            	   attrs="{'invisible':[('member','=',False)]}"/>
                             <field name="internal_rules_approved"
                             	   attrs="{'invisible':[('member','=',False)]}"/>
+                            <field name="data_policy_approved"
+                            	   attrs="{'invisible':[('member','=',False)]}"/>
                             <field name="financial_risk_approved"
                             	   attrs="{'invisible':[('member','=',False)]}"/>
                         </group>
diff --git a/easy_my_coop/views/subscription_request_view.xml b/easy_my_coop/views/subscription_request_view.xml
index 1647629..a44d7f5 100644
--- a/easy_my_coop/views/subscription_request_view.xml
+++ b/easy_my_coop/views/subscription_request_view.xml
@@ -101,8 +101,8 @@
                             <field name="type"/>
                             <field name="lang"/>
                             <field name="skip_control_ng"/>
-                            <field name="data_policy_approved"/>
                             <field name="internal_rules_approved"/>
+                            <field name="data_policy_approved"/>
                             <field name="financial_risk_approved"/>
                         </group>
                     </group>
diff --git a/easy_my_coop_website/views/subscription_template.xml b/easy_my_coop_website/views/subscription_template.xml
index 8cf57a4..5bfeb3c 100644
--- a/easy_my_coop_website/views/subscription_template.xml
+++ b/easy_my_coop_website/views/subscription_template.xml
@@ -432,41 +432,41 @@
 
                                 <br/>
 
-                                <div id="data_policy_approved"
-                                     t-if="display_data_policy"
+                                <div id="internal_rules_approved"
+                                     t-if="display_internal_rules"
                                      t-attf-class="form-group">
                                     <label class="col-md-3 col-sm-4 control-label"
-                                           for="data_policy_approved">Privacy
-                                        Policy
+                                           for="internal_rules_approved">
+                                        Internal Rules
                                     </label>
                                     <div class="col-md-9 col-sm-8">
                                         <div class="checkbox">
                                             <label>
                                                 <input type="checkbox"
-                                                       name="data_policy_approved"
-                                                       t-att-required="data_policy_required"
-                                                       t-att-checked="data_policy_approved"/>
-                                                <t t-raw="data_policy_text"/>
+                                                       name="internal_rules_approved"
+                                                       t-att-required="internal_rules_required"
+                                                       t-att-checked="internal_rules_approved"/>
+                                                <t t-raw="internal_rules_text"/>
                                             </label>
                                         </div>
                                     </div>
                                 </div>
 
-                                <div id="internal_rules_approved"
-                                     t-if="display_internal_rules"
+                                <div id="data_policy_approved"
+                                     t-if="display_data_policy"
                                      t-attf-class="form-group">
                                     <label class="col-md-3 col-sm-4 control-label"
-                                           for="internal_rules_approved">
-                                        Internal Rules
+                                           for="data_policy_approved">Privacy
+                                        Policy
                                     </label>
                                     <div class="col-md-9 col-sm-8">
                                         <div class="checkbox">
                                             <label>
                                                 <input type="checkbox"
-                                                       name="internal_rules_approved"
-                                                       t-att-required="internal_rules_required"
-                                                       t-att-checked="internal_rules_approved"/>
-                                                <t t-raw="internal_rules_text"/>
+                                                       name="data_policy_approved"
+                                                       t-att-required="data_policy_required"
+                                                       t-att-checked="data_policy_approved"/>
+                                                <t t-raw="data_policy_text"/>
                                             </label>
                                         </div>
                                     </div>