diff --git a/pms_l10n_es/__manifest__.py b/pms_l10n_es/__manifest__.py index 310ab9471..ffbf18d52 100644 --- a/pms_l10n_es/__manifest__.py +++ b/pms_l10n_es/__manifest__.py @@ -18,6 +18,11 @@ "partner_contact_nationality", "queue_job", ], + "external_dependencies": { + "python": [ + "bs4", + ], + }, "data": [ "data/cron_jobs.xml", "data/queue_data.xml", diff --git a/pms_l10n_es/models/pms_property.py b/pms_l10n_es/models/pms_property.py index 296c42d05..67f4c555b 100644 --- a/pms_l10n_es/models/pms_property.py +++ b/pms_l10n_es/models/pms_property.py @@ -1,4 +1,4 @@ -from odoo import api, fields, models +from odoo import fields, models class PmsProperty(models.Model): diff --git a/pms_l10n_es/wizards/traveller_report.py b/pms_l10n_es/wizards/traveller_report.py index 80bcb6846..4bb6440b4 100644 --- a/pms_l10n_es/wizards/traveller_report.py +++ b/pms_l10n_es/wizards/traveller_report.py @@ -1,8 +1,8 @@ import base64 import datetime +import os from datetime import date -import os import requests from bs4 import BeautifulSoup as bs @@ -16,12 +16,8 @@ class TravellerReport(models.TransientModel): _description = "Traveller Report" txt_filename = fields.Text() - txt_binary = fields.Binary( - string="File Download" - ) - txt_message = fields.Char( - string="File Preview" - ) + txt_binary = fields.Binary(string="File Download") + txt_message = fields.Char(string="File Preview") def generate_file(self): @@ -36,14 +32,13 @@ class TravellerReport(models.TransientModel): # file creation txt_binary = self.env["traveller.report.wizard"].create( { - "txt_filename": pms_property.institution_property_id - + ".999", + "txt_filename": pms_property.institution_property_id + ".999", "txt_binary": base64.b64encode(str.encode(content)), "txt_message": content, } ) return { - "name": _("Preview & Send File"), + "name": _("Traveller Report"), "res_id": txt_binary.id, "res_model": "traveller.report.wizard", "target": "new", @@ -148,8 +143,8 @@ class TravellerReport(models.TransientModel): headers = { "User-Agent": "Mozilla/5.0 (Linux; Android 6.0; Nexus 5 " - "Build/MRA58N) AppleWebKit/537.36 (KHTML, like " - "Gecko) Chrome/90.0.4430.93 Mobile Safari/537.36", + "Build/MRA58N) AppleWebKit/537.36 (KHTML, like " + "Gecko) Chrome/90.0.4430.93 Mobile Safari/537.36", } s = requests.session() login_payload = { @@ -161,7 +156,7 @@ class TravellerReport(models.TransientModel): headers=headers, data=login_payload, verify=get_module_resource("pms_l10n_es", "static", "cert.pem"), - ) + ) pwd = get_module_resource("pms_l10n_es", "wizards", "") checkin_list_file = open(pwd + pms_property.institution_user + ".999", "w+") @@ -174,7 +169,7 @@ class TravellerReport(models.TransientModel): data={"autoSeq": "on"}, files=files, verify=get_module_resource("pms_l10n_es", "static", "cert.pem"), - ) + ) os.remove(pwd + pms_property.institution_user + ".999") s.close() @@ -185,13 +180,13 @@ class TravellerReport(models.TransientModel): else: if called_from_user: message = { - 'type': 'ir.actions.client', - 'tag': 'display_notification', - 'params': { - 'title': _('Sent succesfully!'), - 'message': _('Successful file sending'), - 'sticky': False, - } + "type": "ir.actions.client", + "tag": "display_notification", + "params": { + "title": _("Sent succesfully!"), + "message": _("Successful file sending"), + "sticky": False, + }, } return message diff --git a/pms_l10n_es/wizards/traveller_report.xml b/pms_l10n_es/wizards/traveller_report.xml index 31df2a8f7..0680cf196 100644 --- a/pms_l10n_es/wizards/traveller_report.xml +++ b/pms_l10n_es/wizards/traveller_report.xml @@ -7,12 +7,17 @@
-
- +
@@ -20,22 +25,22 @@
-