Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5472-user_passExpired

db/changes/231601/00-kkearEntryNotes.sql

@@ -0,0 +1 @@
+ALTER TABLE `vn`.`entry` DROP COLUMN `notes`;

db/changes/231601/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);

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);

db/dump/fixtures.sql

@@ -1409,16 +1409,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, '',    ''),
+        (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'),
+        (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, 'this is the note three',  'observation three'),
+        (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, 'this is the note four',   'observation four'),
+        (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, 'this is the note five',   'observation five'),
+        (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, 'this is the note six',    'observation six'),
+        (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, 'this is the note seven',  'observation seven'),
+        (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, '',  '');
+        (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

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');
 

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;
 

front/salix/components/log/index.html

@@ -19,19 +19,17 @@
         <div class="user-wrapper">
             <div
                 class="user vn-mt-xs"
-                title="{{::log.user.nickname || 'System'}}">
-                <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)">
-                </img>
-                <div
-                    ng-if="::!log.user.worker"
                 ng-class="::{system: !log.user}"
                 ng-style="::$ctrl.userBgColor(log.user)"
-                    class="user-icon">
+                title="{{::log.user.nickname || 'System'}}">
+                <div class="user-letter">
                     {{::log.user ? log.user.name.charAt(0).toUpperCase() : 'S'}}
                 </div>
+                <img
+                    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>
             <div class="line"></div>
@@ -116,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">

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', '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', {
@@ -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

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,20 @@ vn-log {
                     width: 100%;
                     height: 100%;
                 }
-                img {
+                &.system {
-                    display: block;
+                    background-color: $color-main;
-                    cursor: pointer;
                 }
-                .user-icon {
+                .user-letter {
                     font-size: 22px;
                     display: flex;
                     align-items: center;
                     justify-content: center;
-
-                    &.system {
-                        background-color: $color-main;
                 }
+                img {
+                    cursor: pointer;
+                    position: absolute;
+                    top: 0;
+                    left: 0;
                 }
             }
             & > .arrow {

loopback/locale/es.json

@@ -289,5 +289,6 @@
 	"isTaxDataChecked": "Datos comprobados",
 	"comercialId": "Id comercial",
 	"comercialName": "Comercial",
-	"Pass expired": "La contraseña ha caducado, cambiela desde Salix"
+	"Pass expired": "La contraseña ha caducado, cambiela desde Salix",
+	"Invalid NIF for VIES": "NIF invalido para VIES"
 }

modules/client/back/models/client.js

@@ -89,8 +89,9 @@ module.exports = Self => {
         };
         const country = await Self.app.models.Country.findOne(filter);
         const code = country ? country.code.toLowerCase() : null;
+        const countryCode = this.fi.toLowerCase().substring(0, 2);
 
-        if (!this.fi || !validateTin(this.fi, code))
+        if (!this.fi || !validateTin(this.fi, code) || (this.isVies && countryCode == code))
             err();
         done();
     }

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>

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

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,

modules/entry/back/models/entry.json

@@ -27,9 +27,6 @@
         "isExcludedFromAvailable": {
             "type": "boolean"
         },
-        "notes": {
-            "type": "string"
-        },
         "isConfirmed": {
             "type": "boolean"
         },

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

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

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">

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);

modules/supplier/back/models/supplier.js

@@ -67,8 +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))
+        if (!this.nif || !validateTin(this.nif, code) || (this.isVies && countryCode == code))
             err();
         done();
     }

modules/supplier/front/fiscal-data/index.html

@@ -54,7 +54,8 @@
                 name="taxNumber"
                 ng-model="$ctrl.supplier.nif"
                 required="true"
-                rule>
+                rule
+                >
             </vn-textfield>
         </vn-horizontal>
         <vn-horizontal>
@@ -210,7 +211,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>

modules/supplier/front/fiscal-data/locale/es.yml

@@ -4,3 +4,5 @@ Sage withholding: Retención Sage
 Supplier activity: Actividad proveedor
 Healt register: Pasaporte sanitario
 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

modules/supplier/front/locale/es.yml

@@ -1 +1,2 @@
 Accounts: Cuentas
+Invalid NIF for VIES: NIF no valido por VIES

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

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))

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}}"

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
                 );
 

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>

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