refs #5999 defaulter country autocomplete

modules/client/back/methods/defaulter/filter.js

@@ -69,11 +69,12 @@ module.exports = Self => {
                         c.creditInsurance,
                         d.defaulterSinced,
                         cn.country,
+                        c.countryFk,
                         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 
+                        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

modules/client/back/models/defaulter.json

@@ -33,7 +33,7 @@
     "country": {
       "type": "belongsTo",
       "model": "Country",
-      "foreignKey": "country"
+      "foreignKey": "countryFk"
     },
     "payMethod": {
       "type": "belongsTo",
@@ -41,4 +41,4 @@
       "foreignKey": "payMethod"
     }
   }
-}
+}

modules/client/front/defaulter/index.html

@@ -57,7 +57,7 @@
                         <th field="salesPersonFk">
                             <span translate>Comercial</span>
                         </th>
-                        <th field="country">
+                        <th field="countryFk">
                             <span translate>Country</span>
                         </th>
                         <th field="payMethod"
@@ -123,7 +123,7 @@
                         </td>
                         <td>
                             {{::defaulter.payMethod}}
-                        </td> 
+                        </td>
                         <td>{{::defaulter.amount | currency: 'EUR': 2}}</td>
                         <td>
                             <span

modules/client/front/defaulter/index.js

@@ -30,11 +30,11 @@ export default class Controller extends Section {
                         valueField: 'id',
                     }
                 }, {
-                    field: 'country',
+                    field: 'countryFk',
                     autocomplete: {
                         url: 'Countries',
                         showField: 'country',
-                        valueField: 'country'
+                        valueField: 'id'
                     }
                 }, {
                     field: 'payMethodFk',
@@ -155,7 +155,7 @@ export default class Controller extends Section {
         case 'amount':
         case 'clientFk':
         case 'workerFk':
-        case 'country':
+        case 'countryFk':
         case 'payMethod':
         case 'salesPersonFk':
             return {[`d.${param}`]: value};