diff --git a/easy_my_coop/controllers/main.py b/easy_my_coop/controllers/main.py
index 3496083..eafd086 100644
--- a/easy_my_coop/controllers/main.py
+++ b/easy_my_coop/controllers/main.py
@@ -166,12 +166,12 @@ class WebsiteSubscription(http.Controller):
comp = request.env['res.company']._company_default_get()
values.update({
- 'display_data_policy': comp.display_data_policy_approval,
- 'data_policy_required': comp.data_policy_approval_required,
- 'data_policy_text': comp.data_policy_approval_text,
'display_internal_rules': comp.display_internal_rules_approval,
'internal_rules_required': comp.internal_rules_approval_required,
'internal_rules_text': comp.internal_rules_approval_text,
+ 'display_data_policy': comp.display_data_policy_approval,
+ 'data_policy_required': comp.data_policy_approval_required,
+ 'data_policy_text': comp.data_policy_approval_text,
'display_financial_risk': comp.display_financial_risk_approval,
'financial_risk_required': comp.financial_risk_approval_required,
'financial_risk_text': comp.financial_risk_approval_text,
@@ -362,12 +362,12 @@ class WebsiteSubscription(http.Controller):
values["already_cooperator"] = already_coop
values["is_company"] = is_company
- if kwargs.get('data_policy_approved', 'off') == 'on':
- values['data_policy_approved'] = True
-
if kwargs.get('internal_rules_approved', 'off') == 'on':
values['internal_rules_approved'] = True
+ if kwargs.get('data_policy_approved', 'off') == 'on':
+ values['data_policy_approved'] = True
+
if kwargs.get('financial_risk_approved', 'off') == 'on':
values['financial_risk_approved'] = True
diff --git a/easy_my_coop/models/company.py b/easy_my_coop/models/company.py
index 8b87bb4..1ba8a89 100644
--- a/easy_my_coop/models/company.py
+++ b/easy_my_coop/models/company.py
@@ -44,17 +44,7 @@ class ResCompany(models.Model):
bottom_logo2 = fields.Binary(string="Bottom logo 2")
logo_url = fields.Char(string="logo url",
compute="_get_base_logo")
- display_data_policy_approval = fields.Boolean(
- help="Choose to display a data policy checkbox on the cooperator"
- " website form."
- )
- data_policy_approval_required = fields.Boolean(
- string="Is data policy approval required?"
- )
- data_policy_approval_text = fields.Html(
- translate=True,
- help="Text to display aside the checkbox to approve data policy."
- )
+
display_internal_rules_approval = fields.Boolean(
help="Choose to display an internal rules checkbox on the"
" cooperator website form."
@@ -66,6 +56,19 @@ class ResCompany(models.Model):
translate=True,
help="Text to display aside the checkbox to approve internal rules."
)
+
+ display_data_policy_approval = fields.Boolean(
+ help="Choose to display a data policy checkbox on the cooperator"
+ " website form."
+ )
+ data_policy_approval_required = fields.Boolean(
+ string="Is data policy approval required?"
+ )
+ data_policy_approval_text = fields.Html(
+ translate=True,
+ help="Text to display aside the checkbox to approve data policy."
+ )
+
display_financial_risk_approval = fields.Boolean(
help="Choose to display a financial risk checkbox on the"
" cooperator website form."
@@ -78,16 +81,16 @@ class ResCompany(models.Model):
help="Text to display aside the checkbox to approve financial risk."
)
- @api.onchange('data_policy_approval_required')
- def onchange_data_policy_approval_required(self):
- if self.data_policy_approval_required:
- self.display_data_policy_approval = True
-
@api.onchange('internal_rules_approval_required')
def onchange_internal_rules_approval_required(self):
if self.internal_rules_approval_required:
self.display_internal_rules_approval = True
+ @api.onchange('data_policy_approval_required')
+ def onchange_data_policy_approval_required(self):
+ if self.data_policy_approval_required:
+ self.display_data_policy_approval = True
+
@api.onchange('financial_risk_approval_required')
def onchange_financial_risk_approval_required(self):
if self.financial_risk_approval_required:
diff --git a/easy_my_coop/models/coop.py b/easy_my_coop/models/coop.py
index 20a0e87..fe34dc5 100644
--- a/easy_my_coop/models/coop.py
+++ b/easy_my_coop/models/coop.py
@@ -31,10 +31,10 @@ class subscription_request(models.Model):
def get_required_field(self):
required_fields = _REQUIRED
company = self.env['res.company']._company_default_get()
- if company.data_policy_approval_required:
- required_fields.append('data_policy_approved')
if company.internal_rules_approval_required:
required_fields.append('internal_rules_approved')
+ if company.data_policy_approval_required:
+ required_fields.append('data_policy_approved')
if company.financial_risk_approval_required:
required_fields.append('financial_risk_approved')
return required_fields
@@ -308,14 +308,14 @@ class subscription_request(models.Model):
default="website",
readonly=True,
states={'draft': [('readonly', False)]})
- data_policy_approved = fields.Boolean(
- string='Data Policy Approved',
- default=False,
- )
internal_rules_approved = fields.Boolean(
string='Internal Rules Approved ',
default=False,
)
+ data_policy_approved = fields.Boolean(
+ string='Data Policy Approved',
+ default=False,
+ )
financial_risk_approved = fields.Boolean(
string='Financial Risk Approved',
default=False,
@@ -436,8 +436,8 @@ class subscription_request(models.Model):
'out_inv_comm_algorithm': 'random',
'country_id': self.country_id.id,
'lang': self.lang,
- 'data_policy_approved': self.data_policy_approved,
'internal_rules_approved': self.internal_rules_approved,
+ 'data_policy_approved': self.data_policy_approved,
'financial_risk_approved': self.financial_risk_approved
}
return partner_vals
@@ -453,8 +453,8 @@ class subscription_request(models.Model):
'country_id': self.country_id.id, 'lang': self.lang,
'birthdate_date': self.birthdate,
'customer': self.share_product_id.customer,
- 'data_policy_approved': self.data_policy_approved,
'internal_rules_approved': self.internal_rules_approved,
+ 'data_policy_approved': self.data_policy_approved,
'financial_risk_approved': self.financial_risk_approved
}
return partner_vals
@@ -528,8 +528,8 @@ class subscription_request(models.Model):
'representative': True,
'function': self.contact_person_function,
'type': 'representative',
- 'data_policy_approved': self.data_policy_approved,
'internal_rules_approved': self.internal_rules_approved,
+ 'data_policy_approved': self.data_policy_approved,
'financial_risk_approved': self.financial_risk_approved
}
contact = partner_obj.create(contact_vals)
diff --git a/easy_my_coop/models/partner.py b/easy_my_coop/models/partner.py
index e349cc4..277ff7e 100644
--- a/easy_my_coop/models/partner.py
+++ b/easy_my_coop/models/partner.py
@@ -144,8 +144,8 @@ class ResPartner(models.Model):
string="Subscription request")
legal_form = fields.Selection([('', '')],
string="Legal form")
- data_policy_approved = fields.Boolean(string="Data Policy Approved ")
internal_rules_approved = fields.Boolean(string="Internal Rules Approved ")
+ data_policy_approved = fields.Boolean(string="Data Policy Approved ")
financial_risk_approved = fields.Boolean(string="Financial Risk Approved ")
@api.multi
diff --git a/easy_my_coop/view/res_company_view.xml b/easy_my_coop/view/res_company_view.xml
index 248f833..0c26f41 100644
--- a/easy_my_coop/view/res_company_view.xml
+++ b/easy_my_coop/view/res_company_view.xml
@@ -21,12 +21,12 @@