From f3d760b064e8aa6b77034f489930def46c6c6634 Mon Sep 17 00:00:00 2001 From: miguelpadin Date: Thu, 29 Apr 2021 17:56:35 +0200 Subject: [PATCH] [FIX] fix pre-commit --- pms_l10n_es/models/pms_property.py | 19 ++++++++++--------- pms_l10n_es/views/pms_property_views.xml | 8 ++++---- pms_l10n_es/wizards/traveller_report.py | 21 ++++++++++++++++----- 3 files changed, 30 insertions(+), 18 deletions(-) diff --git a/pms_l10n_es/models/pms_property.py b/pms_l10n_es/models/pms_property.py index 4901deaaa..6274af05b 100644 --- a/pms_l10n_es/models/pms_property.py +++ b/pms_l10n_es/models/pms_property.py @@ -1,18 +1,19 @@ -from odoo import _, fields, models +from odoo import fields, models class PmsProperty(models.Model): _inherit = "pms.property" police_type = fields.Selection( - [ - ("guardia_civil", "Guardia Civil"), - ("policia_nacional","Policía Nacional"), - ("ertxaintxa", "Ertxaintxa"), - ("mossos", "Mossos_d'esquadra") - ], - string="Police Type", - default="guardia_civil") + [ + ("guardia_civil", "Guardia Civil"), + ("policia_nacional", "Policía Nacional"), + ("ertxaintxa", "Ertxaintxa"), + ("mossos", "Mossos_d'esquadra"), + ], + string="Police Type", + default="guardia_civil", + ) police_number = fields.Char("Police Number", size=10) police_user = fields.Char("Police User") police_pass = fields.Char("Police Password") diff --git a/pms_l10n_es/views/pms_property_views.xml b/pms_l10n_es/views/pms_property_views.xml index 52aeaf8c7..58bbda1dc 100644 --- a/pms_l10n_es/views/pms_property_views.xml +++ b/pms_l10n_es/views/pms_property_views.xml @@ -9,10 +9,10 @@ - - - - + + + + diff --git a/pms_l10n_es/wizards/traveller_report.py b/pms_l10n_es/wizards/traveller_report.py index 4a79a9cce..918a3660e 100644 --- a/pms_l10n_es/wizards/traveller_report.py +++ b/pms_l10n_es/wizards/traveller_report.py @@ -1,9 +1,11 @@ import base64 import datetime from datetime import date -from odoo import _, api, fields, models + import requests +from odoo import _, fields, models + class TravellerReport(models.TransientModel): _name = "traveller.report.wizard" @@ -29,7 +31,12 @@ class TravellerReport(models.TransientModel): [("id", "=", self.env.user.get_active_property_ids()[0])] ) if pms_property.police_number and pms_property.name: - content = "1|" + pms_property.police_number.upper() + "|" + pms_property.name.upper() + content = ( + "1|" + + pms_property.police_number.upper() + + "|" + + pms_property.name.upper() + ) content += "|" content += datetime.datetime.now().strftime("%Y%m%d|%H%M") content += "|" + str(len(lines)) @@ -52,7 +59,9 @@ class TravellerReport(models.TransientModel): # REVIEW: nationality_id must be nationality content += line.nationality_id.name.upper() + "|" content += line.arrival.strftime("%Y%m%d") + "|" - sequence_num = self.env['ir.sequence'].next_by_code("traveller.report.wizard") + sequence_num = self.env["ir.sequence"].next_by_code( + "traveller.report.wizard" + ) txt_binary = self.env["traveller.report.wizard"].create( { "txt_filename": pms_property.police_number + "." + sequence_num, @@ -72,6 +81,7 @@ class TravellerReport(models.TransientModel): } def send_guardia_civil_report(self): + # TODO: Review this pms_property = self.env["pms.property"].search( [("id", "=", self.env.user.get_active_property_ids()[0])] ) @@ -80,7 +90,8 @@ class TravellerReport(models.TransientModel): if user and password: data = [self.txt_binary] requests.post( - 'https://usuario:password@hospederias.guardiacivil.es/hospederias/servlet/ControlRecepcionFichero', + "https://usuario:password@hospederias.guardiacivil.es/" + "hospederias/servlet/ControlRecepcionFichero", auth=(user, password), - data=data + data=data, )