diff --git a/models/acc_operation.py b/models/acc_operation.py index 1f4ffcdeb54f626fe9fa7c1377fee364ee8a033b..1dad26ad4a97272a74664aadd7f58807dea97b4c 100644 --- a/models/acc_operation.py +++ b/models/acc_operation.py @@ -91,7 +91,11 @@ class AccOperation(models.Model): account_list = [] date_end = date_utils.end_of(date_month, 'month') - date_start = date_utils.start_of(date_month, 'month') + if account_periodicity == "1": + 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( [('acc_operation_id', '=', self.id), @@ -158,7 +162,7 @@ class AccOperation(models.Model): account_list = [] 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') power_tab_by_prod = self.env['acc.enedis.cdc'].read_group( diff --git a/wizard/acc_account_surplus_wizard.py b/wizard/acc_account_surplus_wizard.py index f683c6ccf589de2525508b16f0626a0e7ef9094c..5a9f8a386840faec8ed181a9fc2e73b6244d75a0 100644 --- a/wizard/acc_account_surplus_wizard.py +++ b/wizard/acc_account_surplus_wizard.py @@ -13,8 +13,8 @@ class AccAccountSurplusWizard(models.TransientModel): # ------------------------------------------------------ start_date = fields.Date("Date de début") account_periodicity = fields.Selection([ - ("trimestrial", "Trimestrielle"), - ("annual", "Annuelle") + ("3", "Trimestrielle"), + ("12", "Annuelle") ], string='Périodicité Facturation', default="trimestrial") # ------------------------------------------------------ # SQL Constraints diff --git a/wizard/acc_account_wizard.py b/wizard/acc_account_wizard.py index 927ffe14a454e5b89440040fc29d144aa34bb179..8d2fe8c94b40f9b3523963d80418d84cffb7f1aa 100644 --- a/wizard/acc_account_wizard.py +++ b/wizard/acc_account_wizard.py @@ -13,10 +13,11 @@ class AccAccountWizard(models.TransientModel): # ------------------------------------------------------ start_date = fields.Date("Date de début") account_periodicity = fields.Selection([ - ("mensual", "Mensuelle"), - ("trimestrial", "Trimestrielle"), - ("annual", "Annuelle") - ], string='Périodicité Facturation', default="mensual") + ("1", "Mensuelle"), + ("3", "Trimestrielle"), + ("6", "Semestrielle"), + ("12", "Annuelle") + ], string='Périodicité Facturation', default="1") # ------------------------------------------------------ # SQL Constraints # ------------------------------------------------------