Browse Source

[IMP] add financial risk approval feature from dedicated PR.

https://github.com/coopiteasy/vertical-cooperative/pull/20/files
pull/105/head
houssine 5 years ago
committed by Manuel Claeys Bouuaert
parent
commit
caa27bb20b
  1. 2
      easy_my_coop/__manifest__.py
  2. 16
      easy_my_coop/models/company.py
  3. 11
      easy_my_coop/models/coop.py
  4. 1
      easy_my_coop/models/partner.py
  5. 3
      easy_my_coop/views/res_company_view.xml

2
easy_my_coop/__manifest__.py

@ -7,7 +7,7 @@
{ {
"name": "Easy My Coop", "name": "Easy My Coop",
"summary": "Manage your cooperative shares", "summary": "Manage your cooperative shares",
"version": "12.0.3.0.1",
"version": "12.0.3.0.2",
"depends": [ "depends": [
"base", "base",
"web", "web",

16
easy_my_coop/models/company.py

@ -81,6 +81,17 @@ class ResCompany(models.Model):
translate=True, translate=True,
help="Text to display aside the checkbox to approve internal rules.", 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") @api.onchange("data_policy_approval_required")
def onchange_data_policy_approval_required(self): def onchange_data_policy_approval_required(self):
@ -91,3 +102,8 @@ class ResCompany(models.Model):
def onchange_internal_rules_approval_required(self): def onchange_internal_rules_approval_required(self):
if self.internal_rules_approval_required: if self.internal_rules_approval_required:
self.display_internal_rules_approval = True 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

11
easy_my_coop/models/coop.py

@ -2,7 +2,6 @@
# Houssine Bakkali <houssine@coopiteasy.be> # Houssine Bakkali <houssine@coopiteasy.be>
# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html). # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
from datetime import datetime from datetime import datetime
# pylint: disable=missing-manifest-dependency # pylint: disable=missing-manifest-dependency
@ -44,6 +43,8 @@ class SubscriptionRequest(models.Model):
required_fields.append("data_policy_approved") required_fields.append("data_policy_approved")
if company.internal_rules_approval_required: if company.internal_rules_approval_required:
required_fields.append("internal_rules_approved") required_fields.append("internal_rules_approved")
if company.financial_risk_approval_required:
required_fields.append('financial_risk_approved')
return required_fields return required_fields
def get_mail_template_notif(self, is_company=False): def get_mail_template_notif(self, is_company=False):
@ -430,6 +431,11 @@ class SubscriptionRequest(models.Model):
internal_rules_approved = fields.Boolean( internal_rules_approved = fields.Boolean(
string="Approved Internal Rules", default=False string="Approved Internal Rules", default=False
) )
financial_risk_approved = fields.Boolean(
string='Financial Risk Approved',
default=False,
)
_order = "id desc" _order = "id desc"
def get_person_info(self, partner): def get_person_info(self, partner):
@ -574,6 +580,7 @@ class SubscriptionRequest(models.Model):
"lang": self.lang, "lang": self.lang,
"data_policy_approved": self.data_policy_approved, "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 return partner_vals
@ -595,6 +602,7 @@ class SubscriptionRequest(models.Model):
"customer": self.share_product_id.customer, "customer": self.share_product_id.customer,
"data_policy_approved": self.data_policy_approved, "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 return partner_vals
@ -623,6 +631,7 @@ class SubscriptionRequest(models.Model):
"type": "representative", "type": "representative",
"data_policy_approved": self.data_policy_approved, "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 contact_vals return contact_vals

1
easy_my_coop/models/partner.py

@ -178,6 +178,7 @@ class ResPartner(models.Model):
legal_form = fields.Selection([("", "")], string="Legal form") legal_form = fields.Selection([("", "")], string="Legal form")
data_policy_approved = fields.Boolean(string="Approved Data Policy") data_policy_approved = fields.Boolean(string="Approved Data Policy")
internal_rules_approved = fields.Boolean(string="Approved Internal Rules") internal_rules_approved = fields.Boolean(string="Approved Internal Rules")
financial_risk_approved = fields.Boolean(string="Approved Financial Risk")
@api.multi @api.multi
@api.depends("subscription_request_ids.state") @api.depends("subscription_request_ids.state")

3
easy_my_coop/views/res_company_view.xml

@ -28,6 +28,9 @@
<field name="display_internal_rules_approval"/> <field name="display_internal_rules_approval"/>
<field name="internal_rules_approval_required"/> <field name="internal_rules_approval_required"/>
<field name="internal_rules_approval_text"/> <field name="internal_rules_approval_text"/>
<field name="display_financial_risk_approval"/>
<field name="financial_risk_approval_required"/>
<field name="financial_risk_approval_text"/>
</group> </group>
</group> </group>
</field> </field>

Loading…
Cancel
Save