Browse Source

Merge branch '12.0-small-changes' into 12.0

pull/46/head
robin.keunen 5 years ago
parent
commit
7485b23566
  1. 12
      easy_my_coop/models/coop.py
  2. 5
      easy_my_coop/models/mail_template.py
  3. 2
      easy_my_coop/views/subscription_request_view.xml
  4. 2
      easy_my_coop_loan/models/loan.py
  5. 9
      easy_my_coop_loan/views/loan_view.xml

12
easy_my_coop/models/coop.py

@ -58,7 +58,6 @@ class SubscriptionRequest(models.Model):
@api.model @api.model
def create(self, vals): def create(self, vals):
partner_obj = self.env['res.partner'] partner_obj = self.env['res.partner']
mail_template_notif = self.get_mail_template_notif(False)
if not vals.get('partner_id'): if not vals.get('partner_id'):
cooperator = False cooperator = False
@ -81,13 +80,13 @@ class SubscriptionRequest(models.Model):
cooperator.write({'cooperator': True}) cooperator.write({'cooperator': True})
subscr_request = super(SubscriptionRequest, self).create(vals) subscr_request = super(SubscriptionRequest, self).create(vals)
mail_template_notif = subscr_request.get_mail_template_notif(False)
mail_template_notif.send_mail(subscr_request.id) mail_template_notif.send_mail(subscr_request.id)
return subscr_request return subscr_request
@api.model @api.model
def create_comp_sub_req(self, vals): def create_comp_sub_req(self, vals):
confirmation_mail_template = self.get_mail_template_notif(True)
vals["name"] = vals['company_name'] vals["name"] = vals['company_name']
if not vals.get('partner_id'): if not vals.get('partner_id'):
cooperator = self.env['res.partner'].get_cooperator_from_crn(vals.get('company_register_number')) cooperator = self.env['res.partner'].get_cooperator_from_crn(vals.get('company_register_number'))
@ -97,6 +96,7 @@ class SubscriptionRequest(models.Model):
vals['already_cooperator'] = True vals['already_cooperator'] = True
subscr_request = super(SubscriptionRequest, self).create(vals) subscr_request = super(SubscriptionRequest, self).create(vals)
confirmation_mail_template = subscr_request.get_mail_template_notif(True)
confirmation_mail_template.send_mail(subscr_request.id) confirmation_mail_template.send_mail(subscr_request.id)
return subscr_request return subscr_request
@ -502,7 +502,7 @@ class SubscriptionRequest(models.Model):
'out_inv_comm_algorithm': 'random', 'out_inv_comm_algorithm': 'random',
'lang': self.lang, 'lang': self.lang,
'birthdate_date': self.birthdate, 'birthdate_date': self.birthdate,
'parent_id': self.partner.id,
'parent_id': self.partner_id.id,
'representative': True, 'representative': True,
'function': self.contact_person_function, 'function': self.contact_person_function,
'type': 'representative', 'type': 'representative',
@ -553,11 +553,9 @@ class SubscriptionRequest(models.Model):
if domain: if domain:
partner = partner_obj.search(domain) partner = partner_obj.search(domain)
if not partner.cooperator:
partner.cooperator = True
if not partner: if not partner:
partner = self.create_coop_partner() partner = self.create_coop_partner()
self.partner_id = partner
else: else:
partner = partner[0] partner = partner[0]
@ -588,7 +586,7 @@ class SubscriptionRequest(models.Model):
'representative': True}) 'representative': True})
invoice = self.create_invoice(partner) invoice = self.create_invoice(partner)
self.write({'partner_id': partner.id, 'state': 'done'})
self.write({'state': 'done'})
self.set_membership() self.set_membership()
return invoice return invoice

5
easy_my_coop/models/mail_template.py

@ -4,9 +4,4 @@ from odoo import models, fields
class MailTemplate(models.Model): class MailTemplate(models.Model):
_inherit = "mail.template" _inherit = "mail.template"
# def init(self):
# for template_id in EMAIL_TEMPLATE_IDS:
# mail_template = self.env.ref(template_id)
# mail_template.easy_my_coop = True
easy_my_coop = fields.Boolean(string="Easy my coop mail template") easy_my_coop = fields.Boolean(string="Easy my coop mail template")

2
easy_my_coop/views/subscription_request_view.xml

@ -34,7 +34,7 @@
<header> <header>
<button string="Validate" type="object" name="validate_subscription_request" attrs="{'invisible':['|',('state','not in',['draft','waiting']),('validated','=',False)]}"/> <button string="Validate" type="object" name="validate_subscription_request" attrs="{'invisible':['|',('state','not in',['draft','waiting']),('validated','=',False)]}"/>
<button string="Waiting list" type="object" name="put_on_waiting_list" states="draft"/> <button string="Waiting list" type="object" name="put_on_waiting_list" states="draft"/>
<button string="Cancel" type="object" name="cancel_subscription_request" states="draft,done,block" groups="easy_my_coop.group_easy_my_coop_user"/>
<button string="Cancel" type="object" name="cancel_subscription_request" states="draft,waiting,done,block" groups="easy_my_coop.group_easy_my_coop_user"/>
<field name="state" widget="statusbar" statusbar_visible="draft,cancelled,done,failed"/> <field name="state" widget="statusbar" statusbar_visible="draft,cancelled,done,failed"/>
</header> </header>
<sheet> <sheet>

2
easy_my_coop_loan/models/loan.py

@ -20,7 +20,6 @@ class LoanIssue(models.Model):
name = fields.Char(string="Name", name = fields.Char(string="Name",
translate=True) translate=True)
is_bond = fields.Boolean(string="Is a bond issue?")
default_issue = fields.Boolean(string="Default issue") default_issue = fields.Boolean(string="Default issue")
subscription_start_date = fields.Date(string="Start date subscription period") subscription_start_date = fields.Date(string="Start date subscription period")
subscription_end_date = fields.Date(string="End date subscription period") subscription_end_date = fields.Date(string="End date subscription period")
@ -94,7 +93,6 @@ class LoanIssue(models.Model):
@api.multi @api.multi
def get_web_issues(self, is_company): def get_web_issues(self, is_company):
bond_issues = self.search([ bond_issues = self.search([
('is_bond', '=', True),
('display_on_website', '=', True), ('display_on_website', '=', True),
('state', '=', 'ongoing') ('state', '=', 'ongoing')
]) ])

9
easy_my_coop_loan/views/loan_view.xml

@ -56,18 +56,17 @@
<group> <group>
<group> <group>
<field name="name" /> <field name="name" />
<field name="is_bond" />
<field name="default_issue" /> <field name="default_issue" />
<field name="face_value" /> <field name="face_value" />
<field name="minimum_amount" /> <field name="minimum_amount" />
<field name="maximum_amount" /> <field name="maximum_amount" />
<field name="subscribed_amount" /> <field name="subscribed_amount" />
<field name="min_amount_person" />
<field name="max_amount_person" />
<field name="min_amount_company" />
<field name="max_amount_company" />
<field name="by_individual" /> <field name="by_individual" />
<field name="min_amount_person" attrs="{'invisible':[('by_individual','=',False)]}" />
<field name="max_amount_person" attrs="{'invisible':[('by_individual','=',False)]}" />
<field name="by_company" /> <field name="by_company" />
<field name="min_amount_company" attrs="{'invisible':[('by_company','=',False)]}" />
<field name="max_amount_company" attrs="{'invisible':[('by_company','=',False)]}" />
<field name="company_currency_id" invisible="True" /> <field name="company_currency_id" invisible="True" />
</group> </group>
<group> <group>

Loading…
Cancel
Save