From db52e66f470913191e9448aa032a5269e31dae5e Mon Sep 17 00:00:00 2001 From: Elouan Le Bars Date: Thu, 19 Sep 2019 17:48:15 +0200 Subject: [PATCH] [ADD] Financial risk approval choice to company, subscription and partner models --- easy_my_coop/models/company.py | 16 ++++++++++++++++ easy_my_coop/models/coop.py | 15 ++++++++++++--- easy_my_coop/models/partner.py | 1 + easy_my_coop/views/res_company_view.xml | 3 +++ 4 files changed, 32 insertions(+), 3 deletions(-) diff --git a/easy_my_coop/models/company.py b/easy_my_coop/models/company.py index 81cc9fc..d063414 100644 --- a/easy_my_coop/models/company.py +++ b/easy_my_coop/models/company.py @@ -65,6 +65,17 @@ class ResCompany(models.Model): translate=True, help="Text to display aside the checkbox to approve internal rules." ) + display_financial_risk_approval = fields.Boolean( + help="Choose to display a financial risk checkbox on the" + " cooperator website form." + ) + financial_risk_approval_required = fields.Boolean( + string="Is financial risk approval required?" + ) + financial_risk_approval_text = fields.Html( + translate=True, + help="Text to display aside the checkbox to approve financial risk." + ) @api.onchange('data_policy_approval_required') def onchange_data_policy_approval_required(self): @@ -75,3 +86,8 @@ class ResCompany(models.Model): def onchange_internal_rules_approval_required(self): if self.internal_rules_approval_required: self.display_internal_rules_approval = True + + @api.onchange('financial_risk_approval_required') + def onchange_financial_risk_approval_required(self): + if self.financial_risk_approval_required: + self.display_financial_risk_approval = True diff --git a/easy_my_coop/models/coop.py b/easy_my_coop/models/coop.py index 8e0c4a1..1c2159f 100644 --- a/easy_my_coop/models/coop.py +++ b/easy_my_coop/models/coop.py @@ -34,6 +34,8 @@ class SubscriptionRequest(models.Model): required_fields.append('data_policy_approved') if company.internal_rules_approval_required: required_fields.append('internal_rules_approved') + if company.financial_risk_approval_required: + required_fields.append('financial_risk_approved') return required_fields def get_mail_template_notif(self, is_company=False): @@ -321,7 +323,11 @@ class SubscriptionRequest(models.Model): default=False, ) internal_rules_approved = fields.Boolean( - string='Approved Internal Rules', + string='Internal Rules Approved', + default=False, + ) + financial_risk_approved = fields.Boolean( + string='Financial Risk Approved', default=False, ) _order = "id desc" @@ -449,7 +455,8 @@ class SubscriptionRequest(models.Model): 'country_id': self.country_id.id, 'lang': self.lang, 'data_policy_approved': self.data_policy_approved, - 'internal_rules_approved': self.internal_rules_approved + 'internal_rules_approved': self.internal_rules_approved, + 'financial_risk_approved': self.financial_risk_approved } return partner_vals @@ -466,6 +473,7 @@ class SubscriptionRequest(models.Model): 'customer': self.share_product_id.customer, 'data_policy_approved': self.data_policy_approved, 'internal_rules_approved': self.internal_rules_approved + 'financial_risk_approved': self.financial_risk_approved } return partner_vals @@ -544,7 +552,8 @@ class SubscriptionRequest(models.Model): 'function': self.contact_person_function, 'type': 'representative', 'data_policy_approved': self.data_policy_approved, - 'internal_rules_approved': self.internal_rules_approved + 'internal_rules_approved': self.internal_rules_approved, + 'financial_risk_approved': self.financial_risk_approved, } contact = partner_obj.create(contact_vals) else: diff --git a/easy_my_coop/models/partner.py b/easy_my_coop/models/partner.py index 85ba9f3..32ab289 100644 --- a/easy_my_coop/models/partner.py +++ b/easy_my_coop/models/partner.py @@ -131,6 +131,7 @@ class ResPartner(models.Model): string="Legal form") data_policy_approved = fields.Boolean(string="Approved Data Policy") internal_rules_approved = fields.Boolean(string="Approved Internal Rules") + financial_risk_approved = fields.Boolean(string="Approved Financial Risk") @api.multi @api.depends('subscription_request_ids.state') diff --git a/easy_my_coop/views/res_company_view.xml b/easy_my_coop/views/res_company_view.xml index 69eb547..e232cbc 100644 --- a/easy_my_coop/views/res_company_view.xml +++ b/easy_my_coop/views/res_company_view.xml @@ -26,6 +26,9 @@ + + +