diff --git a/models/acc_counter_period.py b/models/acc_counter_period.py index 777718788e21429a6815c8459bb870fc2b81403f..723c78bb4316a749fe9622f62bcad31fc213dafd 100644 --- a/models/acc_counter_period.py +++ b/models/acc_counter_period.py @@ -20,7 +20,7 @@ class AccCounterPeriod(models.Model): help="Ce tarif est appliqué par défaut à tous les consommateurs lorsque vous" " cliquez sur le bouton Mise à jour des prix de vente dans l'onglet " "Prix de vente.", - default=lambda self: self.get_default_sale_price(), + default=lambda self: self._get_default_sale_price(), ) price_accise = fields.Float("Tarif ACCISE par PRMs (€ / kWh)", digits="Sale Price") @@ -41,7 +41,7 @@ class AccCounterPeriod(models.Model): # ------------------------------------------------------ # Default methods # ------------------------------------------------------ - def get_default_sale_price(self): + def _get_default_sale_price(self): active_id = self.env["acc.operation"].browse( self.env.context.get("default_acc_operation_id") ) diff --git a/models/acc_operation.py b/models/acc_operation.py index ae8761afdf50d43b990dd3379f314caa3bfc31ca..a3da4059dd71da8f6aa224771d983a0356cf1480 100644 --- a/models/acc_operation.py +++ b/models/acc_operation.py @@ -172,7 +172,7 @@ class AccOperation(models.Model): months=int(account_move_periodicity) - 1 ) - energy_dict = self.env["acc.enedis.cdc.day"].get_proratized_energy( + energy_dict = self.env["acc.enedis.cdc.day"]._get_proratized_energy( acc_operation_id=self.id, start_date=start_date, end_date=end_date + relativedelta(days=1), diff --git a/models/account_move.py b/models/account_move.py index 96656a7934dd7cee149cad5816c1b1330cc7f532..6b8052dabb4b688ff3bd39267ea7f29108800dca 100644 --- a/models/account_move.py +++ b/models/account_move.py @@ -57,7 +57,8 @@ class AccountMove(models.Model): ) power_cons_display = fields.Float( - "Electricité locale (kwh)", digits="Unité de Mesure", + "Electricité locale (kwh)", + digits="Unité de Mesure", store=True, readonly=True, compute="_compute_power_cons_display", @@ -163,7 +164,7 @@ class AccountMove(models.Model): Calcul de la quantité facturée a afficher ( négatif si facture extournée) """ for move in self: - if move.move_type == 'out_refund': + if move.move_type == "out_refund": move.power_cons_display = move.power_cons * -1 else: move.power_cons_display = move.power_cons @@ -173,7 +174,7 @@ class AccountMove(models.Model): "line_ids.price_total", "line_ids.price_unit", "line_ids.quantity", - "move_type" + "move_type", ) def _compute_amount_oacc(self): """ @@ -203,7 +204,7 @@ class AccountMove(models.Model): else: tot_divers += line.price_subtotal - if move.move_type == 'out_refund': + if move.move_type == "out_refund": move.amount_accise_tot = tot_accise * -1 move.amount_elec_tot = tot_elec * -1 move.amount_divers_tot = tot_divers * -1 @@ -545,7 +546,7 @@ class AccountMove(models.Model): # Récupération des dates d'entrée / sortie des compteurs del_counter_period_min_max = self.env[ "acc.counter.period" - ].get_counter_interval_min_max( + ]._get_counter_interval_min_max( acc_operation_id=acc_operation_id.id, prm_type="delivery", start_date=start_date, @@ -595,11 +596,13 @@ class AccountMove(models.Model): elif self.acc_operation_id.subscription_type == "kw": quantity = move.power_cons - subscription_move_line = move._process_create_subscription_move_line( - quantity, - delivery_id, - counter_start_date, - counter_end_date, + subscription_move_line = ( + move._process_create_subscription_move_line( + quantity, + delivery_id, + counter_start_date, + counter_end_date, + ) ) if subscription_move_line: move_lines_to_create.append(subscription_move_line)