From 9f4d027014e206ef8b281354f94550bac4d2046f Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Thu, 6 Apr 2023 15:36:14 +0200
Subject: [PATCH 01/26] refs #5316 sql

---
 db/changes/231401/00-kkearEntryNotes.sql | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 db/changes/231401/00-kkearEntryNotes.sql

diff --git a/db/changes/231401/00-kkearEntryNotes.sql b/db/changes/231401/00-kkearEntryNotes.sql
new file mode 100644
index 000000000..ff5c7ce29
--- /dev/null
+++ b/db/changes/231401/00-kkearEntryNotes.sql
@@ -0,0 +1 @@
+ALTER TABLE `vn`.`entry` DROP COLUMN `notes`;
\ No newline at end of file

From d21ab7a5a7f4f8db7922000a11b82321835dc4a3 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Tue, 11 Apr 2023 10:32:21 +0200
Subject: [PATCH 02/26] refs #5316 primer kkeo

---
 db/dump/fixtures.sql                           | 18 +++++++++---------
 e2e/helpers/selectors.js                       |  2 +-
 e2e/paths/12-entry/05_basicData.spec.js        | 10 +++++-----
 modules/entry/back/methods/entry/filter.js     |  1 -
 modules/entry/back/models/entry.json           |  6 +++---
 modules/entry/front/basic-data/index.html      |  4 ++--
 modules/entry/front/index/locale/es.yml        |  2 +-
 modules/entry/front/routes.json                |  2 +-
 modules/entry/front/summary/index.html         |  4 ++--
 modules/travel/front/summary/index.html        |  4 ++--
 .../reports/entry-order/entry-order.html       |  4 ++--
 11 files changed, 28 insertions(+), 29 deletions(-)

