Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4658-createWorker

CHANGELOG.md

@@ -10,8 +10,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Added
 - [General](Inicio) Permite recuperar la contraseña
 - [Trabajadores](Nuevo trabajador) Nueva sección
+- [Artículo](Datos Básicos) Añadido campo Unidades/Caja
 
 ### Changed
+- [Tickets](Líneas preparadas) Actualizada sección para que sea más visual
 
 ### Fixed
 - [General] Al utilizar el traductor de Google se descuadraban los iconos

back/methods/osticket/closeTicket.js

@@ -25,10 +25,10 @@ module.exports = Self => {
             return false;
 
         const con = mysql.createConnection({
-            host: `${config.hostDb}`,
-            user: `${config.userDb}`,
-            password: `${config.passwordDb}`,
-            port: `${config.portDb}`
+            host: config.hostDb,
+            user: config.userDb,
+            password: config.passwordDb,
+            port: config.portDb
         });
 
         const sql = `SELECT ot.ticket_id, ot.number
@@ -38,23 +38,23 @@ module.exports = Self => {
                             JOIN (
                                 SELECT ote.thread_id, MAX(ote.created) created, MAX(ote.updated) updated
                                     FROM osticket.ost_thread_entry ote
-                                    WHERE ote.staff_id != 0 AND ote.type = 'R'
+                                    WHERE ote.staff_id AND ote.type = 'R'
                                     GROUP BY ote.thread_id
                             ) sub ON sub.thread_id = ot2.id
-                        WHERE ot.isanswered = 1
-                            AND ots.state = '${config.oldStatus}'
-                            AND IF(sub.updated > sub.created, sub.updated, sub.created) < DATE_SUB(CURDATE(), INTERVAL ${config.day} DAY)`;
+                        WHERE ot.isanswered
+                            AND ots.state = ?
+                            AND IF(sub.updated > sub.created, sub.updated, sub.created) < DATE_SUB(CURDATE(), INTERVAL ? DAY)`;
 
-        let ticketsId = [];
+        const ticketsId = [];
         con.connect(err => {
             if (err) throw err;
-            con.query(sql, (err, results) => {
+            con.query(sql, [config.oldStatus, config.day],
+                (err, results) => {
                     if (err) throw err;
                     for (const result of results)
                         ticketsId.push(result.ticket_id);
                 });
         });
-
         await getRequestToken();
 
         async function getRequestToken() {
@@ -94,30 +94,20 @@ module.exports = Self => {
             await close(token, secondCookie);
         }
 
-        async function getLockCode(token, secondCookie, ticketId) {
-            const ostUri = `${config.host}/ajax.php/lock/ticket/${ticketId}`;
-            const params = {
-                method: 'POST',
-                headers: {
-                    'X-CSRFToken': token,
-                    'Cookie': secondCookie
-                }
-            };
-            const response = await fetch(ostUri, params);
-            const body = await response.text();
-            const json = JSON.parse(body);
-
-            return json.code;
-        }
-
         async function close(token, secondCookie) {
             for (const ticketId of ticketsId) {
-                const lockCode = await getLockCode(token, secondCookie, ticketId);
+                try {
+                    const lock = await getLockCode(token, secondCookie, ticketId);
+                    if (!lock.code) {
+                        let error = `Can't get lock code`;
+                        if (lock.msg) error += `: ${lock.msg}`;
+                        throw new Error(error);
+                    }
                     let form = new FormData();
                     form.append('__CSRFToken__', token);
                     form.append('id', ticketId);
                     form.append('a', config.responseType);
-                form.append('lockCode', lockCode);
+                    form.append('lockCode', lock.code);
                     form.append('from_email_id', config.fromEmailId);
                     form.append('reply-to', config.replyTo);
                     form.append('cannedResp', 0);
@@ -133,8 +123,29 @@ module.exports = Self => {
                             'Cookie': secondCookie
                         }
                     };
-                return fetch(ostUri, params);
+                    await fetch(ostUri, params);
+                } catch (e) {
+                    const err = new Error(`${ticketId} Ticket close failed: ${e.message}`);
+                    err.stack += e.stack;
+                    console.error(err);
                 }
             }
+        }
+
+        async function getLockCode(token, secondCookie, ticketId) {
+            const ostUri = `${config.host}/ajax.php/lock/ticket/${ticketId}`;
+            const params = {
+                method: 'POST',
+                headers: {
+                    'X-CSRFToken': token,
+                    'Cookie': secondCookie
+                }
+            };
+            const response = await fetch(ostUri, params);
+            const body = await response.text();
+            const json = JSON.parse(body);
+
+            return json;
+        }
     };
 };

db/changes/224903/00-insert_notification_invoiceE.sql

@@ -1 +0,0 @@
-insert into `util`.`notification` (`id`, `name`,`description`) values (2, 'invoiceElectronic', 'A electronic invoice has been generated');

db/changes/225201/00-invoiceOut_new.sql

@@ -0,0 +1,225 @@
+DROP PROCEDURE IF EXISTS `vn`.`invoiceOut_new`;
+DELIMITER $$
+CREATE DEFINER=`root`@`localhost` PROCEDURE `vn`.`invoiceOut_new`(
+	vSerial VARCHAR(255),
+	vInvoiceDate DATETIME,
+	vTaxArea VARCHAR(25),
+	OUT vNewInvoiceId INT)
+BEGIN
+/**
+ * Creación de facturas emitidas.
+ * requiere previamente tabla ticketToInvoice(id).
+ *
+ * @param vSerial serie a la cual se hace la factura
+ * @param vInvoiceDate fecha de la factura
+ * @param vTaxArea tipo de iva en relacion a la empresa y al cliente
+ * @param vNewInvoiceId id de la factura que se acaba de generar
+ * @return vNewInvoiceId
+ */
+	DECLARE vSpainCountryCode INT DEFAULT 1;
+	DECLARE vIsAnySaleToInvoice BOOL;
+	DECLARE vIsAnyServiceToInvoice BOOL;
+	DECLARE vNewRef VARCHAR(255);
+	DECLARE vWorker INT DEFAULT account.myUser_getId();
+	DECLARE vCompany INT;
+	DECLARE vSupplier INT;
+	DECLARE vClient INT;
+	DECLARE vCplusStandardInvoiceTypeFk INT DEFAULT 1;
+	DECLARE vCplusCorrectingInvoiceTypeFk INT DEFAULT 6;
+	DECLARE vCplusSimplifiedInvoiceTypeFk INT DEFAULT 2;
+	DECLARE vCorrectingSerial VARCHAR(1) DEFAULT 'R';
+	DECLARE vSimplifiedSerial VARCHAR(1) DEFAULT 'S';
+	DECLARE vNewInvoiceInId INT;
+	DECLARE vIsInterCompany BOOL;
+
+	SET vInvoiceDate = IFNULL(vInvoiceDate,CURDATE());
+
+	SELECT t.clientFk, t.companyFk
+			INTO vClient, vCompany
+		FROM ticketToInvoice tt
+			JOIN ticket t ON t.id = tt.id
+		LIMIT 1;
+
+	-- Eliminem de ticketToInvoice els tickets que no han de ser facturats
+	DELETE ti.*
+		FROM ticketToInvoice ti
+			JOIN ticket t ON t.id = ti.id
+			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 client c ON c.id = t.clientFk
+			LEFT JOIN itemTaxCountry itc ON itc.itemFk = i.id AND itc.countryFk = su.countryFk
+		WHERE YEAR(t.shipped) < 2001
+			OR c.isTaxDataChecked = FALSE
+			OR t.isDeleted
+			OR c.hasToInvoice = FALSE
+			OR itc.id IS NULL;
+
+	SELECT SUM(s.quantity * s.price * (100 - s.discount)/100), ts.id
+			INTO vIsAnySaleToInvoice, vIsAnyServiceToInvoice
+		FROM ticketToInvoice t
+			LEFT JOIN sale s ON s.ticketFk = t.id
+			LEFT JOIN ticketService ts ON ts.ticketFk = t.id;
+
+	IF (vIsAnySaleToInvoice OR vIsAnyServiceToInvoice)
+		AND (vCorrectingSerial = vSerial OR NOT hasAnyNegativeBase())
+	THEN
+
+		-- el trigger añade el siguiente Id_Factura correspondiente a la vSerial
+		INSERT INTO invoiceOut
+		(
+			ref,
+			serial,
+			issued,
+			clientFk,
+			dued,
+			companyFk,
+			cplusInvoiceType477Fk
+		)
+		SELECT
+				1,
+				vSerial,
+				vInvoiceDate,
+				vClient,
+				getDueDate(vInvoiceDate, dueDay),
+				vCompany,
+				IF(vSerial = vCorrectingSerial,
+					vCplusCorrectingInvoiceTypeFk,
+					IF(vSerial = vSimplifiedSerial,
+						vCplusSimplifiedInvoiceTypeFk,
+						vCplusStandardInvoiceTypeFk))
+			FROM client
+			WHERE id = vClient;
+
+
+		SET vNewInvoiceId = LAST_INSERT_ID();
+
+		SELECT `ref`
+				INTO vNewRef
+			FROM invoiceOut
+			WHERE id = vNewInvoiceId;
+
+		UPDATE ticket t
+				JOIN ticketToInvoice ti ON ti.id = t.id
+			SET t.refFk = vNewRef;
+
+		DROP TEMPORARY TABLE IF EXISTS tmp.updateInter;
+		CREATE TEMPORARY TABLE tmp.updateInter ENGINE = MEMORY
+			SELECT s.id,ti.id ticket_id,vWorker Id_Trabajador
+				FROM ticketToInvoice ti
+					LEFT JOIN ticketState ts ON ti.id = ts.ticket
+					JOIN state s
+				WHERE IFNULL(ts.alertLevel,0) < 3 and s.`code` = getAlert3State(ti.id);
+
+		INSERT INTO vncontrol.inter(state_id,Id_Ticket,Id_Trabajador)
+			SELECT * FROM tmp.updateInter;
+
+		INSERT INTO ticketLog (action, userFk, originFk, description)
+			SELECT 'UPDATE', account.myUser_getId(), ti.id, CONCAT('Crea factura ', vNewRef)
+				FROM ticketToInvoice ti;
+
+		CALL invoiceExpenceMake(vNewInvoiceId);
+		CALL invoiceTaxMake(vNewInvoiceId,vTaxArea);
+
+		UPDATE invoiceOut io
+				JOIN (
+					SELECT SUM(amount) AS total
+						FROM invoiceOutExpence
+						WHERE invoiceOutFk = vNewInvoiceId
+					) base
+				JOIN (
+					SELECT SUM(vat) AS total
+						FROM invoiceOutTax
+						WHERE invoiceOutFk = vNewInvoiceId
+					) vat
+			SET io.amount = base.total + vat.total
+			WHERE io.id = vNewInvoiceId;
+
+		DROP TEMPORARY TABLE tmp.updateInter;
+
+		SELECT ios.isCEE INTO vIsInterCompany
+			FROM vn.ticket t
+				JOIN vn.invoiceOut io ON io.`ref` = t.refFk
+				JOIN vn.invoiceOutSerial ios ON ios.code = io.serial
+			WHERE t.refFk = vNewRef
+            LIMIT 1;
+
+		IF (vIsInterCompany) THEN
+
+			SELECT vCompany INTO vSupplier;
+			SELECT id INTO vCompany FROM company WHERE clientFk = vClient;
+
+			INSERT INTO invoiceIn(supplierFk, supplierRef, issued, companyFk)
+				SELECT vSupplier, vNewRef, vInvoiceDate, vCompany;
+
+			SET vNewInvoiceInId = LAST_INSERT_ID();
+
+			DROP TEMPORARY TABLE IF EXISTS tmp.ticket;
+			CREATE TEMPORARY TABLE tmp.ticket
+				(KEY (ticketFk))
+				ENGINE = MEMORY
+				SELECT id ticketFk
+					FROM ticketToInvoice;
+
+			CALL `ticket_getTax`('NATIONAL');
+
+			SET @vTaxableBaseServices := 0.00;
+			SET @vTaxCodeGeneral := NULL;
+
+			INSERT INTO vn.invoiceInTax(invoiceInFk, taxableBase, expenceFk, taxTypeSageFk, transactionTypeSageFk)
+				SELECT vNewInvoiceInId, @vTaxableBaseServices, sub.expenceFk, sub.taxTypeSageFk , sub.transactionTypeSageFk
+					FROM (
+						SELECT @vTaxableBaseServices := SUM(tst.taxableBase) taxableBase, i.expenceFk, i.taxTypeSageFk , i.transactionTypeSageFk, @vTaxCodeGeneral := i.taxClassCodeFk
+							FROM tmp.ticketServiceTax tst
+								JOIN vn.invoiceOutTaxConfig i ON i.taxClassCodeFk = tst.code
+							WHERE i.isService
+							HAVING taxableBase
+						) sub;
+
+			INSERT INTO vn.invoiceInTax(invoiceInFk, taxableBase, expenceFk, taxTypeSageFk, transactionTypeSageFk)
+				SELECT  vNewInvoiceInId, SUM(tt.taxableBase) - IF(tt.code = @vTaxCodeGeneral, @vTaxableBaseServices, 0) taxableBase, i.expenceFk, i.taxTypeSageFk , i.transactionTypeSageFk
+					FROM tmp.ticketTax tt
+						JOIN vn.invoiceOutTaxConfig i ON i.taxClassCodeFk = tt.code
+					WHERE !i.isService
+					GROUP BY tt.pgcFk
+					HAVING taxableBase
+					ORDER BY tt.priority;
+
+			CALL invoiceInDueDay_calculate(vNewInvoiceInId);
+
+			INSERT INTO invoiceInIntrastat (
+					invoiceInFk,
+					intrastatFk,
+					amount,
+					stems,
+					countryFk,
+					net)
+				SELECT
+					vNewInvoiceInId invoiceInFk,
+					i.intrastatFk,
+					CAST(SUM((s.quantity * s.price * (100 - s.discount) / 100 )) AS DECIMAL(10,2)) subtotal,
+					CAST(SUM(IFNULL(i.stems, 1) * s.quantity) AS DECIMAL(10,2)) stems,
+					su.countryFk,
+					CAST(SUM(IFNULL(i.stems, 1)
+							* s.quantity
+							* IF(ic.grams, ic.grams, i.weightByPiece) / 1000) AS DECIMAL(10,2)) netKg
+				FROM sale s
+					JOIN ticket t ON s.ticketFk = t.id
+					JOIN supplier su ON su.id = t.companyFk
+					JOIN item i ON i.id = s.itemFk
+					JOIN vn.itemCost ic ON ic.itemFk = i.id AND ic.warehouseFk = t.warehouseFk
+					JOIN intrastat ir ON ir.id = i.intrastatFk
+				WHERE t.refFk = vNewRef;
+
+			DROP TEMPORARY TABLE tmp.ticket;
+			DROP TEMPORARY TABLE tmp.ticketAmount;
+			DROP TEMPORARY TABLE tmp.ticketTax;
+			DROP TEMPORARY TABLE tmp.ticketServiceTax;
+
+		END IF;
+
+	END IF;
+
+	DROP TEMPORARY TABLE `ticketToInvoice`;
+END$$
+DELIMITER ;

