Skip to content
Extraits de code Groupes Projets
Valider 1d6ecc5c rédigé par Juliana's avatar Juliana
Parcourir les fichiers

[ADD]Add periodicity invoice calcul

parent ebea032f
Aucune branche associée trouvée
Aucune étiquette associée trouvée
Aucune requête de fusion associée trouvée
...@@ -91,7 +91,11 @@ class AccOperation(models.Model): ...@@ -91,7 +91,11 @@ class AccOperation(models.Model):
account_list = [] account_list = []
date_end = date_utils.end_of(date_month, 'month') date_end = date_utils.end_of(date_month, 'month')
if account_periodicity == "1":
date_start = date_utils.start_of(date_month, 'month') date_start = date_utils.start_of(date_month, 'month')
else:
date_start = date_end - relativedelta(months=int(account_periodicity)-1)
date_start = date_utils.start_of(date_start, 'month')
power_tab_by_prod = self.env['acc.enedis.cdc'].read_group( power_tab_by_prod = self.env['acc.enedis.cdc'].read_group(
[('acc_operation_id', '=', self.id), [('acc_operation_id', '=', self.id),
...@@ -158,7 +162,7 @@ class AccOperation(models.Model): ...@@ -158,7 +162,7 @@ class AccOperation(models.Model):
account_list = [] account_list = []
date_end = date_utils.end_of(date_month, 'month') date_end = date_utils.end_of(date_month, 'month')
date_start = date_end - relativedelta(days=6) date_start = date_end - relativedelta(months=int(account_periodicity)-1)
date_start = date_utils.start_of(date_start, 'month') date_start = date_utils.start_of(date_start, 'month')
power_tab_by_prod = self.env['acc.enedis.cdc'].read_group( power_tab_by_prod = self.env['acc.enedis.cdc'].read_group(
......
...@@ -13,8 +13,8 @@ class AccAccountSurplusWizard(models.TransientModel): ...@@ -13,8 +13,8 @@ class AccAccountSurplusWizard(models.TransientModel):
# ------------------------------------------------------ # ------------------------------------------------------
start_date = fields.Date("Date de début") start_date = fields.Date("Date de début")
account_periodicity = fields.Selection([ account_periodicity = fields.Selection([
("trimestrial", "Trimestrielle"), ("3", "Trimestrielle"),
("annual", "Annuelle") ("12", "Annuelle")
], string='Périodicité Facturation', default="trimestrial") ], string='Périodicité Facturation', default="trimestrial")
# ------------------------------------------------------ # ------------------------------------------------------
# SQL Constraints # SQL Constraints
......
...@@ -13,10 +13,11 @@ class AccAccountWizard(models.TransientModel): ...@@ -13,10 +13,11 @@ class AccAccountWizard(models.TransientModel):
# ------------------------------------------------------ # ------------------------------------------------------
start_date = fields.Date("Date de début") start_date = fields.Date("Date de début")
account_periodicity = fields.Selection([ account_periodicity = fields.Selection([
("mensual", "Mensuelle"), ("1", "Mensuelle"),
("trimestrial", "Trimestrielle"), ("3", "Trimestrielle"),
("annual", "Annuelle") ("6", "Semestrielle"),
], string='Périodicité Facturation', default="mensual") ("12", "Annuelle")
], string='Périodicité Facturation', default="1")
# ------------------------------------------------------ # ------------------------------------------------------
# SQL Constraints # SQL Constraints
# ------------------------------------------------------ # ------------------------------------------------------
......
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