Skip to content
Extraits de code Groupes Projets
Valider c605dd79 rédigé par Julien - Le Filament's avatar Julien - Le Filament
Parcourir les fichiers

Merge branch '16.0' of sources.le-filament.com:lefilament/oacc/oacc_repartition_keys into 16.0

parents c7d9e03d 98b40820
Aucune branche associée trouvée
Aucune étiquette associée trouvée
Aucune requête de fusion associée trouvée
...@@ -88,7 +88,7 @@ class RepartitionKeyEntryFile: ...@@ -88,7 +88,7 @@ class RepartitionKeyEntryFile:
call_list = [] call_list = []
for horo in self.json: for horo in self.json:
date = datetime.strptime(horo, "%d-%m-%Y %H:%M") 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 = [] body = []
for key in self.json.get(horo): for key in self.json.get(horo):
if send_empty_key: if send_empty_key:
...@@ -175,9 +175,6 @@ class RepartitionKeyEntryFile: ...@@ -175,9 +175,6 @@ class RepartitionKeyEntryFile:
for key in horo: for key in horo:
if key["key"] == "0.00000000": if key["key"] == "0.00000000":
key["key"] = 0.0 key["key"] = 0.0
try:
keys_sum = keys_sum + float(key["key"]) keys_sum = keys_sum + float(key["key"])
except ValueError:
pass
return keys_sum return keys_sum
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
import base64 import base64
from datetime import datetime from datetime import datetime
from odoo import fields, models from odoo import _, fields, models
from odoo.exceptions import UserError, ValidationError from odoo.exceptions import UserError, ValidationError
from ..tools.key_file import RepartitionKeyEntryFile from ..tools.key_file import RepartitionKeyEntryFile
...@@ -64,12 +64,12 @@ class AccRepartitionKeysWizard(models.TransientModel): ...@@ -64,12 +64,12 @@ class AccRepartitionKeysWizard(models.TransientModel):
.split("\n") .split("\n")
) )
except UnicodeDecodeError as exc: 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: try:
entry_file_handler = RepartitionKeyEntryFile(data=file) entry_file_handler = RepartitionKeyEntryFile(data=file)
except (ValueError, IndexError) as exc: 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 = ( counter_list_from_operation = (
self.env["acc.counter.period"] self.env["acc.counter.period"]
...@@ -89,10 +89,10 @@ class AccRepartitionKeysWizard(models.TransientModel): ...@@ -89,10 +89,10 @@ class AccRepartitionKeysWizard(models.TransientModel):
try: try:
file_check_result = entry_file_handler.check() file_check_result = entry_file_handler.check()
except (ValueError, IndexError) as exc: 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"): 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) data_to_send = entry_file_handler.data_to_send(send_empty_key=False)
...@@ -103,7 +103,7 @@ class AccRepartitionKeysWizard(models.TransientModel): ...@@ -103,7 +103,7 @@ class AccRepartitionKeysWizard(models.TransientModel):
description=job_description description=job_description
).send_repartition_key(key=key) ).send_repartition_key(key=key)
except ValidationError as exc: except ValidationError as exc:
raise UserError(str(exc)) raise UserError(_(str(exc))) from exc
self.env["acc.repartition.keys"].create( self.env["acc.repartition.keys"].create(
{ {
...@@ -113,7 +113,7 @@ class AccRepartitionKeysWizard(models.TransientModel): ...@@ -113,7 +113,7 @@ class AccRepartitionKeysWizard(models.TransientModel):
} }
) )
else: else:
raise UserError("Fichier de répartition non chargé") raise UserError(_("Fichier de répartition non chargé"))
# ------------------------------------------------------ # ------------------------------------------------------
# Business methods # Business methods
......
...@@ -24,15 +24,15 @@ ...@@ -24,15 +24,15 @@
</field> </field>
</record> </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="name">Création clefs de repartition</field>
<field name="type">ir.actions.act_window</field> <field name="type">ir.actions.act_window</field>
<field name="res_model">acc.repartition.keys.wizard</field> <field name="res_model">acc.repartition.keys.wizard</field>
<field name="view_mode">form</field> <field name="view_mode">form</field>
<field <field name="view_id" ref="acc_repartition_keys_wizard_form" />
name="view_id"
ref="acc_repartition_keys_wizard_form"
/>
<field name="target">new</field> <field name="target">new</field>
</record> </record>
</odoo> </odoo>
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