Merge branch 'dev' into 7731-clientViesCode

back/methods/osticket/sendToSupport.js

@@ -33,52 +33,25 @@ module.exports = Self => {
         const emailUser =
             await Self.app.models.EmailUser.findById(userId, {fields: ['email']});
 
-        const tableStyle = 'width:100%; border-collapse: collapse; text-align: left;';
+        let html = `<h2>Motivo: ${reason}</h2>`;
-        const thStyle = 'padding: 8px; border: 1px solid #ddd; background-color: #f4f4f4;';
+        html += `<h3>Usuario: ${userId} ${emailUser.email}</h3>`;
-        const tdStyle = 'padding: 8px; border: 1px solid #ddd;';
+        html += `<h3>Additional Data:</h3>`;
-        const tdBoldStyle = 'padding: 8px; border: 1px solid #ddd; font-weight: bold;';
+        html += '<ul>';
-        const subTdStyle = 'padding: 6px; border: 1px solid #ddd;';
-        const subTdBoldStyle = 'padding: 6px; border: 1px solid #ddd; font-weight: bold;';
-
-        let html = `
-        <h2>Motivo: ${reason}</h2>
-        <h3>Usuario: ${userId} ${emailUser.email}</h3>
-        <h3>Additional Data:</h3>
-        <table style="${tableStyle}">
-            <thead>
-                <tr>
-                <th style="${thStyle}">Clave</th><th style="${thStyle}">Valor</th></tr>
-            </thead>
-            <tbody>`;
         for (const [key, val] of Object.entries(additionalData)) {
-            if (key !== 'config') {
+            if (key !== 'config') html += `<li>${key}: ${parse(val)}</li>`;
-                html += `<tr>
+            else {
-                            <td style="${tdBoldStyle}">${key}</td>
+                html += `<li>${key}:</li><ul style="list-style-type: square;">`;
-                            <td style="${tdStyle}">${parse(val)}</td>
+                for (const [confKey, confVal] of Object.entries(val))
-                        </tr>`;
+                    html += `<li>${confKey}: ${parse(confVal)}</li>`;
-            } else {
+                html += '</ul>';
-                html += `<tr>
-                            <td style="${tdBoldStyle}">${key}</td>
-                            <td style="${tdStyle}">
-                                <table style="${tableStyle}">
-                <tbody>`;
-                for (const [confKey, confVal] of Object.entries(val)) {
-                    html += `<tr>
-                                <td style="${subTdBoldStyle}">${confKey}</td>
-                                <td style="${subTdStyle}">${parse(confVal)}</td>
-                            </tr>`;
-                }
-                html += `</tbody></table></td></tr>`;
             }
         }
-        html += `</tbody></table>`;
+        html += '</ul>';
 
         const {message, path, name} = additionalData;
-        const err = name && message ? `${name}: ${message}` : name || message || '';
-
         await smtp.send({
             to: `${config.app.reportEmail}, ${emailUser.email}`,
-            subject: `[Support-Salix] ${path.split('?')[0]} ${err}`,
+            subject: `[Support-Salix] ${path} ${name}: ${message}`,
             html
         });
     };

back/models/vn-user.json

@@ -54,8 +54,7 @@
             "type": "string"
         },
         "hasGrant": {
-            "type": "boolean",
+            "type": "boolean"
-            "default": false
         },
         "passExpired": {
             "type": "date"
@@ -169,7 +168,6 @@
                 "emailVerified",
                 "twoFactor"
             ]
-
         }
     }
 }

db/dump/fixtures.after.sql

@@ -77,8 +77,8 @@ INSERT INTO `vn`.`agency` (`name`, `warehouseFk`, `isOwn`, `isAnyVolumeAllowed`)
     ('Otra agencia ', '1', '0', '0');
 
 INSERT INTO `vn`.`expedition` (`agencyModeFk`, `ticketFk`, `isBox`, `counter`, `workerFk`, `externalId`, `packagingFk`, `hostFk`, `itemPackingTypeFk`, `hasNewRoute`) VALUES
-    ('1', '1', 1, '1', '1', '1', '1', 'pc1', 'F', 0),
+    ('1', '1', 1, '1', '1', '1', '1', 'pc00', 'F', 0),
-    ('1', '1', 1, '2', '1', '1', '1', 'pc1', 'F', 0);
+    ('1', '1', 1, '2', '1', '1', '1', 'pc00', 'F', 0);
 
 INSERT INTO vn.client (id,name,defaultAddressFk,street,fi,email,dueDay,isTaxDataChecked,accountingAccount,city,provinceFk,postcode,socialName,contact,credit,countryFk,quality,riskCalculated) VALUES
     (100,'root',110,'Valle de la muerte','74974747G','root@mydomain.com',0,1,'4300000078','ALGEMESI',1,'46680','rootSocial','rootContact',500.0,1,10,'2025-01-01');

db/dump/fixtures.before.sql

