diff --git a/booking.py b/booking.py
index 93e8e75..43fd1f2 100644
--- a/booking.py
+++ b/booking.py
@@ -690,7 +690,7 @@ class Booking(Workflow, ModelSQL, ModelView):
                     res[party.id] = {
                         'party': party,
                         'currency': bk.currency.id,
-                        'payment_term': bk.payment_term,
+                        'payment_term': bk.payment_term.id,
                         'number': bk.number,
                         'reference': [folio.registration_card],
                         'rooms': [folio.room.name],
diff --git a/folio.py b/folio.py
index 888b5b5..63525a4 100644
--- a/folio.py
+++ b/folio.py
@@ -383,8 +383,10 @@ class Folio(ModelSQL, ModelView):
             _check_charges(self)
             _check_accommodation(self)
         elif bk.responsible_payment == 'holder':
-            if self.main_guest == bk.party:
+            if bk.payment_term and bk.payment_term.payment_type == 2:
+                return
 
+            if self.main_guest == bk.party:
                 for folio in bk.lines:
                     if bk.pending_to_pay == 0:
                         for charge in folio.charges: