From c9ae5989f9b2652f59637c00ef25ba37bd9e5b22 Mon Sep 17 00:00:00 2001
From: Jorge Padawan <jorgebl@verdnatura.es>
Date: Wed, 30 Dec 2020 10:49:02 +0100
Subject: [PATCH 1/3] Add id on description of typeTransiction on client and
 supplier

---
 modules/client/front/fiscal-data/index.html   | 11 ++++-------
 modules/supplier/front/fiscal-data/index.html | 11 ++++-------
 2 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/modules/client/front/fiscal-data/index.html b/modules/client/front/fiscal-data/index.html
index 2b671c69a4..a03bcfdd4e 100644
--- a/modules/client/front/fiscal-data/index.html
+++ b/modules/client/front/fiscal-data/index.html
@@ -24,12 +24,6 @@
     data="sageTaxTypes"
     order="vat">
 </vn-crud-model>
-<vn-crud-model
-    auto-load="true"
-    url="SageTransactionTypes"
-    data="sageTransactionTypes"
-    order="transaction">
-</vn-crud-model>
 <form name="form" ng-submit="$ctrl.onSubmit()" class="vn-w-md">
     <vn-card class="vn-pa-lg">
         <vn-horizontal>
@@ -69,12 +63,15 @@
             </vn-autocomplete>
             <vn-autocomplete vn-one
                 ng-model="$ctrl.client.sageTransactionTypeFk"
-                data="sageTransactionTypes"
+                url="SageTransactionTypes"
                 show-field="transaction"
                 value-field="id"
                 label="Sage transaction type"
+                search-function="{or: [{id: $search}, {transaction: {like: '%'+ $search +'%'}}]}"
                 vn-acl="salesAssistant"
+                order="id"
                 rule>
+                <tpl-item>{{id}}: {{transaction}}</tpl-item>
             </vn-autocomplete>
             <vn-autocomplete vn-one
                 ng-model="$ctrl.client.transferorFk"
diff --git a/modules/supplier/front/fiscal-data/index.html b/modules/supplier/front/fiscal-data/index.html
index 804be97845..2c7b09f95e 100644
--- a/modules/supplier/front/fiscal-data/index.html
+++ b/modules/supplier/front/fiscal-data/index.html
@@ -24,12 +24,6 @@
     data="sageTaxTypes"
     order="vat">
 </vn-crud-model>
-<vn-crud-model
-    auto-load="true"
-    url="SageTransactionTypes"
-    data="sageTransactionTypes"
-    order="transaction">
-</vn-crud-model>
 <vn-crud-model
     auto-load="true"
     url="SageWithholdings"
@@ -83,11 +77,14 @@
             </vn-autocomplete>
             <vn-autocomplete vn-one
                 ng-model="$ctrl.supplier.sageTransactionTypeFk"
-                data="sageTransactionTypes"
+                url="SageTransactionTypes"
                 show-field="transaction"
                 value-field="id"
                 label="Sage transaction type"
+                search-function="{or: [{id: $search}, {transaction: {like: '%'+ $search +'%'}}]}"
+                order="id"
                 rule>
+                <tpl-item>{{id}}: {{transaction}}</tpl-item>
             </vn-autocomplete>
         </vn-horizontal>
         <vn-horizontal>

From 77e3ae9fee1f58f9711b7001018956a042c276cf Mon Sep 17 00:00:00 2001
From: Jorge Padawan <jorgebl@verdnatura.es>
Date: Wed, 30 Dec 2020 10:49:42 +0100
Subject: [PATCH 2/3] Modificated the e2e of fiscal data on client

---
 e2e/paths/02-client/03_edit_fiscal_data.spec.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/e2e/paths/02-client/03_edit_fiscal_data.spec.js b/e2e/paths/02-client/03_edit_fiscal_data.spec.js
index da04c813aa..614ede0f06 100644
--- a/e2e/paths/02-client/03_edit_fiscal_data.spec.js
+++ b/e2e/paths/02-client/03_edit_fiscal_data.spec.js
@@ -200,7 +200,7 @@ describe('Client Edit fiscalData path', () => {
         it('should confirm the sageTransaction have been edited', async() => {
             const result = await page.waitToGetProperty(selectors.clientFiscalData.sageTransaction, 'value');
 
-            expect(result).toEqual('Regularización de inversiones');
+            expect(result).toEqual('36: Regularización de inversiones');
         });
 
         it('should confirm the transferor have been edited', async() => {

From b4038990723a8d27db8d7fa3b1b03ff2e87a7ac2 Mon Sep 17 00:00:00 2001
From: Jorge Padawan <jorgebl@verdnatura.es>
Date: Wed, 30 Dec 2020 15:39:27 +0100
Subject: [PATCH 3/3] modificated value of "order" on client and supplier

---
 modules/client/front/fiscal-data/index.html   | 2 +-
 modules/supplier/front/fiscal-data/index.html | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/client/front/fiscal-data/index.html b/modules/client/front/fiscal-data/index.html
index a03bcfdd4e..2ae9e04751 100644
--- a/modules/client/front/fiscal-data/index.html
+++ b/modules/client/front/fiscal-data/index.html
@@ -69,7 +69,7 @@
                 label="Sage transaction type"
                 search-function="{or: [{id: $search}, {transaction: {like: '%'+ $search +'%'}}]}"
                 vn-acl="salesAssistant"
-                order="id"
+                order="transaction"
                 rule>
                 <tpl-item>{{id}}: {{transaction}}</tpl-item>
             </vn-autocomplete>
diff --git a/modules/supplier/front/fiscal-data/index.html b/modules/supplier/front/fiscal-data/index.html
index 2c7b09f95e..fc44468f4b 100644
--- a/modules/supplier/front/fiscal-data/index.html
+++ b/modules/supplier/front/fiscal-data/index.html
@@ -82,7 +82,7 @@
                 value-field="id"
                 label="Sage transaction type"
                 search-function="{or: [{id: $search}, {transaction: {like: '%'+ $search +'%'}}]}"
-                order="id"
+                order="transaction"
                 rule>
                 <tpl-item>{{id}}: {{transaction}}</tpl-item>
             </vn-autocomplete>