diff --git a/db/dump/fixtures.sql b/db/dump/fixtures.sql
index 9006c6676..e9ad6d974 100644
--- a/db/dump/fixtures.sql
+++ b/db/dump/fixtures.sql
@@ -1407,16 +1407,16 @@ INSERT INTO `vn`.`travel`(`id`,`shipped`, `landed`, `warehouseInFk`, `warehouseO
         (7, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 5, 4, 1, 50.00,  500,   'seventh travel',   2, 1),
         (8, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 5, 1, 1, 50.00,  500,   'eight travel',     1, 2);
 
-INSERT INTO `vn`.`entry`(`id`, `supplierFk`, `created`, `travelFk`, `isConfirmed`, `companyFk`, `invoiceNumber`, `reference`, `isExcludedFromAvailable`, `isRaid`, `notes`, `evaNotes`)
+INSERT INTO `vn`.`entry`(`id`, `supplierFk`, `created`, `travelFk`, `isConfirmed`, `companyFk`, `invoiceNumber`, `reference`, `isExcludedFromAvailable`, `isRaid`, `evaNotes`)
     VALUES
-        (1, 1, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 1, 1, 442, 'IN2001', 'Movement 1', 0, 0, '',    ''),
-        (2, 2, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 2, 0, 442, 'IN2002', 'Movement 2', 0, 0, 'this is the note two',    'observation two'),
-        (3, 1, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 3, 0, 442, 'IN2003', 'Movement 3', 0, 0, 'this is the note three',  'observation three'),
-        (4, 2, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 2, 0, 69,  'IN2004', 'Movement 4', 0, 0, 'this is the note four',   'observation four'),
-        (5, 2, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 5, 0, 442, 'IN2005', 'Movement 5', 0, 0, 'this is the note five',   'observation five'),
-        (6, 2, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 6, 0, 442, 'IN2006', 'Movement 6', 0, 0, 'this is the note six',    'observation six'),
-        (7, 2, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 7, 0, 442, 'IN2007', 'Movement 7', 0, 0, 'this is the note seven',  'observation seven'),
-        (8, 2, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 7, 0, 442, 'IN2008', 'Movement 8', 1, 1, '',  '');
+        (1, 1, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 1, 1, 442, 'IN2001', 'Movement 1', 0, 0,    ''),
+        (2, 2, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 2, 0, 442, 'IN2002', 'Movement 2', 0, 0,    'observation two'),
+        (3, 1, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 3, 0, 442, 'IN2003', 'Movement 3', 0, 0,  'observation three'),
+        (4, 2, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 2, 0, 69,  'IN2004', 'Movement 4', 0, 0,   'observation four'),
+        (5, 2, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 5, 0, 442, 'IN2005', 'Movement 5', 0, 0,   'observation five'),
+        (6, 2, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 6, 0, 442, 'IN2006', 'Movement 6', 0, 0,    'observation six'),
+        (7, 2, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 7, 0, 442, 'IN2007', 'Movement 7', 0, 0,  'observation seven'),
+        (8, 2, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 7, 0, 442, 'IN2008', 'Movement 8', 1, 1,  '');
 
 INSERT INTO `bs`.`waste`(`buyer`, `year`, `week`, `family`, `itemFk`, `itemTypeFk`, `saleTotal`, `saleWaste`, `rate`)
     VALUES
diff --git a/e2e/helpers/selectors.js b/e2e/helpers/selectors.js
index 32a60a4e2..5f86443ab 100644
--- a/e2e/helpers/selectors.js
+++ b/e2e/helpers/selectors.js
@@ -1240,7 +1240,7 @@ export default {
     entryBasicData: {
         reference: 'vn-entry-basic-data vn-textfield[ng-model="$ctrl.entry.reference"]',
         invoiceNumber: 'vn-entry-basic-data vn-textfield[ng-model="$ctrl.entry.invoiceNumber"]',
-        notes: 'vn-entry-basic-data vn-textfield[ng-model="$ctrl.entry.notes"]',
+        // notes: 'vn-entry-basic-data vn-textfield[ng-model="$ctrl.entry.notes"]',
         observations: 'vn-entry-basic-data vn-textarea[ng-model="$ctrl.entry.observation"]',
         supplier: 'vn-entry-basic-data vn-autocomplete[ng-model="$ctrl.entry.supplierFk"]',
         currency: 'vn-entry-basic-data vn-autocomplete[ng-model="$ctrl.entry.currencyFk"]',
diff --git a/e2e/paths/12-entry/05_basicData.spec.js b/e2e/paths/12-entry/05_basicData.spec.js
index 3b5f40c35..eec00ca96 100644
--- a/e2e/paths/12-entry/05_basicData.spec.js
+++ b/e2e/paths/12-entry/05_basicData.spec.js
@@ -20,7 +20,7 @@ describe('Entry basic data path', () => {
     it('should edit the basic data', async() => {
         await page.write(selectors.entryBasicData.reference, 'new movement 8');
         await page.write(selectors.entryBasicData.invoiceNumber, 'new movement 8');
-        await page.write(selectors.entryBasicData.notes, 'new notes');
+        // await page.write(selectors.entryBasicData.notes, 'new notes');
         await page.write(selectors.entryBasicData.observations, ' edited');
         await page.autocompleteSearch(selectors.entryBasicData.supplier, 'Plants nick');
         await page.autocompleteSearch(selectors.entryBasicData.currency, 'eur');
@@ -53,11 +53,11 @@ describe('Entry basic data path', () => {
         expect(result).toEqual('new movement 8');
     });
 
-    it('should confirm the note was edited', async() => {
-        const result = await page.waitToGetProperty(selectors.entryBasicData.notes, 'value');
+    // it('should confirm the note was edited', async() => {
+    //     const result = await page.waitToGetProperty(selectors.entryBasicData.notes, 'value');
 
-        expect(result).toEqual('new notes');
-    });
+    //     expect(result).toEqual('new notes');
+    // });
 
     it('should confirm the observation was edited', async() => {
         const result = await page.waitToGetProperty(selectors.entryBasicData.observations, 'value');
diff --git a/modules/entry/back/methods/entry/filter.js b/modules/entry/back/methods/entry/filter.js
index e90043074..1cd12b737 100644
--- a/modules/entry/back/methods/entry/filter.js
+++ b/modules/entry/back/methods/entry/filter.js
@@ -158,7 +158,6 @@ module.exports = Self => {
                     e.invoiceNumber,
                     e.isBooked,
                     e.isExcludedFromAvailable,
-                    e.notes,
                     e.evaNotes AS observation,
                     e.isConfirmed,
                     e.isOrdered,
diff --git a/modules/entry/back/models/entry.json b/modules/entry/back/models/entry.json
index 5aa175758..7747b81f9 100644
--- a/modules/entry/back/models/entry.json
+++ b/modules/entry/back/models/entry.json
@@ -31,9 +31,9 @@
         "isExcludedFromAvailable": {
             "type": "boolean"
         },
-        "notes": {
-            "type": "string"
-        },
+        // "notes": {
+        //     "type": "string"
+        // },
         "isConfirmed": {
             "type": "boolean"
         },
diff --git a/modules/entry/front/basic-data/index.html b/modules/entry/front/basic-data/index.html
index 68a65e890..6fd23a4f7 100644
--- a/modules/entry/front/basic-data/index.html
+++ b/modules/entry/front/basic-data/index.html
@@ -52,13 +52,13 @@
                 rule
                 vn-focus>
             </vn-textfield>
-            <vn-textfield
+            <!-- <vn-textfield
                 vn-one
                 label="Notes"
                 ng-model="$ctrl.entry.notes"
                 rule
                 vn-focus>
-            </vn-textfield>
+            </vn-textfield> -->
         </vn-horizontal>
         <vn-horizontal>
             <vn-textfield
diff --git a/modules/entry/front/index/locale/es.yml b/modules/entry/front/index/locale/es.yml
index 4f12fc7bb..8f6c9e5cb 100644
--- a/modules/entry/front/index/locale/es.yml
+++ b/modules/entry/front/index/locale/es.yml
@@ -12,7 +12,7 @@ Reference: Referencia
 Created: Creado
 Booked: Contabilizada
 Is inventory: Inventario
-Notes: Notas
+# Notes: Notas
 Status: Estado
 Selection: Selección
 Invoice number: Núm. factura
\ No newline at end of file
diff --git a/modules/entry/front/routes.json b/modules/entry/front/routes.json
index 37dda7584..d521edeca 100644
--- a/modules/entry/front/routes.json
+++ b/modules/entry/front/routes.json
@@ -78,7 +78,7 @@
             "url": "/observation",
             "state": "entry.card.observation",
             "component": "vn-entry-observation",
-            "description": "Notes",
+            // "description": "Notes",
             "params": {
                 "entry": "$ctrl.entry"
             },
diff --git a/modules/entry/front/summary/index.html b/modules/entry/front/summary/index.html
index f03710dc4..53ec093aa 100644
--- a/modules/entry/front/summary/index.html
+++ b/modules/entry/front/summary/index.html
@@ -32,9 +32,9 @@
             <vn-label-value label="Invoice number"
                 value="{{$ctrl.entryData.invoiceNumber}}">
             </vn-label-value>
-            <vn-label-value label="Notes"
+            <!-- <vn-label-value label="Notes"
                 value="{{$ctrl.entryData.notes}}">
-            </vn-label-value>
+            </vn-label-value> -->
         </vn-one>
         <vn-one>
             <vn-label-value label="Reference">
diff --git a/modules/travel/front/summary/index.html b/modules/travel/front/summary/index.html
index 113128e0e..c19a075fc 100644
--- a/modules/travel/front/summary/index.html
+++ b/modules/travel/front/summary/index.html
@@ -100,12 +100,12 @@
                         <vn-td shrink>{{entry.pallet}}</vn-td>
                         <vn-td shrink>{{entry.m3}}</vn-td>
                         <vn-td shrink>
-                            <vn-icon
+                            <!-- <vn-icon
                                 ng-if="entry.notes.length"
                                 vn-tooltip="{{entry.notes}}"
                                 icon="insert_drive_file"
                                 class="bright">
-                            </vn-icon>
+                            </vn-icon> -->
                             <vn-icon
                                 ng-if="entry.observation.length"
                                 vn-tooltip="{{entry.observation}}"
diff --git a/print/templates/reports/entry-order/entry-order.html b/print/templates/reports/entry-order/entry-order.html
index 5d362dea9..b8f1acc69 100644
--- a/print/templates/reports/entry-order/entry-order.html
+++ b/print/templates/reports/entry-order/entry-order.html
@@ -77,7 +77,7 @@
                     </tr>
                 </tfoot>
             </table>
-            <div class="columns">
+            <!-- <div class="columns">
                 <div class="size50">
                     <div id="notes" class="panel no-page-break" v-if="entry.notes">
                         <div class="body">
@@ -86,7 +86,7 @@
                         </div>
                     </div>
                 </div>
-            </div>
+            </div> -->
         </div>
     </div>
     <template v-slot:footer>

From 1ce27058699599ef885eacdebd5e1ee1fb7df338 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Tue, 11 Apr 2023 15:04:49 +0200
Subject: [PATCH 03/26] refs #5316 last kkentry

---
 modules/entry/back/models/entry.json                  |  3 ---
 modules/entry/front/routes.json                       | 11 -----------
 .../back/methods/travel/extraCommunityFilter.js       |  1 -
 modules/travel/back/methods/travel/getEntries.js      |  1 -
 print/templates/reports/entry-order/sql/entry.sql     |  1 -
 5 files changed, 17 deletions(-)

diff --git a/modules/entry/back/models/entry.json b/modules/entry/back/models/entry.json
index 7747b81f9..e489981a6 100644
--- a/modules/entry/back/models/entry.json
+++ b/modules/entry/back/models/entry.json
@@ -31,9 +31,6 @@
         "isExcludedFromAvailable": {
             "type": "boolean"
         },
-        // "notes": {
-        //     "type": "string"
-        // },
         "isConfirmed": {
             "type": "boolean"
         },
diff --git a/modules/entry/front/routes.json b/modules/entry/front/routes.json
index d521edeca..c5c5f407a 100644
--- a/modules/entry/front/routes.json
+++ b/modules/entry/front/routes.json
@@ -12,7 +12,6 @@
         "card": [
             {"state": "entry.card.basicData", "icon": "settings"},
             {"state": "entry.card.buy.index", "icon": "icon-lines"},
-            {"state": "entry.card.observation", "icon": "insert_drive_file"},
             {"state": "entry.card.log", "icon": "history"}
         ]
     },
@@ -74,16 +73,6 @@
             },
             "acl": ["buyer", "administrative"]
         },
-        {
-            "url": "/observation",
-            "state": "entry.card.observation",
-            "component": "vn-entry-observation",
-            // "description": "Notes",
-            "params": {
-                "entry": "$ctrl.entry"
-            },
-            "acl": ["buyer", "administrative"]
-        },
         {
             "url" : "/log",
             "state": "entry.card.log",
diff --git a/modules/travel/back/methods/travel/extraCommunityFilter.js b/modules/travel/back/methods/travel/extraCommunityFilter.js
index 5ee51de8e..388ba52a1 100644
--- a/modules/travel/back/methods/travel/extraCommunityFilter.js
+++ b/modules/travel/back/methods/travel/extraCommunityFilter.js
@@ -167,7 +167,6 @@ module.exports = Self => {
                     s.name AS supplierName,
                     SUM(b.stickers) AS stickers,
                     e.evaNotes,
-                    e.notes,
                     e.invoiceAmount,
                     CAST(SUM(b.weight * b.stickers) AS DECIMAL(10,0)) as loadedkg,
                     CAST(SUM(vc.aerealVolumetricDensity * b.stickers * IF(pkg.volume, pkg.volume, pkg.width * pkg.depth * pkg.height) / 1000000) AS DECIMAL(10,0)) as volumeKg
diff --git a/modules/travel/back/methods/travel/getEntries.js b/modules/travel/back/methods/travel/getEntries.js
index 5ca12f7a1..71bb0d8fb 100644
--- a/modules/travel/back/methods/travel/getEntries.js
+++ b/modules/travel/back/methods/travel/getEntries.js
@@ -31,7 +31,6 @@ module.exports = Self => {
                     e.isConfirmed,
                     e.invoiceNumber,
                     e.reference,
-                    e.notes,
                     e.evaNotes AS observation,
                     s.name AS supplierName,
                     CAST((SUM(IF(p.volume > 0,p.volume,p.width * p.depth * IF(p.height, p.height, i.size + pconfig.upperGap))
diff --git a/print/templates/reports/entry-order/sql/entry.sql b/print/templates/reports/entry-order/sql/entry.sql
index 57b8d9293..c30eebca8 100644
--- a/print/templates/reports/entry-order/sql/entry.sql
+++ b/print/templates/reports/entry-order/sql/entry.sql
@@ -1,7 +1,6 @@
 SELECT
     e.id,
     e.invoiceNumber,
-    e.notes,
     c.code companyCode,
     t.landed
 FROM entry e

From 117849f09395aee737df62efbd1a615907252bc1 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Wed, 12 Apr 2023 12:03:55 +0200
Subject: [PATCH 04/26] refs #5540 supplier js

---
 db/changes/231401/00-updateIsVies.sql            |  5 +++++
 modules/supplier/back/models/supplier.js         | 12 ++++++++++++
 modules/supplier/front/fiscal-data/index.html    |  7 +++++--
 modules/supplier/front/fiscal-data/locale/es.yml |  4 +++-
 4 files changed, 25 insertions(+), 3 deletions(-)
 create mode 100644 db/changes/231401/00-updateIsVies.sql

diff --git a/db/changes/231401/00-updateIsVies.sql b/db/changes/231401/00-updateIsVies.sql
new file mode 100644
index 000000000..efe008101
--- /dev/null
+++ b/db/changes/231401/00-updateIsVies.sql
@@ -0,0 +1,5 @@
+UPDATE vn.supplier s
+            JOIN vn.country c ON c.id = s.countryFk
+        SET s.nif = MID(REPLACE(s.nif, ' ', ''), 3, LENGTH(REPLACE(s.nif, ' ', '')) - 1)
+        WHERE s.isVies = TRUE 
+            AND c.code = LEFT(REPLACE(s.nif, ' ', ''), 2);
\ No newline at end of file
diff --git a/modules/supplier/back/models/supplier.js b/modules/supplier/back/models/supplier.js
index 4e509aafc..745a2f7e3 100644
--- a/modules/supplier/back/models/supplier.js
+++ b/modules/supplier/back/models/supplier.js
@@ -73,6 +73,18 @@ module.exports = Self => {
         done();
     }
 
+    Self.validateAsync('nif', areFirstTwoCharsLetters, nifInvalid, {
+        message: 'The first two values are letters.'});
+
+    function areFirstTwoCharsLetters(str) {
+        return /^[a-zA-Z]{2}/.test(str);
+    }
+
+    async function nifInvalid(err, areFirstTwoCharsLetters) {
+        if (this.isVies == 1 && areFirstTwoCharsLetters(this.nif))
+            err();
+    }
+
     function isAlpha(value) {
         const regexp = new RegExp(/^[ñça-zA-Z0-9\s]*$/i);
 
diff --git a/modules/supplier/front/fiscal-data/index.html b/modules/supplier/front/fiscal-data/index.html
index ccbd5b0d9..f84a1890e 100644
--- a/modules/supplier/front/fiscal-data/index.html
+++ b/modules/supplier/front/fiscal-data/index.html
@@ -52,7 +52,8 @@
                 label="Tax number"
                 ng-model="$ctrl.supplier.nif"
                 required="true"
-                rule>
+                rule
+                >
             </vn-textfield>
         </vn-horizontal>
         <vn-horizontal>
@@ -188,7 +189,9 @@
                 <vn-check
                     class="vn-ml-lg"
                     label="Vies"
-                    ng-model="$ctrl.supplier.isVies">
+                    info="When activating it, do not enter the country code in the ID field."
+                    ng-model="$ctrl.supplier.isVies"
+                    >
                 </vn-check>
             </vn-two>
         </vn-horizontal>
diff --git a/modules/supplier/front/fiscal-data/locale/es.yml b/modules/supplier/front/fiscal-data/locale/es.yml
index 5232dd95d..ee641231f 100644
--- a/modules/supplier/front/fiscal-data/locale/es.yml
+++ b/modules/supplier/front/fiscal-data/locale/es.yml
@@ -3,4 +3,6 @@ Sage transaction type: Tipo de transacción Sage
 Sage withholding: Retención Sage
 Supplier activity: Actividad proveedor
 Healt register: Pasaporte sanitario
-Trucker: Transportista
\ No newline at end of file
+Trucker: Transportista
+When activating it, do not enter the country code in the ID field.: Al activarlo, no informar el código del país en el campo nif
+The first two values are letters.: Los dos primeros valores son letras
\ No newline at end of file

From 60103fa80ac08ce1ac39909fd2f14b5cf71cc9bf Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Wed, 12 Apr 2023 14:39:40 +0200
Subject: [PATCH 05/26] refs #5540 validacion nif

---
 loopback/locale/es.json                  |  3 ++-
 modules/supplier/back/models/supplier.js | 13 +++++--------
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/loopback/locale/es.json b/loopback/locale/es.json
index 42276efe7..8e2672bc4 100644
--- a/loopback/locale/es.json
+++ b/loopback/locale/es.json
@@ -274,5 +274,6 @@
 	"This ticket cannot be signed because it has not been boxed": "Este ticket no puede firmarse porque no ha sido encajado",
 	"Insert a date range": "Inserte un rango de fechas",
     "Added observation": "{{user}} añadió esta observacion: {{text}}",
-    "Comment added to client": "Observación añadida al cliente {{clientFk}}"
+    "Comment added to client": "Observación añadida al cliente {{clientFk}}",
+	"The first two values are letters": "Los dos primeros carácteres del NIF son letras"
 }
diff --git a/modules/supplier/back/models/supplier.js b/modules/supplier/back/models/supplier.js
index 745a2f7e3..7f12e86ef 100644
--- a/modules/supplier/back/models/supplier.js
+++ b/modules/supplier/back/models/supplier.js
@@ -73,16 +73,13 @@ module.exports = Self => {
         done();
     }
 
-    Self.validateAsync('nif', areFirstTwoCharsLetters, nifInvalid, {
-        message: 'The first two values are letters.'});
+    Self.validateAsync('nif', nifInvalid, {
+        message: 'The first two values are letters'});
 
-    function areFirstTwoCharsLetters(str) {
-        return /^[a-zA-Z]{2}/.test(str);
-    }
-
-    async function nifInvalid(err, areFirstTwoCharsLetters) {
-        if (this.isVies == 1 && areFirstTwoCharsLetters(this.nif))
+    async function nifInvalid(err, done) {
+        if (this.isVies && /^[a-zA-Z]{2}/.test(this.nif))
             err();
+        done();
     }
 
     function isAlpha(value) {

From 747efc4342ac8da8994c8ac096f50f48cf655a0e Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Wed, 12 Apr 2023 14:52:59 +0200
Subject: [PATCH 06/26] refs #5540 sql mod

---
 db/changes/231401/00-updateIsVies.sql | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/db/changes/231401/00-updateIsVies.sql b/db/changes/231401/00-updateIsVies.sql
index efe008101..1d2e55441 100644
--- a/db/changes/231401/00-updateIsVies.sql
+++ b/db/changes/231401/00-updateIsVies.sql
@@ -1,5 +1,3 @@
-UPDATE vn.supplier s
-            JOIN vn.country c ON c.id = s.countryFk
-        SET s.nif = MID(REPLACE(s.nif, ' ', ''), 3, LENGTH(REPLACE(s.nif, ' ', '')) - 1)
-        WHERE s.isVies = TRUE 
-            AND c.code = LEFT(REPLACE(s.nif, ' ', ''), 2);
\ No newline at end of file
+UPDATE vn.supplier
+SET nif = SUBSTRING(nif, IF(ASCII(SUBSTRING(nif, 1, 1)) BETWEEN 65 AND 90 AND ASCII(SUBSTRING(nif, 2, 1)) BETWEEN 65 AND 90, 3, 1), LENGTH(nif))
+WHERE isVies = 1 AND nif REGEXP '^[a-zA-Z]{2}';

From ad267c933c68149e7c693ff031e1edc8c2af24f6 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Thu, 13 Apr 2023 08:30:33 +0200
Subject: [PATCH 07/26] refs #5540 country.code

---
 db/changes/231401/00-updateIsVies.sql    | 8 +++++---
 modules/supplier/back/models/supplier.js | 9 ++++++++-
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/db/changes/231401/00-updateIsVies.sql b/db/changes/231401/00-updateIsVies.sql
index 1d2e55441..83fde7352 100644
--- a/db/changes/231401/00-updateIsVies.sql
+++ b/db/changes/231401/00-updateIsVies.sql
@@ -1,3 +1,5 @@
-UPDATE vn.supplier
-SET nif = SUBSTRING(nif, IF(ASCII(SUBSTRING(nif, 1, 1)) BETWEEN 65 AND 90 AND ASCII(SUBSTRING(nif, 2, 1)) BETWEEN 65 AND 90, 3, 1), LENGTH(nif))
-WHERE isVies = 1 AND nif REGEXP '^[a-zA-Z]{2}';
+    UPDATE vn.supplier s
+            JOIN vn.country c ON c.id = s.countryFk
+        SET s.nif = MID(REPLACE(s.nif, ' ', ''), 3, LENGTH(REPLACE(s.nif, ' ', '')) - 1)
+        WHERE s.isVies = TRUE 
+            AND c.code = LEFT(REPLACE(s.nif, ' ', ''), 2);
\ No newline at end of file
diff --git a/modules/supplier/back/models/supplier.js b/modules/supplier/back/models/supplier.js
index 7f12e86ef..c889fd420 100644
--- a/modules/supplier/back/models/supplier.js
+++ b/modules/supplier/back/models/supplier.js
@@ -77,7 +77,14 @@ module.exports = Self => {
         message: 'The first two values are letters'});
 
     async function nifInvalid(err, done) {
-        if (this.isVies && /^[a-zA-Z]{2}/.test(this.nif))
+        const filter = {
+            fields: ['code'],
+            where: {id: this.countryFk}
+        };
+        const countryCode = this.nif.toUpperCase().substring(0, 2);
+        const country = await Self.app.models.Country.findOne(filter);
+        const code = country ? country.code : null;
+        if (this.isVies && countryCode == code)
             err();
         done();
     }

From d399cda050089b619faef36ec10eeece6ba27f53 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Mon, 17 Apr 2023 10:34:08 +0200
Subject: [PATCH 08/26] refs #5316 quitar comment

---
 e2e/helpers/selectors.js                             |  1 -
 e2e/paths/12-entry/05_basicData.spec.js              |  7 -------
 loopback/locale/en.json                              |  5 +++--
 modules/entry/front/basic-data/index.html            |  7 -------
 modules/entry/front/index/locale/es.yml              |  1 -
 modules/entry/front/summary/index.html               |  3 ---
 modules/travel/front/summary/index.html              |  6 ------
 print/templates/reports/entry-order/entry-order.html | 10 ----------
 8 files changed, 3 insertions(+), 37 deletions(-)

diff --git a/e2e/helpers/selectors.js b/e2e/helpers/selectors.js
index e47235ef0..9d3410f2b 100644
--- a/e2e/helpers/selectors.js
+++ b/e2e/helpers/selectors.js
@@ -1247,7 +1247,6 @@ export default {
     entryBasicData: {
         reference: 'vn-entry-basic-data vn-textfield[ng-model="$ctrl.entry.reference"]',
         invoiceNumber: 'vn-entry-basic-data vn-textfield[ng-model="$ctrl.entry.invoiceNumber"]',
-        // notes: 'vn-entry-basic-data vn-textfield[ng-model="$ctrl.entry.notes"]',
         observations: 'vn-entry-basic-data vn-textarea[ng-model="$ctrl.entry.observation"]',
         supplier: 'vn-entry-basic-data vn-autocomplete[ng-model="$ctrl.entry.supplierFk"]',
         currency: 'vn-entry-basic-data vn-autocomplete[ng-model="$ctrl.entry.currencyFk"]',
diff --git a/e2e/paths/12-entry/05_basicData.spec.js b/e2e/paths/12-entry/05_basicData.spec.js
index eec00ca96..0272446d9 100644
--- a/e2e/paths/12-entry/05_basicData.spec.js
+++ b/e2e/paths/12-entry/05_basicData.spec.js
@@ -20,7 +20,6 @@ describe('Entry basic data path', () => {
     it('should edit the basic data', async() => {
         await page.write(selectors.entryBasicData.reference, 'new movement 8');
         await page.write(selectors.entryBasicData.invoiceNumber, 'new movement 8');
-        // await page.write(selectors.entryBasicData.notes, 'new notes');
         await page.write(selectors.entryBasicData.observations, ' edited');
         await page.autocompleteSearch(selectors.entryBasicData.supplier, 'Plants nick');
         await page.autocompleteSearch(selectors.entryBasicData.currency, 'eur');
@@ -53,12 +52,6 @@ describe('Entry basic data path', () => {
         expect(result).toEqual('new movement 8');
     });
 
-    // it('should confirm the note was edited', async() => {
-    //     const result = await page.waitToGetProperty(selectors.entryBasicData.notes, 'value');
-
-    //     expect(result).toEqual('new notes');
-    // });
-
     it('should confirm the observation was edited', async() => {
         const result = await page.waitToGetProperty(selectors.entryBasicData.observations, 'value');
 
diff --git a/loopback/locale/en.json b/loopback/locale/en.json
index e9fd67209..c3c8d234d 100644
--- a/loopback/locale/en.json
+++ b/loopback/locale/en.json
@@ -154,5 +154,6 @@
 	"Valid priorities: 1,2,3": "Valid priorities: 1,2,3",
 	"Warehouse inventory not set": "Almacén inventario no está establecido",
 	"Component cost not set": "Componente coste no está estabecido",
-	"Tickets with associated refunds can't be deleted. This ticket is associated with refund Nº 2": "Tickets with associated refunds can't be deleted. This ticket is associated with refund Nº 2"
-}
+	"Tickets with associated refunds can't be deleted. This ticket is associated with refund Nº 2": "Tickets with associated refunds can't be deleted. This ticket is associated with refund Nº 2",
+	"Description cannot be blank": "Description cannot be blank"
+}
\ No newline at end of file
diff --git a/modules/entry/front/basic-data/index.html b/modules/entry/front/basic-data/index.html
index 6fd23a4f7..4e4631a3c 100644
--- a/modules/entry/front/basic-data/index.html
+++ b/modules/entry/front/basic-data/index.html
@@ -52,13 +52,6 @@
                 rule
                 vn-focus>
             </vn-textfield>
-            <!-- <vn-textfield
-                vn-one
-                label="Notes"
-                ng-model="$ctrl.entry.notes"
-                rule
-                vn-focus>
-            </vn-textfield> -->
         </vn-horizontal>
         <vn-horizontal>
             <vn-textfield
diff --git a/modules/entry/front/index/locale/es.yml b/modules/entry/front/index/locale/es.yml
index 8f6c9e5cb..cebe57a42 100644
--- a/modules/entry/front/index/locale/es.yml
+++ b/modules/entry/front/index/locale/es.yml
@@ -12,7 +12,6 @@ Reference: Referencia
 Created: Creado
 Booked: Contabilizada
 Is inventory: Inventario
-# Notes: Notas
 Status: Estado
 Selection: Selección
 Invoice number: Núm. factura
\ No newline at end of file
diff --git a/modules/entry/front/summary/index.html b/modules/entry/front/summary/index.html
index 53ec093aa..d5d3ebf1e 100644
--- a/modules/entry/front/summary/index.html
+++ b/modules/entry/front/summary/index.html
@@ -32,9 +32,6 @@
             <vn-label-value label="Invoice number"
                 value="{{$ctrl.entryData.invoiceNumber}}">
             </vn-label-value>
-            <!-- <vn-label-value label="Notes"
-                value="{{$ctrl.entryData.notes}}">
-            </vn-label-value> -->
         </vn-one>
         <vn-one>
             <vn-label-value label="Reference">
diff --git a/modules/travel/front/summary/index.html b/modules/travel/front/summary/index.html
index c19a075fc..5d38ed08f 100644
--- a/modules/travel/front/summary/index.html
+++ b/modules/travel/front/summary/index.html
@@ -100,12 +100,6 @@
                         <vn-td shrink>{{entry.pallet}}</vn-td>
                         <vn-td shrink>{{entry.m3}}</vn-td>
                         <vn-td shrink>
-                            <!-- <vn-icon
-                                ng-if="entry.notes.length"
-                                vn-tooltip="{{entry.notes}}"
-                                icon="insert_drive_file"
-                                class="bright">
-                            </vn-icon> -->
                             <vn-icon
                                 ng-if="entry.observation.length"
                                 vn-tooltip="{{entry.observation}}"
diff --git a/print/templates/reports/entry-order/entry-order.html b/print/templates/reports/entry-order/entry-order.html
index b8f1acc69..ddf0e9b5d 100644
--- a/print/templates/reports/entry-order/entry-order.html
+++ b/print/templates/reports/entry-order/entry-order.html
@@ -77,16 +77,6 @@
                     </tr>
                 </tfoot>
             </table>
-            <!-- <div class="columns">
-                <div class="size50">
-                    <div id="notes" class="panel no-page-break" v-if="entry.notes">
-                        <div class="body">
-                            <h3>{{$t('notes')}}</h3>
-                            <div>{{entry.notes}}</div>
-                        </div>
-                    </div>
-                </div>
-            </div> -->
         </div>
     </div>
     <template v-slot:footer>

From d8b5659a5dd0e4fbbd48081881285ea0a9c2c1ed Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Fri, 21 Apr 2023 09:14:30 +0200
Subject: [PATCH 09/26] refs #5540  client vies

---
 .../{231401 => 231601}/00-updateIsVies.sql       |  0
 db/changes/231601/00-updateisViesClient.sql      |  5 +++++
 loopback/locale/es.json                          |  9 +++++----
 modules/client/back/models/client.js             | 16 ++++++++++++++++
 modules/client/front/fiscal-data/index.html      |  4 +++-
 modules/client/front/fiscal-data/locale/es.yml   |  2 ++
 6 files changed, 31 insertions(+), 5 deletions(-)
 rename db/changes/{231401 => 231601}/00-updateIsVies.sql (100%)
 create mode 100644 db/changes/231601/00-updateisViesClient.sql

diff --git a/db/changes/231401/00-updateIsVies.sql b/db/changes/231601/00-updateIsVies.sql
similarity index 100%
rename from db/changes/231401/00-updateIsVies.sql
rename to db/changes/231601/00-updateIsVies.sql
diff --git a/db/changes/231601/00-updateisViesClient.sql b/db/changes/231601/00-updateisViesClient.sql
new file mode 100644
index 000000000..bdf62d7a8
--- /dev/null
+++ b/db/changes/231601/00-updateisViesClient.sql
@@ -0,0 +1,5 @@
+UPDATE IGNORE vn.client c
+        JOIN vn.country co ON co.id = c.countryFk
+    SET c.fi = MID(REPLACE(c.fi, ' ', ''), 3, LENGTH(REPLACE(c.fi, ' ', '')) - 1)
+    WHERE c.isVies = TRUE 
+        AND co.code = LEFT(REPLACE(c.fi, ' ', ''), 2);
\ No newline at end of file
diff --git a/loopback/locale/es.json b/loopback/locale/es.json
index 33741d395..1faf57ffe 100644
--- a/loopback/locale/es.json
+++ b/loopback/locale/es.json
@@ -273,7 +273,8 @@
 	"Not exist this branch": "La rama no existe",
 	"This ticket cannot be signed because it has not been boxed": "Este ticket no puede firmarse porque no ha sido encajado",
 	"Insert a date range": "Inserte un rango de fechas",
-    "Added observation": "{{user}} añadió esta observacion: {{text}}",
-    "Comment added to client": "Observación añadida al cliente {{clientFk}}",
-    "Cannot create a new claimBeginning from a different ticket": "No se puede crear una línea de reclamación de un ticket diferente al origen"
-}
+	"Added observation": "{{user}} añadió esta observacion: {{text}}",
+	"Comment added to client": "Observación añadida al cliente {{clientFk}}",
+	"Cannot create a new claimBeginning from a different ticket": "No se puede crear una línea de reclamación de un ticket diferente al origen",
+	"The first two values are letters": "The first two values are letters"
+}
\ No newline at end of file
diff --git a/modules/client/back/models/client.js b/modules/client/back/models/client.js
index 7933f2f42..21dfb516d 100644
--- a/modules/client/back/models/client.js
+++ b/modules/client/back/models/client.js
@@ -23,6 +23,22 @@ module.exports = Self => {
         message: 'TIN must be unique'
     });
 
+    Self.validateAsync('fi', fiInvalid, {
+        message: 'The first two values are letters'});
+
+    async function fiInvalid(err, done) {
+        const filter = {
+            fields: ['code'],
+            where: {id: this.countryFk}
+        };
+        const countryCode = this.fi.toUpperCase().substring(0, 2);
+        const country = await Self.app.models.Country.findOne(filter);
+        const code = country ? country.code : null;
+        if (this.isVies && countryCode == code)
+            err();
+        done();
+    }
+
     Self.validatesFormatOf('email', {
         message: 'Invalid email',
         allowNull: true,
diff --git a/modules/client/front/fiscal-data/index.html b/modules/client/front/fiscal-data/index.html
index 88586cff7..4b1219f31 100644
--- a/modules/client/front/fiscal-data/index.html
+++ b/modules/client/front/fiscal-data/index.html
@@ -72,7 +72,9 @@
         <vn-horizontal>
             <vn-check vn-one label="Has to invoice" ng-model="$ctrl.client.hasToInvoice">
             </vn-check>
-            <vn-check vn-one label="Vies" ng-model="$ctrl.client.isVies">
+            <vn-check vn-one label="Vies" 
+            info="When activating it, do not enter the country code in the ID field."
+            ng-model="$ctrl.client.isVies">
             </vn-check>
         </vn-horizontal>
         <vn-horizontal>
diff --git a/modules/client/front/fiscal-data/locale/es.yml b/modules/client/front/fiscal-data/locale/es.yml
index 7624c86bd..61a91828f 100644
--- a/modules/client/front/fiscal-data/locale/es.yml
+++ b/modules/client/front/fiscal-data/locale/es.yml
@@ -12,3 +12,5 @@ Previous client: Cliente anterior
 In case of a company succession, specify the grantor company: En el caso de que haya habido una sucesión de empresa, indicar la empresa cedente
 Incoterms authorization: Autorización incoterms
 Electronic invoice: Factura electrónica
+When activating it, do not enter the country code in the IF.:  Al activarlo, no informar el código del país en el campo IF
+The first two values are letters: Los dos primeros valores son letras
\ No newline at end of file

From 397d8f658e1ea187d79867bbfab19c9a5fbe9403 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Fri, 21 Apr 2023 10:41:50 +0200
Subject: [PATCH 10/26] refs #5540 error trad

---
 modules/client/back/models/client.js     | 3 ++-
 modules/supplier/back/models/supplier.js | 3 +--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/client/back/models/client.js b/modules/client/back/models/client.js
index 21dfb516d..451830749 100644
--- a/modules/client/back/models/client.js
+++ b/modules/client/back/models/client.js
@@ -24,7 +24,8 @@ module.exports = Self => {
     });
 
     Self.validateAsync('fi', fiInvalid, {
-        message: 'The first two values are letters'});
+        message: 'Invalid TIN'
+    });
 
     async function fiInvalid(err, done) {
         const filter = {
diff --git a/modules/supplier/back/models/supplier.js b/modules/supplier/back/models/supplier.js
index 87f3b5d6a..7270c0405 100644
--- a/modules/supplier/back/models/supplier.js
+++ b/modules/supplier/back/models/supplier.js
@@ -73,8 +73,7 @@ module.exports = Self => {
         done();
     }
 
-    Self.validateAsync('nif', nifInvalid, {
-        message: 'The first two values are letters'});
+    Self.validateAsync('nif', nifInvalid);
 
     async function nifInvalid(err, done) {
         const filter = {

From cd4f66e292118af0600563039be054e03a47f0a8 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Mon, 24 Apr 2023 08:48:35 +0200
Subject: [PATCH 11/26] refs #5540 arreglar e2e

---
 modules/worker/back/methods/worker/new.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/worker/back/methods/worker/new.js b/modules/worker/back/methods/worker/new.js
index 144b07f10..5ff7135a7 100644
--- a/modules/worker/back/methods/worker/new.js
+++ b/modules/worker/back/methods/worker/new.js
@@ -196,7 +196,7 @@ module.exports = Self => {
 
                 client = await models.Client.findById(
                     user.id,
-                    {fields: ['id', 'name', 'socialName', 'street', 'city', 'iban', 'bankEntityFk', 'defaultAddressFk']},
+                    {fields: ['id', 'name', 'socialName', 'street', 'city', 'iban', 'bankEntityFk', 'defaultAddressFk', 'fi']},
                     myOptions
                 );
 

From b25071f52b7f55788db6c6523bbba252f5119728 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Wed, 26 Apr 2023 11:40:18 +0200
Subject: [PATCH 12/26] refs #5316 solve e2e

---
 e2e/helpers/selectors.js        |  1 +
 modules/entry/front/routes.json | 11 +++++++++++
 2 files changed, 12 insertions(+)

diff --git a/e2e/helpers/selectors.js b/e2e/helpers/selectors.js
index 8839c5756..7e8b91fa1 100644
--- a/e2e/helpers/selectors.js
+++ b/e2e/helpers/selectors.js
@@ -1258,6 +1258,7 @@ export default {
     entryBasicData: {
         reference: 'vn-entry-basic-data vn-textfield[ng-model="$ctrl.entry.reference"]',
         invoiceNumber: 'vn-entry-basic-data vn-textfield[ng-model="$ctrl.entry.invoiceNumber"]',
+        notes: 'vn-entry-basic-data vn-textfield[ng-model="$ctrl.entry.notes"]',
         observations: 'vn-entry-basic-data vn-textarea[ng-model="$ctrl.entry.observation"]',
         supplier: 'vn-entry-basic-data vn-autocomplete[ng-model="$ctrl.entry.supplierFk"]',
         currency: 'vn-entry-basic-data vn-autocomplete[ng-model="$ctrl.entry.currencyFk"]',
diff --git a/modules/entry/front/routes.json b/modules/entry/front/routes.json
index c5c5f407a..3934a96ee 100644
--- a/modules/entry/front/routes.json
+++ b/modules/entry/front/routes.json
@@ -12,6 +12,7 @@
         "card": [
             {"state": "entry.card.basicData", "icon": "settings"},
             {"state": "entry.card.buy.index", "icon": "icon-lines"},
+            {"state": "entry.card.observation", "icon": "insert_drive_file"},
             {"state": "entry.card.log", "icon": "history"}
         ]
     },
@@ -73,6 +74,16 @@
             },
             "acl": ["buyer", "administrative"]
         },
+        {		
+            "url": "/observation",		
+            "state": "entry.card.observation",		
+            "component": "vn-entry-observation",		
+            "description": "Notes",		
+            "params": {		
+                "entry": "$ctrl.entry"		
+            },		
+            "acl": ["buyer", "administrative"]		
+        },
         {
             "url" : "/log",
             "state": "entry.card.log",

From dd4d0bca84a540bd2729aa67719c41a083188e02 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Thu, 27 Apr 2023 10:39:58 +0200
Subject: [PATCH 13/26] refs #5540 delete tinIsValid, solve test back, e2e

---
 e2e/paths/13-supplier/03_fiscal_data.spec.js  |  2 +-
 .../supplier/specs/newSupplier.spec.js        |  5 +--
 modules/supplier/back/models/supplier.js      | 31 ++++++++++---------
 3 files changed, 21 insertions(+), 17 deletions(-)

diff --git a/e2e/paths/13-supplier/03_fiscal_data.spec.js b/e2e/paths/13-supplier/03_fiscal_data.spec.js
index 4f9581e32..45e11fbe1 100644
--- a/e2e/paths/13-supplier/03_fiscal_data.spec.js
+++ b/e2e/paths/13-supplier/03_fiscal_data.spec.js
@@ -38,7 +38,7 @@ describe('Supplier fiscal data path', () => {
         await page.waitToClick(selectors.supplierFiscalData.saveButton);
         const message = await page.waitForSnackbar();
 
-        expect(message.text).toContain('Invalid Tax number');
+        expect(message.text).toContain('Data saved!');
     });
 
     it('should save the changes as the tax number is valid this time', async() => {
diff --git a/modules/supplier/back/methods/supplier/specs/newSupplier.spec.js b/modules/supplier/back/methods/supplier/specs/newSupplier.spec.js
index d4479d00b..c368ec1b8 100644
--- a/modules/supplier/back/methods/supplier/specs/newSupplier.spec.js
+++ b/modules/supplier/back/methods/supplier/specs/newSupplier.spec.js
@@ -19,13 +19,14 @@ describe('Supplier newSupplier()', () => {
         });
     });
 
-    it('should create a new supplier containing only the name', async() => {
+    it('should create a new supplier containing only the name and the nif', async() => {
         const tx = await models.Supplier.beginTransaction({});
 
         try {
             const options = {transaction: tx};
             ctx.args = {
-                name: 'newSupplier'
+                name: 'newSupplier',
+                nif: '12345678Z'
             };
 
             const result = await models.Supplier.newSupplier(ctx, options);
diff --git a/modules/supplier/back/models/supplier.js b/modules/supplier/back/models/supplier.js
index 7270c0405..f30b744c4 100644
--- a/modules/supplier/back/models/supplier.js
+++ b/modules/supplier/back/models/supplier.js
@@ -32,6 +32,10 @@ module.exports = Self => {
         message: 'TIN must be unique'
     });
 
+    Self.validateAsync('nif', nifInvalid, {
+        message: 'Invalid TIN'
+    });
+
     Self.validateAsync('nif', tinIsValid, {
         message: 'Invalid TIN'
     });
@@ -57,24 +61,23 @@ module.exports = Self => {
         done();
     }
 
-    async function tinIsValid(err, done) {
-        if (!this.countryFk)
-            return done();
+    // async function tinIsValid(err, done) {
+    //     if (!this.countryFk)
+    //         return done();
 
-        const filter = {
-            fields: ['code'],
-            where: {id: this.countryFk}
-        };
-        const country = await Self.app.models.Country.findOne(filter);
-        const code = country ? country.code.toLowerCase() : null;
+    //     const filter = {
+    //         fields: ['code'],
+    //         where: {id: this.countryFk}
+    //     };
+    //     const country = await Self.app.models.Country.findOne(filter);
+    //     const code = country ? country.code.toLowerCase() : null;
 
-        if (!this.nif || !validateTin(this.nif, code))
-            err();
-        done();
-    }
+    //     if (!this.nif || !validateTin(this.nif, code))
+    //         err();
+    //     done();
+    // }
 
     Self.validateAsync('nif', nifInvalid);
-
     async function nifInvalid(err, done) {
         const filter = {
             fields: ['code'],

From 07148f6c291c40cb5f2160c104aeecfac72e6a95 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Thu, 27 Apr 2023 11:31:26 +0200
Subject: [PATCH 14/26] refs #5540 mon message

---
 e2e/paths/13-supplier/03_fiscal_data.spec.js |  2 +-
 loopback/locale/es.json                      |  3 ++-
 modules/supplier/back/models/supplier.js     | 28 ++++++++++----------
 3 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/e2e/paths/13-supplier/03_fiscal_data.spec.js b/e2e/paths/13-supplier/03_fiscal_data.spec.js
index 45e11fbe1..4f9581e32 100644
--- a/e2e/paths/13-supplier/03_fiscal_data.spec.js
+++ b/e2e/paths/13-supplier/03_fiscal_data.spec.js
@@ -38,7 +38,7 @@ describe('Supplier fiscal data path', () => {
         await page.waitToClick(selectors.supplierFiscalData.saveButton);
         const message = await page.waitForSnackbar();
 
-        expect(message.text).toContain('Data saved!');
+        expect(message.text).toContain('Invalid Tax number');
     });
 
     it('should save the changes as the tax number is valid this time', async() => {
diff --git a/loopback/locale/es.json b/loopback/locale/es.json
index 696fbe18d..ca77aa77c 100644
--- a/loopback/locale/es.json
+++ b/loopback/locale/es.json
@@ -278,5 +278,6 @@
 	"Added observation": "{{user}} añadió esta observacion: {{text}}",
 	"Comment added to client": "Observación añadida al cliente {{clientFk}}",
 	"Cannot create a new claimBeginning from a different ticket": "No se puede crear una línea de reclamación de un ticket diferente al origen",
-	"The first two values are letters": "The first two values are letters"
+	"The first two values are letters": "The first two values are letters",
+	"NIF no valido por VIES": "NIF no valido por VIES"
 }
\ No newline at end of file
diff --git a/modules/supplier/back/models/supplier.js b/modules/supplier/back/models/supplier.js
index f30b744c4..d543e0d48 100644
--- a/modules/supplier/back/models/supplier.js
+++ b/modules/supplier/back/models/supplier.js
@@ -33,7 +33,7 @@ module.exports = Self => {
     });
 
     Self.validateAsync('nif', nifInvalid, {
-        message: 'Invalid TIN'
+        message: 'NIF no valido por VIES'
     });
 
     Self.validateAsync('nif', tinIsValid, {
@@ -61,21 +61,21 @@ module.exports = Self => {
         done();
     }
 
-    // async function tinIsValid(err, done) {
-    //     if (!this.countryFk)
-    //         return done();
+    async function tinIsValid(err, done) {
+        if (!this.countryFk)
+            return done();
 
-    //     const filter = {
-    //         fields: ['code'],
-    //         where: {id: this.countryFk}
-    //     };
-    //     const country = await Self.app.models.Country.findOne(filter);
-    //     const code = country ? country.code.toLowerCase() : null;
+        const filter = {
+            fields: ['code'],
+            where: {id: this.countryFk}
+        };
+        const country = await Self.app.models.Country.findOne(filter);
+        const code = country ? country.code.toLowerCase() : null;
 
-    //     if (!this.nif || !validateTin(this.nif, code))
-    //         err();
-    //     done();
-    // }
+        if (!this.nif || !validateTin(this.nif, code))
+            err();
+        done();
+    }
 
     Self.validateAsync('nif', nifInvalid);
     async function nifInvalid(err, done) {

From d15a671359b073e378bcc61bb5098b88e804a6fe Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Thu, 27 Apr 2023 11:40:42 +0200
Subject: [PATCH 15/26] refs #5540 traduccion

---
 modules/supplier/back/models/supplier.js | 2 +-
 modules/supplier/front/locale/es.yml     | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/modules/supplier/back/models/supplier.js b/modules/supplier/back/models/supplier.js
index d543e0d48..4014aac03 100644
--- a/modules/supplier/back/models/supplier.js
+++ b/modules/supplier/back/models/supplier.js
@@ -33,7 +33,7 @@ module.exports = Self => {
     });
 
     Self.validateAsync('nif', nifInvalid, {
-        message: 'NIF no valido por VIES'
+        message: 'Invalid NIF for VIES'
     });
 
     Self.validateAsync('nif', tinIsValid, {
diff --git a/modules/supplier/front/locale/es.yml b/modules/supplier/front/locale/es.yml
index abb6a9775..a2b6dd04d 100644
--- a/modules/supplier/front/locale/es.yml
+++ b/modules/supplier/front/locale/es.yml
@@ -1 +1,2 @@
-Accounts: Cuentas
\ No newline at end of file
+Accounts: Cuentas
+Invalid NIF for VIES: NIF no valido por VIES
\ No newline at end of file

From e1864fec092a0d1c3a8501548fd394a5f50339ad Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Thu, 27 Apr 2023 13:26:22 +0200
Subject: [PATCH 16/26] arreglo json

---
 loopback/locale/es.json | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/loopback/locale/es.json b/loopback/locale/es.json
index c0be5471e..3ef3c4a22 100644
--- a/loopback/locale/es.json
+++ b/loopback/locale/es.json
@@ -278,11 +278,6 @@
 	"Added observation": "{{user}} añadió esta observacion: {{text}}",
 	"Comment added to client": "Observación añadida al cliente {{clientFk}}",
 	"Cannot create a new claimBeginning from a different ticket": "No se puede crear una línea de reclamación de un ticket diferente al origen",
-<<<<<<< HEAD
-	"The first two values are letters": "The first two values are letters",
-	"NIF no valido por VIES": "NIF no valido por VIES"
-}
-=======
 	"company": "Compañía",
     "country": "País",
     "clientId": "Id cliente",
@@ -296,4 +291,3 @@
     "comercialId": "Id comercial",
     "comercialName": "Comercial"
 }
->>>>>>> 7f8f65567f4eb53637a1ff0c2cdbd3a93447e1ac

From b8f7f7bd6955c78283c006da48e549b40740af81 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Fri, 28 Apr 2023 09:07:06 +0200
Subject: [PATCH 17/26] refs #5540 create validateIban

---
 loopback/util/validateNIF.js         | 12 ++++++++++++
 modules/client/back/models/client.js | 27 ++++++++++++++-------------
 2 files changed, 26 insertions(+), 13 deletions(-)
 create mode 100644 loopback/util/validateNIF.js

diff --git a/loopback/util/validateNIF.js b/loopback/util/validateNIF.js
new file mode 100644
index 000000000..22c10d612
--- /dev/null
+++ b/loopback/util/validateNIF.js
@@ -0,0 +1,12 @@
+module.exports = async function(fi) {
+    const filter = {
+        fields: ['code'],
+        where: {id: this.countryFk}
+    };
+    const countryCode = this.fi.toUpperCase().substring(0, 2);
+    const country = await app.models.Country.findOne(filter);
+    const code = country ? country.code : null;
+    if (this.isVies && countryCode == code)
+        err();
+    done();
+};
diff --git a/modules/client/back/models/client.js b/modules/client/back/models/client.js
index c271a24e8..d51a67d05 100644
--- a/modules/client/back/models/client.js
+++ b/modules/client/back/models/client.js
@@ -4,6 +4,7 @@ const isMultiple = require('vn-loopback/util/hook').isMultiple;
 const validateTin = require('vn-loopback/util/validateTin');
 const validateIban = require('vn-loopback/util/validateIban');
 const LoopBackContext = require('loopback-context');
+const validateNIF = require('vn-loopback/util/validateNIF');
 
 module.exports = Self => {
     // Methods
@@ -23,22 +24,22 @@ module.exports = Self => {
         message: 'TIN must be unique'
     });
 
-    Self.validateAsync('fi', fiInvalid, {
+    Self.validateAsync('fi', validateNIF(fi), {
         message: 'Invalid TIN'
     });
 
-    async function fiInvalid(err, done) {
-        const filter = {
-            fields: ['code'],
-            where: {id: this.countryFk}
-        };
-        const countryCode = this.fi.toUpperCase().substring(0, 2);
-        const country = await Self.app.models.Country.findOne(filter);
-        const code = country ? country.code : null;
-        if (this.isVies && countryCode == code)
-            err();
-        done();
-    }
+    // async function fiInvalid(err, done) {
+    //     const filter = {
+    //         fields: ['code'],
+    //         where: {id: this.countryFk}
+    //     };
+    //     const countryCode = this.fi.toUpperCase().substring(0, 2);
+    //     const country = await Self.app.models.Country.findOne(filter);
+    //     const code = country ? country.code : null;
+    //     if (this.isVies && countryCode == code)
+    //         err();
+    //     done();
+    // }
 
     Self.validatesFormatOf('email', {
         message: 'Invalid email',

From cdbbec9d36619a3c8e4db4ff06c9ba2504f8cda2 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Fri, 28 Apr 2023 10:21:54 +0200
Subject: [PATCH 18/26] refs #5540 validate

---
 loopback/util/validateNIF.js         | 16 +++++++++-------
 modules/client/back/models/client.js | 12 +++++++++++-
 2 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/loopback/util/validateNIF.js b/loopback/util/validateNIF.js
index 22c10d612..041ca8876 100644
--- a/loopback/util/validateNIF.js
+++ b/loopback/util/validateNIF.js
@@ -1,12 +1,14 @@
-module.exports = async function(fi) {
+const models = require('vn-loopback/server/server').models;
+module.exports = async function(fi, isVies, countryFk) {
     const filter = {
         fields: ['code'],
-        where: {id: this.countryFk}
+        where: {id: countryFk}
     };
-    const countryCode = this.fi.toUpperCase().substring(0, 2);
-    const country = await app.models.Country.findOne(filter);
+    const countryCode = fi.toUpperCase().substring(0, 2);
+    const country = await models.Country.findOne(filter);
     const code = country ? country.code : null;
-    if (this.isVies && countryCode == code)
-        err();
-    done();
+    if (isVies && countryCode == code)
+        return false;
+    return true;
 };
+
diff --git a/modules/client/back/models/client.js b/modules/client/back/models/client.js
index d51a67d05..972355e3e 100644
--- a/modules/client/back/models/client.js
+++ b/modules/client/back/models/client.js
@@ -24,7 +24,7 @@ module.exports = Self => {
         message: 'TIN must be unique'
     });
 
-    Self.validateAsync('fi', validateNIF(fi), {
+    Self.validateAsync(validateNIF(this.fi, this.isVies, this.countryFk), {
         message: 'Invalid TIN'
     });
 
@@ -93,6 +93,16 @@ module.exports = Self => {
         done();
     }
 
+    Self.validateAsync('fi', validationNIF, {
+        message: 'El NIF es incorrecto por el Vies'
+    });
+
+    async function validationNIF(err, done){
+        if (!validateNIF(this.fi, this.isVies, this.countryFk))
+            err();
+        done();
+    }
+    
     Self.validateAsync('fi', tinIsValid, {
         message: 'Invalid TIN'
     });

From 38142c121dd97755b3202c2264015d248bcf54f6 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Fri, 28 Apr 2023 12:12:26 +0200
Subject: [PATCH 19/26] refs #5540 mods client

---
 loopback/locale/es.json              | 25 +++++++++++++------------
 modules/client/back/models/client.js |  6 +-----
 2 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/loopback/locale/es.json b/loopback/locale/es.json
index 3ef3c4a22..45993bdd5 100644
--- a/loopback/locale/es.json
+++ b/loopback/locale/es.json
@@ -279,15 +279,16 @@
 	"Comment added to client": "Observación añadida al cliente {{clientFk}}",
 	"Cannot create a new claimBeginning from a different ticket": "No se puede crear una línea de reclamación de un ticket diferente al origen",
 	"company": "Compañía",
-    "country": "País",
-    "clientId": "Id cliente",
-    "clientSocialName": "Cliente",
-    "amount": "Importe",
-    "taxableBase": "Base",
-    "ticketFk": "Id ticket",
-    "isActive": "Activo",
-    "hasToInvoice": "Facturar",
-    "isTaxDataChecked": "Datos comprobados",
-    "comercialId": "Id comercial",
-    "comercialName": "Comercial"
-}
+	"country": "País",
+	"clientId": "Id cliente",
+	"clientSocialName": "Cliente",
+	"amount": "Importe",
+	"taxableBase": "Base",
+	"ticketFk": "Id ticket",
+	"isActive": "Activo",
+	"hasToInvoice": "Facturar",
+	"isTaxDataChecked": "Datos comprobados",
+	"comercialId": "Id comercial",
+	"comercialName": "Comercial",
+	"Invalid NIF for VIES": "Invalid NIF for VIES"
+}
\ No newline at end of file
diff --git a/modules/client/back/models/client.js b/modules/client/back/models/client.js
index 972355e3e..d3022af81 100644
--- a/modules/client/back/models/client.js
+++ b/modules/client/back/models/client.js
@@ -24,10 +24,6 @@ module.exports = Self => {
         message: 'TIN must be unique'
     });
 
-    Self.validateAsync(validateNIF(this.fi, this.isVies, this.countryFk), {
-        message: 'Invalid TIN'
-    });
-
     // async function fiInvalid(err, done) {
     //     const filter = {
     //         fields: ['code'],
@@ -102,7 +98,7 @@ module.exports = Self => {
             err();
         done();
     }
-    
+
     Self.validateAsync('fi', tinIsValid, {
         message: 'Invalid TIN'
     });

From c0deb745d64faad1903cb0f044c4b3b4ec95070e Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Fri, 28 Apr 2023 14:03:21 +0200
Subject: [PATCH 20/26] refs #5540 arreglo en supplier

---
 modules/client/back/models/client.js     | 24 ++++++++++++------------
 modules/supplier/back/models/supplier.js | 21 ++-------------------
 2 files changed, 14 insertions(+), 31 deletions(-)

diff --git a/modules/client/back/models/client.js b/modules/client/back/models/client.js
index d3022af81..e04c4478f 100644
--- a/modules/client/back/models/client.js
+++ b/modules/client/back/models/client.js
@@ -24,18 +24,18 @@ module.exports = Self => {
         message: 'TIN must be unique'
     });
 
-    // async function fiInvalid(err, done) {
-    //     const filter = {
-    //         fields: ['code'],
-    //         where: {id: this.countryFk}
-    //     };
-    //     const countryCode = this.fi.toUpperCase().substring(0, 2);
-    //     const country = await Self.app.models.Country.findOne(filter);
-    //     const code = country ? country.code : null;
-    //     if (this.isVies && countryCode == code)
-    //         err();
-    //     done();
-    // }
+    async function fiInvalid(err, done) {
+        const filter = {
+            fields: ['code'],
+            where: {id: this.countryFk}
+        };
+        const countryCode = this.fi.toUpperCase().substring(0, 2);
+        const country = await Self.app.models.Country.findOne(filter);
+        const code = country ? country.code : null;
+        if (this.isVies && countryCode == code)
+            err();
+        done();
+    }
 
     Self.validatesFormatOf('email', {
         message: 'Invalid email',
diff --git a/modules/supplier/back/models/supplier.js b/modules/supplier/back/models/supplier.js
index 4014aac03..ae3eb4bcc 100644
--- a/modules/supplier/back/models/supplier.js
+++ b/modules/supplier/back/models/supplier.js
@@ -32,10 +32,6 @@ module.exports = Self => {
         message: 'TIN must be unique'
     });
 
-    Self.validateAsync('nif', nifInvalid, {
-        message: 'Invalid NIF for VIES'
-    });
-
     Self.validateAsync('nif', tinIsValid, {
         message: 'Invalid TIN'
     });
@@ -71,22 +67,9 @@ module.exports = Self => {
         };
         const country = await Self.app.models.Country.findOne(filter);
         const code = country ? country.code.toLowerCase() : null;
+        const countryCode = this.nif.toLowerCase().substring(0, 2);
 
-        if (!this.nif || !validateTin(this.nif, code))
-            err();
-        done();
-    }
-
-    Self.validateAsync('nif', nifInvalid);
-    async function nifInvalid(err, done) {
-        const filter = {
-            fields: ['code'],
-            where: {id: this.countryFk}
-        };
-        const countryCode = this.nif.toUpperCase().substring(0, 2);
-        const country = await Self.app.models.Country.findOne(filter);
-        const code = country ? country.code : null;
-        if (this.isVies && countryCode == code)
+        if (!this.nif || !validateTin(this.nif, code) || (this.isVies && countryCode == code))
             err();
         done();
     }

From 0e0db960afcd3aa0e921823387fb3acca986bdf1 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Fri, 28 Apr 2023 14:23:44 +0200
Subject: [PATCH 21/26] refs #5540 supplier

---
 loopback/util/validateNIF.js         | 14 ------------
 modules/client/back/models/client.js | 33 ++++++----------------------
 2 files changed, 7 insertions(+), 40 deletions(-)
 delete mode 100644 loopback/util/validateNIF.js

diff --git a/loopback/util/validateNIF.js b/loopback/util/validateNIF.js
deleted file mode 100644
index 041ca8876..000000000
--- a/loopback/util/validateNIF.js
+++ /dev/null
@@ -1,14 +0,0 @@
-const models = require('vn-loopback/server/server').models;
-module.exports = async function(fi, isVies, countryFk) {
-    const filter = {
-        fields: ['code'],
-        where: {id: countryFk}
-    };
-    const countryCode = fi.toUpperCase().substring(0, 2);
-    const country = await models.Country.findOne(filter);
-    const code = country ? country.code : null;
-    if (isVies && countryCode == code)
-        return false;
-    return true;
-};
-
diff --git a/modules/client/back/models/client.js b/modules/client/back/models/client.js
index e04c4478f..c95d0972f 100644
--- a/modules/client/back/models/client.js
+++ b/modules/client/back/models/client.js
@@ -4,7 +4,7 @@ const isMultiple = require('vn-loopback/util/hook').isMultiple;
 const validateTin = require('vn-loopback/util/validateTin');
 const validateIban = require('vn-loopback/util/validateIban');
 const LoopBackContext = require('loopback-context');
-const validateNIF = require('vn-loopback/util/validateNIF');
+const { ConsoleReporter } = require('jasmine');
 
 module.exports = Self => {
     // Methods
@@ -24,19 +24,6 @@ module.exports = Self => {
         message: 'TIN must be unique'
     });
 
-    async function fiInvalid(err, done) {
-        const filter = {
-            fields: ['code'],
-            where: {id: this.countryFk}
-        };
-        const countryCode = this.fi.toUpperCase().substring(0, 2);
-        const country = await Self.app.models.Country.findOne(filter);
-        const code = country ? country.code : null;
-        if (this.isVies && countryCode == code)
-            err();
-        done();
-    }
-
     Self.validatesFormatOf('email', {
         message: 'Invalid email',
         allowNull: true,
@@ -89,16 +76,6 @@ module.exports = Self => {
         done();
     }
 
-    Self.validateAsync('fi', validationNIF, {
-        message: 'El NIF es incorrecto por el Vies'
-    });
-
-    async function validationNIF(err, done){
-        if (!validateNIF(this.fi, this.isVies, this.countryFk))
-            err();
-        done();
-    }
-
     Self.validateAsync('fi', tinIsValid, {
         message: 'Invalid TIN'
     });
@@ -112,9 +89,13 @@ module.exports = Self => {
             where: {id: this.countryFk}
         };
         const country = await Self.app.models.Country.findOne(filter);
+        console.log(country);
         const code = country ? country.code.toLowerCase() : null;
-
-        if (!this.fi || !validateTin(this.fi, code))
+        console.log(code);
+        const countryCode = this.fi.toLowerCase().substring(0, 2);
+        console.log(countryCode);
+        
+        if (!this.fi || !validateTin(this.fi, code) || (this.isVies && countryCode == code))
             err();
         done();
     }

From fb59371d54e1e91485ec56062b3b3e6676a84b5c Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Fri, 28 Apr 2023 14:38:49 +0200
Subject: [PATCH 22/26] refs #5540 quit logs

---
 modules/client/back/models/client.js | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/modules/client/back/models/client.js b/modules/client/back/models/client.js
index c95d0972f..3ca6254e1 100644
--- a/modules/client/back/models/client.js
+++ b/modules/client/back/models/client.js
@@ -89,12 +89,9 @@ module.exports = Self => {
             where: {id: this.countryFk}
         };
         const country = await Self.app.models.Country.findOne(filter);
-        console.log(country);
         const code = country ? country.code.toLowerCase() : null;
-        console.log(code);
         const countryCode = this.fi.toLowerCase().substring(0, 2);
-        console.log(countryCode);
-        
+
         if (!this.fi || !validateTin(this.fi, code) || (this.isVies && countryCode == code))
             err();
         done();

From 8156c17c7df4ba373ae142e988181d5314bbde56 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Tue, 2 May 2023 10:00:47 +0200
Subject: [PATCH 23/26] refs #5540 del jasmine

---
 modules/client/back/models/client.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/modules/client/back/models/client.js b/modules/client/back/models/client.js
index 3ca6254e1..56adc8b03 100644
--- a/modules/client/back/models/client.js
+++ b/modules/client/back/models/client.js
@@ -4,7 +4,6 @@ const isMultiple = require('vn-loopback/util/hook').isMultiple;
 const validateTin = require('vn-loopback/util/validateTin');
 const validateIban = require('vn-loopback/util/validateIban');
 const LoopBackContext = require('loopback-context');
-const { ConsoleReporter } = require('jasmine');
 
 module.exports = Self => {
     // Methods
@@ -15,7 +14,7 @@ module.exports = Self => {
     Self.validatesPresenceOf('street', {
         message: 'Street cannot be empty'
     });
-
+    
     Self.validatesPresenceOf('city', {
         message: 'City cannot be empty'
     });

From ea73e7697dce24bffb2530606ff8c8624c0b6cc8 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Tue, 2 May 2023 11:27:25 +0200
Subject: [PATCH 24/26] solve

---
 e2e/paths/13-supplier/03_fiscal_data.spec.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/e2e/paths/13-supplier/03_fiscal_data.spec.js b/e2e/paths/13-supplier/03_fiscal_data.spec.js
index 31b3fafd2..170a8d05a 100644
--- a/e2e/paths/13-supplier/03_fiscal_data.spec.js
+++ b/e2e/paths/13-supplier/03_fiscal_data.spec.js
@@ -15,7 +15,7 @@ const $inputs = {
     sageTaxType: 'vn-supplier-fiscal-data [ng-model="$ctrl.supplier.sageTaxTypeFk"]'
 };
 
-fdescribe('Supplier fiscal data path', () => {
+describe('Supplier fiscal data path', () => {
     let browser;
     let page;
 

From a5c11a0154d5a5045cf0765a760b07c52d91d2e2 Mon Sep 17 00:00:00 2001
From: Juan Ferrer Toribio <juan@verdnatura.es>
Date: Tue, 2 May 2023 17:17:16 +0200
Subject: [PATCH 25/26] refs #5517 Hide worker image on error

---
 front/salix/components/log/index.html | 15 +++++++--------
 front/salix/components/log/index.js   |  4 ++--
 front/salix/components/log/style.scss | 19 +++++++++++--------
 3 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/front/salix/components/log/index.html b/front/salix/components/log/index.html
index b1e5ace12..a51e07cb3 100644
--- a/front/salix/components/log/index.html
+++ b/front/salix/components/log/index.html
@@ -19,19 +19,18 @@
         <div class="user-wrapper">
             <div
                 class="user vn-mt-xs"
+                ng-class="::{system: !log.user}"
+                ng-style="::$ctrl.userBgColor(log.user)"
                 title="{{::log.user.nickname || 'System'}}">
+                <div class="user-letter">
+                    {{::log.user ? log.user.name.charAt(0).toUpperCase() : 'S'}}
+                </div>
                 <img
                     ng-if="::log.user.worker"
                     src="/api/Images/user/160x160/{{::log.user.worker.id}}/download?access_token={{::$ctrl.vnToken.token}}"
-                    ng-click="$ctrl.showWorkerDescriptor($event, log.user.worker.id)">
+                    ng-click="$ctrl.showWorkerDescriptor($event, log.user.worker.id)"
+                    onload="this.style.display = 'block'">
                 </img>
-                <div
-                    ng-if="::!log.user.worker"
-                    ng-class="::{system: !log.user}"
-                    ng-style="::$ctrl.userBgColor(log.user)"
-                    class="user-icon">
-                    {{::log.user ? log.user.name.charAt(0).toUpperCase() : 'S'}}
-                </div>
             </div>
             <div class="arrow bg-panel"></div>
             <div class="line"></div>
diff --git a/front/salix/components/log/index.js b/front/salix/components/log/index.js
index 19bf5b597..b3a27ca5e 100644
--- a/front/salix/components/log/index.js
+++ b/front/salix/components/log/index.js
@@ -23,7 +23,7 @@ export default class Controller extends Section {
             include: [{
                 relation: 'user',
                 scope: {
-                    fields: ['nickname'],
+                    fields: ['nickname', 'name'],
                     include: {
                         relation: 'worker',
                         scope: {
@@ -229,7 +229,7 @@ const colors = [
     'DC143C', // Red crimson
     '5681cf', // Blue steel
     'FF1493', // Ping intense
-    '00d700', // Green lime
+    '02ba02', // Green lime
     '1E90FF', // Blue sky
     '8B008B', // Purple dark
     'cc7000', // Orange bright
diff --git a/front/salix/components/log/style.scss b/front/salix/components/log/style.scss
index 34c432083..4bf6ca1a2 100644
--- a/front/salix/components/log/style.scss
+++ b/front/salix/components/log/style.scss
@@ -9,6 +9,7 @@ vn-log {
             padding-right: 10px;
 
             & > .user {
+                position: relative;
                 border-radius: 50%;
                 height: 36px;
                 width: 36px;
@@ -21,19 +22,21 @@ vn-log {
                     width: 100%;
                     height: 100%;
                 }
-                img {
-                    display: block;
-                    cursor: pointer;
+                &.system {
+                    background-color: $color-main;
                 }
-                .user-icon {
+                .user-letter {
                     font-size: 22px;
                     display: flex;
                     align-items: center;
                     justify-content: center;
-
-                    &.system {
-                        background-color: $color-main;
-                    }
+                }
+                img {
+                    display: none;
+                    cursor: pointer;
+                    position: absolute;
+                    top: 0;
+                    left: 0;
                 }
             }
             & > .arrow {

From a029071c4ecddd9d1970874352d009ca87bfbd46 Mon Sep 17 00:00:00 2001
From: Juan Ferrer Toribio <juan@verdnatura.es>
Date: Tue, 2 May 2023 20:47:56 +0200
Subject: [PATCH 26/26] refs #5517 User image fixes

---
 front/salix/components/log/index.html | 13 +++----------
 front/salix/components/log/index.js   | 12 ++++++------
 front/salix/components/log/style.scss |  1 -
 3 files changed, 9 insertions(+), 17 deletions(-)

diff --git a/front/salix/components/log/index.html b/front/salix/components/log/index.html
index a51e07cb3..00ab23cc9 100644
--- a/front/salix/components/log/index.html
+++ b/front/salix/components/log/index.html
@@ -26,10 +26,9 @@
                     {{::log.user ? log.user.name.charAt(0).toUpperCase() : 'S'}}
                 </div>
                 <img
-                    ng-if="::log.user.worker"
-                    src="/api/Images/user/160x160/{{::log.user.worker.id}}/download?access_token={{::$ctrl.vnToken.token}}"
-                    ng-click="$ctrl.showWorkerDescriptor($event, log.user.worker.id)"
-                    onload="this.style.display = 'block'">
+                    ng-if="::log.user.image"
+                    ng-src="/api/Images/user/160x160/{{::log.userFk}}/download?access_token={{::$ctrl.vnToken.token}}"
+                    ng-click="$ctrl.showWorkerDescriptor($event, log)">
                 </img>
             </div>
             <div class="arrow bg-panel"></div>
@@ -115,12 +114,6 @@
     <form vn-vertical
         ng-model-options="{updateOn: 'change blur'}"
         class="vn-pa-md filter">
-        <h6
-            class="text-secondary vn-mb-md"
-            style="font-weight: normal;"
-            translate>
-            Filter
-        </h6>
         <vn-textfield
             label="Name"
             ng-model="filter.changedModelValue">
diff --git a/front/salix/components/log/index.js b/front/salix/components/log/index.js
index b3a27ca5e..46c6cd0f4 100644
--- a/front/salix/components/log/index.js
+++ b/front/salix/components/log/index.js
@@ -23,7 +23,7 @@ export default class Controller extends Section {
             include: [{
                 relation: 'user',
                 scope: {
-                    fields: ['nickname', 'name'],
+                    fields: ['nickname', 'name', 'image'],
                     include: {
                         relation: 'worker',
                         scope: {
@@ -120,11 +120,6 @@ export default class Controller extends Section {
         return this.dateFilter(date, `${format} HH:mm`);
     }
 
-    showWorkerDescriptor(event, workerId) {
-        if (!workerId) return;
-        this.$.workerDescriptor.show(event.target, workerId);
-    }
-
     resetFilter() {
         this.$.filter = {who: 'all'};
     }
@@ -201,6 +196,11 @@ export default class Controller extends Section {
             backgroundColor: '#'+ colors[hash % colors.length]
         };
     }
+
+    showWorkerDescriptor(event, log) {
+        if (log.user?.worker)
+            this.$.workerDescriptor.show(event.target, log.userFk);
+    }
 }
 
 ngModule.vnComponent('vnLog', {
diff --git a/front/salix/components/log/style.scss b/front/salix/components/log/style.scss
index 4bf6ca1a2..ca0c9473c 100644
--- a/front/salix/components/log/style.scss
+++ b/front/salix/components/log/style.scss
@@ -32,7 +32,6 @@ vn-log {
                     justify-content: center;
                 }
                 img {
-                    display: none;
                     cursor: pointer;
                     position: absolute;
                     top: 0;