db/changes/225201/01-modules.sql

@@ -43,7 +43,7 @@ SET t.code = 'claim'
 WHERE t.code LIKE 'Claims' ESCAPE '#';
 
 UPDATE salix.module t
-SET t.code = 'user'
+SET t.code = 'account'
 WHERE t.code LIKE 'Users' ESCAPE '#';
 
 UPDATE salix.module t

db/changes/225202/00-mdbApp.sql

@@ -0,0 +1,28 @@
+ALTER TABLE `vn`.`mdbApp` DROP PRIMARY KEY;
+ALTER TABLE `vn`.`mdbApp` ADD CONSTRAINT mdbApp_PK PRIMARY KEY (app,baselineBranchFk);
+
+INSERT INTO `vn`.`mdbApp` (app,baselineBranchFk)
+	VALUES ('com','master');
+INSERT INTO `vn`.`mdbApp` (app,baselineBranchFk)
+	VALUES ('enc','master');
+INSERT INTO `vn`.`mdbApp` (app,baselineBranchFk)
+	VALUES ('ent','master');
+INSERT INTO `vn`.`mdbApp` (app,baselineBranchFk)
+	VALUES ('eti','master');
+INSERT INTO `vn`.`mdbApp` (app,baselineBranchFk)
+	VALUES ('lab','master');
+INSERT INTO `vn`.`mdbApp` (app,baselineBranchFk)
+	VALUES ('tpv','master');
+INSERT INTO `vn`.`mdbApp` (app,baselineBranchFk)
+	VALUES ('com','dev');
+INSERT INTO `vn`.`mdbApp` (app,baselineBranchFk)
+	VALUES ('enc','dev');
+INSERT INTO `vn`.`mdbApp` (app,baselineBranchFk)
+	VALUES ('ent','dev');
+INSERT INTO `vn`.`mdbApp` (app,baselineBranchFk)
+	VALUES ('eti','dev');
+INSERT INTO `vn`.`mdbApp` (app,baselineBranchFk)
+	VALUES ('lab','dev');
+INSERT INTO `vn`.`mdbApp` (app,baselineBranchFk)
+	VALUES ('tpv','dev');
+

db/changes/230201/00-ACL_ItemShelvingSale.sql

@@ -0,0 +1,2 @@
+INSERT INTO `salix`.`ACL` (`model`,`property`,`accessType`,`permission`,`principalId`)
+    VALUES ('ItemShelvingSale','*','*','ALLOW','employee');

db/changes/230201/00-autoincrement_VnReport_VnPrinter.sql

@@ -0,0 +1,4 @@
+SET FOREIGN_KEY_CHECKS = 0;
+ALTER TABLE `vn`.`report` MODIFY COLUMN id tinyint(3) unsigned NOT NULL AUTO_INCREMENT;
+ALTER TABLE `vn`.`printer` MODIFY COLUMN id tinyint(3) unsigned NOT NULL AUTO_INCREMENT;
+SET FOREIGN_KEY_CHECKS = 1;

db/dump/fixtures.sql

