Skip to content
Extraits de code Groupes Projets
Valider 35c49781 rédigé par jordan's avatar jordan
Parcourir les fichiers

[fix] date adhesion and invoice is date bureau if exists

parent 11705761
Aucune branche associée trouvée
Aucune étiquette associée trouvée
Aucune requête de fusion associée trouvée
...@@ -304,8 +304,7 @@ class ScopPartner(models.Model): ...@@ -304,8 +304,7 @@ class ScopPartner(models.Model):
:param number: :param number:
:return: :return:
""" """
start = fields.Date.today() date = self.date_bureau_validation or fields.Date.today()
start_stat = fields.Date.today()
if self.env['scop.membership.period'].search( if self.env['scop.membership.period'].search(
[('partner_id', '=', self.id), [('partner_id', '=', self.id),
('end', '=', False), ('type_id', '=', type_id.id)], ('end', '=', False), ('type_id', '=', type_id.id)],
...@@ -316,8 +315,8 @@ class ScopPartner(models.Model): ...@@ -316,8 +315,8 @@ class ScopPartner(models.Model):
self.env['scop.membership.period'].create({ self.env['scop.membership.period'].create({
'partner_id': self.id, 'partner_id': self.id,
'type_id': type_id.id, 'type_id': type_id.id,
'start': start, 'start': date,
'start_stat': start_stat, 'start_stat': date,
'number': number 'number': number
}) })
...@@ -349,7 +348,7 @@ class ScopPartner(models.Model): ...@@ -349,7 +348,7 @@ class ScopPartner(models.Model):
Invoice = self.env['account.invoice'] Invoice = self.env['account.invoice']
InvoiceLine = self.env['account.invoice.line'] InvoiceLine = self.env['account.invoice.line']
date_invoice = fields.Date.today() date_invoice = self.date_bureau_validation or fields.Date.today()
account_id = self.property_account_receivable_id account_id = self.property_account_receivable_id
adhesion_invoice = Invoice.create({ adhesion_invoice = Invoice.create({
'partner_id': self.id, 'partner_id': self.id,
......
0% Chargement en cours ou .
You are about to add 0 people to the discussion. Proceed with caution.
Veuillez vous inscrire ou vous pour commenter