diff --git a/README.rst b/README.rst index b6fd0ae150fdf05b9b48c7852d5e998c7bce6819..d5c92036ccae1db6bdc2f5a362fc688ddd9df9ba 100644 --- a/README.rst +++ b/README.rst @@ -36,4 +36,4 @@ Maintainer :alt: Le Filament :target: https://le-filament.com -This module is maintained by Le Filament \ No newline at end of file +This module is maintained by Le Filament diff --git a/tools/key_file.py b/tools/key_file.py index d3e141ee41b3f1c62a93a12566db6f1881bff7b8..b7b10c88d797068fe6ed6c92461bff7faa7b70b4 100644 --- a/tools/key_file.py +++ b/tools/key_file.py @@ -88,7 +88,7 @@ class RepartitionKeyEntryFile: call_list = [] for horo in self.json: date = datetime.strptime(horo, "%d-%m-%Y %H:%M") - timestamp = date.strftime('%Y%m%dT%H%M%SZ') + timestamp = date.strftime("%Y%m%dT%H%M%SZ") body = [] for key in self.json.get(horo): if send_empty_key: @@ -175,9 +175,6 @@ class RepartitionKeyEntryFile: for key in horo: if key["key"] == "0.00000000": key["key"] = 0.0 - try: - keys_sum = keys_sum + float(key["key"]) - except ValueError: - pass + keys_sum = keys_sum + float(key["key"]) return keys_sum diff --git a/views/acc_operation_views.xml b/views/acc_operation_views.xml index 439894516ccf17e00d78e24af121ae392f4c0c6b..588f02db9ab33dc27fd89357bc0e3aa9b1123372 100644 --- a/views/acc_operation_views.xml +++ b/views/acc_operation_views.xml @@ -13,13 +13,13 @@ <field name="keys_repartition_ids" /> </tree> <button - string="Importer un fichier" - type="action" - name="%(oacc_repartition_keys.acc_repartition_keys_wizard_action)d" - class="btn-primary" - /> + string="Importer un fichier" + type="action" + name="%(oacc_repartition_keys.acc_repartition_keys_wizard_action)d" + class="btn-primary" + /> </page> </xpath> </field> </record> -</odoo> \ No newline at end of file +</odoo> diff --git a/views/acc_repartition_keys_views.xml b/views/acc_repartition_keys_views.xml index b14ec0f02561d1545f6a2d56de31a795c63c8b00..6d7236c2f884ae8418db5a65fdc7b4a2160aa8d0 100644 --- a/views/acc_repartition_keys_views.xml +++ b/views/acc_repartition_keys_views.xml @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8" ?> <odoo> <!-- <data>--> <record id="acc_keys_repatition_action" model="ir.actions.act_window"> @@ -11,11 +11,11 @@ <field name="model">acc.repartition.keys</field> <field name="arch" type="xml"> <tree string="Keys" create="false"> - <field name="date_send"/> - <field name="csv_file"/> - <field name="operation_id"/> + <field name="date_send" /> + <field name="csv_file" /> + <field name="operation_id" /> </tree> </field> </record> <!-- </data>--> -</odoo> \ No newline at end of file +</odoo> diff --git a/wizard/acc_repartition_keys_wizard.py b/wizard/acc_repartition_keys_wizard.py index 921bc23094a5e908b55a1e6a65693ffe089e5501..360dd9436f4f105bd944da7095dee1fa2a0f05e9 100644 --- a/wizard/acc_repartition_keys_wizard.py +++ b/wizard/acc_repartition_keys_wizard.py @@ -3,7 +3,7 @@ import base64 from datetime import datetime -from odoo import fields, models +from odoo import _, fields, models from odoo.exceptions import UserError, ValidationError from ..tools.key_file import RepartitionKeyEntryFile @@ -64,12 +64,12 @@ class AccRepartitionKeysWizard(models.TransientModel): .split("\n") ) except UnicodeDecodeError as exc: - raise UserError("Fichier de répartitions au mauvais format") from exc + raise UserError(_("Fichier de répartitions au mauvais format")) from exc try: entry_file_handler = RepartitionKeyEntryFile(data=file) except (ValueError, IndexError) as exc: - raise UserError("Fichier de répartitions au mauvais format") from exc + raise UserError(_("Fichier de répartitions au mauvais format")) from exc counter_list_from_operation = ( self.env["acc.counter.period"] @@ -89,10 +89,10 @@ class AccRepartitionKeysWizard(models.TransientModel): try: file_check_result = entry_file_handler.check() except (ValueError, IndexError) as exc: - raise UserError("Fichier de répartitions au mauvais format") from exc + raise UserError(_("Fichier de répartitions au mauvais format")) from exc if not file_check_result.get("check"): - raise UserError(file_check_result.get("message")) + raise UserError(_(file_check_result.get("message"))) data_to_send = entry_file_handler.data_to_send(send_empty_key=False) @@ -103,7 +103,7 @@ class AccRepartitionKeysWizard(models.TransientModel): description=job_description ).send_repartition_key(key=key) except ValidationError as exc: - raise UserError(str(exc)) + raise UserError(_(str(exc))) from exc self.env["acc.repartition.keys"].create( { @@ -113,7 +113,7 @@ class AccRepartitionKeysWizard(models.TransientModel): } ) else: - raise UserError("Fichier de répartition non chargé") + raise UserError(_("Fichier de répartition non chargé")) # ------------------------------------------------------ # Business methods diff --git a/wizard/acc_repartition_keys_wizard_views.xml b/wizard/acc_repartition_keys_wizard_views.xml index a2fdfcc0d165c833231644ef7e9fc7918c453816..ebd2c5fa18eb19110a3d35c7fa2a96075198b689 100644 --- a/wizard/acc_repartition_keys_wizard_views.xml +++ b/wizard/acc_repartition_keys_wizard_views.xml @@ -1,38 +1,38 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8" ?> <odoo> <record id="acc_repartition_keys_wizard_form" model="ir.ui.view"> <field name="name">acc.repartition.keys.wizard.form</field> <field name="model">acc.repartition.keys.wizard</field> <field name="arch" type="xml"> <form string="Création clefs de repartition"> - <field name="csv_file"/> + <field name="csv_file" /> <footer> <button - class="btn btn-primary" - name="send_imported_file" - type="object" - string="Envoyer a enedis" - /> + class="btn btn-primary" + name="send_imported_file" + type="object" + string="Envoyer a enedis" + /> <button - class="btn btn-primary" - name="ignore" - type="object" - string="Ignorer" - /> + class="btn btn-primary" + name="ignore" + type="object" + string="Ignorer" + /> </footer> </form> </field> </record> - <record id="acc_repartition_keys_wizard_action" model="ir.actions.act_window"> + <record + id="acc_repartition_keys_wizard_action" + model="ir.actions.act_window" + > <field name="name">Création clefs de repartition</field> <field name="type">ir.actions.act_window</field> <field name="res_model">acc.repartition.keys.wizard</field> <field name="view_mode">form</field> - <field - name="view_id" - ref="acc_repartition_keys_wizard_form" - /> + <field name="view_id" ref="acc_repartition_keys_wizard_form" /> <field name="target">new</field> </record> -</odoo> \ No newline at end of file +</odoo>