diff --git a/models/acc_operation.py b/models/acc_operation.py index 7c4829c5ba026fab0d0ac8f62cf41a1cd4599c86..0fb76b770136f03b2a5e82175c3f963099e55c3a 100644 --- a/models/acc_operation.py +++ b/models/acc_operation.py @@ -3,13 +3,12 @@ import logging from datetime import date -from odoo import api, fields, models, _ +from odoo import _, fields, models from odoo.exceptions import UserError _logger = logging.getLogger(__name__) - class AccOperation(models.Model): _name = "acc.operation" _inherit = ["acc.operation", "api.enedis"] @@ -159,15 +158,14 @@ class AccOperation(models.Model): """ self._check_access_api() message = str() - message += "<h1>API Enedis OACC - Appel Périmètre " + str(fields.Datetime.now()) + "</h1>" message += ( - "<p><strong>Appel API ...<br/>" + "<h1>API Enedis OACC - Appel Périmètre " + + str(fields.Datetime.now()) + + "</h1>" ) + message += "<p><strong>Appel API ...<br/>" perimeter_data = self._get_perimeter(self.name, self.client_id, self.secret_id) - message += ( - "<p><strong>Appel API terminé<br/>" - "Traitement des données ...<br/>" - ) + message += "<p><strong>Appel API terminé<br/>" "Traitement des données ...<br/>" usage_points = perimeter_data.get("usage_points") for usage_point in usage_points: @@ -177,9 +175,7 @@ class AccOperation(models.Model): ("name", "=", usage_point["usage_point_id"]), ] ) - message += ( - "<br/>PRM " + usage_point["usage_point_id"] + "<br/>" - ) + message += "<br/>PRM " + usage_point["usage_point_id"] + "<br/>" if usage_id: message += ( "PRM existe : mise à jour des dates - " @@ -187,21 +183,17 @@ class AccOperation(models.Model): ) usage_id.write( { - "date_start_contract": date.fromisoformat( - usage_point["start"]), + "date_start_contract": date.fromisoformat(usage_point["start"]), } ) if usage_point["end"] != "9999-12-31": usage_id.write( { - "date_end_contract": date.fromisoformat( - usage_point["end"]), + "date_end_contract": date.fromisoformat(usage_point["end"]), } ) else: - message += ( - "PRM n'existe pas : Création ...<br/>" - ) + message += "PRM n'existe pas : Création ...<br/>" is_delivery = False is_injection = False if usage_point["type"] == "CONS": @@ -224,16 +216,15 @@ class AccOperation(models.Model): "is_delivery": is_delivery, "is_injection": is_injection, "acc_operation_id": self.id, - "date_start_contract": date.fromisoformat( - usage_point["start"]), + "date_start_contract": date.fromisoformat(usage_point["start"]), "date_end_contract": date_end, } ) - message += ( - "Fin de la création du PRM<br/>" - ) + message += "Fin de la création du PRM<br/>" - message += "<h1>Fin appel API Périmètre: " + str(fields.Datetime.now()) + "</h1>" + message += ( + "<h1>Fin appel API Périmètre: " + str(fields.Datetime.now()) + "</h1>" + ) return message # ------------------------------------------------------ diff --git a/views/acc_operation_views.xml b/views/acc_operation_views.xml index 813f503c9150e9e154a2f40c3e9f26f0a7d8eb5e..a26f66fa2eae5b12eb1ecd11e5b1721737e3f83c 100644 --- a/views/acc_operation_views.xml +++ b/views/acc_operation_views.xml @@ -1,31 +1,29 @@ <?xml version="1.0" encoding="utf-8" ?> <odoo> - <data> - <record id="acc_operation_form_view" model="ir.ui.view"> - <field name="name">acc_operation_form_view.api.form</field> - <field name="model">acc.operation</field> - <field name="inherit_id" ref="oacc.acc_operation_form_view" /> - <field name="arch" type="xml"> - <xpath expr="//notebook" position="inside"> - <page string="API Enedis" name="api"> - <header> - <button - string="Périmètre" - type="object" - class="btn-primary" - name="get_perimeter" - attrs="{'invisible':[('client_id','=', False), ('secret_id','=', False)]}" - /> - </header> - <group> - <field name="client_id" /> - <field name="secret_id" /> - </group> - </page> - </xpath> - </field> - </record> + <record id="acc_operation_form_view" model="ir.ui.view"> + <field name="name">acc_operation_form_view.api.form</field> + <field name="model">acc.operation</field> + <field name="inherit_id" ref="oacc.acc_operation_form_view" /> + <field name="arch" type="xml"> + <xpath expr="//notebook" position="inside"> + <page string="API Enedis" name="api"> + <header> + <button + string="Périmètre" + type="object" + class="btn-primary" + name="get_perimeter" + attrs="{'invisible':[('client_id','=', False), ('secret_id','=', False)]}" + /> + </header> + <group> + <field name="client_id" /> + <field name="secret_id" /> + </group> + </page> + </xpath> + </field> + </record> - </data> </odoo>