@@ -214,15 +214,15 @@ INSERT INTO `vn`.`worker`(`id`, `code`, `firstName`, `lastName`,`bossFk`, `phone
         (1109, 'HLK', 'Bruce'        , 'Banner', 19, 432978109),
         (1110, 'JJJ', 'Jessica'      , 'Jones' , 19, 432978110);
 
-INSERT INTO `vn`.`parking` (`id`, `sectorFk`, `code`, `pickingOrder`)
+INSERT INTO `vn`.`parking` (`id`, `column`, `row`, `sectorFk`, `code`, `pickingOrder`)
     VALUES
-		('1',   1, '700-01', 70001),
+        ('1',   700, '01', 1, '700-01', 70001),
-		('2',   2, '700-02', 70002),
+        ('2',   700, '02', 2, '700-02', 70002),
-		('3',   1, '100-01', 1),
+        ('3',   100, '01', 1, '100-01', 1),
-		(32397, 1, 'A-47-1',   1165),
+        (32397, 100, '02', 1, 'A-47-1',   1165),
-		(34831, 1, 'K-26-2',   20220),
+        (34831, 200, '01', 1, 'K-26-2',   20220),
-		(34965, 2, 'L-08-4',   21800),
+        (34965, 200, '02', 2, 'L-08-4',   21800),
-		(39096, 2, 'LR-02-3',  99999);
+        (39096, 200, '03', 2, 'LR-02-3',  99999);
 
 INSERT INTO `vn`.`shelving` (`code`, `parkingFk`, `isPrinted`, `priority`, `userFk`, `isRecyclable`)
     VALUES
@@ -393,20 +393,20 @@ INSERT INTO `vn`.`contactChannel`(`id`, `name`)
         (4, 'GCN Channel'),
         (5, 'The Newspaper');
 
-INSERT INTO `vn`.`client`(`id`,`name`,`fi`,`socialName`,`contact`,`street`,`city`,`postcode`,`phone`,`mobile`,`isRelevant`,`email`,`iban`,`dueDay`,`accountingAccount`,`isEqualizated`,`provinceFk`,`hasToInvoice`,`credit`,`countryFk`,`isActive`,`quality`,`payMethodFk`,`created`,`isToBeMailed`,`contactChannelFk`,`hasSepaVnl`,`hasCoreVnl`,`hasCoreVnh`,`riskCalculated`, `hasToInvoiceByAddress`,`isTaxDataChecked`,`isFreezed`,`creditInsurance`,`isCreatedAsServed`,`hasInvoiceSimplified`,`salesPersonFk`,`isVies`,`businessTypeFk`,`typeFk`)
+INSERT INTO `vn`.`client`(`id`,`name`,`fi`,`socialName`,`contact`,`street`,`city`,`postcode`,`phone`,`mobile`,`isRelevant`,`email`,`iban`,`dueDay`,`accountingAccount`,`isEqualizated`,`provinceFk`,`hasToInvoice`,`credit`,`countryFk`,`isActive`,`quality`,`payMethodFk`,`created`,`isToBeMailed`,`contactChannelFk`,`hasSepaVnl`,`hasCoreVnl`,`hasCoreVnh`,`riskCalculated`, `hasToInvoiceByAddress`,`isTaxDataChecked`,`isFreezed`,`creditInsurance`,`isCreatedAsServed`,`hasInvoiceSimplified`,`salesPersonFk`,`viesCode`,`businessTypeFk`,`typeFk`)
     VALUES
-		(1101,     'Bruce Wayne',        '84612325V',  'BATMAN',         'Alfred',           '1007 MOUNTAIN DRIVE, GOTHAM',                  'Gotham', 46460, 1111111111, 222222222, 1, 'BruceWayne@mydomain.com',            NULL, 0, 1234567890, 0, 1, 1, 300,  1,  1, 10, 5,    util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, 1, 0, NULL, 0, 0, 18,   0, 'florist','normal'),
+        (1101,     'Bruce Wayne',        '84612325V',  'BATMAN',         'Alfred',           '1007 MOUNTAIN DRIVE, GOTHAM',                  'Gotham', 46460, 1111111111, 222222222, 1, 'BruceWayne@mydomain.com',            NULL, 0, 1234567890, 0, 1, 1, 300,  1,  1, 10, 5,    util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, 1, 0, NULL, 0, 0, 18,     NULL, 'florist','normal'),
-		(1102,     'Petter Parker',      '87945234L',  'SPIDER MAN',     'Aunt May',         '20 INGRAM STREET, QUEENS, USA',                'Gotham', 46460, 1111111111, 222222222, 1, 'PetterParker@mydomain.com',          NULL, 0, 1234567890, 0, 2, 1, 300,  1,  1, 10, 5,    util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, 1, 0, NULL, 0, 0, 18,   0, 'florist','normal'),
+        (1102,     'Petter Parker',      '87945234L',  'SPIDER MAN',     'Aunt May',         '20 INGRAM STREET, QUEENS, USA',                'Gotham', 46460, 1111111111, 222222222, 1, 'PetterParker@mydomain.com',          NULL, 0, 1234567890, 0, 2, 1, 300,  1,  1, 10, 5,    util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, 1, 0, NULL, 0, 0, 18,     NULL, 'florist','normal'),
-		(1103,     'Clark Kent',         '06815934E',  'SUPER MAN',      'lois lane',        '344 CLINTON STREET, APARTAMENT 3-D',           'Gotham', 46460, 1111111111, 222222222, 1, 'ClarkKent@mydomain.com',             NULL, 0, 1234567890, 0, 3, 1, 0,    19, 1, 10, 5,    util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, 1, 0, NULL, 0, 0, 18,   0, 'florist','normal'),
+        (1103,     'Clark Kent',         '06815934E',  'SUPER MAN',      'lois lane',        '344 CLINTON STREET, APARTAMENT 3-D',           'Gotham', 46460, 1111111111, 222222222, 1, 'ClarkKent@mydomain.com',             NULL, 0, 1234567890, 0, 3, 1, 0,    19, 1, 10, 5,    util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, 1, 0, NULL, 0, 0, 18,     NULL, 'florist','normal'),
-		(1104,     'Tony Stark',         '06089160W',  'IRON MAN',       'Pepper Potts',     '10880 MALIBU POINT, 90265',                    'Gotham', 46460, 1111111111, 222222222, 1, 'TonyStark@mydomain.com',             NULL, 0, 1234567890, 0, 2, 1, 300,  1,  1, 10, 5,    util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, 1, 0, NULL, 0, 0, 18,   0, 'florist','normal'),
+        (1104,     'Tony Stark',         '06089160W',  'IRON MAN',       'Pepper Potts',     '10880 MALIBU POINT, 90265',                    'Gotham', 46460, 1111111111, 222222222, 1, 'TonyStark@mydomain.com',             NULL, 0, 1234567890, 0, 2, 1, 300,  1,  1, 10, 5,    util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, 1, 0, NULL, 0, 0, 18,     NULL, 'florist','normal'),
-		(1105,     'Max Eisenhardt',     '251628698',  'MAGNETO',        'Rogue',            'UNKNOWN WHEREABOUTS',                          'Gotham', 46460, 1111111111, 222222222, 1, 'MaxEisenhardt@mydomain.com',         NULL, 0, 1234567890, 0, 3, 1, 300,  8,  1, 10, 5,    util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, 1, 1, NULL, 0, 0, 18,   0, 'florist','normal'),
+        (1105,     'Max Eisenhardt',     '251628698',  'MAGNETO',        'Rogue',            'UNKNOWN WHEREABOUTS',                          'Gotham', 46460, 1111111111, 222222222, 1, 'MaxEisenhardt@mydomain.com',         NULL, 0, 1234567890, 0, 3, 1, 300,  8,  1, 10, 5,    util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, 1, 1, NULL, 0, 0, 18,     NULL, 'florist','normal'),
-		(1106,     'DavidCharlesHaller', '53136686Q',  'LEGION',         'Charles Xavier',   'CITY OF NEW YORK, NEW YORK, USA',              'Gotham', 46460, 1111111111, 222222222, 1, 'DavidCharlesHaller@mydomain.com',    NULL, 0, 1234567890, 0, 1, 1, 300,  1,  0, 10, 5,    util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, 1, 0, NULL, 0, 0, 19,   0, 'florist','normal'),
+        (1106,     'DavidCharlesHaller', '53136686Q',  'LEGION',         'Charles Xavier',   'CITY OF NEW YORK, NEW YORK, USA',              'Gotham', 46460, 1111111111, 222222222, 1, 'DavidCharlesHaller@mydomain.com',    NULL, 0, 1234567890, 0, 1, 1, 300,  1,  0, 10, 5,    util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, 1, 0, NULL, 0, 0, 19,     NULL, 'florist','normal'),
-		(1107,     'Hank Pym',           '09854837G',  'ANT MAN',        'Hawk',             'ANTHILL, SAN FRANCISCO, CALIFORNIA',           'Gotham', 46460, 1111111111, 222222222, 1, 'HankPym@mydomain.com',               NULL, 0, 1234567890, 0, 1, 1, 300,  1,  1, 10, 5,    util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, 0, 0, NULL, 0, 0, 19,   0, 'florist','normal'),
+        (1107,     'Hank Pym',           '09854837G',  'ANT MAN',        'Hawk',             'ANTHILL, SAN FRANCISCO, CALIFORNIA',           'Gotham', 46460, 1111111111, 222222222, 1, 'HankPym@mydomain.com',               NULL, 0, 1234567890, 0, 1, 1, 300,  1,  1, 10, 5,    util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, 0, 0, NULL, 0, 0, 19,     NULL, 'florist','normal'),
-		(1108,     'Charles Xavier',     '22641921P',  'PROFESSOR X',    'Beast',            '3800 VICTORY PKWY, CINCINNATI, OH 45207, USA', 'Gotham', 46460, 1111111111, 222222222, 1, 'CharlesXavier@mydomain.com',         NULL, 0, 1234567890, 0, 5, 1, 300,  13, 1, 10, 5,    util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, 1, 1, NULL, 0, 0, 19,   0, 'florist','normal'),
+        (1108,     'Charles Xavier',     '22641921P',  'PROFESSOR X',    'Beast',            '3800 VICTORY PKWY, CINCINNATI, OH 45207, USA', 'Gotham', 46460, 1111111111, 222222222, 1, 'CharlesXavier@mydomain.com',         NULL, 0, 1234567890, 0, 5, 1, 300,  13, 1, 10, 5,    util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, 1, 1, NULL, 0, 0, 19,     NULL, 'florist','normal'),
-		(1109,     'Bruce Banner',       '16104829E',  'HULK',           'Black widow',      'SOMEWHERE IN NEW YORK',                        'Gotham', 46460, 1111111111, 222222222, 1, 'BruceBanner@mydomain.com',           NULL, 0, 1234567890, 0, 1, 1, 300,  1,  1, 10, 5,    util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, 0, 0, NULL, 0, 0, 9,    0, 'florist','normal'),
+        (1109,     'Bruce Banner',       '16104829E',  'HULK',           'Black widow',      'SOMEWHERE IN NEW YORK',                        'Gotham', 46460, 1111111111, 222222222, 1, 'BruceBanner@mydomain.com',           NULL, 0, 1234567890, 0, 1, 1, 300,  1,  1, 10, 5,    util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, 0, 0, NULL, 0, 0, 9,      NULL, 'florist','normal'),
-		(1110,     'Jessica Jones',      '58282869H',  'JESSICA JONES',  'Luke Cage',        'NYCC 2015 POSTER',                             'Gotham', 46460, 1111111111, 222222222, 1, 'JessicaJones@mydomain.com',          NULL, 0, 1234567890, 0, 1, 1, 300,  1,  1, 10, 5,    util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, 1, 0, NULL, 0, 0, NULL, 1, 'florist','normal'),
+        (1110,     'Jessica Jones',      '58282869H',  'JESSICA JONES',  'Luke Cage',        'NYCC 2015 POSTER',                             'Gotham', 46460, 1111111111, 222222222, 1, 'JessicaJones@mydomain.com',          NULL, 0, 1234567890, 0, 1, 1, 300,  1,  1, 10, 5,    util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, 1, 0, NULL, 0, 0, NULL,   'ES', 'florist','normal'),
-		(1111,     'Missing',            NULL,         'MISSING MAN',    'Anton',            'THE SPACE, UNIVERSE FAR AWAY',                 'Gotham', 46460, 1111111111, 222222222, 0, NULL,                                 NULL, 0, 1234567890, 0, 1, 1, 300,  1,  1, 10, 5,    util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 0, 1, 0, NULL, 1, 0, NULL, 0, 'others','loses'),
+        (1111,     'Missing',            NULL,         'MISSING MAN',    'Anton',            'THE SPACE, UNIVERSE FAR AWAY',                 'Gotham', 46460, 1111111111, 222222222, 1, NULL,                                 NULL, 0, 1234567890, 0, 1, 1, 300,  1,  1, 10, 5,    util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 0, 1, 0, NULL, 1, 0, NULL,   NULL, 'others','loses'),
-		(1112,     'Trash',              NULL,         'GARBAGE MAN',    'Unknown name',     'NEW YORK CITY, UNDERGROUND',                   'Gotham', 46460, 1111111111, 222222222, 0, NULL,                                 NULL, 0, 1234567890, 0, 1, 1, 300,  1,  1, 10, 5,    util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 0, 1, 0, NULL, 1, 0, NULL, 0, 'others','loses');
+        (1112,     'Trash',              NULL,         'GARBAGE MAN',    'Unknown name',     'NEW YORK CITY, UNDERGROUND',                   'Gotham', 46460, 1111111111, 222222222, 1, NULL,                                 NULL, 0, 1234567890, 0, 1, 1, 300,  1,  1, 10, 5,    util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 0, 1, 0, NULL, 1, 0, NULL,   NULL, 'others','loses');
 
 INSERT INTO `vn`.`client`(`id`, `name`, `fi`, `socialName`, `contact`, `street`, `city`, `postcode`, `isRelevant`, `email`, `iban`,`dueDay`,`accountingAccount`, `isEqualizated`, `provinceFk`, `hasToInvoice`, `credit`, `countryFk`, `isActive`, `quality`, `payMethodFk`,`created`, `isTaxDataChecked`)
     SELECT id, name, CONCAT(RPAD(CONCAT(id,9),8,id),'A'), UPPER(CONCAT(name, 'Social')), CONCAT(name, 'Contact'), UPPER(CONCAT(name, 'Street')), 'GOTHAM', 46460, 0, CONCAT(name,'@mydomain.com'), NULL, 0, 1234567890, 0, 1, 1, 300, 1, 1, 10, 5, util.VN_CURDATE(), 1
@@ -587,16 +587,16 @@ INSERT INTO `vn`.`supplierActivity`(`code`, `name`)
         ('flowerPlants',  'Wholesale of flowers and plants'),
         ('vegetablesFruits', 'Fruit and vegetable trade');
 
-INSERT INTO `vn`.`supplier`(`id`, `name`, `nickname`,`account`,`countryFk`,`nif`, `commission`, `created`, `isActive`, `street`, `city`, `provinceFk`, `postCode`, `payMethodFk`, `payDemFk`, `payDay`, `taxTypeSageFk`, `withholdingSageFk`, `transactionTypeSageFk`, `workerFk`, `supplierActivityFk`, `isPayMethodChecked`, `healthRegister`)
+INSERT INTO `vn`.`supplier`(`id`, `name`, `nickname`,`account`,`countryFk`,`nif`, `commission`, `created`, `isActive`, `street`, `city`, `provinceFk`, `postCode`, `payMethodFk`, `payDemFk`, `payDay`, `taxTypeSageFk`, `withholdingSageFk`, `transactionTypeSageFk`, `workerFk`, `supplierActivityFk`, `isPayMethodChecked`, `healthRegister`, `viesCode`)
     VALUES
-		(1,     'PLANTS SL',             'Plants nick',      4100000001, 1, '06089160W', 0, util.VN_CURDATE(), 1, 'supplier address 1', 'GOTHAM',    1, 46000, 1, 1, 15, 4,  1, 1, 18, 'flowerPlants',  1, '400664487V'),
+        (1,     'PLANTS SL',             'Plants nick',      4100000001, 1, '06089160W', 0, util.VN_CURDATE(), 1, 'supplier address 1', 'GOTHAM',    1, 46000, 1, 1, 15, 4,  1, 1, 18, 'flowerPlants',  1, '400664487V','ES'),
-		(2,     'FARMER KING',              'The farmer',       4000020002, 1, '87945234L', 0, util.VN_CURDATE(), 1, 'supplier address 2', 'GOTHAM',        2, 46000, 1, 2, 10, 93, 2, 8, 18, 'animals',       1, '400664487V'),
+        (2,     'FARMER KING',              'The farmer',       4000020002, 1, '87945234L', 0, util.VN_CURDATE(), 1, 'supplier address 2', 'GOTHAM',        2, 46000, 1, 2, 10, 93, 2, 8, 18, 'animals',       1, '400664487V',NULL),
-		(4,     'INVENTARIO',               'INVENTARIO',       4000000004, NULL, NULL,     0, util.VN_CURDATE(), 1,  NULL,                 NULL,           NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL, NULL, NULL),
+        (4,     'INVENTARIO',               'INVENTARIO',       4000000004, NULL, NULL,     0, util.VN_CURDATE(), 1,  NULL,                 NULL,           NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL, NULL, NULL,NULL),
-		(69,    'PACKAGING',                'Packaging nick',   4100000069, 1, '94935005K', 0, util.VN_CURDATE(), 1, 'supplier address 5', 'ASGARD',        3, 46600, 1, 1, 15, 4,  1, 1, 18, 'flowerPlants',  1, '400664487V'),
+        (69,    'PACKAGING',                'Packaging nick',   4100000069, 1, '94935005K', 0, util.VN_CURDATE(), 1, 'supplier address 5', 'ASGARD',        3, 46600, 1, 1, 15, 4,  1, 1, 18, 'flowerPlants',  1, '400664487V', NULL),
-		(442,   'VERDNATURA LEVANTE SL',    'Verdnatura',       5115000442, 1, '06815934E', 0, util.VN_CURDATE(), 1, 'supplier address 3', 'GOTHAM',        1, 46000, 1, 2, 15, 6,  9, 3, 18, 'complements',   1, '400664487V'),
+        (442,   'VERDNATURA LEVANTE SL',    'Verdnatura',       5115000442, 1, '06815934E', 0, util.VN_CURDATE(), 1, 'supplier address 3', 'GOTHAM',        1, 46000, 1, 2, 15, 6,  9, 3, 18, 'complements',   1, '400664487V', NULL),
-		(567,   'HOLLAND',                  'Holland nick',     4000020567, 1, '14364089Z', 0, util.VN_CURDATE(), 1, 'supplier address 6', 'ASGARD',        3, 46600, 1, 2, 10, 93, 2, 8, 18, 'animals',       1, '400664487V'),
+        (567,   'HOLLAND',                  'Holland nick',     4000020567, 1, '14364089Z', 0, util.VN_CURDATE(), 1, 'supplier address 6', 'ASGARD',        3, 46600, 1, 2, 10, 93, 2, 8, 18, 'animals',       1, '400664487V', NULL),
-		(791,   'BROS SL',                  'Bros nick',        5115000791, 1, '37718083S', 0, util.VN_CURDATE(), 1, 'supplier address 7', 'ASGARD',        3, 46600, 1, 2, 15, 6,  9, 3, 18, 'complements',   1, '400664487V'),
+        (791,   'BROS SL',                  'Bros nick',        5115000791, 1, '37718083S', 0, util.VN_CURDATE(), 1, 'supplier address 7', 'ASGARD',        3, 46600, 1, 2, 15, 6,  9, 3, 18, 'complements',   1, '400664487V', NULL),
-		(1381,  'ORNAMENTALES',             'Ornamentales',     7185001381, 1, '07972486L', 0, util.VN_CURDATE(), 1, 'supplier address 4', 'GOTHAM',        1, 46000, 1, 2, 15, 6,  9, 3, 18, 'complements',   1, '400664487V');
+        (1381,  'ORNAMENTALES',             'Ornamentales',     7185001381, 1, '07972486L', 0, util.VN_CURDATE(), 1, 'supplier address 4', 'GOTHAM',        1, 46000, 1, 2, 15, 6,  9, 3, 18, 'complements',   1, '400664487V', NULL);
 
 INSERT INTO `vn`.`supplierAddress`(`id`, `supplierFk`, `nickname`, `street`, `provinceFk`, `postalCode`, `city`, `phone`, `mobile`)
     VALUES
@@ -798,8 +798,7 @@ INSERT INTO `vn`.`ticket`(`id`, `priority`, `agencyModeFk`,`warehouseFk`,`routeF
         (34, 1,     1, 1,  3,       util.VN_CURDATE(),                              util.VN_CURDATE(),                                                        1103, 'BEJAR',                                         123, NULL,     0, 1,     16, 0, util.VN_CURDATE(),                                   NULL,      NULL,                            NULL,          NULL),
         (35, 1,     1, 1,  3,       util.VN_CURDATE(),                              util.VN_CURDATE(),                                                        1102, 'Somewhere in Philippines',                      123, NULL,     0, 1,     16, 0, util.VN_CURDATE(),                                   NULL,      NULL,                            NULL,          NULL),
         (36, 1,     1, 1,  3,       util.VN_CURDATE(),                              util.VN_CURDATE(),                                                        1102, 'Ant-Man Adventure',                             123, NULL,     0, 1,     16, 0, util.VN_CURDATE(),                                   NULL,      NULL,                            NULL,          NULL),
-        (37, 1,     1, 1,  3,       util.VN_CURDATE(),                              util.VN_CURDATE(),                                                        1110, 'Deadpool swords',                               123, NULL,     0, 1,     16, 0, util.VN_CURDATE(),                                   NULL,      NULL,                            NULL,          NULL),
+        (37, 1,     1, 1,  3,       util.VN_CURDATE(),                              util.VN_CURDATE(),                                                        1110, 'Deadpool swords',                               123, NULL,     0, 1,     16, 0, util.VN_CURDATE(),                                   NULL,      NULL,                            NULL,          NULL);
-		(1000000, NULL, 1, 1, NULL, util.VN_CURDATE(), util.VN_CURDATE(), 1, 'employee', 131, NULL, 0, 1, 1.00, 0.00, CURDATE(), NULL, NULL, '', NULL);
 
 INSERT INTO `vn`.`ticketObservation`(`id`, `ticketFk`, `observationTypeFk`, `description`)
     VALUES
@@ -924,18 +923,17 @@ INSERT INTO `vn`.`itemType`(`id`, `code`, `name`, `categoryFk`, `life`, `workerF
         (5, 'CON', 'Container',      3, NULL,   35, 1, 'warm', 0),
         (6, 'ALS', 'Alstroemeria',   1, 31,     16, 0, 'warm', 1);
 
-INSERT INTO `vn`.`ink`(`id`, `name`, `picture`, `showOrder`, `hex`, `hexJson`)
+INSERT INTO `vn`.`ink`(`id`, `name`, `picture`, `showOrder`, `hex`)
     VALUES
-		('YEL', 'Yellow',         1, 1, 'F4D03F', '{"value": ["F4D03F"]}'),
+        ('YEL', 'Yellow',       1, 1, 'F4D03F'),
-		('BLU', 'Blue',           1, 2, '5DADE2', '{"value": ["5DADE2"]}'),
+        ('BLU', 'Blue',         1, 2, '5DADE2'),
-		('RED', 'Red',            1, 3, 'EC7063', '{"value": ["EC7063"]}'),
+        ('RED', 'Red',          1, 3, 'EC7063'),
-		('SLV', 'Silver',         1, 4, 'CACFD2', '{"value": ["CACFD2"]}'),
+        ('SLV', 'Silver',       1, 4, 'CACFD2'),
-		('BRW', 'Brown',          1, 5, 'DC7633', '{"value": ["DC7633"]}'),
+        ('BRW', 'Brown',        1, 5, 'DC7633'),
-		('BLK', 'Black',          1, 6, '000000', '{"value": ["000000"]}'),
+        ('BLK', 'Black',        1, 6, '000000'),
-		('BAS', 'Blue/Silver',    1, 7, '5DADE2', '{"value": ["5DADE2"]}'),
+        ('BAS', 'Blue/Silver',  1, 7, '5DADE2'),
-		('GRN', 'Green',          1, 8, '28A745', '{"value": ["28A745"]}'),
+        ('GRN', 'Green',        1, 8, '28A745'),
-		('WHT', 'White',          1, 9, 'FFFFFF', '{"value": ["FFFFFF"]}'),
+        ('WHT', 'White',        1, 9, 'FFFFFF');
-        ('RGB', 'Red/Green/Blue', 1, 9, 'FFFFFF', '{"value": ["EC7063","5DADE2","28A745"]}');
 
 INSERT INTO `vn`.`origin`(`id`,`code`, `name`)
     VALUES
@@ -985,28 +983,26 @@ INSERT INTO `vn`.`itemFamily`(`code`, `description`)
 INSERT INTO `vn`.`item`(
     `id`, `typeFk`, `stems`, `originFk`, `description`, `producerFk`, `intrastatFk`, `expenseFk`,
     `comment`, `relevancy`, `image`, `subName`, `minPrice`, `family`, `isFloramondo`, `genericFk`,
-	`itemPackingTypeFk`, `hasMinPrice`, `packingOut`, `weightByPiece`, `isCustomInspectionRequired`
+    `itemPackingTypeFk`, `hasMinPrice`, `weightByPiece`, `isCustomInspectionRequired`
 )
 VALUES
-	(1,  2, 1,    1, NULL,              1,    06021010, 2000000000, NULL, 0, '1',  NULL, 0, 'EMB',  0,  NULL,	'V',	0, NULL,    3, 	1),
+    (1,  2, 1,    1, NULL,              1,    06021010, 2000000000, NULL, 0, '1',  NULL, 0, 'EMB',  0,  NULL,	'V',	0, 3, 		1),
-	(2,  2, 1,    2, NULL,              1,    06021010, 2000000000, NULL, 0, '2',  NULL, 0, 'VT',   0,  NULL,   'H',  	0, NULL,    2, 	1),
+    (2,  2, 1,    2, NULL,              1,    06021010, 2000000000, NULL, 0, '2',  NULL, 0, 'VT',   0,  NULL,   'H',  	0, 2, 		1),
-	(3,  1, 1,    3, NULL,              1,    05080000, 4751000000, NULL, 0, '3',  NULL, 0, 'VT',   0,  NULL,   NULL, 	0, NULL,    5,  0),
+    (3,  1, 1,    3, NULL,              1,    05080000, 4751000000, NULL, 0, '3',  NULL, 0, 'VT',   0,  NULL,   NULL, 	0, 5, 		0),
-	(4,  1, 1,    1, 'Increases block', 1,    05080000, 4751000000, NULL, 0, '4',  NULL, 0, 'VT',   0,  NULL,   NULL, 	0, NULL, NULL,	0),
+    (4,  1, 1,    1, 'Increases block', 1,    05080000, 4751000000, NULL, 0, '4',  NULL, 0, 'VT',   0,  NULL,   NULL, 	0, NULL,	0),
-	(5,  3, 1,    2, NULL,              2,    06021010, 4751000000, NULL, 0, '5',  NULL, 0, 'VT',   0,  NULL,   NULL, 	0, NULL, NULL,	0),
+    (5,  3, 1,    2, NULL,              2,    06021010, 4751000000, NULL, 0, '5',  NULL, 0, 'VT',   0,  NULL,   NULL, 	0, NULL,	0),
-	(6,  5, 1,    2, NULL,              NULL, 06021010, 4751000000, NULL, 0, '6',  NULL, 0, 'VT',   0,  NULL,   NULL, 	0, NULL, NULL,	0),
+    (6,  5, 1,    2, NULL,              NULL, 06021010, 4751000000, NULL, 0, '6',  NULL, 0, 'VT',   0,  NULL,   NULL, 	0, NULL,	0),
-	(7,  5, 1,    2, NULL,              NULL, 06021010, 4751000000, NULL, 0, '7',  NULL, 0, 'VT',   0,  NULL,   NULL, 	0, NULL, NULL,	0),
+    (7,  5, 1,    2, NULL,              NULL, 06021010, 4751000000, NULL, 0, '7',  NULL, 0, 'VT',   0,  NULL,   NULL, 	0, NULL,	0),
-	(8,  2, 1,    1, NULL,              1,    06021010, 2000000000, NULL, 0, '8',  NULL, 0, 'VT',   0,  NULL,   NULL, 	0, NULL, NULL,	0),
+    (8,  2, 1,    1, NULL,              1,    06021010, 2000000000, NULL, 0, '8',  NULL, 0, 'VT',   0,  NULL,   NULL, 	0, NULL,	0),
-	(9,  2, 1,    2, NULL,              1,    06021010, 2000000000, NULL, 0, '9',  NULL, 0, 'VT',   1,  NULL,   NULL, 	0, NULL, NULL,	0),
+    (9,  2, 1,    2, NULL,              1,    06021010, 2000000000, NULL, 0, '9',  NULL, 0, 'VT',   1,  NULL,   NULL, 	0, NULL,	0),
-	(10, 1, 1,    3, NULL,              1,    05080000, 4751000000, NULL, 0, '10', NULL, 0, 'VT',   0,  NULL,   NULL, 	0, NULL, NULL,	0),
+    (10, 1, 1,    3, NULL,              1,    05080000, 4751000000, NULL, 0, '10', NULL, 0, 'VT',   0,  NULL,   NULL, 	0, NULL,	0),
-	(11, 1, 1,    1, NULL,              1,    05080000, 4751000000, NULL, 0, '11', NULL, 0, 'VT',   0,  NULL,   NULL, 	0, NULL, NULL,	0),
+    (11, 1, 1,    1, NULL,              1,    05080000, 4751000000, NULL, 0, '11', NULL, 0, 'VT',   0,  NULL,   NULL, 	0, NULL,	0),
-	(12, 3, 1,    2, NULL,              2,    06021010, 4751000000, NULL, 0, '12', NULL, 0, 'VT',   0,  NULL,   NULL, 	0, NULL, NULL,	0),
+    (12, 3, 1,    2, NULL,              2,    06021010, 4751000000, NULL, 0, '12', NULL, 0, 'VT',   0,  NULL,   NULL, 	0, NULL,	0),
-	(13, 5, 1,    2, NULL,              NULL, 06021010, 4751000000, NULL, 0, '13', NULL, 1, 'VT',   1,  NULL,   NULL, 	1, NULL, NULL,	0),
+    (13, 5, 1,    2, NULL,              NULL, 06021010, 4751000000, NULL, 0, '13', NULL, 1, 'VT',   1,  NULL,   NULL, 	1, NULL,	0),
-	(14, 5, 1,    2, NULL,              NULL, 06021010, 4751000000, NULL, 0, '',   NULL, 0, 'VT',   1,  NULL,   NULL, 	0, NULL, NULL,	0),
+    (14, 5, 1,    2, NULL,              NULL, 06021010, 4751000000, NULL, 0, '',   NULL, 0, 'VT',   1,  NULL,   NULL, 	0, NULL,	0),
-	(15, 4, NULL, 1, NULL,              NULL, 06021010, 4751000000, NULL, 0, '',   NULL, 0, 'EMB',  0,  NULL,   NULL, 	0, NULL, NULL,	0),
+    (15, 4, NULL, 1, NULL,              NULL, 06021010, 4751000000, NULL, 0, '',   NULL, 0, 'EMB',  0,  NULL,   NULL, 	0, NULL,	0),
-	(16, 6, NULL, 1, NULL,              NULL, 06021010, 4751000000, NULL, 0, '',   NULL, 0, 'EMB',  0,  NULL,   NULL, 	0, NULL, NULL,	0),
+    (16, 6, NULL, 1, NULL,              NULL, 06021010, 4751000000, NULL, 0, '',   NULL, 0, 'EMB',  0,  NULL,   NULL, 	0, NULL,	0),
-	(71, 6, NULL, 1, NULL,              NULL, 06021010, 4751000000, NULL, 0, '',   NULL, 0, 'VT',   0,  NULL,   NULL, 	0, NULL, NULL,	0),
+    (71, 6, NULL, 1, NULL,              NULL, 06021010, 4751000000, NULL, 0, '',   NULL, 0, 'VT',   0,  NULL,   NULL, 	0, NULL,	0);
-	(72, 6, NULL, 1, NULL,              NULL, 06021010, 4751000000, NULL, 0, NULL, NULL, 1, 'VT',   0,  NULL,   NULL, 	1,    1, NULL, 	0),
-	(88, 1,    1, 2, NULL,              NULL, 06021010, 4751000000, NULL, 0, NULL, NULL,10, 'VT',   0,  NULL,   NULL,   1, NULL, NULL,  0);
 
 
 -- Update the taxClass after insert of the items
@@ -1129,8 +1125,7 @@ INSERT INTO `vn`.`sale`(`id`, `itemFk`, `ticketFk`, `concept`, `quantity`, `pric
         (39, 1, 32,  'Ranged weapon longbow 200cm',         2, 103.49, 0, 0, 0, util.VN_CURDATE(),     'hasComponentLack'),
         (40, 2, 34, 'Melee weapon combat fist 15cm', 10.00, 3.91, 0, 0, 0, util.VN_CURDATE(),     'hasComponentLack,hasItemLost'),
         (41, 2, 35, 'Melee weapon combat fist 15cm', 8.00, 3.01, 0, 0, 0, util.VN_CURDATE(),     'hasComponentLack,hasRounding,hasItemLost'),
-        (42, 2, 36, 'Melee weapon combat fist 15cm', 6.00, 2.50, 0, 0, 0, util.VN_CURDATE(),     'hasComponentLack,hasRounding,hasItemLost'),
+        (42, 2, 36, 'Melee weapon combat fist 15cm', 6.00, 2.50, 0, 0, 0, util.VN_CURDATE(),     'hasComponentLack,hasRounding,hasItemLost');
-		(43, 88, 1000000, 'Chest medical box 2', 15.00, 10.00, 0, 0, 0, CURDATE(), '');
 
 INSERT INTO `vn`.`saleComponent`(`saleFk`, `componentFk`, `value`)
     VALUES
@@ -1462,21 +1457,7 @@ INSERT INTO `vn`.`itemTag`(`id`,`itemFk`,`tagFk`,`value`,`priority`)
         (98,    14, 23, '1',                        7),
         (99,    15, 92, 'Trolley',                  2),
         (100,   16, 92, 'Pallet',                   2),
-        (101,   71, 92, 'Shipping cost',            2),
+        (101,   71, 92, 'Shipping cost',            2);
-        (102,   88, 56, 'Chest',                    1),
-        (103,   88, 58, 'ammo box',                 2),
-        (104,   88, 27, '100cm',                    3),
-        (105,   88, 36, 'Stark Industries',         4),
-        (106,   88, 1,  'White',                    5),
-        (107,   88, 67, 'supply',                   6),
-        (108,   88, 23, '13',                       7),
-		(109,   72, 56, 'Mistic weapon',            1),
-        (110,   72, 58, 'Stormbreaker',             2),
-        (111,   72, 27, '200cm',                    3),
-        (112,   72, 36, 'Stark Industries',         4),
-        (113,   72, 1,  'Red/Green/Blue',           5),
-        (114,   72, 67, '-1 precission',            6),
-        (115,   72, 23, '1',                        7);
 
 INSERT INTO `vn`.`itemTypeTag`(`id`, `itemTypeFk`, `tagFk`, `priority`)
     VALUES
@@ -1546,8 +1527,7 @@ INSERT INTO `vn`.`travel`(`id`,`shipped`, `landed`, `warehouseInFk`, `warehouseO
         (10, DATE_ADD(util.VN_CURDATE(), INTERVAL +5 DAY),   DATE_ADD(util.VN_CURDATE(), INTERVAL +5 DAY),   5, 1, 1, 50.00,  500,  'nineth travel',  1, 2, 10, TRUE, 2),
         (11, util.VN_CURDATE() - INTERVAL 1 DAY          ,                              util.VN_CURDATE(),   6, 3, 0, 50.00, 500, 'eleventh travel',  1, 2, 4, FALSE, NULL),
         (12, util.VN_CURDATE()                           ,             util.VN_CURDATE() + INTERVAL 1 DAY,   6, 3, 0, 50.00, 500, 'eleventh travel',  1, 2, 4, FALSE, NULL),
-        (13,  util.VN_CURDATE() - INTERVAL 1 MONTH - INTERVAL 1 DAY, util.VN_CURDATE() - INTERVAL 1 MONTH,   6, 3, 0, 50.00, 500, 'eleventh travel',  1, 2, 4, FALSE, NULL),
+        (13,  util.VN_CURDATE() - INTERVAL 1 MONTH - INTERVAL 1 DAY, util.VN_CURDATE() - INTERVAL 1 MONTH,   6, 3, 0, 50.00, 500, 'eleventh travel',  1, 2, 4, FALSE, NULL);
-        (14, util.VN_CURDATE() - INTERVAL 1 DAY          ,             util.VN_CURDATE() + INTERVAL 1 DAY,   6, 3, 0, 50.00, 500, 'eleventh travel',  1, 2, 4, FALSE, NULL);
 
 INSERT INTO `vn`.`entry`(`id`, `supplierFk`, `created`, `travelFk`, `isConfirmed`, `companyFk`, `invoiceNumber`, `reference`, `isExcludedFromAvailable`, `evaNotes`, `typeFk`)
 	VALUES
@@ -1563,11 +1543,10 @@ INSERT INTO `vn`.`entry`(`id`, `supplierFk`, `created`, `travelFk`, `isConfirmed
 		(10,	2,	DATE_ADD(util.VN_CURDATE(), INTERVAL +2 DAY), 	10, 0, 442, 'IN2010', 'Movement 10',1,                  '', 'product'),
         (11,    4,  DATE_ADD(util.VN_CURDATE(), INTERVAL -2 MONTH),  1, 1, 442, 'IN2011', 'Movement 11',0,                  '', 'product'),
         (12,    4,  util.VN_CURDATE() - INTERVAL 1 MONTH,            13, 1, 442, 'IN2012', 'Movement 12',0,                 '', 'product'),
-		(99,	69, util.VN_CURDATE() - INTERVAL 1 MONTH, 			11, 0, 442, 'IN2009', 'Movement 99',0,                  '', 'product'),
+		(99,	69, util.VN_CURDATE() - INTERVAL 1 MONTH, 			11, 0, 442, 'IN2009', 'Movement 99',0,                  '', 'product');
-        (100,    1, util.VN_CURDATE()                   ,           14, 0, 442, 'IN2009','Movement 100',0,                  '', 'product');
 
-INSERT INTO `vn`.`entryConfig` (`defaultEntry`, `inventorySupplierFk`, `maxLockTime`, `defaultSupplierFk`)
+INSERT INTO `vn`.`entryConfig` (`defaultEntry`, `inventorySupplierFk`, `defaultSupplierFk`)
-	VALUES (2, 4, 300, 1);
+	VALUES (2, 4, 1);
 
 INSERT INTO `bs`.`waste`(`buyerFk`, `year`, `week`, `itemFk`, `itemTypeFk`, `saleTotal`, `saleWasteQuantity`, `saleExternalWaste`, `saleFaultWaste`, `saleContainerWaste`, `saleBreakWaste`, `saleOtherWaste`)
     VALUES
@@ -1587,35 +1566,26 @@ INSERT INTO `bs`.`waste`(`buyerFk`, `year`, `week`, `itemFk`, `itemTypeFk`, `sal
         ('103',              YEAR(DATE_ADD(util.VN_CURDATE(), INTERVAL -1 WEEK)),   WEEK(DATE_ADD(util.VN_CURDATE(), INTERVAL -1 WEEK), 1),      6, 1, '186',      '0',      '51',      '53.12',   '56.20',   '56.20',   '56.20'),
         ('103',              YEAR(DATE_ADD(util.VN_CURDATE(), INTERVAL -1 WEEK)),   WEEK(DATE_ADD(util.VN_CURDATE(), INTERVAL -1 WEEK), 1),      7, 1, '277',      '0',      '53.12',   '56.20',   '56.20',   '56.20',   '56.20');
 
-    INSERT INTO edi.supplier (supplier_id,company_name,entry_date,expiry_date,change_date_time,isAllowedDirectSales,isBanned)
+	INSERT INTO vn.buy(id,entryFk,itemFk,buyingValue,quantity,packagingFk,stickers,freightValue,packageValue,comissionValue,packing,grouping,groupingMode,location,price1,price2,price3,printedStickers,isChecked,isIgnored,weight,created)
-	    VALUES (1,'MV', util.VN_CURDATE(), util.VN_CURDATE(), util.VN_CURDATE(), 1, 0);
-    INSERT INTO edi.ekt (id,`ref`,qty,pro,pri,ok,scanned)
-        VALUES (1, 1234, 1, 1, 1.1, 1, 1);
-
-	INSERT INTO vn.buy(id,entryFk,itemFk,buyingValue,quantity,packagingFk,stickers,freightValue,packageValue,comissionValue,packing,grouping,groupingMode,location,price1,price2,price3,printedStickers,isChecked,isIgnored,ektFk,weight,created)
     VALUES
-    		( 1,   1, 1,      50, 5000, 4, 1, 1.500, 1.500, 0.000,  1,  1,  'packing', NULL, 0.00,  99.6,  99.4, 0, 1, 0, NULL,    1, util.VN_CURDATE() - INTERVAL 2 MONTH),
+        (1,  1, 1, 50,      5000,   4, 1, 1.500, 1.500, 0.000, 1,  1,  'packing', NULL, 0.00, 99.6, 99.4,   0, 1, 0, 1,     util.VN_CURDATE() - INTERVAL 2 MONTH),
-    		( 2,   2, 1,      50,  100, 4, 1, 1.500, 1.500, 0.000,  1,  1,  'packing', NULL, 0.00,  99.6,  99.4, 0, 1, 0, NULL,    1, util.VN_CURDATE() - INTERVAL 1 MONTH),
+        (2,  2, 1, 50,      100,    4, 1, 1.500, 1.500, 0.000, 1,  1,  'packing', NULL, 0.00, 99.6, 99.4,   0, 1, 0, 1,     util.VN_CURDATE() - INTERVAL 1 MONTH),
-    		( 3,   3, 1,      50,  100, 4, 1, 1.500, 1.500, 0.000,  1,  1,       NULL, NULL, 0.00,  99.6,  99.4, 0, 1, 0, NULL,    1,                    util.VN_CURDATE()),
+        (3,  3, 1, 50,      100,    4, 1, 1.500, 1.500, 0.000, 1,  1,  NULL, NULL, 0.00, 99.6, 99.4,   0, 1, 0, 1,     util.VN_CURDATE()),
-    		( 4,   2, 2,       5,  450, 3, 1, 1.000, 1.000, 0.000, 10, 10,       NULL, NULL, 0.00,  7.30,  7.00, 0, 1, 0, NULL,  2.5,                    util.VN_CURDATE()),
+        (4,  2, 2, 5,       450,    3, 1, 1.000, 1.000, 0.000, 10, 10, NULL, NULL, 0.00, 7.30, 7.00,   0, 1, 0, 2.5,   util.VN_CURDATE()),
-    		( 5,   3, 3,      55,  500, 5, 1, 1.000, 1.000, 0.000,  1,  1,       NULL, NULL, 0.00,  78.3,  75.6, 0, 1, 0, NULL,  2.5,                    util.VN_CURDATE()),
+        (5,  3, 3, 55,      500,    5, 1, 1.000, 1.000, 0.000, 1,  1,  NULL, NULL, 0.00, 78.3, 75.6,   0, 1, 0, 2.5,   util.VN_CURDATE()),
-    		( 6,   4, 8,      50, 1000, 4, 1, 1.000, 1.000, 0.000,  1,  1, 'grouping', NULL, 0.00,  99.6,  99.4, 0, 1, 0, NULL,  2.5,                    util.VN_CURDATE()),
+        (6,  4, 8, 50,      1000,   4, 1, 1.000, 1.000, 0.000, 1,  1,  'grouping', NULL, 0.00, 99.6, 99.4,   0, 1, 0, 2.5,   util.VN_CURDATE()),
-    		( 7,   4, 9,      20, 1000, 3, 1, 0.500, 0.500, 0.000, 10, 10,  'packing', NULL, 0.00, 30.50, 29.00, 0, 1, 0, NULL,  2.5,                    util.VN_CURDATE()),
+        (7,  4, 9, 20,      1000,   3, 1, 0.500, 0.500, 0.000, 10, 10, 'packing', NULL, 0.00, 30.50, 29.00, 0, 1, 0, 2.5,   util.VN_CURDATE()),
-    		( 8,   4, 4,    1.25, 1000, 3, 1, 0.500, 0.500, 0.000, 10, 10, 'grouping', NULL, 0.00,  1.75,  1.67, 0, 1, 0, NULL,  2.5,                    util.VN_CURDATE()),
+        (8,  4, 4, 1.25,    1000,   3, 1, 0.500, 0.500, 0.000, 10, 10, 'grouping', NULL, 0.00, 1.75, 1.67,   0, 1, 0, 2.5,   util.VN_CURDATE()),
-    		( 9,   4, 4,    1.25, 1000, 3, 1, 0.500, 0.500, 0.000, 10, 10, 'grouping', NULL, 0.00,  1.75,  1.67, 0, 1, 0, NULL,    4,                    util.VN_CURDATE()),
+        (9,  4, 4, 1.25,    1000,   3, 1, 0.500, 0.500, 0.000, 10, 10, 'grouping', NULL, 0.00, 1.75, 1.67,   0, 1, 0, 4,     util.VN_CURDATE()),
-    		(10,   5, 1,      50,   10, 4, 1, 2.500, 2.500, 0.000,  1,  1,  'packing', NULL, 0.00,  99.6,  99.4, 0, 1, 0, NULL,    4,                    util.VN_CURDATE()),
+        (10, 5, 1, 50,      10,     4, 1, 2.500, 2.500, 0.000, 1,  1,  'packing', NULL, 0.00, 99.6, 99.4,   0, 1, 0, 4,     util.VN_CURDATE()),
-    		(11,   5, 4,    1.25,   10, 3, 1, 2.500, 2.500, 0.000, 10, 10, 'grouping', NULL, 0.00,  1.75,  1.67, 0, 1, 0, NULL,    4,                    util.VN_CURDATE()),
+        (11, 5, 4, 1.25,    10,     3, 1, 2.500, 2.500, 0.000, 10, 10, 'grouping', NULL, 0.00, 1.75, 1.67,   0, 1, 0, 4,     util.VN_CURDATE()),
-    		(12,   6, 4,    1.25,    0, 3, 1, 2.500, 2.500, 0.000, 10, 10, 'grouping', NULL, 0.00,  1.75,  1.67, 0, 1, 0, NULL,    4,                    util.VN_CURDATE()),
+        (12, 6, 4, 1.25,    0,      3, 1, 2.500, 2.500, 0.000, 10, 10, 'grouping', NULL, 0.00, 1.75, 1.67,   0, 1, 0, 4,     util.VN_CURDATE()),
-    		(13,   7, 1,      50,    0, 3, 1, 2.000, 2.000, 0.000,  1,  1,  'packing', NULL, 0.00,  99.6,  99.4, 0, 1, 0, NULL,    4,                    util.VN_CURDATE()),
+        (13, 7, 1, 50,      0,      3, 1, 2.000, 2.000, 0.000, 1,  1,  'packing', NULL, 0.00, 99.6, 99.4,   0, 1, 0, 4,     util.VN_CURDATE()),
-    		(14,   7, 2,       5,    0, 3, 1, 2.000, 2.000, 0.000, 10, 10, 'grouping', NULL, 0.00,  7.30,  7.00, 0, 1, 0, NULL,    4,                    util.VN_CURDATE()),
+        (14, 7, 2, 5,       0,      3, 1, 2.000, 2.000, 0.000, 10, 10, 'grouping', NULL, 0.00, 7.30, 7.00,   0, 1, 0, 4,     util.VN_CURDATE()),
-            (15,   7, 4,    1.25,    0, 3, 1, 2.000, 2.000, 0.000, 10, 10, 'grouping', NULL, 0.00,  1.75,  1.67, 0, 1, 0, NULL,    4,                    util.VN_CURDATE()),
+		(15, 7, 4, 1.25,    0,      3, 1, 2.000, 2.000, 0.000, 10, 10, 'grouping', NULL, 0.00, 1.75, 1.67,   0, 1, 0, 4,     util.VN_CURDATE()),
-            (16,  99, 1, 50.0000, 5000, 4, 1, 1.500, 1.500, 0.000,  1,  1,  'packing', NULL, 0.00, 99.60, 99.40, 0, 1, 0, NULL, 1.00,            '2024-07-30 08:13:51.000'),
+        (16, 99,1,50.0000,  5000,   4, 1, 1.500, 1.500, 0.000, 1,  1,  'packing', NULL, 0.00, 99.60, 99.40,  0, 1, 0, 1.00, '2024-07-30 08:13:51.000'),
-            (17,  11, 1,      50, 5000, 4, 1, 1.500, 1.500, 0.000,  1,  1,  'packing', NULL, 0.00,  99.6,  99.4, 0, 1, 0, NULL,    1, util.VN_CURDATE() - INTERVAL 2 MONTH),
+        (17, 11, 1, 50,      5000,   4, 1, 1.500, 1.500, 0.000, 1,  1,  'packing', NULL, 0.00, 99.6, 99.4,   0, 1, 0, 1,     util.VN_CURDATE() - INTERVAL 2 MONTH),
-            (18,  12, 1,      50, 5000, 4, 1, 1.500, 1.500, 0.000,  1,  1, 'grouping', NULL, 0.00,  99.6,  99.4, 0, 1, 0, NULL,    1, util.VN_CURDATE() - INTERVAL 2 MONTH),
+        (18, 12, 1, 50,      5000,   4, 1, 1.500, 1.500, 0.000, 1,  1,  'grouping', NULL, 0.00, 99.6, 99.4,   0, 1, 0, 1,     util.VN_CURDATE() - INTERVAL 2 MONTH);
-            (19, 100, 1,      50,  100, 4, 1, 1.500, 1.500, 0.000,  1,  1, 'grouping', NULL, 0.00,  99.6,  99.4, 0, 1, 0, NULL,    1,                    util.VN_CURDATE()),
-            (20, 100, 2,       5,  450, 3, 2, 1.000, 1.000, 0.000, 10, 10,       NULL, NULL, 0.00,  7.30,  7.00, 0, 1, 0, NULL,  2.5,                    util.VN_CURDATE()),
-            (21, 100,72,      55,  500, 5, 3, 1.000, 1.000, 0.000,  1,  1,  'packing', NULL, 0.00,  78.3,  75.6, 0, 1, 0,    1,    3,                    util.VN_CURDATE()),		
-	  (10000002,  12,88, 50.0000, 5000, 4, 1, 1.500, 1.500, 0.000,  1,  1, 'grouping', NULL, 0.00, 99.60, 99.40, 0, 1, 0, 1.00,    1,util.VN_CURDATE()  - INTERVAL 2 MONTH);
 
 INSERT INTO `hedera`.`order`(`id`, `date_send`, `customer_id`, `delivery_method_id`, `agency_id`, `address_id`, `company_id`, `note`, `source_app`, `confirmed`,`total`, `date_make`, `first_row_stamp`, `confirm_date`)
     VALUES
@@ -2785,11 +2755,11 @@ INSERT INTO `vn`.`roadmapAddress` (`addressFk`)
         (3),
         (4);
 
-INSERT INTO `vn`.`roadmap` (`id`, `name`, `tractorPlate`, `trailerPlate`, `phone`, `supplierFk`, `etd`, `observations`, `editorFk`, `price`, `driverName`)
+INSERT INTO `vn`.`roadmap` (`id`, `name`, `tractorPlate`, `trailerPlate`, `phone`, `supplierFk`, `etd`, `eta`, `observations`, `editorFk`, `price`, `driverName`)
     VALUES
-        (1, 'val-algemesi', '1234-BCD', '9876-BCD', '111111111', 1, util.VN_NOW(),                           'this is test observation', 1, 15, 'Batman'),
+        (1, 'val-algemesi', '1234-BCD', '9876-BCD', '111111111', 1, util.VN_NOW(), DATE_ADD(util.VN_NOW(), INTERVAL 2 DAY),                           'this is test observation', 1, 15, 'Batman'),
-        (2, 'alg-valencia', '2345-CDF', '8765-BCD', '111111111', 1, util.VN_NOW(),                           'test observation',         1, 20, 'Robin'),
+        (2, 'alg-valencia', '2345-CDF', '8765-BCD', '111111111', 1, util.VN_NOW(), DATE_ADD(util.VN_NOW(), INTERVAL 5 DAY),                           'test observation',         1, 20, 'Robin'),
-        (3, 'alz-algemesi', '3456-DFG', '7654-BCD', '222222222', 2, DATE_ADD(util.VN_NOW(), INTERVAL 3 DAY), 'observations...',          2, 25, 'Driverman');
+        (3, 'alz-algemesi', '3456-DFG', '7654-BCD', '222222222', 2, DATE_ADD(util.VN_NOW(), INTERVAL 3 DAY), DATE_ADD(util.VN_NOW(), INTERVAL 6 DAY), 'observations...',          2, 25, 'Driverman');
 
 INSERT INTO `vn`.`roadmapStop` (`id`, `roadmapFk`, `roadmapAddressFk`, `eta`, `description`, `editorFk`)
     VALUES

db/routines/cache/procedures/available_refresh.sql

@@ -89,12 +89,12 @@ proc: BEGIN
 						AND (ir.ended IS NULL OR i.shipped <= ir.ended)
 						AND i.warehouseFk = vWarehouse
 				UNION ALL
-				SELECT i.itemFk, IFNULL(i.availabled, i.landed), i.quantity
+				SELECT i.itemFk, i.landed, i.quantity
 					FROM vn.itemEntryIn i
 						JOIN itemRange ir ON ir.itemFk = i.itemFk
-					WHERE IFNULL(i.availabled, i.landed) >= vStartDate
+					WHERE i.landed >= vStartDate
 						AND IFNULL(i.availabled, i.landed) <= vAvailabled
-						AND (ir.ended IS NULL OR IFNULL(i.availabled, i.landed) <= ir.ended)
+						AND (ir.ended IS NULL OR i.landed <= ir.ended)
 						AND i.warehouseInFk = vWarehouse
 				UNION ALL
 				SELECT i.itemFk, i.shipped, i.quantity

db/routines/sage/procedures/clientSupplier_add.sql

@@ -57,8 +57,8 @@ BEGIN
 			c.socialName,
 			IFNULL(c.street, ''),
 			c.accountingAccount,
-			@fi := IF(cu.code = LEFT(TRIM(c.fi), 2) AND c.isVies, MID(TRIM(c.fi), 3, LENGTH(TRIM(c.fi))-1), TRIM(c.fi)),
+			@fi := REGEXP_REPLACE(TRIM(c.fi), c.viesCode, ''),
-			IF(c.isVies, CONCAT(IFNULL(cu.viesCode,cu.code), @fi ), TRIM(c.fi)),
+			IF(c.viesCode IS NOT NULL, CONCAT(cu.code, @fi ), TRIM(c.fi)),
 			IFNULL(c.postcode, ''),
 			IFNULL(c.city, ''),
 			IFNULL(pr.CodigoProvincia, ''),
@@ -68,7 +68,7 @@ BEGIN
 			IF((c.fi REGEXP '^([[:blank:]]|[[:digit:]])'), 'J','F'),
 			IF(cu.code = 'ES',
 				1,
-				IF((cu.isUeeMember AND c.isVies), 2, 4)),
+				IF((cu.isUeeMember AND c.viesCode IS NOT NULL), 2, 4)),
 			IFNULL(c.taxTypeSageFk,0),
 			IF(n.SiglaNacion = vCountryCanariasCode COLLATE utf8mb3_unicode_ci,
 				IF(@isCeutaMelilla, 'CEUTA Y MELILLA', IF (@isCanarias, 'ISLAS CANARIAS', n.Nacion)),
@@ -94,8 +94,8 @@ BEGIN
 				s.name,
 				IFNULL(s.street, ''),
 				s.account,
-				@nif := IF(co.code = LEFT(TRIM(s.nif), 2), MID(TRIM(s.nif), 3, LENGTH(TRIM(s.nif))-1), TRIM(s.nif)),
+				@nif := REGEXP_REPLACE(TRIM(s.nif), s.viesCode, ''),
-				IF(s.isVies, CONCAT(IFNULL(co.viesCode,co.code), @nif), TRIM(s.nif)),
+				TRIM(CONCAT(IFNULL(s.viesCode,''), @nif)),
 				IFNULL(s.postCode,''),
 				IFNULL(s.city, ''),
 				IFNULL(pr.CodigoProvincia, ''),

db/routines/vn/procedures/addressTaxArea.sql

@@ -17,7 +17,7 @@ BEGIN
 			WHEN (NOT IFNULL(auClient.isUeeMember, cClient.isUeeMember) OR NOT cSupplier.isUeeMember) 
 					AND NOT (auSupplier.id <=> auClient.id) THEN 
 				'WORLD'
-			WHEN cClient.isUeeMember AND cSupplier.isUeeMember AND c.countryFk != s.countryFk AND c.isVies THEN 
+			WHEN cClient.isUeeMember AND cSupplier.isUeeMember AND c.countryFk != s.countryFk AND c.viesCode IS NOT NULL THEN 
 				'CEE'
 			WHEN a.isEqualizated AND cClient.code = 'ES' THEN 
 				'EQU'

db/routines/vn/procedures/catalog_calculate.sql

@@ -19,15 +19,13 @@ BEGIN
  * @return tmp.ticketComponentPrice
  */
 	DECLARE vAvailableCalc INT;
-	DECLARE vAvailabled DATETIME;
+	DECLARE vAvailableNoRaidsCalc INT;
-	DECLARE vDone BOOL;
-	DECLARE vHour INT;
 	DECLARE vShipped DATE;
 	DECLARE vWarehouseFk SMALLINT;
 	DECLARE vZoneFk INT;
-
+	DECLARE vDone BOOL;
 	DECLARE cTravelTree CURSOR FOR
-		SELECT zoneFk, warehouseFk, shipped, `hour` FROM tmp.zoneGetShipped;
+		SELECT zoneFk, warehouseFk, shipped FROM tmp.zoneGetShipped;
 
 	DECLARE CONTINUE HANDLER FOR NOT FOUND SET vDone = TRUE;
 
@@ -68,15 +66,14 @@ BEGIN
 	OPEN cTravelTree;
 	l: LOOP
 		SET vDone = FALSE;
-		FETCH cTravelTree INTO vZoneFk, vWarehouseFk, vShipped, vHour;
+		FETCH cTravelTree INTO vZoneFk, vWarehouseFk, vShipped;
-	
-		SET vAvailabled = vShipped + INTERVAL HOUR(vHour) HOUR;
 
 		IF vDone THEN
 			LEAVE l;
 		END IF;
 
-		CALL `cache`.available_refresh(vAvailableCalc, FALSE, vWarehouseFk, vAvailabled);
+		CALL `cache`.available_refresh(vAvailableCalc, FALSE, vWarehouseFk, vShipped);
+		CALL `cache`.availableNoRaids_refresh(vAvailableNoRaidsCalc, FALSE, vWarehouseFk, vShipped);
 		CALL buy_getUltimate(NULL, vWarehouseFk, vShipped);
 
 		INSERT INTO tmp.ticketLot (warehouseFk, itemFk, available, buyFk, zoneFk)
@@ -86,10 +83,31 @@ BEGIN
 					bu.buyFk,
 					vZoneFk
 				FROM `cache`.available a
+					LEFT JOIN cache.availableNoRaids anr ON anr.item_id = a.item_id 
+														AND anr.calc_id = vAvailableNoRaidsCalc
 					JOIN tmp.item i ON i.itemFk = a.item_id
 					JOIN item it ON it.id = i.itemFk
 					JOIN `zone` z ON z.id = vZoneFk
 					LEFT JOIN tmp.buyUltimate bu ON bu.itemFk = a.item_id	
+					LEFT JOIN edi.supplyResponse sr ON sr.ID = it.supplyResponseFk	
+					LEFT JOIN edi.VMPSettings v ON v.VMPID = sr.vmpID 
+					LEFT JOIN edi.marketPlace mp ON mp.id = sr.MarketPlaceID
+					LEFT JOIN (SELECT isVNHSupplier, isEarlyBird, TRUE AS itemAllowed
+									FROM addressFilter af
+										JOIN (SELECT ad.provinceFk, p.countryFk, ad.isLogifloraAllowed 
+												FROM address ad 
+													JOIN province p ON p.id = ad.provinceFk 
+												WHERE ad.id = vAddressFk
+											) sub2 ON sub2.provinceFk <=> IFNULL(af.provinceFk, sub2.provinceFk)
+													AND sub2.countryFk <=> IFNULL(af.countryFk, sub2.countryFk)
+													AND sub2.isLogifloraAllowed <=> IFNULL(af.isLogifloraAllowed, sub2.isLogifloraAllowed)
+								WHERE vWarehouseFk = af.warehouseFk
+									AND (vShipped < af.beforeDated
+										OR ISNULL(af.beforeDated)
+										OR	vShipped > af.afterDated
+										OR ISNULL(af.afterDated))
+								) sub ON sub.isVNHSupplier = v.isVNHSupplier
+										AND (sub.isEarlyBird = mp.isEarlyBird OR ISNULL(sub.isEarlyBird))
 					JOIN agencyMode am ON am.id = vAgencyModeFk
 					JOIN agency ag ON ag.id = am.agencyFk
 					JOIN itemType itt ON itt.id = it.typeFk
@@ -106,6 +124,7 @@ BEGIN
 							AND ait.itemTypeFk = itt.id
 				WHERE a.calc_id = vAvailableCalc
 					AND a.available > 0
+					AND (sub.itemAllowed OR NOT it.isFloramondo OR anr.available > 0)
 					AND (ag.isAnyVolumeAllowed OR NOT itt.isUnconventionalSize)
 					AND (it.`size` IS NULL
 						OR IF(itc.isReclining,

db/routines/vn/procedures/collection_new.sql

@@ -160,11 +160,9 @@ BEGIN
 				OR (NOT s.isPreparable AND NOT s.isPrintable)
 				OR pb.collectionH IS NOT NULL
 				OR pb.collectionV IS NOT NULL
-				OR pb.collectionA IS NOT NULL
 				OR pb.collectionN IS NOT NULL
-				OR (NOT pb.H AND pb.V + pb.A > 0 AND vItemPackingTypeFk = 'H')
+				OR (NOT pb.H AND pb.V > 0 AND vItemPackingTypeFk = 'H')
 				OR (NOT pb.V AND vItemPackingTypeFk = 'V')
-				OR (NOT pb.A AND vItemPackingTypeFk = 'A')
 				OR (pc.isPreviousPreparationRequired AND pb.previousWithoutParking)
 				OR LENGTH(pb.problem)
 				OR pb.lines > vLinesLimit

db/routines/vn/procedures/invoiceIn_booking.sql

@@ -50,7 +50,7 @@ BEGIN
 				s.account supplierAccount,
 				s.name supplierName,
 				s.nif,
-				s.IsVies,
+				s.viesCode,
 				iit.taxTypeSageFk,
 				tt.code taxCode,
 				ti.Iva,
@@ -282,7 +282,7 @@ BEGIN
 				JOIN sage.config c
 			WHERE tii.taxCode = 'ISP21' OR MID(tii.supplierAccount, 4, 1) = '1'
 				AND tii.taxTypeSageFk IS NOT NULL
-				AND NOT(tii.isVies 
+				AND NOT(tii.viesCode IS NOT NULL
 					AND c.nontaxableTransactionTypeFk = tii.transactionTypeSageFk 
 					AND tii.taxCode = 'nonTaxable')
 			GROUP BY tii.CuentaIvaRepercutido;

db/routines/vn/procedures/item_getBalance.sql

@@ -30,7 +30,7 @@ BEGIN
 		WITH entriesIn AS (
 			SELECT 'entry' originType,
 					e.id originId,
-					IFNULL(tr.availabled, tr.landed) shipped,
+					tr.landed shipped,
 					b.quantity `in`,
 					NULL `out`,
 					st.alertLevel ,
@@ -54,7 +54,7 @@ BEGIN
 						OR (util.VN_CURDATE() AND tr.isReceived),
 							'DELIVERED',
 							'FREE')
-				WHERE IFNULL(tr.availabled, tr.landed) >= vDateInventory
+				WHERE tr.landed >= vDateInventory
 					AND tr.warehouseInFk = vWarehouseFk
 					AND (s.id <> vSupplierInventoryFk OR vDated IS NULL)
 					AND b.itemFk = vItemFk
@@ -99,7 +99,7 @@ BEGIN
 		),
 		sales AS (
 			WITH itemSales AS (
-				SELECT DATE(t.shipped) + INTERVAL HOUR(z.`hour`) HOUR shipped,
+				SELECT DATE(t.shipped) shipped,
 						s.quantity,
 						st2.alertLevel,
 						st2.name,
@@ -114,7 +114,6 @@ BEGIN
 						cb.claimFk
 					FROM vn.sale s
 						JOIN vn.ticket t ON t.id = s.ticketFk
-						JOIN vn.`zone` z ON z.id = t.zoneFk
 						LEFT JOIN vn.ticketState ts ON ts.ticketFk = t.id
 						LEFT JOIN vn.state st ON st.code = ts.code
 						JOIN vn.client c ON c.id = t.clientFk
@@ -190,15 +189,14 @@ BEGIN
 			SELECT * FROM sales
 			UNION ALL
 			SELECT * FROM orders
-			ORDER BY DATE(shipped),
+			ORDER BY shipped,
 				(inventorySupplierFk = entityId) DESC,
 				alertLevel DESC,
 				isTicket,
 				`order` DESC,
 				isPicked DESC,
 				`in` DESC,
-				`out` DESC,
+				`out` DESC;
-				shipped;
 
 	IF vDated IS NULL THEN
 		SET @a := 0;
@@ -207,7 +205,7 @@ BEGIN
 
 		SELECT t.originType,
 			t.originId,
-			@shipped:= t.shipped,
+			DATE(@shipped:= t.shipped) shipped,
 			t.alertLevel,
 			t.stateName,
 			t.reference,

db/routines/vn/procedures/item_getLack.sql

@@ -1,16 +1,5 @@
 DELIMITER $$
-CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`item_getLack`(
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`item_getLack`(IN vForce BOOLEAN, IN vDays INT)
-	vSelf INT,
-    vForce BOOLEAN,
-    vDays INT,
-    vLongname VARCHAR(255),
-    vProducerName VARCHAR(255),
-    vColor VARCHAR(255),
-    vSize INT,
-    vOrigen INT,
-    vLack INT,
-    vWarehouseFk INT
-    )
 BEGIN
 /**
  * Calcula una tabla con el máximo negativo visible para cada producto y almacen
@@ -58,14 +47,6 @@ BEGIN
 		WHERE w.isForTicket
 			AND ic.display
 			AND it.code != 'GEN'
-            AND (vSelf IS NULL OR i.id = vSelf)
-			AND (vLongname IS NULL OR i.name = vLongname)
-			AND (vProducerName IS NULL OR p.`name` LIKE CONCAT('%', vProducerName, '%'))
-			AND (vColor IS NULL OR vColor = i.inkFk)
-			AND (vSize IS NULL OR vSize = i.`size`)
-			AND (vOrigen IS NULL OR vOrigen = w.id)
-			AND (vLack IS NULL OR vLack = sub.amount)
-			AND (vWarehouseFk IS NULL OR vWarehouseFk = w.id)
 		GROUP BY i.id, w.id
 		HAVING lack < 0;
 

db/routines/vn/procedures/item_getSimilar.sql

@@ -82,19 +82,14 @@ BEGIN
 				AND it.priority = vPriority
 			LEFT JOIN vn.tag t ON t.id = it.tagFk
 			LEFT JOIN vn.buy b ON b.id = bu.buyFk
-			LEFT JOIN vn.itemShelvingStock iss ON iss.itemFk = i.id
-				AND iss.warehouseFk = vWarehouseFk
-			LEFT JOIN vn.ink ink ON ink.id = i.tag5
 			JOIN itemTags its
 		WHERE a.available > 0
 			AND (i.typeFk = its.typeFk OR NOT vShowType)
 			AND i.id <> vSelf
-		ORDER BY (a.available > 0) DESC,
+		ORDER BY `counter` DESC,
-				`counter` DESC,
 			(t.name = its.name) DESC,
 			(it.value = its.value) DESC,
 			(i.tag5 = its.tag5) DESC,
-				(ink.`showOrder`) DESC,
 			match5 DESC,
 			(i.tag6 = its.tag6) DESC,
 			match6 DESC,

db/routines/vn/procedures/item_getStock.sql

@@ -35,8 +35,8 @@ BEGIN
 				SELECT iei.itemFk, iei.quantity
 					FROM itemEntryIn iei
 						JOIN item i ON i.id = iei.itemFk
-					WHERE IFNULL(iei.availabled, iei.landed) >= util.VN_CURDATE()
+					WHERE iei.landed >= util.VN_CURDATE()
-						AND IFNULL(iei.availabled, iei.landed) < vDated
+						AND iei.landed < vDated
 						AND iei.warehouseInFk = vWarehouseFk
 						AND (vItemFk IS NULL OR iei.itemFk = vItemFk)
 				UNION ALL

db/routines/vn/procedures/productionControl.sql

@@ -91,7 +91,6 @@ proc: BEGIN
 				pk.code parking,
 				0 H,
 				0 V,
-				0 A,
 				0 N,
 				st.isOk,
 				ag.isOwn,
@@ -139,7 +138,6 @@ proc: BEGIN
 		CHANGE COLUMN `problem` `problem` VARCHAR(255),
 		ADD COLUMN `collectionH` INT,
 		ADD COLUMN `collectionV` INT,
-		ADD COLUMN `collectionA` INT,
 		ADD COLUMN `collectionN` INT;
 
 	-- Clientes Nuevos o Recuperados
@@ -181,13 +179,11 @@ proc: BEGIN
 		SELECT ticketFk,
 				SUM(sub.H) H,
 				SUM(sub.V) V,
-				SUM(sub.A) A,
 				SUM(sub.N) N
 			FROM (
 				SELECT t.ticketFk,
 						SUM(i.itemPackingTypeFk = 'H') H,
 						SUM(i.itemPackingTypeFk = 'V') V,
-						SUM(i.itemPackingTypeFk = 'A') A,
 						SUM(i.itemPackingTypeFk IS NULL) N
 					FROM tmp.productionTicket t
 						JOIN sale s ON s.ticketFk = t.ticketFk
@@ -200,7 +196,6 @@ proc: BEGIN
 			JOIN tItemPackingType ti ON ti.ticketFk = pb.ticketFk
 		SET pb.H = ti.H,
 			pb.V = ti.V,
-			pb.A = ti.A,
 			pb.N = ti.N;
 
 	-- Colecciones segun tipo de encajado
@@ -208,7 +203,6 @@ proc: BEGIN
 			JOIN ticketCollection tc ON pb.ticketFk = tc.ticketFk
 		SET pb.collectionH = IF(pb.H, tc.collectionFk, NULL),
 			pb.collectionV = IF(pb.V, tc.collectionFk, NULL),
-			pb.collectionA = IF(pb.A, tc.collectionFk, NULL),
 			pb.collectionN = IF(pb.N, tc.collectionFk, NULL);
 
 	-- Previa pendiente

db/routines/vn/procedures/sale_replaceItem.sql

@@ -25,11 +25,9 @@ BEGIN
 	DECLARE vNewSaleFk INT;
 	DECLARE vFinalPrice DECIMAL(10,2);
 
-
-	DECLARE vIsRequiredTx BOOL DEFAULT NOT @@in_transaction;
 	DECLARE EXIT HANDLER FOR SQLEXCEPTION
 	BEGIN
-		CALL util.tx_rollback(vIsRequiredTx);
+		ROLLBACK;
 		RESIGNAL;
 	END;
 
@@ -131,6 +129,6 @@ BEGIN
 		VALUES(vItemFk, vNewItemFk, 1)
 		ON DUPLICATE KEY UPDATE counter = counter + 1;
 
-	CALL util.tx_commit(vIsRequiredTx);
+	COMMIT;
 END$$
 DELIMITER ;

db/routines/vn/procedures/ticket_canbePostponed.sql

@@ -30,16 +30,11 @@ BEGIN
 			st.code stateCode,
 			sub2.code futureStateCode,
 			st.classColor,
-			sub2.classColor futureClassColor,
+			sub2.classColor futureClassColor
-			am.id agencyFk,
-			am.name agency,
-			sub2.agencyModeFk futureAgencyFk,
-			sub2.agencyMode futureAgency
 		FROM vn.saleVolume sv
 			JOIN vn.sale s ON s.id = sv.saleFk
 			JOIN vn.item i ON i.id = s.itemFk
 			JOIN vn.ticket t ON t.id = sv.ticketFk
-			JOIN vn.agencyMode am ON am.id = t.agencyModeFk
 			JOIN vn.address a ON a.id = t.addressFk
 			JOIN vn.province p ON p.id = a.provinceFk
 			JOIN vn.country c ON c.id = p.countryFk
@@ -59,11 +54,8 @@ BEGIN
 							st.name state,
 							st.code,
 							st.classColor,
-							am.id agencyModeFk,
-							am.name agencyMode,
 							GROUP_CONCAT(DISTINCT i.itemPackingTypeFk ORDER BY i.itemPackingTypeFk) iptd
 							FROM vn.ticket t
-							JOIN vn.agencyMode am ON am.id = t.agencyModeFk
 								JOIN vn.ticketState ts ON ts.ticketFk = t.id
 								JOIN vn.state st ON st.id = ts.stateFk
 								JOIN vn.sale s ON s.ticketFk = t.id

db/routines/vn/procedures/ticket_close.sql

@@ -10,11 +10,14 @@ BEGIN
 	DECLARE vDone BOOL;
 	DECLARE vClientFk INT;
     DECLARE vCurTicketFk INT;
+	DECLARE vIsTaxDataChecked BOOL;
+	DECLARE vCompanyFk INT;
+	DECLARE vShipped DATE;
 	DECLARE vNewInvoiceId INT;
 	DECLARE vHasDailyInvoice BOOL;
 	DECLARE vWithPackage BOOL;
     DECLARE vHasToInvoice BOOL;
-	DECLARE vStateCode VARCHAR(45);
+	DECLARE vSerial VARCHAR(2);
 
 	DECLARE cur CURSOR FOR
 		SELECT ticketFk FROM tmp.ticket_close;
@@ -35,11 +38,18 @@ BEGIN
 			LEAVE proc;
 		END IF;
 
-		SELECT c.id,
+		SELECT
+				c.id,
+				c.isTaxDataChecked,
+				t.companyFk,
+				t.shipped,
 				c.hasDailyInvoice,
 				w.isManaged,
 				c.hasToInvoice
 			INTO vClientFk,
+				vIsTaxDataChecked,
+				vCompanyFk,
+				vShipped,
 				vHasDailyInvoice,
 				vWithPackage,
 				vHasToInvoice
@@ -49,7 +59,7 @@ BEGIN
 			WHERE t.id = vCurTicketFk;
 
 		INSERT INTO ticketPackaging (ticketFk, packagingFk, quantity)
-			SELECT vCurTicketFk, p.id, COUNT(*)
+			(SELECT vCurTicketFk, p.id, COUNT(*)
 				FROM expedition e
 					JOIN packaging p ON p.id = e.packagingFk
 					JOIN ticket t ON t.id = e.ticketFk
@@ -58,35 +68,39 @@ BEGIN
 				WHERE e.ticketFk = vCurTicketFk AND p.isPackageReturnable
 					AND vWithPackage
 					AND NOT dm.`code`= 'PICKUP'
-				GROUP BY p.itemFk;
+				GROUP BY p.itemFk);
 
 		-- No retornables o no catalogados
-		INSERT INTO sale (
+		INSERT INTO sale (itemFk, ticketFk, concept, quantity, price, isPriceFixed)
-				itemFk,
+			(SELECT e.freightItemFk, vCurTicketFk, i.name, COUNT(*) AS amount, getSpecialPrice(e.freightItemFk, vClientFk), 1
-				ticketFk,
-				concept,
-				quantity,
-				price, isPriceFixed
-			)SELECT e.freightItemFk,
-					vCurTicketFk,
-					i.name,
-					COUNT(*) amount,
-					getSpecialPrice(e.freightItemFk, vClientFk),
-					TRUE
 				FROM expedition e
 					JOIN item i ON i.id = e.freightItemFk
 					LEFT JOIN packaging p ON p.itemFk = i.id
-				WHERE e.ticketFk = vCurTicketFk
+				WHERE e.ticketFk = vCurTicketFk AND IFNULL(p.isPackageReturnable, 0) = 0
-					AND (p.isPackageReturnable = 0 OR p.isPackageReturnable IS NULL)
 					AND getSpecialPrice(e.freightItemFk, vClientFk) > 0
-				GROUP BY e.freightItemFk;
+				GROUP BY e.freightItemFk);
 
-		IF vHasDailyInvoice AND vHasToInvoice THEN
+		IF(vHasDailyInvoice) AND vHasToInvoice THEN
-			SET vStateCode = 'DELIVERED';
+			SELECT invoiceSerial(vClientFk, vCompanyFk, 'quick') INTO vSerial;
-		ELSE
+			IF vSerial IS NULL THEN
-			SELECT getAlert3State(vCurTicketFk) INTO vStateCode;
+				CALL util.throw('Cannot booking without a serial');
+			END IF;
+
+			CALL ticket_setState(vCurTicketFk, 'DELIVERED');
+
+			IF vIsTaxDataChecked THEN
+				CALL invoiceOut_newFromClient(
+					vClientFk,
+					vSerial,
+					vShipped,
+					vCompanyFk,
+					NULL,
+					NULL,
+					vNewInvoiceId);
+			END IF;
+		ELSE
+			CALL ticket_setState(vCurTicketFk, (SELECT vn.getAlert3State(vCurTicketFk)));
 		END IF;
-		CALL ticket_setState(vCurTicketFk, vStateCode);
 	END LOOP;
 
 	CLOSE cur;

db/routines/vn/procedures/ticket_doCmr.sql

@@ -1,7 +1,5 @@
 DELIMITER $$
-CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`ticket_doCmr`(
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`ticket_doCmr`(vSelf INT)
-	vSelf INT
-)
 BEGIN
 /**
 * Crea u actualiza la información del CMR asociado con
@@ -21,7 +19,6 @@ BEGIN
 				a.id addressFk,
 				c2.defaultAddressFk,
 				IFNULL(sat.supplierFk, su.id) supplierFk,
-				t.packages,
 				t.landed
 			FROM ticket t
 				JOIN client c ON c.id = t.clientFk
@@ -36,7 +33,7 @@ BEGIN
 				LEFT JOIN route r ON r.id = t.routeFk
 				LEFT JOIN worker wo ON wo.id = r.workerFk
 				LEFT JOIN vehicle v ON v.id = r.vehicleFk
-				LEFT JOIN agencyMode am ON am.id = t.agencyModeFk
+				LEFT JOIN agencyMode am ON am.id = r.agencyModeFk
 				LEFT JOIN agency ag ON ag.id = am.agencyFk
 				LEFT JOIN supplierAgencyTerm sat ON sat.agencyFk = ag.id
 					AND wo.isFreelance
@@ -55,7 +52,6 @@ BEGIN
 				c.addressToFk = t.addressFk,
 				c.addressFromFk = t.defaultAddressFk,
 				c.supplierFk = t.supplierFk,
-				c.packagesList = t.packages,
 				c.ead = t.landed
 			WHERE id = vCmrFk;
 	ELSE		
@@ -66,7 +62,6 @@ BEGIN
 			addressToFk,
 			addressFromFk,
 			supplierFk,
-			packagesList,
 			ead
 		)
 			SELECT * FROM tTicket;

db/routines/vn/procedures/ticket_setState.sql

@@ -3,25 +3,21 @@ CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`ticket_setState`(
 	vSelf INT,
 	vStateCode VARCHAR(255) COLLATE utf8_general_ci
 )
-proc:BEGIN
+BEGIN
 /**
  * Modifica el estado de un ticket si se cumplen las condiciones necesarias.
  *
  * @param vSelf el id del ticket
  * @param vStateCode estado a modificar del ticket
  */
-	DECLARE vTicketAlertLevel INT;
+	DECLARE vticketAlertLevel INT;
-	DECLARE vTicketStateCode VARCHAR(255) COLLATE utf8_general_ci;
+	DECLARE vTicketStateCode VARCHAR(255);
 	DECLARE vCanChangeState BOOL;
 	DECLARE vPackedAlertLevel INT;
 	DECLARE vZoneFk INT;
-	DECLARE vOldWorkerFk INT;
-	DECLARE vNewWorkerFk INT;
 
-	SET vNewWorkerFk = account.myUser_getId();
+	SELECT s.alertLevel, s.`code`, t.zoneFk
-
+		INTO vticketAlertLevel, vTicketStateCode,  vZoneFk
-	SELECT s.alertLevel, s.`code`, t.zoneFk, tt.userFk
-		INTO vTicketAlertLevel, vTicketStateCode, vZoneFk, vOldWorkerFk
 		FROM state s
 			JOIN ticketTracking tt ON tt.stateFk = s.id
 			JOIN ticket t ON t.id = tt.ticketFk
@@ -37,27 +33,24 @@ proc:BEGIN
 
 	SET vCanChangeState = ((
 			vStateCode <> 'ON_CHECKING' AND vStateCode <> 'CHECKED') OR 
-			vTicketAlertLevel < vPackedAlertLevel
+			vticketAlertLevel < vPackedAlertLevel
 		)AND NOT (
 			vTicketStateCode IN ('CHECKED', 'CHECKING')
 			AND vStateCode IN ('PREPARED', 'ON_PREPARATION')
 		);
 
 	IF vCanChangeState THEN
+		INSERT INTO ticketTracking (stateFk, ticketFk, userFk)
+			SELECT id, vSelf, account.myUser_getId()
+				FROM state
+				WHERE `code` = vStateCode COLLATE utf8_unicode_ci;
+				
 		IF vStateCode = 'PACKED' THEN
 			CALL ticket_doCmr(vSelf);
 		END IF;
-
-		IF vStateCode = vTicketStateCode AND vOldWorkerFk = vNewWorkerFk THEN
-			LEAVE proc;
-		END IF;
-
-		INSERT INTO ticketTracking (stateFk, ticketFk, userFk)
-			SELECT id, vSelf, vNewWorkerFk
-				FROM state
-				WHERE `code` = vStateCode COLLATE utf8_unicode_ci;
 	ELSE
 		CALL util.throw('INCORRECT_TICKET_STATE');
 	END IF;
+	
 END$$
 DELIMITER ;

db/routines/vn/triggers/client_afterUpdate.sql

@@ -16,7 +16,7 @@ BEGIN
 		OR NOT (NEW.socialName <=> OLD.socialName)
 		OR NOT (NEW.street <=> OLD.street)
 		OR NOT (NEW.accountingAccount <=> OLD.accountingAccount)
-		OR NOT (NEW.isVies <=> OLD.isVies)
+		OR NOT (NEW.viesCode <=> OLD.viesCode)
 		OR NOT (NEW.fi <=> OLD.fi)
 		OR NOT (NEW.postcode <=> OLD.postcode)
 		OR NOT (NEW.city <=> OLD.city)

db/routines/vn/triggers/entry_beforeUpdate.sql

@@ -10,6 +10,7 @@ BEGIN
 
 	IF NEW.isBooked = OLD.isBooked AND (
 			NOT (NEW.supplierFk <=> OLD.supplierFk) OR
+			NOT (NEW.dated <=> OLD.dated) OR
 			NOT (NEW.travelFk <=> OLD.travelFk) OR
 			NOT (NEW.companyFk <=> OLD.companyFk) OR
 			NOT (NEW.invoiceInFk <=> OLD.invoiceInFk) OR

db/routines/vn/triggers/roadmapStop_beforeDelete.sql

@@ -0,0 +1,26 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`vn`@`localhost` TRIGGER `vn`.`roadmapStop_beforeDelete`
+	BEFORE DELETE ON `roadmapStop`
+	FOR EACH ROW
+BEGIN
+	DECLARE vMaxEta DATETIME;
+	DECLARE vRoadmapEta DATETIME;
+
+	IF OLD.roadmapFk IS NOT NULL THEN
+		SELECT MAX(eta) INTO vMaxEta
+			FROM roadmapStop
+			WHERE roadmapFk = OLD.roadmapFk
+				AND id <> OLD.id;
+
+		SELECT eta INTO vRoadmapEta
+			FROM roadmap
+			WHERE id = OLD.roadmapFk;
+
+		IF vMaxEta <> vRoadmapEta OR vMaxEta IS NULL THEN
+			UPDATE roadmap
+				SET eta = vMaxEta
+				WHERE id = OLD.roadmapFk;
+		END IF;
+	END IF;
+END$$
+DELIMITER ;

db/routines/vn/triggers/roadmapStop_beforeInsert.sql

@@ -3,6 +3,8 @@ CREATE OR REPLACE DEFINER=`vn`@`localhost` TRIGGER `vn`.`roadmapStop_beforeInser
 	BEFORE INSERT ON `roadmapStop`
 	FOR EACH ROW
 BEGIN
+	DECLARE vRoadmapEta DATETIME;
+
 	SET NEW.editorFk = account.myUser_getId();
 
 	IF NEW.description IS NOT NULL THEN
@@ -14,5 +16,17 @@ BEGIN
 			CALL util.throw('Departure time can not be after arrival time');
 		END IF;
 	END IF;
+
+	IF NEW.roadmapFk IS NOT NULL AND NEW.eta IS NOT NULL THEN
+		SELECT eta INTO vRoadmapEta
+			FROM roadmap
+			WHERE id = NEW.roadmapFk;
+
+		IF vRoadmapEta < NEW.eta OR vRoadmapEta IS NULL THEN
+			UPDATE roadmap
+				SET eta = NEW.eta
+				WHERE id = NEW.roadmapFk;
+		END IF;
+	END IF;
 END$$
 DELIMITER ;

db/routines/vn/triggers/roadmapStop_beforeUpdate.sql

@@ -3,17 +3,40 @@ CREATE OR REPLACE DEFINER=`vn`@`localhost` TRIGGER `vn`.`roadmapStop_beforeUpdat
 	BEFORE UPDATE ON `roadmapStop`
 	FOR EACH ROW
 BEGIN
+	DECLARE vMaxEta DATETIME;
+	DECLARE vCurrentEta DATETIME;
+
 	SET NEW.editorFk = account.myUser_getId();
 
 	IF NOT (NEW.description <=> OLD.description) THEN
 		SET NEW.description = UCASE(NEW.description);
 	END IF;
 
-	IF NOT (NEW.roadmapFk <=> OLD.roadmapFk) OR NOT (NEW.eta <=> OLD.eta) THEN
+	IF (NOT (NEW.roadmapFk <=> OLD.roadmapFk) AND NEW.roadmapFk IS NOT NULL)
+		OR (NOT (NEW.eta <=> OLD.eta)) THEN
 
 		IF NEW.eta < (SELECT etd FROM roadmap WHERE id = NEW.roadmapFk) THEN
 			CALL util.throw('Departure time can not be after arrival time');
 		END IF;
+
+		SELECT MAX(eta) INTO vMaxEta
+			FROM roadmapStop
+			WHERE roadmapFk = NEW.roadmapFk
+				AND id <> OLD.id;
+
+		IF vMaxEta < NEW.eta OR vMaxEta IS NULL THEN
+			SET vMaxEta = NEW.eta;
+		END IF;
+
+		SELECT eta INTO vCurrentEta
+			FROM roadmap
+			WHERE id = NEW.roadmapFk;
+
+		IF (vMaxEta <> vCurrentEta OR vMaxEta IS NULL) OR vMaxEta IS NOT NULL THEN
+			UPDATE roadmap
+				SET eta = vMaxEta
+				WHERE id = NEW.roadmapFk;
+		END IF;
 	END IF;
 END$$
 DELIMITER ;

db/routines/vn/triggers/roadmap_afterUpdate.sql

@@ -0,0 +1,17 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`vn`@`localhost` TRIGGER `vn`.`roadmap_afterUpdate`
+	AFTER UPDATE ON `roadmap`
+	FOR EACH ROW
+BEGIN
+	DECLARE vSeconds INT;
+
+	IF NOT (NEW.etd <=> OLD.etd) THEN
+		SET vSeconds = TIME_TO_SEC(TIMEDIFF(NEW.etd, OLD.etd));
+		IF vSeconds IS NOT NULL AND vSeconds <> 0 THEN
+			UPDATE roadmapStop
+				SET eta = eta + INTERVAL vSeconds SECOND
+				WHERE roadmapFk = NEW.id;
+		END IF;
+	END IF;
+END$$
+DELIMITER ;

db/routines/vn/triggers/roadmap_beforeUpdate.sql

@@ -3,8 +3,6 @@ CREATE OR REPLACE DEFINER=`vn`@`localhost` TRIGGER `vn`.`roadmap_beforeUpdate`
 	BEFORE UPDATE ON `roadmap`
 	FOR EACH ROW
 BEGIN
-	DECLARE vSeconds INT;
-
 	SET NEW.editorFk = account.myUser_getId();
 
 	IF NOT (NEW.name <=> OLD.name) THEN
@@ -39,15 +37,5 @@ BEGIN
 										FROM worker w
 										WHERE w.id = NEW.driverChangeFk);
 	END IF;
-
-	IF NOT (NEW.etd <=> OLD.etd) THEN
-		SET vSeconds = TIME_TO_SEC(TIMEDIFF(NEW.etd, OLD.etd));
-		
-		IF vSeconds <> 0 THEN
-			UPDATE roadmapStop
-				SET eta = eta + INTERVAL vSeconds SECOND
-				WHERE roadmapFk = NEW.id;
-		END IF;
-	END IF;
 END$$
 DELIMITER ;

db/routines/vn/triggers/supplier_afterUpdate.sql

@@ -8,7 +8,7 @@ BEGIN
 		OR NOT (NEW.street <=> OLD.street)
 		OR NOT (NEW.account <=> OLD.account)
 		OR NOT (NEW.nif <=> OLD.nif)
-		OR NOT (NEW.isVies <=> OLD.isVies)
+		OR NOT (NEW.viesCode <=> OLD.viesCode)
 		OR NOT (NEW.provinceFk <=> OLD.provinceFk)
 		OR NOT (NEW.countryFk <=> OLD.countryFk)
 		OR NOT (NEW.postCode <=> OLD.postCode)

db/routines/vn/views/roadmapEta.sql

@@ -1,8 +0,0 @@
-CREATE OR REPLACE DEFINER=`vn`@`localhost`
-	SQL SECURITY DEFINER
-	VIEW `vn`.`roadmapEta`
-AS SELECT `roadmapFk` AS id,
-	MAX(`eta`) AS `eta`
-FROM `vn`.`roadmapStop`
-WHERE `roadmapFk` IS NOT NULL
-GROUP BY `roadmapFk`;

db/routines/vn2008/views/Clientes.sql

@@ -40,7 +40,7 @@ AS SELECT `c`.`id` AS `id_cliente`,
 	`c`.`isCreatedAsServed` AS `isCreatedAsServed`,
 	`c`.`hasInvoiceSimplified` AS `hasInvoiceSimplified`,
 	`c`.`salesPersonFk` AS `Id_Trabajador`,
-	`c`.`isVies` AS `vies`,
+	`c`.`viesCode` AS `vies`,
 	`c`.`bankEntityFk` AS `bankEntityFk`,
 	`c`.`typeFk` AS `typeFk`
 FROM `vn`.`client` `c`

db/versions/10936-wheatAnthurium/00-updateACL.sql

@@ -1,6 +0,0 @@
-INSERT IGNORE INTO salix.ACL (model,property,accessType,permission,principalType,principalId)
-	VALUES
-        ('Ticket','itemLack','READ','ALLOW','ROLE','employee'),
-        ('Ticket','itemLackDetail','READ','ALLOW','ROLE','employee'),
-        ('Ticket','split','WRITE','ALLOW','ROLE','employee'),
-        ('Sale','replaceItem','WRITE','ALLOW','ROLE','employee');

db/versions/11132-aquaDracena/00-firstScript.sql

@@ -1,2 +0,0 @@
-ALTER TABLE vn.ticketConfig ADD lackAlertPrice int(11) DEFAULT 30 NOT NULL COMMENT 'Value to alert when item proposal exceed price';
-ALTER TABLE vn.ticketConfig ADD lackScopeDays int(11) DEFAULT 2 NOT NULL COMMENT 'Number of days to look back for ticket with negatives';

db/versions/11303-salmonMoss/00-firstScript.sql

@@ -0,0 +1,29 @@
+use vn;
+ALTER TABLE vn.client
+	ADD COLUMN IF NOT EXISTS viesCode varchar(2) DEFAULT NULL;
+
+ALTER TABLE vn.supplier
+	ADD COLUMN IF NOT EXISTS viesCode varchar(2) COLLATE utf8mb3_unicode_ci DEFAULT NULL NULL;
+
+-- client
+UPDATE vn.client c
+		JOIN country c2 ON c2.id = c.countryFk
+	SET c.viesCode = c2.code
+	WHERE c.isVies;
+
+UPDATE client c
+		JOIN country c2 ON c2.id = c.countryFk
+	SET c.viesCode = 'FR'
+	WHERE c2.name = 'Mónaco' AND c.isVies;
+
+-- supplier
+UPDATE supplier s
+		JOIN country c ON c.id = s.countryFk
+	SET s.viesCode = c.code
+	WHERE s.isVies;
+
+ALTER TABLE vn.client
+	CHANGE IF EXISTS isVies isVies__ tinyint(4) NOT NULL DEFAULT 0 COMMENT'@deprecated 2025-01-24';
+
+ALTER TABLE vn.supplier
+	CHANGE IF EXISTS isVies isVies__ tinyint(4) NOT NULL DEFAULT 0 COMMENT '@deprecated 2025-01-24';

db/versions/11389-yellowChico/00-firstScript.sql

@@ -1,23 +0,0 @@
-CREATE TABLE vn.parkingCoordinates (
-	parkingFk int(11) NOT NULL,
-	x varchar(5) NOT NULL,
-	y varchar(5) NOT NULL,
-	z varchar(5) NOT NULL,
-	CONSTRAINT parkingCoordinates_pk PRIMARY KEY (parkingFk),
-	CONSTRAINT parkingCoordinates_parking_FK FOREIGN KEY (parkingFk) REFERENCES vn.parking(id) ON DELETE CASCADE ON UPDATE CASCADE
-)
-ENGINE=InnoDB
-DEFAULT CHARSET=utf8mb3
-COLLATE=utf8mb3_unicode_ci;
-
-INSERT INTO vn.parkingCoordinates (parkingFk, x, y, z)
-	SELECT id, `column`, `row`, `floor`
-		FROM vn.parking
-		WHERE `column` IS NOT NULL
-			OR `row` IS NOT NULL
-			OR `floor` IS NOT NULL;
-
-ALTER TABLE vn.parking
-	DROP COLUMN `column`,
-	DROP COLUMN `row`,
-	DROP COLUMN `floor`;

db/versions/11399-bronzeOak/00-firstScript.sql

@@ -1,90 +0,0 @@
-INSERT INTO salix.ACL (model,property,accessType,permission,principalType,principalId)
-	VALUES ('Entry','getBuyList','READ','ALLOW','ROLE','buyer'),
-		('Entry','getBuyUltimate','READ','ALLOW','ROLE','buyer'),
-		('Entry','search','READ','ALLOW','ROLE','buyer'),
-		('Entry','create','WRITE','ALLOW','ROLE','buyer'),
-		('Entry','cloneEntry','WRITE','ALLOW','ROLE','buyer'),
-		('Entry','deleteEntry','WRITE','ALLOW','ROLE','buyer'),
-		('Entry','recalcEntryPrices','WRITE','ALLOW','ROLE','buyer'),
-		('EntryType','find','READ','ALLOW','ROLE','buyer'),
-		('EntryConfig','findOne','READ','ALLOW','ROLE','buyer');
-
-ALTER TABLE vn.ink ADD IF NOT EXISTS hexJson TEXT NOT NULL;
-
-UPDATE vn.ink
-	SET hexJson = CONCAT('{"value": ["',hex,'"]}');
-
-UPDATE vn.ink
-SET hexJson = CASE `name`
-    WHEN 'Blanco/Naranja' THEN '{"value": ["FFFFFF", "FFA500"]}'
-    WHEN 'Sin especificar' THEN '{"value": ["808080"]}'
-    WHEN '2 Colores' THEN '{"value": ["000000", "FFFFFF"]}'
-    WHEN 'Amarillo/Marrón' THEN '{"value": ["FFFF00", "8B4513"]}'
-    WHEN 'Amarillo/Naranja' THEN '{"value": ["FFFF00", "FFA500"]}'
-    WHEN 'Rosa/Blanco/Amarillo' THEN '{"value": ["FFC0CB", "FFFFFF", "FFFF00"]}'
-    WHEN 'Rosa/Amarillo' THEN '{"value": ["FFC0CB", "FFFF00"]}'
-    WHEN 'Antracita' THEN '{"value": ["2F2F2F"]}'
-    WHEN 'Azul/Amarillo' THEN '{"value": ["0000FF", "FFFF00"]}'
-    WHEN 'Azul Claro' THEN '{"value": ["ADD8E6"]}'
-    WHEN 'Azul/Marron' THEN '{"value": ["0000FF", "8B4513"]}'
-    WHEN 'Azul/Verde' THEN '{"value": ["0000FF", "008000"]}'
-    WHEN 'Blanco/Amarillo' THEN '{"value": ["FFFFFF", "FFFF00"]}'
-    WHEN 'Blaugrana' THEN '{"value": ["A50044", "004D98"]}'
-    WHEN 'Blanco/Negro' THEN '{"value": ["FFFFFF", "000000"]}'
-    WHEN 'Blanco/Verde' THEN '{"value": ["FFFFFF", "008000"]}'
-    WHEN 'Blanco/Azul' THEN '{"value": ["FFFFFF", "0000FF"]}'
-    WHEN 'Blanco/Rosa' THEN '{"value": ["FFFFFF", "FFC0CB"]}'
-    WHEN 'Cognac/Verde' THEN '{"value": ["9A463D", "008000"]}'
-    WHEN 'Champagne/Verde' THEN '{"value": ["F7E7CE", "008000"]}'
-    WHEN 'Camuflaje' THEN '{"value": ["6B8E23", "556B2F", "8B4513"]}'
-    WHEN 'Crema/Rosa' THEN '{"value": ["FFFDD0", "FFC0CB"]}'
-    WHEN 'Fucsia/Amarillo' THEN '{"value": ["FF00FF", "FFFF00"]}'
-    WHEN 'Fucsia/Blanco' THEN '{"value": ["FF00FF", "FFFFFF"]}'
-    WHEN 'Fucsia/Crema' THEN '{"value": ["FF00FF", "FFFDD0"]}'
-    WHEN 'Fucsia/Rosa' THEN '{"value": ["FF00FF", "FFC0CB"]}'
-    WHEN 'Fucsia/Verde' THEN '{"value": ["FF00FF", "008000"]}'
-    WHEN 'Granate/Blanco' THEN '{"value": ["800000", "FFFFFF"]}'
-    WHEN 'Gris Lila' THEN '{"value": ["808080", "C8A2C8"]}'
-    WHEN 'Lavanda/Amarillo' THEN '{"value": ["E6E6FA", "FFFF00"]}'
-    WHEN 'Lavanda/Gris' THEN '{"value": ["E6E6FA", "808080"]}'
-    WHEN 'Lividum' THEN '{"value": ["702963"]}'
-    WHEN 'Morado/Amarillo' THEN '{"value": ["800080", "FFFF00"]}'
-    WHEN 'Marrón/Blanco' THEN '{"value": ["8B4513", "FFFFFF"]}'
-    WHEN 'Marron/Gris' THEN '{"value": ["8B4513", "808080"]}'
-    WHEN 'Marron/Negro' THEN '{"value": ["8B4513", "000000"]}'
-    WHEN 'Marrón/Verde' THEN '{"value": ["8B4513", "008000"]}'
-    WHEN 'Matizado' THEN '{"value": ["D3D3D3", "808080", "FFFFFF"]}'
-    WHEN 'Mixto' THEN '{"value": ["FF0000", "0000FF", "008000", "FFFF00"]}'
-    WHEN 'Marrón Oscuro' THEN '{"value": ["654321"]}'
-    WHEN 'Naranja/Marron' THEN '{"value": ["FFA500", "8B4513"]}'
-    WHEN 'Naranja/Rosa' THEN '{"value": ["FFA500", "FFC0CB"]}'
-    WHEN 'Ocre/Burgundi' THEN '{"value": ["CC7722", "800020"]}'
-    WHEN 'Oro/Plata' THEN '{"value": ["FFD700", "C0C0C0"]}'
-    WHEN 'Oro/Negro' THEN '{"value": ["FFD700", "000000"]}'
-    WHEN 'Oro/Verde' THEN '{"value": ["FFD700", "008000"]}'
-    WHEN 'Purpura/Blanco' THEN '{"value": ["800080", "FFFFFF"]}'
-    WHEN 'Purpura/Rosa' THEN '{"value": ["800080", "FFC0CB"]}'
-    WHEN 'Pastel' THEN '{"value": ["FFB6C1", "87CEFA", "98FB98"]}'
-    WHEN 'Plata' THEN '{"value": ["C0C0C0"]}'
-    WHEN 'Plata/Verde' THEN '{"value": ["C0C0C0", "008000"]}'
-    WHEN 'Rojo/Amarillo' THEN '{"value": ["FF0000", "FFFF00"]}'
-    WHEN 'Rojo/Blanco' THEN '{"value": ["FF0000", "FFFFFF"]}'
-    WHEN 'Rojo/Naranja' THEN '{"value": ["FF0000", "FFA500"]}'
-    WHEN 'Rojo/Oro' THEN '{"value": ["FF0000", "FFD700"]}'
-    WHEN 'Rojo/Verde' THEN '{"value": ["FF0000", "008000"]}'
-    WHEN 'Rosa/Lila' THEN '{"value": ["FFC0CB", "C8A2C8"]}'
-    WHEN 'Rosa/Naranja' THEN '{"value": ["FFC0CB", "FFA500"]}'
-    WHEN 'Rojo/Rosa' THEN '{"value": ["FF0000", "FFC0CB"]}'
-    WHEN 'Rosa empolvado' THEN '{"value": ["E6B8AF"]}'
-    WHEN 'Rosa/Verde' THEN '{"value": ["FFC0CB", "008000"]}'
-    WHEN 'Topo/Blanco' THEN '{"value": ["8B8589", "FFFFFF"]}'
-    WHEN 'Topo' THEN '{"value": ["8B8589"]}'
-    WHEN 'Transparente' THEN '{"value": ["00000000"]}'
-    WHEN 'Verde/Amarillo' THEN '{"value": ["008000", "FFFF00"]}'
-    WHEN 'Verde/Negro' THEN '{"value": ["008000", "000000"]}'
-    WHEN 'Variado' THEN '{"value": ["FF0000", "0000FF", "008000", "FFFF00", "FFA500"]}'
-    WHEN 'Verde Claro/Morado' THEN '{"value": ["90EE90", "800080"]}'
-    WHEN 'Verde/Lila' THEN '{"value": ["008000", "C8A2C8"]}'
-    WHEN 'Vaquero Neon' THEN '{"value": ["1560BD", "FFFF00"]}'
-    ELSE hexJson 
-END;

db/versions/11436-bronzeMonstera/00-firstScript.sql

@@ -1,3 +0,0 @@
-ALTER TABLE vn.roadmap
-    MODIFY COLUMN dollyPlate varchar(10) CHARACTER SET utf8mb3 COLLATE utf8mb3_unicode_ci DEFAULT NULL NULL COMMENT
-        'Vehículo sin motor diseñado para conectarse a una unidad tractora, un camión o un vehículo tractor con fuerte potencia de tracción';

db/versions/11436-bronzeMonstera/01-firstScript.sql

@@ -1,3 +0,0 @@
-ALTER TABLE vn.volumeConfig ADD COLUMN id INT(11) NOT NULL AUTO_INCREMENT PRIMARY KEY FIRST;
-
-GRANT UPDATE (palletM3) ON vn.volumeConfig TO deliveryBoss;

db/versions/11436-bronzeMonstera/02-firstScript.sql

@@ -1,3 +0,0 @@
-ALTER TABLE vn.vehicle
-    MODIFY COLUMN typeFk enum('car','van','truck','trailer','tug','dolly','trailerLink')
-        CHARACTER SET utf8mb3 COLLATE utf8mb3_unicode_ci DEFAULT 'van' NOT NULL;

db/versions/11436-bronzeMonstera/03-firstScript.sql

@@ -1 +0,0 @@
-ALTER TABLE vn.roadmap DROP COLUMN eta;

db/versions/11441-limeCyca/00-firstScript.sql

@@ -1,8 +0,0 @@
-UPDATE vn.expedition e
-        JOIN (
-            SELECT id
-            FROM vn.expedition
-            WHERE hostFk COLLATE utf8mb3_unicode_ci NOT IN 
-                (SELECT code COLLATE utf8mb3_unicode_ci FROM vn.host WHERE code IS NOT NULL)
-        ) s ON e.id = s.id
-    SET e.hostFk = 'pc336';

db/versions/11441-limeCyca/01-firstScript.sql

@@ -1,9 +0,0 @@
-ALTER TABLE vn.expedition
-    MODIFY COLUMN hostFk VARCHAR(30) COLLATE utf8mb3_general_ci;
-
-ALTER TABLE vn.expedition
-    ADD CONSTRAINT fk_expedition_host_code
-    FOREIGN KEY (hostFk)
-    REFERENCES host(code)
-    ON UPDATE CASCADE
-    ON DELETE CASCADE;

loopback/locale/en.json

@@ -58,10 +58,10 @@
 	"Swift / BIC can't be empty": "Swift / BIC can't be empty",
 	"Deleted sales from ticket": "I have deleted the following lines from the ticket [{{ticketId}}]({{{ticketUrl}}}): {{{deletions}}}",
 	"Added sale to ticket": "I have added the following line to the ticket [{{ticketId}}]({{{ticketUrl}}}): {{{addition}}}",
-	"Changed sale discount": "I have changed the following lines discounts from the ticket [{{ticketId}}]({{{ticketUrl}}}): {{{changes}}} {{ticketWeekly}}",
+	"Changed sale discount": "I have changed the following lines discounts from the ticket [{{ticketId}}]({{{ticketUrl}}}): {{{changes}}}",
 	"Created claim": "I have created the claim [{{claimId}}]({{{claimUrl}}}) for the following lines from the ticket [{{ticketId}}]({{{ticketUrl}}}): {{{changes}}}",
-	"Changed sale price": "I have changed the price of [{{itemId}} {{concept}}]({{{itemUrl}}}) ({{quantity}}) from {{oldPrice}}€ ➔ *{{newPrice}}€* of the ticket [{{ticketId}}]({{{ticketUrl}}}) {{ticketWeekly}}",
+	"Changed sale price": "I have changed the price of [{{itemId}} {{concept}}]({{{itemUrl}}}) ({{quantity}}) from {{oldPrice}}€ ➔ *{{newPrice}}€* of the ticket [{{ticketId}}]({{{ticketUrl}}})",
-	"Changed sale quantity": "I have changed {{changes}} of the ticket [{{ticketId}}]({{{ticketUrl}}}) {{ticketWeekly}}",
+	"Changed sale quantity": "I have changed {{changes}} of the ticket [{{ticketId}}]({{{ticketUrl}}})",
 	"Changes in sales": "the quantity of [{{itemId}} {{concept}}]({{{itemUrl}}}) from {{oldQuantity}} ➔ *{{newQuantity}}*",
 	"Changed sale reserved state": "I have changed the following lines reserved state from the ticket [{{ticketId}}]({{{ticketUrl}}}): {{{changes}}}",
 	"Bought units from buy request": "Bought {{quantity}} units of [{{itemId}} {{concept}}]({{{urlItem}}}) for the ticket id [{{ticketId}}]({{{url}}})",
@@ -234,7 +234,6 @@
 	"It has been invoiced but the PDF of refund not be generated": "It has been invoiced but the PDF of refund not be generated",
 	"Cannot add holidays on this day": "Cannot add holidays on this day",
 	"Cannot send mail": "Cannot send mail",
-	"This worker already exists": "This worker already exists",
 	"CONSTRAINT `chkParkingCodeFormat` failed for `vn`.`parking`": "CONSTRAINT `chkParkingCodeFormat` failed for `vn`.`parking`",
 	"This postcode already exists": "This postcode already exists",
 	"Original invoice not found": "Original invoice not found",
@@ -254,8 +253,5 @@
 	"Sales already moved": "Sales already moved",
 	"Holidays to past days not available": "Holidays to past days not available",
 	"Incorrect delivery order alert on route": "Incorrect delivery order alert on route: {{ route }} zone: {{ zone }}",
-	"Ticket has been delivered out of order": "The ticket {{ticket}} of route {{{fullUrl}}} has been delivered out of order.",
+	"Ticket has been delivered out of order": "The ticket {{ticket}} of route {{{fullUrl}}} has been delivered out of order."
-    "clonedFromTicketWeekly": ", that is a cloned sale from ticket {{ ticketWeekly }}",
-	"negativeReplaced": "Replaced item [#{{oldItemId}}]({{{oldItemUrl}}}) {{oldItem}} with [#{{newItemId}}]({{{newItemUrl}}}) {{newItem}} from ticket [{{ticketId}}]({{{ticketUrl}}})",
-  	"The tag and priority can't be repeated": "The tag and priority can't be repeated"
 }

loopback/locale/es.json

@@ -121,10 +121,10 @@
     "Incoterms is required for a non UEE member": "El incoterms es requerido para los clientes extracomunitarios",
     "Deleted sales from ticket": "He eliminado las siguientes lineas del ticket [{{ticketId}}]({{{ticketUrl}}}): {{{deletions}}}",
     "Added sale to ticket": "He añadido la siguiente linea al ticket [{{ticketId}}]({{{ticketUrl}}}): {{{addition}}}",
-    "Changed sale discount": "He cambiado el descuento de las siguientes lineas al ticket [{{ticketId}}]({{{ticketUrl}}}): {{{changes}}} {{ticketWeekly}}",
+    "Changed sale discount": "He cambiado el descuento de las siguientes lineas al ticket [{{ticketId}}]({{{ticketUrl}}}): {{{changes}}}",
     "Created claim": "He creado la reclamación [{{claimId}}]({{{claimUrl}}}) de las siguientes lineas del ticket [{{ticketId}}]({{{ticketUrl}}}): {{{changes}}}",
-    "Changed sale price": "He cambiado el precio de [{{itemId}} {{concept}}]({{{itemUrl}}}) ({{quantity}}) de {{oldPrice}}€ ➔ *{{newPrice}}€* del ticket [{{ticketId}}]({{{ticketUrl}}}) {{ticketWeekly}} ",
+    "Changed sale price": "He cambiado el precio de [{{itemId}} {{concept}}]({{{itemUrl}}}) ({{quantity}}) de {{oldPrice}}€ ➔ *{{newPrice}}€* del ticket [{{ticketId}}]({{{ticketUrl}}})",
-    "Changed sale quantity": "He cambiado {{changes}} del ticket [{{ticketId}}]({{{ticketUrl}}}) {{ticketWeekly}}",
+    "Changed sale quantity": "He cambiado {{changes}} del ticket [{{ticketId}}]({{{ticketUrl}}})",
     "Changes in sales": "la cantidad de [{{itemId}} {{concept}}]({{{itemUrl}}}) de {{oldQuantity}} ➔ *{{newQuantity}}*",
     "State": "Estado",
     "regular": "normal",
@@ -396,7 +396,6 @@
     "There are tickets to be invoiced": "La zona tiene tickets por facturar",
     "Incorrect delivery order alert on route": "Alerta de orden de entrega incorrecta en ruta: {{ route }} zona: {{ zone }}",
     "Ticket has been delivered out of order": "El ticket {{ticket}} {{{fullUrl}}} no ha sido entregado en su orden.",
-    "Price cannot be blank": "El precio no puede estar en blanco",
+    "Price cannot be blank": "El precio no puede estar en blanco"
-    "clonedFromTicketWeekly": ", que es una linea clonada del ticket {{ticketWeekly}}",
+
-    "negativeReplaced": "Sustituido el articulo [#{{oldItemId}}]({{{oldItemUrl}}}) {{oldItem}} por [#{{newItemId}}]({{{newItemUrl}}}) {{newItem}} del ticket [{{ticketId}}]({{{ticketUrl}}})"
 }

loopback/locale/fr.json

@@ -368,6 +368,5 @@
 	"ticketLostExpedition": "Le ticket [{{ticketId}}]({{{ticketUrl}}}) a l'expédition perdue suivante : {{expeditionId}}",
 	"The web user's email already exists": "L'email de l'internaute existe déjà",
 	"Incorrect delivery order alert on route": "Alerte de bon de livraison incorrect sur l'itinéraire: {{ route }} zone : {{ zone }}",
-	"Ticket has been delivered out of order": "Le ticket {{ticket}} de la route {{{fullUrl}}} a été livré hors service.",
+	"Ticket has been delivered out of order": "Le ticket {{ticket}} de la route {{{fullUrl}}} a été livré hors service."
-	"negativeReplaced": "Remplacé l'article [#{{oldItemId}}]({{{oldItemUrl}}}) {{oldItem}} par [#{{newItemId}}]({{{newItemUrl}}}) {{newItem}} du ticket [{{ticketId}}]({{{ticketUrl}}})"
 }

loopback/locale/pt.json

@@ -367,6 +367,5 @@
 	"ticketLostExpedition": "O ticket [{{ticketId}}]({{{ticketUrl}}}) tem a seguinte expedição perdida: {{expeditionId}}",
 	"The web user's email already exists": "O e-mail do utilizador da web já existe.",
 	"Incorrect delivery order alert on route": "Alerta de ordem de entrega incorreta na rota: {{ route }} zona: {{ zone }}",
-	"Ticket has been delivered out of order": "O ticket {{ticket}} da rota {{{fullUrl}}} foi entregue fora de ordem.",
+	"Ticket has been delivered out of order": "O ticket {{ticket}} da rota {{{fullUrl}}} foi entregue fora de ordem."
-	"negativeReplaced": "Substituído o artigo [#{{oldItemId}}]({{{oldItemUrl}}}) {{oldItem}} por [#{{newItemId}}]({{{newItemUrl}}}) {{newItem}} do ticket [{{ticketId}}]({{{ticketUrl}}})"
 }

modules/client/back/methods/client/extendedListFilter.js

@@ -124,7 +124,7 @@ module.exports = Self => {
                     c.email,
                     c.created,
                     c.isActive,
-                    c.isVies,
+                    c.viesCode,
                     c.isTaxDataChecked,
                     c.isEqualizated,
                     c.isFreezed,

modules/client/back/methods/client/specs/updateFiscalData.spec.js

@@ -89,4 +89,27 @@ describe('Client updateFiscalData', () => {
             throw e;
         }
     });
+
+    it('should update the client fiscal data, set vies code that is not on the list', async() => {
+        const tx = await models.Client.beginTransaction({});
+
+        try {
+            const options = {transaction: tx};
+            const ctx = {req: {accessToken: {userId: administrativeId}}};
+            ctx.args = {viesCode: 'TT'};
+
+            const client = await models.Client.findById(clientId, null, options);
+
+            expect(client.viesCode).not.toEqual(ctx.args.viesCode);
+
+            const result = await models.Client.updateFiscalData(ctx, clientId, options);
+
+            expect(result.viesCode).toEqual(ctx.args.viesCode);
+
+            await tx.rollback();
+        } catch (e) {
+            await tx.rollback();
+            throw e;
+        }
+    });
 });

modules/client/back/methods/client/updateFiscalData.js

@@ -73,8 +73,8 @@ module.exports = Self => {
                 type: 'boolean'
             },
             {
-                arg: 'isVies',
+                arg: 'viesCode',
-                type: 'boolean'
+                type: 'any'
             },
             {
                 arg: 'isToBeMailed',

modules/client/back/models/client.js

@@ -121,7 +121,7 @@ module.exports = Self => {
         const code = country ? country.code.toLowerCase() : null;
         const countryCode = this.fi?.toLowerCase().substring(0, 2);
 
-        if (!this.fi || !validateTin(this.fi, code) || (this.isVies && countryCode == code))
+        if (!this.fi || !validateTin(this.fi, code) || (this.viesCode && countryCode == code))
             err();
         done();
     }
@@ -248,10 +248,9 @@ module.exports = Self => {
         const models = Self.app.models;
 
         const loopBackContext = LoopBackContext.getCurrentContext();
+        const accessToken = {req: loopBackContext.active.accessToken};
 
-        const accessToken = {req: {accessToken: loopBackContext.active.accessToken}};
+        const editVerifiedDataWithoutTaxDataChecked = models.ACL.checkAccessAcl(
-
-        const editVerifiedDataWithoutTaxDataChecked = await models.ACL.checkAccessAcl(
             accessToken,
             'Client',
             'editVerifiedDataWithoutTaxDataCheck',

modules/client/back/models/client.json

@@ -103,9 +103,6 @@
 		"quality": {
 			"type": "number"
 		},
-		"isVies": {
-			"type": "boolean"
-		},
 		"isRelevant": {
 			"type": "boolean"
 		},
@@ -147,8 +144,10 @@
 		},
 		"hasDailyInvoice": {
 			"type": "boolean"
+		},
+		"viesCode": {
+			"type": "string"
 		}
-
 	},
 	"relations": {
 		"account": {

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

@@ -116,7 +116,7 @@
         </vn-horizontal>
         <vn-horizontal>
             <vn-autocomplete
-                vn-one
+                vn-two
                 vn-id="province"
                 label="Province"
                 ng-model="$ctrl.client.provinceFk"
@@ -138,6 +138,17 @@
                 label="Country"
                 rule>
             </vn-autocomplete>
+            <vn-autocomplete
+                vn-one
+                vn-id="viesCode"
+                ng-model="$ctrl.client.viesCode"
+                data="countries"
+                show-field="code"
+                value-field="code"
+                label="viesCode"
+                info="To use vies that is not listed use Lilium"
+                rule>
+            </vn-autocomplete>
         </vn-horizontal>
         <vn-horizontal>
             <vn-check
@@ -155,9 +166,8 @@
                 ng-model="$ctrl.client.hasToInvoice">
             </vn-check>
             <vn-check
-                label="Vies"
+                label="Invoice by address"
-                info="When activating it, do not enter the country code in the ID field."
+                ng-model="$ctrl.client.hasToInvoiceByAddress">
-                ng-model="$ctrl.client.isVies">
             </vn-check>
         </vn-horizontal>
         <vn-horizontal>
@@ -166,8 +176,9 @@
                 ng-model="$ctrl.client.isToBeMailed">
             </vn-check>
             <vn-check
-                label="Invoice by address"
+                label="Verified data"
-                ng-model="$ctrl.client.hasToInvoiceByAddress">
+                ng-model="$ctrl.client.isTaxDataChecked"
+                vn-acl="salesAssistant">
             </vn-check>
         </vn-horizontal>
         <vn-horizontal>
@@ -177,13 +188,6 @@
                 info="In order to invoice, this field is not consulted, but the consignee's ET. When modifying this field if the invoice by address option is not checked, the change will be automatically propagated to all addresses, otherwise the user will be asked if he wants to propagate it or not."
                 on-change="$ctrl.onChangeEqualizated(value)">
             </vn-check>
-            <vn-check
-                label="Verified data"
-                ng-model="$ctrl.client.isTaxDataChecked"
-                vn-acl="salesAssistant">
-            </vn-check>
-        </vn-horizontal>
-        <vn-horizontal>
             <vn-check
                 label="Electronic invoice"
                 ng-model="$ctrl.client.hasElectronicInvoice"

modules/client/front/fiscal-data/locale/en.yml

@@ -1 +1,2 @@
 Found a client with this phone or email: The client with id <a href="#!/client/{{clientId}}/summary" target="_blank">{{clientId}}</a> already has this phone or email. <br/> ¿Do you want to continue?
+viesCode: Vies

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

@@ -14,3 +14,5 @@ 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
+viesCode: Vies
+To use vies that is not listed use Lilium: Para usar un vies que no estan en la lista use Lilium

modules/entry/back/methods/entry-buys/getBuyList.js

@@ -1,303 +0,0 @@
-const ParameterizedSQL = require('loopback-connector').ParameterizedSQL;
-const buildFilter = require('vn-loopback/util/filter').buildFilter;
-const mergeFilters = require('vn-loopback/util/filter').mergeFilters;
-
-module.exports = Self => {
-    Self.remoteMethodCtx('getBuyList', {
-        description: 'Returns buys for editing of one entry',
-        accessType: 'READ',
-        accepts: [{
-            arg: 'entryFk',
-            type: 'number',
-            required: true,
-            description: 'The entry id',
-            http: {source: 'path'}
-        },
-        {
-            arg: 'filter',
-            type: 'object',
-            description: 'Filter defining where, order, offset, and limit - must be a JSON-encoded string'
-        },
-        {
-            arg: 'isIgnored',
-            type: 'boolean',
-            description: 'check if the buy is ignored',
-            http: {source: 'query'}
-        },
-        {
-            arg: 'itemFk',
-            type: 'number',
-            description: 'item id',
-            http: {source: 'query'}
-        },
-        {
-            arg: 'name',
-            type: 'string',
-            description: 'item name',
-            http: {source: 'query'}
-        },
-        {
-            arg: 'size',
-            type: 'number',
-            description: 'item size',
-            http: {source: 'query'}
-        },
-        {
-            arg: 'stickers',
-            type: 'number',
-            description: 'sticker quantity',
-            http: {source: 'query'}
-        },
-        {
-            arg: 'packagingFk',
-            type: 'number',
-            description: 'packaging id',
-            http: {source: 'query'}
-        },
-        {
-            arg: 'weight',
-            type: 'number',
-            description: 'weight',
-            http: {source: 'query'}
-        },
-        {
-            arg: 'packing',
-            type: 'number',
-            description: 'packing quantity',
-            http: {source: 'query'}
-        },
-        {
-            arg: 'grouping',
-            type: 'number',
-            description: 'grouping quantity',
-            http: {source: 'query'}
-        },
-        {
-            arg: 'quantity',
-            type: 'number',
-            http: {source: 'query'}
-        },
-        {
-            arg: 'buyingValue',
-            type: 'number',
-            http: {source: 'query'}
-        },
-        {
-            arg: 'amount',
-            type: 'number',
-            description: 'buying value * quantity',
-            http: {source: 'query'}
-        },
-        {
-            arg: 'price2',
-            type: 'number',
-            description: 'price for the package',
-            http: {source: 'query'}
-        },
-        {
-            arg: 'price3',
-            type: 'number',
-            description: 'price for the box',
-            http: {source: 'query'}
-        },
-        {
-            arg: 'minPrice',
-            type: 'number',
-            description: 'item minimum price',
-            http: {source: 'query'}
-        },
-        {
-            arg: 'packingOut',
-            type: 'number',
-            description: 'quantity of package on a vn box',
-            http: {source: 'query'}
-        },
-        {
-            arg: 'comment',
-            type: 'string',
-            description: 'item comment',
-            http: {source: 'query'}
-        },
-        {
-            arg: 'subName',
-            type: 'string',
-            description: 'supplier name',
-            http: {source: 'query'}
-        },
-        {
-            arg: 'subName',
-            type: 'string',
-            description: 'supplier name',
-            http: {source: 'query'}
-        },
-        {
-            arg: 'company_name',
-            type: 'string',
-            description: 'company name',
-            http: {source: 'query'}
-        },
-        {
-            arg: 'workerFk',
-            type: 'number',
-            description: 'buyer id',
-            http: {source: 'query'}
-        },
-        {
-            arg: 'itemTypeFk',
-            type: 'number',
-            description: 'item family id',
-            http: {source: 'query'}
-        },
-        {
-            arg: 'groupingMode',
-            type: 'string',
-            description: 'grouping mode',
-            http: {source: 'query'}
-        },
-        {
-            arg: 'hasMinPrice',
-            type: 'boolean',
-            description: 'grouping mode',
-            http: {source: 'query'}
-        },
-        {
-            arg: 'groupBy',
-            type: 'string',
-            description: 'group by',
-            http: {source: 'query'}
-        },
-        ],
-        returns: {
-            type: ['object'],
-            root: true
-        },
-        http: {
-            path: `/:entryFk/getBuyList`,
-            verb: 'GET'
-        }
-    });
-
-    Self.getBuyList = async(ctx, entryFk, filter, options) => {
-        const myOptions = {};
-
-        if (typeof options == 'object')
-            Object.assign(myOptions, options);
-
-        let conn = Self.dataSource.connector;
-        let where = buildFilter(ctx.args, (param, value) => {
-            switch (param) {
-            case 'name':
-            case 'subName':
-            case 'company_name':
-            case 'comment':
-                return {[param]: {like: `%${value}%`}};
-            case 'size':
-            case 'isIgnored':
-            case 'itemFk':
-            case 'stickers':
-            case 'packagingFk':
-            case 'weight':
-            case 'packing':
-            case 'grouping':
-            case 'quantity':
-            case 'buyingValue':
-            case 'amount':
-            case 'price2':
-            case 'price3':
-            case 'packingOut':
-            case 'minPrice':
-            case 'workerFk':
-            case 'itemTypeFk':
-            case 'groupingMode':
-            case 'hasMinPrice':
-                return {[param]: value};
-            }
-        });
-
-        filter = mergeFilters(filter, {where});
-
-        let stmts = [];
-        let stmt;
-
-        const selectFields = `b.id,
-            b.isIgnored,
-            b.itemFk,
-            b.printedStickers,
-            b.stickers,
-            b.packagingFk,
-            b.weight,
-            b.packing,
-            b.groupingMode,
-            b.grouping,
-            b.quantity,
-            b.buyingValue,
-            ROUND(b.buyingValue * b.quantity, 2) amount,
-            b.isChecked,
-            b.price2,
-            b.price3,
-            i.name,
-            i.size,
-            i.minPrice,
-            i.hasMinPrice,
-            i.packingOut,
-            i.comment,
-            i.subName,
-            i.tag5,
-            i.value5,
-            i.tag6,
-            i.value6,
-            i.tag7,
-            i.value7,
-            i.tag8,
-            i.value8,
-            i.tag9,
-            i.value9,
-            i.tag10,
-            i.value10,
-            s.company_name,
-            ik.hexJson,
-            it.workerFk,
-            it.id itemTypeFk
-            `;
-
-        const groupByFields = `SUM(b.printedStickers) printedStickers,
-            SUM(b.packing) packing,
-            SUM(b.stickers) stickers,
-            SUM(b.weight) weight,
-            SUM(b.quantity) quantity,
-            SUM(ROUND(b.buyingValue * b.quantity, 2)) amount
-            `;
-
-        const groupBy = ctx.args.groupBy;
-
-        stmt = new ParameterizedSQL(
-            `SELECT *
-                FROM(
-                    SELECT 
-                        ${ groupBy ? groupByFields : selectFields}
-                    FROM item i
-                        LEFT JOIN ink ik ON ik.id = i.inkFk
-                        LEFT JOIN buy b ON b.itemFk = i.id
-                        LEFT JOIN edi.ekt e ON e.id = b.ektFk
-                        LEFT JOIN edi.supplier s ON e.pro = s.supplier_id
-                        LEFT JOIN itemType it ON it.id = i.typeFk
-                    WHERE b.entryFk = ?
-                    ${groupBy ?? ''}
-                ) sub`,
-            [entryFk]
-        );
-
-        stmt.merge(conn.makeSuffix(filter));
-        let itemsIndex = stmts.push(stmt) - 1;
-
-        let sql = ParameterizedSQL.join(stmts, ';');
-        let result = await conn.executeStmt(sql, myOptions);
-
-        if (groupBy && result.length) {
-            const buys = await Self.app.models.Buy.find({where: {entryFk}}, myOptions);
-            const buysChecked = buys.filter(buy => buy?.isChecked);
-            result[0].isChecked = buysChecked.length === buys.length;
-        }
-        return itemsIndex === 0 ? result : result[itemsIndex];
-    };
-};

modules/entry/back/methods/entry-buys/getBuyUltimate.js

@@ -1,46 +0,0 @@
-module.exports = Self => {
-    Self.remoteMethodCtx('getBuyUltimate', {
-        description: 'Returns the last buy of the item',
-        accessType: 'READ',
-        accepts: [
-            {
-                arg: 'itemFk',
-                type: 'number',
-                required: true
-            }, {
-                arg: 'warehouseFk',
-                type: 'number',
-                required: true
-            }, {
-                arg: 'date',
-                type: 'date',
-                required: true
-            }
-        ],
-        returns: {
-            type: 'object',
-            root: true
-        },
-        http: {
-            path: `/getBuyUltimate`,
-            verb: 'GET'
-        }
-    });
-    Self.getBuyUltimate = async(ctx, itemFk, warehouseFk, date, options) => {
-        const myOptions = {};
-
-        if (typeof options == 'object')
-            Object.assign(myOptions, options);
-
-        await Self.rawSql('CALL vn.buy_getUltimate(?, ?, ?)', [itemFk, warehouseFk, date], myOptions);
-        return Self.rawSql(
-            `SELECT b.* 
-                FROM cache.last_buy lb 
-                    JOIN buy b ON b.id = lb.buy_id 
-                WHERE lb.item_id = ? 
-                ORDER BY (lb.warehouse_id = ?) desc 
-                LIMIT 1`,
-            [itemFk, warehouseFk], myOptions
-        );
-    };
-};

modules/entry/back/methods/entry/cloneEntry.js

@@ -1,46 +0,0 @@
-
-module.exports = Self => {
-    Self.remoteMethodCtx('cloneEntry', {
-        description: 'Clones an entry',
-        accessType: 'WRITE',
-        accepts: [{
-            arg: 'id',
-            type: 'number',
-            required: true,
-            description: 'The entry id',
-            http: {source: 'path'}
-        }],
-        returns: {
-            type: 'object',
-            root: true
-        },
-        http: {
-            path: `/:id/cloneEntry`,
-            verb: 'POST'
-        }
-    });
-
-    Self.cloneEntry = async(ctx, id, options) => {
-        const userId = ctx.req.accessToken.userId;
-        const myOptions = {userId};
-        let tx;
-        if (typeof options == 'object')
-            Object.assign(myOptions, options);
-
-        if (!myOptions.transaction) {
-            tx = await Self.beginTransaction({});
-            myOptions.transaction = tx;
-        }
-        try {
-            await Self.rawSql('CALL entry_clone(?, @newEntryId)', [id], myOptions);
-            const result = await Self.rawSql('SELECT @newEntryId', [], myOptions);
-            const newEntryId = result[0]['@newEntryId'];
-
-            if (tx) await tx.commit();
-            return newEntryId;
-        } catch (e) {
-            if (tx) await tx.rollback();
-            throw e;
-        }
-    };
-};

modules/entry/back/methods/entry/deleteEntry.js

@@ -1,48 +0,0 @@
-
-module.exports = Self => {
-    Self.remoteMethodCtx('deleteEntry', {
-        description: 'Clones an entry',
-        accessType: 'WRITE',
-        accepts: [{
-            arg: 'id',
-            type: 'number',
-            required: true,
-            description: 'The entry id',
-            http: {source: 'path'}
-        }],
-        http: {
-            path: `/:id/deleteEntry`,
-            verb: 'POST'
-        }
-    });
-
-    Self.deleteEntry = async(ctx, id, options) => {
-        const userId = ctx.req.accessToken.userId;
-        const myOptions = {userId};
-        let tx;
-        if (typeof options == 'object')
-            Object.assign(myOptions, options);
-
-        if (!myOptions.transaction) {
-            tx = await Self.beginTransaction({});
-            myOptions.transaction = tx;
-        }
-
-        try {
-            const entry = await Self.findById(id, null, myOptions);
-            await entry.updateAttribute('travelFk', null, myOptions);
-            await Self.rawSql('DELETE FROM vn.duaEntry WHERE entryFk = ?;', [id], myOptions);
-            await Self.rawSql(`
-                DELETE i.*
-                FROM vn.invoiceIn i
-                    JOIN vn.entry e ON e.invoiceInFk = i.id
-                WHERE e.id = ?`, [id], myOptions
-            );
-
-            if (tx) await tx.commit();
-        } catch (e) {
-            if (tx) await tx.rollback();
-            throw e;
-        }
-    };
-};

modules/entry/back/methods/entry/filter.js

@@ -129,68 +129,7 @@ module.exports = Self => {
                 arg: 'finalTemperature',
                 type: 'number',
                 description: 'Final temperature value'
-            },
+            }
-            {
-                arg: 'isExcludedFromAvailable',
-                type: 'boolean',
-                description: `landing date`
-            },
-            {
-                arg: 'isReceived',
-                type: 'boolean',
-                description: `travel received`
-            },
-            {
-                arg: 'isRaid',
-                type: 'boolean',
-                description: `travel isRaid`
-            },
-            {
-                arg: 'landed',
-                type: 'date',
-                description: `landing date`
-            },
-            {
-                arg: 'invoiceNumber',
-                type: 'string',
-                description: `entry invoice`
-            },
-            {
-                arg: 'reference',
-                type: 'string',
-                description: `entry reference`
-            },
-            {
-                arg: 'awbCode',
-                type: 'string',
-                description: `awb code`
-            },
-            {
-                arg: 'agencyModeId',
-                type: 'number',
-                description: `agency mode id`
-            },
-            {
-                arg: 'evaNotes',
-                type: 'string',
-                description: `observation`
-            },
-            {
-                arg: 'warehouseInFk',
-                type: 'number',
-                description: `warehouse in id`
-            },
-            {
-                arg: 'warehouseOutFk',
-                type: 'number',
-                description: `warehouse out id`
-            },
-            {
-                arg: 'entryTypeCode',
-                type: 'string',
-                description: 'entry type code'
-            },
-
         ],
         returns: {
             type: ['object'],
@@ -217,12 +156,19 @@ module.exports = Self => {
                         {'s.name': {like: `%${value}%`}},
                         {'s.nickname': {like: `%${value}%`}}
                     ]};
-            case 'invoiceNumber':
-            case 'reference':
             case 'ref':
-            case 'evaNotes':
                 param = `e.${param}`;
                 return {[param]: {like: `%${value}%`}};
+            case 'created':
+                return {'e.created': {gte: value}};
+            case 'from':
+                return {'t.landed': {gte: value}};
+            case 'fromShipped':
+                return {'t.shipped': {gte: value}};
+            case 'to':
+                return {'t.landed': {lte: value}};
+            case 'toShipped':
+                return {'t.shipped': {lte: value}};
             case 'id':
             case 'isBooked':
             case 'isConfirmed':
@@ -232,20 +178,8 @@ module.exports = Self => {
             case 'currencyFk':
             case 'supplierFk':
             case 'invoiceInFk':
-            case 'isExcludedFromAvailable':
+                param = `e.${param}`;
-                return {[`e.${param}`]: value};
+                return {[param]: value};
-            case 'isReceived':
-            case 'landed':
-            case 'isRaid':
-            case 'warehouseInFk':
-            case 'warehouseOutFk':
-                return {[`t.${param}`]: value};
-            case 'awbCode':
-                return {'a.code': {like: `%${value}%`}};
-            case 'agencyModeId':
-                return {[`am.id`]: value};
-            case 'entryTypeCode':
-                return {[`et.code`]: value};
             case 'initialTemperature':
                 return {'e.initialTemperature': {lte: value}};
             case 'finalTemperature':
@@ -263,14 +197,15 @@ module.exports = Self => {
         const stmts = [];
         let stmt;
         stmt = new ParameterizedSQL(
-            `SELECT e.id,
+            `SELECT
+                    e.id,
                     e.supplierFk,
                     e.dated,
                     e.reference,
                     e.invoiceNumber,
                     e.isBooked,
                     e.isExcludedFromAvailable,
-                    e.evaNotes,
+                    e.evaNotes observation,
                     e.isConfirmed,
                     e.isOrdered,
                     t.isRaid,
@@ -292,27 +227,15 @@ module.exports = Self => {
                     cu.code currencyCode,
                     t.shipped,
                     t.landed,
-                    t.ref travelRef,
+                    t.ref AS travelRef,
                     t.warehouseInFk,
-                    w.name warehouseInName,
+                    w.name warehouseInName
-                    t.warehouseOutFk,
-                    w2.name warehouseOutName,
-                    a.code awbCode,
-                    am.id agencyModeId,
-                    am.name agencyModeName,
-                    et.code entryTypeCode,
-                    et.description entryTypeDescription,
-                    t.isReceived
                 FROM vn.entry e
                     JOIN vn.supplier s ON s.id = e.supplierFk
-                    LEFT JOIN vn.travel t ON t.id = e.travelFk
+                    JOIN vn.travel t ON t.id = e.travelFk
-                    LEFT JOIN vn.warehouse w ON w.id = t.warehouseInFk
+                    JOIN vn.warehouse w ON w.id = t.warehouseInFk
-                    LEFT JOIN vn.warehouse w2 ON w2.id = t.warehouseOutFk
+                    JOIN vn.company co ON co.id = e.companyFk
-                    LEFT JOIN vn.company co ON co.id = e.companyFk
+                    JOIN vn.currency cu ON cu.id = e.currencyFk`
-                    LEFT JOIN vn.currency cu ON cu.id = e.currencyFk
-                    LEFT JOIN vn.awb a ON a.id = t.awbFk
-                    LEFT JOIN vn.agencyMode am ON am.id = t.agencyModeFk
-                    LEFT JOIN vn.entryType et ON et.code = e.typeFk`
         );
 
         stmt.merge(conn.makeWhere(filter.where));

modules/entry/back/methods/entry/recalcEntryPrices.js

@@ -1,49 +0,0 @@
-
-module.exports = Self => {
-    Self.remoteMethodCtx('recalcEntryPrices', {
-        description: 'Clones an entry',
-        accessType: 'WRITE',
-        accepts: [{
-            arg: 'entryFk',
-            type: 'number',
-            required: true,
-            description: 'The entry id',
-            http: {source: 'path'}
-        }],
-        returns: {
-            type: 'object',
-            root: true
-        },
-        http: {
-            path: `/:entryFk/recalcEntryPrices`,
-            verb: 'POST'
-        }
-    });
-
-    Self.recalcEntryPrices = async(ctx, entryFk, options) => {
-        const userId = ctx.req.accessToken.userId;
-        const myOptions = {userId};
-        let tx;
-        if (typeof options == 'object')
-            Object.assign(myOptions, options);
-
-        if (!myOptions.transaction) {
-            tx = await Self.beginTransaction({});
-            myOptions.transaction = tx;
-        }
-        const entry = await Self.findById(entryFk, myOptions);
-        const entryConfig = await Self.app.models.EntryConfig.findOne({}, myOptions);
-
-        if (entry.supplierFk === entryConfig.inventorySupplierFk) return;
-
-        try {
-            const result = await Self.rawSql('CALL vn.buy_recalcPricesByEntry(?)', [entryFk], myOptions);
-
-            if (tx) await tx.commit();
-            return result[0];
-        } catch (e) {
-            if (tx) await tx.rollback();
-            throw e;
-        }
-    };
-};

modules/entry/back/model-config.json

@@ -31,8 +31,5 @@
     },
     "InventoryConfig": {
         "dataSource": "vn"
-    },
-    "EntryConfig": {
-        "dataSource": "vn"
     }
 }

modules/entry/back/models/entry-config.json

@@ -1,30 +0,0 @@
-{
-    "name": "EntryConfig",
-    "base": "VnModel",
-    "mixins": {
-        "Loggable": true
-    },
-    "options": {
-        "mysql": {
-            "table": "entryConfig"
-        }
-    },
-    "properties": {
-        "defaultEntry": {
-            "type": "number",
-            "id": true
-        },
-        "mailToNotify": {
-            "type": "string"
-        },
-        "inventorySupplierFk": {
-            "type": "number"
-        },
-        "maxLockTime": {
-            "type": "number"
-        },
-        "defaultSupplierFk": {
-            "type": "number"
-        }
-    }
-}

modules/entry/back/models/entry.js

@@ -15,13 +15,8 @@ module.exports = Self => {
     require('../methods/entry/transfer')(Self);
     require('../methods/entry/labelSupplier')(Self);
     require('../methods/entry/buyLabelSupplier')(Self);
-    require('../methods/entry-buys/getBuyList')(Self);
-    require('../methods/entry-buys/getBuyUltimate')(Self);
-    require('../methods/entry/cloneEntry')(Self);
-    require('../methods/entry/deleteEntry')(Self);
-    require('../methods/entry/recalcEntryPrices')(Self);
 
-    Self.observe('before save', async(ctx, options) => {
+    Self.observe('before save', async function(ctx, options) {
         if (ctx.isNewInstance) return;
 
         const changes = ctx.data || ctx.instance;

modules/entry/back/models/entry.json

@@ -56,7 +56,8 @@
             "required": true
         },
         "travelFk": {
-            "type": "number"
+            "type": "number",
+            "required": true
         },
         "companyFk": {
             "type": "number",
@@ -73,12 +74,6 @@
         },
         "finalTemperature": {
             "type": "number"
-        },
-        "lockerUserFk":{
-            "type": "number"
-        },
-        "locked":{
-            "type": "date"
         }
     },
     "relations": {
@@ -112,16 +107,6 @@
             "type": "belongsTo",
             "model": "EntryType",
             "foreignKey": "typeFk"
-        },
-        "invoiceIn": {
-            "type": "belongsTo",
-            "model": "InvoiceIn",
-            "foreignKey": "invoiceInFk"
-        },
-        "user": {
-			"type": "belongsTo",
-			"model": "VnUser",
-			"foreignKey": "lockerUserFk"
         }
     }
 }

modules/entry/back/models/specs/entry.spec.js

@@ -29,9 +29,9 @@ describe('entry_isEditable trigger', () => {
     });
 
     async function prepareEntry(isBooked, typeFk) {
-        const companyFk = 69;
+        let newCreated = Date.vnNew();
         await entry.updateAttributes({isBooked, typeFk}, options);
-        await entry.updateAttributes({companyFk}, options);
+        await entry.updateAttributes({dated: newCreated}, options);
     }
 
     it('should throw an error when entry is booked and typeFk is null', async() => {

modules/invoiceOut/back/methods/invoiceOut/filter.js

@@ -32,12 +32,6 @@ module.exports = Self => {
                 description: 'The client id',
                 http: {source: 'query'}
             },
-            {
-                arg: 'companyFk',
-                type: 'integer',
-                description: 'The company id',
-                http: {source: 'query'}
-            },
             {
                 arg: 'fi',
                 type: 'string',
@@ -154,7 +148,6 @@ module.exports = Self => {
                 i.hasPdf,
                 i.customsAgentFk,
                 c.socialName AS clientSocialName,
-                i.companyFk,
                 co.code AS companyCode,
                 ca.fiscalName AS customsAgentName
             FROM invoiceOut i

modules/item/back/methods/fixed-price/filter.js

@@ -22,11 +22,6 @@ module.exports = Self => {
                 type: 'integer',
                 description: 'The item id',
             },
-            {
-                arg: 'name',
-                type: 'string',
-                description: 'The item name',
-            },
             {
                 arg: 'typeFk',
                 type: 'integer',
@@ -117,8 +112,6 @@ module.exports = Self => {
                     : {'it.code': {like: `%${value}%`}};
             case 'categoryFk':
                 return {'it.categoryFk': value};
-            case 'name':
-                return {'i.name': {like: `%${value}%`}};
             case 'buyerFk':
                 return {'it.workerFk': value};
             case 'warehouseFk':

modules/item/back/methods/item/getSimilar.js

@@ -1,43 +0,0 @@
-module.exports = Self => {
-    Self.remoteMethodCtx('getSimilar', {
-        description: 'Returns list of items with similar item requested',
-        accessType: 'READ',
-        accepts: [
-            {
-                arg: 'filter',
-                type: 'Object',
-                required: true,
-                description: 'Filter defining where and paginated data',
-                http: {source: 'query'}
-            }
-        ],
-        returns: {
-            type: ['Object'],
-            root: true
-        },
-        http: {
-            path: `/getSimilar`,
-            verb: 'GET'
-        }
-    });
-
-    Self.getSimilar = async(ctx, filter, options) => {
-        const myOptions = {userId: ctx.req.accessToken.userId};
-
-        if (typeof options == 'object')
-            Object.assign(myOptions, options);
-
-        const {where} = filter;
-
-        const query = [
-            filter.itemFk,
-            where.warehouseFk,
-            where.date,
-            where.showType,
-            where.scopeDays
-        ];
-        const [results] = await Self.rawSql('CALL vn.item_getSimilar(?, ?, ?, ?, ?)', query, myOptions);
-
-        return results;
-    };
-};

modules/item/back/methods/item/search.js

@@ -1,38 +0,0 @@
-const ParameterizedSQL = require('loopback-connector').ParameterizedSQL;
-
-module.exports = Self => {
-    Self.remoteMethodCtx('search', {
-        description: 'Returns an array of search results for a specified item',
-        accepts: [{
-            arg: 'filter',
-            type: 'object',
-            description: 'Filter to define conditions and paginate the data.',
-            required: true
-        }],
-        returns: {
-            type: ['object'],
-            root: true
-        },
-        http: {
-            path: `/search`,
-            verb: 'GET'
-        }
-    });
-
-    Self.search = async(ctx, filter) => {
-        const conn = Self.dataSource.connector;
-
-        const stmt = new ParameterizedSQL(`
-            SELECT *
-                FROM(
-                    SELECT i.id, i.name, i.size, p.name producerName
-                        FROM item i
-                            LEFT JOIN producer p ON p.id = i.producerFk
-                ) sub
-        `);
-
-        stmt.merge(conn.makeSuffix(filter));
-
-        return conn.executeStmt(stmt);
-    };
-};

modules/item/back/methods/item/specs/filter.spec.js

@@ -89,7 +89,7 @@ describe('item filter()', () => {
             const ctx = {args: {filter: filter, workerFk: 16}, req: {accessToken: {userId: 1}}};
             const result = await models.Item.filter(ctx, filter, options);
 
-            expect(result.length).toEqual(3);
+            expect(result.length).toEqual(2);
             expect(result[0].id).toEqual(16);
             expect(result[1].id).toEqual(71);
 

modules/item/back/methods/item/specs/getSimilar.spec.js

@@ -1,49 +0,0 @@
-const models = require('vn-loopback/server/server').models;
-
-describe('Item get similar', () => {
-    let options;
-    let tx;
-    const ctx = beforeAll.getCtx();
-    beforeAll.mockLoopBackContext();
-    beforeEach(async() => {
-        tx = await models.Item.beginTransaction({});
-        options = {transaction: tx};
-    });
-
-    afterEach(async() => {
-        if (tx)
-            await tx.rollback();
-    });
-
-    it('should return similar items', async() => {
-        const filter = {
-            itemFk: 88, sales: 43,
-            where: {
-                'scopeDays': '2',
-                'showType': true,
-                'alertLevelCode': 'FREE',
-                'date': '2001-01-01T11:00:00.000Z',
-                'warehouseFk': 1
-            }
-        };
-        const result = await models.Item.getSimilar(ctx, filter, options);
-
-        expect(result.length).toEqual(2);
-    });
-
-    it('should return empty array is if not exists', async() => {
-        const filter = {
-            itemFk: 88, sales: 43,
-            where: {
-                'scopeDays': '2',
-                'showType': true,
-                'alertLevelCode': 'FREE',
-                'date': '2001-01-01T11:00:00.000Z',
-                'warehouseFk': 60
-            }
-        };
-        const result = await models.Item.getSimilar(ctx, filter, options);
-
-        expect(result.length).toEqual(0);
-    });
-});

modules/item/back/methods/tag/specs/filterValue.spec.js

@@ -26,7 +26,7 @@ describe('tag filterValue()', () => {
             const filter = {where: {value: 'Blue'}, limit: 5};
             const result = await models.Tag.filterValue(colorTagId, filter, options);
 
-            expect(result.length).toEqual(3);
+            expect(result.length).toEqual(2);
             expect(result[0].value).toEqual('Blue');
             expect(result[1].value).toEqual('Blue/Silver');
 

modules/item/back/models/ink.json

@@ -17,9 +17,6 @@
         },
         "showOrder": {
             "type": "number"
-        },
-        "hexJson": {
-            "type": "string"
         }
     },
     "acls": [

modules/item/back/models/item.js

@@ -5,7 +5,6 @@ module.exports = Self => {
     require('../methods/item/clone')(Self);
     require('../methods/item/updateTaxes')(Self);
     require('../methods/item/getBalance')(Self);
-    require('../methods/item/getSimilar')(Self);
     require('../methods/item/lastEntriesFilter')(Self);
     require('../methods/item/getSummary')(Self);
     require('../methods/item/getCard')(Self);
@@ -18,7 +17,6 @@ module.exports = Self => {
     require('../methods/item/buyerWasteEmail')(Self);
     require('../methods/item/setVisibleDiscard')(Self);
     require('../methods/item/get')(Self);
-    require('../methods/item/search')(Self);
 
     Self.validatesPresenceOf('originFk', {message: 'Cannot be blank'});
 

modules/route/back/methods/route/specs/getSuggestedTickets.spec.js

@@ -31,7 +31,7 @@ describe('route getSuggestedTickets()', () => {
             const length = result.length;
             const anyResult = result[Math.floor(Math.random() * Math.floor(length))];
 
-            expect(result.length).toEqual(5);
+            expect(result.length).toEqual(4);
             expect(anyResult.zoneFk).toEqual(1);
             expect(anyResult.agencyModeFk).toEqual(8);
 

modules/route/back/methods/route/specs/unlink.spec.js

@@ -14,7 +14,7 @@ describe('route unlink()', () => {
             let tickets = await models.Route.getSuggestedTickets(routeId, options);
 
             expect(zoneAgencyModes.length).toEqual(4);
-            expect(tickets.length).toEqual(4);
+            expect(tickets.length).toEqual(3);
 
             await models.Route.unlink(agencyModeId, zoneId, options);
 

modules/route/back/models/roadmap.json

@@ -33,7 +33,7 @@
         "observations": {
             "type": "string"
         },
-        "editorFk": {
+        "userFk": {
             "type": "number"
         },
         "price": {

modules/route/back/models/roadmapStop.json

@@ -15,13 +15,16 @@
         "roadmapFk": {
             "type": "number"
         },
+        "addressFk": {
+            "type": "number"
+        },
         "eta": {
             "type": "date"
         },
         "description": {
             "type": "string"
         },
-        "editorFk": {
+        "userFk": {
             "type": "number"
         }
     },
@@ -34,7 +37,7 @@
         "address": {
             "type": "belongsTo",
             "model": "RoadmapAddress",
-            "foreignKey": "roadmapAddressFk"
+            "foreignKey": "addressFk"
         }
     }
 }

modules/shelving/back/models/parking.json

@@ -12,6 +12,14 @@
             "id": true,
             "description": "Identifier"
         },
+        "column": {
+            "type": "string",
+            "required": true
+        },
+        "row": {
+            "type": "string",
+            "required": true
+        },
         "code": {
             "type": "string"
         },

modules/supplier/back/methods/supplier/specs/getItemsPackaging.spec.js

@@ -7,6 +7,6 @@ describe('Supplier getItemsPackaging()', () => {
         expect(item.id).toEqual(1);
         expect(item.name).toEqual('Ranged weapon longbow 200cm');
         expect(item.quantity).toEqual(5000);
-        expect(item.quantityTotal).toEqual(5200);
+        expect(item.quantityTotal).toEqual(5100);
     });
 });

modules/supplier/back/methods/supplier/specs/updateFiscalData.spec.js

@@ -19,6 +19,7 @@ describe('Supplier updateFiscalData()', () => {
     const countryFk = 1;
     const supplierActivityFk = 'animals';
     const healthRegister = '400664487H';
+    const viesCode = 'ES';
 
     let ctx;
     let options;
@@ -120,7 +121,7 @@ describe('Supplier updateFiscalData()', () => {
             supplierActivityFk,
             healthRegister,
             undefined,
-            undefined,
+            viesCode,
             options);
 
         expect(supplier.name).toEqual(name);
@@ -137,5 +138,6 @@ describe('Supplier updateFiscalData()', () => {
         expect(supplier.countryFk).toEqual(countryFk);
         expect(supplier.supplierActivityFk).toEqual(supplierActivityFk);
         expect(supplier.healthRegister).toEqual(healthRegister);
+        expect(supplier.viesCode).toEqual(viesCode);
     });
 });

modules/supplier/back/methods/supplier/updateFiscalData.js

@@ -50,12 +50,12 @@ module.exports = Self => {
         }, {
             arg: 'healthRegister',
             type: 'any'
-        }, {
-            arg: 'isVies',
-            type: 'boolean'
         }, {
             arg: 'isTrucker',
             type: 'boolean'
+        }, {
+            arg: 'viesCode',
+            type: 'any'
         }],
         returns: {
             arg: 'res',
@@ -68,7 +68,7 @@ module.exports = Self => {
         }
     });
 
-    Self.updateFiscalData = async(ctx, supplierId, name, nif, account, phone, sageTaxTypeFk, sageWithholdingFk, sageTransactionTypeFk, postCode, street, city, provinceFk, countryFk, supplierActivityFk, healthRegister, isVies, isTrucker, options) => {
+    Self.updateFiscalData = async(ctx, supplierId, name, nif, account, phone, sageTaxTypeFk, sageWithholdingFk, sageTransactionTypeFk, postCode, street, city, provinceFk, countryFk, supplierActivityFk, healthRegister, isTrucker, viesCode, options) => {
         const models = Self.app.models;
         const {args} = ctx;
         const myOptions = {};
@@ -102,8 +102,8 @@ module.exports = Self => {
             countryFk,
             supplierActivityFk,
             healthRegister,
-            isVies,
+            isTrucker,
-            isTrucker
+            viesCode
         }, myOptions);
     };
 };

modules/supplier/back/models/supplier.js

@@ -74,7 +74,7 @@ module.exports = Self => {
         const code = country ? country.code.toLowerCase() : null;
         const countryCode = this.nif?.toLowerCase().substring(0, 2);
 
-        if (!validateTin(this.nif, code) || (this.isVies && countryCode == code))
+        if (!validateTin(this.nif, code) || (this.viesCode && countryCode == code))
             err();
         done();
     }

modules/supplier/back/models/supplier.json

@@ -111,8 +111,8 @@
         "healthRegister": {
             "type": "string"
         },
-        "isVies": {
+        "viesCode": {
-            "type": "boolean"
+			"type": "string"
 		},
         "companySize": {
             "type": "string"

modules/ticket/back/methods/boxing/getVideo.js

@@ -49,7 +49,7 @@ module.exports = Self => {
                     ps.monitorId,
                     e.created
                 FROM expedition e
-                    JOIN host h ON h.code = e.hostFk
+                    JOIN host h ON Convert(h.code USING utf8mb3) COLLATE utf8mb3_unicode_ci = e.hostFk
                     JOIN packingSite ps ON  ps.hostFk = h.id
                 WHERE e.id = ?;`;
         const [expedition] = await models.Expedition.rawSql(query, [id]);

modules/ticket/back/methods/boxing/getVideoList.js

@@ -44,14 +44,12 @@ module.exports = Self => {
                 ps.monitorId,
                 e.created
             FROM expedition e
-                JOIN host h ON h.code = e.hostFk
+                JOIN host h ON Convert(h.code USING utf8mb3) COLLATE utf8mb3_unicode_ci = e.hostFk
                 JOIN packingSite ps ON  ps.hostFk = h.id
             WHERE e.id = ?;`;
-
+        const [expedition] = await models.PackingSiteConfig.rawSql(query, [id]);
-        const [expedition] = await models.PackingSiteConfig.rawSql(query, [id], myOptions);
 
         if (!from && !expedition) return [];
-
         let start = new Date(expedition.created);
         let end = new Date(start.getTime() + (packingSiteConfig.avgBoxingTime * 1000));
 
@@ -59,13 +57,9 @@ module.exports = Self => {
             start.setHours(from, 0, 0);
             end.setHours(to, 0, 0);
         }
-
         const offset = start.getTimezoneOffset();
         start = new Date(start.getTime() - (offset * 60 * 1000));
         end = new Date(end.getTime() - (offset * 60 * 1000));
-        const minutes = start.getMinutes();
-        const roundedMinutes = minutes - (minutes % 15);
-        start.setMinutes(roundedMinutes, 0, 0);
 
         const videoUrl =
             `/${packingSiteConfig.shinobiToken}/videos/${packingSiteConfig.shinobiGroupKey}/${expedition.monitorId}`;
@@ -79,7 +73,6 @@ module.exports = Self => {
         } catch (e) {
             return [];
         }
-
         return response.data.videos.map(video => video.filename);
     };
 };

modules/ticket/back/methods/boxing/specs/getVideoList.spec.js

@@ -2,28 +2,35 @@ const models = require('vn-loopback/server/server').models;
 const axios = require('axios');
 
 describe('boxing getVideoList()', () => {
-    let tx;
+    it('should return video list', async() => {
-    let options;
+        const tx = await models.PackingSiteConfig.beginTransaction({});
 
-    beforeEach(async() => {
+        try {
-        tx = await models.PackingSiteConfig.beginTransaction({});
+            const options = {transaction: tx};
-        options = {transaction: tx};
+
-    });
+            const id = 1;
+            const from = 1;
+            const to = 2;
+
+            const response = {
+                data: {
+                    videos: [{
+                        id: 1,
+                        filename: 'video1.mp4'
+                    }]
+                }
+            };
+
+            spyOn(axios, 'get').and.returnValue(new Promise(resolve => resolve(response)));
+
+            const result = await models.Boxing.getVideoList(id, from, to, options);
+
+            expect(result[0]).toEqual(response.data.videos[0].filename);
 
-    afterEach(async() => {
             await tx.rollback();
-    });
+        } catch (e) {
-
+            await tx.rollback();
-    it('should make the correct API call', async() => {
+            throw e;
-        const expedition = await models.Expedition.findById(15, null, options);
+        }
-        await expedition.updateAttribute('created', '2000-12-01 07:07:00', options);
-
-        const axiosSpy = spyOn(axios, 'get').and.callThrough();
-        await models.Boxing.getVideoList(expedition.id, undefined, undefined, options);
-
-        const expectedStartTime = '2000-12-01T07:00:00';
-        const calledUrl = axiosSpy.calls.mostRecent().args[0];
-
-        expect(calledUrl).toContain(`start=${expectedStartTime}`);
     });
 });

modules/ticket/back/methods/sale/replaceItem.js

@@ -1,99 +0,0 @@
-
-module.exports = Self => {
-    Self.remoteMethodCtx('replaceItem', {
-        description: 'Replace item from sale',
-        accessType: 'WRITE',
-        accepts: [
-            {
-                arg: 'saleFk',
-                type: 'number',
-                required: true,
-            },
-            {
-                arg: 'substitutionFk',
-                type: 'number',
-                required: true
-            },
-            {
-                arg: 'quantity',
-                type: 'number',
-                required: true
-            }
-        ],
-        returns: {
-            type: 'object',
-            root: true
-        },
-        http: {
-            path: `/replaceItem`,
-            verb: 'POST'
-        }
-    });
-
-    Self.replaceItem = async(ctx, saleFk, substitutionFk, quantity, options) => {
-        const myOptions = {userId: ctx.req.accessToken.userId};
-        let tx;
-        const $t = ctx.req.__;
-
-        const models = Self.app.models;
-
-        if (typeof options == 'object')
-            Object.assign(myOptions, options);
-
-        if (!myOptions.transaction) {
-            tx = await Self.beginTransaction({});
-            myOptions.transaction = tx;
-        }
-
-        try {
-            const replaceItemQuery = {
-                sql: 'CALL sale_replaceItem(?,?,?)',
-                query: [saleFk, substitutionFk, quantity]
-            };
-            const resultReplaceItem = await Self.rawSql(replaceItemQuery.sql, replaceItemQuery.query, myOptions);
-            const sale = await models.Sale.findById(saleFk, {
-                fields: ['id', 'ticketFk', 'itemFk', 'quantity', 'price'],
-                include: [
-                    {
-                        relation: 'ticket',
-                        scope: {
-                            fields: ['id']
-                        },
-                    }, {
-                        relation: 'item',
-                        scope: {
-                            fields: ['id', 'name', 'longName']
-                        }
-                    }
-                ]
-            }, myOptions);
-
-            const salesPersonQuery = {
-                sql: 'SELECT vn.client_getSalesPersonByTicket(?)',
-                query: [sale.ticketFk]
-            };
-            const salesPerson = await Self.rawSql(salesPersonQuery.sql, salesPersonQuery.query, myOptions);
-            const url = await models.Url.getUrl();
-            const substitution = await models.Item.findById(substitutionFk, {
-                fields: ['id', 'name', 'longName']
-            }, myOptions);
-
-            const message = $t('negativeReplaced', {
-                oldItemId: sale.itemFk,
-                oldItem: sale.item().longName,
-                oldItemUrl: `${url}item/${sale.itemFk}/summary`,
-                newItemId: substitution.id,
-                newItem: substitution.longName,
-                newItemUrl: `${url}item/${substitution.id}/summary`,
-                ticketId: sale.ticketFk,
-                ticketUrl: `${url}ticket/${sale.ticketFk}/sale`
-            });
-            await models.Chat.sendCheckingPresence(ctx, salesPerson.id, message);
-
-            return resultReplaceItem;
-        } catch (e) {
-            if (tx) await tx.rollback();
-            throw e;
-        }
-    };
-};

modules/ticket/back/methods/sale/specs/replaceItem.spec.js

@@ -1,61 +0,0 @@
-const {models} = require('vn-loopback/server/server');
-
-describe('Sale - replaceItem function', () => {
-    let options;
-    let tx;
-    const ctx = beforeAll.getCtx();
-    beforeAll.mockLoopBackContext();
-    beforeEach(async() => {
-        tx = await models.Sale.beginTransaction({});
-        options = {transaction: tx};
-    });
-
-    afterEach(async() => {
-        if (tx)
-            await tx.rollback();
-    });
-
-    it('should replace full item in sale and send notification', async() => {
-        const saleFk = 43;
-        const substitutionFk = 3;
-        const quantity = 15;
-        const ticketFk = 1000000;
-
-        const salesBefore = await models.Sale.find({where: {ticketFk}}, options);
-        const salesLength = salesBefore.length;
-
-        expect(1).toEqual(salesBefore.length);
-
-        await models.Sale.replaceItem(ctx, saleFk, substitutionFk, quantity, options);
-        const salesAfter = await models.Sale.find({where: {ticketFk}}, options);
-
-        expect(salesLength).toBeLessThan(salesAfter.length);
-        expect(salesAfter[0].id).toEqual(saleFk);
-        expect(salesAfter[salesLength].itemFk).toEqual(substitutionFk);
-        expect(salesAfter[salesLength].quantity).toEqual(quantity);
-        expect(salesAfter[0].quantity).toEqual(0);
-        expect(salesAfter[salesLength].concept).toMatch(/^\+/);
-    });
-
-    it('should replace half item in sale and send notification', async() => {
-        const saleFk = 43;
-        const substitutionFk = 3;
-        const quantity = 10;
-        const ticketFk = 1000000;
-
-        const salesBefore = await models.Sale.find({where: {ticketFk}}, options);
-        const salesLength = salesBefore.length;
-
-        expect(1).toEqual(salesBefore.length);
-
-        await models.Sale.replaceItem(ctx, saleFk, substitutionFk, quantity, options);
-        const salesAfter = await models.Sale.find({where: {ticketFk}}, options);
-
-        expect(salesLength).toBeLessThan(salesAfter.length);
-        expect(salesAfter[0].id).toEqual(saleFk);
-        expect(salesAfter[salesLength].itemFk).toEqual(substitutionFk);
-        expect(salesAfter[salesLength].quantity).toEqual(quantity);
-        expect(salesAfter[0].quantity).toEqual(5);
-        expect(salesAfter[salesLength].concept).toMatch(/^\+/);
-    });
-});

modules/ticket/back/methods/sale/updatePrice.js

@@ -113,12 +113,6 @@ module.exports = Self => {
             const salesPerson = sale.ticket().client().salesPersonUser();
             if (salesPerson) {
                 const url = await Self.app.models.Url.getUrl();
-
-                const saleCloned = await Self.app.models.SaleCloned.findById(sale.id, {
-                    include: 'saleOriginal',
-                });
-                const ticketWeekly = saleCloned?.saleOriginal()?.ticketFk || null;
-
                 const message = $t('Changed sale price', {
                     ticketId: sale.ticket().id,
                     itemId: sale.itemFk,
@@ -127,8 +121,7 @@ module.exports = Self => {
                     oldPrice: oldPrice,
                     newPrice: newPrice,
                     ticketUrl: `${url}ticket/${sale.ticket().id}/sale`,
-                    itemUrl: `${url}item/${sale.itemFk}/summary`,
+                    itemUrl: `${url}item/${sale.itemFk}/summary`
-                    ticketWeekly: ticketWeekly ? $t('clonedFromTicketWeekly', {ticketWeekly}) : null
                 });
                 await models.Chat.sendCheckingPresence(ctx, salesPerson.id, message, myOptions);
             }

modules/ticket/back/methods/sale/updateQuantity.js

@@ -72,12 +72,6 @@ module.exports = Self => {
             const salesPerson = sale.ticket().client().salesPersonUser();
             if (salesPerson) {
                 const url = await Self.app.models.Url.getUrl();
-
-                const saleCloned = await Self.app.models.SaleCloned.findById(sale.id, {
-                    include: 'saleOriginal',
-                });
-                const ticketWeekly = saleCloned?.saleOriginal()?.ticketFk || null;
-
                 const change = $t('Changes in sales', {
                     itemId: sale.itemFk,
                     concept: sale.concept,
@@ -90,7 +84,6 @@ module.exports = Self => {
                     ticketId: sale.ticket().id,
                     changes: JSON.stringify(change),
                     ticketUrl: `${url}ticket/${sale.ticket().id}/sale`,
-                    ticketWeekly: ticketWeekly ? $t('clonedFromTicketWeekly', {ticketWeekly}) : null
                 });
 
                 await models.Chat.sendCheckingPresence(ctx, salesPerson.id, message, myOptions);

modules/ticket/back/methods/ticket/closeAll.js

@@ -1,5 +1,4 @@
-const smtp = require('vn-print/core/smtp');
+const closure = require('./closure');
-const config = require('vn-print/core/config');
 
 module.exports = Self => {
     Self.remoteMethodCtx('closeAll', {
@@ -26,62 +25,122 @@ module.exports = Self => {
     Self.closeAll = async(ctx, options) => {
         const userId = ctx.req.accessToken.userId;
         const myOptions = {userId};
-        let tx;
+
         if (typeof options == 'object')
             Object.assign(myOptions, options);
 
-        if (!myOptions.transaction) {
+        let tx;
-            tx = await Self.beginTransaction({});
+        // IMPORTANT: Due to its high cost in production, wrapping this process in a transaction may cause timeouts.
-            myOptions.transaction = tx;
+
-        }
         const toDate = Date.vnNew();
         toDate.setHours(0, 0, 0, 0);
         toDate.setDate(toDate.getDate() - 1);
-        const [{dateFrom, dateTo}] = await Self.rawSql(`
-            SELECT ? - INTERVAL closureDaysAgo DAY dateFrom,
-                    util.dayEnd(?) dateTo
-                FROM ticketConfig
-                LIMIT 1`, [toDate, toDate], myOptions);
 
-        await Self.rawSql(`
+        const tickets = await Self.rawSql(`
-            DROP TEMPORARY TABLE IF EXISTS tmp.ticket_close;
+            SELECT t.id,
-            CREATE TEMPORARY TABLE tmp.ticket_close
-                ENGINE = MEMORY
-            WITH wTickets AS(
-                SELECT t.id ticketFk
-                    FROM ticket t
-                        JOIN warehouse wh ON wh.id = t.warehouseFk AND wh.hasComission
-                    WHERE t.shipped BETWEEN ? AND ?
-                        AND t.refFk IS NULL
-            ), wTicketsTracking AS(
-            SELECT wt.ticketFk, MAX(tt.id) maxTracking
-                FROM wTickets wt
-                    JOIN ticketTracking tt ON tt.ticketFk = wt.ticketFk
-                GROUP BY tt.ticketFk
-            ), wTicketsLastState AS(
-                SELECT wt.ticketFk, tt.stateFk
-                    FROM wTicketsTracking wt
-                        JOIN ticketTracking tt ON tt.id = wt.maxTracking
-            ) SELECT tls.ticketFk,
                     t.clientFk,
+                    t.companyFk,
+                    c.id clientFk,
                     c.name clientName,
                     c.email recipient,
-                    eu.email salesPersonEmail,
+                    c.salesPersonFk,
-                    t.addressFk,
+                    c.isToBeMailed,
+                    c.hasToInvoice,
                     c.hasDailyInvoice,
-                    c.hasToInvoiceByAddress,
+                    eu.email salesPersonEmail,
-                    t.totalWithVat,
+                    t.addressFk
-                    t.companyFk
+                FROM ticket t
-                FROM wTicketsLastState tls
-                    JOIN ticket t ON t.id = tls.ticketFk
-                    JOIN state s ON s.id =tls.stateFk
-                    JOIN alertLevel al ON al.id = s.alertLevel
                     JOIN agencyMode am ON am.id = t.agencyModeFk
+                    JOIN warehouse wh ON wh.id = t.warehouseFk AND wh.hasComission
+                    JOIN ticketState ts ON ts.ticketFk = t.id
+                    JOIN alertLevel al ON al.id = ts.alertLevel
                     JOIN client c ON c.id = t.clientFk
+                    JOIN province p ON p.id = c.provinceFk
+                    JOIN country co ON co.id = p.countryFk
                     LEFT JOIN account.emailUser eu ON eu.userFk = c.salesPersonFk
-                WHERE (al.code = 'PACKED' OR (am.code = 'refund' AND al.code <> 'delivered'));
+                    JOIN ticketConfig tc ON TRUE
-            CALL ticket_close();
+                WHERE (al.code = 'PACKED' OR (am.code = 'refund' AND al.code <> 'delivered'))
-        `, [dateFrom, dateTo], myOptions);
+                    AND t.shipped BETWEEN ? - INTERVAL tc.closureDaysAgo DAY AND util.dayEnd(?)
+                    AND t.refFk IS NULL
+                GROUP BY t.id
+        `, [toDate, toDate], myOptions);
+        const ticketIds = tickets.map(ticket => ticket.id);
+        await Self.rawSql(`
+            INSERT INTO util.debug (variable, value)
+                VALUES ('nightInvoicing', ?)
+        `, [ticketIds.join(',')], myOptions);
+
+        await Self.rawSql(`
+        WITH ticketNotInvoiceable AS(
+            SELECT JSON_OBJECT(
+                'tickets',
+                JSON_ARRAYAGG(
+                    JSON_OBJECT(
+                        'ticketId', ticketFk,
+                        'reason', reason,
+                        'clientId', clientFk
+                    )
+                )
+            )errors
+            FROM (
+                SELECT ticketFk,
+                        CONCAT_WS(', ',
+                            IF(hasErrorToInvoice, 'Facturar', NULL),
+                            IF(hasErrorTaxDataChecked, 'Datos comprobados', NULL),
+                            IF(hasErrorDeleted, 'Eliminado', NULL),
+                            IF(hasErrorItemTaxCountry, 'Impuesto no informado', NULL),
+                            IF(hasErrorAddress, 'Sin dirección', NULL),
+                            IF(hasErrorInfoTaxAreaWorld, 'Datos exportaciones', NULL)) reason,
+                        clientFk
+                    FROM (
+                        SELECT t.id ticketFk,
+                                SUM(NOT c.hasToInvoice) hasErrorToInvoice,
+                                SUM(NOT c.isTaxDataChecked) hasErrorTaxDataChecked,
+                                SUM(t.isDeleted) hasErrorDeleted,
+                                SUM(itc.id IS NULL) hasErrorItemTaxCountry,
+                                SUM(a.id IS NULL) hasErrorAddress,
+                                SUM(ios.code IS NOT NULL
+                                    AND(ad.customsAgentFk IS NULL
+                                        OR ad.incotermsFk IS NULL)) hasErrorInfoTaxAreaWorld,
+                                t.clientFk clientFk
+                            FROM ticket t
+                                LEFT JOIN address ad ON ad.id = t.addressFk
+                                JOIN sale s ON s.ticketFk = t.id
+                                JOIN item i ON i.id = s.itemFk
+                                JOIN supplier su ON su.id = t.companyFk
+                                JOIN agencyMode am ON am.id = t.agencyModeFk
+                                JOIN warehouse wh ON wh.id = t.warehouseFk AND wh.hasComission
+                                JOIN ticketState ts ON ts.ticketFk = t.id
+                                JOIN alertLevel al ON al.id = ts.alertLevel
+                                JOIN client c ON c.id = t.clientFk
+                                JOIN province p ON p.id = c.provinceFk
+                                JOIN ticketConfig tc ON TRUE
+                                LEFT JOIN autonomy a ON a.id = p.autonomyFk
+                                JOIN country co ON co.id = p.countryFk
+                                LEFT JOIN account.emailUser eu ON eu.userFk = c.salesPersonFk
+                                LEFT JOIN itemTaxCountry itc ON itc.itemFk = i.id
+                                    AND itc.countryFk = su.countryFk
+                                LEFT JOIN vn.invoiceOutSerial ios ON ios.taxAreaFk = 'WORLD'
+                                    AND ios.code = invoiceSerial(t.clientFk, t.companyFk, 'multiple')
+                            WHERE (al.code = 'PACKED' OR (am.code = 'refund' AND al.code <> 'delivered'))
+                                AND t.shipped BETWEEN ? - INTERVAL tc.closureDaysAgo DAY AND util.dayEnd(?)
+                                AND t.refFk IS NULL
+                                AND c.hasDailyInvoice
+                            GROUP BY ticketFk
+                            HAVING hasErrorToInvoice
+                                OR hasErrorTaxDataChecked
+                                OR hasErrorDeleted
+                                OR hasErrorItemTaxCountry
+                                OR hasErrorAddress
+                                OR hasErrorInfoTaxAreaWorld
+                    )sub
+                )sub2
+            ) SELECT IF(errors = '{"tickets": null}',
+                    'No errors',
+                    util.notification_send('invoice-ticket-closure', errors, NULL))
+                FROM ticketNotInvoiceable`, [toDate, toDate], myOptions);
+
+        await closure(ctx, Self, tickets, myOptions);
 
         await Self.rawSql(`
             UPDATE ticket t
@@ -92,100 +151,17 @@ module.exports = Self => {
                     JOIN ticketConfig tc ON TRUE
                     LEFT JOIN ticketObservation tob ON tob.ticketFk = t.id
                 SET t.routeFk = NULL
-                WHERE t.shipped BETWEEN ? AND ?
+                WHERE t.shipped BETWEEN ? - INTERVAL tc.closureDaysAgo DAY AND util.dayEnd(?)
                     AND al.code NOT IN ('DELIVERED', 'PACKED')
                     AND NOT t.packages
                     AND tob.id IS NULL
-                    AND t.routeFk`, [dateFrom, dateTo], myOptions);
+                    AND t.routeFk`, [toDate, toDate], myOptions);
-
-        const [clients] = await Self.rawSql(`
-            SELECT clientFk clientId,
-                    clientName,
-                    recipient,
-                    salesPersonEmail,
-                    addressFk addressId,
-                    companyFk,
-                    SUM(totalWithVat) total,
-                    'quick' serialType
-                FROM tmp.ticket_close
-                WHERE hasDailyInvoice
-                GROUP BY IF (hasToInvoiceByAddress, addressFk, clientFk), companyFk
-                HAVING total > 0;
-            DROP TEMPORARY TABLE tmp.ticket_close;
-        `, [], myOptions);
 
         if (tx)
             await tx.commit();
 
-        const failedClients = [];
-        const nestedTransaction = options?.transaction ? myOptions : {};
-        for (const client of clients) {
-            ctx.args = {
-                ...client,
-                invoiceDate: Date.vnNew(),
-                maxShipped: toDate
-            };
-            try {
-                const id = await Self.app.models.InvoiceOut.invoiceClient(ctx, nestedTransaction);
-                if (id)
-                    await Self.app.models.InvoiceOut.makePdfAndNotify(ctx, id, null, nestedTransaction);
-            } catch (error) {
-                await Self.rawSql(`
-                    INSERT INTO util.debug (variable, value)
-                        VALUES ('invoicingTicketError', ?)
-                `, [client.clientId + ' - ' + error]);
-
-                if (error.responseCode == 450) {
-                    await invalidEmail(client);
-                    continue;
-                }
-
-                failedClients.push({
-                    id: client.clientId,
-                    address: client.addressId,
-                    error
-                });
-            }
-        }
-
-        if (failedClients.length > 0) {
-            let body = 'This following tickets have failed:<br/><br/>';
-
-            for (const client of failedClients) {
-                body += `Client: <strong>${client.id}</strong>
-                        Address: <strong>${client.address}</strong>
-                            <br/> <strong>${client.error}</strong><br/><br/>`;
-            }
-
-            smtp.send({
-                to: config.app.reportEmail,
-                subject: '[API] Nightly ticket closure report',
-                html: body,
-            }).catch(err => console.error(err));
-        }
-
         return {
             message: 'Success'
         };
     };
-
-    async function invalidEmail(client) {
-        await Self.rawSql(
-            `UPDATE client SET email = NULL WHERE id = ?`,
-            [client.clientId],
-            myOptions
-        );
-
-        const body = `No se ha podido facturar al cliente <strong>${client.clientId} - ${client.clientName}</strong>
-            porque la dirección de email <strong>"${client.recipient}"</strong> no es correcta
-            o no está disponible.<br/><br/>
-            Para evitar que se repita este error, se ha eliminado la dirección de email de la ficha del cliente.
-            Actualiza la dirección de email con una correcta.`;
-
-        smtp.send({
-            to: client.salesPersonEmail,
-            subject: 'No se ha podido enviar el albarán',
-            html: body,
-        }).catch(err => console.error(err));
-    }
 };

modules/ticket/back/methods/ticket/closure.js

@@ -120,7 +120,7 @@ module.exports = async function(ctx, Self, tickets, options) {
                         JOIN client c ON c.id = t.clientFk
                     WHERE t.clientFk = ?
                         AND NOT t.isDeleted
-                        AND c.isVies
+                        AND c.viesCode IS NOT NULL
                 `,
             [ticket.clientFk],
             myOptions);

modules/ticket/back/methods/ticket/itemLack.js

@@ -1,111 +0,0 @@
-module.exports = Self => {
-    Self.remoteMethod('itemLack', {
-        description: 'Get tickets as negative status',
-        accessType: 'READ',
-        accepts: [
-            {
-                arg: 'ctx',
-                type: 'object',
-                http: {source: 'context'}
-            },
-            {
-                arg: 'filter',
-                type: 'object',
-                description: 'Filter defining where, order, offset, and limit - must be a JSON-encoded string',
-                http: {source: 'query'}
-            },
-            {
-                arg: 'id',
-                type: 'number',
-                description: 'The item id',
-            },
-            {
-                arg: 'longname',
-                type: 'string',
-                description: 'Article name',
-            },
-            {
-                arg: 'supplier',
-                type: 'string',
-                description: 'Supplier id',
-            },
-            {
-                arg: 'colour',
-                type: 'string',
-                description: 'Colour\'s item',
-            },
-            {
-                arg: 'size',
-                type: 'string',
-                description: 'Size\'s item',
-            },
-            {
-                arg: 'origen',
-                type: 'string',
-                description: 'origen id',
-            },
-            {
-                arg: 'warehouseFk',
-                type: 'number',
-                description: 'The warehouse id',
-            },
-            {
-                arg: 'lack',
-                type: 'number',
-                description: 'The item id',
-            },
-            {
-                arg: 'days',
-                type: 'number',
-                description: 'The range days',
-            }
-        ],
-        returns: [
-            {
-                arg: 'body',
-                type: ['object'],
-                root: true
-            }
-        ],
-        http: {
-            path: `/itemLack`,
-            verb: 'GET'
-        }
-    });
-
-    Self.itemLack = async(ctx, filter, options) => {
-        const myOptions = {};
-
-        if (typeof options == 'object')
-            Object.assign(myOptions, options);
-
-        const filterKeyOrder = [
-            'id', 'force', 'days', 'longname', 'supplier',
-            'colour', 'size', 'originFk',
-            'lack', 'warehouseFk'
-        ];
-
-        delete ctx?.args?.ctx;
-
-        delete ctx?.args?.filter;
-
-        Object.assign(filter, ctx.args ?? {});
-
-        let procedureParams = [];
-        procedureParams.push(...filterKeyOrder.map(clave => filter[clave] ?? null));
-
-        // Default values
-        const forceIndex = filterKeyOrder.indexOf('force');
-        if (!procedureParams[forceIndex])procedureParams[forceIndex] = true;
-        const daysIndex = filterKeyOrder.indexOf('days');
-        if (!procedureParams[daysIndex])procedureParams[daysIndex] = 2;
-        const procedureArgs = Array(procedureParams.length).fill('?').join(', ');
-
-        let query = `CALL vn.item_getLack(${procedureArgs})`;
-
-        const result = await Self.rawSql(query, procedureParams, myOptions);
-
-        const itemsIndex = 0;
-        return result[itemsIndex];
-    };
-};

modules/ticket/back/methods/ticket/itemLackDetail.js

@@ -1,167 +0,0 @@
-const {ParameterizedSQL} = require('loopback-connector');
-
-module.exports = Self => {
-    Self.remoteMethod('itemLackDetail', {
-        description: 'Retrieve detail from ticket as negative',
-        accessType: 'READ',
-        accepts: [
-            {
-                arg: 'itemFk',
-                type: 'number',
-                description: 'The item as negative status',
-            },
-            {
-                arg: 'filter',
-                type: 'object',
-                description: 'Filter defining where, order, offset, and limit - must be a JSON-encoded string',
-                http: {source: 'query'}
-            }
-        ],
-        returns: [
-            {
-                arg: 'body',
-                type: ['object'],
-                root: true,
-            },
-        ],
-        http: {
-            path: `/itemLack/:itemFk`,
-            verb: 'GET',
-        },
-    });
-
-    Self.itemLackDetail = async(itemFk, filter, options) => {
-        const conn = Self.dataSource.connector;
-
-        const myOptions = {};
-        if (typeof options == 'object') Object.assign(myOptions, options);
-        const vDated = (Date.vnNew());
-        vDated.setHours(0, 0, 0, 0);
-        const scopeDays = filter.where.scopeDays ?? 0;
-        let alertLevels = filter.where.alertLevelCode;
-
-        if (!alertLevels)
-            alertLevels = (await Self.app.models.AlertLevel.find({fields: ['code']})).map(({code}) => code);
-
-        const stmt = new ParameterizedSQL(`
-            SELECT s.id,
-                st.code,
-                t.id,
-                t.nickname,
-                c.id customerId,
-                t.shipped,
-                s.quantity,
-                ag.name,
-                ag.id agencyFk,
-                tls.alertLevel alertLevel,
-                st.name stateName,
-                s.id saleFk,
-                s.itemFk,
-                s.price price,
-                al.code alertLevelCode,
-                z.name zoneName,
-                z.id zoneFk,
-                z.hour theoreticalhour,
-                cn.isRookie,
-                sc.saleClonedFk turno,
-                tr.saleFk peticionCompra,
-                DATE_FORMAT(IF(HOUR(t.shipped), t.shipped, IF(zc.hour, zc.hour, z.hour)),'%H:%i') minTimed,
-                FALSE isBasket,
-                substitution.hasObservation,
-                (d.code = 'spainTeamVip') hasToIgnore
-            FROM sale s
-                LEFT JOIN saleGroupDetail sgd ON sgd.saleFk = s.id
-                JOIN ticket t ON t.id = s.ticketFk
-                LEFT JOIN zone z ON z.id = t.zoneFk
-                LEFT JOIN zoneClosure zc ON zc.zoneFk = t.zoneFk
-                    AND t.shipped BETWEEN zc.dated AND util.dayEnd(t.shipped)
-                JOIN client c ON c.id=t.clientFk
-                LEFT JOIN bs.clientNewBorn cn ON cn.clientFk=c.id
-                JOIN agencyMode ag ON ag.id=t.agencyModeFk
-                JOIN ticketState tls ON tls.ticketFk=t.id
-                LEFT JOIN state st ON st.id=tls.state
-                LEFT JOIN alertLevel al ON al.id = st.alertLevel
-                LEFT JOIN saleCloned sc ON sc.saleClonedFk = s.id
-                LEFT JOIN ticketRequest tr ON tr.saleFk = s.id
-                LEFT JOIN workerDepartment wd ON wd.workerFk = c.salesPersonFk
-                LEFT JOIN department d ON d.id = wd.departmentFk
-                LEFT JOIN (
-                    SELECT co.clientFk, COUNT(*) hasObservation
-                        FROM clientObservation co
-                             JOIN observationType ot ON ot.id = co.observationTypeFk
-                        WHERE ot.code = 'substitution'
-                        GROUP BY co.clientFk
-                ) substitution ON substitution.clientFk = c.id
-            WHERE t.warehouseFk = ?
-                AND s.itemFk = ?
-                AND s.quantity <> 0
-
-                AND t.shipped BETWEEN ? AND (? + INTERVAL ? DAY)
-
-                AND sgd.saleFk IS NULL
-                AND (al.code IN (?) OR al.id IS NULL)
-            UNION ALL
-                SELECT r.id,
-                    NULL,
-                    r.orderFk,
-                    c.name customerName,
-                    c.id customerId,
-                    r.shipment,
-                    r.amount,
-                    ag.name,
-                    ag.id,
-                    NULL,
-                    NULL,
-                    NULL,
-                    r.itemFk,
-                    NULL,
-                    NULL,
-                    NULL,
-                    NULL,
-                    NULL,
-                    cn.isRookie,
-                    NULL,
-                    NULL,
-                    NULL,
-                    TRUE,
-                    substitution.hasObservation,
-                    d.code = 'spainTeamVip'
-                FROM hedera.orderRow r
-                    JOIN hedera.order o ON o.id = r.orderFk
-                    JOIN client c ON c.id = o.customer_id
-                    JOIN agencyMode ag ON ag.id=o.agency_id
-                    LEFT JOIN bs.clientNewBorn cn ON cn.clientFk=c.id
-                    LEFT JOIN workerDepartment wd ON wd.workerFk = c.salesPersonFk
-                    LEFT JOIN department d ON d.id = wd.departmentFk
-                    LEFT JOIN (
-                        SELECT co.clientFk, COUNT(*) hasObservation
-                            FROM clientObservation co
-                                JOIN observationType ot ON ot.id = co.observationTypeFk
-                            WHERE ot.code = 'substitution'
-                            GROUP BY co.clientFk
-                    )  substitution ON substitution.clientFk = c.id
-                WHERE r.shipment BETWEEN ? AND ? + INTERVAL ? DAY
-                    AND r.created >= ?
-                    AND r.warehouseFk = ?
-                    AND NOT o.confirmed
-                    AND r.itemFk = ?
-                    AND r.amount
-            ORDER BY hasToIgnore, isBasket
-        `,
-        [
-            filter.where.warehouseFk,
-            itemFk,
-            vDated, vDated,
-            scopeDays,
-            alertLevels,
-            scopeDays,
-            vDated, vDated, vDated,
-            filter.where.warehouseFk,
-            itemFk
-        ]);
-
-        const sql = ParameterizedSQL.join([stmt], ';');
-        const result = await conn.executeStmt(sql, myOptions);
-        return result;
-    };
-};

modules/ticket/back/methods/ticket/specs/itemLack.spec.js

@@ -1,80 +0,0 @@
-const {models} = require('vn-loopback/server/server');
-
-describe('Item Lack', () => {
-    let options;
-    let tx;
-    const ctx = beforeAll.getCtx();
-    beforeAll.mockLoopBackContext();
-
-    beforeEach(async() => {
-        tx = await models.Ticket.beginTransaction({});
-        options = {transaction: tx};
-    });
-
-    afterEach(async() => {
-        if (tx)
-            await tx.rollback();
-    });
-
-    it('should return data with NO filters', async() => {
-        const filter = {};
-        const result = await models.Ticket.itemLack(ctx, filter, options);
-
-        expect(result.length).toEqual(2);
-    });
-
-    it('should return data with filter.id', async() => {
-        const filter = {
-            id: 5
-        };
-        const result = await models.Ticket.itemLack(ctx, filter, options);
-
-        expect(result.length).toEqual(1);
-    });
-
-    it('should return data with filter.longname', async() => {
-        const filter = {
-            longname: 'Ranged weapon pistol 9mm'
-        };
-        const result = await models.Ticket.itemLack(ctx, filter, options);
-
-        expect(result.length).toEqual(1);
-    });
-
-    it('should return data with filter.color', async() => {
-        const filter = {
-            colour: 'WHT'
-        };
-        const result = await models.Ticket.itemLack(ctx, filter, options);
-
-        expect(result.length).toEqual(1);
-    });
-
-    it('should return data with filter.origen', async() => {
-        const filter = {
-            originFk: 1
-        };
-        const result = await models.Ticket.itemLack(ctx, filter, options);
-
-        expect(result.length).toEqual(2);
-    });
-
-    it('should return data with filter.size', async() => {
-        const filter = {
-            size: '15'
-        };
-        const result = await models.Ticket.itemLack(ctx, filter, options);
-
-        expect(result.length).toEqual(1);
-    });
-
-    it('should return data with filter.lack', async() => {
-        const filter = {
-            lack: '-15'
-        };
-
-        const result = await models.Ticket.itemLack(ctx, filter, options);
-
-        expect(result.length).toEqual(1);
-    });
-});

modules/ticket/back/methods/ticket/specs/itemLackDetail.spec.js

@@ -1,55 +0,0 @@
-const models = require('vn-loopback/server/server').models;
-
-describe('Item Lack Detail', () => {
-    it('should return false if id is null', async() => {
-        const tx = await models.Ticket.beginTransaction({});
-
-        try {
-            const options = {transaction: tx};
-            const itemFk = null;
-
-            const filter = {where: {warehouseFk: 60}};
-            const result = await models.Ticket.itemLackDetail(itemFk, filter, options);
-
-            expect(result.length).toEqual(0);
-            await tx.rollback();
-        } catch (e) {
-            await tx.rollback();
-            throw e;
-        }
-    });
-
-    it('should return data if id exists', async() => {
-        const tx = await models.Ticket.beginTransaction({});
-
-        try {
-            const options = {transaction: tx};
-            const itemFk = 1167;
-            const filter = {where: {warehouseFk: 60}};
-            const result = await models.Ticket.itemLackDetail(itemFk, filter, options);
-
-            expect(result.length).toEqual(0);
-            await tx.rollback();
-        } catch (e) {
-            await tx.rollback();
-            throw e;
-        }
-    });
-
-    it('should return error is if not exists', async() => {
-        const tx = await models.Ticket.beginTransaction({});
-
-        try {
-            const options = {transaction: tx};
-            const itemFk = 0;
-            const filter = {where: {warehouseFk: 60}};
-            const result = await models.Ticket.itemLackDetail(itemFk, filter, options);
-
-            expect(result.length).toEqual(0);
-            await tx.rollback();
-        } catch (e) {
-            await tx.rollback();
-            throw e;
-        }
-    });
-});

modules/ticket/back/methods/ticket/specs/split.spec.js

@@ -1,47 +0,0 @@
-const {models} = require('vn-loopback/server/server');
-
-describe('Split', () => {
-    let options;
-    let tx;
-    const ctx = beforeAll.getCtx();
-    beforeAll.mockLoopBackContext();
-
-    beforeEach(async() => {
-        tx = await models.Ticket.beginTransaction({});
-        options = {transaction: tx};
-    });
-
-    afterEach(async() => {
-        if (tx)
-            await tx.rollback();
-    });
-
-    it('should split tickets with count 1', async() => {
-        const data =
-            {ticketFk: 7, sales: [1]};
-        const result = await models.Ticket.split(ctx, data, options);
-
-        expect(data.ticketFk).toEqual(result.ticket);
-        expect('noSplit').toEqual(result.status);
-    });
-
-    it('should split tickets with count 2 and error', async() => {
-        const data =
-            {ticketFk: 11, sales: [7]}
-        ;
-        const result = await models.Ticket.split(ctx, data, options);
-
-        expect(data.ticketFk).toEqual(result.ticket);
-        expect('error').toEqual(result.status);
-        expect('Can\'t transfer claimed sales').toEqual(result.message);
-    });
-
-    it('should split tickets with count 2 and success', async() => {
-        const data =
-            {ticketFk: 14, sales: [33]};
-        const result = await models.Ticket.split(ctx, data, options);
-
-        expect(data.ticketFk).toEqual(result.ticket);
-        expect('split').toEqual(result.status);
-    });
-});

modules/ticket/back/methods/ticket/split.js

@@ -1,73 +0,0 @@
-module.exports = Self => {
-    Self.remoteMethodCtx('split', {
-        description: 'Split ticket with custom date',
-        accessType: 'WRITE',
-        accepts: [
-            {
-                arg: 'ticket',
-                type: 'Object',
-                required: true,
-                http: {source: 'body'}
-            },
-            {
-                arg: 'date',
-                type: 'date',
-                required: true,
-            }
-        ],
-        returns: {
-            type: ['Object'],
-            root: true
-        },
-        http: {
-            path: `/split`,
-            verb: 'POST'
-        }
-    });
-
-    Self.split = async(ctx, ticket, options) => {
-        const {ticketFk} = ticket;
-        const models = Self.app.models;
-        const myOptions = {};
-        let tx;
-        let result = [];
-        if (typeof options == 'object')
-            Object.assign(myOptions, options);
-
-        if (!myOptions.transaction) {
-            tx = await Self.beginTransaction({});
-            myOptions.transaction = tx;
-        }
-        try {
-            const count = await models.Sale.count({
-                ticketFk
-            }, myOptions);
-            if (count === 1)
-                return {ticket: ticketFk, status: 'noSplit'};
-
-            const [, [{vNewTicket}]] = await Self.rawSql(`
-                    CALL vn.ticket_clone(?, @vNewTicket);
-                    SELECT @vNewTicket vNewTicket;`,
-            [ticketFk], myOptions);
-
-            if (vNewTicket === 0) return result;
-            const sales = await models.Sale.find({
-                where: {id: {inq: ticket.sales}}
-            }, myOptions);
-
-            const updateIsPicked = sales.map(({sid}) => Self.rawSql(`
-                     UPDATE vn.sale SET isPicked = (id = ?) WHERE ticketFk = ?`,
-            [sid, ticketFk], myOptions));
-
-            await Promise.all(updateIsPicked);
-            await Self.transferSales(ctx, ticketFk, vNewTicket, sales, myOptions);
-
-            await Self.rawSql(`CALL vn.ticket_setState(?, ?)`, [ticketFk, 'FIXING'], myOptions);
-            if (tx) await tx.commit();
-            return {ticket: ticketFk, newTicket: vNewTicket, status: 'split'};
-        } catch (e) {
-            if (tx) await tx.rollback();
-            return {ticket: ticketFk, status: 'error', message: e.message};
-        }
-    };
-};

modules/ticket/back/methods/ticket/state.js

@@ -43,8 +43,8 @@ module.exports = Self => {
                 const {code} = await models.State.findById(params.stateFk, {fields: ['code']}, myOptions);
                 params.code = code;
             } else {
-                const state = await models.State.findOne({where: {id: params.code}}, myOptions);
+                const {id} = await models.State.findOne({where: {code: params.code}}, myOptions);
-                params.stateFk = state.id;
+                params.stateFk = id;
             }
 
             if (!params.userFk) {

modules/ticket/back/methods/ticket/updateDiscount.js

@@ -166,18 +166,10 @@ module.exports = Self => {
             const salesPerson = ticket.client().salesPersonUser();
             if (salesPerson) {
                 const url = await Self.app.models.Url.getUrl();
-
-                const saleId = sales[0].id;
-                const saleCloned = await Self.app.models.SaleCloned.findById(saleId, {
-                    include: 'saleOriginal',
-                });
-                const ticketWeekly = saleCloned?.saleOriginal()?.ticketFk || null;
-
                 const message = $t('Changed sale discount', {
                     ticketId: id,
                     ticketUrl: `${url}ticket/${id}/sale`,
-                    changes: changesMade,
+                    changes: changesMade
-                    ticketWeekly: ticketWeekly ? $t('clonedFromTicketWeekly', {ticketWeekly}) : null
                 });
                 await models.Chat.sendCheckingPresence(ctx, salesPerson.id, message, myOptions);
             }