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

[update] remove useless functions to generate move_line according to payment terms

parent d76a66f0
Aucune branche associée trouvée
Aucune étiquette associée trouvée
1 requête de fusion!112.0 refactor cotiz
...@@ -25,6 +25,14 @@ class ScopAuraAccountInvoice(models.Model): ...@@ -25,6 +25,14 @@ class ScopAuraAccountInvoice(models.Model):
string="Montant calculé annuel", currency_field='company_currency_id', string="Montant calculé annuel", currency_field='company_currency_id',
compute='_compute_amount_aura_calculated', store=True, readonly=True) compute='_compute_amount_aura_calculated', store=True, readonly=True)
nb_quarter = fields.Selection(
string='Nombre de trimestres de cotisation',
selection=[(1, '1'),
(2, '2'),
(3, '3'),
(4, '4')],
default=4,
required=True)
amount_aura_prorata = fields.Monetary( amount_aura_prorata = fields.Monetary(
string="Montant calculé proratisé", string="Montant calculé proratisé",
currency_field='company_currency_id', currency_field='company_currency_id',
...@@ -81,23 +89,23 @@ class ScopAuraAccountInvoice(models.Model): ...@@ -81,23 +89,23 @@ class ScopAuraAccountInvoice(models.Model):
# ------------------------------------------------------ # ------------------------------------------------------
# Override parent # Override parent
# ------------------------------------------------------ # ------------------------------------------------------
@api.multi # @api.multi
def set_scop_contribution(self): # def set_scop_contribution(self):
contrib_id = super(ScopAuraAccountInvoice, self).set_scop_contribution() # contrib_id = super(ScopAuraAccountInvoice, self).set_scop_contribution()
if self.cotisation_aura_id: # if self.cotisation_aura_id:
i = 4 - self.nb_quarter # i = 4 - self.nb_quarter
schedule = { # schedule = {
'quarter_1': self.cotisation_aura_id.trimester_1, # 'quarter_1': self.cotisation_aura_id.trimester_1,
'quarter_2': self.cotisation_aura_id.trimester_2, # 'quarter_2': self.cotisation_aura_id.trimester_2,
'quarter_3': self.cotisation_aura_id.trimester_3, # 'quarter_3': self.cotisation_aura_id.trimester_3,
'quarter_4': self.cotisation_aura_id.trimester_4, # 'quarter_4': self.cotisation_aura_id.trimester_4,
} # }
while i != 0: # while i != 0:
key = 'quarter_' + str(i) # key = 'quarter_' + str(i)
schedule.pop(key, None) # schedule.pop(key, None)
i -= 1 # i -= 1
contrib_id.update(schedule) # contrib_id.update(schedule)
return contrib_id # return contrib_id
# ------------------------------------------------------ # ------------------------------------------------------
# Global functions # Global functions
......
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