diff --git a/easy_my_coop/__manifest__.py b/easy_my_coop/__manifest__.py index 2a91490..f7061cb 100644 --- a/easy_my_coop/__manifest__.py +++ b/easy_my_coop/__manifest__.py @@ -7,7 +7,7 @@ { "name": "Easy My Coop", "summary": "Manage your cooperative shares", - "version": "12.0.3.0.1", + "version": "12.0.3.0.2", "depends": [ "base", "web", diff --git a/easy_my_coop/models/company.py b/easy_my_coop/models/company.py index 15cc03e..ee27535 100644 --- a/easy_my_coop/models/company.py +++ b/easy_my_coop/models/company.py @@ -81,6 +81,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): @@ -91,3 +102,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 45ad68c..5037490 100644 --- a/easy_my_coop/models/coop.py +++ b/easy_my_coop/models/coop.py @@ -2,7 +2,6 @@ # Houssine Bakkali # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html). - from datetime import datetime # pylint: disable=missing-manifest-dependency @@ -44,6 +43,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): @@ -430,6 +431,11 @@ class SubscriptionRequest(models.Model): internal_rules_approved = fields.Boolean( string="Approved Internal Rules", default=False ) + financial_risk_approved = fields.Boolean( + string='Financial Risk Approved', + default=False, + ) + _order = "id desc" def get_person_info(self, partner): @@ -574,6 +580,7 @@ class SubscriptionRequest(models.Model): "lang": self.lang, "data_policy_approved": self.data_policy_approved, "internal_rules_approved": self.internal_rules_approved, + 'financial_risk_approved': self.financial_risk_approved } return partner_vals @@ -595,6 +602,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 @@ -623,6 +631,7 @@ class SubscriptionRequest(models.Model): "type": "representative", "data_policy_approved": self.data_policy_approved, "internal_rules_approved": self.internal_rules_approved, + "financial_risk_approved": self.financial_risk_approved, } return contact_vals diff --git a/easy_my_coop/models/partner.py b/easy_my_coop/models/partner.py index b4b1752..4af1da0 100644 --- a/easy_my_coop/models/partner.py +++ b/easy_my_coop/models/partner.py @@ -178,6 +178,7 @@ class ResPartner(models.Model): legal_form = fields.Selection([("", "")], 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 3ee14a5..f113dee 100644 --- a/easy_my_coop/views/res_company_view.xml +++ b/easy_my_coop/views/res_company_view.xml @@ -22,12 +22,15 @@ - - - + + + + + + diff --git a/easy_my_coop/views/res_partner_view.xml b/easy_my_coop/views/res_partner_view.xml index 44b9659..be1c97f 100644 --- a/easy_my_coop/views/res_partner_view.xml +++ b/easy_my_coop/views/res_partner_view.xml @@ -53,8 +53,12 @@ attrs="{'invisible':[('is_company','=',True)]}"/> - - + + + diff --git a/easy_my_coop/views/subscription_request_view.xml b/easy_my_coop/views/subscription_request_view.xml index 018b556..a44d7f5 100644 --- a/easy_my_coop/views/subscription_request_view.xml +++ b/easy_my_coop/views/subscription_request_view.xml @@ -101,7 +101,9 @@ + + diff --git a/easy_my_coop_website/controllers/main.py b/easy_my_coop_website/controllers/main.py index 28f540b..f9ef8fa 100644 --- a/easy_my_coop_website/controllers/main.py +++ b/easy_my_coop_website/controllers/main.py @@ -199,12 +199,12 @@ class WebsiteSubscription(http.Controller): if company.default_country_id: values["country_id"] = company.default_country_id.id else: - values["country_id"] = "21" + values["country_id"] = "20" if not values.get("activities_country_id"): if company.default_country_id: values["activities_country_id"] = company.default_country_id.id else: - values["activities_country_id"] = "21" + values["activities_country_id"] = "20" if not values.get("lang"): if company.default_lang_id: values["lang"] = company.default_lang_id.code @@ -218,6 +218,9 @@ class WebsiteSubscription(http.Controller): "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_financial_risk": comp.display_financial_risk_approval, + "financial_risk_required": comp.financial_risk_approval_required, + "financial_risk_text": comp.financial_risk_approval_text, } ) return values @@ -439,6 +442,9 @@ class WebsiteSubscription(http.Controller): if kwargs.get("internal_rules_approved", "off") == "on": values["internal_rules_approved"] = True + if kwargs.get("financial_risk_approved", "off") == "on": + values["financial_risk_approved"] = True + lastname = kwargs.get("lastname").upper() firstname = kwargs.get("firstname").title() diff --git a/easy_my_coop_website/views/subscription_template.xml b/easy_my_coop_website/views/subscription_template.xml index f12f8b6..5bfeb3c 100644 --- a/easy_my_coop_website/views/subscription_template.xml +++ b/easy_my_coop_website/views/subscription_template.xml @@ -309,6 +309,7 @@ + + + + + +
@@ -451,25 +472,26 @@
-
+
@@ -699,6 +721,7 @@