Merge pull request 'fix: refs #7039 filterFix' (!2639) from 7039-hotFixFilterCountry into master

Reviewed-on: #2639 Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>
2024-06-26 08:24:59 +00:00 · 2024-06-26 08:24:59 +00:00 · ded7a5391f
parent 2e1ab3af20 0534526ac2
commit ded7a5391f
7 changed files with 7 additions and 7 deletions
--- a/front/salix/components/bank-entity/index.html
+++ b/front/salix/components/bank-entity/index.html
@ -27,7 +27,7 @@
            vn-id="country"
            ng-model="$ctrl.data.countryFk"
            url="Countries"
-            fields="['id', 'country', 'code']"
+            fields="['id', 'name', 'code']"
            show-field="name"
            value-field="id"
            label="Country">
--- a/modules/client/back/methods/client/getCard.js
+++ b/modules/client/back/methods/client/getCard.js
@ -50,7 +50,7 @@ module.exports = function(Self) {
                {
                    relation: 'country',
                    scope: {
-                        fields: ['id', 'country']
+                        fields: ['id', 'name']
                    }
                },
                {
--- a/modules/client/back/methods/client/summary.js
+++ b/modules/client/back/methods/client/summary.js
@ -54,7 +54,7 @@ module.exports = Self => {
                {
                    relation: 'country',
                    scope: {
-                        fields: ['country']
+                        fields: ['name']
                    }
                },
                {
--- a/modules/client/front/address/index/index.js
+++ b/modules/client/front/address/index/index.js
@ -37,7 +37,7 @@ class Controller extends Section {
                        include: {
                            relation: 'country',
                            scope: {
-                                fields: ['id', 'country']
+                                fields: ['id', 'name']
                            }
                        }
                    }
--- a/modules/client/front/extended-list/index.js
+++ b/modules/client/front/extended-list/index.js
@ -28,7 +28,7 @@ class Controller extends Section {
                    field: 'countryFk',
                    autocomplete: {
                        url: 'Countries',
-                        showField: 'country',
+                        showField: 'name',
                    }
                },
                {
--- a/modules/item/back/methods/item/getSummary.js
+++ b/modules/item/back/methods/item/getSummary.js
@ -59,7 +59,7 @@ module.exports = Self => {
                        include: [{
                            relation: 'country',
                            scope: {
-                                fields: ['id', 'country']
+                                fields: ['id', 'name']
                            }
                        }, {
                            relation: 'taxClass',
--- a/modules/supplier/back/methods/supplier/getSummary.js
+++ b/modules/supplier/back/methods/supplier/getSummary.js
@ -55,7 +55,7 @@ module.exports = Self => {
                {
                    relation: 'country',
                    scope: {
-                        fields: ['id', 'country', 'code']
+                        fields: ['id', 'name', 'code']
                    }
                },
                {