@@ -1143,10 +1143,10 @@ INSERT INTO `vn`.`itemShelving` (`itemFk`, `shelvingFk`, `visible`, `grouping`,
 
 INSERT INTO `vn`.`itemShelvingSale` (`itemShelvingFk`, `saleFk`, `quantity`, `created`, `userFk`)
     VALUES
-        ('1', '1', '1', '', '1106'),
-        ('2', '2', '5', '', '1106'),
-        ('1', '7', '1', '', '1106'),
-        ('2', '8', '5', '', '1106');
+        ('1', '1', '1', util.VN_CURDATE(), '1106'),
+        ('2', '2', '5', util.VN_CURDATE(), '1106'),
+        ('1', '7', '1', util.VN_CURDATE(), '1106'),
+        ('2', '8', '5', util.VN_CURDATE(), '1106');
 
 INSERT INTO `vncontrol`.`accion`(`accion_id`, `accion`)
     VALUES
@@ -1779,7 +1779,7 @@ INSERT INTO `vn`.`claimDestination`(`id`, `description`, `addressFk`)
 INSERT INTO `vn`.`claimDevelopment`(`id`, `claimFk`, `claimResponsibleFk`, `workerFk`, `claimReasonFk`, `claimResultFk`, `claimRedeliveryFk`, `claimDestinationFk`)
     VALUES
         (1, 1, 1, 21, 1,  1, 2, 5),
-        (2, 1, 1, 21, 7,  2, 2, 5),
+        (2, 1, 2, 21, 7,  2, 2, 5),
         (3, 2, 7, 21, 9,  3, 2, 5),
         (4, 3, 7, 21, 15, 8, 2, 5),
         (5, 4, 7, 21, 7,  8, 2, 5);
@@ -2692,6 +2692,7 @@ INSERT INTO `util`.`notificationConfig`
 INSERT INTO `util`.`notification` (`id`, `name`, `description`)
     VALUES
         (1, 'print-email', 'notification fixture one'),
+        (2, 'invoice-electronic', 'A electronic invoice has been generated'),
         (4, 'supplier-pay-method-update', 'A supplier pay method has been updated');
 
 INSERT INTO `util`.`notificationAcl` (`notificationFk`, `roleFk`)

e2e/helpers/selectors.js

@@ -464,6 +464,7 @@ export default {
         generic: 'vn-autocomplete[ng-model="$ctrl.item.genericFk"]',
         isFragile: 'vn-check[ng-model="$ctrl.item.isFragile"]',
         longName: 'vn-textfield[ng-model="$ctrl.item.longName"]',
+        packingOut: 'vn-input-number[ng-model="$ctrl.item.packingOut"]',
         isActiveCheckbox: 'vn-check[label="Active"]',
         priceInKgCheckbox: 'vn-check[label="Price in kg"]',
         newIntrastatButton: 'vn-item-basic-data vn-icon-button[vn-tooltip="New intrastat"] > button',

e2e/paths/01-salix/03_smartTable_searchBar_integrations.spec.js

@@ -15,7 +15,7 @@ describe('SmartTable SearchBar integration', () => {
         await browser.close();
     });
 
-    describe('as filters', () => {
+    describe('as filters in smart-table section', () => {
         it('should search by type in searchBar', async() => {
             await page.waitToClick(selectors.itemsIndex.openAdvancedSearchButton);
             await page.autocompleteSearch(selectors.itemsIndex.advancedSearchItemType, 'Anthurium');
@@ -47,6 +47,34 @@ describe('SmartTable SearchBar integration', () => {
         });
     });
 
+    describe('as filters in section without smart-table', () => {
+        it('go to zone section', async() => {
+            await page.loginAndModule('salesPerson', 'zone');
+            await page.waitToClick(selectors.globalItems.searchButton);
+        });
+
+        it('should search in searchBar first time', async() => {
+            await page.doSearch('A');
+            const count = await page.countElement(selectors.zoneIndex.searchResult);
+
+            expect(count).toEqual(7);
+        });
+
+        it('should search in searchBar second time', async() => {
+            await page.doSearch('A');
+            const count = await page.countElement(selectors.zoneIndex.searchResult);
+
+            expect(count).toEqual(7);
+        });
+
+        it('should search in searchBar third time', async() => {
+            await page.doSearch('A');
+            const count = await page.countElement(selectors.zoneIndex.searchResult);
+
+            expect(count).toEqual(7);
+        });
+    });
+
     describe('as orders', () => {
         it('should order by first id', async() => {
             await page.loginAndModule('developer', 'item');

e2e/paths/03-worker/01_summary.spec.js

@@ -2,68 +2,32 @@ import selectors from '../../helpers/selectors.js';
 import getBrowser from '../../helpers/puppeteer';
 
 describe('Worker summary path', () => {
+    const workerId = 3;
     let browser;
     let page;
     beforeAll(async() => {
         browser = await getBrowser();
         page = browser.page;
         await page.loginAndModule('employee', 'worker');
+        const httpDataResponse = page.waitForResponse(response => {
+            return response.status() === 200 && response.url().includes(`Workers/${workerId}`);
+        });
         await page.accessToSearchResult('agencyNick');
+        await httpDataResponse;
     });
 
     afterAll(async() => {
         await browser.close();
     });
 
-    it('should reach the employee summary section', async() => {
-        await page.waitForState('worker.card.summary');
-    });
-
-    it('should check the summary contains the name and userName on the header', async() => {
-        const result = await page.waitToGetProperty(selectors.workerSummary.header, 'innerText');
-
-        expect(result).toEqual('agency agency');
-    });
-
-    it('should check the summary contains the basic data id', async() => {
-        const result = await page.waitToGetProperty(selectors.workerSummary.id, 'innerText');
-
-        expect(result).toEqual('3');
-    });
-
-    it('should check the summary contains the basic data email', async() => {
-        const result = await page.waitToGetProperty(selectors.workerSummary.email, 'innerText');
-
-        expect(result).toEqual('agency@verdnatura.es');
-    });
-
-    it('should check the summary contains the basic data department', async() => {
-        const result = await page.waitToGetProperty(selectors.workerSummary.department, 'innerText');
-
-        expect(result).toEqual('CAMARA');
-    });
-
-    it('should check the summary contains the user data id', async() => {
-        const result = await page.waitToGetProperty(selectors.workerSummary.userId, 'innerText');
-
-        expect(result).toEqual('3');
-    });
-
-    it('should check the summary contains the user data name', async() => {
-        const result = await page.waitToGetProperty(selectors.workerSummary.userName, 'innerText');
-
-        expect(result).toEqual('agency');
-    });
-
-    it('should check the summary contains the user data role', async() => {
-        const result = await page.waitToGetProperty(selectors.workerSummary.role, 'innerText');
-
-        expect(result).toEqual('agency');
-    });
-
-    it('should check the summary contains the user data extension', async() => {
-        const result = await page.waitToGetProperty(selectors.workerSummary.extension, 'innerText');
-
-        expect(result).toEqual('1101');
+    it('should reach the employee summary section and check all properties', async() => {
+        expect(await page.getProperty(selectors.workerSummary.header, 'innerText')).toEqual('agency agency');
+        expect(await page.getProperty(selectors.workerSummary.id, 'innerText')).toEqual('3');
+        expect(await page.getProperty(selectors.workerSummary.email, 'innerText')).toEqual('agency@verdnatura.es');
+        expect(await page.getProperty(selectors.workerSummary.department, 'innerText')).toEqual('CAMARA');
+        expect(await page.getProperty(selectors.workerSummary.userId, 'innerText')).toEqual('3');
+        expect(await page.getProperty(selectors.workerSummary.userName, 'innerText')).toEqual('agency');
+        expect(await page.getProperty(selectors.workerSummary.role, 'innerText')).toEqual('agency');
+        expect(await page.getProperty(selectors.workerSummary.extension, 'innerText')).toEqual('1101');
     });
 });

e2e/paths/03-worker/02_basicData.spec.js

@@ -2,13 +2,18 @@ import selectors from '../../helpers/selectors.js';
 import getBrowser from '../../helpers/puppeteer';
 
 describe('Worker basic data path', () => {
+    const workerId = 1106;
     let browser;
     let page;
     beforeAll(async() => {
         browser = await getBrowser();
         page = browser.page;
         await page.loginAndModule('hr', 'worker');
+        const httpDataResponse = page.waitForResponse(response => {
+            return response.status() === 200 && response.url().includes(`Workers/${workerId}`);
+        });
         await page.accessToSearchResult('David Charles Haller');
+        await httpDataResponse;
         await page.accessToSection('worker.card.basicData');
     });
 
@@ -16,35 +21,20 @@ describe('Worker basic data path', () => {
         await browser.close();
     });
 
-    it('should edit the form', async() => {
-        await page.clearInput(selectors.workerBasicData.name);
-        await page.write(selectors.workerBasicData.name, 'David C.');
-        await page.clearInput(selectors.workerBasicData.surname);
-        await page.write(selectors.workerBasicData.surname, 'H.');
-        await page.clearInput(selectors.workerBasicData.phone);
-        await page.write(selectors.workerBasicData.phone, '444332211');
-        await page.waitToClick(selectors.workerBasicData.saveButton);
+    it('should edit the form and then reload the section and check the data was edited', async() => {
+        await page.overwrite(selectors.workerBasicData.name, 'David C.');
+        await page.overwrite(selectors.workerBasicData.surname, 'H.');
+        await page.overwrite(selectors.workerBasicData.phone, '444332211');
+        await page.click(selectors.workerBasicData.saveButton);
+
         const message = await page.waitForSnackbar();
 
         expect(message.text).toContain('Data saved!');
-    });
 
-    it('should reload the section then check the name was edited', async() => {
         await page.reloadSection('worker.card.basicData');
-        const result = await page.waitToGetProperty(selectors.workerBasicData.name, 'value');
 
-        expect(result).toEqual('David C.');
-    });
-
-    it('should the surname was edited', async() => {
-        const result = await page.waitToGetProperty(selectors.workerBasicData.surname, 'value');
-
-        expect(result).toEqual('H.');
-    });
-
-    it('should the phone was edited', async() => {
-        const result = await page.waitToGetProperty(selectors.workerBasicData.phone, 'value');
-
-        expect(result).toEqual('444332211');
+        expect(await page.waitToGetProperty(selectors.workerBasicData.name, 'value')).toEqual('David C.');
+        expect(await page.waitToGetProperty(selectors.workerBasicData.surname, 'value')).toEqual('H.');
+        expect(await page.waitToGetProperty(selectors.workerBasicData.phone, 'value')).toEqual('444332211');
     });
 });

e2e/paths/03-worker/03_pbx.spec.js

@@ -16,19 +16,16 @@ describe('Worker pbx path', () => {
         await browser.close();
     });
 
-    it('should receive an error when the extension exceeds 4 characters', async() => {
+    it('should receive an error when the extension exceeds 4 characters and then sucessfully save the changes', async() => {
         await page.write(selectors.workerPbx.extension, '55555');
-        await page.waitToClick(selectors.workerPbx.saveButton);
-        const message = await page.waitForSnackbar();
+        await page.click(selectors.workerPbx.saveButton);
+        let message = await page.waitForSnackbar();
 
         expect(message.text).toContain('Extension format is invalid');
-    });
 
-    it('should sucessfully save the changes', async() => {
-        await page.clearInput(selectors.workerPbx.extension);
-        await page.write(selectors.workerPbx.extension, '4444');
-        await page.waitToClick(selectors.workerPbx.saveButton);
-        const message = await page.waitForSnackbar();
+        await page.overwrite(selectors.workerPbx.extension, '4444');
+        await page.click(selectors.workerPbx.saveButton);
+        message = await page.waitForSnackbar();
 
         expect(message.text).toContain('Data saved! User must access web');
     });

e2e/paths/03-worker/04_time_control.spec.js

@@ -21,38 +21,34 @@ describe('Worker time control path', () => {
     const fourPm = '16:00';
     const hankPymId = 1107;
 
-    it('should go to the next month', async() => {
-        const date = new Date();
+    it('should go to the next month, go to current month and go 1 month in the past', async() => {
+        let date = new Date();
         date.setMonth(date.getMonth() + 1);
-        const month = date.toLocaleString('default', {month: 'long'});
+        let month = date.toLocaleString('default', {month: 'long'});
 
-        await page.waitToClick(selectors.workerTimeControl.nextMonthButton);
-        const result = await page.waitToGetProperty(selectors.workerTimeControl.monthName, 'innerText');
+        await page.click(selectors.workerTimeControl.nextMonthButton);
+        let result = await page.getProperty(selectors.workerTimeControl.monthName, 'innerText');
 
         expect(result).toContain(month);
-    });
 
-    it('should go to current month', async() => {
-        const date = new Date();
-        const month = date.toLocaleString('default', {month: 'long'});
+        date = new Date();
+        month = date.toLocaleString('default', {month: 'long'});
 
-        await page.waitToClick(selectors.workerTimeControl.previousMonthButton);
-        const result = await page.waitToGetProperty(selectors.workerTimeControl.monthName, 'innerText');
+        await page.click(selectors.workerTimeControl.previousMonthButton);
+        result = await page.getProperty(selectors.workerTimeControl.monthName, 'innerText');
 
         expect(result).toContain(month);
-    });
 
-    it('should go 1 month in the past', async() => {
-        const date = new Date();
+        date = new Date();
         date.setMonth(date.getMonth() - 1);
         const timestamp = Math.round(date.getTime() / 1000);
-        const month = date.toLocaleString('default', {month: 'long'});
+        month = date.toLocaleString('default', {month: 'long'});
 
         await page.loginAndModule('salesBoss', 'worker');
         await page.goto(`http://localhost:5000/#!/worker/${hankPymId}/time-control?timestamp=${timestamp}`);
-        await page.waitToClick(selectors.workerTimeControl.secondWeekDay);
+        await page.click(selectors.workerTimeControl.secondWeekDay);
 
-        const result = await page.waitToGetProperty(selectors.workerTimeControl.monthName, 'innerText');
+        result = await page.getProperty(selectors.workerTimeControl.monthName, 'innerText');
 
         expect(result).toContain(month);
     });
@@ -115,7 +111,9 @@ describe('Worker time control path', () => {
     });
 
     it('should change week of month', async() => {
-        await page.waitToClick(selectors.workerTimeControl.thrirdWeekDay);
-        await page.waitForTextInElement(selectors.workerTimeControl.mondayWorkedHours, '00:00 h.');
+        await page.click(selectors.workerTimeControl.thrirdWeekDay);
+        const result = await page.getProperty(selectors.workerTimeControl.mondayWorkedHours, 'innerText');
+
+        expect(result).toEqual('00:00 h.');
     });
 });

e2e/paths/03-worker/05_calendar.spec.js

@@ -1,16 +1,25 @@
+/* eslint-disable max-len */
 import selectors from '../../helpers/selectors.js';
 import getBrowser from '../../helpers/puppeteer';
 
 describe('Worker calendar path', () => {
-    let reasonableTimeBetweenClicks = 400;
+    const reasonableTimeBetweenClicks = 300;
+    const date = new Date();
+    const lastYear = (date.getFullYear() - 1).toString();
+
     let browser;
     let page;
+
+    async function accessAs(user) {
+        await page.loginAndModule(user, 'worker');
+        await page.accessToSearchResult('Charles Xavier');
+        await page.accessToSection('worker.card.calendar');
+    }
+
     beforeAll(async() => {
         browser = await getBrowser();
         page = browser.page;
-        await page.loginAndModule('hr', 'worker');
-        await page.accessToSearchResult('Charles Xavier');
-        await page.accessToSection('worker.card.calendar');
+        accessAs('hr');
     });
 
     afterAll(async() => {
@@ -21,48 +30,40 @@ describe('Worker calendar path', () => {
         it('should set two days as holidays on the calendar and check the total holidays increased by 1.5', async() => {
             await page.waitToClick(selectors.workerCalendar.holidays);
             await page.waitForTimeout(reasonableTimeBetweenClicks);
-            await page.waitToClick(selectors.workerCalendar.penultimateMondayOfJanuary);
+            await page.click(selectors.workerCalendar.penultimateMondayOfJanuary);
 
             await page.waitForTimeout(reasonableTimeBetweenClicks);
-            await page.waitToClick(selectors.workerCalendar.absence);
+            await page.click(selectors.workerCalendar.absence);
             await page.waitForTimeout(reasonableTimeBetweenClicks);
-            await page.waitToClick(selectors.workerCalendar.lastMondayOfMarch);
+            await page.click(selectors.workerCalendar.lastMondayOfMarch);
 
             await page.waitForTimeout(reasonableTimeBetweenClicks);
-            await page.waitToClick(selectors.workerCalendar.halfHoliday);
+            await page.click(selectors.workerCalendar.halfHoliday);
             await page.waitForTimeout(reasonableTimeBetweenClicks);
-            await page.waitToClick(selectors.workerCalendar.fistMondayOfMay);
+            await page.click(selectors.workerCalendar.fistMondayOfMay);
 
             await page.waitForTimeout(reasonableTimeBetweenClicks);
-            await page.waitToClick(selectors.workerCalendar.furlough);
+            await page.click(selectors.workerCalendar.furlough);
             await page.waitForTimeout(reasonableTimeBetweenClicks);
-            await page.waitToClick(selectors.workerCalendar.secondTuesdayOfMay);
+            await page.click(selectors.workerCalendar.secondTuesdayOfMay);
             await page.waitForTimeout(reasonableTimeBetweenClicks);
-            await page.waitToClick(selectors.workerCalendar.secondWednesdayOfMay);
+            await page.click(selectors.workerCalendar.secondWednesdayOfMay);
             await page.waitForTimeout(reasonableTimeBetweenClicks);
-            await page.waitToClick(selectors.workerCalendar.secondThursdayOfMay);
+            await page.click(selectors.workerCalendar.secondThursdayOfMay);
 
             await page.waitForTimeout(reasonableTimeBetweenClicks);
-            await page.waitToClick(selectors.workerCalendar.halfFurlough);
-            await page.waitForTimeout(reasonableTimeBetweenClicks);
-            await page.waitToClick(selectors.workerCalendar.secondFridayOfJun);
+            await page.click(selectors.workerCalendar.halfFurlough);
             await page.waitForTimeout(reasonableTimeBetweenClicks);
+            await page.click(selectors.workerCalendar.secondFridayOfJun);
 
-            const result = await page.waitToGetProperty(selectors.workerCalendar.totalHolidaysUsed, 'innerText');
-
-            expect(result).toContain(' 1.5 ');
+            expect(await page.getProperty(selectors.workerCalendar.totalHolidaysUsed, 'innerText')).toContain(' 1.5 ');
         });
     });
 
     describe(`as salesBoss`, () => {
-        it(`should log in and get to Charles Xavier's calendar`, async() => {
-            await page.loginAndModule('salesBoss', 'worker');
-            await page.accessToSearchResult('Charles Xavier');
-            await page.accessToSection('worker.card.calendar');
-        });
+        it(`should log in, get to Charles Xavier's calendar, undo what was done here, and check the total holidays used are back to what it was`, async() => {
+            accessAs('salesBoss');
 
-        it('should undo what was done here', async() => {
-            await page.waitForTimeout(reasonableTimeBetweenClicks);
             await page.waitToClick(selectors.workerCalendar.holidays);
             await page.waitForTimeout(reasonableTimeBetweenClicks);
             await page.waitToClick(selectors.workerCalendar.penultimateMondayOfJanuary);
@@ -90,45 +91,24 @@ describe('Worker calendar path', () => {
             await page.waitToClick(selectors.workerCalendar.halfFurlough);
             await page.waitForTimeout(reasonableTimeBetweenClicks);
             await page.waitToClick(selectors.workerCalendar.secondFridayOfJun);
-        });
 
-        it('should check the total holidays used are back to what it was', async() => {
-            const result = await page.waitToGetProperty(selectors.workerCalendar.totalHolidaysUsed, 'innerText');
-
-            expect(result).toContain(' 0 ');
+            expect(await page.getProperty(selectors.workerCalendar.totalHolidaysUsed, 'innerText')).toContain(' 0 ');
         });
     });
 
     describe(`as Charles Xavier`, () => {
-        it(`should log in and get to his calendar`, async() => {
-            await page.loginAndModule('CharlesXavier', 'worker');
-            await page.accessToSearchResult('Charles Xavier');
-            await page.accessToSection('worker.card.calendar');
-        });
-
-        it('should make a futile attempt to add holidays', async() => {
-            await page.waitForTimeout(reasonableTimeBetweenClicks);
+        it('should log in and get to his calendar, make a futile attempt to add holidays, check the total holidays used are now the initial ones and use the year selector to go to the previous year', async() => {
+            accessAs('CharlesXavier');
             await page.waitToClick(selectors.workerCalendar.holidays);
             await page.waitForTimeout(reasonableTimeBetweenClicks);
-            await page.waitToClick(selectors.workerCalendar.penultimateMondayOfJanuary);
-        });
 
-        it('should check the total holidays used are now the initial ones', async() => {
-            const result = await page.waitToGetProperty(selectors.workerCalendar.totalHolidaysUsed, 'innerText');
+            await page.click(selectors.workerCalendar.penultimateMondayOfJanuary);
 
-            expect(result).toContain(' 0 ');
-        });
-
-        it('should use the year selector to go to the previous year', async() => {
-            const date = new Date();
-            const lastYear = (date.getFullYear() - 1).toString();
+            expect(await page.getProperty(selectors.workerCalendar.totalHolidaysUsed, 'innerText')).toContain(' 0 ');
 
             await page.autocompleteSearch(selectors.workerCalendar.year, lastYear);
 
-            await page.waitForTimeout(reasonableTimeBetweenClicks);
-            const result = await page.waitToGetProperty(selectors.workerCalendar.totalHolidaysUsed, 'innerText');
-
-            expect(result).toContain(' 0 ');
+            expect(await page.getProperty(selectors.workerCalendar.totalHolidaysUsed, 'innerText')).toContain(' 0 ');
         });
     });
 });

e2e/paths/04-item/02_basic_data.spec.js

@@ -35,6 +35,7 @@ describe('Item Edit basic data path', () => {
         await page.waitToClick(selectors.itemBasicData.isActiveCheckbox);
         await page.waitToClick(selectors.itemBasicData.priceInKgCheckbox);
         await page.waitToClick(selectors.itemBasicData.isFragile);
+        await page.write(selectors.itemBasicData.packingOut, '5');
         await page.waitToClick(selectors.itemBasicData.submitBasicDataButton);
         const message = await page.waitForSnackbar();
 
@@ -128,4 +129,11 @@ describe('Item Edit basic data path', () => {
 
         expect(result).toBe('checked');
     });
+
+    it(`should confirm the item packingOut was edited`, async() => {
+        const result = await page
+            .waitToGetProperty(selectors.itemBasicData.packingOut, 'value');
+
+        expect(result).toEqual('5');
+    });
 });

front/core/components/searchbar/searchbar.js

@@ -308,7 +308,7 @@ export default class Searchbar extends Component {
 
         this.tableQ = null;
 
-        const hasParams = this.$params.q && Object.keys(JSON.parse(this.$params.q)).length;
+        const hasParams = this.$params.q && JSON.parse(this.$params.q).tableQ;
         if (hasParams) {
             const stateFilter = JSON.parse(this.$params.q);
             for (let param in stateFilter) {
@@ -325,8 +325,8 @@ export default class Searchbar extends Component {
             for (let param in stateFilter.tableQ)
                 params[param] = stateFilter.tableQ[param];
 
-            Object.assign(stateFilter, params);
-            return this.model.applyParams(params)
+            const newParams = Object.assign(stateFilter, params);
+            return this.model.applyParams(newParams)
                 .then(() => this.model.data);
         }
 

front/core/components/searchbar/searchbar.spec.js

@@ -174,14 +174,12 @@ describe('Component vnSearchbar', () => {
             jest.spyOn(controller, 'doSearch');
             controller.model = {
                 refresh: jest.fn(),
+                applyFilter: jest.fn().mockReturnValue(Promise.resolve()),
                 userParams: {
                     id: 1
                 }
             };
 
-            controller.model.applyParams = jest.fn().mockReturnValue(Promise.resolve());
-            jest.spyOn(controller.model, 'applyParams');
-
             controller.filter = filter;
             controller.removeParam(0);
 

front/core/components/table/style.scss

@@ -153,6 +153,18 @@ vn-table {
                     background-color: $color-font-bg-dark;
                     color: $color-font-bg;
                 }
+                &.dark-notice {
+                    background-color: $color-notice;
+                    color: $color-font-bg;
+                }
+                &.yellow {
+                    background-color: $color-yellow;
+                    color: $color-font-bg;
+                }
+                &.pink {
+                    background-color: $color-pink;
+                    color: $color-font-bg;
+                }
             }
             vn-icon-menu {
                 display: inline-block;

front/core/styles/variables.scss

@@ -101,6 +101,8 @@ $color-marginal: #222;
 $color-success: #a3d131;
 $color-notice: #32b1ce;
 $color-alert: #fa3939;
+$color-pink: #ff99cc;
+$color-yellow: #ffff00;
 $color-button: $color-secondary;
 
 $color-spacer: rgba(255, 255, 255, .3);

front/package-lock.json

@@ -1,15 +1,8 @@
 {
 	"name": "salix-front",
 	"version": "1.0.0",
-	"lockfileVersion": 1,
+	"lockfileVersion": 2,
 	"requires": true,
-<<<<<<< HEAD
-	"dependencies": {
-		"@uirouter/angularjs": {
-			"version": "1.0.29",
-			"resolved": "https://registry.npmjs.org/@uirouter/angularjs/-/angularjs-1.0.29.tgz",
-			"integrity": "sha512-RImWnBarNixkMto0o8stEaGwZmvhv5cnuOLXyMU2pY8MP2rgEF74ZNJTLeJCW14LR7XDUxVH8Mk8bPI6lxedmQ==",
-=======
 	"packages": {
 		"": {
 			"name": "salix-front",
@@ -32,8 +25,7 @@
 		},
 		"node_modules/@uirouter/angularjs": {
 			"version": "1.0.30",
-			"resolved": "https://registry.npmjs.org/@uirouter/angularjs/-/angularjs-1.0.30.tgz",
-			"integrity": "sha512-qkc3RFZc91S5K0gc/QVAXc9LGDPXjR04vDgG/11j8+yyZEuQojXxKxdLhKIepiPzqLmGRVqzBmBc27gtqaEeZg==",
+			"license": "MIT",
 			"dependencies": {
 				"@uirouter/core": "6.0.8"
 			},
@@ -46,17 +38,14 @@
 		},
 		"node_modules/@uirouter/core": {
 			"version": "6.0.8",
-			"resolved": "https://registry.npmjs.org/@uirouter/core/-/core-6.0.8.tgz",
-			"integrity": "sha512-Gc/BAW47i4L54p8dqYCJJZuv2s3tqlXQ0fvl6Zp2xrblELPVfxmjnc0eurx3XwfQdaqm3T6uls6tQKkof/4QMw==",
+			"license": "MIT",
 			"engines": {
 				"node": ">=4.0.0"
 			}
 		},
 		"node_modules/angular": {
 			"version": "1.8.3",
-			"resolved": "https://registry.npmjs.org/angular/-/angular-1.8.3.tgz",
-			"integrity": "sha512-5qjkWIQQVsHj4Sb5TcEs4WZWpFeVFHXwxEBHUhrny41D8UrBAd6T/6nPPAsLngJCReIOqi95W3mxdveveutpZw==",
-			"deprecated": "For the actively supported Angular, see https://www.npmjs.com/package/@angular/core. AngularJS support has officially ended. For extended AngularJS support options, see https://goo.gle/angularjs-path-forward."
+			"license": "MIT"
 		},
 		"node_modules/angular-animate": {
 			"version": "1.8.2",
@@ -74,8 +63,7 @@
 		},
 		"node_modules/angular-translate": {
 			"version": "2.19.0",
-			"resolved": "https://registry.npmjs.org/angular-translate/-/angular-translate-2.19.0.tgz",
-			"integrity": "sha512-Z/Fip5uUT2N85dPQ0sMEe1JdF5AehcDe4tg/9mWXNDVU531emHCg53ZND9Oe0dyNiGX5rWcJKmsL1Fujus1vGQ==",
+			"license": "MIT",
 			"dependencies": {
 				"angular": "^1.8.0"
 			},
@@ -85,8 +73,7 @@
 		},
 		"node_modules/angular-translate-loader-partial": {
 			"version": "2.19.0",
-			"resolved": "https://registry.npmjs.org/angular-translate-loader-partial/-/angular-translate-loader-partial-2.19.0.tgz",
-			"integrity": "sha512-NnMw13LMV4bPQmJK7/pZOZAnPxe0M5OtUHchADs5Gye7V7feonuEnrZ8e1CKhBlv9a7IQyWoqcBa4Lnhg8gk5w==",
+			"license": "MIT",
 			"dependencies": {
 				"angular-translate": "~2.19.0"
 			}
@@ -133,8 +120,7 @@
 		},
 		"node_modules/moment": {
 			"version": "2.29.4",
-			"resolved": "https://registry.npmjs.org/moment/-/moment-2.29.4.tgz",
-			"integrity": "sha512-5LC9SOxjSc2HF6vO2CyuTDNivEdoz2IvyJJGj6X8DJ0eFyfszE0QiEd+iXmBvUP3WHxSjFH/vIsA0EN00cgr8w==",
+			"license": "MIT",
 			"engines": {
 				"node": "*"
 			}
@@ -179,97 +165,51 @@
 	"dependencies": {
 		"@uirouter/angularjs": {
 			"version": "1.0.30",
-			"resolved": "https://registry.npmjs.org/@uirouter/angularjs/-/angularjs-1.0.30.tgz",
-			"integrity": "sha512-qkc3RFZc91S5K0gc/QVAXc9LGDPXjR04vDgG/11j8+yyZEuQojXxKxdLhKIepiPzqLmGRVqzBmBc27gtqaEeZg==",
->>>>>>> dev
 			"requires": {
 				"@uirouter/core": "6.0.8"
 			}
 		},
 		"@uirouter/core": {
-<<<<<<< HEAD
-			"version": "6.0.7",
-			"resolved": "https://registry.npmjs.org/@uirouter/core/-/core-6.0.7.tgz",
-			"integrity": "sha512-KUTJxL+6q0PiBnFx4/Z+Hsyg0pSGiaW5yZQeJmUxknecjpTbnXkLU8H2EqRn9N2B+qDRa7Jg8RcgeNDPY72O1w=="
+			"version": "6.0.8"
 		},
 		"angular": {
-			"version": "1.8.2",
-			"resolved": "https://registry.npmjs.org/angular/-/angular-1.8.2.tgz",
-			"integrity": "sha512-IauMOej2xEe7/7Ennahkbb5qd/HFADiNuLSESz9Q27inmi32zB0lnAsFeLEWcox3Gd1F6YhNd1CP7/9IukJ0Gw=="
-=======
-			"version": "6.0.8",
-			"resolved": "https://registry.npmjs.org/@uirouter/core/-/core-6.0.8.tgz",
-			"integrity": "sha512-Gc/BAW47i4L54p8dqYCJJZuv2s3tqlXQ0fvl6Zp2xrblELPVfxmjnc0eurx3XwfQdaqm3T6uls6tQKkof/4QMw=="
-		},
-		"angular": {
-			"version": "1.8.3",
-			"resolved": "https://registry.npmjs.org/angular/-/angular-1.8.3.tgz",
-			"integrity": "sha512-5qjkWIQQVsHj4Sb5TcEs4WZWpFeVFHXwxEBHUhrny41D8UrBAd6T/6nPPAsLngJCReIOqi95W3mxdveveutpZw=="
->>>>>>> dev
+			"version": "1.8.3"
 		},
 		"angular-animate": {
-			"version": "1.8.2",
-			"resolved": "https://registry.npmjs.org/angular-animate/-/angular-animate-1.8.2.tgz",
-			"integrity": "sha512-Jbr9+grNMs9Kj57xuBU3Ju3NOPAjS1+g2UAwwDv7su1lt0/PLDy+9zEwDiu8C8xJceoTbmBNKiWGPJGBdCQLlA=="
+			"version": "1.8.2"
 		},
 		"angular-moment": {
 			"version": "1.3.0",
-			"resolved": "https://registry.npmjs.org/angular-moment/-/angular-moment-1.3.0.tgz",
-			"integrity": "sha512-KG8rvO9MoaBLwtGnxTeUveSyNtrL+RNgGl1zqWN36+HDCCVGk2DGWOzqKWB6o+eTTbO3Opn4hupWKIElc8XETA==",
 			"requires": {
 				"moment": ">=2.8.0 <3.0.0"
 			}
 		},
 		"angular-translate": {
-<<<<<<< HEAD
-			"version": "2.18.4",
-			"resolved": "https://registry.npmjs.org/angular-translate/-/angular-translate-2.18.4.tgz",
-			"integrity": "sha512-KohNrkH6J9PK+VW0L/nsRTcg5Fw70Ajwwe3Jbfm54Pf9u9Fd+wuingoKv+h45mKf38eT+Ouu51FPua8VmZNoCw==",
-=======
 			"version": "2.19.0",
-			"resolved": "https://registry.npmjs.org/angular-translate/-/angular-translate-2.19.0.tgz",
-			"integrity": "sha512-Z/Fip5uUT2N85dPQ0sMEe1JdF5AehcDe4tg/9mWXNDVU531emHCg53ZND9Oe0dyNiGX5rWcJKmsL1Fujus1vGQ==",
->>>>>>> dev
 			"requires": {
 				"angular": "^1.8.0"
 			}
 		},
 		"angular-translate-loader-partial": {
-<<<<<<< HEAD
-			"version": "2.18.4",
-			"resolved": "https://registry.npmjs.org/angular-translate-loader-partial/-/angular-translate-loader-partial-2.18.4.tgz",
-			"integrity": "sha512-bsjR+FbB0sdA2528E/ugwKdlPPQhA1looxLxI3otayBTFXBpED33besfSZhYAISLgNMSL038vSssfRUen9qD8w==",
-=======
 			"version": "2.19.0",
-			"resolved": "https://registry.npmjs.org/angular-translate-loader-partial/-/angular-translate-loader-partial-2.19.0.tgz",
-			"integrity": "sha512-NnMw13LMV4bPQmJK7/pZOZAnPxe0M5OtUHchADs5Gye7V7feonuEnrZ8e1CKhBlv9a7IQyWoqcBa4Lnhg8gk5w==",
->>>>>>> dev
 			"requires": {
 				"angular-translate": "~2.19.0"
 			}
 		},
 		"argparse": {
 			"version": "1.0.10",
-			"resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
-			"integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
 			"requires": {
 				"sprintf-js": "~1.0.2"
 			}
 		},
 		"croppie": {
-			"version": "2.6.5",
-			"resolved": "https://registry.npmjs.org/croppie/-/croppie-2.6.5.tgz",
-			"integrity": "sha512-IlChnVUGG5T3w2gRZIaQgBtlvyuYnlUWs2YZIXXR3H9KrlO1PtBT3j+ykxvy9eZIWhk+V5SpBmhCQz5UXKrEKQ=="
+			"version": "2.6.5"
 		},
 		"esprima": {
-			"version": "4.0.1",
-			"resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
-			"integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A=="
+			"version": "4.0.1"
 		},
 		"js-yaml": {
 			"version": "3.14.1",
-			"resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz",
-			"integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==",
 			"requires": {
 				"argparse": "^1.0.7",
 				"esprima": "^4.0.0"
@@ -277,45 +217,27 @@
 		},
 		"mg-crud": {
 			"version": "1.1.2",
-			"resolved": "https://registry.npmjs.org/mg-crud/-/mg-crud-1.1.2.tgz",
-			"integrity": "sha512-mAR6t0aQHKnT0QHKHpLOi0kNPZfO36iMpIoiLjFHxuio6mIJyuveBJ4VNlNXJRxLh32/FLADEb41/sYo7QUKFw==",
 			"requires": {
 				"angular": "^1.6.1"
 			}
 		},
 		"moment": {
-<<<<<<< HEAD
-			"version": "2.29.1",
-			"resolved": "https://registry.npmjs.org/moment/-/moment-2.29.1.tgz",
-			"integrity": "sha512-kHmoybcPV8Sqy59DwNDY3Jefr64lK/by/da0ViFcuA4DH0vQg5Q6Ze5VimxkfQNSC+Mls/Kx53s7TjP1RhFEDQ=="
-=======
-			"version": "2.29.4",
-			"resolved": "https://registry.npmjs.org/moment/-/moment-2.29.4.tgz",
-			"integrity": "sha512-5LC9SOxjSc2HF6vO2CyuTDNivEdoz2IvyJJGj6X8DJ0eFyfszE0QiEd+iXmBvUP3WHxSjFH/vIsA0EN00cgr8w=="
->>>>>>> dev
+			"version": "2.29.4"
 		},
 		"oclazyload": {
-			"version": "0.6.3",
-			"resolved": "https://registry.npmjs.org/oclazyload/-/oclazyload-0.6.3.tgz",
-			"integrity": "sha512-HpOSYUgjtt6sTB/C6+FWsExR+9HCnXKsUA96RWkDXfv11C8Cc9X2DlR0WIZwFIiG6FQU0pwB5dhoYyut8bFAOQ=="
+			"version": "0.6.3"
 		},
 		"require-yaml": {
 			"version": "0.0.1",
-			"resolved": "https://registry.npmjs.org/require-yaml/-/require-yaml-0.0.1.tgz",
-			"integrity": "sha512-M6eVEgLPRbeOhgSCnOTtdrOOEQzbXRchg24Xa13c39dMuraFKdI9emUo97Rih0YEFzSICmSKg8w4RQp+rd9pOQ==",
 			"requires": {
-				"js-yaml": "^4.1.0"
+				"js-yaml": ""
 			},
 			"dependencies": {
 				"argparse": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
-					"integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q=="
+					"version": "2.0.1"
 				},
 				"js-yaml": {
 					"version": "4.1.0",
-					"resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
-					"integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
 					"requires": {
 						"argparse": "^2.0.1"
 					}
@@ -323,14 +245,10 @@
 			}
 		},
 		"sprintf-js": {
-			"version": "1.0.3",
-			"resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
-			"integrity": "sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g=="
+			"version": "1.0.3"
 		},
 		"validator": {
-			"version": "6.3.0",
-			"resolved": "https://registry.npmjs.org/validator/-/validator-6.3.0.tgz",
-			"integrity": "sha512-BylxTwhqwjQI5MDJF7amCy/L0ejJO+74DvCsLV52Lq3+3bhVcVMKqNqOiNcQJm2G48u9EAcw4xFERAmFbwXM9Q=="
+			"version": "6.3.0"
 		}
 	}
 }

front/salix/components/sendSms/locale/es.yml

@@ -1,7 +1,7 @@
 Send SMS: Enviar SMS
 Destination: Destinatario
 Message: Mensaje
-SMS sent!: ¡SMS enviado!
+SMS sent: ¡SMS enviado!
 Characters remaining: Carácteres restantes
 The destination can't be empty: El destinatario no puede estar vacio
 The message can't be empty: El mensaje no puede estar vacio

modules/claim/back/methods/claim/filter.js

@@ -23,7 +23,7 @@ module.exports = Self => {
             {
                 arg: 'search',
                 type: 'string',
-                description: `If it's and integer searchs by id, otherwise it searchs by client name`,
+                description: `If it's a number searchs by id, otherwise it searchs by client name`,
                 http: {source: 'query'}
             },
             {
@@ -34,31 +34,31 @@ module.exports = Self => {
             },
             {
                 arg: 'id',
-                type: 'integer',
+                type: 'number',
                 description: 'The claim id',
                 http: {source: 'query'}
             },
             {
                 arg: 'clientFk',
-                type: 'integer',
+                type: 'number',
                 description: 'The client id',
                 http: {source: 'query'}
             },
             {
                 arg: 'claimStateFk',
-                type: 'integer',
+                type: 'number',
                 description: 'The claim state id',
                 http: {source: 'query'}
             },
             {
                 arg: 'salesPersonFk',
-                type: 'integer',
+                type: 'number',
                 description: 'The salesPerson id',
                 http: {source: 'query'}
             },
             {
                 arg: 'attenderFk',
-                type: 'integer',
+                type: 'number',
                 description: 'The attender worker id',
                 http: {source: 'query'}
             },
@@ -67,6 +67,18 @@ module.exports = Self => {
                 type: 'date',
                 description: 'The to date filter',
                 http: {source: 'query'}
+            },
+            {
+                arg: 'itemFk',
+                type: 'number',
+                description: 'The item id',
+                http: {source: 'query'}
+            },
+            {
+                arg: 'claimResponsibleFk',
+                type: 'number',
+                description: 'The claimResponsible id',
+                http: {source: 'query'}
             }
         ],
         returns: {
@@ -80,33 +92,58 @@ module.exports = Self => {
     });
 
     Self.filter = async(ctx, filter, options) => {
+        const models = Self.app.models;
         const conn = Self.dataSource.connector;
+        const args = ctx.args;
         const myOptions = {};
         let to;
 
         if (typeof options == 'object')
             Object.assign(myOptions, options);
 
-        const where = buildFilter(ctx.args, (param, value) => {
+        let claimIdsByItemFk = [];
+        let claimIdsByClaimResponsibleFk = [];
+
+        if (args.itemFk) {
+            query = `SELECT cb.claimFk
+                            FROM claimBeginning cb
+                                LEFT JOIN sale s ON s.id = cb.saleFk
+                            WHERE s.itemFk = ?`;
+            const claims = await Self.rawSql(query, [args.itemFk], myOptions);
+            claimIdsByItemFk = claims.map(claim => claim.claimFk);
+        }
+
+        if (args.claimResponsibleFk) {
+            const claims = await models.ClaimDevelopment.find({
+                fields: ['claimFk'],
+                where: {claimResponsibleFk: args.claimResponsibleFk}
+            }, myOptions);
+            claimIdsByClaimResponsibleFk = claims.map(claim => claim.claimFk);
+        }
+
+        const where = buildFilter(args, (param, value) => {
             switch (param) {
             case 'search':
                 return /^\d+$/.test(value)
                     ? {'cl.id': value}
                     : {
                         or: [
-                            {'cl.clientName': {like: `%${value}%`}}
+                            {'c.name': {like: `%${value}%`}}
                         ]
                     };
             case 'clientName':
-                return {'cl.clientName': {like: `%${value}%`}};
+                return {'c.name': {like: `%${value}%`}};
             case 'clientFk':
-                return {'cl.clientFk': value};
             case 'id':
             case 'claimStateFk':
             case 'priority':
                 return {[`cl.${param}`]: value};
+            case 'itemFk':
+                return {'cl.id': {inq: claimIdsByItemFk}};
+            case 'claimResponsibleFk':
+                return {'cl.id': {inq: claimIdsByClaimResponsibleFk}};
             case 'salesPersonFk':
-                return {'cl.salesPersonFk': value};
+                return {'c.salesPersonFk': value};
             case 'attenderFk':
                 return {'cl.workerFk': value};
             case 'created':
@@ -118,29 +155,23 @@ module.exports = Self => {
             }
         });
 
-        filter = mergeFilters(ctx.args.filter, {where});
+        filter = mergeFilters(args.filter, {where});
 
         const stmts = [];
 
         const stmt = new ParameterizedSQL(
-            `SELECT * 
-                FROM (
-                    SELECT 
+            `SELECT
                     cl.id,
                     cl.clientFk,
                     c.name AS clientName,
                     cl.workerFk,
                     u.name AS workerName,
                     cs.description,
-                        cl.created,
-                        cs.priority,
-                        cl.claimStateFk,
-                        c.salesPersonFk
+                    cl.created
                 FROM claim cl
                     LEFT JOIN client c ON c.id = cl.clientFk
-                        LEFT JOIN worker w ON w.id = cl.workerFk 
-                        LEFT JOIN account.user u ON u.id = w.userFk
-                        LEFT JOIN claimState cs ON cs.id = cl.claimStateFk ) cl`
+                    LEFT JOIN account.user u ON u.id = cl.workerFk
+                    LEFT JOIN claimState cs ON cs.id = cl.claimStateFk`
         );
 
         stmt.merge(conn.makeSuffix(filter));

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

@@ -57,4 +57,44 @@ describe('claim filter()', () => {
             throw e;
         }
     });
+
+    it('should return 3 results filtering by item id', async() => {
+        const tx = await app.models.Claim.beginTransaction({});
+
+        try {
+            const options = {transaction: tx};
+
+            const result = await app.models.Claim.filter({args: {filter: {}, itemFk: 2}}, null, options);
+
+            expect(result.length).toEqual(3);
+            expect(result[0].id).toEqual(1);
+            expect(result[1].id).toEqual(2);
+            expect(result[2].id).toEqual(4);
+
+            await tx.rollback();
+        } catch (e) {
+            await tx.rollback();
+            throw e;
+        }
+    });
+
+    it('should return 3 results filtering by claimResponsible id', async() => {
+        const tx = await app.models.Claim.beginTransaction({});
+
+        try {
+            const options = {transaction: tx};
+
+            const result = await app.models.Claim.filter({args: {filter: {}, claimResponsibleFk: 7}}, null, options);
+
+            expect(result.length).toEqual(3);
+            expect(result[0].id).toEqual(2);
+            expect(result[1].id).toEqual(3);
+            expect(result[2].id).toEqual(4);
+
+            await tx.rollback();
+        } catch (e) {
+            await tx.rollback();
+            throw e;
+        }
+    });
 });

modules/claim/front/search-panel/index.html

@@ -58,6 +58,26 @@
                 ng-model="filter.created">
             </vn-date-picker>
         </vn-horizontal>
+        <vn-horizontal>
+            <vn-autocomplete vn-one class="dense"
+                label="Item"
+                url="Items/withName"
+                ng-model="filter.itemFk"
+                show-field="name"
+                value-field="id"
+                search-function="$ctrl.itemSearchFunc($search)"
+                order="id DESC">
+                <tpl-item>{{::id}} - {{::name}}</tpl-item>
+            </vn-autocomplete>
+            <vn-autocomplete
+                vn-one
+                ng-model="filter.claimResponsibleFk"
+                url="ClaimResponsibles"
+                show-field="description"
+                value-field="id"
+                label="Responsible">
+            </vn-autocomplete>
+        </vn-horizontal>
         <vn-horizontal class="vn-mt-lg">
             <vn-submit label="Search"></vn-submit>
         </vn-horizontal>

modules/claim/front/search-panel/index.js

@@ -1,7 +1,14 @@
 import ngModule from '../module';
 import SearchPanel from 'core/components/searchbar/search-panel';
 
+class Controller extends SearchPanel {
+    itemSearchFunc($search) {
+        return /^\d+$/.test($search)
+            ? {id: $search}
+            : {name: {like: '%' + $search + '%'}};
+    }
+}
 ngModule.vnComponent('vnClaimSearchPanel', {
     template: require('./index.html'),
-    controller: SearchPanel
+    controller: Controller
 });

modules/client/front/balance/create/index.js

@@ -4,7 +4,7 @@ import Dialog from 'core/components/dialog';
 class Controller extends Dialog {
     constructor($element, $, $transclude, vnReport) {
         super($element, $, $transclude);
-
+        this.viewReceipt = true;
         this.vnReport = vnReport;
         this.receipt = {};
     }

modules/client/front/balance/create/index.spec.js

@@ -75,6 +75,7 @@ describe('Client', () => {
                 jest.spyOn(controller.vnReport, 'show');
 
                 controller.$params = {id: 1101};
+                controller.viewReceipt = false;
 
                 $httpBackend.expect('POST', `Clients/1101/createReceipt`).respond({id: 1});
                 controller.responseHandler('accept');

modules/invoiceOut/back/methods/invoiceOut/specs/createPdf.spec.js

@@ -11,7 +11,6 @@ describe('InvoiceOut createPdf()', () => {
     const ctx = {req: activeCtx};
 
     it('should create a new PDF file and set true the hasPdf property', async() => {
-        pending('https://redmine.verdnatura.es/issues/4875');
         const invoiceId = 1;
         spyOn(LoopBackContext, 'getCurrentContext').and.returnValue({
             active: activeCtx

modules/invoiceOut/back/methods/invoiceOut/specs/downloadZip.spec.js

@@ -13,7 +13,6 @@ describe('InvoiceOut downloadZip()', () => {
     };
 
     it('should return part of link to dowloand the zip', async() => {
-        pending('https://redmine.verdnatura.es/issues/4875');
         const tx = await models.InvoiceOut.beginTransaction({});
 
         try {
@@ -31,6 +30,8 @@ describe('InvoiceOut downloadZip()', () => {
     });
 
     it('should return an error if the size of the files is too large', async() => {
+        pending('https://redmine.verdnatura.es/issues/5035');
+
         const tx = await models.InvoiceOut.beginTransaction({});
 
         let error;

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

@@ -51,7 +51,6 @@ describe('InvoiceOut filter()', () => {
     });
 
     it('should return the invoice out matching hasPdf', async() => {
-        pending('https://redmine.verdnatura.es/issues/4875');
         const tx = await models.InvoiceOut.beginTransaction({});
         const options = {transaction: tx};
 
@@ -67,7 +66,7 @@ describe('InvoiceOut filter()', () => {
 
             const result = await models.InvoiceOut.filter(ctx, {id: invoiceOut.id}, options);
 
-            expect(result.length).toEqual(1);
+            expect(result.length).toBeGreaterThanOrEqual(1);
 
             await tx.rollback();
         } catch (e) {

modules/invoiceOut/front/descriptor-menu/index.html

@@ -17,12 +17,12 @@
                         target="_blank"
                         name="showInvoicePdf"
                         translate>
-                        Show as PDF
+                        as PDF
                     </a>
                     <vn-item
                         ng-click="$ctrl.showCsvInvoice()"
                         translate>
-                        Show as CSV
+                        as CSV
                     </vn-item>
                 </vn-list>
             </vn-menu>

modules/invoiceOut/front/descriptor-menu/locale/es.yml

@@ -2,6 +2,8 @@ Show invoice...: Ver factura...
 Send invoice...: Enviar factura...
 Send PDF invoice: Enviar factura en PDF
 Send CSV invoice: Enviar factura en CSV
+as PDF: como PDF
+as CSV: como CSV
 Delete Invoice:  Eliminar factura
 Clone Invoice:  Clonar factura
 Book invoice: Asentar factura

modules/item/back/methods/item-shelving-sale/filter.js

@@ -0,0 +1,49 @@
+
+const ParameterizedSQL = require('loopback-connector').ParameterizedSQL;
+
+module.exports = Self => {
+    Self.remoteMethod('filter', {
+        description: 'Returns all item shelving sale matching with the filter',
+        accessType: 'READ',
+        accepts: [{
+            arg: 'filter',
+            type: 'object',
+            description: 'Filter defining where and paginated data'
+        }],
+        returns: {
+            type: ['object'],
+            root: true
+        },
+        http: {
+            path: `/filter`,
+            verb: 'GET'
+        }
+    });
+
+    Self.filter = async(filter, options) => {
+        const conn = Self.dataSource.connector;
+        const myOptions = {};
+
+        if (typeof options == 'object')
+            Object.assign(myOptions, options);
+
+        const stmt = new ParameterizedSQL(`
+            SELECT iss.created,
+                iss.saleFk,
+                iss.quantity,
+                iss.userFk,
+                ish.shelvingFk,
+                p.code,
+                u.name
+            FROM itemShelvingSale iss
+                LEFT JOIN itemShelving ish ON iss.itemShelvingFk = ish.id
+                LEFT JOIN shelving s ON ish.shelvingFk = s.code
+                LEFT JOIN parking p ON s.parkingFk = p.id
+                LEFT JOIN account.user u ON u.id = iss.userFk`
+        );
+
+        stmt.merge(conn.makeSuffix(filter));
+
+        return conn.executeStmt(stmt);
+    };
+};

modules/item/back/models/item-shelving-sale.js

@@ -0,0 +1,3 @@
+module.exports = Self => {
+    require('../methods/item-shelving-sale/filter')(Self);
+};

modules/item/back/models/item-shelving.json

@@ -11,9 +11,6 @@
 			"type": "number",
 			"id": true,
 			"description": "Identifier"
-		},
-		"shelve": {
-			"type": "string"
 		},
 		"shelvingFk": {
 			"type": "string"
@@ -21,12 +18,6 @@
 		"itemFk": {
 			"type": "number"
         },
-        "deep": {
-			"type": "number"
-        },
-        "quantity": {
-			"type": "number"
-		},
 		"created": {
 			"type": "date"
 		}
@@ -41,6 +32,11 @@
 			"type": "belongsTo",
 			"model": "Account",
 			"foreignKey": "userFk"
+		},
+        "shelving": {
+			"type": "belongsTo",
+			"model": "Shelving",
+			"foreignKey": "shelvingFk"
 		}
 	}
 }

modules/item/front/basic-data/index.html

@@ -128,6 +128,13 @@
                 ng-model="$ctrl.item.weightByPiece"
                 rule>
             </vn-input-number>
+            <vn-input-number
+                vn-one
+                min="0"
+                label="Units/Box"
+                ng-model="$ctrl.item.packingOut"
+                rule>
+            </vn-input-number>
             <vn-autocomplete
                 vn-one
                 label="Generic"

modules/item/front/locale/es.yml

@@ -44,6 +44,7 @@ Weight/Piece: Peso/tallo
 Search items by id, name or barcode: Buscar articulos por identificador, nombre o codigo de barras
 SalesPerson: Comercial
 Concept: Concepto
+Units/Box: Unidades/Caja
 
 # Sections
 Items: Artículos

modules/mdb/back/methods/mdbVersion/upload.js

@@ -65,7 +65,7 @@ module.exports = Self => {
         try {
             const mdbApp = await models.MdbApp.findById(appName, null, myOptions);
 
-            if (mdbApp.locked && mdbApp.userFk != userId) {
+            if (mdbApp && mdbApp.locked && mdbApp.userFk != userId) {
                 throw new UserError($t('App locked', {
                     userId: mdbApp.userFk
                 }));

modules/monitor/front/index/tickets/index.html

@@ -79,51 +79,51 @@
                 </thead>
                 <tbody>
                     <tr ng-repeat="ticket in model.data track by ticket.id"
-                        vn-anchor="::{
+                        vn-anchor="{
                             state: 'ticket.card.summary', 
                             params: {id: ticket.id},
                             target: '_blank'
                         }">
                         <td>
                             <vn-icon
-                                ng-show="::ticket.isTaxDataChecked === 0"
+                                ng-show="ticket.isTaxDataChecked === 0"
                                 translate-attr="{title: 'No verified data'}"
                                 class="bright"
                                 icon="icon-no036">
                             </vn-icon>
                             <vn-icon
-                                ng-show="::ticket.hasTicketRequest"
+                                ng-show="ticket.hasTicketRequest"
                                 translate-attr="{title: 'Purchase request'}"
                                 class="bright"
                                 icon="icon-buyrequest">
                             </vn-icon>
                             <vn-icon
-                                ng-show="::ticket.itemShortage"
+                                ng-show="ticket.itemShortage"
                                 translate-attr="{title: 'Not visible'}"
                                 class="bright"
                                 icon="icon-unavailable">
                             </vn-icon>
                             <vn-icon
-                                ng-show="::ticket.isFreezed"
+                                ng-show="ticket.isFreezed"
                                 translate-attr="{title: 'Client frozen'}"
                                 class="bright"
                                 icon="icon-frozen">
                             </vn-icon>
                             <vn-icon
-                                ng-show="::ticket.risk"
-                                ng-class="::{'highRisk': ticket.hasHighRisk}"
-                                title="{{::$ctrl.$t('Risk')}}: {{ticket.risk}}"
+                                ng-show="ticket.risk"
+                                ng-class="{'highRisk': ticket.hasHighRisk}"
+                                title="{{$ctrl.$t('Risk')}}: {{ticket.risk}}"
                                 class="bright"
                                 icon="icon-risk">
                             </vn-icon>
                             <vn-icon
-                                ng-show="::ticket.hasComponentLack"
+                                ng-show="ticket.hasComponentLack"
                                 translate-attr="{title: 'Component lack'}"
                                 class="bright"
                                 icon="icon-components">
                             </vn-icon>
                             <vn-icon
-                                ng-show="::ticket.isTooLittle"
+                                ng-show="ticket.isTooLittle"
                                 translate-attr="{title: 'Ticket too little'}"
                                 class="bright"
                                 icon="icon-isTooLittle">
@@ -133,64 +133,64 @@
                             <span
                                 vn-click-stop="ticketDescriptor.show($event, ticket.id)"
                                 class="link">
-                                {{::ticket.id}}
+                                {{ticket.id}}
                             </span>
                         </td>
                         <td name="nickname">
                             <span
-                                title="{{::ticket.nickname}}"
+                                title="{{ticket.nickname}}"
                                 vn-click-stop="clientDescriptor.show($event, ticket.clientFk)"
                                 class="link">
-                                {{::ticket.nickname}}
+                                {{ticket.nickname}}
                             </span>
                         </td>
                         <td>
                             <span
-                                title="{{::ticket.userName}}"
+                                title="{{ticket.userName}}"
                                 vn-click-stop="workerDescriptor.show($event, ticket.salesPersonFk)"
                                 class="link">
-                                {{::ticket.userName | dashIfEmpty}}
+                                {{ticket.userName | dashIfEmpty}}
                             </span>
                         </td>
                         <td>
-                            <span class="chip {{::$ctrl.compareDate(ticket.shippedDate)}}">
-                                {{::ticket.shippedDate | date: 'dd/MM/yyyy'}}
+                            <span class="chip {{$ctrl.compareDate(ticket.shippedDate)}}">
+                                {{ticket.shippedDate | date: 'dd/MM/yyyy'}}
                             </span>
                         </td>
-                        <td>{{::ticket.zoneLanding | date: 'HH:mm'}}</td>
-                        <td>{{::ticket.practicalHour | date: 'HH:mm'}}</td>
-                        <td>{{::ticket.shipped | date: 'HH:mm'}}</td>
-                        <td>{{::ticket.province}}</td>
+                        <td>{{ticket.zoneLanding | date: 'HH:mm'}}</td>
+                        <td>{{ticket.practicalHour | date: 'HH:mm'}}</td>
+                        <td>{{ticket.shipped | date: 'HH:mm'}}</td>
+                        <td>{{ticket.province}}</td>
                         <td>
                             <span
-                                ng-show="::ticket.refFk"
-                                title="{{::ticket.refFk}}"
+                                ng-show="ticket.refFk"
+                                title="{{ticket.refFk}}"
                                 vn-click-stop="invoiceOutDescriptor.show($event, ticket.invoiceOutId)"
                                 class="link">
-                                {{::ticket.refFk}}
+                                {{ticket.refFk}}
                             </span>
                             <span 
-                                ng-show="::!ticket.refFk"
-                                class="chip {{::ticket.classColor}}">
-                                {{::ticket.state}}
+                                ng-show="!ticket.refFk"
+                                class="chip {{ticket.classColor}}">
+                                {{ticket.state}}
                             </span>
                         </td>
                         <td name="zone">
                             <span
-                                title="{{::ticket.zoneName}}"
+                                title="{{ticket.zoneName}}"
                                 vn-click-stop="zoneDescriptor.show($event, ticket.zoneFk)"
                                 class="link">
-                                {{::ticket.zoneName | dashIfEmpty}}
+                                {{ticket.zoneName | dashIfEmpty}}
                             </span>
                         </td>
                         <td number>
-                            <span class="chip {{::$ctrl.totalPriceColor(ticket)}}">
-                                {{::(ticket.totalWithVat ? ticket.totalWithVat : 0) | currency: 'EUR': 2}}
+                            <span class="chip {{$ctrl.totalPriceColor(ticket)}}">
+                                {{(ticket.totalWithVat ? ticket.totalWithVat : 0) | currency: 'EUR': 2}}
                             </span>
                         </td>
                         <td actions>
                             <vn-icon-button
-                                vn-anchor="::{
+                                vn-anchor="{
                                     state: 'ticket.card.sale', 
                                     params: {id: ticket.id}, 
                                     target: '_blank'

modules/route/front/sms/index.js

@@ -26,7 +26,7 @@ class Controller extends Component {
                 throw new Error(`The message it's too long`);
 
             this.$http.post(`Routes/sendSms`, this.sms).then(res => {
-                this.vnApp.showMessage(this.$t('SMS sent!'));
+                this.vnApp.showMessage(this.$t('SMS sent'));
 
                 if (res.data) this.emit('send', {response: res.data});
             });

modules/route/front/sms/index.spec.js

@@ -30,7 +30,7 @@ describe('Route', () => {
                 controller.onResponse();
                 $httpBackend.flush();
 
-                expect(controller.vnApp.showMessage).toHaveBeenCalledWith('SMS sent!');
+                expect(controller.vnApp.showMessage).toHaveBeenCalledWith('SMS sent');
             });
 
             it('should call onResponse without the destination and show an error snackbar', () => {

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

@@ -0,0 +1,33 @@
+module.exports = Self => {
+    Self.remoteMethodCtx('salePreparingList', {
+        description: 'Returns a list with the lines of a ticket and its different states of preparation',
+        accessType: 'READ',
+        accepts: [{
+            arg: 'id',
+            type: 'number',
+            required: true,
+            description: 'The ticket id',
+            http: {source: 'path'}
+        }],
+        returns: {
+            type: ['object'],
+            root: true
+        },
+        http: {
+            path: `/:id/salePreparingList`,
+            verb: 'GET'
+        }
+    });
+
+    Self.salePreparingList = async(ctx, id, options) => {
+        const myOptions = {};
+
+        if (typeof options == 'object')
+            Object.assign(myOptions, options);
+
+        query = `CALL vn.salePreparingList(?)`;
+        const [sales] = await Self.rawSql(query, [id], myOptions);
+
+        return sales;
+    };
+};

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

@@ -24,6 +24,8 @@ module.exports = Self => {
         const salesDepartment = await models.Department.findOne({where: {code: 'VT'}, fields: 'id'}, myOptions);
         const departments = await models.Department.getLeaves(salesDepartment.id, null, myOptions);
         const workerDepartment = await models.WorkerDepartment.findById(userId, null, myOptions);
+        if (!workerDepartment) return false;
+
         const usesMana = departments.find(department => department.id == workerDepartment.departmentFk);
 
         return usesMana ? true : false;

modules/ticket/back/models/sale.js

@@ -1,5 +1,6 @@
 module.exports = Self => {
     require('../methods/sale/getClaimableFromTicket')(Self);
+    require('../methods/sale/salePreparingList')(Self);
     require('../methods/sale/reserve')(Self);
     require('../methods/sale/deleteSales')(Self);
     require('../methods/sale/updatePrice')(Self);

modules/ticket/front/descriptor-menu/index.js

@@ -267,8 +267,15 @@ class Controller extends Section {
 
         if (client.hasElectronicInvoice) {
             this.$http.post(`NotificationQueues`, {
-                notificationFk: 'invoiceElectronic',
+                notificationFk: 'invoice-electronic',
                 authorFk: client.id,
+                params: JSON.stringify(
+                    {
+                        'name': client.name,
+                        'email': client.email,
+                        'ticketId': this.id,
+                        'url': window.location.href
+                    })
             }).then(() => {
                 this.vnApp.showSuccess(this.$t('Invoice sent'));
             });

modules/ticket/front/sale-tracking/index.html

@@ -1,10 +1,11 @@
 <vn-crud-model
     vn-id="model"
-    url="SaleTrackings/listSaleTracking"
+    url="sales"
+    filter="::$ctrl.filter"
     link="{ticketFk: $ctrl.$params.id}"
     limit="20"
-    data="sales"
-    order="itemFk DESC"
+    data="$ctrl.sales"
+    order="concept ASC"
     auto-load="true">
 </vn-crud-model>
 <vn-data-viewer model="model">
@@ -12,31 +13,27 @@
     <vn-table model="model">
         <vn-thead>
             <vn-tr>
-                <vn-th shrink></vn-th>
+                <vn-th field="isChecked" center>Is checked</vn-th>
                 <vn-th field="itemFk" number>Item</vn-th>
-                <vn-th expand>Description</vn-th>
+                <vn-th field="concept">Description</vn-th>
                 <vn-th field="quantity" number>Quantity</vn-th>
-                <vn-th field="originalQuantity" number>Original</vn-th>
-                <vn-th field="workerFk">Worker</vn-th>
-                <vn-th field="state" shrink>State</vn-th>
-                <vn-th field="created" expand>Created</vn-th>
+                <vn-th></vn-th>
             </vn-tr>
         </vn-thead>
         <vn-tbody>
-            <vn-tr ng-repeat="sale in sales">
-                <vn-td shrink>
-                    <vn-icon 
-                        class="bright"
-                        icon="warning" 
-                        ng-if="sale.quantity != sale.originalQuantity"
-                        vn-tooltip="The quantity do not match">
-                    </vn-icon>
+            <vn-tr ng-repeat="sale in $ctrl.sales">
+                <vn-td center>
+                    <span class="chip {{$ctrl.chipHasSaleGroupDetail(sale.preparingList.hasSaleGroupDetail)}} vn-mx-xs chip2" vn-tooltip="has saleGroupDetail"></span>
+                    <span class="chip {{$ctrl.chipIsPreviousSelected(sale.preparingList.isPreviousSelected)}} vn-ml-xs" vn-tooltip="is previousSelected"></span>
+                    <span class="chip {{$ctrl.chipIsPrevious(sale.preparingList.isPrevious)}} vn-mr-xs" vn-tooltip="is previous"></span>
+                    <span class="chip {{$ctrl.chipIsPrepared(sale.preparingList.isPrepared)}} vn-mx-xs" vn-tooltip="is prepared"></span>
+                    <span class="chip {{$ctrl.chipIsControled(sale.preparingList.isControled)}} vn-mx-xs" vn-tooltip="is controled"></span>
                 </vn-td>
                 <vn-td number>
                     <span
-                        ng-click="itemDescriptor.show($event, sale.itemFk, sale.id)"
+                        ng-click="$ctrl.showItemDescriptor($event, sale)"
                         class="link">
-                        {{sale.itemFk | zeroFill:6}}
+                        {{::sale.itemFk | zeroFill:6}}
                     </span>
                 </vn-td>
                 <vn-td vn-fetched-tags>
@@ -52,6 +49,54 @@
                         tabindex="-1">
                     </vn-fetched-tags>
                 </vn-td>
+                <vn-td number>{{::sale.quantity}}</vn-td>
+                <vn-td actions>
+                    <vn-icon-button
+                        vn-click-stop="$ctrl.showSaleTracking(sale)"
+                        vn-tooltip="Sale tracking"
+                        icon="history">
+                    </vn-icon-button>
+                    <vn-icon-button
+                        vn-click-stop="$ctrl.showItemShelvingSale(sale)"
+                        vn-tooltip="ItemShelvings sale"
+                        icon="icon-inventory">
+                    </vn-icon-button>
+                </vn-td>
+            </vn-tr>
+        </vn-tbody>
+    </vn-table>
+    </vn-card>
+</vn-data-viewer>
+<vn-item-descriptor-popover
+    vn-id="item-descriptor"
+    warehouse-fk="$ctrl.ticket.warehouseFk"
+    ticket-fk="$ctrl.ticket.id">
+</vn-item-descriptor-popover>
+
+<vn-popup vn-id="saleTracking">
+    <vn-crud-model
+        vn-id="modelSaleTracking"
+        url="SaleTrackings/listSaleTracking"
+        link="{saleFk: $ctrl.saleId}"
+        limit="20"
+        data="saleTrackings"
+        order="itemFk DESC"
+        auto-load="true">
+    </vn-crud-model>
+    <vn-data-viewer model="modelSaleTracking">
+        <vn-card class="vn-w-lg">
+        <vn-table model="modelSaleTracking">
+            <vn-thead>
+                <vn-tr>
+                    <vn-th field="quantity" number>Quantity</vn-th>
+                    <vn-th field="originalQuantity" number>Original</vn-th>
+                    <vn-th field="workerFk">Worker</vn-th>
+                    <vn-th field="state" shrink>State</vn-th>
+                    <vn-th field="created" expand>Created</vn-th>
+                </vn-tr>
+            </vn-thead>
+            <vn-tbody>
+                <vn-tr ng-repeat="sale in saleTrackings">
                     <vn-td number>{{::sale.quantity}}</vn-td>
                     <vn-td number>{{::sale.originalQuantity}}</vn-td>
                     <vn-td expand>
@@ -75,3 +120,48 @@
     <vn-worker-descriptor-popover
         vn-id="worker-descriptor">
     </vn-worker-descriptor-popover>
+</vn-popup>
+
+<vn-popup vn-id="itemShelvingSale">
+    <vn-crud-model
+        vn-id="modelSaleTracking"
+        url="ItemShelvingSales/filter"
+        link="{saleFk: $ctrl.saleId}"
+        limit="20"
+        data="$ctrl.itemShelvingSales"
+        auto-load="true">
+    </vn-crud-model>
+    <vn-data-viewer model="modelSaleTracking">
+        <vn-card class="vn-w-lg">
+        <vn-table model="modelSaleTracking">
+            <vn-thead>
+                <vn-tr>
+                    <vn-th field="quantity" number>Quantity</vn-th>
+                    <vn-th field="workerFk">Worker</vn-th>
+                    <vn-th field="shelving" shrink>Shelving</vn-th>
+                    <vn-th field="parking" shrink>Parking</vn-th>
+                    <vn-th field="created" expand>Created</vn-th>
+                </vn-tr>
+            </vn-thead>
+            <vn-tbody>
+                <vn-tr ng-repeat="itemShelvingSale in $ctrl.itemShelvingSales">
+                    <vn-td number>{{::itemShelvingSale.quantity}}</vn-td>
+                    <vn-td expand>
+                        <span
+                            class="link"
+                            ng-click="workerDescriptor.show($event, itemShelvingSale.userFk)">
+                            {{::itemShelvingSale.name | dashIfEmpty}}
+                        </span>
+                    </vn-td>
+                    <vn-td shrink>{{::itemShelvingSale.shelvingFk}}</vn-td>
+                    <vn-td shrink>{{::itemShelvingSale.code}}</vn-td>
+                    <vn-td expand>{{::itemShelvingSale.created | date: 'dd/MM/yyyy HH:mm'}}</vn-td>
+                </vn-tr>
+            </vn-tbody>
+        </vn-table>
+        </vn-card>
+    </vn-data-viewer>
+    <vn-worker-descriptor-popover
+        vn-id="worker-descriptor">
+    </vn-worker-descriptor-popover>
+</vn-popup>

modules/ticket/front/sale-tracking/index.js

@@ -1,12 +1,100 @@
 import ngModule from '../module';
 import Section from 'salix/components/section';
+import './style.scss';
 
-class Controller extends Section {}
+class Controller extends Section {
+    constructor($element, $) {
+        super($element, $);
+        this.filter = {
+            include: [
+                {
+                    relation: 'item'
+                }, {
+                    relation: 'saleTracking',
+                    scope: {
+                        fields: ['isChecked']
+                    }
+                }
+            ]
+        };
+    }
+
+    get sales() {
+        return this._sales;
+    }
+
+    set sales(value) {
+        this._sales = value;
+        if (value) {
+            const query = `Sales/${this.$params.id}/salePreparingList`;
+            this.$http.get(query)
+                .then(res => {
+                    this.salePreparingList = res.data;
+                    for (const salePreparing of this.salePreparingList) {
+                        for (const sale of this.sales) {
+                            if (salePreparing.saleFk == sale.id)
+                                sale.preparingList = salePreparing;
+                        }
+                    }
+                });
+        }
+    }
+
+    showItemDescriptor(event, sale) {
+        this.quicklinks = {
+            btnThree: {
+                icon: 'icon-transaction',
+                state: `item.card.diary({
+                    id: ${sale.itemFk},
+                    warehouseFk: ${this.ticket.warehouseFk},
+                    lineFk: ${sale.id}
+                })`,
+                tooltip: 'Item diary'
+            }
+        };
+        this.$.itemDescriptor.show(event.target, sale.itemFk);
+    }
+
+    chipHasSaleGroupDetail(hasSaleGroupDetail) {
+        if (hasSaleGroupDetail) return 'pink';
+        else return 'message';
+    }
+
+    chipIsPreviousSelected(isPreviousSelected) {
+        if (isPreviousSelected) return 'notice';
+        else return 'message';
+    }
+
+    chipIsPrevious(isPrevious) {
+        if (isPrevious) return 'dark-notice';
+        else return 'message';
+    }
+
+    chipIsPrepared(isPrepared) {
+        if (isPrepared) return 'warning';
+        else return 'message';
+    }
+
+    chipIsControled(isControled) {
+        if (isControled) return 'yellow';
+        else return 'message';
+    }
+
+    showSaleTracking(sale) {
+        this.saleId = sale.id;
+        this.$.saleTracking.show();
+    }
+
+    showItemShelvingSale(sale) {
+        this.saleId = sale.id;
+        this.$.itemShelvingSale.show();
+    }
+}
 
 ngModule.vnComponent('vnTicketSaleTracking', {
     template: require('./index.html'),
     controller: Controller,
     bindings: {
-        ticket: '<',
-    },
+        ticket: '<'
+    }
 });

modules/ticket/front/sale-tracking/locale/es.yml

@@ -0,0 +1,6 @@
+ItemShelvings sale: Carros línea
+has saleGroupDetail: tiene detalle grupo lineas
+is previousSelected: es previa seleccionada
+is previous: es previa
+is prepared: esta preparado
+is controled: esta controlado

modules/ticket/front/sale-tracking/style.scss

@@ -0,0 +1,7 @@
+@import "variables";
+
+.chip {
+    display: inline-block;
+    min-width: 15px;
+    min-height: 25px;
+}

modules/ticket/front/sale/index.html

@@ -441,10 +441,11 @@
 </vn-popover>
 
 <!-- SMS Dialog -->
-<vn-ticket-sms
+<vn-sms-dialog
     vn-id="sms"
-    sms="$ctrl.newSMS">
-</vn-ticket-sms>
+    sms="$ctrl.newSMS"
+    on-send="$ctrl.onSmsSend($sms)">
+</vn-sms-dialog>
 
 <vn-confirm
     vn-id="delete-lines"

modules/ticket/front/sale/index.js

@@ -389,6 +389,11 @@ class Controller extends Section {
         this.$.sms.open();
     }
 
+    onSmsSend(sms) {
+        return this.$http.post(`Tickets/${this.ticket.id}/sendSms`, sms)
+            .then(() => this.vnApp.showSuccess(this.$t('SMS sent')));
+    }
+
     /**
      * Inserts a new instance
      */

modules/travel/front/extra-community/index.html

@@ -27,7 +27,7 @@
             <section>
                 <vn-tool-bar class="vn-mb-md">
                     <vn-button
-                        disabled="!$ctrl.hasDateRange"
+                        disabled="!travels.length"
                         icon="picture_as_pdf"
                         ng-click="$ctrl.showReport()"
                         vn-tooltip="Open as PDF">

modules/travel/front/extra-community/index.js

@@ -43,16 +43,6 @@ class Controller extends Section {
         this.smartTableOptions = {};
     }
 
-    get hasDateRange() {
-        const userParams = this.$.model.userParams;
-        const hasLanded = userParams.landedTo;
-        const hasShipped = userParams.shippedFrom;
-        const hasContinent = userParams.continent;
-        const hasWarehouseOut = userParams.warehouseOutFk;
-
-        return hasLanded || hasShipped || hasContinent || hasWarehouseOut;
-    }
-
     onDragInterval() {
         if (this.dragClientY > 0 && this.dragClientY < 75)
             this.$window.scrollTo(0, this.$window.scrollY - 10);

modules/travel/front/extra-community/index.spec.js

@@ -14,17 +14,6 @@ describe('Travel Component vnTravelExtraCommunity', () => {
         controller.$.model.refresh = jest.fn();
     }));
 
-    describe('hasDateRange()', () => {
-        it('should return truthy when shippedFrom or landedTo are set as userParams', () => {
-            const now = new Date();
-            controller.$.model.userParams = {shippedFrom: now, landedTo: now};
-
-            const result = controller.hasDateRange;
-
-            expect(result).toBeTruthy();
-        });
-    });
-
     describe('findDraggable()', () => {
         it('should find the draggable element', () => {
             const draggable = document.createElement('tr');

print/templates/email/invoice-electronic/invoice-electronic.html

@@ -0,0 +1,13 @@
+<!DOCTYPE html>
+<html v-bind="$props">
+    <head>
+        <meta name="viewport" content="width=device-width">
+        <meta name="format-detection" content="telephone=no">
+        <title>{{ $t('subject') }}</title>
+    </head>
+    <body>
+        <h1>{{ $t('title') }} {{name}}</h1>
+        <p>{{ $t('clientMail') }} {{email}}</p>
+        <p>{{ $t('ticketId') }} <a :href='url'>{{ticketId}}</a>
+    </body>
+</html>

print/templates/email/invoice-electronic/invoice-electronic.js

@@ -0,0 +1,21 @@
+module.exports = {
+    name: 'invoice-electronic',
+    props: {
+        name: {
+            type: [String],
+            required: true
+        },
+        email: {
+            type: [String],
+            required: true
+        },
+        ticketId: {
+            type: [Number],
+            required: true
+        },
+        url: {
+            type: [String],
+            required: true
+        }
+    },
+};

print/templates/email/invoice-electronic/locale/en.yml

@@ -0,0 +1,4 @@
+subject: A electronic invoice has been created
+title: A new electronic invoice has been created for the client
+clientMail: The client's email is
+ticketId: The invoice's ticket is

print/templates/email/invoice-electronic/locale/es.yml

@@ -0,0 +1,4 @@
+subject: Se ha creado una factura electrónica
+title: Se ha creado una nueva factura electrónica para el cliente
+clientMail: El correo del cliente es
+ticketId: El ticket de la factura es

print/templates/reports/invoice/invoice.js

@@ -82,7 +82,7 @@ module.exports = {
             return this.rawSqlFromDef(`taxes`, [reference]);
         },
         fetchIntrastat(reference) {
-            return this.rawSqlFromDef(`intrastat`, [reference, reference, reference, reference, reference]);
+            return this.rawSqlFromDef(`intrastat`, [reference, reference, reference]);
         },
         fetchRectified(reference) {
             return this.rawSqlFromDef(`rectified`, [reference]);

print/templates/reports/invoice/sql/intrastat.sql

@@ -1,39 +1,26 @@
 SELECT *
 	FROM invoiceOut io
 		JOIN invoiceOutSerial ios ON io.serial = ios.code
-		JOIN
-		(SELECT
-			t.refFk,
-		    ir.id code,
-		    ir.description description,
-		    CAST(SUM(IFNULL(i.stems, 1) * s.quantity) AS DECIMAL(10,2)) stems,
-		    CAST(SUM(CAST(IFNULL(i.stems, 1) * s.quantity * IF(ic.grams, ic.grams, i.density * ic.cm3delivery / 1000) / 1000 AS DECIMAL(10,2)) *
-		    IF(sub.weight, sub.weight / vn.invoiceOut_getWeight(?), 1)) AS DECIMAL(10,2)) netKg,
-		    CAST(SUM((s.quantity * s.price * (100 - s.discount) / 100 )) AS DECIMAL(10,2)) subtotal
-		        FROM vn.ticket t
-		            JOIN vn.sale s ON s.ticketFk = t.id
-		            JOIN vn.item i ON i.id = s.itemFk
-		            JOIN vn.itemCost ic ON ic.itemFk = i.id AND ic.warehouseFk = t.warehouseFk
-		            JOIN vn.intrastat ir ON ir.id = i.intrastatFk
-		            LEFT JOIN (
-		                SELECT t2.weight
-		                    FROM vn.ticket t2
-		                    WHERE refFk = ? AND weight
-		                    LIMIT 1
-		            ) sub ON TRUE
-		        WHERE t.refFk = ?
-		            AND i.intrastatFk
-		        GROUP BY i.intrastatFk
+		JOIN(
+            SELECT  ir.id code,
+                    ir.description,
+                    iii.stems,
+                    iii.net netKg,
+                    iii.amount subtotal
+                FROM vn.invoiceInIntrastat iii
+                    LEFT JOIN vn.invoiceIn ii ON ii.id = iii.invoiceInFk
+                    LEFT JOIN vn.invoiceOut io ON io.ref = ii.supplierRef
+                    LEFT JOIN vn.intrastat ir ON ir.id = iii.intrastatFk
+                WHERE io.`ref` = ?
             UNION ALL
-		SELECT
-			NULL AS refFk,
-		    NULL AS code,
-		    NULL AS description,
-		    0 AS stems,
-		    0 AS netKg,
-		    IF(CAST(SUM((ts.quantity * ts.price)) AS DECIMAL(10,2)), CAST(SUM((ts.quantity * ts.price)) AS DECIMAL(10,2)), 0) AS subtotal
+            SELECT  NULL code,
+                    'Servicios' description,
+                    0 stems,
+                    0 netKg,
+                    IF(CAST(SUM((ts.quantity * ts.price)) AS DECIMAL(10,2)), CAST(SUM((ts.quantity * ts.price)) AS DECIMAL(10,2)), 0) subtotal
                 FROM vn.ticketService ts
                     JOIN vn.ticket t ON ts.ticketFk = t.id
-		    WHERE t.refFk = ?) sub
-	WHERE io.`ref` = ? AND ios.isCEE
+                WHERE t.refFk =  ?
+        ) sub
+    WHERE io.ref = ? AND ios.isCEE
     ORDER BY sub.code;