From e9fed94977c962a2bb6148f5456270dfede6c59d Mon Sep 17 00:00:00 2001
From: braisab <braisterbutalino@gmail.com>
Date: Mon, 8 Nov 2021 13:11:16 +0100
Subject: [PATCH] [FIX]fixed not manually journals in folio payment

---
 pms/models/pms_folio.py                 |  4 +++-
 pms/models/pms_property.py              | 10 +++++++---
 pms/views/payment_transaction_views.xml |  2 +-
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/pms/models/pms_folio.py b/pms/models/pms_folio.py
index bcbbb3e80..68c8e769e 100644
--- a/pms/models/pms_folio.py
+++ b/pms/models/pms_folio.py
@@ -964,7 +964,9 @@ class PmsFolio(models.Model):
                 }
                 record.update(vals)
             else:
-                journals = record.pms_property_id._get_payment_methods()
+                journals = record.pms_property_id._get_payment_methods(
+                    automatic_included=True
+                )
                 paid_out = 0
                 for journal in journals:
                     paid_out += sum(
diff --git a/pms/models/pms_property.py b/pms/models/pms_property.py
index 9f031cec0..16d9209b2 100644
--- a/pms/models/pms_property.py
+++ b/pms/models/pms_property.py
@@ -428,12 +428,14 @@ class PmsProperty(models.Model):
             dt = dt.replace(tzinfo=None)
         return dt
 
-    def _get_payment_methods(self):
+    def _get_payment_methods(self, automatic_included=False):
+        # We use automatic_included to True to see absolutely
+        # all the journals with associated payments, if it is
+        # false, we will only see those journals that can be used
+        # to pay manually
         self.ensure_one()
         payment_methods = self.env["account.journal"].search(
             [
-                ("allowed_pms_payments", "=", True),
-                "&",
                 ("type", "in", ["cash", "bank"]),
                 "|",
                 ("pms_property_ids", "in", self.id),
@@ -446,6 +448,8 @@ class PmsProperty(models.Model):
                 ("company_id", "=", False),
             ]
         )
+        if not automatic_included:
+            payment_methods = payment_methods.filtered(lambda p: p.allowed_pms_payments)
         return payment_methods
 
     @api.model
diff --git a/pms/views/payment_transaction_views.xml b/pms/views/payment_transaction_views.xml
index a8dc582fc..57cfb228f 100644
--- a/pms/views/payment_transaction_views.xml
+++ b/pms/views/payment_transaction_views.xml
@@ -4,7 +4,7 @@
         <field name="model">payment.transaction</field>
         <field name="inherit_id" ref="payment.transaction_form" />
         <field name="arch" type="xml">
-            <xpath expr="//group[@string='Message']" position="before">
+            <xpath expr="//field[@name='date']" position="before">
                 <field name="folio_ids" />
             </xpath>
         </field>