From d03d995002644a53e5166c40e08546b5688f1954 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dar=C3=ADo=20Lodeiros?= <dario@commitsun.com>
Date: Fri, 16 Dec 2022 11:05:17 +0100
Subject: [PATCH] [IMP]pms_l10n_es: Traveller report flow

---
 ...ler_report_notification_email_template.xml |  4 +--
 pms_l10n_es/wizards/traveller_report.py       | 33 +++++++------------
 2 files changed, 14 insertions(+), 23 deletions(-)

diff --git a/pms_l10n_es/data/pms_traveler_report_notification_email_template.xml b/pms_l10n_es/data/pms_traveler_report_notification_email_template.xml
index 661a1ba2b..9dcbebd6e 100644
--- a/pms_l10n_es/data/pms_traveler_report_notification_email_template.xml
+++ b/pms_l10n_es/data/pms_traveler_report_notification_email_template.xml
@@ -2,7 +2,7 @@
 <odoo>
     <data>
         <record id="notification_send_error_travel_report_email" model="mail.template">
-            <field name="name">Travel Report Send</field>
+            <field name="name">Error Travel Report Send</field>
             <field
                 name="model_id"
                 ref="pms_l10n_es.model_pms_log_institution_traveller_report"
@@ -29,7 +29,7 @@
             id="notification_send_success_travel_report_email"
             model="mail.template"
         >
-            <field name="name">Travel Report Send</field>
+            <field name="name">Success Travel Report Send</field>
             <field
                 name="model_id"
                 ref="pms_l10n_es.model_pms_log_institution_traveller_report"
diff --git a/pms_l10n_es/wizards/traveller_report.py b/pms_l10n_es/wizards/traveller_report.py
index 895cc43aa..63ef366e8 100644
--- a/pms_l10n_es/wizards/traveller_report.py
+++ b/pms_l10n_es/wizards/traveller_report.py
@@ -71,25 +71,18 @@ class TravellerReport(models.TransientModel):
             "view_mode": "form",
         }
 
-    def generate_checkin_list(
-        self, pms_property_id, date_target=False, checkin_ids=False
-    ):
+    def generate_checkin_list(self, pms_property_id, date_target=False):
         regex = re.compile("[^a-zA-Z0-9]")
 
         # check if there's guests info pending to send
-        if not checkin_ids:
-            if not date_target:
-                date_target = fields.date.today()
-            domain = [
-                ("state", "in", ["onboard", "done"]),
-                ("arrival", ">=", str(date_target) + " 0:00:00"),
-                ("arrival", "<=", str(date_target) + " 23:59:59"),
-                ("pms_property_id", "=", pms_property_id),
-            ]
-        else:
-            domain = [
-                ("id", "in", checkin_ids),
-            ]
+        if not date_target:
+            date_target = fields.date.today()
+        domain = [
+            ("state", "in", ["onboard", "done"]),
+            ("arrival", ">=", str(date_target) + " 0:00:00"),
+            ("arrival", "<=", str(date_target) + " 23:59:59"),
+            ("pms_property_id", "=", pms_property_id),
+        ]
         pms_property = (
             self.env["pms.property"]
             .with_context(lang="es_ES")
@@ -479,9 +472,7 @@ class TravellerReport(models.TransientModel):
                 }
             )
 
-    def send_file_institution(
-        self, pms_property=False, checkin_ids=False, offset=0, date_target=False
-    ):
+    def send_file_institution(self, pms_property=False, offset=0, date_target=False):
         try:
             called_from_user = False
             if not pms_property:
@@ -498,13 +489,13 @@ class TravellerReport(models.TransientModel):
                 raise ValidationError(
                     _("The guest information sending settings is not complete.")
                 )
+            date_target = self.date_target or False
             if not date_target:
                 date_target = fields.Date.today()
             date_target = date_target - relativedelta(days=offset)
             file_content = self.generate_checkin_list(
                 pms_property_id=pms_property.id,
                 date_target=date_target,
-                checkin_ids=checkin_ids,
             )
             if pms_property.institution == "policia_nacional":
                 log = self.send_file_pn(file_content, called_from_user, pms_property)
@@ -576,5 +567,5 @@ class TravellerReport(models.TransientModel):
     def send_file_institution_async(self, offset=0):
         for prop in self.env["pms.property"].search([]):
             if prop.institution:
-                self.send_file_institution(prop, offset)
+                self.send_file_institution(pms_property=prop, offset=offset)
                 time.sleep(0.5)