From e2bea16e68095b7726597099be44a9dbd8386a44 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Tue, 23 May 2023 12:31:02 +0200
Subject: [PATCH] refs #5639 select country, paymethod

---
 modules/client/back/methods/defaulter/filter.js | 6 +++++-
 modules/client/front/defaulter/index.html       | 4 ++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/modules/client/back/methods/defaulter/filter.js b/modules/client/back/methods/defaulter/filter.js
index 748581913..736c29f9c 100644
--- a/modules/client/back/methods/defaulter/filter.js
+++ b/modules/client/back/methods/defaulter/filter.js
@@ -67,9 +67,13 @@ module.exports = Self => {
                         uw.id workerFk,
                         uw.name workerName,
                         c.creditInsurance,
-                        d.defaulterSinced
+                        d.defaulterSinced,
+                        cn.country,
+                        pm.name payMethod
                     FROM vn.defaulter d
                         JOIN vn.client c ON c.id = d.clientFk
+                        JOIN vn.country cn ON cn.id = c.countryFk
+                        JOIN vn.payMethod pm ON pm.id = c.payMethodFk 
                         LEFT JOIN vn.clientObservation co ON co.clientFk = c.id
                         LEFT JOIN account.user u ON u.id = c.salesPersonFk
                         LEFT JOIN account.user uw ON uw.id = co.workerFk
diff --git a/modules/client/front/defaulter/index.html b/modules/client/front/defaulter/index.html
index 9de1472a6..c61bd071e 100644
--- a/modules/client/front/defaulter/index.html
+++ b/modules/client/front/defaulter/index.html
@@ -119,10 +119,10 @@
                             </span>
                         </td>
                         <td>
-                            {{::defaulter.countryFk}}
+                            {{::defaulter.country}}
                         </td>
                         <td>
-                            {{::defaulter.payMethodFk}}
+                            {{::defaulter.payMethod}}
                         </td> 
                         <td>{{::defaulter.amount | currency: 'EUR': 2}}</td>
                         <td>