CHANGELOG.md

@@ -102,6 +102,7 @@
 - feat: refs #7438 Added volume to item_valuateInventory  by:guillermo
 - feat: refs #7438 Requested changes and little changes  by:guillermo
 - refs #6281 feat:buyFk in itemShelving  by:sergiodt
+- feat: refs #6449 item ID is displayed in the sale line  by:jorgep
 
 ### Changed 📦
 

back/methods/collection/spec/getSales.spec.js

@@ -4,15 +4,7 @@ describe('collection getSales()', () => {
     const collectionOrTicketFk = 999999;
     const print = true;
     const source = 'CHECKER';
-
+    const ctx = beforeAll.getCtx();
-    beforeAll(() => {
-        ctx = {
-            req: {
-                accessToken: {userId: 9},
-                headers: {origin: 'http://localhost'},
-            }
-        };
-    });
 
     it('should return a collection with tickets, placements and barcodes settled correctly', async() => {
         const tx = await models.Collection.beginTransaction({});

back/methods/collection/spec/getTickets.spec.js

@@ -1,15 +1,7 @@
 const models = require('vn-loopback/server/server').models;
 
 describe('collection getTickets()', () => {
-    let ctx;
+    const ctx = beforeAll.getCtx();
-    beforeAll(async() => {
-        ctx = {
-            req: {
-                accessToken: {userId: 9},
-                headers: {origin: 'http://localhost'}
-            }
-        };
-    });
 
     it('should get tickets, sales and barcodes from collection', async() => {
         const tx = await models.Collection.beginTransaction({});

back/methods/collection/spec/setSaleQuantity.spec.js

@@ -1,20 +1,7 @@
 const models = require('vn-loopback/server/server').models;
-const LoopBackContext = require('loopback-context');
 
 describe('setSaleQuantity()', () => {
-    beforeAll(async() => {
+    beforeAll.mockLoopBackContext();
-        const activeCtx = {
-            accessToken: {userId: 9},
-            http: {
-                req: {
-                    headers: {origin: 'http://localhost'}
-                }
-            }
-        };
-        spyOn(LoopBackContext, 'getCurrentContext').and.returnValue({
-            active: activeCtx
-        });
-    });
 
     it('should change quantity sale', async() => {
         const tx = await models.Ticket.beginTransaction({});

back/methods/starred-module/specs/getStarredModules.spec.js

@@ -1,22 +1,7 @@
 const {models} = require('vn-loopback/server/server');
-const LoopBackContext = require('loopback-context');
 
 describe('getStarredModules()', () => {
-    const activeCtx = {
+    const ctx = beforeAll.getCtx();
-        accessToken: {userId: 9},
-        http: {
-            req: {
-                headers: {origin: 'http://localhost'}
-            }
-        }
-    };
-    const ctx = {req: activeCtx};
-
-    beforeEach(() => {
-        spyOn(LoopBackContext, 'getCurrentContext').and.returnValue({
-            active: activeCtx
-        });
-    });
 
     it(`should return the starred modules for a given user`, async() => {
         const newStarred = await models.StarredModule.create({workerFk: 9, moduleFk: 'customer', position: 1});

back/methods/starred-module/specs/setPosition.spec.js

@@ -1,24 +1,8 @@
 const {models} = require('vn-loopback/server/server');
-const LoopBackContext = require('loopback-context');
 
 describe('setPosition()', () => {
-    const activeCtx = {
+    const ctx = beforeAll.getCtx();
-        accessToken: {userId: 9},
+    beforeAll.mockLoopBackContext();
-        http: {
-            req: {
-                headers: {origin: 'http://localhost'}
-            }
-        }
-    };
-    const ctx = {
-        req: activeCtx
-    };
-
-    beforeEach(() => {
-        spyOn(LoopBackContext, 'getCurrentContext').and.returnValue({
-            active: activeCtx
-        });
-    });
 
     it('should increase the orders module position by replacing it with clients and vice versa', async() => {
         const tx = await models.StarredModule.beginTransaction({});

back/methods/starred-module/specs/toggleStarredModule.spec.js

@@ -1,24 +1,7 @@
 const {models} = require('vn-loopback/server/server');
-const LoopBackContext = require('loopback-context');
 
 describe('toggleStarredModule()', () => {
-    const activeCtx = {
+    const ctx = beforeAll.getCtx();
-        accessToken: {userId: 9},
-        http: {
-            req: {
-                headers: {origin: 'http://localhost'}
-            }
-        }
-    };
-    const ctx = {
-        req: activeCtx
-    };
-
-    beforeEach(() => {
-        spyOn(LoopBackContext, 'getCurrentContext').and.returnValue({
-            active: activeCtx
-        });
-    });
 
     it('should create a new starred module and then remove it by calling the method again with same args', async() => {
         const starredModule = await models.StarredModule.toggleStarredModule(ctx, 'order');
@@ -26,7 +9,7 @@ describe('toggleStarredModule()', () => {
 
         expect(starredModules.length).toEqual(1);
         expect(starredModule.moduleFk).toEqual('order');
-        expect(starredModule.workerFk).toEqual(activeCtx.accessToken.userId);
+        expect(starredModule.workerFk).toEqual(ctx.req.accessToken.userId);
         expect(starredModule.position).toEqual(starredModules.length);
 
         await models.StarredModule.toggleStarredModule(ctx, 'order');

back/methods/user-config/specs/getUserConfig.spec.js

@@ -1,12 +1,12 @@
 const models = require('vn-loopback/server/server').models;
 
 describe('userConfig getUserConfig()', () => {
+    const ctx = beforeAll.getCtx();
     it(`should return the configuration data of a given user`, async() => {
         const tx = await models.Item.beginTransaction({});
         const options = {transaction: tx};
 
         try {
-            const ctx = {req: {accessToken: {userId: 9}}};
             const result = await models.UserConfig.getUserConfig(ctx, options);
 
             expect(result.warehouseFk).toEqual(1);

back/models/specs/mailAliasAccount.spec.js

@@ -1,12 +1,13 @@
 const models = require('vn-loopback/server/server').models;
 
 describe('loopback model MailAliasAccount', () => {
+    const ctx = beforeAll.getCtx();
     it('should add a mail Alias', async() => {
         const tx = await models.MailAliasAccount.beginTransaction({});
         let error;
 
         try {
-            const options = {transaction: tx, accessToken: {userId: 9}};
+            const options = {transaction: tx, ctx};
             await models.MailAliasAccount.create({mailAlias: 2, account: 5}, options);
 
             await tx.rollback();
@@ -23,7 +24,7 @@ describe('loopback model MailAliasAccount', () => {
         let error;
 
         try {
-            const options = {transaction: tx, accessToken: {userId: 9}};
+            const options = {transaction: tx, ctx};
             await models.MailAliasAccount.create({mailAlias: 3, account: 5}, options);
 
             await tx.rollback();

back/tests-helper.js

@@ -10,7 +10,6 @@ async function init() {
         host: process.env.DB_HOST,
         port: process.env.DB_PORT
     });
-
     const bootOptions = {dataSources};
     await new Promise((resolve, reject) => {
         app.boot(bootOptions,
@@ -33,3 +32,4 @@ module.exports = {
 
 if (require.main === module)
     init();
+

back/tests.js

@@ -84,7 +84,7 @@ async function test() {
             'loopback/**/*[sS]pec.js',
             'modules/*/back/**/*.[sS]pec.js'
         ],
-        helpers: []
+        helpers: [`back/vn-jasmine.js`],
     };
 
     if (PARALLEL) {
@@ -114,7 +114,6 @@ async function test() {
     if (opts.ci)
         runner.jasmine.DEFAULT_TIMEOUT_INTERVAL = SPEC_TIMEOUT;
 
-    // runner.loadConfigFile('back/jasmine.json');
     runner.loadConfig(config);
     process.env.SPEC_IS_RUNNING = true;
     await runner.execute();

back/vn-jasmine.js

@@ -0,0 +1,48 @@
+
+const LoopBackContext = require('loopback-context');
+const getAccessToken = (userId = 9) => {
+    return {accessToken: {userId}};
+};
+const DEFAULT_HEADERS = {headers: {origin: 'http://localhost'}};
+const default_before_all = userId => {
+    return {
+        req: {
+            ...getAccessToken(userId),
+            ...DEFAULT_HEADERS,
+            ...{__: value => value}
+
+        },
+        args: {}
+    };
+};
+const default_loopback_ctx = userId => {
+    return {
+        ...getAccessToken(userId),
+        ...default_before_all(userId),
+        http: {
+            ...default_before_all(userId)
+        },
+        args: {}
+    };
+};
+
+function vnBeforeAll() {
+    Object.assign(beforeAll, {getCtx: default_before_all, mockLoopBackContext});
+}
+
+const mockLoopBackContext = userId => {
+    const activeCtx = default_loopback_ctx(userId);
+    beforeAll(() => {
+        spyOn(LoopBackContext, 'getCurrentContext').and.returnValue({
+            active: activeCtx
+        });
+    });
+    return activeCtx;
+};
+module.exports = {
+    mockLoopBackContext
+};
+
+(function init() {
+    vnBeforeAll();
+})();

db/dump/fixtures.after.sql

@@ -314,5 +314,4 @@ INSERT INTO mysql.roles_mapping (`User`, `Host`, `Role`, `Admin_option`)
     SELECT SUBSTR(`User`, @prefixLen + 1), `Host`, `Role`, `Admin_option`
         FROM mysql.roles_mapping
         WHERE `User` LIKE @prefixedLike AND `Host` = @genRoleHost;
-
 FLUSH PRIVILEGES;

db/dump/fixtures.before.sql

@@ -115,10 +115,13 @@ INSERT INTO `hedera`.`tpvConfig`(`id`, `currency`, `terminal`, `transactionType`
     VALUES
         (1,	978, 1, 0, 2000, 9, 0);
 
+INSERT INTO hedera.orderConfig (`id`, `employeeFk`, `defaultAgencyFk`, `guestMethod`, `guestAgencyFk`, `reserveTime`, `defaultCompanyFk`)
+	VALUES (1, 1, 2, 'PICKUP', 1, '00:20:00', 442);
+
 INSERT INTO `account`.`user`(`id`,`name`,`nickname`, `password`,`role`,`active`,`email`,`lang`, `image`)
     VALUES
         (1101, 'brucewayne',         'Bruce Wayne',          '$2b$10$UzQHth.9UUQ1T5aiQJ21lOU0oVlbxoqH4PFM9V8T90KNSAcg0eEL2', 2, 1, 'BruceWayne@mydomain.com',         'es','1101'),
-        (1102, 'petterparker',       'Petter Parker',        '$2b$10$UzQHth.9UUQ1T5aiQJ21lOU0oVlbxoqH4PFM9V8T90KNSAcg0eEL2', 2, 1, 'PetterParker@mydomain.com',       'en','1102'),
+        (1102, 'petterparker',       'Petter Parker',        '$2b$10$UzQHth.9UUQ1T5aiQJ21lOU0oVlbxoqH4PFM9V8T90KNSAcg0eEL2', 131, 1, 'PetterParker@mydomain.com',       'en','1102'),
         (1103, 'clarkkent',          'Clark Kent',           '$2b$10$UzQHth.9UUQ1T5aiQJ21lOU0oVlbxoqH4PFM9V8T90KNSAcg0eEL2', 2, 1, 'ClarkKent@mydomain.com',          'fr','1103'),
         (1104, 'tonystark',          'Tony Stark',           '$2b$10$UzQHth.9UUQ1T5aiQJ21lOU0oVlbxoqH4PFM9V8T90KNSAcg0eEL2', 2, 1, 'TonyStark@mydomain.com',          'es','1104'),
         (1105, 'maxeisenhardt',      'Max Eisenhardt',       '$2b$10$UzQHth.9UUQ1T5aiQJ21lOU0oVlbxoqH4PFM9V8T90KNSAcg0eEL2', 2, 1, 'MaxEisenhardt@mydomain.com',      'pt','1105'),
@@ -301,6 +304,17 @@ UPDATE `vn`.`agencyMode` SET `deliveryMethodFk` = 1 WHERE `id` = 8;
 UPDATE `vn`.`agencyMode` SET `deliveryMethodFk` = 4 WHERE `id` = 23;
 UPDATE `vn`.`agencyMode` SET `deliveryMethodFk` = 1 WHERE `id` = 10;
 
+UPDATE `vn`.`agencyMode` SET `description` = 'inhouse pickup' WHERE `id` = 1;
+UPDATE `vn`.`agencyMode` SET `description` = 'Super-Man delivery' WHERE `id` = 2;
+UPDATE `vn`.`agencyMode` SET `description` = 'Teleportation device' WHERE `id` = 3;
+UPDATE `vn`.`agencyMode` SET `description` = 'Entanglement' WHERE `id` = 4;
+UPDATE `vn`.`agencyMode` SET `description` = 'Quantum break device' WHERE `id` = 5;
+UPDATE `vn`.`agencyMode` SET `description` = 'Walking' WHERE `id` = 6;
+UPDATE `vn`.`agencyMode` SET `description` = 'Gotham247' WHERE `id` = 7;
+UPDATE `vn`.`agencyMode` SET `description` = 'Gotham247Expensive' WHERE `id` = 8;
+UPDATE `vn`.`agencyMode` SET `description` = 'Other agency' WHERE `id` = 10;
+UPDATE `vn`.`agencyMode` SET `description` = 'Refund' WHERE `id` = 23;
+
 UPDATE `vn`.`agencyMode` SET `web` = 1, `reportMail` = 'no-reply@gothamcity.com';
 
 UPDATE `vn`.`agencyMode` SET `code` = 'refund' WHERE  `id` = 23;
@@ -528,7 +542,8 @@ INSERT INTO `vn`.`observationType`(`id`,`description`, `code`)
         (5, 'Administrative',   'administrative'),
         (6, 'Weight',           'weight'),
         (7, 'InvoiceOut',       'invoiceOut'),
-        (8, 'DropOff',           'dropOff');
+        (8, 'DropOff',          'dropOff'),
+		(9, 'Sustitución',		'substitution');
 
 INSERT INTO `vn`.`addressObservation`(`id`,`addressFk`,`observationTypeFk`,`description`)
     VALUES
@@ -978,6 +993,14 @@ INSERT INTO `vn`.`priceFixed`(`id`, `itemFk`, `rate0`, `rate1`, `rate2`, `rate3`
         (2, 3, 10,  10, 10,     10, util.VN_CURDATE(), DATE_ADD(util.VN_CURDATE(), INTERVAL +1 MONTH), 0, 1, util.VN_CURDATE()),
         (3, 13, 8.5, 10, 7.5,    6,  util.VN_CURDATE(), DATE_ADD(util.VN_CURDATE(), INTERVAL +1 MONTH), 1, 2, util.VN_CURDATE());
 
+INSERT INTO `vn`.`itemMinimumQuantity`(`itemFk`, `quantity`, `started`, `ended`, `warehouseFk`)
+    VALUES
+        (1, 5,  util.VN_CURDATE() - INTERVAL 2 MONTH, util.VN_CURDATE() + INTERVAL 1 MONTH, 1),
+        (2, 10, util.VN_CURDATE() - INTERVAL 2 DAY,  util.VN_CURDATE() - INTERVAL 1 DAY,    2),
+        (3, 15, util.VN_CURDATE() + INTERVAL 3 DAY, util.VN_CURDATE() + INTERVAL 2 WEEK,    3),
+        (2, 10, util.VN_CURDATE() + INTERVAL 2 MONTH, NULL,                                 5),
+        (4, 8, util.VN_CURDATE() - INTERVAL 3 MONTH, NULL,                                  NULL);
+
 INSERT INTO `vn`.`expeditionBoxVol`(`boxFk`, `m3`, `ratio`)
     VALUES
         (71,0.141,1);
@@ -1477,7 +1500,8 @@ INSERT INTO `vn`.`travel`(`id`,`shipped`, `landed`, `warehouseInFk`, `warehouseO
         (5, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 3, 3, 1, 50.00,  500,   'fifth travel',     1, 1, 5),
         (6, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 4, 4, 1, 50.00,  500,   'sixth travel',     1, 2, 6),
         (7, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 5, 4, 1, 50.00,  500,   'seventh travel',   2, 1, 7),
-        (8, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 5, 1, 1, 50.00,  500,   'eight travel',     1, 2, 10);
+        (8, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 5, 1, 1, 50.00,  500,   'eight travel',     1, 2, 10),
+        (10, DATE_ADD(util.VN_CURDATE(), INTERVAL + 5 DAY), DATE_ADD(util.VN_CURDATE(), INTERVAL + 5 DAY), 5, 1, 1, 50.00,  500,   'nineth travel',     1, 2, 10);
 
 INSERT INTO `vn`.`entry`(`id`, `supplierFk`, `created`, `travelFk`, `isConfirmed`, `companyFk`, `invoiceNumber`, `reference`, `isExcludedFromAvailable`, `isRaid`, `evaNotes`)
     VALUES
@@ -1488,7 +1512,9 @@ INSERT INTO `vn`.`entry`(`id`, `supplierFk`, `created`, `travelFk`, `isConfirmed
         (5, 2, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 5, 0, 442, 'IN2005', 'Movement 5', 0, 0,   'observation five'),
         (6, 2, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 6, 0, 442, 'IN2006', 'Movement 6', 0, 0,    'observation six'),
         (7, 2, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 7, 0, 442, 'IN2007', 'Movement 7', 0, 0,  'observation seven'),
-        (8, 2, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 7, 0, 442, 'IN2008', 'Movement 8', 1, 1,  '');
+        (8, 2, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 7, 0, 442, 'IN2008', 'Movement 8', 1, 1,  ''),
+        (9, 2, DATE_ADD(util.VN_CURDATE(), INTERVAL +2 DAY), 10, 0, 442, 'IN2009', 'Movement 9', 1, 1,  ''),
+        (10, 2, DATE_ADD(util.VN_CURDATE(), INTERVAL +2 DAY), 10, 0, 442, 'IN2009', 'Movement 9', 1, 1,  '');
 
 INSERT INTO `bs`.`waste`(`buyer`, `year`, `week`, `family`, `itemFk`, `itemTypeFk`, `saleTotal`, `saleWaste`, `rate`)
     VALUES
@@ -3232,7 +3258,6 @@ INSERT IGNORE INTO vn.itemType
 		workerFk = 103,
 		isInventory = TRUE,
 		life = 10,
-		density = 250,
 		itemPackingTypeFk = NULL,
 		temperatureFk = 'warm';
 

db/routines/account/triggers/mailAliasAccount_afterDelete.sql

@@ -0,0 +1,12 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `account`.`mailAliasAccount_afterDelete`
+    AFTER DELETE ON `mailAliasAccount`
+    FOR EACH ROW
+BEGIN
+    INSERT INTO userLog
+        SET `action` = 'delete',
+            `changedModel` = 'MailAliasAccount',
+            `changedModelId` = OLD.id,
+            `userFk` = account.myUser_getId();
+END$$
+DELIMITER ;

db/routines/account/triggers/mailAliasAccount_beforeInsert.sql

@@ -0,0 +1,8 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `account`.`mailAliasAccount_beforeInsert`
+    BEFORE INSERT ON `mailAliasAccount`
+    FOR EACH ROW
+BEGIN
+    SET NEW.editorFk = account.myUser_getId();
+END$$
+DELIMITER ;

db/routines/account/triggers/mailAliasAccount_beforeUpdate.sql

@@ -0,0 +1,8 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `account`.`mailAliasAccount_beforeUpdate`
+    BEFORE UPDATE ON `mailAliasAccount`
+    FOR EACH ROW
+BEGIN
+    SET NEW.editorFk = account.myUser_getId();
+END$$
+DELIMITER ;

db/routines/bi/procedures/rutasAnalyze.sql

@@ -59,7 +59,7 @@ BEGIN
 						JOIN vn.saleComponent sc ON sc.saleFk = s.id
 						JOIN vn.component c ON c.id = sc.componentFk
 						JOIN vn.componentType ct ON ct.id = c.typeFk
-					WHERE ct.code = 'FREIGHT'
+					WHERE ct.code = 'freight'
 						AND r.created BETWEEN vDatedFrom AND vDatedTo
 					GROUP BY r.id
 			 ) sub ON sub.routeFk = r.Id_Ruta

db/routines/bi/views/tarifa_componentes_series.sql

@@ -2,7 +2,7 @@ CREATE OR REPLACE DEFINER=`root`@`localhost`
 	SQL SECURITY DEFINER
 	VIEW `bi`.`tarifa_componentes_series`
 AS SELECT `ct`.`id` AS `tarifa_componentes_series_id`,
-	`ct`.`type` AS `Serie`,
+	`ct`.`name` AS `Serie`,
 	`ct`.`isBase` AS `base`,
 	`ct`.`isMargin` AS `margen`
 FROM `vn`.`componentType` `ct`

db/routines/cache/procedures/availableNoRaids_refresh.sql

@@ -117,7 +117,7 @@ proc: BEGIN
 			)sub
 			GROUP BY sub.itemFk;
 
-	DROP TEMPORARY TABLE tmp.itemCalc, tItemRange;
+	DROP TEMPORARY TABLE tmp.itemCalc, tItemRange, tmp.itemList;
 	CALL cache_calc_end (vCalc);
 END$$
 DELIMITER ;

db/routines/cache/procedures/available_refresh.sql

@@ -121,7 +121,7 @@ proc: BEGIN
 			)sub
 		GROUP BY sub.itemFk;
 
-	DROP TEMPORARY TABLE tmp.itemCalc, itemRange;
+	DROP TEMPORARY TABLE tmp.itemCalc, itemRange, tmp.itemList;
 	CALL cache_calc_end (vCalc);
 END$$
 DELIMITER ;

db/routines/cache/procedures/visible_refresh.sql

@@ -1,13 +1,13 @@
 DELIMITER $$
 CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `cache`.`visible_refresh`(OUT v_calc INT, v_refresh BOOL, v_warehouse INT)
-proc: BEGIN
+proc:BEGIN
 	DECLARE EXIT HANDLER FOR SQLEXCEPTION
 	BEGIN
 		CALL cache_calc_unlock (v_calc);
 		RESIGNAL;
 	END;
 
-    CALL cache_calc_start (v_calc, v_refresh, 'visible', v_warehouse);
+	CALL cache_calc_start (v_calc, v_refresh, 'visible', v_warehouse);
 
 	IF !v_refresh THEN
 		LEAVE proc;
@@ -15,22 +15,23 @@ proc: BEGIN
 
 	-- Calculamos el stock hasta ayer
 
-    CALL `cache`.stock_refresh(false);
+	CALL cache.stock_refresh(false);
 
 	CREATE OR REPLACE TEMPORARY TABLE tmp.itemVisible
 		(PRIMARY KEY (item_id))
 		ENGINE = MEMORY
-		SELECT item_id, amount stock, amount visible FROM `cache`.stock
+		SELECT item_id, amount stock, amount visible
+			FROM cache.stock
 			WHERE warehouse_id = v_warehouse;
 
 	-- Calculamos los movimientos confirmados de hoy
-	CALL vn.item_GetVisible(v_warehouse, NULL);
+	CALL vn.item_calcVisible(NULL, v_warehouse);
 	DELETE FROM visible WHERE calc_id = v_calc;
 
 	INSERT INTO visible (calc_id, item_id,visible)
 		SELECT v_calc, item_id, visible FROM tmp.itemVisible;
 
-    CALL cache_calc_end (v_calc);
+	CALL cache_calc_end (v_calc);
 
 	DROP TEMPORARY TABLE tmp.itemVisible;
 END$$

db/routines/edi/procedures/ekt_refresh.sql

@@ -7,7 +7,6 @@ BEGIN
  */
 	DECLARE vRewriteKop INT DEFAULT NULL;
 	DECLARE vTruncatePutOrder INT DEFAULT NULL;
-	DECLARE vBarcode CHAR(15) DEFAULT NULL;
 	DECLARE vKop INT;
 	DECLARE vPutOrderFk BIGINT;
 
@@ -16,17 +15,6 @@ BEGIN
 		FROM ekt
 		WHERE id = vSelf;
 
-	-- Generates the barcode
-
-	SELECT CONCAT(
-				LPAD(IFNULL(auction,0), 3, 0),
-				LPAD(IFNULL(klo, 99), 2, 0),
-				LPAD(DAYOFYEAR(fec), 3, 0),
-				COALESCE(agj, RIGHT(batchNumber,7), id))
-			INTO vBarcode
-		FROM ekt
-		WHERE id = vSelf;
-
 	-- Rewrites the kop parameter
 
 	IF vKop IS NULL THEN
@@ -46,10 +34,9 @@ BEGIN
 
 	-- Refresh EKT
 
-	UPDATE ekt SET
+	UPDATE ekt
-		 barcode = vBarcode
+		SET kop = vKop,
-		,kop = vKop
+			putOrderFk = vTruncatePutOrder
-		,putOrderFk = vTruncatePutOrder
 	WHERE id = vSelf;
 END$$
 DELIMITER ;

db/routines/edi/views/ektRecent.sql

@@ -2,7 +2,6 @@ CREATE OR REPLACE DEFINER=`root`@`localhost`
 	SQL SECURITY DEFINER
 	VIEW `edi`.`ektRecent`
 AS SELECT `e`.`id` AS `id`,
-	`e`.`barcode` AS `barcode`,
 	`e`.`entryYear` AS `entryYear`,
 	`e`.`batchNumber` AS `batchNumber`,
 	`e`.`deliveryNumber` AS `deliveryNumber`,

db/routines/hedera/procedures/item_calcCatalog.sql

@@ -25,11 +25,7 @@ BEGIN
 			JOIN vn.warehouse w ON w.id = p.warehouseFk
 		ORDER BY warehouseFk, `grouping`;
 
-	DROP TEMPORARY TABLE
+	CALL vn.ticketCalculatePurge();
-		tmp.ticketCalculateItem,
+	DROP TEMPORARY TABLE tmp.item;
-		tmp.ticketComponentPrice,
-		tmp.ticketComponent,
-		tmp.ticketLot,
-		tmp.zoneGetShipped;
 END$$
 DELIMITER ;

db/routines/hedera/procedures/order_addItem.sql

@@ -56,11 +56,23 @@ BEGIN
 		CALL util.throw ('ORDER_ROW_UNAVAILABLE');
 	END IF;
 
-	SELECT IFNULL(minQuantity, 0) INTO vMinQuantity
+	WITH itemMinQuantityPriority AS (
-		FROM vn.item 
+		SELECT quantity,
-		WHERE id = vItem;
+				ROW_NUMBER() OVER (
+					PARTITION BY itemFk
+					ORDER BY warehouseFk IS NULL
+				) priority
+		FROM vn.itemMinimumQuantity
+		WHERE itemFk = vItem
+			AND `started` <= vShipment
+			AND (`ended` >= vShipment OR `ended` IS NULL)
+			AND (warehouseFk = vWarehouse OR warehouseFk IS NULL)
+	)
+	SELECT quantity INTO vMinQuantity
+		FROM itemMinQuantityPriority
+		WHERE priority = 1;
 
-	IF vAmount < LEAST(vMinQuantity, vAvailable)  THEN
+	IF vAmount < LEAST(IFNULL(vMinQuantity, 0), vAvailable)  THEN
 		CALL util.throw ('quantityLessThanMin');
 	END IF;
 

db/routines/vn/events/claim_changeState.sql

@@ -0,0 +1,22 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` EVENT `vn`.`claim_changeState`
+	ON SCHEDULE EVERY 1 DAY
+		STARTS '2024-06-06 07:52:46.000'
+	ON COMPLETION PRESERVE
+	ENABLE
+DO BEGIN
+
+	DECLARE vClaimState INT;
+
+	SELECT id INTO vClaimState
+		FROM claimState cs
+		WHERE cs.code = 'canceled';
+	
+	UPDATE claim c
+			JOIN claimState cs ON cs.id = c.claimStateFk
+		SET c.claimStateFk = vClaimState
+		WHERE c.created < util.VN_CURDATE() - INTERVAL 2 MONTH
+			AND cs.code IN('incomplete','coming','waiting','out');
+
+END$$
+DELIMITER ;

db/routines/vn/functions/ticket_isProblemCalcNeeded.sql

@@ -0,0 +1,27 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` FUNCTION `vn`.`ticket_isProblemCalcNeeded`(
+	vSelf INT
+)
+	RETURNS BOOL
+	DETERMINISTIC
+BEGIN
+/**
+ * Check if the ticket requires to update column vn.ticket.problem
+ * 
+ * @param vSelf Id ticket
+ * @return BOOL
+ */
+	DECLARE vIsProblemCalcNeeded BOOL;
+
+	SELECT COUNT(*) INTO vIsProblemCalcNeeded
+		FROM ticket t
+			JOIN client c ON c.id = t.clientFk
+			JOIN agencyMode am ON am.id = t.agencyModeFk
+			JOIN deliveryMethod dm ON dm.id = am.deliveryMethodFk
+		WHERE t.id = vSelf
+			AND dm.code IN ('AGENCY','DELIVERY','PICKUP')
+			AND c.typeFk = 'normal';
+
+	RETURN vIsProblemCalcNeeded;
+END$$
+DELIMITER ;

db/routines/vn/procedures/XDiario_check.sql

@@ -6,19 +6,6 @@ BEGIN
  * identificando y notificando los asientos descuadrados
  * y ajustando los saldos en caso necesario.
  */
-	INSERT INTO mail (receiver, subject, body)
-		SELECT 'cau@verdnatura.es', 
-				'Asientos descuadrados',
-				GROUP_CONCAT(CONCAT(' Asiento: ', ASIEN, ' - Importe:', recon) SEPARATOR ' | \n') 
-			FROM (
-				SELECT ASIEN,
-						SUM(IFNULL(ROUND(Eurodebe, 2), 0)) - SUM(IFNULL(ROUND(EUROHABER, 2), 0)) recon
-					FROM XDiario
-					WHERE NOT enlazado
-					GROUP BY ASIEN
-					HAVING ABS(SUM(IFNULL(ROUND(Eurodebe, 2), 0)) - SUM(IFNULL(ROUND(EUROHABER, 2), 0))) > 0.01 
-			) sub
-			HAVING COUNT(*);
 
 	UPDATE XDiario xd
 			JOIN (

db/routines/vn/procedures/address_updateCoordinates.sql

@@ -0,0 +1,25 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`address_updateCoordinates`(
+	vTicketFk INT,
+	vLongitude INT,
+	vLatitude INT)
+BEGIN
+/**
+ * Actualiza las coordenadas de una dirección.
+ *
+ * @param vTicketFk Id del ticket
+ * @param vLongitude Longitud de la dirección
+ * @param vLatitude Latitud de la dirección
+ */
+	DECLARE vAddressFK INT;
+
+	SELECT addressFK INTO vAddressFK
+		FROM ticket
+		WHERE id = vTicketFk;
+
+	UPDATE address
+		SET longitude = vLongitude,
+			latitude = vLatitude
+		WHERE id = vAddressFK;
+END$$
+DELIMITER ;

db/routines/vn/procedures/buyUltimate.sql

@@ -1,5 +1,8 @@
 DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`buyUltimate`(vWarehouseFk SMALLINT, vDated DATE)
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`buyUltimate`(
+	vWarehouseFk SMALLINT, 
+	vDated DATE
+)
 BEGIN
 /**
  * Calcula las últimas compras realizadas hasta una fecha
@@ -19,21 +22,22 @@ BEGIN
 			FROM cache.last_buy
 			WHERE warehouse_id = vWarehouseFk OR vWarehouseFk IS NULL;
 
-	CALL buyUltimateFromInterval(vWarehouseFk, util.VN_CURDATE(), vDated);
+	IF vDated >= util.VN_CURDATE() THEN
+		CALL buyUltimateFromInterval(vWarehouseFk, util.VN_CURDATE(), vDated);
 
-	REPLACE INTO tmp.buyUltimate
+		REPLACE INTO tmp.buyUltimate
-		SELECT itemFk, buyFk, warehouseFk, landed landing
+			SELECT itemFk, buyFk, warehouseFk, landed landing
-			FROM tmp.buyUltimateFromInterval
+				FROM tmp.buyUltimateFromInterval
-			WHERE (warehouseFk = vWarehouseFk OR vWarehouseFk IS NULL)
+				WHERE (warehouseFk = vWarehouseFk OR vWarehouseFk IS NULL)
-				AND landed <= vDated
+					AND landed <= vDated
-				AND NOT isIgnored;
+					AND NOT isIgnored;
-
-	INSERT IGNORE INTO tmp.buyUltimate
-		SELECT itemFk, buyFk, warehouseFk, landed landing
-			FROM tmp.buyUltimateFromInterval
-			WHERE (warehouseFk = vWarehouseFk OR vWarehouseFk IS NULL)
-				AND landed > vDated
-			ORDER BY isIgnored = FALSE DESC;
 
+		INSERT IGNORE INTO tmp.buyUltimate
+			SELECT itemFk, buyFk, warehouseFk, landed landing
+				FROM tmp.buyUltimateFromInterval
+				WHERE (warehouseFk = vWarehouseFk OR vWarehouseFk IS NULL)
+					AND landed > vDated
+				ORDER BY isIgnored = FALSE DESC;
+	END IF;
 END$$
 DELIMITER ;

db/routines/vn/procedures/buyUltimateFromInterval.sql

@@ -1,5 +1,9 @@
 DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`buyUltimateFromInterval`(vWarehouseFk SMALLINT, vStarted DATE, vEnded DATE)
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`buyUltimateFromInterval`(
+	vWarehouseFk SMALLINT, 
+	vStarted DATE, 
+	vEnded DATE
+)
 BEGIN
 /**
  * Calcula las últimas compras realizadas
@@ -21,12 +25,13 @@ BEGIN
 	-- Item
 	DROP TEMPORARY TABLE  IF EXISTS tmp.buyUltimateFromInterval;
 	CREATE TEMPORARY TABLE tmp.buyUltimateFromInterval
-		(PRIMARY KEY (itemFk, warehouseFk), INDEX(buyFk), INDEX(landed), INDEX(warehouseFk), INDEX(itemFk))
+		(PRIMARY KEY (itemFk, warehouseFk), 
+		INDEX(buyFk), INDEX(landed), INDEX(warehouseFk), INDEX(itemFk))
 		ENGINE = MEMORY
 		SELECT itemFk,
 				warehouseFk,
 				buyFk,
-				MAX(landed) landed,
+				landed,
 				isIgnored
 			FROM (SELECT b.itemFk,
 						t.warehouseInFk warehouseFk,
@@ -45,93 +50,117 @@ BEGIN
 
 
 	INSERT IGNORE INTO tmp.buyUltimateFromInterval(itemFk, warehouseFk, buyFk, landed, isIgnored)
-		SELECT
+		SELECT itemFk,
-				b.itemFk,
+				warehouseFk,
-				t.warehouseInFk warehouseFk,
+				buyFk,
-				b.id buyFk,
+				landed,
-				t.landed,
+				isIgnored
-				b.isIgnored
+			FROM (SELECT b.itemFk,
-			FROM buy b
+						t.warehouseInFk warehouseFk,
-				JOIN entry e ON e.id = b.entryFk
+						b.id buyFk,
-				JOIN travel t ON t.id = e.travelFk
+						t.landed,
-			WHERE t.landed > vEnded
+						b.isIgnored
-				AND (vWarehouseFk IS NULL OR t.warehouseInFk = vWarehouseFk)
+					FROM buy b
-				AND b.price2 > 0
+						JOIN entry e ON e.id = b.entryFk
-				AND NOT b.isIgnored
+						JOIN travel t ON t.id = e.travelFk
-			GROUP BY itemFk, warehouseInFk;
+					WHERE t.landed > vEnded
+						AND (vWarehouseFk IS NULL OR t.warehouseInFk = vWarehouseFk)
+						AND b.price2 > 0
+						AND NOT b.isIgnored
+					ORDER BY NOT b.isIgnored DESC, t.landed DESC, b.id DESC
+					LIMIT 10000000000000000000) sub
+			GROUP BY itemFk, warehouseFk;
 
 	INSERT IGNORE INTO tmp.buyUltimateFromInterval(itemFk, warehouseFk, buyFk, landed, isIgnored)
-		SELECT
+		SELECT itemFk,
-				b.itemFk,
+				warehouseFk,
-				t.warehouseInFk warehouseFk,
+				buyFk,
-				b.id buyFk,
+				landed,
-				t.landed,
+				isIgnored
-				b.isIgnored
+			FROM (SELECT b.itemFk,
-			FROM buy b
+						t.warehouseInFk warehouseFk,
-				JOIN entry e ON e.id = b.entryFk
+						b.id buyFk,
-				JOIN travel t ON t.id = e.travelFk
+						t.landed,
-			WHERE t.landed BETWEEN vStarted AND vEnded
+						b.isIgnored
-				AND (vWarehouseFk IS NULL OR t.warehouseInFk = vWarehouseFk)
+					FROM buy b
-				AND b.quantity = 0
+						JOIN entry e ON e.id = b.entryFk
-			GROUP BY itemFk, warehouseInFk;
+						JOIN travel t ON t.id = e.travelFk
+					WHERE t.landed BETWEEN vStarted AND vEnded
+						AND (vWarehouseFk IS NULL OR t.warehouseInFk = vWarehouseFk)
+						AND b.quantity = 0
+					ORDER BY NOT b.isIgnored DESC, t.landed DESC, b.id DESC
+					LIMIT 10000000000000000000) sub
+			GROUP BY itemFk, warehouseFk;
 
 		-- ItemOriginal
 	INSERT IGNORE INTO tmp.buyUltimateFromInterval(itemFk, warehouseFk, buyFk, landed, isIgnored)
 		SELECT itemFk,
-			warehouseFk,
+				warehouseFk,
-			buyFk,
+				buyFk,
-			MAX(landed) landed,
+				landed,
-			isIgnored
+				isIgnored
-		FROM (SELECT b.itemFk,
+			FROM (SELECT b.itemFk,
-					t.warehouseInFk warehouseFk,
+						t.warehouseInFk warehouseFk,
-					b.id buyFk,
+						b.id buyFk,
-					t.landed,
+						t.landed,
-					itemOriginalFk,
+						itemOriginalFk,
-					b.isIgnored
+						b.isIgnored
-				FROM buy b
+					FROM buy b
-					JOIN entry e ON e.id = b.entryFk
+						JOIN entry e ON e.id = b.entryFk
-					JOIN travel t ON t.id = e.travelFk
+						JOIN travel t ON t.id = e.travelFk
-				WHERE t.landed BETWEEN vStarted AND vEnded
+					WHERE t.landed BETWEEN vStarted AND vEnded
-						AND (vWarehouseFk IS NULL OR t.warehouseInFk = vWarehouseFk)
+							AND (vWarehouseFk IS NULL OR t.warehouseInFk = vWarehouseFk)
-						AND b.price2 > 0
+							AND b.price2 > 0
-						AND NOT b.isIgnored
+							AND NOT b.isIgnored
-						AND b.quantity > 0
+							AND b.quantity > 0
-						AND itemOriginalFk
+							AND itemOriginalFk
-				ORDER BY t.landed DESC, b.id DESC
+					ORDER BY t.landed DESC, b.id DESC
-				LIMIT 10000000000000000000) sub
+					LIMIT 10000000000000000000) sub
-		GROUP BY itemOriginalFk, warehouseFk;
+			GROUP BY itemFk, warehouseFk;
+	INSERT IGNORE INTO tmp.buyUltimateFromInterval(itemFk, warehouseFk, buyFk, landed, isIgnored)
+			SELECT itemFk,
+					warehouseFk,
+					buyFk,
+					landed,
+					isIgnored
+				FROM (SELECT b.itemFk,
+							t.warehouseInFk warehouseFk,
+							b.id buyFk,
+							t.landed,
+							b.isIgnored
+						FROM buy b
+							JOIN entry e ON e.id = b.entryFk
+							JOIN travel t ON t.id = e.travelFk
+						WHERE t.landed > vEnded
+							AND (vWarehouseFk IS NULL OR t.warehouseInFk = vWarehouseFk)
+							AND b.price2 > 0
+							AND NOT b.isIgnored
+							AND itemOriginalFk
+						ORDER BY t.landed DESC, b.id DESC
+						LIMIT 10000000000000000000) sub
+				GROUP BY itemFk, warehouseFk;
 
 	INSERT IGNORE INTO tmp.buyUltimateFromInterval(itemFk, warehouseFk, buyFk, landed, isIgnored)
-	SELECT
+			SELECT itemFk,
-			b.itemFk,
+					warehouseFk,
-			t.warehouseInFk warehouseFk,
+					buyFk,
-			b.id buyFk,
+					landed,
-			t.landed,
+					isIgnored
-			b.isIgnored
+				FROM 
-		FROM buy b
+					(SELECT b.itemFk,
-			JOIN entry e ON e.id = b.entryFk
+							t.warehouseInFk warehouseFk,
-			JOIN travel t ON t.id = e.travelFk
+							b.id buyFk,
-		WHERE t.landed > vEnded
+							t.landed,
-			AND (vWarehouseFk IS NULL OR t.warehouseInFk = vWarehouseFk)
+							b.isIgnored
-			AND b.price2 > 0
+						FROM buy b
-			AND NOT b.isIgnored
+							JOIN entry e ON e.id = b.entryFk
-			AND itemOriginalFk
+							JOIN travel t ON t.id = e.travelFk
-		GROUP BY itemOriginalFk, warehouseInFk;
+						WHERE t.landed BETWEEN vStarted AND vEnded
-
+							AND (vWarehouseFk IS NULL OR t.warehouseInFk = vWarehouseFk)
-	INSERT IGNORE INTO tmp.buyUltimateFromInterval(itemFk, warehouseFk, buyFk, landed, isIgnored)
+							AND b.quantity = 0
-		SELECT
+							AND itemOriginalFk
-				b.itemFk,
+						ORDER BY t.landed DESC, b.id DESC
-				t.warehouseInFk warehouseFk,
+						LIMIT 10000000000000000000) sub
-				b.id buyFk,
+			GROUP BY itemFk, warehouseFk;
-				t.landed,
-				b.isIgnored
-			FROM buy b
-				JOIN entry e ON e.id = b.entryFk
-				JOIN travel t ON t.id = e.travelFk
-			WHERE t.landed BETWEEN vStarted AND vEnded
-				AND (vWarehouseFk IS NULL OR t.warehouseInFk = vWarehouseFk)
-				AND b.quantity = 0
-				AND itemOriginalFk
-			GROUP BY itemOriginalFk, warehouseInFk;
 END$$
 DELIMITER ;

db/routines/vn/procedures/catalog_calculate.sql

@@ -45,8 +45,7 @@ BEGIN
 
 	CALL catalog_componentPrepare();
 
-	DROP TEMPORARY TABLE IF EXISTS tmp.ticketCalculateItem;
+	CREATE OR REPLACE TEMPORARY TABLE tmp.ticketCalculateItem(
-	CREATE TEMPORARY TABLE tmp.ticketCalculateItem(
 		itemFk INT(11) NOT NULL, 
 		available INT(11),
 		producer VARCHAR(50), 
@@ -60,11 +59,11 @@ BEGIN
 		price DECIMAL(10,2),
 		priceKg DECIMAL(10,2),
 		`grouping` INT(10) UNSIGNED,
+		minQuantity INT(10) UNSIGNED,
 		PRIMARY KEY `itemFk` (`itemFk`)
 	) ENGINE = MEMORY DEFAULT CHARSET=utf8;
 	
 	OPEN cTravelTree;
-
 	l: LOOP
 		SET vDone = FALSE;
 		FETCH cTravelTree INTO vZoneFk, vWarehouseFk, vShipped;
@@ -136,7 +135,7 @@ BEGIN
 
 		CALL vn.catalog_componentCalculate(vZoneFk, vAddressFk, vShipped, vWarehouseFk);
 
-		INSERT INTO tmp.ticketCalculateItem (
+		INSERT INTO tmp.ticketCalculateItem(
 					itemFk,
 					available,
 					producer,
@@ -149,9 +148,9 @@ BEGIN
 					origin,
 					price,
 					priceKg,
-					`grouping`)
+					`grouping`,
-		SELECT
+					minQuantity)
-				tl.itemFk,
+		SELECT tl.itemFk,
 				SUM(tl.available) available,
 				p.name producer,
 				i.name item,
@@ -163,7 +162,8 @@ BEGIN
 				o.code origin,
 				bl.price,
 				bl.priceKg,
-				bl.`grouping`
+				bl.`grouping`,
+				mq.quantity
 			FROM tmp.ticketLot tl
 				JOIN item i ON tl.itemFk = i.id
 				LEFT JOIN producer p ON p.id = i.producerFk AND p.isVisible
@@ -179,12 +179,28 @@ BEGIN
 						) sub
 						GROUP BY itemFk
 				) bl ON bl.itemFk = tl.itemFk
-			WHERE tl.zoneFk = vZoneFk AND tl.warehouseFk = vWarehouseFk
+				LEFT JOIN (
+					WITH itemMinQuantityPriority AS (
+						SELECT itemFk,
+								quantity,
+								ROW_NUMBER() OVER (
+									PARTITION BY itemFk
+									ORDER BY warehouseFk IS NULL
+								) priority
+						FROM vn.itemMinimumQuantity
+						WHERE `started` <= vShipped
+							AND (`ended` >= vShipped OR `ended` IS NULL)
+							AND (warehouseFk = vWarehouseFk OR warehouseFk IS NULL)
+					)
+					SELECT itemFk, quantity
+						FROM itemMinQuantityPriority
+						WHERE priority = 1
+				) mq ON mq.itemFk = tl.itemFk
+			WHERE tl.zoneFk = vZoneFk
+				AND tl.warehouseFk = vWarehouseFk
 			GROUP BY tl.itemFk
 			ON DUPLICATE KEY UPDATE available = available + VALUES(available);
-
 	END LOOP;
-
 	CLOSE cTravelTree;
 END$$
 DELIMITER ;

db/routines/vn/procedures/client_create.sql

@@ -34,20 +34,25 @@ BEGIN
 	DECLARE vIsTaxDataChecked TINYINT(1);
 	DECLARE vHasCoreVnl BOOLEAN;
 	DECLARE vMandateTypeFk INT;
+	DECLARE vHasDailyInvoice BOOLEAN;
 
-	SELECT defaultPayMethodFk,
+	SELECT cc.defaultPayMethodFk,
-			defaultDueDay,
+			cc.defaultDueDay,
-			defaultCredit,
+			cc.defaultCredit,
-			defaultIsTaxDataChecked,
+			cc.defaultIsTaxDataChecked,
-			defaultHasCoreVnl,
+			cc.defaultHasCoreVnl,
-			defaultMandateTypeFk
+			cc.defaultMandateTypeFk,
+			c.hasDailyInvoice
 		INTO vPayMethodFk,
 			vDueDay,
 			vDefaultCredit,
 			vIsTaxDataChecked,
 			vHasCoreVnl,
-			vMandateTypeFk
+			vMandateTypeFk,
-		FROM clientConfig;
+			vHasDailyInvoice
+		FROM clientConfig cc
+			LEFT JOIN province p ON p.id = vProvinceFk
+			LEFT JOIN country c ON c.id = p.countryFk;
 
 	INSERT INTO `client`
 		SET id = vUserFk,
@@ -65,7 +70,8 @@ BEGIN
 			credit = vDefaultCredit,
 			isTaxDataChecked = vIsTaxDataChecked,
 			hasCoreVnl = vHasCoreVnl,
-			isEqualizated = FALSE
+			isEqualizated = FALSE,
+			hasDailyInvoice = vHasDailyInvoice
 		ON duplicate KEY UPDATE
 			payMethodFk = vPayMethodFk,
 			dueDay = vDueDay,

db/routines/vn/procedures/collection_setParking.sql

@@ -1,15 +1,18 @@
 DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`collection_setParking`(IN `vCollectionFk` VARCHAR(8), IN `vParkingFk` INT)
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`collection_setParking`(
-proc: BEGIN
+	vSelf INT,
+	vParkingFk INT
+)
+BEGIN
 /**
  * Aparca una colección en un parking.
  *
- * @param vCollectionFk Id de la colección
+ * @param vSelf Id colección
- * @param vParkingFk Id del parking
+ * @param vParkingFk Id parking
  */
-	REPLACE vn.ticketParking(ticketFk, parkingFk)
+	REPLACE ticketParking(ticketFk, parkingFk)
 		SELECT tc.ticketFk, vParkingFk
-			FROM vn.ticketCollection tc
+			FROM ticketCollection tc
-			WHERE tc.collectionFk = vCollectionFk;
+			WHERE tc.collectionFk = vSelf;
 END$$
 DELIMITER ;

db/routines/vn/procedures/copyComponentsFromSaleList.sql

@@ -16,9 +16,9 @@ BEGIN
 
 	SET @order = 0;
 
-	DROP TEMPORARY TABLE IF EXISTS tmp.newSaleList;
+	DROP TEMPORARY TABLE IF EXISTS tNewSaleList;
 
-	CREATE TEMPORARY TABLE tmp.newSaleList
+	CREATE TEMPORARY TABLE tNewSaleList
 		SELECT id as saleFk, @order := @order + 1 as orden
 			FROM vn.sale
 			WHERE ticketFk = vTargetTicketFk
@@ -28,7 +28,8 @@ BEGIN
 		SELECT ns.saleFk, sc.componentFk, sc.value
 			FROM vn.saleComponent sc
 				JOIN tmp.saleList s ON s.saleFk = sc.saleFk
-				JOIN tmp.newSaleList ns ON ns.orden = s.orden;
+				JOIN tNewSaleList ns ON ns.orden = s.orden;
 
+	DROP TEMPORARY TABLE tNewSaleList;
 END$$
 DELIMITER ;

db/routines/vn/procedures/entry_isEditable.sql

@@ -18,7 +18,7 @@ BEGIN
 			AND e.id = vSelf;
 
 	IF vIsEditable AND NOT IFNULL(@isModeInventory, FALSE) THEN
-		CALL util.throw('Entry is not editable');
+		CALL util.throw(CONCAT('Entry ', vSelf, ' is not editable'));
 	END IF;
 END$$
 DELIMITER ;

db/routines/vn/procedures/entry_splitByShelving.sql

@@ -17,34 +17,19 @@ BEGIN
 		SELECT 	bb.id buyFk,
 				FLOOR(ish.visible / ish.packing) ishStickers,
 				bb.stickers buyStickers
-				FROM vn.itemShelving ish
+			FROM itemShelving ish
 				JOIN (SELECT b.id, b.itemFk, b.stickers 
-						FROM vn.buy b 
+						FROM buy b
 						WHERE b.entryFk = vFromEntryFk
 						ORDER BY b.stickers DESC
 						LIMIT 10000000000000000000) bb ON bb.itemFk = ish.itemFk
 							AND bb.stickers >= FLOOR(ish.visible / ish.packing)
-			WHERE shelvingFk = vShelvingFk COLLATE utf8_general_ci
+			WHERE ish.shelvingFk = vShelvingFk COLLATE utf8_general_ci
+				AND NOT ish.isSplit
 			GROUP BY ish.id;
 			
 	DECLARE CONTINUE HANDLER FOR NOT FOUND SET vDone = TRUE;
 
-	-- Cantidades de la matrícula que exceden la de las entradas 
-	SELECT 	ish.itemFk, 
-			i.longName, 
-			FLOOR(ish.visible / ish.packing) AS etiEnMatricula,
-			bb.stickers etiEnEntrada
-				FROM vn.itemShelving ish
-					JOIN vn.item i ON i.id = ish.itemFk 
-				LEFT JOIN (SELECT b.id, b.itemFk, b.stickers 
-						FROM vn.buy b 
-						WHERE b.entryFk = vFromEntryFk
-						ORDER BY b.stickers DESC
-						LIMIT 10000000000000000000) bb ON bb.itemFk = ish.itemFk
-			WHERE shelvingFk = vShelvingFk COLLATE utf8_general_ci
-				AND  IFNULL(bb.stickers,0) < FLOOR(ish.visible / ish.packing)
-			GROUP BY ish.id;
-		
 	OPEN cur;
 
 	read_loop: LOOP
@@ -57,16 +42,16 @@ BEGIN
 		END IF;
 
 		IF vIshStickers =  vBuyStickers THEN
-			UPDATE vn.buy
+			UPDATE buy
 				SET entryFk = vToEntryFk
 				WHERE id = vBuyFk;
 		ELSE
-			UPDATE vn.buy
+			UPDATE buy
 				SET stickers = stickers - vIshStickers,
 					quantity = stickers * packing 
 				WHERE id = vBuyFk;
 
-			INSERT INTO	vn.buy(entryFk,
+			INSERT INTO	buy(entryFk,
 								itemFk,
 								quantity,
 								buyingValue,
@@ -117,13 +102,16 @@ BEGIN
 							weight,
 							deliveryFk,
 							itemOriginalFk
-						FROM vn.buy
+						FROM buy
 						WHERE id = vBuyFk;
 
 			UPDATE buy SET printedStickers = vIshStickers WHERE id = LAST_INSERT_ID();
 		END IF;
-	END LOOP;
 
+		UPDATE itemShelving
+			SET isSplit = TRUE
+				WHERE shelvingFk = vShelvingFk;
+	END LOOP;
 	CLOSE cur;
 END$$
 DELIMITER ;

db/routines/vn/procedures/invoiceIn_booking.sql

@@ -13,20 +13,32 @@ BEGIN
  * @param vBookEntry Id de asiento, si es NULL se genera uno nuevo
  */
 	DECLARE vFiscalYear INT;
-	DECLARE vHasDistinctTransactions INT;
+	DECLARE vDistinctTransactions INT;
+	DECLARE vHasRepeatedTransactions BOOL;
 
-	SELECT COUNT(DISTINCT transactionTypeSageFk) INTO vHasDistinctTransactions
+	SELECT COUNT(DISTINCT iit.transactionTypeSageFk) INTO vDistinctTransactions
 		FROM invoiceIn ii
 			JOIN invoiceInTax iit ON iit.invoiceInFk = ii.id
 			JOIN invoiceInSerial iis ON iis.code = ii.serial 
-		WHERE ii.id = vSelf
+		WHERE iit.invoiceInFk = vSelf
 			AND iis.taxAreaFk = 'CEE'
-			AND transactionTypeSageFk;
+			AND iit.transactionTypeSageFk;
 
-	IF vHasDistinctTransactions > 1 THEN 
+	IF vDistinctTransactions > 1 THEN 
 		CALL util.throw ('This invoice does not allow different types of transactions');
 	END IF;
 
+	SELECT TRUE INTO vHasRepeatedTransactions
+		FROM invoiceInTax
+		WHERE invoiceInFk = vSelf
+		GROUP BY transactionTypeSageFk
+		HAVING COUNT(transactionTypeSageFk) > 1
+		LIMIT 1;
+
+	IF vHasRepeatedTransactions THEN 
+		CALL util.throw ('This invoice contains repeated types of transactions');
+	END IF;
+
 	CREATE OR REPLACE TEMPORARY TABLE tInvoiceIn
 		ENGINE = MEMORY
 		SELECT ii.bookEntried,

db/routines/vn/procedures/itemShelving_inventory.sql

@@ -59,5 +59,7 @@ BEGIN
 		WHERE p.pickingOrder BETWEEN vPickingOrderFrom AND vPickingOrderTo
 			AND p.sectorFk = vSectorFk
 		ORDER BY p.pickingOrder;
+
+	DROP TEMPORARY TABLE tmp.stockMisfit;
 END$$
 DELIMITER ;

db/routines/vn/procedures/item_GetVisible.sql

@@ -1,43 +0,0 @@
-DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`item_GetVisible`(vWarehouse SMALLINT, vItem INT)
-BEGIN
-	DECLARE vTomorrow DATETIME DEFAULT TIMESTAMPADD(DAY, 1, util.VN_CURDATE());
-
-	INSERT INTO tmp.itemVisible (item_id, visible)
-		SELECT item_id, SUM(amount) amount
-			FROM (
-				SELECT i.itemFk AS item_id, quantity AS amount
-					FROM itemTicketOut i
-						LEFT JOIN ticketState ts ON ts.ticketFk = i.ticketFk
-							JOIN state s ON s.id = ts.stateFk
-						LEFT JOIN (SELECT DISTINCT saleFk
-										FROM saleTracking st
-											JOIN state s ON s.id = st.stateFk
-										WHERE st.created > util.VN_CURDATE()
-											AND (s.isPicked OR st.isChecked)
-									)  stPrevious  ON `stPrevious`.`saleFk` = i.saleFk
-					WHERE i.warehouseFk = vWarehouse
-						AND (vItem IS NULL OR i.itemFk = vItem)
-						AND (s.isPicked OR i.reserved OR stPrevious.saleFk )
-						AND i.shipped >= util.VN_CURDATE() AND i.shipped < vTomorrow
-				UNION ALL
-				SELECT iei.itemFk, quantity
-					FROM itemEntryIn iei
-					WHERE (iei.isReceived != FALSE /*OR ip.modificationDate > util.VN_CURDATE()*/)
-						AND iei.landed >= util.VN_CURDATE() AND iei.landed < vTomorrow
-						AND iei.warehouseInFk = vWarehouse
-						AND (vItem IS NULL OR iei.itemFk = vItem)
-						AND iei.isVirtualStock is FALSE
-				UNION ALL
-				SELECT itemFk, quantity
-					FROM itemEntryOut
-					WHERE isDelivered != FALSE
-						AND shipped >= util.VN_CURDATE() AND shipped < vTomorrow
-						AND warehouseOutFk = vWarehouse
-						AND (vItem IS NULL OR itemFk = vItem)
-					) t
-			GROUP BY item_id
-			ON DUPLICATE KEY UPDATE
-			visible = IFNULL(stock,0) + VALUES(visible);
-END$$
-DELIMITER ;

db/routines/vn/procedures/item_calcVisible.sql

@@ -0,0 +1,56 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`item_calcVisible`(
+	vSelf INT,
+	vWarehouseFk INT
+)
+BEGIN
+/**
+ * Calcula el visible de un artículo o de todos.
+ *
+ * @param vWarehouse Warehouse id
+ * @param vSelf Item id
+ * @param tmp.itemVisible(item_id, stock, visible)
+ */
+ 	DECLARE vDated DATE DEFAULT util.VN_CURDATE();
+	DECLARE vTomorrow DATETIME DEFAULT util.tomorrow();
+
+	INSERT INTO tmp.itemVisible(item_id, visible)
+		SELECT itemFk, SUM(quantity)
+			FROM (
+				SELECT i.itemFk, i.quantity
+					FROM itemTicketOut i
+						LEFT JOIN ticketState ts ON ts.ticketFk = i.ticketFk
+							JOIN `state` s ON s.id = ts.stateFk
+						LEFT JOIN (
+							SELECT DISTINCT st.saleFk
+								FROM saleTracking st
+									JOIN state s ON s.id = st.stateFk
+								WHERE st.created > vDated
+									AND (s.isPicked OR st.isChecked)
+						) stPrevious ON `stPrevious`.`saleFk` = i.saleFk
+					WHERE IFNULL(vWarehouseFk, i.warehouseFk) = i.warehouseFk
+						AND (vSelf IS NULL OR i.itemFk = vSelf)
+						AND (s.isPicked OR i.reserved OR stPrevious.saleFk)
+						AND i.shipped >= vDated AND i.shipped < vTomorrow
+				UNION ALL
+				SELECT itemFk, quantity
+					FROM itemEntryIn
+					WHERE isReceived
+						AND landed >= vDated AND landed < vTomorrow
+						AND IFNULL(vWarehouseFk, warehouseInFk) = warehouseInFk
+						AND (vSelf IS NULL OR itemFk = vSelf)
+						AND NOT isVirtualStock
+				UNION ALL
+				SELECT itemFk, quantity
+					FROM itemEntryOut
+					WHERE isDelivered
+						AND shipped >= vDated
+						AND shipped < vTomorrow
+						AND IFNULL(vWarehouseFk, warehouseOutFk) = warehouseOutFk
+						AND (vSelf IS NULL OR itemFk = vSelf)
+					) t
+			GROUP BY itemFk
+			ON DUPLICATE KEY UPDATE
+				visible = IFNULL(stock, 0) + VALUES(visible);
+END$$
+DELIMITER ;

db/routines/vn/procedures/item_getBalance.sql

@@ -2,94 +2,84 @@ DELIMITER $$
 CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`item_getBalance`(
 	vItemFk INT,
 	vWarehouseFk INT,
-	vDate DATETIME
+	vDated DATETIME
 )
 BEGIN
 /**
- * @vItemFk item a buscar
+ * Calcula el balance de un artículo.
- * @vWarehouseFk almacen donde buscar
+ *
- * @vDate Si la fecha es null, muestra el histórico desde el inventario. 
+ * @vItemFk Id de artículo
- * Si la fecha no es null, muestra histórico desde la fecha de vDate.
+ * @vWarehouseFk Id de almacén
+ * @vDated Fecha a calcular, si es NULL muestra el histórico desde el inventario
  */
-	DECLARE vDateInventory DATETIME;
+	DECLARE vDateInventory DATETIME
+		DEFAULT (
+			SELECT IF(vDated, uc.mockUtcTime, c.inventoried)
+				FROM config c
+					JOIN util.config uc
+		);
+	DECLARE vSupplierInventoryFk INT
+		DEFAULT (SELECT supplierFk FROM inventoryConfig);
 
-	IF vDate IS NULL THEN
+	IF NOT vSupplierInventoryFk OR NOT vDateInventory THEN
-		SELECT inventoried INTO vDateInventory 
+		CALL util.throw('Config variables are not set');
-			FROM config;
-	ELSE
-		SELECT mockUtcTime INTO vDateInventory
-			FROM util.config;
 	END IF;
 
-	CREATE OR REPLACE TEMPORARY TABLE tItemDiary(
+	CREATE OR REPLACE TEMPORARY TABLE tItemDiary
-		shipped DATE,
+		ENGINE = MEMORY
-		`in` INT(11),
-		`out` INT(11),
-		alertLevel INT(11),
-		stateName VARCHAR(20),
-		`name` VARCHAR(50),
-		reference VARCHAR(50),
-		origin INT(11),
-		clientFk INT(11),
-		isPicked INT(11),
-		isTicket TINYINT(1),
-		lineFk INT(11),
-		`order` TINYINT(3) UNSIGNED,
-		clientType VARCHAR(20),
-		claimFk INT(10) UNSIGNED,
-		inventorySupplierFk INT(10)
-	);
-
-	INSERT INTO tItemDiary
 		WITH entriesIn AS (
-			SELECT tr.landed shipped,
+			SELECT 'entry' originType,
+					e.id originId,
+					tr.landed shipped,
 					b.quantity `in`,
 					NULL `out`,
 					st.alertLevel ,
 					st.name stateName,
-					s.name `name`,
 					e.invoiceNumber reference,
-					e.id origin,
+					'supplier' entityType,
-					s.id clientFk,
+					s.id entityId,
+					s.name entityName,
 					IF(st.`code` = 'DELIVERED', TRUE, FALSE) isPicked,
 					FALSE isTicket,
 					b.id lineFk,
 					NULL `order`,
 					NULL clientType,
 					NULL claimFk,
-					ec.inventorySupplierFk
+					vSupplierInventoryFk inventorySupplierFk
 				FROM vn.buy b
 					JOIN vn.entry e ON e.id = b.entryFk
 					JOIN vn.travel tr ON tr.id = e.travelFk
 					JOIN vn.supplier s ON s.id = e.supplierFk
-					JOIN vn.state st ON st.`code` = IF( tr.landed < util.VN_CURDATE() 
+					JOIN vn.state st ON st.`code` = IF(tr.landed < util.VN_CURDATE() 
 						OR (util.VN_CURDATE() AND tr.isReceived),
 							'DELIVERED',
 							'FREE')
-					JOIN vn.entryConfig ec
 				WHERE tr.landed >= vDateInventory
-					AND vWarehouseFk = tr.warehouseInFk
+					AND tr.warehouseInFk = vWarehouseFk
-					AND (s.id <> ec.inventorySupplierFk OR vDate IS NULL) 
+					AND (s.id <> vSupplierInventoryFk OR vDated IS NULL) 
 					AND b.itemFk = vItemFk
 					AND NOT e.isExcludedFromAvailable
 					AND NOT e.isRaid
-		), entriesOut AS (
+		),
-			SELECT tr.shipped,
+		entriesOut AS (
+			SELECT 'entry',
+					e.id originType,
+					tr.shipped,
 					NULL,
 					b.quantity,
 					st.alertLevel,
 					st.name stateName,
-					s.name ,
 					e.invoiceNumber,
-					e.id entryFk,
+					'supplier' entityType,
-					s.id supplierFk,
+					s.id entityId,
+					s.name,
 					IF(st.`code` = 'DELIVERED' , TRUE, FALSE),
 					FALSE isTicket,
 					b.id,
 					NULL `order`,
 					NULL clientType,
 					NULL claimFk,
-					ec.inventorySupplierFk
+					vSupplierInventoryFk
 				FROM vn.buy b
 					JOIN vn.entry e ON e.id = b.entryFk
 					JOIN vn.travel tr ON tr.id = e.travelFk
@@ -99,86 +89,108 @@ BEGIN
 						OR (tr.shipped = util.VN_CURDATE() AND tr.isReceived),
 							'DELIVERED',
 							'FREE')
-					JOIN vn.entryConfig ec
 				WHERE tr.shipped >= vDateInventory
-					AND vWarehouseFk = tr.warehouseOutFk
+					AND tr.warehouseOutFk = vWarehouseFk
-					AND (s.id <> ec.inventorySupplierFk OR vDate IS NULL)
+					AND (s.id <> vSupplierInventoryFk OR vDated IS NULL)
 						AND b.itemFk = vItemFk
 						AND NOT e.isExcludedFromAvailable
 						AND NOT w.isFeedStock
 						AND NOT e.isRaid
-		), sales AS (
+		),
-			SELECT DATE(t.shipped) shipped,
+		sales AS (
-					s.quantity,
+			WITH itemSales AS (
-					st2.alertLevel,
+				SELECT DATE(t.shipped) shipped,
-					st2.name,
+						s.quantity,
-					t.nickname,
+						st2.alertLevel,
-					t.refFk,
+						st2.name,
-					t.id ticketFk,
+						t.refFk,
-					t.clientFk,
+						t.id ticketFk,
-					s.id saleFk,
+						'client' entityType,
-					st.`order`,
+						t.clientFk entityId,
-					c.typeFk,
+						t.nickname,
-					cb.claimFk
+						s.id saleFk,
-				FROM vn.sale s
+						st.`order`,
-					JOIN vn.ticket t ON t.id = s.ticketFk
+						c.typeFk,
-					LEFT JOIN vn.ticketState ts ON ts.ticketFk = t.id
+						cb.claimFk
-					LEFT JOIN vn.state st ON st.`code` = ts.`code`
+					FROM vn.sale s
-					JOIN vn.client c ON c.id = t.clientFk
+						JOIN vn.ticket t ON t.id = s.ticketFk
-					JOIN vn.state st2 ON st2.`code` = IF(t.shipped < util.VN_CURDATE(),
+						LEFT JOIN vn.ticketState ts ON ts.ticketFk = t.id
-						'DELIVERED',
+						LEFT JOIN vn.state st ON st.code = ts.code
-						IF (t.shipped > util.dayEnd(util.VN_CURDATE()),
+						JOIN vn.client c ON c.id = t.clientFk
-							'FREE',
+						JOIN vn.state st2 ON st2.`code` = IF(t.shipped < util.VN_CURDATE(),
-							IFNULL(ts.code, 'FREE')))
+							'DELIVERED',
-					LEFT JOIN vn.claimBeginning cb ON s.id = cb.saleFk
+							IF (t.shipped > util.dayEnd(util.VN_CURDATE()),
-				WHERE t.shipped >= vDateInventory
+								'FREE',
-					AND s.itemFk = vItemFk
+								IFNULL(st.code, 'FREE')))
-					AND vWarehouseFk = t.warehouseFk
+						LEFT JOIN vn.claimBeginning cb ON cb.saleFk = s.id
-		),sale AS (
+					WHERE t.shipped >= vDateInventory
-			SELECT s.shipped,
+						AND s.itemFk = vItemFk
+						AND t.warehouseFk = vWarehouseFk
+			)
+			SELECT 'ticket',
+					s.ticketFk,
+					s.shipped,
 					NULL `in`,
 					s.quantity,
 					s.alertLevel,
 					s.name,
-					s.nickname,
 					s.refFk,
-					s.ticketFk,
+					s.entityType,
-					s.clientFk,
+					s.entityId,
-					IF(stk.saleFk, TRUE, NULL),
+					s.nickname,
+					IF(stk.saleFk, TRUE, FALSE),
 					TRUE,
 					s.saleFk,
 					s.`order`,
 					s.typeFk,
 					s.claimFk,
 					NULL
-				FROM sales s
+				FROM itemSales s
 					LEFT JOIN vn.state stPrep ON stPrep.`code` = 'PREPARED'
 					LEFT JOIN vn.saleTracking stk ON stk.saleFk = s.saleFk 
 						AND stk.stateFk = stPrep.id
 				GROUP BY s.saleFk
-		)	SELECT shipped,
+		), 
-				`in`,
+		orders AS (
-				`out`,
+			SELECT 'order' originType,
-				alertLevel,
+					o.id originId,
-				stateName,
+					r.shipment,
-				`name`,
+					NULL 'in',
-				reference,
+					r.amount,
-				origin,
+					NULL alertLevel,
-				clientFk,
+					NULL stateName,
-				isPicked,
+					NULL invoiceNumber,
-				isTicket,
+					'client' entityType,
-				lineFk,
+					c.id,
-				`order`,
+					c.name,
-				clientType,
+					FALSE,
-				claimFk,
+					FALSE isTicket,
-				inventorySupplierFk
+					NULL buyFk,
-				FROM entriesIn
+					NULL 'order',
+					c.typeFk,
+					NULL claimFk,
+					NULL
+				FROM hedera.orderRow r
+					JOIN hedera.`order` o ON o.id = r.orderFk
+					JOIN vn.client c ON c.id = o.customer_id
+				WHERE r.shipment >= vDateInventory
+					AND r.warehouseFk = vWarehouseFk
+					AND r.created >= (
+						SELECT SUBTIME(util.VN_NOW(), reserveTime)
+							FROM hedera.orderConfig
+					)
+					AND NOT o.confirmed
+					AND r.itemFk = vItemFk
+		)
+		SELECT * FROM entriesIn
 			UNION ALL
 			SELECT * FROM entriesOut
 			UNION ALL
-			SELECT * FROM sale
+			SELECT * FROM sales
+			UNION ALL
+			SELECT * FROM orders
 			ORDER BY shipped,
-				(inventorySupplierFk = clientFk) DESC,
+				(inventorySupplierFk = entityId) DESC,
 				alertLevel DESC,
 				isTicket,
 				`order` DESC,
@@ -186,19 +198,20 @@ BEGIN
 				`in` DESC,
 				`out` DESC;
 
-	IF vDate IS NULL THEN
+	IF vDated IS NULL THEN
-
 		SET @a := 0;
 		SET @currentLineFk := 0;
 		SET @shipped := '';
 
-		SELECT DATE(@shipped:= t.shipped) shipped,
+		SELECT t.originType,
+			t.originId,
+			DATE(@shipped:= t.shipped) shipped,
 			t.alertLevel,
 			t.stateName,
-			t.origin,
 			t.reference,
-			t.clientFk,
+			t.entityType,
-			t.name,
+			t.entityId,
+			t.entityName,
 			t.`in` invalue,
 			t.`out`,
 			@a := @a + IFNULL(t.`in`, 0) - IFNULL(t.`out`, 0) balance,
@@ -214,37 +227,41 @@ BEGIN
 			t.`order`
 			FROM tItemDiary t
 				LEFT JOIN alertLevel a ON a.id = t.alertLevel;
-
 	ELSE
 		SELECT IFNULL(SUM(IFNULL(`in`, 0)) - SUM(IFNULL(`out`, 0)), 0) INTO @a
 			FROM tItemDiary
-			WHERE shipped < vDate;
+			WHERE shipped < vDated;
 
-		SELECT vDate shipped,
+		SELECT NULL originType,
-			0 alertLevel,
+			NULL originId,
-			0 stateName,
+			vDated shipped,
-			0 origin,
+			NULL alertLevel,
-			'' reference,
+			NULL stateName,
-			0 clientFk,
+			NULL reference,
+			NULL entityType,
+			NULL entityId,
 			'Inventario calculado',
 			@a invalue,
 			NULL `out`,
 			@a balance,
-			0 lastPreparedLineFk,
+			NULL lastPreparedLineFk,
-			0 isTicket,
+			NULL isTicket,
-			0 lineFk,
+			NULL lineFk,
-			0 isPicked,
+			NULL isPicked,
-			0 clientType,
+			NULL clientType,
-			0 claimFk,
+			NULL claimFk,
 			NULL `order`
 		UNION ALL
-		SELECT shipped, 
+		SELECT originType,
+				originId,
+				shipped, 
 				alertlevel, 
 				stateName, 
-				origin, 
 				reference,
-				clientFk, 
+				entityType,
-				name, `in`, 
+				entityId, 
+				entityName,
+				`in`, 
 				`out`, 
 				@a := @a + IFNULL(`in`, 0) - IFNULL(`out`, 0), 
 				0, 
@@ -255,7 +272,7 @@ BEGIN
 				claimFk,
 				`order`
 			FROM tItemDiary
-				WHERE shipped >= vDate;
+				WHERE shipped >= vDated;
 	END IF;
 
 	DROP TEMPORARY TABLE tItemDiary;

db/routines/vn/procedures/item_getMinacum.sql

@@ -76,5 +76,7 @@ BEGIN
 				i.quantity amount
 			FROM tmp.itemAtp i
 			HAVING amount != 0;
+
+	DROP TEMPORARY TABLE tmp.itemAtp;
 END$$
 DELIMITER ;

db/routines/vn/procedures/item_getSimilar.sql

@@ -63,7 +63,7 @@ BEGIN
 				WHEN b.groupingMode = 'grouping' THEN b.grouping
 				WHEN b.groupingMode = 'packing' THEN b.packing
 				ELSE 1
-			END AS minQuantity,
+			END minQuantity,
 			v.visible located,
 			b.price2
 		FROM vn.item i

db/routines/vn/procedures/item_setVisibleDiscard.sql

@@ -6,7 +6,8 @@ CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`item_setVisibleDisc
 	vAddressFk INT)
 BEGIN
 /**
- * Procedimiento para dar dar de baja/alta un item, si vAddressFk es NULL se entiende que se da de alta y se toma el addressFk de la configuración
+ * Procedimiento para dar dar de baja/alta un item, si vAdressFk es NULL
+ * se entiende que se da de alta y se toma el addressFk de la configuración
  *
  * @param vItemFk Identificador del ítem
  * @param vWarehouseFk id del warehouse

db/routines/vn/procedures/multipleInventory.sql

@@ -10,6 +10,7 @@ proc: BEGIN
 	DECLARE vDateTo DATETIME;
 	DECLARE vDateToTomorrow DATETIME;
 	DECLARE vDefaultDayRange INT;
+	DECLARE vCalcFk INT;
 
 	IF vDate < util.VN_CURDATE() THEN
 		LEAVE proc;
@@ -82,50 +83,18 @@ proc: BEGIN
 			ai.sd = iic.quantity;
 
 	-- Cálculo del visible
-	CREATE OR REPLACE TEMPORARY TABLE tItemVisibleCalc
+	CALL cache.visible_refresh(vCalcFk, FALSE, vWarehouseFk);
-		(PRIMARY KEY (itemFk))
-		ENGINE = MEMORY		
-		SELECT itemFk, SUM(quantity) visible
-			FROM (
-				SELECT s.itemFk, s.quantity
-					FROM sale s
-						JOIN ticket t ON t.id = s.ticketFk
-						JOIN warehouse w ON w.id = t.warehouseFk
-					WHERE t.shipped >= vDate
-						AND t.shipped < vDateTomorrow
-						AND (NOT isPicked AND NOT t.isLabeled AND t.refFk IS NULL)
-						AND IFNULL(vWarehouseFk, t.warehouseFk) = t.warehouseFk
-						AND w.isComparative
-				UNION ALL
-				SELECT b.itemFk, - b.quantity
-					FROM buy b
-						JOIN entry e ON e.id = b.entryFk
-						JOIN travel t ON t.id = e.travelFk
-						JOIN warehouse w ON w.id = t.warehouseInFk
-					WHERE t.landed = vDate
-						AND NOT t.isReceived
-						AND NOT e.isExcludedFromAvailable
-						AND NOT e.isRaid
-						AND IFNULL(vWarehouseFk, t.warehouseInFk) = t.warehouseInFk
-						AND w.isComparative
-				UNION ALL
-				SELECT b.itemFk, b.quantity
-					FROM buy b
-						JOIN entry e ON e.id = b.entryFk
-						JOIN travel t ON t.id = e.travelFk
-						JOIN warehouse w ON w.id = t.warehouseOutFk
-					WHERE t.shipped = vDate
-						AND NOT t.isReceived
-						AND NOT e.isExcludedFromAvailable
-						AND NOT e.isRaid
-						AND IFNULL(vWarehouseFk, t.warehouseOutFk) = t.warehouseOutFk
-						AND w.isComparative
-			) sub2
-			GROUP BY itemFk;
 
-	UPDATE tmp.itemInventory ai
+	CREATE OR REPLACE TEMPORARY TABLE tItemVisibleCalc
-			JOIN tItemVisibleCalc ivc ON ivc.itemFk = ai.id
+		(PRIMARY KEY (item_id))
-		SET ai.visible = ai.visible + ivc.visible;
+		ENGINE = MEMORY
+		SELECT item_id, visible
+			FROM cache.visible
+			WHERE calc_id = vCalcFk;
+
+	UPDATE tmp.itemInventory it
+			JOIN tItemVisibleCalc ivc ON ivc.item_id = it.id
+		SET it.visible = it.visible + ivc.visible;
 
 	-- Calculo del disponible
 	CREATE OR REPLACE TEMPORARY TABLE tmp.itemCalc
@@ -196,8 +165,8 @@ proc: BEGIN
 	DROP TEMPORARY TABLE
 		tmp.itemTravel,
 		tmp.itemCalc,
+		tmp.itemAtp,
 		tItemInventoryCalc,
-		tItemVisibleCalc,
+		tItemVisibleCalc;
-		tmp.itemAtp;
 END$$
 DELIMITER ;

db/routines/vn/procedures/productionSectorList.sql

@@ -104,5 +104,6 @@ BEGIN
 		) sub;
 	DROP TEMPORARY TABLE tmp.whiteTicket;
 	DROP TEMPORARY TABLE tmp.sectorTypeTicket;
+	DROP TEMPORARY TABLE tmp.productionBuffer;
 END$$
 DELIMITER ;

db/routines/vn/procedures/saleGroup_setParking.sql

@@ -1,17 +1,25 @@
 DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`saleGroup_setParking`(IN `vSaleGroupFk` VARCHAR(8), IN `vParkingFk` INT)
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`saleGroup_setParking`(
-proc: BEGIN
+	vSaleGroupFk VARCHAR(8),
+	vParkingFk INT
+)
+BEGIN
 /**
- * Aparca una preparación previa en un parking
+ * Aparca una preparación previa en un parking.
  *
  * @param vSaleGroupFk id de la preparación previa
  * @param vParkingFk id del parking
  */
-	UPDATE vn.saleGroup sg
+ 	DECLARE EXIT HANDLER FOR SQLEXCEPTION
+	BEGIN
+		RESIGNAL;
+	END;
+
+	UPDATE saleGroup sg
 		SET sg.parkingFk = vParkingFk
 			WHERE sg.id = vSaleGroupFk
-				AND sg.created >= TIMESTAMPADD(WEEK,-1,util.VN_CURDATE());
+				AND sg.created >= util.VN_CURDATE() - INTERVAL 1 WEEK;
 
-	CALL vn.ticket_setNextState(vn.ticket_get(vSaleGroupFk));
+	CALL ticket_setNextState(ticket_get(vSaleGroupFk));
 END$$
 DELIMITER ;

db/routines/vn/procedures/sale_PriceFix.sql

@@ -8,7 +8,7 @@ BEGIN
 			JOIN vn.component c ON c.id = sc.componentFk
 			JOIN vn.componentType ct ON ct.id = c.typeFk
 		WHERE s.ticketFk = vTicketFk
-			AND ct.`type` = 'otros';
+			AND ct.code = 'other';
 
 	UPDATE vn.sale s
 		JOIN (

db/routines/vn/procedures/sale_setProblem.sql

@@ -5,14 +5,32 @@ CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`sale_setProblem`(
 BEGIN
 /**
  * Update column sale.problem with a problem code
+ *
  * @param vProblemCode Code to set or unset
- * @table tmp.sale(saleFk, hasProblem)
+ * @table tmp.sale(saleFk, hasProblem, isProblemCalcNeeded)
  */
-	UPDATE sale s
+ 	DECLARE vSaleFk INT;
-			JOIN tmp.sale ts ON ts.saleFk = s.id 
+	DECLARE vHasProblem INT;
-		SET s.problem = CONCAT(
+	DECLARE vDone BOOL;
-			IF(ts.hasProblem,
+	DECLARE vSaleList CURSOR FOR SELECT saleFk, hasProblem FROM tmp.sale;
-				CONCAT(s.problem, ',', vProblemCode),
+	DECLARE CONTINUE HANDLER FOR NOT FOUND SET vDone = TRUE;
-				REPLACE(s.problem, vProblemCode , '')));
+
+	OPEN vSaleList;
+	l: LOOP
+		SET vDone = FALSE;
+		FETCH vSaleList INTO vSaleFk, vHasProblem;
+
+		IF vDone THEN
+			LEAVE l;
+		END IF;
+
+	UPDATE sale
+		SET problem = CONCAT(
+			IF(vHasProblem,
+				CONCAT(problem, ',', vProblemCode),
+				REPLACE(problem, vProblemCode , '')))
+		WHERE id = vSaleFk;
+	END LOOP;
+	CLOSE vSaleList;
 END$$
 DELIMITER ;

db/routines/vn/procedures/sale_setProblemComponentLack.sql

@@ -10,9 +10,13 @@ BEGIN
  * @param vSelf Id del sale
  */
 	CREATE OR REPLACE TEMPORARY TABLE tmp.sale
-		(INDEX(saleFk))
+		(INDEX(saleFk, isProblemCalcNeeded))
 		ENGINE = MEMORY
-		SELECT vSelf saleFk, sale_hasComponentLack(vSelf) hasProblem;
+		SELECT vSelf saleFk, 
+				sale_hasComponentLack(vSelf) hasProblem,
+				ticket_isProblemCalcNeeded(ticketFk) isProblemCalcNeeded
+			FROM sale 
+			WHERE id = vSelf;
 
 	CALL sale_setProblem('hasComponentLack');	
 

db/routines/vn/procedures/sale_setProblemComponentLackByComponent.sql

@@ -10,11 +10,13 @@ BEGIN
  * @param vComponentFk Id component
  */
 	CREATE OR REPLACE TEMPORARY TABLE tmp.sale
-		(INDEX(saleFk))
+		(INDEX(saleFk, isProblemCalcNeeded))
 		ENGINE = MEMORY
-		SELECT saleFk, sale_hasComponentLack(saleFk)hasProblem
+		SELECT saleFk, 
+				sale_hasComponentLack(saleFk) hasProblem, 
+				ticket_isProblemCalcNeeded(ticketFk) isProblemCalcNeeded
 			FROM (
-				SELECT s.id saleFk
+				SELECT s.id saleFk, s.ticketFk
 					FROM ticket t
 						JOIN sale s ON s.ticketFk = t.id
 						LEFT JOIN saleComponent sc ON sc.saleFk = s.id 

db/routines/vn/procedures/sale_setProblemRounding.sql

@@ -11,9 +11,10 @@ BEGIN
 	DECLARE vWarehouseFk INT;
 	DECLARE vShipped DATE;
 	DECLARE vQuantity INT;
+	DECLARE vIsProblemCalcNeeded BOOL;
 
-	SELECT s.itemFk, t.warehouseFk, t.shipped, s.quantity 
+	SELECT s.itemFk, t.warehouseFk, t.shipped, s.quantity, ticket_isProblemCalcNeeded(t.id) 
-			INTO vItemFk, vWarehouseFk, vShipped, vQuantity
+			INTO vItemFk, vWarehouseFk, vShipped, vQuantity, vIsProblemCalcNeeded
 		FROM sale s 
 			JOIN ticket t ON t.id = s.ticketFk 
 		WHERE s.id = vSelf;
@@ -21,7 +22,9 @@ BEGIN
 	CALL buyUltimate(vWarehouseFk, vShipped);	
 	
 	CREATE OR REPLACE TEMPORARY TABLE tmp.sale 
-		SELECT vSelf saleFk, MOD(vQuantity, b.`grouping`) hasProblem
+		SELECT vSelf saleFk, 
+				MOD(vQuantity, b.`grouping`) hasProblem,
+				vIsProblemCalcNeeded isProblemCalcNeeded
 			FROM tmp.buyUltimate bu
 				JOIN buy b ON b.id = bu.buyFk
 			WHERE bu.itemFk = vItemFk;

db/routines/vn/procedures/setParking.sql

@@ -1,6 +1,9 @@
 DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`setParking`(IN `vParam` VARCHAR(8), IN `vParkingCode` VARCHAR(8))
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`setParking`(
-proc: BEGIN
+	vParam VARCHAR(8),
+	vParkingCode VARCHAR(8)
+)
+BEGIN
 /**
  * Aparca una colección, un ticket, un saleGroup o un shelving en un parking
  *
@@ -8,56 +11,41 @@ proc: BEGIN
  * @param vParkingCode código del parking
  */
 	DECLARE vParkingFk INT;
-	DECLARE vIsSaleGroup BOOL;
+	DECLARE vLastWeek DATE;
-	DECLARE vIsTicket BOOL;
-	DECLARE vIsCollection BOOL;
 
-	SET vParkingCode = replace(vParkingCode,' ','');
+	DECLARE EXIT HANDLER FOR SQLEXCEPTION
+	BEGIN
+		ROLLBACK;
+		RESIGNAL;
+	END;
+
+	SET vParkingCode = REPLACE(vParkingCode, ' ', '');
 
 	SELECT id INTO vParkingFk
-		FROM vn.parking
+		FROM parking
 		WHERE code = vParkingCode COLLATE utf8_unicode_ci;
 
 	IF vParkingFk IS NULL THEN
 		CALL util.throw('parkingNotExist');
-		LEAVE proc;
 	END IF;
 
-	IF  vParam REGEXP '^[0-9]+$' THEN
+	START TRANSACTION;
-		-- Se comprueba si es una preparación previa
-		SELECT COUNT(*) INTO vIsSaleGroup
-			FROM vn.saleGroup sg
-			WHERE sg.id = vParam;
 
-		IF vIsSaleGroup THEN
+	SET vLastWeek = util.VN_CURDATE() - INTERVAL 1 WEEK;
-			CALL vn.saleGroup_setParking(vParam, vParkingFk);
-			LEAVE proc;
-		END IF;
 
-		-- Se comprueba si es un ticket
+	-- Comprobamos si es una prep. previa, ticket, colección o shelving
-		SELECT COUNT(*) INTO vIsTicket
+	IF (SELECT TRUE FROM saleGroup WHERE id = vParam) THEN
-			FROM vn.ticket t
+		CALL saleGroup_setParking(vParam, vParkingFk);
-			WHERE t.id = vParam
+	ELSEIF (SELECT TRUE FROM ticket	WHERE id = vParam AND shipped >= vLastWeek) THEN
-				AND t.shipped >= TIMESTAMPADD(WEEK,-1,util.VN_CURDATE());
+		CALL ticket_setParking(vParam, vParkingFk);
-
+	ELSEIF (SELECT TRUE	FROM `collection` WHERE id = vParam AND created >= vLastWeek) THEN
-		IF vIsTicket THEN
+		CALL collection_setParking(vParam, vParkingFk);
-			CALL vn.ticket_setParking(vParam, vParkingFk);
+	ELSEIF (SELECT TRUE	FROM shelving WHERE code = vParam COLLATE utf8_unicode_ci) THEN
-			LEAVE proc;
+		CALL shelving_setParking(vParam, vParkingFk);
-		END IF;
-
-		-- Se comprueba si es una coleccion de tickets
-		SELECT COUNT(*) INTO vIsCollection
-			FROM vn.collection c
-			WHERE c.id = vParam
-				AND c.created >= TIMESTAMPADD(WEEK,-1,util.VN_CURDATE());
-
-		IF vIsCollection THEN
-			CALL vn.collection_setParking(vParam, vParkingFk);
-			LEAVE proc;
-		END IF;
 	ELSE
-		-- Por descarte, se considera una matrícula
+		CALL util.throw('paramNotExist');
-		CALL vn.shelving_setParking(vParam, vParkingFk);
 	END IF;
+
+	COMMIT;
 END$$
 DELIMITER ;

db/routines/vn/procedures/ticket_DelayTruck.sql

@@ -3,14 +3,14 @@ CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`ticket_DelayTruck`(
 BEGIN
 	DECLARE done INT DEFAULT FALSE;
 	DECLARE vTicketFk INT;
-	DECLARE cur1 CURSOR FOR SELECT ticketFk FROM tmp.ticket;
+	DECLARE cur1 CURSOR FOR SELECT ticketFk FROM tTicket;
 
 	DECLARE CONTINUE HANDLER FOR NOT FOUND SET done = TRUE;
 
 	CALL vn.productionControl(vWarehouserFk,0) ;
 
-	DROP TEMPORARY TABLE IF EXISTS tmp.ticket;
+	DROP TEMPORARY TABLE IF EXISTS tTicket;
-	CREATE TEMPORARY TABLE tmp.ticket
+	CREATE TEMPORARY TABLE tTicket
 		SELECT ticketFk
 		FROM tmp.productionBuffer
 			JOIN alertLevel al ON al.code = 'FREE'
@@ -31,5 +31,6 @@ BEGIN
 	END LOOP;
 
 	CLOSE cur1;
+	DROP TEMPORARY TABLE tTicket, tmp.productionBuffer;
 END$$
 DELIMITER ;

db/routines/vn/procedures/ticket_add.sql

@@ -65,6 +65,8 @@ BEGIN
 		IF (vZoneFk IS NULL OR vZoneFk = 0) AND vIsRequiredZone THEN
 			CALL util.throw ('NOT_ZONE_WITH_THIS_PARAMETERS');
 		END IF;
+		
+		DROP TEMPORARY TABLE tmp.zoneGetShipped;
 	END IF;
 
 	INSERT INTO ticket (

db/routines/vn/procedures/ticket_checkNoComponents.sql

@@ -20,7 +20,8 @@ BEGIN
 			JOIN itemCategory ic ON ic.id = tp.categoryFk
 			JOIN saleComponent sc ON sc.saleFk = s.id
 			JOIN component c ON c.id = sc.componentFk
-			JOIN componentType ct ON ct.id = c.typeFk AND ct.id = 1
+			JOIN componentType ct ON ct.id = c.typeFk
+				AND ct.code = 'cost'
 		WHERE t.shipped BETWEEN vShippedFrom AND vShippedTo
 			AND ic.merchandise;
 

db/routines/vn/procedures/ticket_cloneWeekly.sql

@@ -213,6 +213,6 @@ BEGIN
 	END;
 	END LOOP;
 	CLOSE rsTicket;
-	DROP TEMPORARY TABLE IF EXISTS tmp.time;
+	DROP TEMPORARY TABLE IF EXISTS tmp.time, tmp.zoneGetLanded;
 END$$
 DELIMITER ;

db/routines/vn/procedures/ticket_getFromFloramondo.sql

@@ -66,7 +66,7 @@ BEGIN
 					JOIN vn.componentType ct ON ct.id = c.typeFk
 					JOIN vn.sale s ON s.id = sc.saleFk
 					JOIN tmp.ticket t ON t.ticketFk = s.ticketFk
-				WHERE ct.code = 'FREIGHT'
+				WHERE ct.code = 'freight'
 				GROUP BY t.ticketFk) sb ON sb.ticketFk = tf.ticketFk
 		SET tf.freight = sb.freight;
 
@@ -88,7 +88,7 @@ BEGIN
 
 	-- Margin
 	UPDATE tmp.ticketFloramondo tf
-		JOIN (SELECT SUM(IF(ct.code = 'COST',sc.value, 0)) cost,
+		JOIN (SELECT SUM(IF(ct.code = 'cost',sc.value, 0)) cost,
 					SUM(IF(ct.isMargin, sc.value, 0)) margin,
 					t.ticketFk
 				FROM vn.saleComponent sc

db/routines/vn/procedures/ticket_setNextState.sql

@@ -1,14 +1,21 @@
 DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`ticket_setNextState`(vSelf INT)
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`ticket_setNextState`(
+	vSelf INT
+)
 BEGIN
 /**
- * Cambia el estado del ticket al siguiente estado según la tabla state
+ * Cambia el estado del ticket al siguiente estado según la tabla state.
  *
- * @param vSelf id dle ticket
+ * @param vSelf Id ticket
  */
 	DECLARE vStateFk INT;
 	DECLARE vNewStateFk INT;
 
+	DECLARE EXIT HANDLER FOR SQLEXCEPTION
+	BEGIN
+		RESIGNAL;
+	END;
+
 	SELECT stateFk INTO vStateFk
 		FROM ticketState
 		WHERE ticketFk = vSelf;
@@ -17,6 +24,10 @@ BEGIN
 		FROM state
 		WHERE id = vStateFk;
 
+	IF vNewStateFk IS NULL THEN
+		CALL util.throw('The ticket not have next state');
+	END IF;
+
 	INSERT INTO ticketTracking(stateFk, ticketFk, userFk)
 		VALUES (vNewStateFk, vSelf, account.myUser_getId());
 END$$

db/routines/vn/procedures/ticket_setParking.sql

@@ -1,11 +1,14 @@
 DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`ticket_setParking`(IN `vTicketFk` VARCHAR(8), IN `vParkingFk` INT)
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`ticket_setParking`(
-proc: BEGIN
+	vSelf INT,
+	vParkingFk INT
+)
+BEGIN
 /**
- * Aparca un ticket en un parking
+ * Aparca un ticket en un parking.
  *
- * @param vTicketFk id del ticket
+ * @param vSelf Id ticket
- * @param vParkingFk id del parking
+ * @param vParkingFk Id parking
  */
 	DECLARE vDone INT DEFAULT FALSE;
 	DECLARE vCollectionTicketFk INT;
@@ -14,16 +17,21 @@ proc: BEGIN
 			FROM ticket t
 				LEFT JOIN ticketCollection tc1 ON tc1.ticketFk = t.id
 				LEFT JOIN ticketCollection tc2 ON tc2.collectionFk = tc1.collectionFk
-			WHERE t.id = vTicketFk;
+			WHERE t.id = vSelf;
 
 	DECLARE CONTINUE HANDLER FOR NOT FOUND SET vDone = TRUE;
 
+	DECLARE EXIT HANDLER FOR SQLEXCEPTION
+	BEGIN
+		RESIGNAL;
+	END;
+
 	INSERT INTO vn.ticketParking(ticketFk, parkingFk)
 		SELECT IFNULL(tc2.ticketFk, t.id), vParkingFk
 			FROM ticket t
 				LEFT JOIN ticketCollection tc1 ON tc1.ticketFk = t.id
 				LEFT JOIN ticketCollection tc2 ON tc2.collectionFk = tc1.collectionFk
-			WHERE t.id = vTicketFk
+			WHERE t.id = vSelf
 		ON DUPLICATE KEY UPDATE parkingFk = vParkingFk;
 
 	OPEN vCursor;

db/routines/vn/procedures/ticket_setProblem.sql

@@ -4,16 +4,34 @@ CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`ticket_setProblem`(
 )
 BEGIN
 /**
- * Update column ticket.problem with a problem code
+ * Update column ticket.problem with a problem code and SET NULL when
+ * the problem is not requiered
  * 
  * @param vProblemCode Code to set or unset
- * @table tmp.ticket(ticketFk, hasProblem)
+ * @table tmp.ticket(ticketFk, hasProblem, isProblemCalcNeeded)
  */
-	UPDATE ticket t
+ 	DECLARE vTicketFk INT;
-			JOIN tmp.ticket tt ON tt.ticketFk = t.id 
+	DECLARE vHasProblem INT;
-		SET t.problem = CONCAT(
+	DECLARE vDone BOOL;
-			IF(tt.hasProblem,
+	DECLARE vTicketList CURSOR FOR SELECT ticketFk, hasProblem FROM tmp.ticket;
-				CONCAT(problem, ',', vProblemCode),
+	DECLARE CONTINUE HANDLER FOR NOT FOUND SET vDone = TRUE;
-				REPLACE(problem, vProblemCode , '')));
+
+	OPEN vTicketList;
+	l: LOOP
+		SET vDone = FALSE;
+		FETCH vTicketList INTO vTicketFk, vHasProblem;
+
+		IF vDone THEN
+			LEAVE l;
+		END IF;
+
+		UPDATE ticket
+			SET problem = CONCAT(
+				IF(vHasProblem,
+					CONCAT(problem, ',', vProblemCode),
+					REPLACE(problem, vProblemCode , '')))
+			WHERE id = vTicketFk;
+	END LOOP;
+	CLOSE vTicketList;
 END$$
 DELIMITER ;

db/routines/vn/procedures/ticket_setProblemFreeze.sql

@@ -9,9 +9,11 @@ BEGIN
  * @param vClientFk Id Cliente, if NULL all clients
  */
 	CREATE OR REPLACE TEMPORARY TABLE tmp.ticket 
-		(INDEX(ticketFk))
+		(INDEX(ticketFk, isProblemCalcNeeded))
 		ENGINE = MEMORY
-		SELECT t.id ticketFk, FALSE hasProblem
+		SELECT t.id ticketFk, 
+				FALSE hasProblem, 
+				ticket_isProblemCalcNeeded(t.id) isProblemCalcNeeded
 			FROM ticket t 
 			WHERE t.shipped >= util.VN_CURDATE()
 				AND (vClientFk IS NULL OR t.clientFk = vClientFk);

db/routines/vn/procedures/ticket_setProblemRequest.sql

@@ -9,9 +9,11 @@ BEGIN
  * @param vSelf Id ticket, if NULL ALL tickets
  */
 	CREATE OR REPLACE TEMPORARY TABLE tmp.ticket 
-		(INDEX(ticketFk))
+		(INDEX(ticketFk, isProblemCalcNeeded))
 		ENGINE = MEMORY
-		SELECT t.id ticketFk, FALSE hasProblem 
+		SELECT t.id ticketFk, 
+				FALSE hasProblem, 
+				ticket_isProblemCalcNeeded(t.id) isProblemCalcNeeded
 			FROM ticket t 
 				WHERE t.shipped >= util.VN_CURDATE()
 					AND (vSelf IS NULL OR t.id = vSelf);

db/routines/vn/procedures/ticket_setProblemRisk.sql

@@ -10,21 +10,30 @@ BEGIN
  */
 	DECLARE vHasRisk BOOL;
 	DECLARE vHasHighRisk BOOL;
+	DECLARE vIsProblemCalcNeeded BOOL;
 
-	SELECT t.risk > (c.credit + 10), ((t.risk - cc.riskTolerance) > (c.credit + 10)) 
+	SELECT t.risk > (c.credit + 10), 
-			INTO vHasRisk, vHasHighRisk
+				(t.risk - cc.riskTolerance) > (c.credit + 10), 
+				ticket_isProblemCalcNeeded(t.id) 
+			INTO vHasRisk, vHasHighRisk, vIsProblemCalcNeeded
 		FROM client c
 			JOIN ticket t ON t.clientFk = c.id 
 			JOIN clientConfig cc
 		WHERE t.id = vSelf;
 
 	CREATE OR REPLACE TEMPORARY TABLE tmp.ticket 
-		SELECT vSelf ticketFk, vHasRisk hasProblem;
+		ENGINE = MEMORY
+		SELECT vSelf ticketFk, 
+			vHasRisk hasProblem, 
+			vIsProblemCalcNeeded isProblemCalcNeeded;
 	
 	CALL ticket_setProblem('hasRisk');
 
 	CREATE OR REPLACE TEMPORARY TABLE tmp.ticket 
-		SELECT vSelf ticketFk, vHasHighRisk hasProblem;
+		ENGINE = MEMORY
+		SELECT vSelf ticketFk, 
+			vHasHighRisk hasProblem, 
+			vIsProblemCalcNeeded isProblemCalcNeeded;
 	
 	CALL ticket_setProblem('hasHighRisk');
 

db/routines/vn/procedures/ticket_setProblemRounding.sql

@@ -19,7 +19,10 @@ BEGIN
 	CALL buyUltimate(vWarehouseFk, vDated);	
 	
 	CREATE OR REPLACE TEMPORARY TABLE tmp.sale
-		SELECT s.id saleFk , MOD(s.quantity, b.`grouping`) hasProblem
+		(INDEX(saleFk, isProblemCalcNeeded)) 
+		SELECT s.id saleFk , 
+				MOD(s.quantity, b.`grouping`) hasProblem, 
+				ticket_isProblemCalcNeeded(t.id) isProblemCalcNeeded
 			FROM ticket t
 				JOIN sale s ON s.ticketFk = t.id
 				JOIN tmp.buyUltimate bu ON bu.itemFk = s.itemFk

db/routines/vn/procedures/ticket_setProblemTaxDataChecked.sql

@@ -9,9 +9,11 @@ BEGIN
  * @param vClientFk Id cliente, if NULL all clients
  */
 	CREATE OR REPLACE TEMPORARY TABLE tmp.ticket 
-		(INDEX(ticketFk))
+		(INDEX(ticketFk, isProblemCalcNeeded))
 		ENGINE = MEMORY
-		SELECT t.id ticketFk, IF(c.isTaxDataChecked, FALSE, TRUE) hasProblem
+		SELECT t.id ticketFk, 
+				IF(c.isTaxDataChecked, FALSE, TRUE) hasProblem,
+				ticket_isProblemCalcNeeded(t.id) isProblemCalcNeeded
 			FROM ticket t 
 				JOIN client c ON c.id = t.clientFk 
 			WHERE t.shipped >= util.VN_CURDATE() 

db/routines/vn/procedures/ticket_setProblemTooLittle.sql

@@ -8,13 +8,17 @@ BEGIN
  *
  * @param vSelf Id del ticket
  */
+	
 	CREATE OR REPLACE TEMPORARY TABLE tmp.ticket 
-		(INDEX(ticketFk))
+		(INDEX(ticketFk, isProblemCalcNeeded))
 		ENGINE = MEMORY
-		SELECT vSelf ticketFk, ticket_isTooLittle(vSelf) hasProblem;
+		SELECT vSelf ticketFk, 
+			ticket_isTooLittle(vSelf) hasProblem, 
+			ticket_isProblemCalcNeeded(vSelf) isProblemCalcNeeded;
 	
 	CALL ticket_setProblem('isTooLittle');
 
 	DROP TEMPORARY TABLE tmp.ticket;
+
 END$$
 DELIMITER ;

db/routines/vn/procedures/ticket_setProblemTooLittleItemCost.sql

@@ -10,7 +10,7 @@ BEGIN
  * @param vItemFk Id del item, NULL ALL items
  */
 	CREATE OR REPLACE TEMPORARY TABLE tmp.ticket 
-		(INDEX(ticketFk))
+		(INDEX(ticketFk, isProblemCalcNeeded))
 		ENGINE = MEMORY
 		WITH tickets AS(
 			SELECT t.id ticketFk
@@ -19,7 +19,9 @@ BEGIN
 				WHERE t.shipped >= util.VN_CURDATE()
 					AND (s.itemFk = vItemFk OR vItemFk IS NULL)
 				GROUP BY t.id
-		)SELECT ticketFk, ticket_isTooLittle(ticketFk) hasProblem
+		)SELECT ticketFk, 
+				ticket_isTooLittle(ticketFk) hasProblem, 
+				ticket_isProblemCalcNeeded(t.id) isProblemCalcNeeded
 			FROM tickets;
 
 	CALL ticket_setProblem('isTooLittle');

db/routines/vn/procedures/ticket_setRisk.sql

@@ -8,6 +8,7 @@ BEGIN
  * @param vClientFk Id cliente
  */
 	DECLARE vHasDebt BOOL;
+	DECLARE vStarted DATETIME;
 
 	SELECT COUNT(*) INTO vHasDebt
 		FROM `client`
@@ -16,22 +17,24 @@ BEGIN
 
 	IF vHasDebt THEN
 
+		SELECT util.VN_CURDATE() - INTERVAL riskScope MONTH INTO vStarted
+			FROM clientConfig;
+
 		CREATE OR REPLACE TEMPORARY TABLE tTicketRisk
 			(KEY (ticketFk))
 			ENGINE = MEMORY
 		WITH ticket AS(
-		SELECT id ticketFk, companyFk, DATE(shipped) dated
+		SELECT id ticketFk, 
-			FROM vn.ticket t
+				companyFk, 
+				DATE(shipped) dated, 
+				totalWithVat,
+				ticket_isProblemCalcNeeded(id) isProblemCalcNeeded 
+			FROM vn.ticket 
 			WHERE clientFk = vClientFk
 				AND refFk IS NULL
 				AND NOT isDeleted 
-				AND totalWithoutVat <> 0
+				AND IFNULL(totalWithVat, 0) <> 0
-		), dated AS(
+				AND shipped > vStarted	
-		SELECT t.companyFk, MIN(DATE(t.dated) - INTERVAL cc.riskScope MONTH) started,
-				MAX(DATE(t.dated)) ended
-			FROM ticket t
-				JOIN vn.clientConfig cc	
-			GROUP BY t.companyFk	
 		), balance AS(
 		SELECT SUM(amount)amount, companyFk
 			FROM (
@@ -49,15 +52,11 @@ BEGIN
 			WHERE companyFk
 			GROUP BY companyFk
 		), uninvoiced AS(
-		SELECT t.companyFk, DATE(t.shipped) dated, SUM(IFNULL(t.totalWithVat, 0)) amount
+		SELECT companyFk, dated, SUM(totalWithVat) amount
-			FROM vn.ticket t
+			FROM ticket 
-				JOIN dated d
+			GROUP BY companyFk, dated
-			WHERE t.clientFk = vClientFk
-				AND t.refFk IS NULL
-				AND t.shipped BETWEEN d.started AND d.ended
-			GROUP BY t.companyFk, DATE(t.shipped)
 		), receipt AS(
-		SELECT companyFk,DATE(payed) dated, SUM(amountPaid) amount
+		SELECT companyFk, DATE(payed) dated, SUM(amountPaid) amount
 		 	FROM vn.receipt 
 			WHERE clientFk = vClientFk
 				AND payed > util.VN_CURDATE() 
@@ -79,7 +78,15 @@ BEGIN
 
 		UPDATE ticket t 
 				JOIN tTicketRisk tr ON tr.ticketFk = t.id
-			SET t.risk = tr.amount;
+			SET t.risk = tr.amount
+			WHERE tr.isProblemCalcNeeded
+			ORDER BY t.id;
+
+		UPDATE ticket t 
+				JOIN tTicketRisk tr ON tr.ticketFk = t.id
+			SET t.risk = NULL
+			WHERE tr.isProblemCalcNeeded
+			ORDER BY t.id;	
 
 		DROP TEMPORARY TABLE tTicketRisk;
 	END IF;	

db/routines/vn/procedures/ticket_splitItemPackingType.sql

@@ -1,15 +1,15 @@
 DELIMITER $$
 CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`ticket_splitItemPackingType`(
-	vTicketFk INT,
+	vSelf INT,
-	vOriginalItemPackingTypeFk VARCHAR(1)
+	vItemPackingTypeFk VARCHAR(1)
 )
 BEGIN
 /**
  * Clona y reparte las ventas de un ticket en funcion del tipo de empaquetado.
  * Respeta el id inicial para el tipo propuesto.
  *
- * @param vTicketFk Identificador de vn.ticket
+ * @param vSelf Id ticket
- * @param vOriginalItemPackingTypeFk Tipo para el que se reserva el número de ticket original
+ * @param vItemPackingTypeFk Tipo para el que se reserva el número de ticket original
  * @return table tmp.ticketIPT(ticketFk, itemPackingTypeFk)
  */
 	DECLARE vItemPackingTypeFk VARCHAR(1) DEFAULT 'H';
@@ -19,11 +19,11 @@ BEGIN
 	DECLARE vErrorNumber INT;
 	DECLARE vErrorMsg TEXT;
 
-	DECLARE cur1 CURSOR FOR
+	DECLARE vSaleGroup CURSOR FOR
 		SELECT itemPackingTypeFk
-			FROM tmp.saleGroup
+			FROM tSaleGroup
 			WHERE itemPackingTypeFk IS NOT NULL
-			ORDER BY (itemPackingTypeFk = vOriginalItemPackingTypeFk) DESC;
+			ORDER BY (itemPackingTypeFk = vItemPackingTypeFk) DESC;
 
 	DECLARE CONTINUE HANDLER FOR NOT FOUND SET vDone = TRUE;
 
@@ -36,35 +36,44 @@ BEGIN
 		CALL util.debugAdd('ticket_splitItemPackingType', JSON_OBJECT(
 				'errorNumber', vErrorNumber,
 				'errorMsg', vErrorMsg,
-				'ticketFk', vTicketFk
+				'ticketFk', vSelf
 			)); -- Tmp
+		ROLLBACK;
 		RESIGNAL;
 	END;
 
-	DELETE FROM vn.sale
+	START TRANSACTION;
-		WHERE quantity = 0
-		AND ticketFk = vTicketFk;
 
-	CREATE OR REPLACE TEMPORARY TABLE tmp.sale
+	SELECT id
+		FROM sale
+		WHERE ticketFk = vSelf
+			AND NOT quantity
+		FOR UPDATE;
+
+	DELETE FROM sale
+		WHERE NOT quantity
+		AND ticketFk = vSelf;
+
+	CREATE OR REPLACE TEMPORARY TABLE tSale
 		(PRIMARY KEY (id))
 		ENGINE = MEMORY
-		SELECT s.id, i.itemPackingTypeFk , IFNULL(sv.litros, 0) litros
+		SELECT s.id, i.itemPackingTypeFk, IFNULL(sv.litros, 0) litros
-			FROM vn.sale s
+			FROM sale s
-				JOIN vn.item i ON i.id = s.itemFk
+				JOIN item i ON i.id = s.itemFk
-				LEFT JOIN vn.saleVolume sv ON sv.saleFk = s.id
+				LEFT JOIN saleVolume sv ON sv.saleFk = s.id
-			WHERE s.ticketFk = vTicketFk;
+			WHERE s.ticketFk = vSelf;
 
-	CREATE OR REPLACE TEMPORARY TABLE tmp.saleGroup
+	CREATE OR REPLACE TEMPORARY TABLE tSaleGroup
 		ENGINE = MEMORY
 		SELECT itemPackingTypeFk, SUM(litros) totalLitros
-			FROM tmp.sale
+			FROM tSale
 			GROUP BY itemPackingTypeFk;
 
 	SELECT COUNT(*) INTO vPackingTypesToSplit
-		FROM tmp.saleGroup
+		FROM tSaleGroup
 		WHERE itemPackingTypeFk IS NOT NULL;
 
-	CREATE OR REPLACE TEMPORARY TABLE tmp.ticketIPT (
+	CREATE OR REPLACE TEMPORARY TABLE tmp.ticketIPT(
 		ticketFk INT,
 		itemPackingTypeFk VARCHAR(1)
 	) ENGINE = MEMORY;
@@ -72,55 +81,63 @@ BEGIN
 	CASE vPackingTypesToSplit
 		WHEN 0 THEN
 			INSERT INTO tmp.ticketIPT(ticketFk, itemPackingTypeFk)
-				VALUES(vTicketFk, vItemPackingTypeFk);
+				VALUES(vSelf, vItemPackingTypeFk);
 		WHEN 1 THEN
 			INSERT INTO tmp.ticketIPT(ticketFk, itemPackingTypeFk)
-				SELECT vTicketFk, itemPackingTypeFk
+				SELECT vSelf, itemPackingTypeFk
-					FROM tmp.saleGroup
+					FROM tSaleGroup
 					WHERE itemPackingTypeFk IS NOT NULL;
 		ELSE
-			OPEN cur1;
+			OPEN vSaleGroup;
-
+			FETCH vSaleGroup INTO vItemPackingTypeFk;
-			FETCH cur1 INTO vItemPackingTypeFk;
 
 			INSERT INTO tmp.ticketIPT(ticketFk, itemPackingTypeFk)
-				VALUES(vTicketFk, vItemPackingTypeFk);
+				VALUES(vSelf, vItemPackingTypeFk);
 
-			read_loop: LOOP
+			l: LOOP
-				FETCH cur1 INTO vItemPackingTypeFk;
+				SET vDone = FALSE;
+				FETCH vSaleGroup INTO vItemPackingTypeFk;
 
 				IF vDone THEN
-					LEAVE read_loop;
+					LEAVE l;
 				END IF;
 
-				CALL vn.ticket_Clone(vTicketFk, vNewTicketFk);
+				CALL ticket_Clone(vSelf, vNewTicketFk);
 
 				INSERT INTO tmp.ticketIPT(ticketFk, itemPackingTypeFk)
 					VALUES(vNewTicketFk, vItemPackingTypeFk);
 			END LOOP;
 
-			CLOSE cur1;
+			CLOSE vSaleGroup;
 
-			UPDATE vn.sale s
+			SELECT s.id
-					JOIN tmp.sale ts ON ts.id = s.id
+				FROM sale s
+					JOIN tSale ts ON ts.id = s.id
+					JOIN tmp.ticketIPT t ON t.itemPackingTypeFk = ts.itemPackingTypeFk
+				FOR UPDATE;
+
+			UPDATE sale s
+					JOIN tSale ts ON ts.id = s.id
 					JOIN tmp.ticketIPT t ON t.itemPackingTypeFk = ts.itemPackingTypeFk
 				SET s.ticketFk = t.ticketFk;
 
 			SELECT itemPackingTypeFk INTO vItemPackingTypeFk
-				FROM tmp.saleGroup sg
+				FROM tSaleGroup sg
 				WHERE sg.itemPackingTypeFk IS NOT NULL
 				ORDER BY sg.itemPackingTypeFk
 				LIMIT 1;
 
-			UPDATE vn.sale s
+			UPDATE sale s
-					JOIN tmp.sale ts ON ts.id = s.id
+					JOIN tSale ts ON ts.id = s.id
 					JOIN tmp.ticketIPT t ON t.itemPackingTypeFk = vItemPackingTypeFk
 				SET s.ticketFk = t.ticketFk
 				WHERE ts.itemPackingTypeFk IS NULL;
 	END CASE;
 
+	COMMIT;
+
 	DROP TEMPORARY TABLE
-		tmp.sale,
+		tSale,
-		tmp.saleGroup;
+		tSaleGroup;
 END$$
 DELIMITER ;

db/routines/vn/procedures/workerTimeControl_direction.sql

@@ -9,6 +9,8 @@ BEGIN
  */
 	DECLARE vLastIn DATETIME ;
 	DECLARE vIsMiddleOdd BOOLEAN ;
+	DECLARE vMailTo VARCHAR(50) DEFAULT NULL;
+	DECLARE vUserName VARCHAR(50) DEFAULT NULL;
 
 	IF (vTimed IS NULL) THEN 
 		SET vTimed = util.VN_NOW();
@@ -57,5 +59,18 @@ BEGIN
 			VALUES('in', NULL);
 	END IF;
 
+	IF (SELECT option1 IS NULL AND option2 IS NULL FROM  tmp.workerTimeControlDirection) THEN
+		SELECT CONCAT(u.name, '@verdnatura.es'), CONCAT(w.firstName, ' ', w.lastName)
+				INTO vMailTo, vUserName
+			FROM account.user u
+				JOIN worker w ON w.bossFk = u.id
+			WHERE w.id = vWorkerFk;
+
+		CALL mail_insert( 
+			vMailTo, 
+			vMailTo, 
+			'Error al fichar', 
+			CONCAT(vUserName, ' tiene problemas para fichar'));
+	END IF;
 END$$
 DELIMITER ;

db/routines/vn/procedures/zone_getCollisions.sql

@@ -103,6 +103,7 @@ BEGIN
 	DROP TEMPORARY TABLE
 		geoCollision,
 		tmp.zone,
-		tmp.zoneNodes;
+		tmp.zoneNodes,
+		tmp.zoneOption;
 END$$
 DELIMITER ;

db/routines/vn/triggers/delivery_beforeInsert.sql

@@ -3,18 +3,11 @@ CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`delivery_beforeInsert
 	BEFORE INSERT ON `delivery`
 	FOR EACH ROW
 BEGIN
-
+	IF (NEW.longitude IS NOT NULL 
-	IF (NEW.longitude IS NOT NULL AND NEW.latitude IS NOT NULL AND NEW.ticketFK IS NOT NULL)
+		AND NEW.latitude IS NOT NULL 
+		AND NEW.ticketFK IS NOT NULL) 
 	THEN
-		UPDATE address
+		CALL address_updateCoordinates(NEW.ticketFk, NEW.longitude, NEW.latitude);
-		SET longitude = NEW.longitude,
-			latitude = NEW.latitude
-		WHERE id IN (
-					SELECT addressFK
-						FROM ticket
-						WHERE id = NEW.ticketFk
-					);
 	END IF;
-
 END$$
 DELIMITER ;

db/routines/vn/triggers/delivery_beforeUpdate.sql

@@ -3,18 +3,11 @@ CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`delivery_beforeUpdate
 	BEFORE UPDATE ON `delivery`
 	FOR EACH ROW
 BEGIN
-
+	IF (NEW.longitude IS NOT NULL 
-IF (NEW.longitude IS NOT NULL AND NEW.latitude IS NOT NULL AND NEW.ticketFK IS NOT NULL)
+		AND NEW.latitude IS NOT NULL 
+		AND NEW.ticketFK IS NOT NULL) 
 	THEN
-		UPDATE address
+		CALL address_updateCoordinates(NEW.ticketFk, NEW.longitude, NEW.latitude);
-		SET longitude = NEW.longitude,
-			latitude = NEW.latitude
-		WHERE id IN (
-					SELECT addressFK
-						FROM ticket
-						WHERE id = NEW.ticketFk
-					);
 	END IF;
-
 END$$
 DELIMITER ;

db/routines/vn/triggers/itemMinimumQuantity_afterDelete.sql

@@ -0,0 +1,12 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`itemMinimumQuantity_afterDelete`
+	AFTER DELETE ON `itemMinimumQuantity`
+	FOR EACH ROW
+BEGIN
+	INSERT INTO itemLog
+		SET `action` = 'delete',
+			`changedModel` = 'ItemMinimumQuantity',
+			`changedModelId` = OLD.id,
+			`userFk` = account.myUser_getId();
+END$$
+DELIMITER ;

db/routines/vn/triggers/itemMinimumQuantity_beforeInsert.sql

@@ -0,0 +1,8 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`itemMinimumQuantity_beforeInsert`
+	BEFORE INSERT ON `itemMinimumQuantity`
+	FOR EACH ROW
+BEGIN
+	SET NEW.editorFk = account.myUser_getId();
+END$$
+DELIMITER ;

db/routines/vn/triggers/itemMinimumQuantity_beforeUpdate.sql

@@ -0,0 +1,8 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`itemMinimumQuantity_beforeUpdate`
+	BEFORE UPDATE ON `itemMinimumQuantity`
+	FOR EACH ROW
+BEGIN
+	SET NEW.editorFk = account.myUser_getId();
+END$$
+DELIMITER ;

db/routines/vn/triggers/itemShelving _afterDelete.sql

@@ -1,5 +1,5 @@
 DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`itemShelving _afterDelete`
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`itemShelving_afterDelete`
 	AFTER DELETE ON `itemShelving`
 	FOR EACH ROW
 BEGIN

db/routines/vn/triggers/productionConfig_afterDelete.sql

@@ -0,0 +1,12 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`productionConfig_afterDelete`
+	AFTER DELETE ON `productionConfig`
+	FOR EACH ROW
+BEGIN
+	INSERT INTO productionConfig
+		SET `action` = 'delete',
+			`changedModel` = 'ProductionConfig',
+			`changedModelId` = OLD.id,
+			`userFk` = account.myUser_getId();
+END$$
+DELIMITER ;

db/routines/vn/triggers/productionConfig_beforeInsert.sql

@@ -0,0 +1,8 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`productionConfig_beforeInsert`
+	BEFORE INSERT ON `productionConfig`
+	FOR EACH ROW
+BEGIN
+	SET NEW.editorFk = account.myUser_getId();
+END$$
+DELIMITER ;

db/routines/vn/triggers/productionConfig_beforeUpdate.sql

@@ -0,0 +1,8 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`productionConfig_beforeUpdate`
+	BEFORE UPDATE ON `productionConfig`
+	FOR EACH ROW
+BEGIN
+	SET NEW.editorFk = account.myUser_getId();
+END$$
+DELIMITER ;

db/routines/vn/views/saleCost.sql

@@ -19,4 +19,4 @@ FROM (
 		)
 		JOIN `vn`.`componentType` `ct` ON(`ct`.`id` = `c`.`typeFk`)
 	)
-WHERE `ct`.`type` = 'coste'
+WHERE `ct`.`code` = 'cost'

db/routines/vn/views/sale_freightComponent.sql

@@ -16,6 +16,6 @@ FROM (
 		)
 		JOIN `vn`.`componentType` `ct` ON(
 			`ct`.`id` = `c`.`typeFk`
-			AND `ct`.`type` = 'agencia'
+			AND `ct`.`code` = 'freight'
 		)
 	)

db/routines/vn2008/views/Tipos.sql

@@ -9,14 +9,9 @@ AS SELECT `it`.`id` AS `tipo_id`,
 	`it`.`workerFk` AS `Id_Trabajador`,
 	`it`.`life` AS `life`,
 	`it`.`isPackaging` AS `isPackaging`,
-	`it`.`density` AS `density`,
 	`it`.`isInventory` AS `inventory`,
 	`it`.`created` AS `odbc_date`,
 	`it`.`making` AS `confeccion`,
 	`it`.`temperatureFk` AS `Temperatura`,
-	`it`.`promo` AS `promo`,
+	`it`.`promo` AS `promo`
-	`it`.`maneuver` AS `maneuver`,
-	`it`.`target` AS `target`,
-	`it`.`topMargin` AS `top_margin`,
-	`it`.`profit` AS `profit`
 FROM `vn`.`itemType` `it`

db/routines/vn2008/views/buySource.sql

@@ -54,8 +54,7 @@ AS SELECT `b`.`entryFk` AS `Id_Entrada`,
 	`i`.`packingOut` AS `packingOut`,
 	`b`.`itemOriginalFk` AS `itemOriginalFk`,
 	`io`.`longName` AS `itemOriginalName`,
-	`it`.`gramsMax` AS `gramsMax`,
+	`it`.`gramsMax` AS `gramsMax`
-	`i`.`minQuantity` AS `minQuantity`
 FROM (
 		(
 			(

db/routines/vn2008/views/buy_edi.sql

@@ -2,7 +2,6 @@ CREATE OR REPLACE DEFINER=`root`@`localhost`
 	SQL SECURITY DEFINER
 	VIEW `vn2008`.`buy_edi`
 AS SELECT `t`.`id` AS `id`,
-	`t`.`barcode` AS `barcode`,
 	`t`.`entryYear` AS `entry_year`,
 	`t`.`deliveryNumber` AS `delivery_number`,
 	`t`.`fec` AS `fec`,

db/versions/10960-silverRoebelini/00-firstScript.sql

@@ -0,0 +1,23 @@
+-- Place your SQL code here
+CREATE TABLE IF NOT EXISTS `vn`.`agencyIncoming` (
+  `agencyModeFk` int(11) NOT NULL,
+	PRIMARY KEY (`agencyModeFk`)
+)
+ENGINE=InnoDB 
+DEFAULT CHARSET=utf8mb3
+COLLATE=utf8mb3_unicode_ci COMMENT='Agencias de entrada de mercancias';
+
+INSERT IGNORE INTO vn.agencyIncoming (agencyModeFk) VALUES 
+(1343), (1002), (1282), (841), (1303), (714), (556), (1786), (1785), (1784),
+(1780), (1783), (1758), (1782), (1772), (1789), (1776), (1791), (1778), (1792),
+(1779), (1362), (681), (1765), (15), (1594), (1706), (1707), (907), (1260),
+(1715), (1371), (1372), (53), (689), (1375), (738), (742), (1307), (1700), (608),
+(1311), (1315), (1339), (1433), (1338), (1332), (1844), (842), (1382), (1466),
+(1719), (1723), (1725), (1720), (1732), (1736), (1728), (1724), (1726), (1727),
+(1767), (1734), (1730), (1845), (1729), (1746), (1699), (2), (671), (1379), (614),
+(1718), (1697), (62), (1529), (1392), (1378), (1438), (1796), (1688), (686),
+(1326), (1691), (1), (1560), (1695), (1696), (1558), (1648), (1649), (1598),
+(1680), (1694), (1600), (1601), (1602), (1712), (1603), (1604), (1641), (1692),
+(1693), (1650), (1683), (1682), (1681), (1713), (1826), (1768), (1769), (1770),
+(1593), (1443), (1244), (1679), (1006), (1361), (1102), (1655), (1744), (1225),
+(1007);

db/versions/10986-pinkChrysanthemum/00-addSummaryId.sql

@@ -0,0 +1,22 @@
+ALTER TABLE vn.claimLog ADD COLUMN IF NOT EXISTS summaryId varchar(30);
+ALTER TABLE vn.clientLog ADD COLUMN IF NOT EXISTS summaryId varchar(30);
+ALTER TABLE vn.deviceProductionLog ADD COLUMN IF NOT EXISTS summaryId varchar(30);
+ALTER TABLE vn.entryLog ADD COLUMN IF NOT EXISTS summaryId varchar(30);
+ALTER TABLE vn.invoiceInLog ADD COLUMN IF NOT EXISTS summaryId varchar(30);
+ALTER TABLE vn.itemLog ADD COLUMN IF NOT EXISTS summaryId varchar(30);
+ALTER TABLE vn.packingSiteDeviceLog ADD COLUMN IF NOT EXISTS summaryId varchar(30);
+ALTER TABLE vn.parkingLog ADD COLUMN IF NOT EXISTS summaryId varchar(30);
+ALTER TABLE vn.rateLog ADD COLUMN IF NOT EXISTS summaryId varchar(30);
+ALTER TABLE vn.routeLog ADD COLUMN IF NOT EXISTS summaryId varchar(30);
+ALTER TABLE vn.shelvingLog ADD COLUMN IF NOT EXISTS summaryId varchar(30);
+ALTER TABLE vn.supplierLog ADD COLUMN IF NOT EXISTS summaryId varchar(30);
+ALTER TABLE vn.ticketLog ADD COLUMN IF NOT EXISTS summaryId varchar(30);
+ALTER TABLE vn.travelLog ADD COLUMN IF NOT EXISTS summaryId varchar(30);
+ALTER TABLE vn.userLog ADD COLUMN IF NOT EXISTS summaryId varchar(30);
+ALTER TABLE vn.workerLog ADD COLUMN IF NOT EXISTS summaryId varchar(30);
+ALTER TABLE vn.zoneLog ADD COLUMN IF NOT EXISTS summaryId varchar(30);
+
+ALTER TABLE account.userLog ADD COLUMN IF NOT EXISTS summaryId varchar(30);
+ALTER TABLE account.signInLog ADD COLUMN IF NOT EXISTS summaryId varchar(30);
+ALTER TABLE account.roleLog ADD COLUMN IF NOT EXISTS summaryId varchar(30);
+ALTER TABLE account.accountLog ADD COLUMN IF NOT EXISTS summaryId varchar(30);

db/versions/11118-limeCymbidium/00-firstScript.sql

@@ -0,0 +1,21 @@
+
+INSERT IGNORE INTO salix.ACL (`model`,`property`,`accessType`,`permission`,`principalType`,`principalId`)
+	VALUES ('Entry','filter','READ','ALLOW','ROLE','supplier');
+
+INSERT IGNORE INTO salix.ACL (`model`,`property`,`accessType`,`permission`,`principalType`,`principalId`)
+	VALUES ('Entry','getBuys','READ','ALLOW','ROLE','supplier');
+
+INSERT IGNORE INTO salix.ACL (`model`,`property`,`accessType`,`permission`,`principalType`,`principalId`)
+	VALUES ('Entry','buyLabel','READ','ALLOW','ROLE','supplier');
+
+INSERT IGNORE INTO `account`.`role` (`name`,`description`,`hasLogin`,`created`,`modified`)
+	VALUES ('supplier','Proveedores',1,'2017-10-10 14:58:58.000','2017-10-10 14:59:20.000');
+SET @supplierFk =LAST_INSERT_ID();
+INSERT IGNORE INTO account.roleInherit (`role`,`inheritsFrom`)
+	VALUES (@supplierFk,2);
+
+UPDATE salix.ACL
+	SET principalId='$authenticated'
+	WHERE id=264;
+
+

db/versions/11119-tealGerbera/00-firstScript.sql

@@ -0,0 +1,9 @@
+ALTER TABLE vn.componentType
+    CHANGE code code varchar(20) CHARACTER SET utf8mb3 COLLATE utf8mb3_unicode_ci DEFAULT NULL NULL AFTER id;
+ALTER TABLE vn.componentType
+    CHANGE `type` name varchar(45) CHARACTER SET utf8mb3 COLLATE utf8mb3_unicode_ci NOT NULL;
+UPDATE IGNORE vn.componentType
+	SET code = LOWER(code);
+UPDATE IGNORE vn.componentType
+	SET code = 'other'
+	WHERE id = 12;

db/versions/11120-brownTulip/00-firstScript.sql

@@ -0,0 +1,6 @@
+ALTER TABLE vn.itemType
+    CHANGE maneuver maneuver__ double DEFAULT 0.21 NOT NULL COMMENT '@deprecated 2024-07-01 refs #7418',
+    CHANGE target target__ double DEFAULT 0.15 NOT NULL COMMENT '@deprecated 2024-07-01 refs #7418',
+    CHANGE topMargin topMargin__ double DEFAULT 0.3 NOT NULL COMMENT '@deprecated 2024-07-01 refs #7418',
+    CHANGE profit profit__ double DEFAULT 0.02 NOT NULL COMMENT '@deprecated 2024-07-01 refs #7418',
+    CHANGE density density__ double DEFAULT 167 NOT NULL COMMENT '@deprecated 2024-07-01 refs #7418 Almacena el valor por defecto de la densidad en kg/m3 para el calculo de los portes aereos, en articulos se guarda la correcta';

db/versions/11121-silverAralia/00-firstScript.sql

@@ -0,0 +1,4 @@
+ALTER TABLE account.mailAliasAccount
+	ADD editorFk INT(10) UNSIGNED DEFAULT NULL,
+	ADD CONSTRAINT mailAliasAccount_editorFk FOREIGN KEY (editorFk)
+		REFERENCES account.`user`(id);

db/versions/11126-blueCamellia/00-firstScript.sql

@@ -0,0 +1,2 @@
+ALTER TABLE `vn`.`client`
+ADD COLUMN `hasDailyInvoice` TINYINT(1) NOT NULL DEFAULT 0 COMMENT 'Indica si el cliente requiere facturación diaria por defecto se copiará lo que tenga country.hasDailyInvoice';

db/versions/11128-turquoiseCymbidium/00-firstScript.sql

@@ -0,0 +1 @@
+ALTER TABLE vn.calendar ADD created timestamp DEFAULT current_timestamp() NOT NULL AFTER dated;

db/versions/11129-limeHydrangea/00-firstScript.sql

@@ -0,0 +1 @@
+ALTER TABLE vn.greuge CHANGE Id id int(10) unsigned auto_increment NOT NULL;

db/versions/11130-crimsonIvy/00-firstScript.sql

@@ -0,0 +1,23 @@
+ALTER TABLE vn.productionConfig
+    ADD editorFk int(10) unsigned DEFAULT NULL NULL;
+ALTER TABLE vn.productionConfig
+    ADD CONSTRAINT productionConfig_user_FK FOREIGN KEY (editorFk) REFERENCES account.`user`(id);
+
+CREATE OR REPLACE TABLE `vn`.`productionConfigLog` (
+    `id` int(11) NOT NULL AUTO_INCREMENT,
+    `originFk` int(11) DEFAULT NULL,
+    `userFk` int(10) unsigned DEFAULT NULL,
+    `action` set('insert','update','delete','select') NOT NULL,
+    `creationDate` timestamp NULL DEFAULT current_timestamp(),
+    `description` text CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT NULL,
+    `changedModel` enum('ProductionConfig') NOT NULL DEFAULT 'ProductionConfig',
+    `oldInstance` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL CHECK (json_valid(`oldInstance`)),
+    `newInstance` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL CHECK (json_valid(`newInstance`)),
+    `changedModelId` int(11) NOT NULL,
+    `changedModelValue` varchar(45) DEFAULT NULL,
+    PRIMARY KEY (`id`),
+    KEY `productionConfigLog_userFk` (`userFk`),
+    KEY `productionConfigLog_changedModel` (`changedModel`,`changedModelId`,`creationDate`),
+    KEY `productionConfigLog_originFk` (`originFk`,`creationDate`),
+    CONSTRAINT `productionConfigUserFk` FOREIGN KEY (`userFk`) REFERENCES `account`.`user` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
+) ENGINE=InnoDB AUTO_INCREMENT=0 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;

db/versions/11131-brownPhormium/00-firstScript.sql

@@ -0,0 +1 @@
+ALTER TABLE vn.itemShelving ADD isSplit tinyint(1) NULL COMMENT 'Este valor cambia al splitar un carro que se ha quedado en holanda';

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

@@ -0,0 +1,2 @@
+INSERT IGNORE INTO vn.observationType (`description`,code)
+    VALUES ('Sustitución','substitution');