Compare commits

...

1 Commits

  1. 16
      easy_my_coop/models/company.py
  2. 15
      easy_my_coop/models/coop.py
  3. 1
      easy_my_coop/models/partner.py
  4. 3
      easy_my_coop/views/res_company_view.xml

16
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

15
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:

1
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')

3
easy_my_coop/views/res_company_view.xml

@ -26,6 +26,9 @@
<field name="display_internal_rules_approval"/>
<field name="internal_rules_approval_required"/>
<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>
</field>

Loading…
Cancel
Save