CHANGELOG.md

@@ -6,6 +6,24 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 
+## [2340.01] - 2023-10-05
+
+### Added
+### Changed
+
+### Fixed
+
+## [2338.01] - 2023-09-21
+
+### Added
+- (Ticket -> Servicios) Se pueden abonar servicios
+- (Facturas -> Datos básicos) Muestra valores por defecto
+- (Facturas -> Borrado) Notificación al borrar un asiento ya enlazado en Sage
+### Changed
+- (Trabajadores -> Calendario) Icono de check arreglado cuando pulsas un tipo de dia
+
+### Fixed
+
 ## [2336.01] - 2023-09-07
 
 ### Added

back/methods/edi/updateData.js

@@ -139,7 +139,7 @@ module.exports = Self => {
             ftpClient.exec((err, response) => {
                 if (err || response.error) {
                     console.debug(`Error downloading checksum file... ${response.error}`);
-                    return reject(err);
+                    return reject(response.error || err);
                 }
 
                 resolve(response);

back/model-config.json

@@ -15,6 +15,9 @@
     },
     "Bank": {
         "dataSource": "vn"
+    },
+     "Buyer": {
+        "dataSource": "vn"
     },
     "Campaign": {
         "dataSource": "vn"

back/models/buyer.json

@@ -0,0 +1,28 @@
+{
+	"name": "Buyer",
+	"base": "VnModel",
+	"options": {
+		"mysql": {
+			"table": "buyer"
+		}
+	},
+	"properties": {
+		"userFk": {
+			"type": "number",
+			"required": true,
+			"id": true
+		},
+		"nickname": {
+			"type": "string",
+			"required": true
+		}
+	},
+	"acls": [
+        {
+            "accessType": "READ",
+            "principalType": "ROLE",
+            "principalId": "employee",
+            "permission": "ALLOW"
+        }
+    ]
+}

back/models/vn-user.json

@@ -84,7 +84,7 @@
 		"worker": {
 			"type": "hasOne",
 			"model": "Worker",
-			"foreignKey": "userFk"
+			"foreignKey": "id"
 		},
 		"userConfig": {
 			"type": "hasOne",

db/.archive/224903/00-timeBusiness_calculate.sql

@@ -34,7 +34,7 @@ BEGIN
 				isAllowedToWork
 			FROM(SELECT t.dated,
 						b.id businessFk,
-						w.userFk,
+						w.id,
 						b.departmentFk,
 						IF(j.start = NULL, NULL, GROUP_CONCAT(DISTINCT LEFT(j.start,5) ORDER BY j.start ASC SEPARATOR ' - ')) hourStart ,
 						IF(j.start = NULL, NULL, GROUP_CONCAT(DISTINCT LEFT(j.end,5) ORDER BY j.end ASC SEPARATOR ' - ')) hourEnd,
@@ -48,14 +48,14 @@ BEGIN
 					FROM time t
 						LEFT JOIN business b ON t.dated BETWEEN b.started AND IFNULL(b.ended, vDatedTo)
 						LEFT JOIN worker w ON w.id = b.workerFk
-						JOIN tmp.`user` u ON u.userFK = w.userFK
+						JOIN tmp.`user` u ON u.userFK = w.id
 						LEFT JOIN workCenter wc ON wc.id = b.workcenterFK
 						LEFT JOIN postgresql.calendar_labour_type cl ON cl.calendar_labour_type_id = b.calendarTypeFk
 						LEFT JOIN postgresql.journey j ON j.business_id = b.id AND j.day_id = WEEKDAY(t.dated) + 1
 						LEFT JOIN postgresql.calendar_employee ce ON ce.businessFk = b.id AND ce.date = t.dated
 						LEFT JOIN absenceType at2 ON at2.id = ce.calendar_state_id
 					WHERE t.dated BETWEEN vDatedFrom AND vDatedTo
-					GROUP BY w.userFk, t.dated
+					GROUP BY w.id, t.dated
 				)sub;
 
 	UPDATE tmp.timeBusinessCalculate t

db/changes/231401/00-clientBeforeUpdate.sql

@@ -46,7 +46,7 @@ BEGIN
                     CONCAT('Cliente ', NEW.id),
 					CONCAT('Recibida la documentación: ', vText)
 				FROM worker w
-					LEFT JOIN account.user u ON w.userFk = u.id AND u.active
+					LEFT JOIN account.user u ON w.id = u.id AND u.active
 					LEFT JOIN account.account ac ON ac.id = u.id
 				WHERE w.id = NEW.salesPersonFk;
 	END IF;

db/changes/232601/00-useSpecificsAcls.sql

@@ -3,11 +3,11 @@ INSERT INTO `salix`.`ACL` (`model`, `property`, `accessType`, `permission`, `pri
         ('Ticket', 'editDiscount', 'WRITE', 'ALLOW', 'ROLE', 'claimManager'),
         ('Ticket', 'editDiscount', 'WRITE', 'ALLOW', 'ROLE', 'salesPerson'),
         ('Ticket', 'isRoleAdvanced', '*', 'ALLOW', 'ROLE', 'salesAssistant'),
-        ('Ticket', 'isRoleAdvanced', '*', 'ALLOW', 'ROLE', 'deliveryBoss'),
+        ('Ticket', 'isRoleAdvanced', '*', 'ALLOW', 'ROLE', 'deliveryAssistant'),
         ('Ticket', 'isRoleAdvanced', '*', 'ALLOW', 'ROLE', 'buyer'),
         ('Ticket', 'isRoleAdvanced', '*', 'ALLOW', 'ROLE', 'claimManager'),
         ('Ticket', 'deleteTicketWithPartPrepared', 'WRITE', 'ALLOW', 'ROLE', 'salesAssistant'),
-        ('Ticket', 'editZone', 'WRITE', 'ALLOW', 'ROLE', 'deliveryBoss'),
+        ('Ticket', 'editZone', 'WRITE', 'ALLOW', 'ROLE', 'deliveryAssistant'),
         ('State', 'editableStates', 'READ', 'ALLOW', 'ROLE', 'employee'),
         ('State', 'seeEditableStates', 'READ', 'ALLOW', 'ROLE', 'administrative'),
         ('State', 'seeEditableStates', 'READ', 'ALLOW', 'ROLE', 'production'),

db/changes/233601/00-addExpeditionState.sql

@@ -0,0 +1,2 @@
+INSERT INTO `salix`.`ACL` (`model`,`property`,`accessType`,`permission`,`principalType`,`principalId`)
+    VALUES ('ExpeditionState','addExpeditionState','WRITE','ALLOW','ROLE','delivery');

db/changes/233601/00-createClaimReader.sql

@@ -1,4 +1,4 @@
-INSERT INTO `account`.`role` (`id`, `name`, `description`, `hasLogin`)
+INSERT INTO `account`.`role` (`name`, `description`, `hasLogin`)
 	VALUES ('claimViewer','Trabajadores que consulta las reclamaciones ',1);
 
 INSERT INTO `account`.`roleInherit` (`role`,`inheritsFrom`)
@@ -10,7 +10,7 @@ INSERT INTO `account`.`roleInherit` (`role`,`inheritsFrom`)
 			'buyer',
 			'deliveryBoss',
 			'handmadeBoss'
-		)
+		);
 
 DELETE FROM `salix`.`ACL`
 	WHERE `model`= 'claim'
@@ -29,4 +29,3 @@ INSERT INTO `salix`.`ACL` (`model`,`property`,`accessType`,`permission`,`princip
 	VALUES ('Claim','findById','READ','ALLOW','ROLE','claimViewer');
 INSERT INTO `salix`.`ACL` (`model`,`property`,`accessType`,`permission`,`principalType`,`principalid`)
 	VALUES ('Claim','getSummary','READ','ALLOW','ROLE','claimViewer');
-

db/changes/233801/00-firstScript.sql

@@ -0,0 +1 @@
+ALTER TABLE `vn`.`province` ADD CONSTRAINT `countryName_UN` UNIQUE KEY (`countryFk`,`name`);

db/changes/233801/00-item_setVisibleDiscard.sql

@@ -0,0 +1,62 @@
+
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`item_setVisibleDiscard`(
+    vItemFk INT,
+	vWarehouseFk INT,
+	vQuantity INT,
+	vAddressFk INT)
+
+BEGIN
+	DECLARE vTicketFk INT;
+	DECLARE vClientFk INT;
+	DECLARE vCompanyVnlFk INT;
+	DECLARE vCalc INT;
+
+	SELECT barcodeToItem(vItemFk) INTO vItemFk;
+
+	SELECT DEFAULT(companyFk)  INTO vCompanyVnlFk 
+		FROM vn.ticket LIMIT 1;
+
+	SELECT a.clientFk INTO vClientFk
+		FROM address a
+		WHERE a.id = vAddressFk;
+
+	SELECT t.id INTO vTicketFk
+		FROM ticket t
+			JOIN address a ON a.id = t.addressFk
+		WHERE t.warehouseFk = vWarehouseFk
+			AND a.id = vAddressFk
+			AND DATE(t.shipped) = util.VN_CURDATE();
+
+	CALL cache.visible_refresh(vCalc, TRUE, vWarehouseFk);
+
+	IF vTicketFk IS NULL THEN
+		CALL ticket_add(
+			vClientFk,
+			util.VN_CURDATE(),
+			vWarehouseFk,
+			vCompanyVnlFk,
+			vAddressFk,
+			NULL,
+			NULL,
+			util.VN_CURDATE(),
+			account.myUser_getId(),
+			FALSE,
+			vTicketFk);
+	END IF;
+
+	INSERT INTO sale(ticketFk, itemFk, concept, quantity)
+		SELECT vTicketFk,
+				vItemFk,
+				CONCAT(longName,' ', getWorkerCode(), ' ', LEFT(CAST(util.VN_NOW() AS TIME),5)),
+				vQuantity
+			FROM item
+			WHERE id = vItemFk;
+
+	UPDATE cache.visible
+		SET visible = visible - vQuantity
+		WHERE calc_id = vCalc
+			AND item_id = vItemFk;
+END$$
+DELIMITER ;
+

db/changes/233801/00-ticketConfig.sql

@@ -0,0 +1,7 @@
+
+	INSERT INTO `salix`.`ACL` (model, property, accessType, permission, principalType, principalId)
+	 VALUES('Item', 'setVisibleDiscard', 'WRITE', 'ALLOW', 'ROLE', 'employee');
+	 
+	INSERT INTO `salix`.`ACL` (model, property, accessType, permission, principalType, principalId) 
+	VALUES('Address', 'getAddress', 'READ', 'ALLOW', 'ROLE', 'employee');
+

db/changes/233801/01-deviceLog_acl.sql

@@ -0,0 +1,6 @@
+
+ALTER TABLE `vn`.`deviceLog` ADD serialNumber varchar(45) DEFAULT NULL NULL;
+
+INSERT INTO `salix`.`ACL` ( model, property, accessType, permission, principalType, principalId) 
+VALUES( 'DeviceLog', 'create', 'WRITE', 'ALLOW', 'ROLE', 'employee');
+

db/changes/234001/00-aclClient.sql

@@ -0,0 +1,42 @@
+-- No encuentro este back
+DELETE FROM `salix`.`ACL` WHERE property = 'activeWorkersWithRole';
+DELETE FROM `salix`.`ACL` WHERE model = 'Client' AND property = '*';
+
+INSERT INTO `salix`.`ACL` (model,property,accessType,permission,principalType,principalId)
+	VALUES ('Client','findOne','READ','ALLOW','ROLE','employee');
+INSERT INTO `salix`.`ACL` (model,property,accessType,permission,principalType,principalId)
+	VALUES ('Client','findById','READ','ALLOW','ROLE','employee');
+INSERT INTO `salix`.`ACL` (model,property,accessType,permission,principalType,principalId)
+	VALUES ('Client','find','READ','ALLOW','ROLE','employee');
+INSERT INTO `salix`.`ACL` (model,property,accessType,permission,principalType,principalId)
+	VALUES ('Client','exists','READ','ALLOW','ROLE','employee');
+INSERT INTO `salix`.`ACL` (model,property,accessType,permission,principalType,principalId)
+	VALUES ('Client','__get__addresses','READ','ALLOW','ROLE','employee');
+
+DELETE FROM `salix`.`ACL` WHERE model = 'Client' AND property = '*' AND accessType IN (
+    'campaignMetricsEmail',
+    'campaignMetricsPdf',
+    'clientDebtStatementEmail',
+    'clientDebtStatementHtml',
+    'clientDebtStatementPdf',
+	'clientWelcomeEmail',
+	'clientWelcomeHtml',
+	'consumptionSendQueued',
+	'creditRequestEmail',
+	'creditRequestHtml',
+	'creditRequestPdf',
+	'getClientOrSupplierReference',
+	'incotermsAuthorizationEmail',
+	'incotermsAuthorizationHtml',
+	'incotermsAuthorizationPdf',
+	'letterDebtorNdEmail',
+	'letterDebtorNdHtml',
+	'letterDebtorPdf',
+	'letterDebtorStEmail',
+	'letterDebtorStHtml',
+	'printerSetupEmail',
+	'printerSetupHtml',
+	'sepaCoreEmail',
+	'setPassword',
+	'updateUser',
+	'uploadFile');

db/changes/234001/00-dropUserFk.sql

@@ -0,0 +1,4 @@
+ALTER TABLE `vn`.`worker` DROP KEY `user_id_UNIQUE`;
+
+ALTER TABLE `vn`.`worker` DROP COLUMN `userFk`;
+

db/changes/234001/00-timeBusiness_calculate.sql

@@ -0,0 +1,86 @@
+DELIMITER $$
+$$
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`timeBusiness_calculate`(vDatedFrom DATETIME, vDatedTo DATETIME)
+BEGIN
+/**
+ * Horas que debe trabajar un empleado según contrato y día.
+ * @param vDatedFrom workerTimeControl
+ * @param vDatedTo workerTimeControl
+ * @table tmp.user(userFk)
+ * @return tmp.timeBusinessCalculate
+ */
+	DROP TEMPORARY TABLE IF EXISTS tmp.timeBusinessCalculate;
+	CREATE TEMPORARY TABLE tmp.timeBusinessCalculate
+		(INDEX (departmentFk))
+		SELECT dated,
+				businessFk,
+				sub.id  userFk,
+				departmentFk,
+				hourStart,
+				hourEnd,
+				timeTable,
+				timeWorkSeconds,
+				SEC_TO_TIME(timeWorkSeconds) timeWorkSexagesimal,
+				timeWorkSeconds / 3600 timeWorkDecimal,
+				timeWorkSeconds timeBusinessSeconds,
+				SEC_TO_TIME(timeWorkSeconds) timeBusinessSexagesimal,
+				timeWorkSeconds / 3600 timeBusinessDecimal,
+				name type,
+				permissionRate,
+				hoursWeek,
+				discountRate,
+				isAllowedToWork
+			FROM(SELECT t.dated,
+						b.id businessFk,
+						w.id,
+						b.departmentFk,
+						IF(bs.started = NULL, NULL, GROUP_CONCAT(DISTINCT LEFT(bs.started,5) ORDER BY bs.started ASC SEPARATOR ' - ')) hourStart ,
+						IF(bs.started = NULL, NULL, GROUP_CONCAT(DISTINCT LEFT(bs.ended,5) ORDER BY bs.ended ASC SEPARATOR ' - ')) hourEnd,
+						IF(bs.started = NULL, NULL, GROUP_CONCAT(DISTINCT LEFT(bs.started,5), " - ",  LEFT(bs.ended,5) ORDER BY bs.ended ASC SEPARATOR ' - ')) timeTable,
+						IF(bs.started = NULL, 0, IFNULL(SUM(TIME_TO_SEC(bs.ended)) - SUM(TIME_TO_SEC(bs.started)), 0)) timeWorkSeconds,
+						at2.name,
+						at2.permissionRate,
+						at2.discountRate,
+						ct.hoursWeek hoursWeek,
+						at2.isAllowedToWork
+					FROM time t
+						LEFT JOIN business b ON t.dated BETWEEN b.started AND IFNULL(b.ended, vDatedTo)
+						LEFT JOIN worker w ON w.id = b.workerFk
+						JOIN tmp.`user` u ON u.userFK = w.id
+						LEFT JOIN workCenter wc ON wc.id = b.workcenterFK
+						LEFT JOIN calendarType ct ON ct.id = b.calendarTypeFk
+						LEFT JOIN businessSchedule bs ON bs.businessFk = b.id AND bs.weekday = WEEKDAY(t.dated) + 1
+						LEFT JOIN calendar c ON c.businessFk = b.id AND c.dated = t.dated
+						LEFT JOIN absenceType at2 ON at2.id = c.dayOffTypeFk
+					WHERE t.dated BETWEEN vDatedFrom AND vDatedTo
+					GROUP BY w.id, t.dated
+				)sub;
+
+	UPDATE tmp.timeBusinessCalculate t
+		LEFT JOIN businessSchedule bs ON bs.businessFk = t.businessFk
+		SET t.timeWorkSeconds = t.hoursWeek / 5 * 3600,
+			t.timeWorkSexagesimal = SEC_TO_TIME( t.hoursWeek / 5 * 3600),
+			t.timeWorkDecimal =  t.hoursWeek / 5,
+			t.timeBusinessSeconds = t.hoursWeek / 5 * 3600,
+			t.timeBusinessSexagesimal = SEC_TO_TIME( t.hoursWeek / 5 * 3600),
+			t.timeBusinessDecimal = t.hoursWeek / 5
+		WHERE DAYOFWEEK(t.dated) IN(2,3,4,5,6) AND bs.id IS NULL  ;
+
+	UPDATE tmp.timeBusinessCalculate t
+		SET t.timeWorkSeconds = t.timeWorkSeconds - (t.timeWorkSeconds * permissionRate)  ,
+			t.timeWorkSexagesimal = SEC_TO_TIME ((t.timeWorkDecimal - (t.timeWorkDecimal * permissionRate)) * 3600),
+			t.timeWorkDecimal = t.timeWorkDecimal - (t.timeWorkDecimal * permissionRate)
+		WHERE permissionRate <> 0;
+
+	UPDATE tmp.timeBusinessCalculate t
+			JOIN calendarHolidays ch ON ch.dated = t.dated
+			JOIN business b ON b.id = t.businessFk
+				AND b.workcenterFk = ch.workcenterFk
+		SET t.timeWorkSeconds = 0,
+			t.timeWorkSexagesimal = 0,
+			t.timeWorkDecimal = 0,
+			t.permissionrate = 1,
+			t.type = 'Festivo'
+		WHERE t.type IS NULL;
+END$$
+DELIMITER ;

db/changes/234001/00-updateAfterBusinnesInsert.sql

@@ -0,0 +1,57 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `account`.`account_enable`(vSelf INT)
+BEGIN
+/**
+ * Enables a worker's account and sets up email configurations.
+ */
+    UPDATE user
+        SET active = TRUE
+        WHERE id = vSelf;
+
+    INSERT IGNORE INTO account
+        SET id = vSelf;
+
+    INSERT IGNORE INTO mailAliasAccount (mailAlias, account)
+        SELECT  id, vSelf
+            FROM mailAlias
+            WHERE alias = 'general';
+
+    INSERT IGNORE INTO mailForward (account, forwardTo)
+        SELECT vSelf, email
+            FROM user
+            WHERE id = vSelf;
+END$$
+DELIMITER ;
+
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`worker_updateBusiness`(vSelf INT)
+BEGIN
+/**
+ * Activates an account and configures its email settings.
+ *
+ * @param vSelf account id.
+ */
+    DECLARE vOldBusinessFk INT;
+    DECLARE vNewBusinessFk INT;
+
+    SELECT businessFk INTO vOldBusinessFk FROM worker WHERE id = vSelf;
+
+    SELECT id INTO vNewBusinessFk 
+        FROM business 
+        WHERE workerFk = vSelf
+            AND util.VN_CURDATE() BETWEEN started AND IFNULL(ended, util.VN_CURDATE());
+
+    UPDATE worker
+        SET businessFk = vNewBusinessFk
+        WHERE id = vSelf;
+
+    IF NOT (vOldBusinessFk <=> vNewBusinessFk) THEN
+        IF vNewBusinessFk IS NULL THEN 
+            CALL workerDisable(vSelf);
+        END IF;
+        IF vOldBusinessFk IS NULL THEN 
+            CALL account.account_enable(vSelf);
+        END IF;
+    END IF;
+END$$
+DELIMITER ;

db/changes/234001/01-aclAccount.sql

@@ -0,0 +1,10 @@
+DELETE FROM `salix`.`ACL` WHERE model = 'Account' AND property = '*' AND principalId = 'employee';
+
+INSERT INTO `salix`.`ACL` (model,property,accessType,permission,principalType,principalId)
+	VALUES ('Account','findOne','READ','ALLOW','ROLE','employee');
+INSERT INTO `salix`.`ACL` (model,property,accessType,permission,principalType,principalId)
+	VALUES ('Account','findById','READ','ALLOW','ROLE','employee');
+INSERT INTO `salix`.`ACL` (model,property,accessType,permission,principalType,principalId)
+	VALUES ('Account','find','READ','ALLOW','ROLE','employee');
+INSERT INTO `salix`.`ACL` (model,property,accessType,permission,principalType,principalId)
+	VALUES ('Account','exists','READ','ALLOW','ROLE','employee');

db/changes/234001/01-deliveryAssistantACL.sql

@@ -0,0 +1,16 @@
+--  Auto-generated SQL script. Actual values for binary/complex data types may differ - what you see is the default string representation of values.
+INSERT INTO `account`.`role` (name, description)
+	VALUES ('deliveryAssistant','Jefe auxiliar repartos');
+
+INSERT INTO `account`.`roleInherit` (role, inheritsFrom)
+    SELECT (SELECT id FROM account.role r1 WHERE r1.name = 'deliveryAssistant'), ri.inheritsFrom
+FROM account.roleInherit ri
+    JOIN account.role r2 ON r2.id = ri.`role`
+WHERE r2.name = 'deliveryBoss';
+
+INSERT INTO `account`.`roleInherit` (role, inheritsFrom)
+		SELECT (SELECT id FROM account.role WHERE name = 'deliveryBoss') role,
+		(SELECT id FROM account.role WHERE name = 'deliveryAssistant') roleInherit;
+
+
+CALL `account`.`role_syncPrivileges`();

db/changes/234001/01-workerCreate.sql

@@ -0,0 +1,20 @@
+DELIMITER $$
+$$
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`workerCreate`(
+  vFirstname VARCHAR(50),
+  vLastName VARCHAR(50),
+  vCode CHAR(3),
+  vBossFk INT,
+  vUserFk INT,
+  vFi VARCHAR(15) ,
+  vBirth DATE
+)
+BEGIN
+/**
+ * Create new worker
+ *
+ */
+  INSERT INTO worker(id, code, firstName, lastName, bossFk, fi, birth)
+    VALUES (vUserFk, vCode, vFirstname, vLastName, vBossFk, vFi, vBirth);
+END$$
+DELIMITER ;

db/dump/fixtures.sql

@@ -87,8 +87,8 @@ INSERT INTO `vn`.`educationLevel` (`id`, `name`)
 		(1, 'ESTUDIOS PRIMARIOS COMPLETOS'),
 		(2, 'ENSEÑANZAS DE BACHILLERATO');
 
-INSERT INTO `vn`.`worker`(`id`,`code`, `firstName`, `lastName`, `userFk`, `bossFk`)
+INSERT INTO `vn`.`worker`(`id`,`code`, `firstName`, `lastName`, `bossFk`)
-    SELECT id,UPPER(LPAD(role, 3, '0')), name, name, id, 9
+    SELECT id,UPPER(LPAD(role, 3, '0')), name, name, 9
         FROM `account`.`user`;
 
 UPDATE `vn`.`worker` SET bossFk = NULL WHERE id = 20;
@@ -188,13 +188,13 @@ INSERT INTO `vn`.`printer` (`id`, `name`, `path`, `isLabeler`, `sectorFk`, `ipAd
 
 UPDATE `vn`.`sector` SET mainPrinterFk = 1 WHERE id = 1;
 
-INSERT INTO `vn`.`worker`(`id`, `code`, `firstName`, `lastName`, `userFk`,`bossFk`, `phone`)
+INSERT INTO `vn`.`worker`(`id`, `code`, `firstName`, `lastName`,`bossFk`, `phone`)
     VALUES
-        (1106, 'LGN', 'David Charles', 'Haller', 1106, 19, 432978106),
+        (1106, 'LGN', 'David Charles', 'Haller', 19, 432978106),
-        (1107, 'ANT', 'Hank'         , 'Pym'   , 1107, 19, 432978107),
+        (1107, 'ANT', 'Hank'         , 'Pym'   , 19, 432978107),
-        (1108, 'DCX', 'Charles'      , 'Xavier', 1108, 19, 432978108),
+        (1108, 'DCX', 'Charles'      , 'Xavier', 19, 432978108),
-        (1109, 'HLK', 'Bruce'        , 'Banner', 1109, 19, 432978109),
+        (1109, 'HLK', 'Bruce'        , 'Banner', 19, 432978109),
-        (1110, 'JJJ', 'Jessica'      , 'Jones' , 1110, 19, 432978110);
+        (1110, 'JJJ', 'Jessica'      , 'Jones' , 19, 432978110);
 
 INSERT INTO `vn`.`parking` (`id`, `column`, `row`, `sectorFk`, `code`, `pickingOrder`)
     VALUES
@@ -358,20 +358,20 @@ INSERT INTO `vn`.`contactChannel`(`id`, `name`)
         (4, 'GCN Channel'),
         (5, 'The Newspaper');
 
-INSERT INTO `vn`.`client`(`id`,`name`,`fi`,`socialName`,`contact`,`street`,`city`,`postcode`,`phone`,`mobile`,`isRelevant`,`email`,`iban`,`dueDay`,`accountingAccount`,`isEqualizated`,`provinceFk`,`hasToInvoice`,`credit`,`countryFk`,`isActive`,`gestdocFk`,`quality`,`payMethodFk`,`created`,`isToBeMailed`,`contactChannelFk`,`hasSepaVnl`,`hasCoreVnl`,`hasCoreVnh`,`riskCalculated`,`clientTypeFk`, `hasToInvoiceByAddress`,`isTaxDataChecked`,`isFreezed`,`creditInsurance`,`isCreatedAsServed`,`hasInvoiceSimplified`,`salesPersonFk`,`isVies`,`eypbc`, `businessTypeFk`)
+INSERT INTO `vn`.`client`(`id`,`name`,`fi`,`socialName`,`contact`,`street`,`city`,`postcode`,`phone`,`mobile`,`isRelevant`,`email`,`iban`,`dueDay`,`accountingAccount`,`isEqualizated`,`provinceFk`,`hasToInvoice`,`credit`,`countryFk`,`isActive`,`gestdocFk`,`quality`,`payMethodFk`,`created`,`isToBeMailed`,`contactChannelFk`,`hasSepaVnl`,`hasCoreVnl`,`hasCoreVnh`,`riskCalculated`,`clientTypeFk`, `hasToInvoiceByAddress`,`isTaxDataChecked`,`isFreezed`,`creditInsurance`,`isCreatedAsServed`,`hasInvoiceSimplified`,`salesPersonFk`,`isVies`,`eypbc`, `businessTypeFk`,`typeFk`)
     VALUES
-        (1101,     'Bruce Wayne',        '84612325V',  'BATMAN',         'Alfred',           '1007 MOUNTAIN DRIVE, GOTHAM',                  'Gotham', 46460, 1111111111, 222222222, 1, 'BruceWayne@mydomain.com',            NULL, 0, 1234567890, 0, 1, 1, 300,  1,  1, NULL, 10, 5,    util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, 1, 1, 0, NULL, 0, 0, 18,   0, 1, 'florist'),
+        (1101,     'Bruce Wayne',        '84612325V',  'BATMAN',         'Alfred',           '1007 MOUNTAIN DRIVE, GOTHAM',                  'Gotham', 46460, 1111111111, 222222222, 1, 'BruceWayne@mydomain.com',            NULL, 0, 1234567890, 0, 1, 1, 300,  1,  1, NULL, 10, 5,    util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, 1, 1, 0, NULL, 0, 0, 18,   0, 1, 'florist','loses'),
-        (1102,     'Petter Parker',      '87945234L',  'SPIDER MAN',     'Aunt May',         '20 INGRAM STREET, QUEENS, USA',                'Gotham', 46460, 1111111111, 222222222, 1, 'PetterParker@mydomain.com',          NULL, 0, 1234567890, 0, 2, 1, 300,  1,  1, NULL, 10, 5,    util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, 1, 1, 0, NULL, 0, 0, 18,   0, 1, 'florist'),
+        (1102,     'Petter Parker',      '87945234L',  'SPIDER MAN',     'Aunt May',         '20 INGRAM STREET, QUEENS, USA',                'Gotham', 46460, 1111111111, 222222222, 1, 'PetterParker@mydomain.com',          NULL, 0, 1234567890, 0, 2, 1, 300,  1,  1, NULL, 10, 5,    util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, 1, 1, 0, NULL, 0, 0, 18,   0, 1, 'florist','normal'),
-        (1103,     'Clark Kent',         '06815934E',  'SUPER MAN',      'lois lane',        '344 CLINTON STREET, APARTAMENT 3-D',           'Gotham', 46460, 1111111111, 222222222, 1, 'ClarkKent@mydomain.com',             NULL, 0, 1234567890, 0, 3, 1, 0,    19, 1, NULL, 10, 5,    util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, 1, 1, 0, NULL, 0, 0, 18,   0, 1, 'florist'),
+        (1103,     'Clark Kent',         '06815934E',  'SUPER MAN',      'lois lane',        '344 CLINTON STREET, APARTAMENT 3-D',           'Gotham', 46460, 1111111111, 222222222, 1, 'ClarkKent@mydomain.com',             NULL, 0, 1234567890, 0, 3, 1, 0,    19, 1, NULL, 10, 5,    util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, 1, 1, 0, NULL, 0, 0, 18,   0, 1, 'florist','normal'),
-        (1104,     'Tony Stark',         '06089160W',  'IRON MAN',       'Pepper Potts',     '10880 MALIBU POINT, 90265',                    'Gotham', 46460, 1111111111, 222222222, 1, 'TonyStark@mydomain.com',             NULL, 0, 1234567890, 0, 2, 1, 300,  1,  1, NULL, 10, 5,    util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, 1, 1, 0, NULL, 0, 0, 18,   0, 1, 'florist'),
+        (1104,     'Tony Stark',         '06089160W',  'IRON MAN',       'Pepper Potts',     '10880 MALIBU POINT, 90265',                    'Gotham', 46460, 1111111111, 222222222, 1, 'TonyStark@mydomain.com',             NULL, 0, 1234567890, 0, 2, 1, 300,  1,  1, NULL, 10, 5,    util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, 1, 1, 0, NULL, 0, 0, 18,   0, 1, 'florist','normal'),
-        (1105,     'Max Eisenhardt',     '251628698',  'MAGNETO',        'Rogue',            'UNKNOWN WHEREABOUTS',                          'Gotham', 46460, 1111111111, 222222222, 1, 'MaxEisenhardt@mydomain.com',         NULL, 0, 1234567890, 0, 3, 1, 300,  8,  1, NULL, 10, 5,    util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, 1, 1, 1, NULL, 0, 0, 18,   0, 1, 'florist'),
+        (1105,     'Max Eisenhardt',     '251628698',  'MAGNETO',        'Rogue',            'UNKNOWN WHEREABOUTS',                          'Gotham', 46460, 1111111111, 222222222, 1, 'MaxEisenhardt@mydomain.com',         NULL, 0, 1234567890, 0, 3, 1, 300,  8,  1, NULL, 10, 5,    util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, 1, 1, 1, NULL, 0, 0, 18,   0, 1, 'florist','normal'),
-        (1106,     'DavidCharlesHaller', '53136686Q',  'LEGION',         'Charles Xavier',   'CITY OF NEW YORK, NEW YORK, USA',              'Gotham', 46460, 1111111111, 222222222, 1, 'DavidCharlesHaller@mydomain.com',    NULL, 0, 1234567890, 0, 1, 1, 300,  1,  0, NULL, 10, 5,    util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, 1, 1, 0, NULL, 0, 0, 19,   0, 1, 'florist'),
+        (1106,     'DavidCharlesHaller', '53136686Q',  'LEGION',         'Charles Xavier',   'CITY OF NEW YORK, NEW YORK, USA',              'Gotham', 46460, 1111111111, 222222222, 1, 'DavidCharlesHaller@mydomain.com',    NULL, 0, 1234567890, 0, 1, 1, 300,  1,  0, NULL, 10, 5,    util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, 1, 1, 0, NULL, 0, 0, 19,   0, 1, 'florist','normal'),
-        (1107,     'Hank Pym',           '09854837G',  'ANT MAN',        'Hawk',             'ANTHILL, SAN FRANCISCO, CALIFORNIA',           'Gotham', 46460, 1111111111, 222222222, 1, 'HankPym@mydomain.com',               NULL, 0, 1234567890, 0, 1, 1, 300,  1,  1, NULL, 10, 5,    util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, 1, 0, 0, NULL, 0, 0, 19,   0, 1, 'florist'),
+        (1107,     'Hank Pym',           '09854837G',  'ANT MAN',        'Hawk',             'ANTHILL, SAN FRANCISCO, CALIFORNIA',           'Gotham', 46460, 1111111111, 222222222, 1, 'HankPym@mydomain.com',               NULL, 0, 1234567890, 0, 1, 1, 300,  1,  1, NULL, 10, 5,    util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, 1, 0, 0, NULL, 0, 0, 19,   0, 1, 'florist','normal'),
-        (1108,     'Charles Xavier',     '22641921P',  'PROFESSOR X',    'Beast',            '3800 VICTORY PKWY, CINCINNATI, OH 45207, USA', 'Gotham', 46460, 1111111111, 222222222, 1, 'CharlesXavier@mydomain.com',         NULL, 0, 1234567890, 0, 1, 1, 300,  1,  1, NULL, 10, 5,    util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, 1, 1, 1, NULL, 0, 0, 19,   0, 1, 'florist'),
+        (1108,     'Charles Xavier',     '22641921P',  'PROFESSOR X',    'Beast',            '3800 VICTORY PKWY, CINCINNATI, OH 45207, USA', 'Gotham', 46460, 1111111111, 222222222, 1, 'CharlesXavier@mydomain.com',         NULL, 0, 1234567890, 0, 1, 1, 300,  1,  1, NULL, 10, 5,    util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, 1, 1, 1, NULL, 0, 0, 19,   0, 1, 'florist','normal'),
-        (1109,     'Bruce Banner',       '16104829E',  'HULK',           'Black widow',      'SOMEWHERE IN NEW YORK',                        'Gotham', 46460, 1111111111, 222222222, 1, 'BruceBanner@mydomain.com',           NULL, 0, 1234567890, 0, 1, 1, 300,  1,  1, NULL, 10, 5,    util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, 1, 0, 0, NULL, 0, 0, 9,    0, 1, 'florist'),
+        (1109,     'Bruce Banner',       '16104829E',  'HULK',           'Black widow',      'SOMEWHERE IN NEW YORK',                        'Gotham', 46460, 1111111111, 222222222, 1, 'BruceBanner@mydomain.com',           NULL, 0, 1234567890, 0, 1, 1, 300,  1,  1, NULL, 10, 5,    util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, 1, 0, 0, NULL, 0, 0, 9,    0, 1, 'florist','normal'),
-        (1110,     'Jessica Jones',      '58282869H',  'JESSICA JONES',  'Luke Cage',        'NYCC 2015 POSTER',                             'Gotham', 46460, 1111111111, 222222222, 1, 'JessicaJones@mydomain.com',          NULL, 0, 1234567890, 0, 1, 1, 300,  1,  1, NULL, 10, 5,    util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, 1, 0, 0, NULL, 0, 0, NULL, 0, 1, 'florist'),
+        (1110,     'Jessica Jones',      '58282869H',  'JESSICA JONES',  'Luke Cage',        'NYCC 2015 POSTER',                             'Gotham', 46460, 1111111111, 222222222, 1, 'JessicaJones@mydomain.com',          NULL, 0, 1234567890, 0, 1, 1, 300,  1,  1, NULL, 10, 5,    util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, 1, 0, 0, NULL, 0, 0, NULL, 0, 1, 'florist','normal'),
-        (1111,     'Missing',            NULL,         'MISSING MAN',    'Anton',            'THE SPACE, UNIVERSE FAR AWAY',                 'Gotham', 46460, 1111111111, 222222222, 1, NULL,                                 NULL, 0, 1234567890, 0, 1, 1, 300,  1,  1, NULL, 10, 5,    util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 4, 0, 1, 0, NULL, 1, 0, NULL, 0, 1, 'others'),
+        (1111,     'Missing',            NULL,         'MISSING MAN',    'Anton',            'THE SPACE, UNIVERSE FAR AWAY',                 'Gotham', 46460, 1111111111, 222222222, 1, NULL,                                 NULL, 0, 1234567890, 0, 1, 1, 300,  1,  1, NULL, 10, 5,    util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 4, 0, 1, 0, NULL, 1, 0, NULL, 0, 1, 'others','normal'),
-        (1112,     'Trash',              NULL,         'GARBAGE MAN',    'Unknown name',     'NEW YORK CITY, UNDERGROUND',                   'Gotham', 46460, 1111111111, 222222222, 1, NULL,                                 NULL, 0, 1234567890, 0, 1, 1, 300,  1,  1, NULL, 10, 5,    util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 4, 0, 1, 0, NULL, 1, 0, NULL, 0, 1, 'others');
+        (1112,     'Trash',              NULL,         'GARBAGE MAN',    'Unknown name',     'NEW YORK CITY, UNDERGROUND',                   'Gotham', 46460, 1111111111, 222222222, 1, NULL,                                 NULL, 0, 1234567890, 0, 1, 1, 300,  1,  1, NULL, 10, 5,    util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 4, 0, 1, 0, NULL, 1, 0, NULL, 0, 1, 'others','normal');
 
 INSERT INTO `vn`.`client`(`id`, `name`, `fi`, `socialName`, `contact`, `street`, `city`, `postcode`, `isRelevant`, `email`, `iban`,`dueDay`,`accountingAccount`, `isEqualizated`, `provinceFk`, `hasToInvoice`, `credit`, `countryFk`, `isActive`, `gestdocFk`, `quality`, `payMethodFk`,`created`, `isTaxDataChecked`)
     SELECT id, name, CONCAT(RPAD(CONCAT(id,9),8,id),'A'), CONCAT(name, 'Social'), CONCAT(name, 'Contact'), CONCAT(name, 'Street'), 'GOTHAM', 46460, 1, CONCAT(name,'@mydomain.com'), NULL, 0, 1234567890, 0, 1, 1, 300, 1, 1,NULL, 10, 5, util.VN_CURDATE(), 1
@@ -871,7 +871,9 @@ INSERT INTO `vn`.`ink`(`id`, `name`, `picture`, `showOrder`, `hex`)
         ('SLV', 'Silver',       1, 4, 'CACFD2'),
         ('BRW', 'Brown',        1, 5, 'DC7633'),
         ('BLK', 'Black',        1, 6, '000000'),
-        ('BAS', 'Blue/Silver',  1, 7, '5DADE2');
+        ('BAS', 'Blue/Silver',  1, 7, '5DADE2'),
+        ('GRN', 'Green',        1, 8, '28A745'),
+        ('WHT', 'White',        1, 9, 'FFFFFF');
 
 INSERT INTO `vn`.`origin`(`id`,`code`, `name`)
     VALUES
@@ -918,26 +920,26 @@ INSERT INTO `vn`.`itemFamily`(`code`, `description`)
         ('SER', 'Services'),
         ('VT',  'Sales');
 
-INSERT INTO `vn`.`item`(`id`, `typeFk`, `size`, `inkFk`, `stems`, `originFk`, `description`, `producerFk`, `intrastatFk`, `expenceFk`,
+INSERT INTO `vn`.`item`(`id`, `typeFk`, `stems`, `originFk`, `description`, `producerFk`, `intrastatFk`, `expenceFk`,
     `comment`, `relevancy`, `image`, `subName`, `minPrice`, `stars`, `family`, `isFloramondo`, `genericFk`, `itemPackingTypeFk`, `hasMinPrice`, `packingShelve`, `weightByPiece`)
     VALUES
-        (1,  2, 70,   'YEL', 1,    1, NULL,              1,    06021010, 2000000000, NULL, 0, '1',  NULL, 0, 1, 'EMB',   0,  NULL,   'V',  0, 15,3),
+        (1,  2, 1,    1, NULL,              1,    06021010, 2000000000, NULL, 0, '1',  NULL, 0, 1, 'EMB',   0,  NULL,   'V',  0, 15,3),
-        (2,  2, 70,   'BLU', 1,    2, NULL,              1,    06021010, 2000000000, NULL, 0, '2',  NULL, 0, 2, 'VT',   0,  NULL,   'H',  0, 10,2),
+        (2,  2, 1,    2, NULL,              1,    06021010, 2000000000, NULL, 0, '2',  NULL, 0, 2, 'VT',   0,  NULL,   'H',  0, 10,2),
-        (3,  1, 60,   'YEL', 1,    3, NULL,              1,    05080000, 4751000000, NULL, 0, '3',  NULL, 0, 5, 'VT',   0,  NULL,   NULL, 0, 5,5),
+        (3,  1, 1,    3, NULL,              1,    05080000, 4751000000, NULL, 0, '3',  NULL, 0, 5, 'VT',   0,  NULL,   NULL, 0, 5,5),
-        (4,  1, 60,   'YEL', 1,    1, 'Increases block', 1,    05080000, 4751000000, NULL, 0, '4',  NULL, 0, 3, 'VT',   0,  NULL,   NULL, 0, NULL,NULL),
+        (4,  1, 1,    1, 'Increases block', 1,    05080000, 4751000000, NULL, 0, '4',  NULL, 0, 3, 'VT',   0,  NULL,   NULL, 0, NULL,NULL),
-        (5,  3, 30,   'RED', 1,    2, NULL,              2,    06021010, 4751000000, NULL, 0, '5',  NULL, 0, 3, 'VT',   0,  NULL,   NULL, 0, NULL,NULL),
+        (5,  3, 1,    2, NULL,              2,    06021010, 4751000000, NULL, 0, '5',  NULL, 0, 3, 'VT',   0,  NULL,   NULL, 0, NULL,NULL),
-        (6,  5, 30,   'RED', 1,    2, NULL,              NULL, 06021010, 4751000000, NULL, 0, '6',  NULL, 0, 4, 'VT',   0,  NULL,   NULL, 0, NULL,NULL),
+        (6,  5, 1,    2, NULL,              NULL, 06021010, 4751000000, NULL, 0, '6',  NULL, 0, 4, 'VT',   0,  NULL,   NULL, 0, NULL,NULL),
-        (7,  5, 90,   'BLU', 1,    2, NULL,              NULL, 06021010, 4751000000, NULL, 0, '7',  NULL, 0, 4, 'VT',   0,  NULL,   NULL, 0, NULL,NULL),
+        (7,  5, 1,    2, NULL,              NULL, 06021010, 4751000000, NULL, 0, '7',  NULL, 0, 4, 'VT',   0,  NULL,   NULL, 0, NULL,NULL),
-        (8,  2, 70,   'YEL', 1,    1, NULL,              1,    06021010, 2000000000, NULL, 0, '8',  NULL, 0, 5, 'VT',   0,  NULL,   NULL, 0, NULL,NULL),
+        (8,  2, 1,    1, NULL,              1,    06021010, 2000000000, NULL, 0, '8',  NULL, 0, 5, 'VT',   0,  NULL,   NULL, 0, NULL,NULL),
-        (9,  2, 70,   'BLU', 1,    2, NULL,              1,    06021010, 2000000000, NULL, 0, '9',  NULL, 0, 4, 'VT',   1,  NULL,   NULL, 0, NULL,NULL),
+        (9,  2, 1,    2, NULL,              1,    06021010, 2000000000, NULL, 0, '9',  NULL, 0, 4, 'VT',   1,  NULL,   NULL, 0, NULL,NULL),
-        (10, 1, 60,   'YEL', 1,    3, NULL,              1,    05080000, 4751000000, NULL, 0, '10', NULL, 0, 4, 'VT',   0,  NULL,   NULL, 0, NULL,NULL),
+        (10, 1, 1,    3, NULL,              1,    05080000, 4751000000, NULL, 0, '10', NULL, 0, 4, 'VT',   0,  NULL,   NULL, 0, NULL,NULL),
-        (11, 1, 60,   'YEL', 1,    1, NULL,              1,    05080000, 4751000000, NULL, 0, '11', NULL, 0, 4, 'VT',   0,  NULL,   NULL, 0, NULL,NULL),
+        (11, 1, 1,    1, NULL,              1,    05080000, 4751000000, NULL, 0, '11', NULL, 0, 4, 'VT',   0,  NULL,   NULL, 0, NULL,NULL),
-        (12, 3, 30,   'RED', 1,    2, NULL,              2,    06021010, 4751000000, NULL, 0, '12', NULL, 0, 3, 'VT',   0,  NULL,   NULL, 0, NULL,NULL),
+        (12, 3, 1,    2, NULL,              2,    06021010, 4751000000, NULL, 0, '12', NULL, 0, 3, 'VT',   0,  NULL,   NULL, 0, NULL,NULL),
-        (13, 5, 30,   'RED', 1,    2, NULL,              NULL, 06021010, 4751000000, NULL, 0, '13', NULL, 1, 2, 'VT',   1,  NULL,   NULL, 1, NULL,NULL),
+        (13, 5, 1,    2, NULL,              NULL, 06021010, 4751000000, NULL, 0, '13', NULL, 1, 2, 'VT',   1,  NULL,   NULL, 1, NULL,NULL),
-        (14, 5, 90,   'BLU', 1,    2, NULL,              NULL, 06021010, 4751000000, NULL, 0, '',   NULL, 0, 4, 'VT',   1,  NULL,   NULL, 0, NULL,NULL),
+        (14, 5, 1,    2, NULL,              NULL, 06021010, 4751000000, NULL, 0, '',   NULL, 0, 4, 'VT',   1,  NULL,   NULL, 0, NULL,NULL),
-        (15, 4, NULL,  NULL, NULL, 1, NULL,              NULL, 06021010, 4751000000, NULL, 0, '',   NULL, 0, 0, 'EMB',  0,  NULL,   NULL, 0, NULL,NULL),
+        (15, 4, NULL, 1, NULL,              NULL, 06021010, 4751000000, NULL, 0, '',   NULL, 0, 0, 'EMB',  0,  NULL,   NULL, 0, NULL,NULL),
-        (16, 6, NULL,  NULL, NULL, 1, NULL,              NULL, 06021010, 4751000000, NULL, 0, '',   NULL, 0, 0, 'EMB',  0,  NULL,   NULL, 0, NULL,NULL),
+        (16, 6, NULL, 1, NULL,              NULL, 06021010, 4751000000, NULL, 0, '',   NULL, 0, 0, 'EMB',  0,  NULL,   NULL, 0, NULL,NULL),
-        (71, 6, NULL,  NULL, NULL, 1, NULL,              NULL, 06021010, 4751000000, NULL, 0, '',   NULL, 0, 0, 'VT',   0,  NULL,   NULL, 0, NULL,NULL);
+        (71, 6, NULL, 1, NULL,              NULL, 06021010, 4751000000, NULL, 0, '',   NULL, 0, 0, 'VT',   0,  NULL,   NULL, 0, NULL,NULL);
 
 -- Update the taxClass after insert of the items
 UPDATE `vn`.`itemTaxCountry` SET `taxClassFk` = 2
@@ -1005,45 +1007,45 @@ INSERT INTO `vn`.`ticketPackaging`(`id`, `ticketFk`, `packagingFk`, `quantity`,
 
 INSERT INTO `vn`.`sale`(`id`, `itemFk`, `ticketFk`, `concept`, `quantity`, `price`, `discount`, `reserved`, `isPicked`, `created`)
     VALUES
-        (1,  1, 1,  'Ranged weapon longbow 2m',         5,  100.39, 0, 0, 0, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH)),
+        (1,  1, 1,  'Ranged weapon longbow 200cm',         5,  100.39, 0, 0, 0, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH)),
         (2,  2, 1,  'Melee weapon combat fist 15cm',    10, 7.07,   0, 0, 0, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH)),
-        (3,  1, 1,  'Ranged weapon longbow 2m',         2,  100.39, 0, 0, 0, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH)),
+        (3,  1, 1,  'Ranged weapon longbow 200cm',         2,  100.39, 0, 0, 0, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH)),
-        (4,  4, 1,  'Melee weapon heavy shield 1x0.5m', 20, 1.69,   0, 0, 0, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH)),
+        (4,  4, 1,  'Melee weapon heavy shield 100cm', 20, 1.69,   0, 0, 0, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH)),
-        (5,  1, 2,  'Ranged weapon longbow 2m',         1,  110.33, 0, 0, 0, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH)),
+        (5,  1, 2,  'Ranged weapon longbow 200cm',         1,  110.33, 0, 0, 0, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH)),
-        (6,  1, 3,  'Ranged weapon longbow 2m',         1,  110.33, 0, 0, 0, DATE_ADD(util.VN_CURDATE(), INTERVAL -2 MONTH)),
+        (6,  1, 3,  'Ranged weapon longbow 200cm',         1,  110.33, 0, 0, 0, DATE_ADD(util.VN_CURDATE(), INTERVAL -2 MONTH)),
-        (7,  2, 11, 'Melee weapon combat fist 15cm',    15, 7.44,   0, 0, 0, util.VN_CURDATE()),
+        (7,  2, 11, 'Melee weapon combat fist 15cm',    15, 7.74,   0, 0, 0, util.VN_CURDATE()),
-        (8,  4, 11, 'Melee weapon heavy shield 1x0.5m', 10, 1.79,   0, 0, 0, util.VN_CURDATE()),
+        (8,  4, 11, 'Melee weapon heavy shield 100cm', 10, 1.79,   0, 0, 0, util.VN_CURDATE()),
-        (9,  1, 16, 'Ranged weapon longbow 2m',         1,  103.49, 0, 0, 0, util.VN_CURDATE()),
+        (9,  1, 16, 'Ranged weapon longbow 200cm',         1,  103.49, 0, 0, 0, util.VN_CURDATE()),
         (10, 2, 16, 'Melee weapon combat fist 15cm',    10, 7.09,   0, 0, 0, util.VN_CURDATE()),
-        (11, 1, 16, 'Ranged weapon longbow 2m',         1,  103.49, 0, 0, 0, util.VN_CURDATE()),
+        (11, 1, 16, 'Ranged weapon longbow 200cm',         1,  103.49, 0, 0, 0, util.VN_CURDATE()),
-        (12, 4, 16, 'Melee weapon heavy shield 1x0.5m', 20, 1.71,   0, 0, 0, util.VN_CURDATE()),
+        (12, 4, 16, 'Melee weapon heavy shield 100cm', 20, 1.71,   0, 0, 0, util.VN_CURDATE()),
         (13, 2, 8,  'Melee weapon combat fist 15cm',    10, 7.08,   0, 0, 0, util.VN_CURDATE()),
-        (14, 1, 8,  'Ranged weapon longbow 2m',         2, 103.49, 0, 0, 0, util.VN_CURDATE()),
+        (14, 1, 8,  'Ranged weapon longbow 200cm',         2, 103.49, 0, 0, 0, util.VN_CURDATE()),
-        (15, 1, 19, 'Ranged weapon longbow 2m',         1, 103.49,   0, 0, 0, util.VN_CURDATE()),
+        (15, 1, 19, 'Ranged weapon longbow 200cm',         1, 103.49,   0, 0, 0, util.VN_CURDATE()),
         (16, 2, 20, 'Melee weapon combat fist 15cm',    20, 7.07,   0, 0, 0, util.VN_CURDATE()),
         (17, 2, 22, 'Melee weapon combat fist 15cm',    30, 7.07,   0, 0, 0, DATE_ADD(util.VN_CURDATE(), INTERVAL +1 MONTH)),
-        (18, 4, 22, 'Melee weapon heavy shield 1x0.5m', 20, 1.69,   0, 0, 0, DATE_ADD(util.VN_CURDATE(), INTERVAL +1 MONTH)),
+        (18, 4, 22, 'Melee weapon heavy shield 100cm', 20, 1.69,   0, 0, 0, DATE_ADD(util.VN_CURDATE(), INTERVAL +1 MONTH)),
-        (19, 1, 4,  'Ranged weapon longbow 2m',         1,  8.07,   0, 0, 0, DATE_ADD(util.VN_CURDATE(), INTERVAL -3 MONTH)),
+        (19, 1, 4,  'Ranged weapon longbow 200cm',         1,  8.07,   0, 0, 0, DATE_ADD(util.VN_CURDATE(), INTERVAL -3 MONTH)),
-        (20, 1, 5,  'Ranged weapon longbow 2m',         1,  8.07,   0, 0, 0, DATE_ADD(util.VN_CURDATE(), INTERVAL -4 MONTH)),
+        (20, 1, 5,  'Ranged weapon longbow 200cm',         1,  8.07,   0, 0, 0, DATE_ADD(util.VN_CURDATE(), INTERVAL -4 MONTH)),
-        (21, 1, 6,  'Ranged weapon longbow 2m',         1,  8.07,   0, 0, 0, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH)),
+        (21, 1, 6,  'Ranged weapon longbow 200cm',         1,  8.07,   0, 0, 0, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH)),
-        (22, 1, 7,  'Ranged weapon longbow 2m',         1,  8.07,   0, 0, 0, util.VN_CURDATE()),
+        (22, 1, 7,  'Ranged weapon longbow 200cm',         1,  8.07,   0, 0, 0, util.VN_CURDATE()),
-        (23, 1, 9,  'Ranged weapon longbow 2m',         1,  8.07,   0, 0, 0, util.VN_CURDATE()),
+        (23, 1, 9,  'Ranged weapon longbow 200cm',         1,  8.07,   0, 0, 0, util.VN_CURDATE()),
-        (24, 1, 10, 'Ranged weapon longbow 2m',         1,  8.07,   0, 0, 0, util.VN_CURDATE()),
+        (24, 1, 10, 'Ranged weapon longbow 200cm',         1,  8.07,   0, 0, 0, util.VN_CURDATE()),
-        (25, 4, 12, 'Melee weapon heavy shield 1x0.5m', 20, 1.72,   0, 0, 0, util.VN_CURDATE()),
+        (25, 4, 12, 'Melee weapon heavy shield 100cm', 20, 1.72,   0, 0, 0, util.VN_CURDATE()),
-        (26, 4, 13, 'Melee weapon heavy shield 1x0.5m', 20, 1.72,   0, 0, 0, util.VN_CURDATE()),
+        (26, 4, 13, 'Melee weapon heavy shield 100cm', 20, 1.72,   0, 0, 0, util.VN_CURDATE()),
-        (27, 4, 14, 'Melee weapon heavy shield 1x0.5m', 20, 1.72,   0, 0, 0, util.VN_CURDATE()),
+        (27, 4, 14, 'Melee weapon heavy shield 100cm', 20, 1.72,   0, 0, 0, util.VN_CURDATE()),
-        (28, 4, 15, 'Melee weapon heavy shield 1x0.5m', 20, 1.72,   0, 0, 0, util.VN_CURDATE()),
+        (28, 4, 15, 'Melee weapon heavy shield 100cm', 20, 1.72,   0, 0, 0, util.VN_CURDATE()),
-        (29, 4, 17, 'Melee weapon heavy shield 1x0.5m', 20, 1.72,   0, 0, 0, util.VN_CURDATE()),
+        (29, 4, 17, 'Melee weapon heavy shield 100cm', 20, 1.72,   0, 0, 0, util.VN_CURDATE()),
-        (30, 4, 18, 'Melee weapon heavy shield 1x0.5m', 20, 1.72,   0, 0, 0, util.VN_CURDATE()),
+        (30, 4, 18, 'Melee weapon heavy shield 100cm', 20, 1.72,   0, 0, 0, util.VN_CURDATE()),
         (31, 2, 23, 'Melee weapon combat fist 15cm',    -5, 7.08,   0, 0, 0, util.VN_CURDATE()),
-        (32, 1, 24, 'Ranged weapon longbow 2m',         -1, 8.07,   0, 0, 0, util.VN_CURDATE()),
+        (32, 1, 24, 'Ranged weapon longbow 200cm',         -1, 8.07,   0, 0, 0, util.VN_CURDATE()),
         (33, 5, 14, 'Ranged weapon pistol 9mm',         50, 1.79,   0, 0, 0, util.VN_CURDATE()),
-        (34, 4, 28, 'Melee weapon heavy shield 1x0.5m', 20, 1.72,   0, 0, 0, util.VN_CURDATE()),
+        (34, 4, 28, 'Melee weapon heavy shield 100cm', 20, 1.72,   0, 0, 0, util.VN_CURDATE()),
-        (35, 4, 29, 'Melee weapon heavy shield 1x0.5m', 20, 1.72,   0, 0, 0, util.VN_CURDATE()),
+        (35, 4, 29, 'Melee weapon heavy shield 100cm', 20, 1.72,   0, 0, 0, util.VN_CURDATE()),
-        (37, 4, 31, 'Melee weapon heavy shield 1x0.5m', 20, 1.72,   0, 0, 0, util.VN_CURDATE()),
+        (37, 4, 31, 'Melee weapon heavy shield 100cm', 20, 1.72,   0, 0, 0, util.VN_CURDATE()),
-        (36, 4, 30, 'Melee weapon heavy shield 1x0.5m', 20, 1.72,   0, 0, 0, util.VN_CURDATE()),
+        (36, 4, 30, 'Melee weapon heavy shield 100cm', 20, 1.72,   0, 0, 0, util.VN_CURDATE()),
         (38, 2, 32, 'Melee weapon combat fist 15cm',    30, 7.07,   0, 0, 0, DATE_ADD(util.VN_CURDATE(), INTERVAL +1 MONTH)),
-        (39, 1, 32,  'Ranged weapon longbow 2m',         2, 103.49, 0, 0, 0, util.VN_CURDATE());
+        (39, 1, 32,  'Ranged weapon longbow 200cm',         2, 103.49, 0, 0, 0, util.VN_CURDATE());
 
 INSERT INTO `vn`.`saleComponent`(`saleFk`, `componentFk`, `value`)
     VALUES
@@ -1259,7 +1261,7 @@ INSERT INTO `vn`.`tag`(`id`, `code`, `name`, `isFree`, `isQuantitatif`, `sourceT
     (5,     NULL,       'Diámetro',         1, 1, NULL,     'mm',NULL,  'diameter'),
     (7,     NULL,       'Ancho de la base', 1, 1, NULL,     'mm',NULL,  NULL),
     (23,    'stems',    'Tallos',           1, 1, NULL,     NULL, NULL, 'stems'),
-    (27,    NULL,       'Longitud(cm)',     1, 1, NULL,     'cm', NULL, NULL),
+    (27,    NULL,       'Longitud(cm)',     1, 1, NULL,     'cm', NULL, 'size'),
     (36,    'producer',       'Proveedor',        1, 0, NULL,     NULL, NULL, 'producer'),
     (56,    NULL,       'Genero',           1, 0, NULL,     NULL, NULL, NULL),
     (58,    NULL,       'Variedad',         1, 0, NULL,     NULL, NULL, NULL),
@@ -1270,7 +1272,7 @@ INSERT INTO `vn`.`itemTag`(`id`,`itemFk`,`tagFk`,`value`,`priority`)
     VALUES
         (1,     1,  56, 'Ranged weapon',            1),
         (2,     1,  58, 'longbow',                  2),
-        (3,     1,  27, '2m',                       3),
+        (3,     1,  27, '200cm',                    3),
         (4,     1,  36, 'Stark Industries',         4),
         (5,     1,  1,  'Brown',                    5),
         (6,     1,  67, '+1 precission',            6),
@@ -1284,42 +1286,42 @@ INSERT INTO `vn`.`itemTag`(`id`,`itemFk`,`tagFk`,`value`,`priority`)
         (14,    2,  23, '2',                        7),
         (15,    3,  56, 'Ranged weapon',            1),
         (16,    3,  58, 'sniper rifle',             2),
-        (17,    3,  4,  '300mm',                    3),
+        (17,    3,  4,  '113cm',                    3),
         (18,    3,  36, 'Stark Industries',         4),
         (19,    3,  1,  'Green',                    5),
         (20,    3,  67, 'precission',               6),
         (21,    3,  23, '3',                        7),
         (22,    4,  56, 'Melee weapon',             1),
         (23,    4,  58, 'heavy shield',             2),
-        (24,    4,  4,  '1x0.5m',                   3),
+        (24,    4,  4,  '100cm',                    3),
         (25,    4,  36, 'Stark Industries',         4),
         (26,    4,  1,  'Black',                    5),
         (27,    4,  67, 'containtment',             6),
         (28,    4,  23, '4',                        7),
         (29,    5,  56, 'Ranged weapon',            1),
         (30,    5,  58, 'pistol',                   2),
-        (31,    5,  27, '9mm',                      3),
+        (31,    5,  67, '9mm',                      3),
         (32,    5,  36, 'Stark Industries',         4),
         (33,    5,  1,  'Silver',                   5),
-        (34,    5,  67, 'rapid fire',               6),
+        (34,    5,  27, '15cm',                     6),
         (35,    5,  23, '5',                        7),
         (36,    6,  56, 'Container',                1),
         (37,    6,  58, 'ammo box',                 2),
-        (38,    6,  27, '1m',                       3),
+        (38,    6,  27, '100cm',                    3),
         (39,    6,  36, 'Stark Industries',         4),
         (40,    6,  1,  'Green',                    5),
         (41,    6,  67, 'supply',                   6),
         (42,    6,  23, '6',                        7),
         (43,    7,  56, 'Container',                1),
         (44,    7,  58, 'medical box',              2),
-        (45,    7,  27, '1m',                       3),
+        (45,    7,  27, '100cm',                     3),
         (46,    7,  36, 'Stark Industries',         4),
         (47,    7,  1,  'White',                    5),
         (48,    7,  67, 'supply',                   6),
         (49,    7,  23, '7',                        7),
         (50,    8,  56, 'Ranged Reinforced weapon', 1),
         (51,    8,  58, '+1 longbow',               2),
-        (52,    8,  27, '2m',                       3),
+        (52,    8,  27, '200cm',                    3),
         (53,    8,  36, 'Stark Industries',         4),
         (54,    8,  1,  'Brown',                    5),
         (55,    8,  67, 'precission',               6),
@@ -1333,14 +1335,14 @@ INSERT INTO `vn`.`itemTag`(`id`,`itemFk`,`tagFk`,`value`,`priority`)
         (63,    9,  23, '9',                        7),
         (64,    10, 56, 'Ranged Reinforced weapon', 1),
         (65,    10, 58, 'sniper rifle',             2),
-        (66,    10, 4,  '300mm',                    3),
+        (66,    10, 67, '700mm',                    3),
         (67,    10, 36, 'Stark Industries',         4),
         (68,    10, 1,  'Green',                    5),
-        (69,    10, 67, 'precission',               6),
+        (69,    10, 27, '130cm',                    6),
         (70,    10, 23, '10',                       7),
         (71,    11, 56, 'Melee Reinforced weapon',  1),
         (72,    11, 58, 'heavy shield',             2),
-        (73,    11, 4,  '1x0.5m',                   3),
+        (73,    11, 4,  '120cm',                    3),
         (74,    11, 36, 'Stark Industries',         4),
         (75,    11, 1,  'Black',                    5),
         (76,    11, 67, 'containtment',             6),
@@ -1350,18 +1352,18 @@ INSERT INTO `vn`.`itemTag`(`id`,`itemFk`,`tagFk`,`value`,`priority`)
         (80,    12, 27, '9mm',                      3),
         (81,    12, 36, 'Stark Industries',         4),
         (82,    12, 1,  'Silver',                   5),
-        (83,    12, 67, 'rapid fire',               6),
+        (83,    12, 67, '23cm',                     6),
         (84,    12, 23, '12',                       7),
         (85,    13, 56, 'Chest',                    1),
         (86,    13, 58, 'ammo box',                 2),
-        (87,    13, 27, '1m',                       3),
+        (87,    13, 27, '100cm',                    3),
         (88,    13, 36, 'Stark Industries',         4),
         (89,    13, 1,  'Green',                    5),
         (90,    13, 67, 'supply',                   6),
         (91,    13, 23, '13',                       7),
         (92,    14, 56, 'Chest',                    1),
         (93,    14, 58, 'medical box',              2),
-        (94,    14, 27, '1m',                       3),
+        (94,    14, 27, '100cm',                    3),
         (95,    14, 36, 'Stark Industries',         4),
         (96,    14, 1,  'White',                    5),
         (97,    14, 67, 'supply',                   6),
@@ -1927,9 +1929,9 @@ INSERT INTO `vn`.`workerTeam`(`id`, `team`, `workerFk`)
 
 INSERT INTO `vn`.`ticketRequest`(`id`, `description`, `requesterFk`, `attenderFk`, `quantity`, `itemFk`, `price`, `isOk`, `saleFk`, `ticketFk`, `created`)
     VALUES
-        (1, 'Ranged weapon longbow 2m',         18, 35, 5,  1,      9.10, 1,    1,      1,  DATE_ADD(util.VN_CURDATE(), INTERVAL -15 DAY)),
+        (1, 'Ranged weapon longbow 200cm',         18, 35, 5,  1,      9.10, 1,    1,      1,  DATE_ADD(util.VN_CURDATE(), INTERVAL -15 DAY)),
         (2, 'Melee weapon combat first 15cm',   18, 35, 10, 2,      1.07, 0,    NULL,   1,  DATE_ADD(util.VN_CURDATE(), INTERVAL -15 DAY)),
-        (3, 'Melee weapon heavy shield 1x0.5m', 18, 35, 20, NULL,   3.06, NULL, NULL,   23, util.VN_CURDATE()),
+        (3, 'Melee weapon heavy shield 100cm', 18, 35, 20, NULL,   3.06, NULL, NULL,   23, util.VN_CURDATE()),
         (4, 'Melee weapon combat first 15cm',   18, 35, 15, NULL,   1.30, NULL, NULL,   11, util.VN_CURDATE()),
         (5, 'Melee weapon combat first 15cm',   18, 35, 15, 4,      1.30, 0,    NULL,   18, util.VN_CURDATE());
 
@@ -1965,6 +1967,8 @@ INSERT INTO `vn`.`calendarType` (`id`, `description`, `hoursWeek`, `isPartial`)
     VALUES
         (1, 'General schedule', 40, 0);
 
+INSERT INTO `vn`.`workerBusinessAgreement` (`id`, `name`, `monthHolidays`, `yearHours`, `started`, `ended`)
+    VALUES(1, 'flowers', 2.5, 1830, '2001-01-01', NULL);
 
 DROP TEMPORARY TABLE IF EXISTS tmp.worker;
 CREATE TEMPORARY TABLE tmp.worker
@@ -2776,11 +2780,13 @@ INSERT INTO `util`.`notification` (`id`, `name`, `description`)
         (2, 'invoice-electronic', 'A electronic invoice has been generated'),
         (3, 'not-main-printer-configured', 'A printer distinct than main has been configured'),
         (4, 'supplier-pay-method-update', 'A supplier pay method has been updated'),
-        (5, 'modified-entry', 'An entry has been modified');
+        (5, 'modified-entry', 'An entry has been modified'),
+        (6, 'book-entry-deleted', 'accounting entries deleted');
 
 INSERT INTO `util`.`notificationAcl` (`notificationFk`, `roleFk`)
     VALUES
-        (1, 9);
+        (1, 9),
+        (6, 9);
 
 INSERT INTO `util`.`notificationQueue` (`id`, `notificationFk`, `params`, `authorFk`, `status`, `created`)
     VALUES
@@ -2793,8 +2799,9 @@ INSERT INTO `util`.`notificationSubscription` (`notificationFk`, `userFk`)
         (1, 1109),
         (1, 1110),
         (2, 1109),
-	    (1,9),
+	    (1, 9),
-        (1,3);
+        (1, 3),
+        (6, 9);
 
 
 INSERT INTO `vn`.`routeConfig` (`id`, `defaultWorkCenterFk`)
@@ -2830,7 +2837,7 @@ INSERT INTO `vn`.`ticketLog` (`originFk`, userFk, `action`, changedModel, oldIns
         (7,   18, 'update', 'Sale', '{"quantity":1}', '{"quantity":10}', 1, NULL),
         (7,   18, 'update', 'Ticket', '{"quantity":1,"concept":"Chest ammo box"}', '{"quantity":10,"concept":"Chest ammo box"}', 1, NULL),
         (7,   18, 'update', 'Sale', '{"price":3}', '{"price":5}', 1, NULL),
-        (7,   18, 'update', NULL, NULL, NULL, NULL, "Cambio cantidad Melee weapon heavy shield 1x0.5m de '5' a '10'"),
+        (7,   18, 'update', NULL, NULL, NULL, NULL, "Cambio cantidad Melee weapon heavy shield 100cm de '5' a '10'"),
         (16,   9, 'update', 'Sale', '{"quantity":10,"concept":"Shield", "price": 10.5, "itemFk": 1}', '{"quantity":8,"concept":"Shield", "price": 10.5, "itemFk": 1}' , 5689, 'Shield');
 
 
@@ -2896,11 +2903,11 @@ INSERT INTO `vn`.`deviceProductionState` (`code`, `description`)
         ('retired', 'retirada');
 
 INSERT INTO `vn`.`deviceProduction` (`imei`, `modelFk`, `macWifi`, `serialNumber`, `android_id`, `purchased`, `stateFk`, `isInScalefusion`, `description`)
-    VALUES
+VALUES
-        ('ime1', 'BLACKVIEW', 'macWifi1', 'serialNumber1', 'android_id1', util.VN_NOW(), 'active', 0, NULL),
+    ('ime1', 'BLACKVIEW', 'macWifi1', 'serialNumber1', 'androidid11234567890', util.VN_NOW(), 'active', 0, NULL),
-        ('ime2', 'DODGEE', 'macWifi2', 'serialNumber2', 'android_id2', util.VN_NOW(), 'idle', 0, NULL),
+    ('ime2', 'DODGEE', 'macWifi2', 'serialNumber2', 'androidid21234567890', util.VN_NOW(), 'idle', 0, NULL),
-        ('ime3', 'ZEBRA', 'macWifi3', 'serialNumber3', 'android_id3', util.VN_NOW(), 'active', 0, NULL),
+    ('ime3', 'ZEBRA', 'macWifi3', 'serialNumber3', 'androidid31234567890', util.VN_NOW(), 'active', 0, NULL),
-        ('ime4', 'BLACKVIEW', 'macWifi4', 'serialNumber4', 'android_id4', util.VN_NOW(), 'idle', 0, NULL);
+    ('ime4', 'BLACKVIEW', 'macWifi4', 'serialNumber4', 'androidid41234567890', util.VN_NOW(), 'idle', 0, NULL);
 
 INSERT INTO `vn`.`deviceProductionUser` (`deviceProductionFk`, `userFk`, `created`)
     VALUES
@@ -2958,3 +2965,12 @@ INSERT INTO `vn`.`invoiceInSerial` (`code`, `description`, `cplusTerIdNifFk`, `t
 INSERT INTO `hedera`.`imageConfig` (`id`, `maxSize`, `useXsendfile`, `url`)
     VALUES
         (1, 0, 0, 'marvel.com');
+
+INSERT INTO vn.XDiario (id, ASIEN, FECHA, SUBCTA, CONTRA, CONCEPTO, EURODEBE, EUROHABER, BASEEURO, SERIE, FACTURA, IVA, RECEQUIV, CLAVE, CAMBIO, DEBEME, HABERME, AUXILIAR, MONEDAUSO, TIPOOPE, NFACTICK, TERIDNIF, TERNIF, TERNOM, OPBIENES, L340, enlazado, FECHA_EX, LRECT349, empresa_id, LDIFADUAN, METAL, METALIMP, CLIENTE, METALEJE, FECHA_OP, FACTURAEX, TIPOCLAVE, TIPOEXENCI, TIPONOSUJE, TIPOFACT, TIPORECTIF, SERIE_RT, FACTU_RT, BASEIMP_RT, BASEIMP_RF, RECTIFICA, FECHA_RT, FECREGCON, enlazadoSage)
+    VALUES
+        (1, 1.0, util.VN_CURDATE(), '4300001104', NULL, 'n/fra T3333333', 8.88, NULL, NULL, NULL, '0', NULL, 0.00, NULL, NULL, NULL, NULL, NULL, '2', NULL, 1, 2, 'I.F.', 'Nombre Importador', 1, 0, 0, util.VN_CURDATE(), 0, 442, 0, 0, 0.00, NULL, NULL, util.VN_CURDATE(), NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, NULL, NULL, 1),
+        (2, 1.0, util.VN_CURDATE(), '2000000000', '4300001104', 'n/fra T3333333 Tony Stark', NULL, 8.07, NULL, NULL, '0', NULL, 0.00, NULL, NULL, NULL, NULL, NULL, '2', NULL, 1, 2, 'I.F.', 'Nombre Importador', 1, 0, 0, util.VN_CURDATE(), 0, 442, 0, 0, 0.00, NULL, NULL, util.VN_CURDATE(), NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, NULL, NULL, 1),
+        (3, 1.0, util.VN_CURDATE(), '4770000010', '4300001104', 'Inmovilizado pendiente : n/fra T3333333 Tony Stark', NULL, 0.81, 8.07, 'T', '3333333', 10.00, NULL, NULL, NULL, NULL, NULL, '', '2', '', 1, 1, '06089160W', 'IRON MAN', 1, 1, 0, util.VN_CURDATE(), 0, 442, 0, 0, 0.00, NULL, NULL, util.VN_CURDATE(), NULL, 1, 1, 1, 1, NULL, NULL, NULL, NULL, NULL, 0, NULL, NULL, 1),
+        (4, 2.0, util.VN_CURDATE(), '4300001104', NULL, 'n/fra T4444444', 8.88, NULL, NULL, NULL, '0', NULL, 0.00, NULL, NULL, NULL, NULL, NULL, '2', NULL, 1, 2, 'I.F.', 'Nombre Importador', 1, 0, 0, util.VN_CURDATE(), 0, 442, 0, 0, 0.00, NULL, NULL, util.VN_CURDATE(), NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, NULL, NULL, 0),
+        (5, 2.0, util.VN_CURDATE(), '2000000000', '4300001104', 'n/fra T4444444 Tony Stark', NULL, 8.07, NULL, NULL, '0', NULL, 0.00, NULL, NULL, NULL, NULL, NULL, '2', NULL, 1, 2, 'I.F.', 'Nombre Importador', 1, 0, 0, util.VN_CURDATE(), 0, 442, 0, 0, 0.00, NULL, NULL, util.VN_CURDATE(), NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, NULL, NULL, 0),
+        (6, 2.0, util.VN_CURDATE(), '4770000010', '4300001104', 'Inmovilizado pendiente : n/fra T4444444 Tony Stark', NULL, 0.81, 8.07, 'T', '4444444', 10.00, NULL, NULL, NULL, NULL, NULL, '', '2', '', 1, 1, '06089160W', 'IRON MAN', 1, 1, 0, util.VN_CURDATE(), 0, 442, 0, 0, 0.00, NULL, NULL, util.VN_CURDATE(), NULL, 1, 1, 1, 1, NULL, NULL, NULL, NULL, NULL, 0, NULL, NULL, 0);

db/export-data.sh

@@ -97,13 +97,6 @@ TABLES=(
 )
 dump_tables ${TABLES[@]}
 
-TABLES=(
-    postgresql
-    labour_agreement
-    media_type
-)
-dump_tables ${TABLES[@]}
-
 TABLES=(
     sage
     TiposIva

db/export-structure.sh

@@ -7,7 +7,6 @@ SCHEMAS=(
     edi
     hedera
     pbx
-    postgresql
     sage
     salix
     stock
@@ -23,7 +22,6 @@ IGNORETABLES=(
     --ignore-table=bs.productionIndicators
     --ignore-table=bs.VentasPorCliente
     --ignore-table=bs.v_ventas
-    --ignore-table=postgresql.currentWorkersStats
     --ignore-table=vn.accounting__
     --ignore-table=vn.agencyModeZone
     --ignore-table=vn.agencyProvince

db/tests/vn/item_getBalance.spec.js

@@ -6,13 +6,13 @@ describe('item_getBalance()', () => {
         let stmts = [];
 
         let params = {
-            warehouseFk: 1,
+            itemFk: 1,
-            itemFk: 1
+            warehouseFk: 1
         };
 
         const conn = await app.models.Item.dataSource.connector;
 
-        stmts.push(new ParameterizedSQL('CALL vn.item_getBalance(?, ?)', [
+        stmts.push(new ParameterizedSQL('CALL vn.item_getBalance(?, ?, NULL)', [
             params.warehouseFk,
             params.itemFk
         ]));

db/tests/vn/logAddWithUser.spec.js

@@ -1,42 +0,0 @@
-const app = require('vn-loopback/server/server');
-const ParameterizedSQL = require('loopback-connector').ParameterizedSQL;
-
-describe('logAddWithUser()', () => {
-    it('should log any action taken by the user in a table ending in Log', async() => {
-        let stmts = [];
-        let stmt;
-
-        stmts.push('START TRANSACTION');
-
-        let params = {
-            ticketFk: 1,
-            userId: 9,
-            actionCode: 'update',
-            targetEntity: 'ticket',
-            description: 'we are testing stuff'
-        };
-
-        stmt = new ParameterizedSQL('CALL vn.logAddWithUser(?, ?, ?, ?, ?)', [
-            params.ticketFk,
-            params.userId,
-            params.actionCode,
-            params.targetEntity,
-            params.description
-        ]);
-        stmts.push(stmt);
-
-        stmt = new ParameterizedSQL('SELECT * FROM vn.ticketLog WHERE description = ?', [
-            params.description
-        ]);
-        let ticketLogIndex = stmts.push(stmt) - 1;
-
-        stmts.push('ROLLBACK');
-
-        let sql = ParameterizedSQL.join(stmts, ';');
-        let result = await app.models.Ticket.rawStmt(sql);
-
-        savedDescription = result[ticketLogIndex][0].description;
-
-        expect(savedDescription).toEqual(params.description);
-    });
-});

db/tests/vn/timeControl_calculateByUser.spec.js

@@ -14,14 +14,6 @@ describe('timeControl_calculateByUser()', () => {
         let stmts = [];
         let stmt;
 
-        stmts.push('START TRANSACTION');
-
-        stmts.push(`
-            DROP TEMPORARY TABLE IF EXISTS
-                tmp.timeControlCalculate,
-                tmp.timeBusinessCalculate
-        `);
-
         let params = {
             workerID: 1106,
             start: start,
@@ -37,17 +29,15 @@ describe('timeControl_calculateByUser()', () => {
 
         let tableIndex = stmts.push('SELECT * FROM tmp.timeControlCalculate') - 1;
 
-        stmts.push('ROLLBACK');
-
         let sql = ParameterizedSQL.join(stmts, ';');
         let result = await app.models.Ticket.rawStmt(sql);
 
         let [timeControlCalculateTable] = result[tableIndex];
 
-        expect(timeControlCalculateTable.timeWorkSeconds).toEqual(29400);
+        expect(timeControlCalculateTable.timeWorkSeconds).toEqual(28200);
     });
-
+    // #2261
-    it(`should return the worked hours between last sunday and monday`, async() => {
+    xit(`should return the worked hours between last sunday and monday`, async() => {
         let lastSunday = Date.vnNew();
         let daysSinceSunday = lastSunday.getDay();
         if (daysSinceSunday === 0) // this means today is sunday but you need the previous sunday :)
@@ -65,13 +55,7 @@ describe('timeControl_calculateByUser()', () => {
 
         stmts.push('START TRANSACTION');
 
-        stmts.push(`
+        const workerID = 1108;
-            DROP TEMPORARY TABLE IF EXISTS
-                tmp.timeControlCalculate,
-                tmp.timeBusinessCalculate
-        `);
-
-        const workerID = 1107;
 
         stmt = new ParameterizedSQL(`
             INSERT INTO vn.workerTimeControl(userFk, timed, manual, direction)

db/tests/vn/workerTimeControlCheck.spec.js

@@ -54,7 +54,6 @@ xdescribe('worker workerTimeControl_check()', () => {
     });
 
     it('should throw an error if the worker with a special category has not finished the 9h break', async() => {
-        // dayBreak to 9h in postgresql.professional_category
         const workerId = 1110;
         const tabletId = 1;
         let stmts = [];
@@ -91,7 +90,6 @@ xdescribe('worker workerTimeControl_check()', () => {
     });
 
     it('should check f the worker with a special category has finished the 9h break', async() => {
-        // dayBreak to 9h in postgresql.professional_category
         const workerId = 1110;
         const tabletId = 1;
         let stmts = [];
@@ -239,12 +237,6 @@ xdescribe('worker workerTimeControl_check()', () => {
 
         stmts.push('START TRANSACTION');
 
-        stmt = new ParameterizedSQL(`INSERT INTO postgresql.calendar_employee(businessFk,calendar_state_id,date)
-            VALUES
-                (?,1,CURDATE())`, [
-            workerId
-        ]);
-        stmts.push(stmt);
         stmt = new ParameterizedSQL(`INSERT INTO vn.workerTimeControl(userFk,timed,manual,direction)
             VALUES
                 (?,TIMESTAMPADD(HOUR,-24,NOW()),0,"in"),

db/tests/vn/zone_getFromGeo.spec.js

@@ -7,7 +7,7 @@ describe('zone zone_getFromGeo()', () => {
         let stmt;
 
         stmts.push('START TRANSACTION');
-        let geoFk = 17;
+        let geoFk = 16;
 
         stmt = new ParameterizedSQL('CALL zone_getFromGeo(?)', [
             geoFk,

e2e/helpers/selectors.js

@@ -671,8 +671,8 @@ export default {
         firstAddServiceTypeButton: 'vn-ticket-service vn-icon-button[vn-tooltip="New service type"]',
         firstServiceType: 'vn-ticket-service vn-autocomplete[ng-model="service.ticketServiceTypeFk"]',
         firstQuantity: 'vn-ticket-service vn-input-number[ng-model="service.quantity"]',
-        firstPrice: 'vn-ticket-service vn-horizontal:nth-child(1) vn-input-number[ng-model="service.price"]',
+        firstPrice: 'vn-ticket-service vn-horizontal:nth-child(2) vn-input-number[ng-model="service.price"]',
-        fistDeleteServiceButton: 'vn-ticket-service form vn-horizontal:nth-child(1) vn-icon-button[icon="delete"]',
+        fistDeleteServiceButton: 'vn-ticket-service form vn-horizontal:nth-child(2) vn-icon-button[icon="delete"]',
         newServiceTypeName: '.vn-dialog.shown vn-textfield[ng-model="newServiceType.name"]',
         serviceLine: 'vn-ticket-service > form > vn-card > vn-one:nth-child(2) > vn-horizontal',
         saveServiceButton: 'button[type=submit]',

e2e/paths/02-client/01_create_client.spec.js

@@ -8,7 +8,7 @@ describe('Client create path', () => {
     beforeAll(async() => {
         browser = await getBrowser();
         page = browser.page;
-        await page.loginAndModule(' deliveryBoss', 'client');
+        await page.loginAndModule('deliveryAssistant', 'client');
     });
 
     afterAll(async() => {

e2e/paths/03-worker/06_create.spec.js

@@ -45,7 +45,7 @@ describe('Worker create path', () => {
 
         // should create a new worker and go to worker basic data'
         await page.pickDate(selectors.workerCreate.birth, new Date(1962, 8, 5));
-        await page.autocompleteSearch(selectors.workerCreate.boss, 'deliveryBoss');
+        await page.autocompleteSearch(selectors.workerCreate.boss, 'deliveryAssistant');
         await page.waitToClick(selectors.workerCreate.createButton);
         message = await page.waitForSnackbar();
         await page.waitForState('worker.card.basicData');

e2e/paths/04-item/01_summary.spec.js

@@ -27,10 +27,10 @@ describe('Item summary path', () => {
     });
 
     it(`should check the item summary preview shows fields from basic data`, async() => {
-        await page.waitForTextInElement(selectors.itemSummary.basicData, 'Ranged weapon longbow 2m');
+        await page.waitForTextInElement(selectors.itemSummary.basicData, 'Ranged weapon longbow 200cm');
         const result = await page.waitToGetProperty(selectors.itemSummary.basicData, 'innerText');
 
-        expect(result).toContain('Ranged weapon longbow 2m');
+        expect(result).toContain('Ranged weapon longbow 200cm');
     });
 
     it(`should check the item summary preview shows fields from tags`, async() => {

e2e/paths/04-item/03_tax.spec.js

@@ -8,7 +8,7 @@ describe('Item edit tax path', () => {
         browser = await getBrowser();
         page = browser.page;
         await page.loginAndModule('buyer', 'item');
-        await page.accessToSearchResult('Ranged weapon longbow 2m');
+        await page.accessToSearchResult('Ranged weapon longbow 200cm');
         await page.accessToSection('item.card.tax');
     });
 

e2e/paths/04-item/04_tags.spec.js

@@ -8,7 +8,7 @@ describe('Item create tags path', () => {
         browser = await getBrowser();
         page = browser.page;
         await page.loginAndModule('buyer', 'item');
-        await page.accessToSearchResult('Ranged weapon longbow 2m');
+        await page.accessToSearchResult('Ranged weapon longbow 200cm');
         await page.accessToSection('item.card.tags');
     });
 

e2e/paths/04-item/06_barcode.spec.js

@@ -8,7 +8,7 @@ describe('Item Create barcodes path', () => {
         browser = await getBrowser();
         page = browser.page;
         await page.loginAndModule('buyer', 'item');
-        await page.accessToSearchResult('Ranged weapon longbow 2m');
+        await page.accessToSearchResult('Ranged weapon longbow 200cm');
         await page.accessToSection('item.card.itemBarcode');
     });
 

e2e/paths/04-item/12_request.spec.js

@@ -22,10 +22,10 @@ describe('Item request path', () => {
     it('should fill the id and quantity then check the concept was updated', async() => {
         await page.writeOnEditableTD(selectors.itemRequest.firstRequestItemID, '4');
         await page.writeOnEditableTD(selectors.itemRequest.firstRequestQuantity, '10');
-        await page.waitForTextInElement(selectors.itemRequest.firstRequestConcept, 'Melee weapon heavy shield 1x0.5m');
+        await page.waitForTextInElement(selectors.itemRequest.firstRequestConcept, 'Melee weapon heavy shield 100cm');
         let filledConcept = await page.waitToGetProperty(selectors.itemRequest.firstRequestConcept, 'innerText');
 
-        expect(filledConcept).toContain('Melee weapon heavy shield 1x0.5m');
+        expect(filledConcept).toContain('Melee weapon heavy shield 100cm');
     });
 
     it('should check the status of the request should now be accepted', async() => {

e2e/paths/05-ticket/01-sale/01_list_sales.spec.js

@@ -54,7 +54,7 @@ describe('Ticket List sale path', () => {
     });
 
     it('should select a valid item to be added as the second item in the sales list', async() => {
-        let searchValue = 'Melee weapon heavy shield 1x0.5m';
+        let searchValue = 'Melee weapon heavy shield 100cm';
         await page.autocompleteSearch(selectors.ticketSales.secondSaleIdAutocomplete, searchValue);
         await page.waitToClick(selectors.ticketSales.secondSaleQuantityCell);
         await page.type(selectors.ticketSales.secondSaleQuantity, '1');

e2e/paths/05-ticket/04_packages.spec.js

@@ -36,7 +36,7 @@ describe('Ticket Create packages path', () => {
 
     it(`should delete the first package and receive and error to save a new one with blank quantity`, async() => {
         await page.clearInput($.firstQuantity);
-        await page.autocompleteSearch($.firstPackage, 'Container medical box 1m');
+        await page.autocompleteSearch($.firstPackage, 'Container medical box 100cm');
         await page.waitToClick($.savePackagesButton);
         const message = await page.waitForSnackbar();
 
@@ -63,10 +63,10 @@ describe('Ticket Create packages path', () => {
 
     it(`should confirm the first select is the expected one`, async() => {
         await page.reloadSection('ticket.card.package');
-        await page.waitForTextInField($.firstPackage, 'Container medical box 1m');
+        await page.waitForTextInField($.firstPackage, 'Container medical box 100cm');
         const result = await page.waitToGetProperty($.firstPackage, 'value');
 
-        expect(result).toEqual('Container medical box 1m');
+        expect(result).toEqual('Container medical box 100cm');
     });
 
     it(`should confirm quantity is just a number and the string part was ignored by the imput number`, async() => {

e2e/paths/05-ticket/06_basic_data_steps.spec.js

@@ -75,7 +75,7 @@ describe('Ticket Edit basic data path', () => {
         const result = await page
             .waitToGetProperty(selectors.ticketBasicData.stepTwoTotalPriceDif, 'innerText');
 
-        expect(result).toContain('-€232.75');
+        expect(result).toContain('-€228.25');
     });
 
     it(`should select a new reason for the changes made then click on finalize`, async() => {

e2e/paths/09-invoice-in/03_basic_data.spec.js

@@ -82,32 +82,24 @@ describe('InvoiceIn basic data path', () => {
         await page.waitToClick(selectors.invoiceInBasicData.confirm);
         let message = await page.waitForSnackbar();
 
-        expect(message.text).toContain('The company can\'t be empty');
-
         await page.clearInput(selectors.invoiceInBasicData.companyId);
         await page.autocompleteSearch(selectors.invoiceInBasicData.companyId, 'VNL');
 
         await page.waitToClick(selectors.invoiceInBasicData.confirm);
         message = await page.waitForSnackbar();
 
-        expect(message.text).toContain('The warehouse can\'t be empty');
-
         await page.clearInput(selectors.invoiceInBasicData.warehouseId);
         await page.autocompleteSearch(selectors.invoiceInBasicData.warehouseId, 'Warehouse One');
 
         await page.waitToClick(selectors.invoiceInBasicData.confirm);
         message = await page.waitForSnackbar();
 
-        expect(message.text).toContain('The DMS Type can\'t be empty');
-
         await page.clearInput(selectors.invoiceInBasicData.dmsTypeId);
         await page.autocompleteSearch(selectors.invoiceInBasicData.dmsTypeId, 'Ticket');
 
         await page.waitToClick(selectors.invoiceInBasicData.confirm);
         message = await page.waitForSnackbar();
 
-        expect(message.text).toContain('The description can\'t be empty');
-
         await page.waitToClick(selectors.invoiceInBasicData.description);
         await page.write(selectors.invoiceInBasicData.description, 'Dms without edition.');
 

e2e/paths/11-zone/01_basic-data.spec.js

@@ -8,7 +8,9 @@ describe('Zone basic data path', () => {
     beforeAll(async() => {
         browser = await getBrowser();
         page = browser.page;
-        await page.loginAndModule('deliveryBoss', 'zone'); // turns up the zone module name and route aint the same lol
+
+        await page.loginAndModule('deliveryAssistant',
+            'zone'); // turns up the zone module name and route aint the same lol
         await page.accessToSearchResult('10');
         await page.accessToSection('zone.card.basicData');
     });

e2e/paths/11-zone/02_descriptor.spec.js

@@ -8,7 +8,7 @@ describe('Zone descriptor path', () => {
     beforeAll(async() => {
         browser = await getBrowser();
         page = browser.page;
-        await page.loginAndModule('deliveryBoss', 'zone');
+        await page.loginAndModule('deliveryAssistant', 'zone');
         await page.accessToSearchResult('13');
     });
 

e2e/paths/12-entry/07_buys.spec.js

@@ -41,10 +41,10 @@ describe('Entry import, create and edit buys path', () => {
         await page.waitForTextInField(selectors.entryBuys.ref, '200573095, 200573106, 200573117, 200573506');
         await page.waitForTextInField(selectors.entryBuys.observation, '729-6340 2846');
 
-        await page.autocompleteSearch(selectors.entryBuys.firstImportedItem, 'Ranged weapon longbow 2m');
+        await page.autocompleteSearch(selectors.entryBuys.firstImportedItem, 'Ranged weapon longbow 200cm');
-        await page.autocompleteSearch(selectors.entryBuys.secondImportedItem, 'Ranged weapon longbow 2m');
+        await page.autocompleteSearch(selectors.entryBuys.secondImportedItem, 'Ranged weapon longbow 200cm');
-        await page.autocompleteSearch(selectors.entryBuys.thirdImportedItem, 'Ranged weapon sniper rifle 300mm');
+        await page.autocompleteSearch(selectors.entryBuys.thirdImportedItem, 'Ranged weapon sniper rifle 113cm');
-        await page.autocompleteSearch(selectors.entryBuys.fourthImportedItem, 'Melee weapon heavy shield 1x0.5m');
+        await page.autocompleteSearch(selectors.entryBuys.fourthImportedItem, 'Melee weapon heavy shield 100cm');
 
         await page.waitToClick(selectors.entryBuys.importBuysButton);
 

front/core/components/snackbar/snackbar.js

@@ -27,7 +27,7 @@ export default class Controller extends Component {
         setTimeout(() => element.classList.add('shown'), 30);
         shape.element = element;
 
-        if (data.additionalData) {
+        if (data.additionalData && this.vnToken.token) {
             this.additionalData = data.additionalData;
             let supportButton = document.createElement('i');
             supportButton.setAttribute('class', 'material-icons clickable');

front/core/components/support-dialog/index.js

@@ -7,12 +7,15 @@ export default class Controller extends Dialog {
     }
 
     responseHandler(response) {
+        if (response !== 'accept')
+            return super.responseHandler(response);
+
         this.$http.post('Ostickets/send-to-support', {
             reason: this.reason,
             additionalData: this.additionalData
         })
-        .then(() => super.responseHandler(response))
+            .then(() => super.responseHandler(response))
-        .then(() => this.vnApp.showSuccess(this.$t('Email sended!')));
+            .then(() => this.vnApp.showSuccess(this.$t('Email sended!')));
     }
 }
 

front/core/lib/validator.js

@@ -5,6 +5,10 @@ export const validators = {
         if (validator.isEmpty(value ? String(value) : ''))
             throw new Error(_($translate, `Value can't be empty`));
     },
+    negative: $translate => {
+        if (validator < 0)
+            throw new Error(_($translate, `Negative numbers are not allowed. Please enter a valid number.`));
+    },
     absence: ($translate, value) => {
         if (!validator.isEmpty(value))
             throw new Error(_($translate, `Value should be empty`));
@@ -104,9 +108,8 @@ export function checkNull($translate, value, conf) {
 export function _($translate, text, params = []) {
     text = $translate.instant(text);
 
-    for (let i = 0; i < params.length; i++) {
+    for (let i = 0; i < params.length; i++)
         text = text.replace('%s', params[i]);
-    }
 
     return text;
 }

front/core/locale/es.yml

@@ -16,6 +16,7 @@ Value can't be empty: El valor no puede estar vacío
 Value should be empty: El valor debe estar vacío
 Value should be integer: El valor debe ser entero
 Value should be a number: El valor debe ser numérico
+Negative numbers are not allowed. Please enter a valid number: No se permiten números negativos. Por favor, ingrese un número válido
 Invalid value: Valor incorrecto
 Value can't be blank: El valor no puede estar en blanco
 Value can't be null: El valor no puede ser nulo

loopback/locale/en.json

@@ -179,11 +179,13 @@
 	"You can not use the same password": "You can not use the same password",
 	"Valid priorities": "Valid priorities: %d",
 	"Negative basis of tickets": "Negative basis of tickets: {{ticketsIds}}",
-    "This ticket cannot be left empty.": "This ticket cannot be left empty. %s",
+	"This ticket cannot be left empty.": "This ticket cannot be left empty. %s",
 	"Social name should be uppercase": "Social name should be uppercase",
 	"Street should be uppercase": "Street should be uppercase",
 	"You don't have enough privileges.": "You don't have enough privileges.",
 	"This ticket is locked.": "This ticket is locked.",
 	"This ticket is not editable.": "This ticket is not editable.",
-	"The ticket doesn't exist.": "The ticket doesn't exist."
+	"The ticket doesn't exist.": "The ticket doesn't exist.",
+	"The sales do not exists": "The sales do not exists",
+	"Ticket without Route": "Ticket without route"
 }

loopback/locale/es.json

@@ -307,7 +307,7 @@
 	"Negative basis of tickets": "Base negativa para los tickets: {{ticketsIds}}",
 	"You cannot assign an alias that you are not assigned to": "No puede asignar un alias que no tenga asignado",
 	"This ticket cannot be left empty.": "Este ticket no se puede dejar vacío. %s",
-    "The company has not informed the supplier account for bank transfers": "La empresa no tiene informado la cuenta de proveedor para transferencias bancarias",
+	"The company has not informed the supplier account for bank transfers": "La empresa no tiene informado la cuenta de proveedor para transferencias bancarias",
 	"You cannot assign/remove an alias that you are not assigned to": "No puede asignar/eliminar un alias que no tenga asignado",
 	"This invoice has a linked vehicle.": "Esta factura tiene un vehiculo vinculado",
 	"You don't have enough privileges.": "No tienes suficientes permisos.",
@@ -315,5 +315,7 @@
 	"This ticket is not editable.": "Este ticket no es editable.",
 	"The ticket doesn't exist.": "No existe el ticket.",
     "Social name should be uppercase": "La razón social debe ir en mayúscula",
-	"Street should be uppercase": "La dirección fiscal debe ir en mayúscula"
+	"Street should be uppercase": "La dirección fiscal debe ir en mayúscula",
+	"The response is not a PDF": "La respuesta no es un PDF",
+	"Ticket without Route": "Ticket sin ruta"
 }

modules/claim/back/methods/claim-beginning/importToNewRefundTicket.js

@@ -75,7 +75,7 @@ module.exports = Self => {
 
         try {
             const worker = await models.Worker.findOne({
-                where: {userFk: userId}
+                where: {id: userId}
             }, myOptions);
 
             const obsevationType = await models.ObservationType.findOne({

modules/claim/back/methods/claim/getSummary.js

@@ -35,7 +35,7 @@ module.exports = Self => {
                 {
                     relation: 'worker',
                     scope: {
-                        fields: ['userFk'],
+                        fields: ['id'],
                         include: {
                             relation: 'user',
                             scope: {
@@ -109,7 +109,7 @@ module.exports = Self => {
                 {
                     relation: 'worker',
                     scope: {
-                        fields: ['userFk'],
+                        fields: ['id'],
                         include: {
                             relation: 'user',
                             scope: {

modules/claim/back/methods/claim/logs.js

@@ -1,7 +1,7 @@
 
 const ParameterizedSQL = require('loopback-connector').ParameterizedSQL;
 const buildFilter = require('vn-loopback/util/filter').buildFilter;
-const { mergeFilters, mergeWhere } = require('vn-loopback/util/filter');
+const {mergeFilters, mergeWhere} = require('vn-loopback/util/filter');
 
 module.exports = Self => {
     Self.remoteMethodCtx('logs', {
@@ -12,27 +12,27 @@ module.exports = Self => {
                 arg: 'id',
                 type: 'Number',
                 description: 'The claim id',
-                http: { source: 'path' }
+                http: {source: 'path'}
             },
             {
                 arg: 'filter',
                 type: 'object',
-                http: { source: 'query' }
+                http: {source: 'query'}
             },
             {
                 arg: 'search',
                 type: 'string',
-                http: { source: 'query' }
+                http: {source: 'query'}
             },
             {
                 arg: 'userFk',
                 type: 'number',
-                http: { source: 'query' }
+                http: {source: 'query'}
             },
             {
                 arg: 'created',
                 type: 'date',
-                http: { source: 'query' }
+                http: {source: 'query'}
             },
         ],
         returns: {
@@ -45,7 +45,7 @@ module.exports = Self => {
         }
     });
 
-    Self.logs = async (ctx, id, filter, options) => {
+    Self.logs = async(ctx, id, filter, options) => {
         const conn = Self.dataSource.connector;
         const args = ctx.args;
         const myOptions = {};
@@ -56,25 +56,25 @@ module.exports = Self => {
 
         let where = buildFilter(args, (param, value) => {
             switch (param) {
-                case 'search':
+            case 'search':
-                    return {
+                return {
-                        or: [
+                    or: [
-                            { changedModel: { like: `%${value}%` } },
+                        {changedModel: {like: `%${value}%`}},
-                            { oldInstance: { like: `%${value}%` } }
+                        {oldInstance: {like: `%${value}%`}}
-                        ]
+                    ]
-                    };
+                };
-                case 'userFk':
+            case 'userFk':
-                    return { 'cl.userFk': value };
+                return {'cl.userFk': value};
-                case 'created':
+            case 'created':
-                    value.setHours(0, 0, 0, 0);
+                value.setHours(0, 0, 0, 0);
-                    to = new Date(value);
+                to = new Date(value);
-                    to.setHours(23, 59, 59, 999);
+                to.setHours(23, 59, 59, 999);
 
-                    return { creationDate: { between: [value, to] } };
+                return {creationDate: {between: [value, to]}};
             }
         });
-        where = mergeWhere(where, { ['cl.originFk']: id });
+        where = mergeWhere(where, {['cl.originFk']: id});
-        filter = mergeFilters(args.filter, { where });
+        filter = mergeFilters(args.filter, {where});
 
         const stmts = [];
 

modules/claim/front/card/index.js

@@ -8,7 +8,7 @@ class Controller extends ModuleCard {
                 {
                     relation: 'worker',
                     scope: {
-                        fields: ['userFk'],
+                        fields: ['id'],
                         include: {
                             relation: 'user',
                             scope: {

modules/claim/front/descriptor/index.html

@@ -45,7 +45,7 @@
             <vn-label-value
                 label="Attended by">
                 <span
-                    ng-click="workerDescriptor.show($event, $ctrl.claim.worker.userFk)"
+                    ng-click="workerDescriptor.show($event, $ctrl.claim.worker.id)"
                     class="link">
                     {{$ctrl.claim.worker.user.name}}
                 </span>

modules/client/back/methods/address/getAddress.js

@@ -0,0 +1,24 @@
+module.exports = Self => {
+    Self.remoteMethod('getAddress', {
+        description: 'Get all activated address with loses client activated',
+        accessType: 'READ',
+        accepts: [],
+        returns: {
+            type: ['object'],
+            root: true
+        },
+        http: {
+            path: `/getAddress`,
+            verb: 'GET'
+        }
+    });
+    Self.getAddress = async() => {
+        let getAddressQuery = `
+    SELECT a.id, a.nickname
+		FROM vn.address a
+			JOIN vn.client c ON a.clientFk = c.id AND c.isActive <> FALSE
+		WHERE c.typeFk = 'loses' AND a.isActive <> FALSE;`;
+
+        return result = await Self.rawSql(getAddressQuery);
+    };
+};

modules/client/back/methods/address/specs/getAddress.spec.js

@@ -0,0 +1,9 @@
+const {models} = require('vn-loopback/server/server');
+
+describe('getAddress()', () => {
+    it('return list of activated address with loses client activated', async() => {
+        let response = await models.Address.getAddress();
+
+        expect(response.length).toEqual(2);
+    });
+});

modules/client/back/methods/client/filter.js

@@ -80,10 +80,15 @@ module.exports = Self => {
             Object.assign(myOptions, options);
 
         if (args.zoneFk) {
-            query = `CALL vn.zone_getPostalCode(?)`;
+            let stmts = [];
-            const [geos] = await Self.rawSql(query, [args.zoneFk]);
+            stmts.push(new ParameterizedSQL('CALL vn.zone_getPostalCode(?)', [args.zoneFk]));
-            for (let geo of geos)
+            stmts.push(`SELECT name FROM tmp.zoneNodes`);
-                postalCode.push(geo.name);
+            stmts.push(`DROP TEMPORARY TABLE tmp.zoneNodes`);
+            const sql = ParameterizedSQL.join(stmts, ';');
+            const [results] = await conn.executeStmt(sql);
+
+            for (let result of results)
+                postalCode.push(result.name);
         }
 
         const where = buildFilter(ctx.args, (param, value) => {

modules/client/back/methods/receipt/filter.js

@@ -60,7 +60,7 @@ module.exports = Self => {
                     at2.id IS NOT NULL as isCompensation
                 FROM vn.receipt r
                     LEFT JOIN vn.worker w ON w.id = r.workerFk
-                    LEFT JOIN account.user u ON u.id = w.userFk
+                    LEFT JOIN account.user u ON u.id = w.id
                     JOIN vn.company c ON c.id = r.companyFk
                     LEFT JOIN vn.accounting a ON a.id = r.bankFk
 				    LEFT JOIN vn.accountingType at2 ON at2.id = a.accountingTypeFk AND at2.code = 'compensation'

modules/client/back/model-config.json

@@ -136,5 +136,8 @@
     },
     "Incoterms": {
         "dataSource": "vn"
+    },
+    "Xdiario": {
+        "dataSource": "vn"
     }
 }

modules/client/back/models/XDiario.json

@@ -1,5 +1,5 @@
 {
-    "name": "XDiario",
+    "name": "Xdiario",
     "base": "VnModel",
 	"options": {
 		"mysql": {
@@ -7,10 +7,12 @@
 		}
 	},
     "properties": {
-		"ASIEN": {
+		"id": {
 			"type": "number",
-			"id": true,
+			"id": true
-			"description": "Identifier"
+        },
+		"ASIEN": {
+			"type": "number"
         },
         "FECHA": {
 			"type": "date"
@@ -71,6 +73,9 @@
         },
         "MONEDAUSO": {
 			"type": "string"
+        },
+        "enlazadoSage": {
+			"type": "boolean"
         }
     },
 	"relations": {

modules/client/back/models/address.js

@@ -3,6 +3,8 @@ let getFinalState = require('vn-loopback/util/hook').getFinalState;
 let isMultiple = require('vn-loopback/util/hook').isMultiple;
 
 module.exports = Self => {
+    require('../methods/address/getAddress')(Self);
+
     Self.validateAsync('isEqualizated', cannotHaveET, {
         message: 'Cannot check Equalization Tax in this NIF/CIF'
     });

modules/client/back/models/client-observation.js

@@ -9,7 +9,7 @@ module.exports = function(Self) {
         let token = ctx.options.accessToken;
         let userId = token && token.userId;
 
-        Self.app.models.Worker.findOne({where: {userFk: userId}}, (err, user) => {
+        Self.app.models.Worker.findOne({where: {id: userId}}, (err, user) => {
             if (err) return next(err);
             ctx.instance.workerFk = user.id;
             next();

modules/client/back/models/client-observation.json

@@ -41,7 +41,7 @@
 		"include": {
 			"relation": "worker",
 			"scope": {
-				"fields": ["userFk"],
+				"fields": ["id"],
 				"include": {
 					"relation": "user",
 					"scope": {

modules/client/front/address/create/index.html

@@ -68,7 +68,7 @@
                         icon="add_circle"
                         vn-tooltip="New postcode"
                         ng-click="postcode.open()"
-                        vn-acl="deliveryBoss"
+                        vn-acl="deliveryAssistant"
                         vn-acl-action="remove">
                     </vn-icon-button>
                 </append>

modules/client/front/address/edit/index.html

@@ -81,7 +81,7 @@
                         icon="add_circle"
                         vn-tooltip="New postcode"
                         ng-click="postcode.open()"
-                        vn-acl="deliveryBoss"
+                        vn-acl="deliveryAssistant"
                         vn-acl-action="remove">
                     </vn-icon-button>
                 </append>

modules/client/front/create/index.html

@@ -73,7 +73,7 @@
                         icon="add_circle"
                         vn-tooltip="New postcode"
                         ng-click="postcode.open()"
-                        vn-acl="deliveryBoss"
+                        vn-acl="deliveryAssistant"
                         vn-acl-action="remove">
                     </vn-icon-button>
                 </append>

modules/client/front/credit-management/index.js

@@ -9,7 +9,7 @@ export default class Controller extends Section {
             include: [{
                 relation: 'worker',
                 scope: {
-                    fields: ['userFk'],
+                    fields: ['id'],
                     include: {
                         relation: 'user',
                         scope: {

modules/client/front/credit/index/index.html

@@ -25,7 +25,7 @@
                 <vn-td shrink-datetime>{{::credit.created | date:'dd/MM/yyyy HH:mm'}}</vn-td>
                 <vn-td>
                     <span
-                        ng-click="workerDescriptor.show($event, credit.worker.userFk)"
+                        ng-click="workerDescriptor.show($event, credit.worker.id)"
                         class="link">
                         {{::credit.worker.user.name}}
                     </span>

modules/client/front/credit/index/index.js

@@ -9,7 +9,7 @@ class Controller extends Section {
                 {
                     relation: 'worker',
                     scope: {
-                        fields: ['userFk'],
+                        fields: ['id'],
                         include: {
                             relation: 'user',
                             scope: {

modules/client/front/dms/index/index.js

@@ -28,7 +28,7 @@ class Controller extends Section {
                     }, {
                         relation: 'worker',
                         scope: {
-                            fields: ['userFk'],
+                            fields: ['id'],
                             include: {
                                 relation: 'user',
                                 scope: {

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

@@ -94,7 +94,7 @@
                         icon="add_circle"
                         vn-tooltip="New postcode"
                         ng-click="postcode.open()"
-                        vn-acl="deliveryBoss"
+                        vn-acl="deliveryAssistant"
                         vn-acl-action="remove">
                     </vn-icon-button>
                 </append>

modules/client/front/postcode/index.html

@@ -27,7 +27,7 @@
                         icon="add_circle"
                         vn-tooltip="New city"
                         ng-click="city.open($event)"
-                        vn-acl="deliveryBoss"
+                        vn-acl="deliveryAssistant"
                         vn-acl-action="remove">
                     </vn-icon-button>
                 </append>
@@ -45,7 +45,7 @@
                         icon="add_circle"
                         vn-tooltip="New province"
                         ng-click="province.open($event)"
-                        vn-acl="deliveryBoss"
+                        vn-acl="deliveryAssistant"
                         vn-acl-action="remove">
                     </vn-icon-button>
                 </append>

modules/client/front/summary/index.html

@@ -255,7 +255,7 @@
                 value="{{$ctrl.summary.averageInvoiced.invoiced | currency: 'EUR':2}}">
             </vn-label-value>
             <vn-label-value label="Claims"
-                value="{{$ctrl.claimingRate($ctrl.summary.claimsRatio.claimingRate) | percentage}}">
+                value="{{$ctrl.claimingRate($ctrl.summary.claimsRatio.claimingRate / 100) | percentage}}">
             </vn-label-value>
         </vn-one>
         <vn-one>

modules/entry/back/locale/entry/es.yml

@@ -4,14 +4,14 @@ columns:
     dated: fecha
     reference: referencia
     invoiceNumber: número factura
-    isBooked: reservado
+    isBooked: contabilizado
     isExcludedFromAvailable: excluido del disponible
     notes: notas
     isConfirmed: confirmado
     isVirtual: virtual
-    isRaid: incursión
+    isRaid: redada
     commission: comisión
-    isOrdered: precio3
+    isOrdered: pedida
     created: creado
     observation: observación
     isBlocked: bloqueado

modules/entry/back/methods/entry/addFromBuy.js

@@ -85,7 +85,6 @@ module.exports = Self => {
                     price2: buyUltimate.price2,
                     price3: buyUltimate.price3,
                     minPrice: buyUltimate.minPrice,
-                    printedStickers: args.printedStickers,
                     workerFk: buyUltimate.workerFk,
                     isChecked: buyUltimate.isChecked,
                     isPickedOff: buyUltimate.isPickedOff,
@@ -95,6 +94,8 @@ module.exports = Self => {
                     deliveryFk: buyUltimate.deliveryFk,
                     itemOriginalFk: buyUltimate.itemOriginalFk
                 }, myOptions);
+                if (buy)
+                    await buy.updateAttribute('printedStickers', args.printedStickers, myOptions);
             }
 
             if (tx) await tx.commit();

modules/entry/back/methods/entry/lastItemBuys.js

@@ -33,7 +33,6 @@ module.exports = Self => {
         const models = Self.app.models;
         const where = {isActive: true};
         const myOptions = {};
-
         if (typeof options == 'object')
             Object.assign(myOptions, options);
 
@@ -47,18 +46,15 @@ module.exports = Self => {
                 }
             }]
         }, myOptions);
-
         const travel = entry.travel();
 
         const stmts = [];
         let stmt;
-
         stmt = new ParameterizedSQL(`CALL buyUltimate(?, ?)`, [
             travel.warehouseInFk,
             travel.landed
         ]);
         stmts.push(stmt);
-
         stmts.push('DROP TEMPORARY TABLE IF EXISTS tmp.item');
         stmt = new ParameterizedSQL(
             `CREATE TEMPORARY TABLE tmp.item
@@ -68,13 +64,12 @@ module.exports = Self => {
                     p.name AS producerName,
                     nk.name AS inkName
                 FROM item i
-                    JOIN producer p ON p.id = i.producerFk
+                    LEFT JOIN producer p ON p.id = i.producerFk
-                    JOIN ink nk ON nk.id = i.inkFk
+                    LEFT JOIN ink nk ON nk.id = i.inkFk
                     JOIN tmp.buyUltimate bu ON i.id = bu.itemFk
                         AND bu.warehouseFk = ?
         `, [travel.warehouseInFk]);
         stmts.push(stmt);
-
         stmt = new ParameterizedSQL('SELECT * FROM tmp.item');
         stmt.merge(conn.makeSuffix(filter));
 
@@ -84,7 +79,6 @@ module.exports = Self => {
 
         const sql = ParameterizedSQL.join(stmts, ';');
         const result = await conn.executeStmt(sql, myOptions);
-
         return result[itemsIndex];
     };
 };

modules/entry/back/methods/entry/specs/editLatestBuys.spec.js

@@ -24,7 +24,7 @@ describe('Buy editLatestsBuys()', () => {
         try {
             const ctx = {
                 args: {
-                    search: 'Ranged weapon longbow 2m'
+                    search: 'Ranged weapon longbow 200cm'
                 },
                 req: {accessToken: {userId: 1}}
             };

modules/entry/back/methods/entry/specs/latestBuysFilter.spec.js

@@ -8,7 +8,7 @@ describe('Entry latests buys filter()', () => {
         try {
             const ctx = {
                 args: {
-                    search: 'Ranged weapon longbow 2m'
+                    search: 'Ranged weapon longbow 200cm'
                 },
                 req: {accessToken: {userId: 1}}
             };
@@ -17,7 +17,7 @@ describe('Entry latests buys filter()', () => {
             const firstBuy = results[0];
 
             expect(results.length).toEqual(1);
-            expect(firstBuy.size).toEqual(70);
+            expect(firstBuy.size).toEqual(200);
 
             await tx.rollback();
         } catch (e) {
@@ -57,7 +57,7 @@ describe('Entry latests buys filter()', () => {
             const ctx = {
                 args: {
                     tags: [
-                        {tagFk: 27, value: '2m'}
+                        {tagFk: 27, value: '200cm'}
                     ]
                 },
                 req: {accessToken: {userId: 1}}

modules/invoiceIn/front/basic-data/index.js

@@ -67,17 +67,22 @@ class Controller extends Section {
     }
 
     openCreateDialog() {
-        this.dms = {
+        const params = {filter: {
-            reference: null,
+            where: {code: 'invoiceIn'}
-            warehouseId: null,
+        }};
-            companyId: null,
+        this.$http.get('DmsTypes/findOne', {params}).then(res => {
-            dmsTypeId: null,
+            this.dms = {
-            description: null,
+                reference: this.invoiceIn.supplierRef,
-            hasFile: true,
+                warehouseId: this.vnConfig.warehouseFk,
-            hasFileAttached: true,
+                companyId: this.vnConfig.companyFk,
-            files: null
+                dmsTypeId: res.data.id,
-        };
+                description: this.invoiceIn.supplier.name,
-        this.$.dmsCreateDialog.show();
+                hasFile: true,
+                hasFileAttached: true,
+                files: null
+            };
+            this.$.dmsCreateDialog.show();
+        });
     }
 
     downloadFile(dmsId) {

modules/invoiceIn/front/create/index.js

@@ -6,6 +6,7 @@ class Controller extends Section {
         this.invoiceIn = {};
         if (this.$params && this.$params.supplierFk)
             this.invoiceIn.supplierFk = this.$params.supplierFk;
+        this.invoiceIn.issued = Date.vnNew();
     }
 
     get companyFk() {

modules/invoiceIn/front/create/index.spec.js

@@ -1,52 +0,0 @@
-import './index.js';
-import watcher from 'core/mocks/watcher';
-
-describe('InvoiceIn', () => {
-    describe('Component vnInvoiceInCreate', () => {
-        let controller;
-        let $element;
-
-        beforeEach(ngModule('invoiceIn'));
-
-        beforeEach(inject(($componentController, $rootScope) => {
-            const $scope = $rootScope.$new();
-            $scope.watcher = watcher;
-            $element = angular.element('<vn-invoice-in-create></vn-invoice-in-create>');
-            controller = $componentController('vnInvoiceInCreate', {$element, $scope});
-            controller.$params = {};
-        }));
-
-        afterEach(() => {
-            $element.remove();
-        });
-
-        describe('onInit()', () => {
-            it(`should defined the controller's invoiceIn property`, () => {
-                expect(controller.invoiceIn).toBeUndefined();
-
-                controller.$onInit();
-
-                expect(controller.invoiceIn).toEqual({});
-            });
-
-            it(`should define invoiceIn and it's supplierFk when received via params`, () => {
-                controller.$params.supplierFk = 'supplierId';
-
-                controller.$onInit();
-
-                expect(controller.invoiceIn.supplierFk).toEqual('supplierId');
-            });
-        });
-
-        describe('onSubmit()', () => {
-            it(`should redirect to basic data by calling the $state.go function`, () => {
-                jest.spyOn(controller.$state, 'go');
-
-                controller.onSubmit();
-
-                expect(controller.$state.go).toHaveBeenCalledWith('invoiceIn.card.basicData', {id: 1234});
-            });
-        });
-    });
-});
-

modules/invoiceOut/back/methods/invoiceOut/delete.js

@@ -1,4 +1,3 @@
-
 module.exports = Self => {
     Self.remoteMethod('delete', {
         description: 'Delete a invoiceOut',
@@ -34,19 +33,41 @@ module.exports = Self => {
 
         try {
             const invoiceOut = await Self.findById(id, {}, myOptions);
-            const tickets = await Self.app.models.Ticket.find({
+            const models = Self.app.models;
+            const tickets = await models.Ticket.find({
                 where: {refFk: invoiceOut.ref}
             }, myOptions);
             
+            const [bookEntry] = await models.Xdiario.find({
+                where: {
+                    SERIE: invoiceOut.ref[0],
+                    FACTURA: invoiceOut.ref.slice(1)
+                }
+            }, myOptions);
             const promises = [];
 
             for (let ticket of tickets)
                 promises.push(ticket.updateAttribute('refFk', null, myOptions));
 
             await Promise.all(promises);
-
             await invoiceOut.destroy(myOptions);
 
+            if (bookEntry) {
+                if (bookEntry.enlazadoSage) {
+                    const params = {
+                        bookEntry: bookEntry.ASIEN, 
+                        invoiceOutRef: invoiceOut.ref
+                    }        
+                    await Self.rawSql(`SELECT util.notification_send('book-entry-deleted', ?, NULL)`,
+                        [JSON.stringify(params)],
+                        myOptions);
+                };
+
+                await models.Xdiario.destroyAll({
+                    ASIEN: bookEntry.ASIEN
+                });
+            }
+
             if (tx) await tx.commit();
 
             return tickets;

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

@@ -2,18 +2,24 @@ const models = require('vn-loopback/server/server').models;
 const LoopBackContext = require('loopback-context');
 
 describe('invoiceOut delete()', () => {
-    const invoiceOutId = 2;
+    const invoiceOutId  = 2;
-    const userId = 1106;
+    const userId = 106;
     const activeCtx = {
         accessToken: {userId: userId},
     };
     
+    beforeEach(() => {
+        spyOn(LoopBackContext, 'getCurrentContext').and.returnValue({
+            active: activeCtx
+        });
+    });
+
     it('should check that there is one ticket in the target invoiceOut', async() => {
         const tx = await models.InvoiceOut.beginTransaction({});
         const options = {transaction: tx};
 
         try {
-            const invoiceOut = await models.InvoiceOut.findById(invoiceOutId, {}, options);
+            const invoiceOut = await models.InvoiceOut.findById(invoiceOutId , {}, options);
             const tickets = await models.Ticket.find({where: {refFk: invoiceOut.ref}}, options);
 
             expect(tickets.length).toEqual(1);
@@ -31,12 +37,7 @@ describe('invoiceOut delete()', () => {
         const options = {transaction: tx};
 
         try {
-            spyOn(LoopBackContext, 'getCurrentContext').and.returnValue({
-                active: activeCtx
-            });
-
             await models.InvoiceOut.delete(invoiceOutId, options);
-
             const originalTicket = await models.Ticket.findById(3, {}, options);
 
             const deletedInvoiceOut = await models.InvoiceOut.findById(invoiceOutId, {}, options);
@@ -50,4 +51,107 @@ describe('invoiceOut delete()', () => {
             throw e;
         }
     });
+
+    it('should delete the corresponding bookEntry and not notify', async () => {
+        const tx = await models.InvoiceOut.beginTransaction({});
+        const options = {transaction: tx};
+
+        try {            
+            const filter = {
+                where: {
+                    ASIEN: 2
+                },
+                fields: ['id', 'enlazadoSage']
+            };
+    
+            const [beforeXdiario] = await models.Xdiario.find(filter, options)
+            
+            const [beforeNotification] = await models.NotificationQueue.find({
+                where: {
+                    notificationFk: 'book-entry-deleted',
+                    status: 'pending'
+                }
+            }, options);
+
+            expect(beforeXdiario).toBeDefined();
+            expect(beforeXdiario.enlazadoSage).toBeFalsy;
+            expect(beforeNotification).not.toBeDefined();
+
+            await models.InvoiceOut.delete(4, options);
+    
+            const [afterXdiario] = await models.Xdiario.find({
+                where: {
+                    ASIEN: 2
+                }
+            }, options); 
+
+            const [afterNotification] = await models.NotificationQueue.find({
+                where: {
+                    notificationFk: 'book-entry-deleted',
+                    params: '{"bookEntry":2,"invoiceOutRef":"T4444444"}',
+                    status: 'pending'
+                }
+            }, options);
+            
+            expect(afterXdiario).not.toBeDefined();
+            expect(afterNotification).not.toBeDefined();
+            
+            await tx.rollback();
+        } catch (e) {
+            await tx.rollback();
+            throw e;
+        }
+    });
+
+    it('should delete the corresponding bookEntry and notify', async () => {
+        const tx = await models.InvoiceOut.beginTransaction({});
+        const options = {transaction: tx};
+
+        try {
+            const filter = {
+                where: {
+                    ASIEN: 1
+                },
+                fields: ['id', 'enlazadoSage']
+            };
+    
+            const [beforeXdiario] = await models.Xdiario.find(filter, options)
+            
+            const [beforeNotification] = await models.NotificationQueue.find({
+                where: {
+                    notificationFk: 'book-entry-deleted',
+                    status: 'pending'
+                }
+            }, options);
+
+            expect(beforeXdiario).toBeDefined();
+            expect(beforeXdiario.enlazadoSage).toBeTruthy();
+            expect(beforeNotification).not.toBeDefined();
+
+            await models.InvoiceOut.delete(3, options);
+            
+            const [afterXdiario] = await models.Xdiario.find({
+                where: {
+                    ASIEN: 1
+                }
+            }, options); 
+
+            const [afterNotification] = await models.NotificationQueue.find({
+                where: {
+                    notificationFk: 'book-entry-deleted',
+                    params: '{"bookEntry":1,"invoiceOutRef":"T3333333"}',
+                    status: 'pending'
+                }
+            }, options);
+
+            expect(afterXdiario).not.toBeDefined();
+            expect(afterNotification).toBeDefined();
+            
+            await tx.rollback();
+        } catch (e) {
+            await tx.rollback();
+            throw e;
+        }
+    });
+
 });

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

@@ -180,7 +180,7 @@ module.exports = Self => {
                     LEFT JOIN itemType it ON it.id = i.typeFk
                     LEFT JOIN itemCategory ic ON ic.id = it.categoryFk
                     LEFT JOIN worker w ON w.id = it.workerFk
-                    LEFT JOIN account.user u ON u.id = w.userFk
+                    LEFT JOIN account.user u ON u.id = w.id
                     LEFT JOIN intrastat intr ON intr.id = i.intrastatFk
                     LEFT JOIN producer pr ON pr.id = i.producerFk
                     LEFT JOIN origin ori ON ori.id = i.originFk

modules/item/back/methods/item/getCard.js

@@ -34,7 +34,7 @@ module.exports = Self => {
                         include: [{
                             relation: 'worker',
                             scope: {
-                                fields: ['userFk'],
+                                fields: ['id'],
                                 include: {
                                     relation: 'user',
                                     scope: {

modules/item/back/methods/item/getSummary.js

@@ -38,7 +38,7 @@ module.exports = Self => {
                         include: [{
                             relation: 'worker',
                             scope: {
-                                fields: ['userFk'],
+                                fields: ['id'],
                                 include: {
                                     relation: 'user',
                                     scope: {

modules/item/back/methods/item/setVisibleDiscard.js

@@ -0,0 +1,37 @@
+module.exports = Self => {
+    Self.remoteMethodCtx('setVisibleDiscard', {
+        description: 'Change visible for item',
+        accessType: 'WRITE',
+        accepts: [{
+            arg: 'itemFk',
+            type: 'Number',
+            required: false,
+            description: 'The item id'
+        }, {
+            arg: 'warehouseFk',
+            type: 'Number',
+            required: true,
+            description: 'The warehouse of item'
+        }, {
+            arg: 'quantity',
+            type: 'Number',
+            required: true,
+            description: 'The quantity to modify'
+        },
+        {
+            arg: 'addressFk',
+            type: 'Number',
+            required: true,
+            description: 'The address id'
+        }],
+        http: {
+            path: `/setVisibleDiscard`,
+            verb: 'POST'
+        }
+    });
+
+    Self.setVisibleDiscard = async(ctx, itemFk, warehouseFk, quantity, addressFk) => {
+        const query = `CALL vn.item_setVisibleDiscard(?, ?, ?, ?)`;
+        await Self.rawSql(query, [itemFk, warehouseFk, quantity, addressFk]);
+    };
+};

modules/item/back/models/item.js

@@ -16,6 +16,7 @@ module.exports = Self => {
     require('../methods/item/createIntrastat')(Self);
     require('../methods/item/buyerWasteEmail')(Self);
     require('../methods/item/labelPdf')(Self);
+    require('../methods/item/setVisibleDiscard')(Self);
 
     Self.validatesPresenceOf('originFk', {message: 'Cannot be blank'});
 

modules/item/front/descriptor/index.html

@@ -58,7 +58,7 @@
             <vn-label-value
                 label="Buyer">
                 <span
-                    ng-click="workerDescriptor.show($event, $ctrl.item.itemType.worker.userFk)"
+                    ng-click="workerDescriptor.show($event, $ctrl.item.itemType.worker.id)"
                     class="link">
                     {{$ctrl.item.itemType.worker.user.name}}
                 </span>

modules/item/front/summary/index.html

@@ -70,7 +70,7 @@
             </vn-label-value>
             <vn-label-value label="Buyer">
                 <span
-                    ng-click="workerDescriptor.show($event, $ctrl.summary.item.itemType.worker.userFk)"
+                    ng-click="workerDescriptor.show($event, $ctrl.summary.item.itemType.worker.id)"
                     class="link">
                     {{$ctrl.summary.item.itemType.worker.user.name}}
                 </span>

modules/monitor/back/methods/sales-monitor/salesFilter.js

@@ -215,7 +215,7 @@ module.exports = Self => {
                         LEFT JOIN state st ON st.id = ts.stateFk
                         LEFT JOIN client c ON c.id = t.clientFk
                         LEFT JOIN worker wk ON wk.id = c.salesPersonFk
-                        LEFT JOIN account.user u ON u.id = wk.userFk
+                        LEFT JOIN account.user u ON u.id = wk.id
                         LEFT JOIN zoneEstimatedDelivery zed ON zed.zoneFk = t.zoneFk`);
 
         if (args.orderFk) {

modules/monitor/back/methods/sales-monitor/specs/salesFilter.spec.js

@@ -39,7 +39,7 @@ describe('SalesMonitor salesFilter()', () => {
             const filter = {};
             const result = await models.SalesMonitor.salesFilter(ctx, filter, options);
 
-            expect(result.length).toBeGreaterThan(15);
+            expect(result.length).toBeGreaterThan(11);
 
             await tx.rollback();
         } catch (e) {
@@ -151,7 +151,7 @@ describe('SalesMonitor salesFilter()', () => {
             const result = await models.SalesMonitor.salesFilter(ctx, filter, options);
             const firstRow = result[0];
 
-            expect(result.length).toEqual(12);
+            expect(result.length).toEqual(15);
             expect(firstRow.alertLevel).not.toEqual(0);
 
             await tx.rollback();

modules/order/back/methods/order/filter.js

@@ -169,7 +169,7 @@ module.exports = Self => {
                 LEFT JOIN agencyMode am ON am.id = o.agency_id
                 LEFT JOIN client c ON c.id = o.customer_id
                 LEFT JOIN worker wk ON wk.id = c.salesPersonFk
-                LEFT JOIN account.user u ON u.id = wk.userFk
+                LEFT JOIN account.user u ON u.id = wk.id
                 LEFT JOIN company co ON co.id = o.company_id
                 LEFT JOIN orderTicket ot ON ot.orderFk = o.id
                 LEFT JOIN ticket t ON t.id = ot.ticketFk

modules/route/back/methods/route/downloadCmrsZip.js

@@ -0,0 +1,71 @@
+const JSZip = require('jszip');
+const axios = require('axios');
+const UserError = require('vn-loopback/util/user-error');
+
+module.exports = Self => {
+    Self.remoteMethodCtx('downloadCmrsZip', {
+        description: 'Download a zip file with multiple cmrs pdfs',
+        accessType: 'READ',
+        accepts: [
+            {
+                arg: 'ids',
+                type: 'string',
+                description: 'The cmrs ids',
+            }
+        ],
+        returns: [
+            {
+                arg: 'body',
+                type: 'file',
+                root: true
+            }, {
+                arg: 'Content-Type',
+                type: 'string',
+                http: {target: 'header'}
+            }, {
+                arg: 'Content-Disposition',
+                type: 'string',
+                http: {target: 'header'}
+            }
+        ],
+        http: {
+            path: '/downloadCmrsZip',
+            verb: 'GET'
+        }
+    });
+
+    Self.downloadCmrsZip = async function(ctx, ids, options) {
+        const models = Self.app.models;
+        const myOptions = {};
+        const token = ctx.req.accessToken;
+        const zip = new JSZip();
+
+        if (typeof options == 'object')
+            Object.assign(myOptions, options);
+
+        const zipConfig = await models.ZipConfig.findOne(null, myOptions);
+        let totalSize = 0;
+        ids = ids.split(',');
+        try {
+            for (let id of ids) {
+                if (zipConfig && totalSize > zipConfig.maxSize) throw new UserError('Files are too large');
+                const response = await axios.get(
+                    `${ctx.req.headers.referer}api/Routes/${id}/cmr?access_token=${token.id}`, {
+                    ...myOptions,
+                    responseType: 'arraybuffer',
+                });
+    
+                if (response.headers['content-type'] !== 'application/pdf')
+                    throw new UserError(`The response is not a PDF`);
+    
+                zip.file(`${id}.pdf`, response.data, { binary: true });
+            }
+    
+            const zipStream = zip.generateNodeStream({ streamFiles: true });
+    
+            return [zipStream, 'application/zip', `filename="cmrs.zip"`];
+        } catch (e) {
+            throw e;
+        }
+    };
+};