Merge branch 'test' into 8030-testPriceDelta

2024-10-02 05:40:48 +00:00 · 2024-10-02 05:40:48 +00:00 · d87f940fff
parent 7d3c2a4a1c 1cf14035d5
commit d87f940fff
44 changed files with 360 additions and 210 deletions
--- a/back/models/buyer.json
+++ b/back/models/buyer.json
@ -15,9 +15,6 @@
 		"nickname": {
 			"type": "string",
 			"required": true
-		},
-		"display": {
-			"type": "boolean"
 		}
 	},
 	"acls": [
--- a/db/dump/fixtures.before.sql
+++ b/db/dump/fixtures.before.sql
@ -179,12 +179,12 @@ INSERT INTO `vn`.`country`(`id`, `name`, `isUeeMember`, `code`, `currencyFk`, `i
        (30,'Canarias', 1, 'IC', 1, 24, 4, 1, 2);

 INSERT INTO `vn`.`warehouse`(`id`, `name`, `code`, `isComparative`, `isInventory`, `hasAvailable`, `isManaged`, `hasDms`, `hasComission`, `countryFk`, `hasProduction`, `isOrigin`, `isDestiny`)
-    VALUES (1,  'Warehouse One',   'ALG',   1, 1, 1, 1, 1, 1, 1,   1, 1, 1),
+    VALUES
+        (1,  'Warehouse One',   'ALG',   1, 1, 1, 1, 1, 1, 1,   1, 1, 1),
        (2,  'Warehouse Two',   NULL,    1, 1, 1, 1, 0, 1, 13,  1, 1, 0),
        (3,  'Warehouse Three', NULL,    1, 1, 1, 1, 0, 0, 1,   1, 1, 0),
        (4,  'Warehouse Four',  NULL,    1, 1, 1, 1, 0, 0, 1,   1, 0, 1),
        (5,  'Warehouse Five',  NULL,    1, 1, 1, 1, 0, 0, 1,   1, 0, 0),
-        (6,  'Warehouse six',   'VNH',    1, 1, 1, 1, 0, 0, 1,   1, 0, 0),
        (13, 'Inventory',       'inv',   1, 1, 1, 0, 0, 0, 1,   0, 0, 0),
        (60, 'Algemesi',        NULL,    1, 1, 1, 0, 0, 0, 1,   0, 0, 0);

@ -1497,16 +1497,16 @@ INSERT INTO `vn`.`awb` (id, code, package, weight, created, amount, transitoryFk
        (10,    '07546500856', 185, 2364,   util.VN_CURDATE(),  5321, 442, 1);

 INSERT INTO `vn`.`travel`(`id`,`shipped`, `landed`, `warehouseInFk`, `warehouseOutFk`, `agencyModeFk`, `m3`, `kg`,`ref`, `totalEntries`, `cargoSupplierFk`, `awbFK`)
-    VALUES (1,  DATE_ADD(util.VN_CURDATE(), INTERVAL -2 MONTH), DATE_ADD(util.VN_CURDATE(), INTERVAL -2 MONTH), 1, 2, 1, 100.00, 1000, 'first travel',   1, 1, 1),
-        (2,  DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 1, 2, 1, 150.00, 2000, 'second travel',  2, 2, 2),
+    VALUES
+        (1, DATE_ADD(util.VN_CURDATE(), INTERVAL -2 MONTH), DATE_ADD(util.VN_CURDATE(), INTERVAL -2 MONTH), 1, 2, 1, 100.00, 1000,  'first travel',     1, 1, 1),
+        (2, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 1, 2, 1, 150,    2000,  'second travel',    2, 2, 2),
        (3, util.VN_CURDATE(),                              util.VN_CURDATE(),                              1, 2, 1, 0.00,   0.00,  'third travel',     1, 1, 3),
        (4, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 1, 3, 1, 50.00,  500,   'fourth travel',    0, 2, 4),
        (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),
-        (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),
-        (11, util.VN_CURDATE()                           ,             util.VN_CURDATE() + INTERVAL 1 DAY,   6, 3, 0, 50.00, 500, 'eleventh travel',  1, 2, 4);
+        (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
@ -1519,8 +1519,7 @@ INSERT INTO `vn`.`entry`(`id`, `supplierFk`, `created`, `travelFk`, `isConfirmed
        (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,  ''),
        (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 10', 1, 1,  ''),
-        (99, 69,                   '2000-12-01 00:00:00.000', 11, 0, 442, 'IN2009', 'Movement 99', 1, 1, '');
+        (10, 2, DATE_ADD(util.VN_CURDATE(), INTERVAL +2 DAY), 10, 0, 442, 'IN2009', 'Movement 9', 1, 1,  '');

 INSERT INTO `vn`.`entryConfig` (`defaultEntry`, `inventorySupplierFk`, `defaultSupplierFk`)
 	VALUES (2, 4, 1);
@ -1543,7 +1542,7 @@ INSERT INTO `bs`.`waste`(`buyerFk`, `year`, `week`, `itemFk`, `itemTypeFk`, `sal
        ('103',              YEAR(DATE_ADD(util.VN_CURDATE(), INTERVAL -1 WEEK)),   WEEK(DATE_ADD(util.VN_CURDATE(), INTERVAL -1 WEEK), 1),      6, 1, '186',      '0',      '51',      '53.12',   '56.20',   '56.20',   '56.20'),
        ('103',              YEAR(DATE_ADD(util.VN_CURDATE(), INTERVAL -1 WEEK)),   WEEK(DATE_ADD(util.VN_CURDATE(), INTERVAL -1 WEEK), 1),      7, 1, '277',      '0',      '53.12',   '56.20',   '56.20',   '56.20',   '56.20');

-INSERT INTO vn.buy(id,entryFk,itemFk,buyingValue,quantity,packagingFk,stickers,freightValue,packageValue,comissionValue,packing,grouping,groupingMode,location,price1,price2,price3,printedStickers,isChecked,isIgnored,weight,created)
+INSERT INTO `vn`.`buy`(`id`,`entryFk`,`itemFk`,`buyingValue`,`quantity`,`packagingFk`,`stickers`,`freightValue`,`packageValue`,`comissionValue`,`packing`,`grouping`,`groupingMode`,`location`,`price1`,`price2`,`price3`, `printedStickers`,`isChecked`,`isIgnored`,`weight`, `created`)
    VALUES
        (1,  1, 1, 50,      5000,   4, 1, 1.500, 1.500, 0.000, 1,  1,  'packing', NULL, 0.00, 99.6, 99.4,   0, 1, 0, 1,     util.VN_CURDATE() - INTERVAL 2 MONTH),
        (2,  2, 1, 50,      100,    4, 1, 1.500, 1.500, 0.000, 1,  1,  'packing', NULL, 0.00, 99.6, 99.4,   0, 1, 0, 1,     util.VN_CURDATE() - INTERVAL 1 MONTH),
@ -1559,8 +1558,7 @@ INSERT INTO vn.buy(id,entryFk,itemFk,buyingValue,quantity,packagingFk,stickers,f
        (12, 6, 4, 1.25,    0,      3, 1, 2.500, 2.500, 0.000, 10, 10, 'grouping', NULL, 0.00, 1.75, 1.67,   0, 1, 0, 4,     util.VN_CURDATE()),
        (13, 7, 1, 50,      0,      3, 1, 2.000, 2.000, 0.000, 1,  1,  'packing', NULL, 0.00, 99.6, 99.4,   0, 1, 0, 4,     util.VN_CURDATE()),
        (14, 7, 2, 5,       0,      3, 1, 2.000, 2.000, 0.000, 10, 10, 'grouping', NULL, 0.00, 7.30, 7.00,   0, 1, 0, 4,     util.VN_CURDATE()),
-        (15, 7, 4, 1.25,    0,      3, 1, 2.000, 2.000, 0.000, 10, 10, 'grouping', NULL, 0.00, 1.75, 1.67,   0, 1, 0, 4,     util.VN_CURDATE()),
-        (16, 99,1,50.0000,  5000,   4, 1, 1.500, 1.500, 0.000, 1,  1,  'packing', NULL, 0.00, 99.60, 99.40,  0, 1, 0, 1.00, '2024-07-30 08:13:51.000');
+        (15, 7, 4, 1.25,    0,      3, 1, 2.000, 2.000, 0.000, 10, 10, 'grouping', NULL, 0.00, 1.75, 1.67,   0, 1, 0, 4,     util.VN_CURDATE());

 INSERT INTO `hedera`.`order`(`id`, `date_send`, `customer_id`, `delivery_method_id`, `agency_id`, `address_id`, `company_id`, `note`, `source_app`, `confirmed`,`total`, `date_make`, `first_row_stamp`, `confirm_date`)
    VALUES
@ -3937,32 +3935,38 @@ INSERT INTO vn.medicalReview
 (id, workerFk, centerFk, `date`, `time`, isFit, amount, invoice, remark)
 VALUES(3, 9, 2, '2000-01-01', '8:00', 1, 150.0, NULL, NULL);

-INSERT INTO vn.stockBought (workerFk, bought, reserve, dated)
-    VALUES(35, 1.00, 1.00, '2001-01-01');
-
-INSERT INTO vn.auctionConfig (id,conversionCoefficient,warehouseFk)
-	VALUES (1,0.6,6);
-
-INSERT INTO vn.payrollComponent (id, name, isSalaryAgreed, isVariable, isException)
-	VALUES (1, 'Salario1', 1, 0, 0),
+INSERT INTO vn.payrollComponent
+(id, name, isSalaryAgreed, isVariable, isException)
+	VALUES
+		(1, 'Salario1', 1, 0, 0),
 		(2, 'Salario2', 1, 1, 0),
 		(3, 'Salario3', 1, 0, 1);

-INSERT INTO vn.workerIncome (debit, credit, incomeTypeFk, paymentDate, workerFk, concept)
-	VALUES (1000.00, 900.00, 2, '2000-01-01', 1106, NULL),
+
+INSERT INTO vn.workerIncome
+(debit, credit, incomeTypeFk, paymentDate, workerFk, concept)
+	VALUES
+		(1000.00, 900.00, 2, '2000-01-01', 1106, NULL),
 		(1001.00, 800.00, 2, '2000-01-01', 1106, NULL);

-INSERT INTO dipole.printer (id, description) VALUES(1, '');

-INSERT INTO dipole.expedition_PrintOut (expeditionFk, ticketFk, addressFk, street, postalCode, city, shopName, isPrinted, created, printerFk, routeFk, parkingCode, truckName, clientFk, phone, province, agency, m3, workerCode, itemFk, quantity, longName, shelvingFk, comments)
+INSERT INTO dipole.printer (id, description)
+VALUES(1, '');
+
+INSERT INTO dipole.expedition_PrintOut (expeditionFk, ticketFk, addressFk, street, postalCode, city, shopName, isPrinted, created, printerFk, routeFk, parkingCode,
+truckName, clientFk, phone, province, agency, m3, workerCode, itemFk, quantity, longName, shelvingFk, comments)
 VALUES(1, 1, 0, ' ', ' ', ' ', ' ', 0, '2001-01-01 00:00:00', 1, 0, ' ', ' ', 0, NULL, '', NULL, 0.000, NULL, 10, NULL, NULL, 'NCC', NULL);

-INSERT INTO vn.accountDetail (id, value, accountDetailTypeFk, supplierAccountFk)
-    VALUES (21, 'ES12345B12345678', 3, 241),
+INSERT INTO vn.accountDetail
+(id, value, accountDetailTypeFk, supplierAccountFk)
+VALUES
+	(21, 'ES12345B12345678', 3, 241),
 	(35, 'ES12346B12345679', 3, 241);

-INSERT INTO vn.accountDetailType (id, description, code)
-    VALUES (1, 'IBAN', 'iban'),
+INSERT INTO vn.accountDetailType
+(id, description, code)
+VALUES
+		(1, 'IBAN', 'iban'),
 		(2, 'SWIFT', 'swift'),
 		(3, 'Referencia Remesas', 'remRef'),
 		(4, 'Referencia Transferencias', 'trnRef'),
--- a/db/routines/vn/events/travel_setDelivered.sql
+++ b/db/routines/vn/events/travel_setDelivered.sql
@ -1,5 +1,5 @@
 DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` EVENT `vn`.`travel_setDelivered`
+CREATE OR REPLACE DEFINER=`vn`@`localhost` EVENT `vn`.`travel_setDelivered`
 	ON SCHEDULE EVERY 1 DAY
 		STARTS '2024-07-12 00:10:00.000'
 	ON COMPLETION PRESERVE
--- a/db/routines/vn/procedures/buy_getUltimate.sql
+++ b/db/routines/vn/procedures/buy_getUltimate.sql
@ -1,5 +1,5 @@
 DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`buy_getUltimate`(
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`buy_getUltimate`(
 	vItemFk INT,
 	vWarehouseFk SMALLINT, 
 	vDated DATE
--- a/db/routines/vn/procedures/buy_getUltimateFromInterval.sql
+++ b/db/routines/vn/procedures/buy_getUltimateFromInterval.sql
@ -1,5 +1,5 @@
 DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`buy_getUltimateFromInterval`(
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`buy_getUltimateFromInterval`(
 	vItemFk INT,
 	vWarehouseFk SMALLINT, 
 	vStarted DATE, 
--- a/db/routines/vn/procedures/collectionPlacement_get.sql
+++ b/db/routines/vn/procedures/collectionPlacement_get.sql
@ -55,24 +55,20 @@ BEGIN
 		SELECT ts.saleFk,
 				ts.itemFk,
 				CAST(0 AS DECIMAL(10,0)) saleOrder,
-				IF(ish.visible > 0 OR iss.id, 1, 100000) *
-					IFNULL(p2.pickingOrder, p.pickingOrder) `order`,
-				TO_SECONDS(IF(iss.id,
-					iss.created - INTERVAL vCurrentYear YEAR,
-					ish.created - INTERVAL YEAR(ish.created) YEAR)) priority,
+				(IF(ish.visible > 0 OR iss.id, 1, 100000) *
+				COALESCE(p2.pickingOrder, p.pickingOrder)) `order`,
+				TO_SECONDS(COALESCE(iss.created, ish.created)) - TO_SECONDS(MAKEDATE(IFNULL(YEAR(iss.created), YEAR(ish.created)), 1)) priority,
 				CONCAT(
-					IF(iss.id,
-						CONCAT('< ', IFNULL(wk.`code`, '---'),' > '),
-						''),
-					p.`code`) COLLATE utf8_general_ci placement,
+				IF(iss.id, CONCAT('< ', COALESCE(wk.`code`, '---'),' > '), ''),
+				p.`code`
+				) COLLATE utf8_general_ci placement,
 				sh.priority shelvingPriority,
 				sh.code COLLATE utf8_general_ci shelving,
 				ish.created,
 				ish.visible,
-				IFNULL(
-					IF(st.code = 'previousByPacking', ish.packing, g.`grouping`),
-					1) `grouping`,
-				st.code = 'previousPrepared' isPreviousPrepared,
+				COALESCE(
+				IF(st.code = 'previousByPacking', ish.packing, g.`grouping`),1) `grouping`,
+				(st.code = 'previousPrepared') isPreviousPrepared,
 				iss.id itemShelvingSaleFk,
 				ts.ticketFk,
 				iss.id,
@ -80,11 +76,12 @@ BEGIN
 				iss.userFk,
 				ts.quantity
 			FROM tSale ts
-				LEFT JOIN (SELECT DISTINCT saleFk
+				LEFT JOIN (SELECT st.saleFk
 							FROM saleTracking st
 								JOIN state s ON s.id = st.stateFk
 							WHERE st.isChecked
-									AND s.semaphore = 1) st ON st.saleFk = ts.saleFk
+								AND s.semaphore = 1
+							GROUP BY st.saleFk) st ON st.saleFk = ts.saleFk
 				JOIN itemShelving ish ON ish.itemFk = ts.itemFk
 				JOIN shelving sh ON sh.code = ish.shelvingFk
 				JOIN parking p ON p.id = sh.parkingFk
@ -100,7 +97,7 @@ BEGIN
 				LEFT JOIN parking p2 ON p2.id = sg.parkingFk
 			WHERE w.id = vWarehouseFk
 					AND NOT sc.isHideForPickers
-			HAVING (iss.id AND st.saleFk) OR salePreviousPrepared IS NULL;
+					AND ((iss.id AND st.saleFk) OR st.saleFk IS NULL);

 	CREATE OR REPLACE TEMPORARY TABLE tSalePlacementList2
 		(INDEX(saleFk), INDEX(olderPriority))
--- a/db/routines/vn/procedures/collection_getTickets.sql
+++ b/db/routines/vn/procedures/collection_getTickets.sql
@ -23,7 +23,7 @@ BEGIN
 				JOIN vn.ticketCollection tc ON tc.ticketFk = tob.ticketFk
 				LEFT JOIN vn.observationType ot ON ot.id = tob.observationTypeFk
 			WHERE ot.`code` = 'itemPicker' 
-				AND tc.collectionFk = vParamFk
+				AND tc.collectionFk = vParamFk OR tc.ticketFk = vParamFk
 	)
 	SELECT t.id ticketFk, 
 			IF(!(vItemPackingTypeFk <=> 'V'), cc.code, CONCAT(SUBSTRING('ABCDEFGH', tc.wagon, 1), '-', tc.`level`)) `level`,
--- a/db/routines/vn/procedures/collection_mergeSales.sql
+++ b/db/routines/vn/procedures/collection_mergeSales.sql
@ -1,5 +1,5 @@
 DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`collection_mergeSales`(vCollectionFk INT)
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`collection_mergeSales`(vCollectionFk INT)
 BEGIN
 	DECLARE vDone BOOL;
 	DECLARE vTicketFk INT;
--- a/db/routines/vn/procedures/itemMinimumQuantity_check.sql
+++ b/db/routines/vn/procedures/itemMinimumQuantity_check.sql
@ -1,5 +1,5 @@
 DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`itemMinimumQuantity_check`(
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`itemMinimumQuantity_check`(
 	vSelf INT,
 	vItemFk INT,
 	vStarted DATE,
--- a/db/routines/vn/procedures/itemShelvingSale_addBySaleGroup.sql
+++ b/db/routines/vn/procedures/itemShelvingSale_addBySaleGroup.sql
@ -1,5 +1,5 @@
 DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`itemShelvingSale_addBySaleGroup`(
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`itemShelvingSale_addBySaleGroup`(
 	vSaleGroupFk INT(11)
 )
 BEGIN
--- a/db/routines/vn/procedures/item_getSimilar.sql
+++ b/db/routines/vn/procedures/item_getSimilar.sql
@ -52,13 +52,13 @@ BEGIN
 			FROM vn.sale s
 				JOIN vn.ticket t ON t.id = s.ticketFk
 				LEFT JOIN vn.itemShelvingSale iss ON iss.saleFk = s.id
-			WHERE t.shipped BETWEEN CURDATE() AND CURDATE() + INTERVAL vDaysInForward DAY
+			WHERE t.shipped >= CURDATE() + INTERVAL vDaysInForward DAY
 				AND iss.saleFk IS NULL
 				AND t.warehouseFk = vWarehouseFk
 			GROUP BY s.itemFk
 	)
 	SELECT i.id itemFk,
-			CAST(sd.quantity AS INT) advanceable,
+			LEAST(CAST(sd.quantity AS INT), sk.stock) advanceable,
 			i.longName,
 			i.subName,
 			i.tag5,
--- a/db/routines/vn/procedures/stockBought_calculate.sql
+++ b/db/routines/vn/procedures/stockBought_calculate.sql
@ -1,12 +1,17 @@
 DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`stockBought_calculate`()
-BEGIN
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`stockBought_calculate`(
+	vDated DATE
+)
+proc: BEGIN
 /**
- * Inserts the purchase volume per buyer
- * into stockBought according to the current date.
+ * Calculate the stock of the auction warehouse from the inventory date to vDated
+ * without taking into account the outputs of the same day vDated
+ *
+ * @param vDated Date to calculate the stock.
 */
-	DECLARE vDated DATE;
-	SET vDated = util.VN_CURDATE();
+	IF vDated < util.VN_CURDATE() THEN
+		LEAVE proc;
+	END IF;

 	CREATE OR REPLACE TEMPORARY TABLE tStockBought
 		SELECT workerFk, reserve
@ -16,26 +21,27 @@ BEGIN

 	DELETE FROM stockBought WHERE dated = vDated;

+	CALL item_calculateStock(vDated);
+
 	INSERT INTO stockBought(workerFk, bought, dated)
 		SELECT it.workerFk,
 				ROUND(SUM(
-					(ac.conversionCoefficient * 
-						(b.quantity / b.packing) * 
+						(ti.quantity / b.packing) *
 						buy_getVolume(b.id)
-					) / (vc.trolleyM3 * 1000000)
-				), 1),
+					) / vc.palletM3 / 1000000, 1) bought,
 				vDated
-			FROM entry e
-				JOIN travel t ON t.id = e.travelFk 
-				JOIN warehouse w ON w.id = t.warehouseInFk
-				JOIN buy b ON b.entryFk = e.id
-				JOIN item i ON i.id = b.itemFk 
-				JOIN itemType it ON it.id = i.typeFk
-				JOIN auctionConfig ac
+			FROM itemType it
+				JOIN item i ON i.typeFk = it.id
+				LEFT JOIN tmp.item ti ON ti.itemFk = i.id
+				JOIN itemCategory ic ON ic.id = it.categoryFk
+				JOIN warehouse wh ON wh.code = 'VNH'
+				JOIN tmp.buyUltimate bu ON bu.itemFk = i.id
+					AND bu.warehouseFk = wh.id
+				JOIN buy b ON b.id = bu.buyFk
 				JOIN volumeConfig vc
-			WHERE t.shipped = vDated
-				AND t.warehouseInFk = ac.warehouseFk
-			GROUP BY it.workerFk;
+			WHERE ic.display
+			GROUP BY it.workerFk
+			HAVING bought;

 	UPDATE stockBought s
 			JOIN tStockBought ts ON ts.workerFk = s.workerFk
@ -45,8 +51,12 @@ BEGIN
 	INSERT INTO stockBought (workerFk, reserve, dated)
 		SELECT ts.workerFk, ts.reserve, vDated
 			FROM tStockBought ts
-			WHERE ts.workerFk NOT IN (SELECT workerFk FROM stockBought WHERE dated = vDated);
+			WHERE ts.workerFk NOT IN (
+				SELECT workerFk
+					FROM stockBought
+					WHERE dated = vDated
+			);

-	DROP TEMPORARY TABLE tStockBought;
+	DROP TEMPORARY TABLE tStockBought, tmp.item, tmp.buyUltimate;
 END$$
 DELIMITER ;
--- a/db/routines/vn/procedures/supplier_statementWithEntries.sql
+++ b/db/routines/vn/procedures/supplier_statementWithEntries.sql
@ -1,5 +1,5 @@
 DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE vn.supplier_statementWithEntries(
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE vn.supplier_statementWithEntries(
 	vSupplierFk INT,
 	vCurrencyFk INT,
 	vCompanyFk INT,
--- a/db/routines/vn/procedures/ticket_mergeSales.sql
+++ b/db/routines/vn/procedures/ticket_mergeSales.sql
@ -1,5 +1,5 @@
 DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`ticket_mergeSales`(
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`ticket_mergeSales`(
 	vSelf INT
 )
 BEGIN
--- a/db/routines/vn/procedures/ticket_setProblemRiskByClient.sql
+++ b/db/routines/vn/procedures/ticket_setProblemRiskByClient.sql
@ -1,5 +1,5 @@
 DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`ticket_setProblemRiskByClient`(
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`ticket_setProblemRiskByClient`(
 	vClientFk INT
 )
 BEGIN
--- a/db/routines/vn/procedures/ticket_setVolume.sql
+++ b/db/routines/vn/procedures/ticket_setVolume.sql
@ -1,5 +1,5 @@
 DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`ticket_setVolume`(
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`ticket_setVolume`(
 	vSelf INT
 )
 BEGIN
--- a/db/routines/vn/procedures/ticket_setVolumeItemCost.sql
+++ b/db/routines/vn/procedures/ticket_setVolumeItemCost.sql
@ -1,5 +1,5 @@
 DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`ticket_setVolumeItemCost`(
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`ticket_setVolumeItemCost`(
 	vItemFk INT
 )
 BEGIN
--- a/db/routines/vn/triggers/host_beforeInsert.sql
+++ b/db/routines/vn/triggers/host_beforeInsert.sql
@ -1,5 +1,5 @@
 DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`host_beforeInsert`
+CREATE OR REPLACE DEFINER=`vn`@`localhost` TRIGGER `vn`.`host_beforeInsert`
 	BEFORE INSERT ON `host`
 	FOR EACH ROW
 BEGIN
--- a/db/routines/vn/triggers/itemShelving_afterInsert.sql
+++ b/db/routines/vn/triggers/itemShelving_afterInsert.sql
@ -0,0 +1,18 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`vn`@`localhost` TRIGGER `vn`.`itemShelving_afterInsert`
+	AFTER INSERT ON `itemShelving`
+	FOR EACH ROW
+BEGIN 
+	INSERT INTO itemShelvingLog
+		SET itemShelvingFk = NEW.id,
+			workerFk = account.myUser_getId(),
+			accion = 'CREA REGISTRO',
+			itemFk = NEW.itemFk,
+			shelvingFk = NEW.shelvingFk,
+			visible = NEW.visible,
+			`grouping` = NEW.`grouping`,
+			packing = NEW.packing,
+			available = NEW.available;
+			
+END$$
+DELIMITER ;
--- a/db/routines/vn/triggers/roadmap_beforeInsert.sql
+++ b/db/routines/vn/triggers/roadmap_beforeInsert.sql
@ -1,5 +1,5 @@
 DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`roadmap_beforeInsert`
+CREATE OR REPLACE DEFINER=`vn`@`localhost` TRIGGER `vn`.`roadmap_beforeInsert`
 	BEFORE INSERT ON `roadmap`
 	FOR EACH ROW
 BEGIN
--- a/db/routines/vn/triggers/roadmap_beforeUpdate.sql
+++ b/db/routines/vn/triggers/roadmap_beforeUpdate.sql
@ -1,5 +1,5 @@
 DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`roadmap_beforeUpdate`
+CREATE OR REPLACE DEFINER=`vn`@`localhost` TRIGGER `vn`.`roadmap_beforeUpdate`
 	BEFORE UPDATE ON `roadmap`
 	FOR EACH ROW
 BEGIN
--- a/db/routines/vn/triggers/saleGroupDetail._beforeInsert.sql
+++ b/db/routines/vn/triggers/saleGroupDetail._beforeInsert.sql
@ -1,5 +1,5 @@
 DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`saleGroupDetail_beforeInsert`
+CREATE OR REPLACE DEFINER=`vn`@`localhost` TRIGGER `vn`.`saleGroupDetail_beforeInsert`
 	BEFORE INSERT ON `saleGroupDetail`
 	FOR EACH ROW
 BEGIN
--- a/db/routines/vn/triggers/saleGroupDetail_afterDelete.sql
+++ b/db/routines/vn/triggers/saleGroupDetail_afterDelete.sql
@ -1,5 +1,5 @@
 DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`saleGroupDetail_afterDelete`
+CREATE OR REPLACE DEFINER=`vn`@`localhost` TRIGGER `vn`.`saleGroupDetail_afterDelete`
 	AFTER DELETE ON `saleGroupDetail`
 	FOR EACH ROW
 BEGIN
--- a/db/routines/vn/triggers/saleGroupDetail_beforeUpdate.sql
+++ b/db/routines/vn/triggers/saleGroupDetail_beforeUpdate.sql
@ -1,5 +1,5 @@
 DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`saleGroupDetail_beforeUpdate`
+CREATE OR REPLACE DEFINER=`vn`@`localhost` TRIGGER `vn`.`saleGroupDetail_beforeUpdate`
 	BEFORE UPDATE ON `saleGroupDetail`
 	FOR EACH ROW
 BEGIN
--- a/db/routines/vn/views/buyer.sql
+++ b/db/routines/vn/views/buyer.sql
@ -2,12 +2,10 @@ CREATE OR REPLACE DEFINER=`vn`@`localhost`
 	SQL SECURITY DEFINER
 	VIEW `vn`.`buyer`
 AS SELECT DISTINCT `u`.`id` AS `userFk`,
-	`u`.`nickname` AS `nickname`,
-	`ic`.`display` AS `display`
+	`u`.`nickname` AS `nickname`
 FROM (
 		`account`.`user` `u`
 		JOIN `vn`.`itemType` `it` ON(`it`.`workerFk` = `u`.`id`)
-		JOIN `vn`.`itemCategory` `ic` ON(`ic`.`id` = `it`.`categoryFk`)
 	)
 WHERE `u`.`active` <> 0
 ORDER BY `u`.`nickname`
--- a/db/versions/11263-brownAnthurium/00-firstScript.sql
+++ b/db/versions/11263-brownAnthurium/00-firstScript.sql
@ -0,0 +1,32 @@
+-- Place your SQL code here
+-- vn.priceDelta definition
+
+CREATE OR REPLACE TABLE vn.priceDelta (
+  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `itemTypeFk` smallint(5) unsigned NOT NULL,
+  `minSize` int(10) unsigned DEFAULT NULL COMMENT 'Minimum item.size',
+  `maxSize` int(10) unsigned DEFAULT NULL COMMENT 'Maximum item.size',
+  `inkFk` varchar(3) DEFAULT NULL,
+  `originFk` tinyint(2) unsigned DEFAULT NULL,
+  `producerFk` mediumint(3) unsigned DEFAULT NULL,
+  `fromDated` date DEFAULT NULL,
+  `toDated` date DEFAULT NULL,
+  `absIncreasing` decimal(10,3) DEFAULT NULL COMMENT 'Absolute increasing of final price',
+  `ratIncreasing` int(11) DEFAULT NULL COMMENT 'Increasing ratio for the cost price',
+  `warehouseFk` smallint(6) unsigned NOT NULL,
+  `created` timestamp NOT NULL DEFAULT current_timestamp(),
+  `editorFk` int(10) unsigned DEFAULT NULL,
+  PRIMARY KEY (`id`),
+  KEY `priceDelta_itemType_FK` (`itemTypeFk`),
+  KEY `priceDelta_ink_FK` (`inkFk`),
+  KEY `priceDelta_producer_FK` (`producerFk`),
+  KEY `priceDelta_warehouse_FK` (`warehouseFk`),
+  KEY `priceDelta_worker_FK` (`editorFk`),
+  CONSTRAINT `priceDelta_ink_FK` FOREIGN KEY (`inkFk`) REFERENCES `ink` (`id`) ON UPDATE CASCADE,
+  CONSTRAINT `priceDelta_itemType_FK` FOREIGN KEY (`itemTypeFk`) REFERENCES `itemType` (`id`) ON UPDATE CASCADE,
+  CONSTRAINT `priceDelta_producer_FK` FOREIGN KEY (`producerFk`) REFERENCES `producer` (`id`) ON UPDATE CASCADE,
+  CONSTRAINT `priceDelta_warehouse_FK` FOREIGN KEY (`warehouseFk`) REFERENCES `warehouse` (`id`) ON UPDATE CASCADE,
+  CONSTRAINT `priceDelta_worker_FK` FOREIGN KEY (`editorFk`) REFERENCES `worker` (`id`) ON DELETE SET NULL ON UPDATE CASCADE
+) ENGINE=InnoDB AUTO_INCREMENT=5 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci COMMENT='Defines the increasing o decreasing for ranges of items';
+
+GRANT INSERT, SELECT, UPDATE, DELETE ON TABLE vn.priceDelta TO buyer;	
--- a/front/core/services/app.js
+++ b/front/core/services/app.js
@ -57,7 +57,7 @@ export default class App {

    getUrl(route, appName = 'lilium') {
        const index = window.location.hash.indexOf(route.toLowerCase());
-        const newRoute = index < 0 ? route : window.location.hash.substring(index);
+        let newRoute = index < 0 ? route : window.location.hash.substring(index);
        const env = process.env.NODE_ENV;
        const filter = {
            where: {and: [
@ -66,6 +66,11 @@ export default class App {
            ]}
        };

+        
+        if (this.logger.$params.q)
+            newRoute = newRoute.concat(`?table=${this.logger.$params.q}`);
+
+
        return this.logger.$http.get('Urls/findOne', {filter})
            .then(res => {
                if (res && res.data)
--- a/loopback/locale/en.json
+++ b/loopback/locale/en.json
@ -235,10 +235,10 @@
 	"Cannot add holidays on this day": "Cannot add holidays on this day",
 	"Cannot send mail": "Cannot send mail",
 	"CONSTRAINT `chkParkingCodeFormat` failed for `vn`.`parking`": "CONSTRAINT `chkParkingCodeFormat` failed for `vn`.`parking`",
+	"This postcode already exists": "This postcode already exists",
 	"Original invoice not found": "Original invoice not found",
 	"There is already a tray with the same height": "There is already a tray with the same height",
 	"The height must be greater than 50cm": "The height must be greater than 50cm",
 	"The maximum height of the wagon is 200cm": "The maximum height of the wagon is 200cm",
-	"This postcode already exists": "This postcode already exists",
-	"This buyer has already made a reservation for this date": "This buyer has already made a reservation for this date"
+    "The quantity claimed cannot be greater than the quantity of the line": "The quantity claimed cannot be greater than the quantity of the line"
 }
--- a/loopback/locale/es.json
+++ b/loopback/locale/es.json
@ -366,9 +366,11 @@
 	"The invoices have been created but the PDFs could not be generated": "Se ha facturado pero no se ha podido generar el PDF",
 	"It has been invoiced but the PDF of refund not be generated": "Se ha facturado pero no se ha podido generar el PDF del abono",
 	"Payment method is required": "El método de pago es obligatorio",
-	"Cannot send mail": "No se ha podido enviar el correo",
+	"Cannot send mail": "Não é possível enviar o email",
 	"CONSTRAINT `supplierAccountTooShort` failed for `vn`.`supplier`": "La cuenta debe tener exactamente 10 dígitos",
 	"The sale not exists in the item shelving": "La venta no existe en la estantería del artículo",
+	"The entry not have stickers": "La entrada no tiene etiquetas",
+	"Too many records": "Demasiados registros",
 	"Original invoice not found": "Factura original no encontrada",
 	"The entry has no lines or does not exist": "La entrada no tiene lineas o no existe",
 	"Weight already set": "El peso ya está establecido",
@ -376,7 +378,5 @@
 	"There is already a tray with the same height": "Ya existe una bandeja con la misma altura",
 	"The height must be greater than 50cm": "La altura debe ser superior a 50cm",
 	"The maximum height of the wagon is 200cm": "La altura máxima es 200cm",
-	"The entry does not have stickers": "La entrada no tiene etiquetas",
-	"Too many records": "Demasiados registros",
-	"This buyer has already made a reservation for this date": "Este comprador ya ha hecho una reserva para esta fecha"
+    "The quantity claimed cannot be greater than the quantity of the line": "La cantidad reclamada no puede ser mayor que la cantidad de la línea"
 }
--- a/loopback/locale/fr.json
+++ b/loopback/locale/fr.json
@ -361,6 +361,6 @@
 	"The invoices have been created but the PDFs could not be generated": "La facture a été émise mais le PDF n'a pas pu être généré",
 	"It has been invoiced but the PDF of refund not be generated": "Il a été facturé mais le PDF de remboursement n'a pas été généré",
 	"Cannot send mail": "Impossible d'envoyer le mail",
-    "Original invoice not found": "Facture originale introuvable"
-
+    "Original invoice not found": "Facture originale introuvable",
+    "The quantity claimed cannot be greater than the quantity of the line": "Le montant réclamé ne peut pas être supérieur au montant de la ligne"
 }
--- a/loopback/locale/pt.json
+++ b/loopback/locale/pt.json
@ -361,5 +361,6 @@
 	"The invoices have been created but the PDFs could not be generated": "Foi faturado, mas o PDF não pôde ser gerado",
 	"It has been invoiced but the PDF of refund not be generated": "Foi faturado mas não foi gerado o PDF do reembolso",
    "Original invoice not found": "Fatura original não encontrada",
-	"Cannot send mail": "Não é possível enviar o email"
+	"Cannot send mail": "Não é possível enviar o email",
+    "The quantity claimed cannot be greater than the quantity of the line": "O valor reclamado não pode ser superior ao valor da linha"
 }
--- a/modules/account/back/models/mail-alias-account.js
+++ b/modules/account/back/models/mail-alias-account.js
@ -1,6 +1,5 @@

 const ForbiddenError = require('vn-loopback/util/forbiddenError');
-const UserError = require('vn-loopback/util/user-error');

 module.exports = Self => {
    Self.rewriteDbError(function(err) {
--- a/modules/claim/back/methods/claim-beginning/specs/claim-beginning.spec.js
+++ b/modules/claim/back/methods/claim-beginning/specs/claim-beginning.spec.js
@ -0,0 +1,55 @@
+const models = require('vn-loopback/server/server').models;
+const LoopBackContext = require('loopback-context');
+
+describe('ClaimBeginning model()', () => {
+    const claimFk = 1;
+    const activeCtx = {
+        accessToken: {userId: 18},
+        headers: {origin: 'localhost:5000'},
+        __: () => {}
+    };
+
+    beforeEach(() => {
+        spyOn(LoopBackContext, 'getCurrentContext').and.returnValue({
+            active: activeCtx
+        });
+    });
+
+    it('should change quantity claimed', async() => {
+        const tx = await models.ClaimBeginning.beginTransaction({});
+
+        let error;
+        try {
+            const options = {transaction: tx};
+            const claim = await models.ClaimBeginning.findOne({where: {claimFk}}, options);
+            const sale = await models.Sale.findById(claim.saleFk, {}, options);
+            await claim.updateAttribute('quantity', sale.quantity - 1, options);
+
+            await tx.rollback();
+        } catch (e) {
+            error = e;
+            await tx.rollback();
+        }
+
+        expect(error).toBeUndefined();
+    });
+
+    it('should throw error when quantity claimed is greater than quantity of the sale', async() => {
+        const tx = await models.ClaimBeginning.beginTransaction({});
+
+        let error;
+        try {
+            const options = {transaction: tx};
+            const claim = await models.ClaimBeginning.findOne({where: {claimFk}}, options);
+            const sale = await models.Sale.findById(claim.saleFk, {}, options);
+            await claim.updateAttribute('quantity', sale.quantity + 1, options);
+
+            await tx.rollback();
+        } catch (e) {
+            error = e;
+            await tx.rollback();
+        }
+
+        expect(error.toString()).toContain('The quantity claimed cannot be greater than the quantity of the line');
+    });
+});
--- a/modules/claim/back/models/claim-beginning.js
+++ b/modules/claim/back/models/claim-beginning.js
@ -10,16 +10,21 @@ module.exports = Self => {
    });

    Self.observe('before save', async ctx => {
-        if (ctx.isNewInstance) {
-            const models = Self.app.models;
        const options = ctx.options;
-            const instance = ctx.instance;
-            const ticket = await models.Sale.findById(instance.saleFk, {fields: ['ticketFk']}, options);
-            const claim = await models.Claim.findById(instance.claimFk, {fields: ['ticketFk']}, options);
-            if (ticket.ticketFk != claim.ticketFk)
+        const models = Self.app.models;
+        const saleFk = ctx?.currentInstance?.saleFk || ctx?.instance?.saleFk;
+        const sale = await models.Sale.findById(saleFk, {fields: ['ticketFk', 'quantity']}, options);
+
+        if (ctx.isNewInstance) {
+            const claim = await models.Claim.findById(ctx.instance.claimFk, {fields: ['ticketFk']}, options);
+            if (sale.ticketFk != claim.ticketFk)
                throw new UserError(`Cannot create a new claimBeginning from a different ticket`);
        }
+
        await claimIsEditable(ctx);
+
+        if (sale?.quantity && ctx.data?.quantity && ctx.data.quantity > sale?.quantity)
+            throw new UserError('The quantity claimed cannot be greater than the quantity of the line');
    });

    Self.observe('before delete', async ctx => {
--- a/modules/entry/back/methods/entry/print.js
+++ b/modules/entry/back/methods/entry/print.js
@ -52,7 +52,7 @@ module.exports = Self => {
            await merger.add(new Uint8Array(pdfBuffer[0]));
        }

-        if (!merger._doc) throw new UserError('The entry does not have stickers');
+        if (!merger._doc) throw new UserError('The entry not have stickers');

        await Self.rawSql(`
            UPDATE buy
--- a/modules/entry/back/methods/entry/specs/filter.spec.js
+++ b/modules/entry/back/methods/entry/specs/filter.spec.js
@ -39,7 +39,7 @@ describe('Entry filter()', () => {

            const result = await models.Entry.filter(ctx, options);

-            expect(result.length).toEqual(12);
+            expect(result.length).toEqual(11);

            await tx.rollback();
        } catch (e) {
@ -131,7 +131,7 @@ describe('Entry filter()', () => {

            const result = await models.Entry.filter(ctx, options);

-            expect(result.length).toEqual(11);
+            expect(result.length).toEqual(10);

            await tx.rollback();
        } catch (e) {
--- a/modules/entry/back/methods/stock-bought/getStockBought.js
+++ b/modules/entry/back/methods/stock-bought/getStockBought.js
@ -29,15 +29,13 @@ module.exports = Self => {
        dated.setHours(0, 0, 0, 0);
        today.setHours(0, 0, 0, 0);

-        if (dated.getTime() === today.getTime())
-            await models.StockBought.rawSql(`CALL vn.stockBought_calculate()`);
+        await models.StockBought.rawSql(`CALL vn.stockBought_calculate(?)`, [dated]);

        const filter = {
-            where: {
-                dated: dated
-            },
+            where: {dated},
            include: [
                {
+                    fields: ['workerFk', 'reserve', 'bought'],
                    relation: 'worker',
                    scope: {
                        include: [
--- a/modules/entry/back/methods/stock-bought/getStockBoughtDetail.js
+++ b/modules/entry/back/methods/stock-bought/getStockBoughtDetail.js
@ -11,6 +11,7 @@ module.exports = Self => {
            arg: 'dated',
            type: 'string',
            description: 'The date to filter',
+            required: true,
        }
        ],
        returns: {
@ -24,35 +25,50 @@ module.exports = Self => {
    });

    Self.getStockBoughtDetail = async(workerFk, dated) => {
-        if (!dated) {
-            dated = Date.vnNew();
-            dated.setHours(0, 0, 0, 0);
+        const models = Self.app.models;
+        const myOptions = {};
+        let tx;
+        let result;
+
+        if (typeof options == 'object')
+            Object.assign(myOptions, options);
+
+        if (!myOptions.transaction) {
+            tx = await Self.beginTransaction({});
+            myOptions.transaction = tx;
        }
-        return Self.rawSql(
-            `SELECT e.id entryFk,
+
+        try {
+            await models.StockBought.rawSql(`CALL vn.item_calculateStock(?)`, [dated], myOptions);
+            result = await Self.rawSql(
+                `SELECT b.entryFk entryFk,
                        i.id itemFk,
-                    i.longName itemName,
-                    b.quantity,
-                    ROUND((ac.conversionCoefficient * 
-                            (b.quantity / b.packing) * 
-                            buy_getVolume(b.id)
-                        ) / (vc.trolleyM3 * 1000000), 
-                        2
-                    ) volume,
-                    b.packagingFk,
+                        i.name itemName,
+                        ti.quantity,
+                        (ac.conversionCoefficient * (ti.quantity / b.packing) * buy_getVolume(b.id))
+                            / (vc.trolleyM3 * 1000000) volume,
+                        b.packagingFk packagingFk,
                        b.packing
-                FROM entry e
-                    JOIN travel t ON t.id = e.travelFk 
-                    JOIN buy b ON b.entryFk = e.id
-                    JOIN item i ON i.id = b.itemFk 
-                    JOIN itemType it ON it.id = i.typeFk
+                    FROM tmp.item ti
+                        JOIN item i ON i.id = ti.itemFk
+                        JOIN itemType it ON i.typeFk = it.id
+                        JOIN itemCategory ic ON ic.id = it.categoryFk
                        JOIN worker w ON w.id = it.workerFk
                        JOIN auctionConfig ac
+                        JOIN tmp.buyUltimate bu ON bu.itemFk = i.id
+                            AND bu.warehouseFk = ac.warehouseFk
+                        JOIN buy b ON b.id = bu.buyFk
                        JOIN volumeConfig vc
-                WHERE t.warehouseInFk = ac.warehouseFk
-                    AND it.workerFk = ?
-                    AND t.shipped = util.VN_CURDATE()`,
-            [workerFk]
+                    WHERE ic.display
+                        AND w.id = ?`,
+                [workerFk], myOptions
            );
+            await Self.rawSql(`DROP TEMPORARY TABLE tmp.item, tmp.buyUltimate;`, [], myOptions);
+            if (tx) await tx.commit();
+            return result;
+        } catch (e) {
+            await tx.rollback();
+            throw e;
+        }
    };
 };
--- a/modules/invoiceOut/back/methods/invoiceOut/invoiceClient.js
+++ b/modules/invoiceOut/back/methods/invoiceOut/invoiceClient.js
@ -64,7 +64,7 @@ module.exports = Self => {
        try {
            const client = await models.Client.findById(args.clientId, {
                fields: ['id', 'hasToInvoiceByAddress']
-            }, options);
+            }, myOptions);

            if (client.hasToInvoiceByAddress) {
                await Self.rawSql('CALL ticketToInvoiceByAddress(?, ?, ?, ?)', [
@ -72,13 +72,13 @@ module.exports = Self => {
                    args.maxShipped,
                    args.addressId,
                    args.companyFk
-                ], options);
+                ], myOptions);
            } else {
                await Self.rawSql('CALL invoiceFromClient(?, ?, ?)', [
                    args.maxShipped,
                    client.id,
                    args.companyFk
-                ], options);
+                ], myOptions);
            }

            const invoiceId = await models.Ticket.makeInvoice(
@ -87,7 +87,7 @@ module.exports = Self => {
                args.companyFk,
                args.invoiceDate,
                null,
-                options
+                myOptions
            );

            if (tx) await tx.commit();
--- a/modules/item/back/methods/item-shelving/updateFromSale.js
+++ b/modules/item/back/methods/item-shelving/updateFromSale.js
@ -38,9 +38,13 @@ module.exports = Self => {

            const itemShelving = itemShelvingSale.itemShelving();
            const quantity = itemShelving.visible + itemShelvingSale.quantity;
+            const available = itemShelving.available + itemShelvingSale.quantity;

            await itemShelving.updateAttributes(
-                {visible: quantity},
+                {
+                    visible: quantity,
+                    available: available
+                },
                myOptions
            );
            if (tx) await tx.commit();
--- a/modules/ticket/back/methods/sale-tracking/setPicked.js
+++ b/modules/ticket/back/methods/sale-tracking/setPicked.js
@ -75,7 +75,11 @@ module.exports = Self => {

            const itemShelving = await models.ItemShelving.findById(itemShelvingFk, null, myOptions);

-            await itemShelving.updateAttributes({visible: itemShelving.visible - quantity}, myOptions);
+            await itemShelving.updateAttributes(
+                {
+                    visible: itemShelving.visible - quantity,
+                    available: itemShelving.available - quantity
+                }, myOptions);

            await Self.updateAll(
                {saleFk},
--- a/modules/ticket/back/methods/sale/clone.js
+++ b/modules/ticket/back/methods/sale/clone.js
@ -142,12 +142,19 @@ module.exports = Self => {
            ctx.args.addressId = ticket.addressFk;

            const newTicket = await models.Ticket.new(ctx, myOptions);
-
+            const existingRefund = await models.TicketRefund.findOne({
+                where: {
+                    originalTicketFk: ticketId,
+                    refundTicketFk: newTicket.id
+                },
+                myOptions
+            });
+            if (!existingRefund) {
                await models.TicketRefund.create({
                    originalTicketFk: ticketId,
                    refundTicketFk: newTicket.id
                }, myOptions);
-
+            }
            return newTicket;
        }
    };
--- a/modules/worker/back/methods/device/handle-user.js
+++ b/modules/worker/back/methods/device/handle-user.js
@ -82,7 +82,7 @@ module.exports = Self => {
        const getDataOperator = await models.Operator.findOne({
            where: {workerFk: user.id},
            fields: ['numberOfWagons', 'warehouseFk', 'itemPackingTypeFk', 'sectorFk', 'sector',
-                'trainFk', 'train', 'labelerFk', 'printer'],
+                'trainFk', 'train', 'labelerFk', 'printer', 'isOnReservationMode'],
            include: [
                {
                    relation: 'sector',