back/methods/collection/getTickets.js

@@ -57,8 +57,10 @@ module.exports = Self => {
                     ROW_NUMBER () OVER (PARTITION BY s.id ORDER BY pickingOrder) currentItemShelving,
                     COUNT(*) OVER (PARTITION BY s.id ORDER BY s.id) totalItemShelving,
                     sh.code,
-                    IFNULL(p2.code, p.code) parkingCode,
+                    p2.code parkingCode,
-                    IFNULL(p2.pickingOrder, p.pickingOrder) pickingOrder,
+                    p2.pickingOrder pickingOrder,
+                    p.code parkingCodePrevia,
+                    p.pickingOrder pickingOrderPrevia,
                     iss.id itemShelvingSaleFk,
                     iss.isPicked
                 FROM ticketCollection tc
@@ -95,8 +97,10 @@ module.exports = Self => {
                 ROW_NUMBER () OVER (PARTITION BY s.id ORDER BY p.pickingOrder),
                 COUNT(*) OVER (PARTITION BY s.id ORDER BY s.id) ,
                 sh.code,
-                IFNULL(p2.code, p.code),
+                p2.code,
-                IFNULL(p2.pickingOrder, p.pickingOrder),
+                p2.pickingOrder,
+                p.code,
+                p.pickingOrder,
                 iss.id itemShelvingSaleFk,
                 iss.isPicked
             FROM sectorCollection sc

back/methods/postcode/filter.js

@@ -11,13 +11,6 @@ module.exports = Self => {
                 arg: 'filter',
                 type: 'object',
                 description: 'Filter defining where, order, offset, and limit - must be a JSON-encoded string',
-                http: {source: 'query'}
-            },
-            {
-                arg: 'search',
-                type: 'string',
-                description: 'Value to filter',
-                http: {source: 'query'}
             },
         ],
         returns: {
@@ -29,13 +22,11 @@ module.exports = Self => {
             verb: 'GET',
         },
     });
-    Self.filter = async(ctx, filter, options) => {
+    Self.filter = async(filter = {}, options) => {
         const myOptions = {};
         if (typeof options == 'object')
             Object.assign(myOptions, options);
 
-        filter = ctx?.filter ?? {};
-
         const conn = Self.dataSource.connector;
         const where = buildFilter(filter?.where, (param, value) => {
             switch (param) {
@@ -50,31 +41,33 @@ module.exports = Self => {
                 };
             }
         }) ?? {};
-        delete ctx.filter.where;
+        delete filter.where;
 
         const stmts = [];
         let stmt;
         stmt = new ParameterizedSQL(`
-        SELECT
+            SELECT
-            pc.townFk,
+                pc.townFk,
-            t.provinceFk,
+                t.provinceFk,
-            p.countryFk,
+                p.countryFk,
-            pc.code,
+                pc.code,
-            t.name as town,
+                t.name as town,
-            p.name as province,
+                p.name as province,
-            c.name country
+                c.name country
-        FROM
+            FROM
-            postCode pc
+                postCode pc
-            JOIN town t on t.id = pc.townFk
+                JOIN town t on t.id = pc.townFk
-            JOIN province p on p.id = t.provinceFk
+                JOIN province p on p.id = t.provinceFk
-            JOIN country c on c.id = p.countryFk
+                JOIN country c on c.id = p.countryFk
         `);
 
-        stmt.merge(conn.makeSuffix({where, ...ctx}));
+        stmt.merge(conn.makeSuffix({where}));
+        stmt.merge(conn.makeLimit(filter));
         const itemsIndex = stmts.push(stmt) - 1;
 
         const sql = ParameterizedSQL.join(stmts, ';');
         const result = await conn.executeStmt(sql, myOptions);
+
         return itemsIndex === 0 ? result : result[itemsIndex];
     };
 };

back/methods/postcode/specs/filter.spec.js

@@ -6,12 +6,9 @@ describe('Postcode filter()', () => {
         const options = {transaction: tx};
 
         try {
-            const ctx = {
+            const results = await models.Postcode.filter({
-                filter: {
-                },
                 limit: 1
-            };
+            }, options);
-            const results = await models.Postcode.filter(ctx, options);
 
             expect(results.length).toEqual(1);
             await tx.rollback();
@@ -26,14 +23,11 @@ describe('Postcode filter()', () => {
         const options = {transaction: tx};
 
         try {
-            const ctx = {
+            const results = await models.Postcode.filter({
-                filter: {
+                where: {
-                    where: {
+                    search: 46,
-                        search: 46,
+                }
-                    }
+            }, options);
-                },
-            };
-            const results = await models.Postcode.filter(ctx, options);
 
             expect(results.length).toEqual(4);
             await tx.rollback();
@@ -48,14 +42,9 @@ describe('Postcode filter()', () => {
         const options = {transaction: tx};
 
         try {
-            const ctx = {
+            const results = await models.Postcode.filter({where: {
-                filter: {
+                search: 'Alz',
-                    where: {
+            }}, options);
-                        search: 'Alz',
-                    }
-                },
-            };
-            const results = await models.Postcode.filter(ctx, options);
 
             expect(results.length).toEqual(1);
             await tx.rollback();
@@ -70,14 +59,9 @@ describe('Postcode filter()', () => {
         const options = {transaction: tx};
 
         try {
-            const ctx = {
+            const results = await models.Postcode.filter({where: {
-                filter: {
+                search: 'one',
-                    where: {
+            }}, options);
-                        search: 'one',
-                    }
-                },
-            };
-            const results = await models.Postcode.filter(ctx, options);
 
             expect(results.length).toEqual(4);
             await tx.rollback();
@@ -92,14 +76,11 @@ describe('Postcode filter()', () => {
         const options = {transaction: tx};
 
         try {
-            const ctx = {
+            const results = await models.Postcode.filter({
-                filter: {
+                where: {
-                    where: {
+                    search: 'Ec',
-                        search: 'Ec',
+                }
-                    }
+            }, options);
-                },
-            };
-            const results = await models.Postcode.filter(ctx, options);
 
             expect(results.length).toEqual(1);
             await tx.rollback();

back/model-config.json

@@ -28,6 +28,9 @@
     "Company": {
         "dataSource": "vn"
     },
+    "Config": {
+        "dataSource": "vn"
+    },
     "Continent": {
         "dataSource": "vn"
     },

back/models/config.json

@@ -0,0 +1,22 @@
+{
+    "name": "Config",
+    "base": "VnModel",
+    "options": {
+        "mysql": {
+            "table": "config"
+        }
+    },
+    "properties": {
+        "inventoried": {
+            "type": "date"
+        }
+    },
+    "acls": [
+        {
+            "accessType": "READ",
+            "principalType": "ROLE",
+            "principalId": "$authenticated",
+            "permission": "ALLOW"
+        }
+    ]
+}

back/models/postcode.json

@@ -9,7 +9,8 @@
 	"properties": {
 		"code": {
 			"id": true,
-			"type": "string"
+			"type": "string",
+            "required": true
 		}
 	},
 	"relations": {
@@ -47,4 +48,4 @@
 			}
 		}
 	}
-}
+}

back/models/town.json

@@ -12,7 +12,8 @@
 			"type": "number"
 		},
 		"name": {
-			"type": "string"
+			"type": "string",
+            "required": true
 		}
 	},
 	"relations": {
@@ -54,4 +55,4 @@
 			"fields": ["id", "name", "provinceFk"]
 		}
 	}
-}
+}

back/process.yml

@@ -2,6 +2,5 @@ apps:
   - script: ./loopback/server/server.js
     name: salix-back
     instances: 1
-    max_restarts: 3
+    max_restarts: 0
-    restart_delay: 15000
     node_args: --tls-min-v1.0 --openssl-legacy-provider

db/routines/cache/procedures/last_buy_refresh.sql

@@ -30,7 +30,7 @@ proc: BEGIN
     SELECT inventoried INTO started FROM vn.config LIMIT 1;
 	SET ended = util.VN_CURDATE(); -- TIMESTAMPADD(DAY, -1, util.VN_CURDATE());
 
-	CALL vn.buyUltimateFromInterval(NULL, started, ended);
+	CALL vn.buy_getUltimateFromInterval(NULL, NULL, started, ended);
 
 	DELETE FROM last_buy;
 

db/routines/vn/procedures/available_traslate.sql

@@ -47,7 +47,7 @@ proc: BEGIN
 
 	-- Tabla con el ultimo dia de last_buy para cada producto 
 	-- que hace un replace de la anterior.
-	CALL buyUltimate(vWarehouseShipment, util.VN_CURDATE());
+	CALL buy_getUltimate (NULL, vWarehouseShipment, util.VN_CURDATE());
 
 	INSERT INTO tItemRange
 		SELECT t.itemFk, tr.landed

db/routines/vn/procedures/buyUltimate.sql

@@ -5,39 +5,14 @@ CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`buyUltimate`(
 )
 BEGIN
 /**
- * Calcula las últimas compras realizadas hasta una fecha
+ * @deprecated Usar buy_getUltimate
+ * Calcula las últimas compras realizadas hasta una fecha.
  *
+ * @param vItemFk Id del artículo
  * @param vWarehouseFk Id del almacén
  * @param vDated Compras hasta fecha
  * @return tmp.buyUltimate
  */
-	CALL cache.last_buy_refresh (FALSE);
+	CALL buy_getUltimate(NULL, vWarehouseFk, vDated);
-
-	DROP TEMPORARY TABLE IF EXISTS tmp.buyUltimate;
-	CREATE TEMPORARY TABLE tmp.buyUltimate
-		(PRIMARY KEY (itemFk, warehouseFk),
-		INDEX(itemFk))
-		ENGINE = MEMORY
-		SELECT item_id itemFk, buy_id buyFk, warehouse_id warehouseFk, landing
-			FROM cache.last_buy
-			WHERE warehouse_id = vWarehouseFk OR vWarehouseFk IS NULL;
-
-	IF vDated >= util.VN_CURDATE() THEN
-		CALL buyUltimateFromInterval(vWarehouseFk, util.VN_CURDATE(), vDated);
-
-		REPLACE INTO tmp.buyUltimate
-			SELECT itemFk, buyFk, warehouseFk, landed landing
-				FROM tmp.buyUltimateFromInterval
-				WHERE (warehouseFk = vWarehouseFk OR vWarehouseFk IS NULL)
-					AND landed <= vDated
-					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;
-	END IF;
 END$$
 DELIMITER ;

db/routines/vn/procedures/buyUltimateFromInterval.sql

@@ -6,6 +6,7 @@ CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`buyUltimateFromInte
 )
 BEGIN
 /**
+ * @deprecated Usar buy_getUltimateFromInterval
  * Calcula las últimas compras realizadas
  * desde un rango de fechas.
  *
@@ -14,153 +15,6 @@ BEGIN
  * @param vEnded Fecha fin
  * @return tmp.buyUltimateFromInterval
  */
-	IF vEnded IS NULL THEN
+	CALL vn.buy_getUltimateFromInterval(NULL, vWarehouseFk, vStarted, vEnded);
-		SET vEnded = vStarted;
-	END IF;
-
-	IF vEnded < vStarted THEN
-		SET vStarted = TIMESTAMPADD(MONTH, -1, vEnded);
-	END IF;
-
-	-- 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))
-		ENGINE = MEMORY
-		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 BETWEEN vStarted AND vEnded
-							AND (vWarehouseFk IS NULL OR t.warehouseInFk = vWarehouseFk)
-							AND b.price2 > 0
-					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 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
-					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 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 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,
-				buyFk,
-				landed,
-				isIgnored
-			FROM (SELECT b.itemFk,
-						t.warehouseInFk warehouseFk,
-						b.id buyFk,
-						t.landed,
-						itemOriginalFk,
-						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.price2 > 0
-							AND NOT b.isIgnored
-							AND b.quantity > 0
-							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 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 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 BETWEEN vStarted AND vEnded
-							AND (vWarehouseFk IS NULL OR t.warehouseInFk = vWarehouseFk)
-							AND b.quantity = 0
-							AND itemOriginalFk
-						ORDER BY t.landed DESC, b.id DESC
-						LIMIT 10000000000000000000) sub
-			GROUP BY itemFk, warehouseFk;
 END$$
 DELIMITER ;

db/routines/vn/procedures/buy_getUltimate.sql

@@ -0,0 +1,47 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`buy_getUltimate`(
+	vItemFk INT,
+	vWarehouseFk SMALLINT, 
+	vDated DATE
+)
+BEGIN
+/**
+ * Calcula las últimas compras realizadas hasta una fecha.
+ *
+ * @param vItemFk Id del artículo
+ * @param vWarehouseFk Id del almacén
+ * @param vDated Compras hasta fecha
+ * @return tmp.buyUltimate
+ */
+	CALL cache.last_buy_refresh(FALSE);
+
+	CREATE OR REPLACE TEMPORARY TABLE tmp.buyUltimate
+		(PRIMARY KEY (itemFk, warehouseFk),
+		INDEX(itemFk))
+		ENGINE = MEMORY
+		SELECT item_id itemFk, buy_id buyFk, warehouse_id warehouseFk, landing
+			FROM cache.last_buy
+			WHERE (warehouse_id = vWarehouseFk OR vWarehouseFk IS NULL)
+				AND (item_id = vItemFk OR vItemFk IS NULL);
+
+	IF vDated >= util.VN_CURDATE() THEN
+		CALL buy_getUltimateFromInterval(vItemFk, vWarehouseFk, util.VN_CURDATE(), vDated);
+
+		REPLACE INTO tmp.buyUltimate
+			SELECT itemFk, buyFk, warehouseFk, landed landing
+				FROM tmp.buyUltimateFromInterval
+				WHERE (warehouseFk = vWarehouseFk OR vWarehouseFk IS NULL)
+					AND (itemFk = vItemFk OR vItemFk IS NULL)
+					AND landed <= vDated
+					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 (itemFk = vItemFk OR vItemFk IS NULL)
+					AND landed > vDated
+				ORDER BY isIgnored = FALSE DESC;
+	END IF;
+END$$
+DELIMITER ;

db/routines/vn/procedures/buy_getUltimateFromInterval.sql

@@ -0,0 +1,175 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`buy_getUltimateFromInterval`(
+	vItemFk INT,
+	vWarehouseFk SMALLINT, 
+	vStarted DATE, 
+	vEnded DATE
+)
+BEGIN
+/**
+ * Calcula las últimas compras realizadas
+ * desde un rango de fechas.
+ *
+ * @param vItemFk Id del artículo
+ * @param vWarehouseFk Id del almacén si es NULL se actualizan todos
+ * @param vStarted Fecha inicial
+ * @param vEnded Fecha fin
+ * @return tmp.buyUltimateFromInterval
+ */
+	IF vEnded IS NULL THEN
+		SET vEnded = vStarted;
+	END IF;
+
+	IF vEnded < vStarted THEN
+		SET vStarted = vEnded - INTERVAL 1 MONTH;
+	END IF;
+
+	-- Item
+
+	CREATE OR REPLACE TEMPORARY TABLE tmp.buyUltimateFromInterval
+		(PRIMARY KEY (itemFk, warehouseFk), 
+		INDEX(buyFk), INDEX(landed), INDEX(warehouseFk), INDEX(itemFk))
+		ENGINE = MEMORY
+		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 BETWEEN vStarted AND vEnded
+							AND (vWarehouseFk IS NULL OR t.warehouseInFk = vWarehouseFk)
+							AND (b.itemFk = vItemFk OR vItemFk IS NULL) 
+							AND b.price2 > 0
+					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 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.itemFk = vItemFk OR vItemFk IS NULL) 
+						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 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 BETWEEN vStarted AND vEnded
+						AND (vWarehouseFk IS NULL OR t.warehouseInFk = vWarehouseFk)
+						AND (b.itemFk = vItemFk OR vItemFk IS NULL) 
+						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,
+				buyFk,
+				landed,
+				isIgnored
+			FROM (SELECT b.itemFk,
+						t.warehouseInFk warehouseFk,
+						b.id buyFk,
+						t.landed,
+						itemOriginalFk,
+						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.itemFk = vItemFk OR vItemFk IS NULL) 
+						AND b.price2 > 0
+						AND NOT b.isIgnored
+						AND b.quantity > 0
+						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 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.itemFk = vItemFk OR vItemFk IS NULL) 
+							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 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 BETWEEN vStarted AND vEnded
+							AND (vWarehouseFk IS NULL OR t.warehouseInFk = vWarehouseFk)
+							AND (b.itemFk = vItemFk OR vItemFk IS NULL) 
+							AND b.quantity = 0
+							AND itemOriginalFk
+						ORDER BY t.landed DESC, b.id DESC
+						LIMIT 10000000000000000000) sub
+			GROUP BY itemFk, warehouseFk;
+END$$
+DELIMITER ;

db/routines/vn/procedures/buy_updateGrouping.sql

@@ -1,5 +1,9 @@
 DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`buy_updateGrouping`(vWarehouseFk INT, vItemFk INT, vGrouping INT)
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`buy_updateGrouping`(
+	vWarehouseFk INT, 
+	vItemFk INT, 
+	vGrouping INT
+)
 BEGIN
 /**
  * Actualiza el grouping de las últimas compras de un artículo
@@ -8,9 +12,9 @@ BEGIN
  * @param vItemFk Id del Artículo
  * @param vGrouping Cantidad de grouping
  */
-	CALL vn.buyUltimate(vWarehouseFk, util.VN_CURDATE());
+	CALL buy_getUltimate(vItemFk, vWarehouseFk, util.VN_CURDATE());
 
-	UPDATE vn.buy b
+	UPDATE buy b
 			JOIN tmp.buyUltimate bu ON b.id = bu.buyFk
 		SET b.`grouping` = vGrouping
 		WHERE bu.warehouseFk = vWarehouseFk

db/routines/vn/procedures/buy_updatePacking.sql

@@ -8,7 +8,7 @@ BEGIN
  * @param vItemFk id del item
  * @param vPacking packing a actualizar
  */
-	CALL buyUltimate(vWarehouseFk, util.VN_CURDATE());
+	CALL buy_getUltimate(vItemFk, vWarehouseFk, util.VN_CURDATE());
 
 	UPDATE buy b
 			JOIN tmp.buyUltimate bu ON b.id = bu.buyFk

db/routines/vn/procedures/catalog_calculate.sql

@@ -29,7 +29,7 @@ BEGIN
 
 	DECLARE CONTINUE HANDLER FOR NOT FOUND SET vDone = TRUE;
 
-	CALL vn.zone_getShipped (vLanded, vAddressFk, vAgencyModeFk, vShowExpiredZones);
+	CALL zone_getShipped (vLanded, vAddressFk, vAgencyModeFk, vShowExpiredZones);
 
 	DROP TEMPORARY TABLE IF EXISTS tmp.ticketLot;
 	CREATE TEMPORARY TABLE tmp.ticketLot(
@@ -72,9 +72,9 @@ BEGIN
 			LEAVE l;
 		END IF;
 
-		CALL `cache`.available_refresh (vAvailableCalc, FALSE, vWarehouseFk, vShipped);
+		CALL `cache`.available_refresh(vAvailableCalc, FALSE, vWarehouseFk, vShipped);
-		CALL `cache`.availableNoRaids_refresh (vAvailableNoRaidsCalc, FALSE, vWarehouseFk, vShipped);
+		CALL `cache`.availableNoRaids_refresh(vAvailableNoRaidsCalc, FALSE, vWarehouseFk, vShipped);
-		CALL vn.buyUltimate(vWarehouseFk, vShipped);
+		CALL buy_getUltimate(NULL, vWarehouseFk, vShipped);
 
 		INSERT INTO tmp.ticketLot (warehouseFk, itemFk, available, buyFk, zoneFk)
 			SELECT vWarehouseFk,
@@ -86,17 +86,17 @@ BEGIN
 					LEFT JOIN cache.availableNoRaids anr ON anr.item_id = a.item_id 
 														AND anr.calc_id = vAvailableNoRaidsCalc
 					JOIN tmp.item i ON i.itemFk = a.item_id
-					JOIN vn.item it ON it.id = i.itemFk
+					JOIN item it ON it.id = i.itemFk
-					JOIN vn.`zone` z ON z.id = vZoneFk
+					JOIN `zone` z ON z.id = vZoneFk
 					LEFT JOIN tmp.buyUltimate bu ON bu.itemFk = a.item_id	
 					LEFT JOIN edi.supplyResponse sr ON sr.ID = it.supplyResponseFk	
 					LEFT JOIN edi.VMPSettings v ON v.VMPID = sr.vmpID 
 					LEFT JOIN edi.marketPlace mp ON mp.id = sr.MarketPlaceID
 					LEFT JOIN (SELECT isVNHSupplier, isEarlyBird, TRUE AS itemAllowed
-									FROM vn.addressFilter af
+									FROM addressFilter af
 										JOIN (SELECT ad.provinceFk, p.countryFk, ad.isLogifloraAllowed 
-												FROM vn.address ad 
+												FROM address ad 
-													JOIN vn.province p ON p.id = ad.provinceFk 
+													JOIN province p ON p.id = ad.provinceFk 
 												WHERE ad.id = vAddressFk
 											) sub2 ON sub2.provinceFk <=> IFNULL(af.provinceFk, sub2.provinceFk)
 													AND sub2.countryFk <=> IFNULL(af.countryFk, sub2.countryFk)
@@ -108,18 +108,18 @@ BEGIN
 										OR ISNULL(af.afterDated))
 								) sub ON sub.isVNHSupplier = v.isVNHSupplier
 										AND (sub.isEarlyBird = mp.isEarlyBird OR ISNULL(sub.isEarlyBird))
-					JOIN vn.agencyMode am ON am.id = vAgencyModeFk
+					JOIN agencyMode am ON am.id = vAgencyModeFk
-					JOIN vn.agency ag ON ag.id = am.agencyFk
+					JOIN agency ag ON ag.id = am.agencyFk
-					JOIN vn.itemType itt ON itt.id = it.typeFk
+					JOIN itemType itt ON itt.id = it.typeFk
-					JOIN vn.itemCategory itc on itc.id = itt.categoryFk
+					JOIN itemCategory itc on itc.id = itt.categoryFk
-					JOIN vn.address ad ON ad.id = vAddressFk
+					JOIN address ad ON ad.id = vAddressFk
-					LEFT JOIN vn.clientItemType cit 
+					LEFT JOIN clientItemType cit 
 						ON cit.clientFk = ad.clientFk
 							AND cit.itemTypeFk = itt.id
-					LEFT JOIN vn.zoneItemType zit 
+					LEFT JOIN zoneItemType zit 
 						ON zit.zoneFk = vZoneFk
 							AND zit.itemTypeFk = itt.id
-					LEFT JOIN vn.agencyModeItemType ait 
+					LEFT JOIN agencyModeItemType ait 
 						ON ait.agencyModeFk = vAgencyModeFk
 							AND ait.itemTypeFk = itt.id
 				WHERE a.calc_id = vAvailableCalc
@@ -133,7 +133,7 @@ BEGIN
 
 		DROP TEMPORARY TABLE tmp.buyUltimate;
 
-		CALL vn.catalog_componentCalculate(vZoneFk, vAddressFk, vShipped, vWarehouseFk);
+		CALL catalog_componentCalculate(vZoneFk, vAddressFk, vShipped, vWarehouseFk);
 
 		INSERT INTO tmp.ticketCalculateItem(
 					itemFk,

db/routines/vn/procedures/entry_getTransfer.sql

@@ -97,7 +97,7 @@ BEGIN
 				FROM tmp.itemList;
 	END IF;
 
-	CALL buyUltimateFromInterval(vWarehouseIn,vInventoryDate, vDateLanded);
+	CALL buy_getUltimateFromInterval(NULL, vWarehouseIn,vInventoryDate, vDateLanded);
 
 	CREATE OR REPLACE TEMPORARY TABLE tTransfer
 		ENGINE = MEMORY

db/routines/vn/procedures/itemShelvingSale_reallocate.sql

@@ -1,55 +1,55 @@
-DELIMITER $$
+DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`itemShelvingSale_reallocate`(
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`itemShelvingSale_reallocate`(
-	vItemShelvingFk INT(10),
+	vItemShelvingFk INT(10),
-	vItemFk INT(10),
+	vItemFk INT(10),
-	vSectorFk INT
+	vSectorFk INT
-)
+)
-BEGIN
+BEGIN
-/**
+/**
- * Elimina reservas de un itemShelving e intenta reservar en otra ubicación 
+ * Elimina reservas de un itemShelving e intenta reservar en otra ubicación 
- * 
+ * 
- * @param vItemShelvingFk Id itemShelving
+ * @param vItemShelvingFk Id itemShelving
- * @param vItemFk Id del artículo
+ * @param vItemFk Id del artículo
- * @param vSectorFk Id del sector
+ * @param vSectorFk Id del sector
- */
+ */
-	DECLARE EXIT HANDLER FOR SQLEXCEPTION
+	DECLARE EXIT HANDLER FOR SQLEXCEPTION
-		BEGIN
+		BEGIN
-			ROLLBACK;
+			ROLLBACK;
-			RESIGNAL;
+			RESIGNAL;
-		END;
+		END;
-
+
-	START TRANSACTION;
+	START TRANSACTION;
-	
+	
-	UPDATE itemShelving
+	UPDATE itemShelving
-		SET visible = 0,
+		SET visible = 0,
-			available = 0
+			available = 0
-		WHERE id = vItemShelvingFk 
+		WHERE id = vItemShelvingFk 
-			AND itemFk = vItemFk;	
+			AND itemFk = vItemFk;	
-
+
-	SELECT iss.id
+	SELECT iss.id
-			FROM itemShelvingSale iss
+			FROM itemShelvingSale iss
-				JOIN itemShelving ish ON ish.id = iss.itemShelvingFk
+				JOIN itemShelving ish ON ish.id = iss.itemShelvingFk
-			WHERE iss.itemShelvingFk = vItemShelvingFk 			 
+			WHERE iss.itemShelvingFk = vItemShelvingFk 			 
-				AND iss.itemFk = vItemFk
+				AND ish.itemFk = vItemFk
-				AND NOT iss.isPicked
+				AND NOT iss.isPicked
-			FOR UPDATE;
+			FOR UPDATE;
-
+
-	INSERT INTO itemShelvingSaleReserve (saleFk, vSectorFk)
+	INSERT INTO itemShelvingSaleReserve (saleFk, sectorFk)
-		SELECT DISTINCT iss.saleFk
+		SELECT DISTINCT iss.saleFk, vSectorFk
-			FROM itemShelvingSale iss
+			FROM itemShelvingSale iss
-				JOIN itemShelving ish ON ish.id = iss.itemShelvingFk
+				JOIN itemShelving ish ON ish.id = iss.itemShelvingFk
-			WHERE iss.itemShelvingFk = vItemShelvingFk 			 
+			WHERE iss.itemShelvingFk = vItemShelvingFk 			 
-				AND ish.itemFk = vItemFk
+				AND ish.itemFk = vItemFk
-				AND NOT iss.isPicked;
+				AND NOT iss.isPicked;
-
+
-	DELETE iss
+	DELETE iss
-		FROM itemShelvingSale iss
+		FROM itemShelvingSale iss
-				JOIN itemShelving ish ON ish.id = iss.itemShelvingFk
+				JOIN itemShelving ish ON ish.id = iss.itemShelvingFk
-			WHERE iss.itemShelvingFk = vItemShelvingFk 			 
+			WHERE iss.itemShelvingFk = vItemShelvingFk 			 
-				AND ish.itemFk = vItemFk
+				AND ish.itemFk = vItemFk
-				AND NOT iss.isPicked;
+				AND NOT iss.isPicked;
-	COMMIT;
+	COMMIT;
-
+
-	CALL itemShelvingSale_doReserve();
+	CALL itemShelvingSale_doReserve();
-END$$
+END$$
 DELIMITER ;

db/routines/vn/procedures/itemShelvingSale_setQuantity.sql

@@ -103,7 +103,7 @@ BEGIN
 	COMMIT;
 	
 	IF vIsItemShelvingSaleEmpty AND vQuantity <> vReservedQuantity THEN
-		INSERT INTO itemShelvingSaleReserve (saleFk, vSectorFk)
+		INSERT INTO itemShelvingSaleReserve (saleFk, sectorFk)
 			SELECT vSaleFk, vSectorFk;
 		CALL itemShelvingSale_reallocate(vItemShelvingFk, vItemFk, vSectorFk);
 	END IF;

db/routines/vn/procedures/itemShelving_addByClaim.sql

@@ -15,7 +15,7 @@ BEGIN
 			JOIN ticket t ON t.id = c.ticketFk
 		WHERE c.id = vClaimFk;
 
-	CALL buyUltimate (vWarehouseFk, util.VN_CURDATE());
+	CALL buy_getUltimate(NULL, vWarehouseFk, util.VN_CURDATE());
 
 	INSERT INTO itemShelving (itemFk, shelvingFk, packing, `grouping`, visible)
 		SELECT s.itemFk, vShelvingFk, b.packing, b.`grouping`, cb.quantity AS visible

db/routines/vn/procedures/itemShelving_getItemDetails.sql

@@ -23,7 +23,7 @@ BEGIN
 			FROM operator
 			WHERE workerFk = account.myUser_getId();
 
-		CALL buyUltimate(vWarehouseFk, util.VN_CURDATE());
+		CALL buy_getUltimate(vBarcodeItem, vWarehouseFk, util.VN_CURDATE());
 
 		SELECT buyFk INTO vBuyFk
 			FROM  tmp.buyUltimate

db/routines/vn/procedures/item_devalueA2.sql

@@ -93,7 +93,7 @@ BEGIN
 		ORDER BY created DESC
 		LIMIT 1;
 
-	CALL buyUltimate(vWarehouseFk, vCurdate);
+	CALL buy_getUltimate(vSelf, vWarehouseFk, vCurdate);
 
 	SELECT b.entryFk, bu.buyFk,IFNULL(b.buyingValue, 0) INTO vLastEntryFk, vLastBuyFk, vBuyingValueOriginal
 		FROM tmp.buyUltimate bu

db/routines/vn/procedures/item_getBalance.sql

@@ -240,7 +240,7 @@ BEGIN
 			NULL reference,
 			NULL entityType,
 			NULL entityId,
-			'Inventario calculado',
+			'Inventario calculado' entityName,
 			@a invalue,
 			NULL `out`,
 			@a balance,

db/routines/vn/procedures/item_getInfo.sql

@@ -1,5 +1,8 @@
 DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`item_getInfo`(IN `vBarcode` VARCHAR(22), IN `vWarehouseFk` INT)
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`item_getInfo`(
+	`vBarcode` VARCHAR(22), 
+	`vWarehouseFk` INT
+)
 BEGIN
 /**
  * Devuelve información relativa al item correspondiente del vBarcode pasado
@@ -11,12 +14,14 @@ BEGIN
 	DECLARE vCacheAvailableFk INT;
 	DECLARE vVisibleItemShelving INT;
 	DECLARE vItemFk INT;
+	DECLARE vDated DATE;
+
+	SELECT barcodeToItem(vBarcode), util.VN_CURDATE() INTO vItemFk, vDated;
 
 	CALL cache.visible_refresh(vCacheVisibleFk, FALSE, vWarehouseFk);
-	CALL cache.available_refresh(vCacheAvailableFk, FALSE, vWarehouseFk, util.VN_CURDATE());
+	CALL cache.available_refresh(vCacheAvailableFk, FALSE, vWarehouseFk, vDated);
-	CALL buyUltimate(vWarehouseFk, util.VN_CURDATE());
+	CALL buy_getUltimate(vItemFk, vWarehouseFk, vDated);
-
+	
-	SELECT barcodeToItem(vBarcode) INTO vItemFk;
 	SELECT SUM(visible) INTO vVisibleItemShelving
 		FROM itemShelvingStock
 		WHERE itemFk = vItemFk

db/routines/vn/procedures/item_multipleBuy.sql

@@ -13,7 +13,7 @@ BEGIN
  */
 	ALTER TABLE tmp.itemInventory ADD IF NOT EXISTS buy_id INT;
 
-	CALL buyUltimate(vWarehouseFk, vDate);
+	CALL buy_getUltimate (NULL, vWarehouseFk, vDate);
 
 	CREATE OR REPLACE TEMPORARY TABLE tmp
 		(KEY (itemFk))

db/routines/vn/procedures/item_valuateInventory.sql

@@ -204,7 +204,7 @@ BEGIN
 				AND (ic.id = vItemCategoryFk OR vItemCategoryFk IS NULL)
 			ON DUPLICATE KEY UPDATE tInventory.quantity = tInventory.quantity + (b.quantity);
 		
-	CALL buyUltimate(NULL, vDateDayEnd);
+	CALL buy_getUltimate (NULL, NULL, vDateDayEnd);
 
 	DELETE FROM tInventory WHERE quantity IS NULL OR NOT quantity;
 

db/routines/vn/procedures/sale_getProblems.sql

@@ -276,7 +276,7 @@ BEGIN
 			ON DUPLICATE KEY UPDATE itemDelay = sub.problem, saleFk = sub.saleFk;
 
 		-- Redondeo: Cantidad pedida incorrecta en al grouping de la última compra
-		CALL buyUltimate(vWarehouseFk, vDate);
+		CALL buy_getUltimate(NULL, vWarehouseFk, vDate);
 		INSERT INTO tmp.sale_problems(ticketFk, hasRounding, saleFk)
 			SELECT ticketFk, problem ,saleFk
 				FROM (

db/routines/vn/procedures/sale_recalcComponent.sql

@@ -78,7 +78,7 @@ proc: BEGIN
 		DROP TEMPORARY TABLE tmp.zoneGetLanded;
 
 		-- rellena la tabla buyUltimate con la ultima compra	
-		CALL buyUltimate (vWarehouseFk, vShipped);  
+		CALL buy_getUltimate(NULL, vWarehouseFk, vShipped);  
 	
 		CREATE OR REPLACE TEMPORARY TABLE tmp.sale
 				(PRIMARY KEY (saleFk)) ENGINE = MEMORY

db/routines/vn/procedures/sale_replaceItem.sql

@@ -53,7 +53,7 @@ BEGIN
 			JOIN ticket t ON t.id = s.ticketFk
 		WHERE s.id = vSaleFk;
 
-	CALL buyUltimate(vWarehouseFk, vDate);
+	CALL buy_getUltimate(vNewItemFk, vWarehouseFk, vDate);
 
 	SELECT `grouping`, groupingMode, packing
 		INTO vGrouping,vGroupingMode,vPacking
@@ -61,6 +61,8 @@ BEGIN
 			JOIN tmp.buyUltimate tmp ON b.id = tmp.buyFk
 		WHERE tmp.itemFk = vNewItemFk AND tmp.WarehouseFk = vWarehouseFk;
 
+	DROP TEMPORARY TABLE tmp.buyUltimate;
+	
 	IF vGroupingMode = 'packing' AND vPacking > 0 THEN
 		SET vRoundQuantity = vPacking;
 	END IF;

db/routines/vn/procedures/sale_setProblemRounding.sql

@@ -19,7 +19,7 @@ BEGIN
 			JOIN ticket t ON t.id = s.ticketFk 
 		WHERE s.id = vSelf;
 
-	CALL buyUltimate(vWarehouseFk, vShipped);	
+	CALL buy_getUltimate(vItemFk, vWarehouseFk, vShipped);	
 	
 	CREATE OR REPLACE TEMPORARY TABLE tmp.sale 
 		SELECT vSelf saleFk, 

db/routines/vn/procedures/stockTraslation.sql

@@ -36,6 +36,6 @@ BEGIN
 			WHERE warehouse_id = vAuctionWarehouseFk
 			ON DUPLICATE KEY UPDATE quantity = tmp.item.quantity + VALUES(quantity);
 
-	CALL buyUltimate(vAuctionWarehouseFk, vDated);
+	CALL buy_getUltimate(NULL, vAuctionWarehouseFk, vDated);
 END$$
 DELIMITER ;

db/routines/vn/procedures/ticket_componentPreview.sql

@@ -56,13 +56,12 @@ BEGIN
 		FROM zone
 		WHERE id = vZoneFk;
 		
-	CALL buyUltimate(vWarehouseFk, vShipped);
+	CALL buy_getUltimate(NULL, vWarehouseFk, vShipped);
 		
 	DROP TEMPORARY TABLE IF EXISTS tmp.ticketLot;
 	CREATE TEMPORARY TABLE tmp.ticketLot ENGINE = MEMORY ( 
-	SELECT 
+	SELECT  vWarehouseFk warehouseFk,
-			vWarehouseFk AS warehouseFk,
+			NULL available,
-			NULL AS available,
 			s.itemFk,
 			bu.buyFk,
 			vZoneFk zoneFk

db/routines/vn/procedures/ticket_setProblemRounding.sql

@@ -16,7 +16,7 @@ BEGIN
 		FROM ticket
 		WHERE id = vSelf;
 
-	CALL buyUltimate(vWarehouseFk, vDated);	
+	CALL buy_getUltimate(NULL, vWarehouseFk, vDated);	
 	
 	CREATE OR REPLACE TEMPORARY TABLE tmp.sale
 		(INDEX(saleFk, isProblemCalcNeeded)) 

db/routines/vn/procedures/zone_getAddresses.sql

@@ -1,55 +1,57 @@
 DELIMITER $$
 CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`zone_getAddresses`(
 	vSelf INT,
-	vLanded DATE
+	vShipped DATE,
+	vDepartmentFk INT
 )
 BEGIN
 /**
  * Devuelve un listado de todos los clientes activos
  * con consignatarios a los que se les puede
- * vender producto para esa zona y no tiene un ticket
+ * vender producto para esa zona.
- * para ese día.
  *
  * @param vSelf Id de zona
- * @param vDated Fecha de entrega
+ * @param vShipped Fecha de envio
+ * @param vDepartmentFk Id de departamento
  * @return Un select
  */
 	CALL zone_getPostalCode(vSelf);
 
-	WITH notHasTicket AS (
+	WITH clientWithTicket AS (
-		SELECT id
+		SELECT clientFk
-			FROM vn.client
+			FROM vn.ticket
-			WHERE id NOT IN (
+			WHERE shipped BETWEEN vShipped AND util.dayEnd(vShipped)
-				SELECT clientFk
-					FROM vn.ticket
-					WHERE landed BETWEEN vLanded AND util.dayEnd(vLanded)
-			)
 	)
-	SELECT c.id clientFk,
+	SELECT c.id,
-				c.name,
+			c.name,
-				c.phone,
+			c.phone,
-				bt.description,
+			bt.description,
-				c.salesPersonFk,
+			c.salesPersonFk,
-				u.name username,
+			u.name username,
-				aai.invoiced,
+			aai.invoiced,
-				cnb.lastShipped
+			cnb.lastShipped,
-			FROM vn.client c
+			cwt.clientFk
-				JOIN notHasTicket ON notHasTicket.id = c.id
+		FROM vn.client c
-				LEFT JOIN account.`user` u ON u.id = c.salesPersonFk
+			JOIN vn.worker w ON w.id = c.salesPersonFk
-				JOIN vn.`address` a ON a.clientFk = c.id
+			JOIN vn.workerDepartment wd ON wd.workerFk = w.id
-				JOIN vn.postCode pc ON pc.code = a.postalCode
+			JOIN vn.department d ON d.id = wd.departmentFk
-				JOIN vn.town t ON t.id = pc.townFk AND t.provinceFk = a.provinceFk
+			LEFT JOIN clientWithTicket cwt ON cwt.clientFk = c.id
-				JOIN vn.zoneGeo zg ON zg.name = a.postalCode
+			LEFT JOIN account.`user` u ON u.id = c.salesPersonFk
-				JOIN tmp.zoneNodes zn ON zn.geoFk = pc.geoFk
+			JOIN vn.`address` a ON a.clientFk = c.id
-				LEFT JOIN bs.clientNewBorn cnb ON cnb.clientFk = c.id
+			JOIN vn.postCode pc ON pc.code = a.postalCode
-				LEFT JOIN vn.annualAverageInvoiced aai ON aai.clientFk = c.id
+			JOIN vn.town t ON t.id = pc.townFk AND t.provinceFk = a.provinceFk
-				JOIN vn.clientType ct ON ct.code = c.typeFk
+			JOIN vn.zoneGeo zg ON zg.name = a.postalCode
-				JOIN vn.businessType bt ON bt.code = c.businessTypeFk 
+			JOIN tmp.zoneNodes zn ON zn.geoFk = pc.geoFk
-			WHERE a.isActive
+			LEFT JOIN bs.clientNewBorn cnb ON cnb.clientFk = c.id
-				AND c.isActive
+			LEFT JOIN vn.annualAverageInvoiced aai ON aai.clientFk = c.id
-				AND ct.code = 'normal'
+			JOIN vn.clientType ct ON ct.code = c.typeFk
-				AND bt.code <> 'worker'
+			JOIN vn.businessType bt ON bt.code = c.businessTypeFk
-			GROUP BY c.id;
+		WHERE a.isActive
+			AND c.isActive
+			AND ct.code = 'normal'
+			AND bt.code <> 'worker'
+			AND (d.id = vDepartmentFk OR NOT vDepartmentFk)
+		GROUP BY c.id;
 
 	DROP TEMPORARY TABLE tmp.zoneNodes;
 END$$

db/versions/11177-crimsonPaniculata/00-firstScript.sql

@@ -0,0 +1,6 @@
+-- Place your SQL code here
+
+ALTER TABLE vn.itemShelvingSaleReserve DROP FOREIGN KEY IF EXISTS  itemShelvingSaleReserve_sector_FK;
+
+ALTER TABLE vn.itemShelvingSaleReserve ADD CONSTRAINT  itemShelvingSaleReserve_sector_FK 
+	FOREIGN KEY IF NOT EXISTS (sectorFk) REFERENCES vn.sector(id) ON DELETE RESTRICT ON UPDATE CASCADE;

loopback/locale/en.json

@@ -233,5 +233,7 @@
 	"It has been invoiced but the PDF could not be generated": "It has been invoiced but the PDF could not be generated",
 	"It has been invoiced but the PDF of refund not be generated": "It has been invoiced but the PDF of refund not be generated",
 	"Cannot add holidays on this day": "Cannot add holidays on this day",
-	"Cannot send mail": "Cannot send mail"
+	"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"
 }

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

@@ -52,8 +52,8 @@ module.exports = Self => {
             else {
                 const userConfig = await models.UserConfig.findById(userId, {fields: ['warehouseFk']}, myOptions);
                 await Self.rawSql(
-                    'CALL vn.buyUltimate(?,?)',
+                    'CALL buy_getUltimate(?, ?, ?)',
-                    [userConfig.warehouseFk, null],
+                    [args.item, userConfig.warehouseFk, null],
                     myOptions
                 );
                 let buyUltimate = await Self.rawSql(

modules/entry/back/methods/entry/importBuys.js

@@ -73,7 +73,8 @@ module.exports = Self => {
             }, myOptions);
 
             const travel = entry.travel();
-            await Self.rawSql('CALL buyUltimate(?, ?)', [
+            await Self.rawSql('CALL buy_getUltimate(?, ?, ?)', [
+                null,
                 travel.warehouseInFk,
                 travel.landed
             ], myOptions);

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

@@ -50,7 +50,8 @@ module.exports = Self => {
 
         const stmts = [];
         let stmt;
-        stmt = new ParameterizedSQL(`CALL buyUltimate(?, ?)`, [
+        stmt = new ParameterizedSQL(`CALL buy_getUltimate(?, ?, ?)`, [
+            null,
             travel.warehouseInFk,
             travel.landed
         ]);

modules/order/back/methods/order/getItemTypeAvailable.js

@@ -44,16 +44,14 @@ module.exports = Self => {
         ]);
         stmts.push(stmt);
 
-        stmts.push('DROP TEMPORARY TABLE IF EXISTS tmp.item');
-
         stmt = new ParameterizedSQL(
-            `CREATE TEMPORARY TABLE tmp.item
+            `CREATE OR REPLACE TEMPORARY TABLE tmp.item
                 (PRIMARY KEY (itemFk)) ENGINE = MEMORY
                 SELECT DISTINCT
-                    i.id AS itemFk,
+                    i.id itemFk,
-                    it.id AS typeFk,
+                    it.id typeFk,
                     it.name,
-                    ic.name AS categoryName
+                    ic.name categoryName
                 FROM tmp.availableCalc ac
                     JOIN cache.available a ON a.calc_id = ac.calcFk
                     JOIN vn.item i ON i.id = a.item_id
@@ -64,7 +62,7 @@ module.exports = Self => {
         stmts.push(stmt);
 
         stmt = new ParameterizedSQL(
-            'CALL vn.catalog_calculate(?, ?, ?,?)', [
+            'CALL vn.catalog_calculate(?, ?, ?, ?)', [
                 order.landed,
                 order.addressFk,
                 order.agencyModeFk,
@@ -74,7 +72,7 @@ module.exports = Self => {
         stmts.push(stmt);
 
         stmt = new ParameterizedSQL(`
-            SELECT i.typeFk AS id, i.name, i.categoryName
+            SELECT i.typeFk id, i.name, i.categoryName
                 FROM tmp.item i
                     JOIN tmp.ticketCalculateItem tci ON tci.itemFk = i.itemFk
                 GROUP BY i.typeFk`
@@ -85,7 +83,6 @@ module.exports = Self => {
 
         const sql = ParameterizedSQL.join(stmts, ';');
         const result = await Self.rawStmt(sql, myOptions);
-
         return result[categoriesIndex];
     };
 };

package.json

@@ -1,6 +1,6 @@
 {
     "name": "salix-back",
-    "version": "24.32.0",
+    "version": "24.34.0",
     "author": "Verdnatura Levante SL",
     "description": "Salix backend",
     "license": "GPL-3.0",

print/templates/email/printer-setup/locale/fr.yml

@@ -0,0 +1,39 @@
+subject: Instalation et configuration de l'imprimante
+title: "Merci pour votre confiance !"
+description:
+  dear: Cher client
+  instructions: Veuillez suivre les instructions spécifiées dans cet e-mail pour procéder à l'installation de l'imprimante.
+  followGuide: Vous pouvez utiliser comme guide la vidéo du montage du ruban et de la bande.
+    <a href='https://www.youtube.com/watch?v=qhb0kgQF3o8' title='Youtube' target='_blank'
+    style='color:#8dba25'>https://www.youtube.com/watch?v=qhb0kgQF3o8</a>. Vous
+    aurez également besoin de GoLabel, le programme pour imprimer les bandes.
+  downloadFrom: Vous pouvez le télécharger depuis ce lien. <a href='https://cdn.verdnatura.es/public/GoLabel.zip'
+    title='Descargar GoLabel' target='_blank' style='color:#8dba25'>https://cdn.verdnatura.es/public/GoLabel.zip</a>
+  downloadDriver: Vous pouvez télécharger le pilote de l'imprimante depuis ce lien. <a href='https://es.seagullscientific.com/support/downloads/drivers/godex/download/'
+    title='Descargar driver' target='_blank' style='color:#8dba25'>https://es.seagullscientific.com/support/downloads/drivers/godex/download/</a>
+sections:
+  GoLabel:
+    title: Utilisation de GoLabel
+    description: Pour utiliser le programme d'impression des bandes, suivez ces étapes
+    steps:
+    - Ci-joint à cet e-mail, vous trouverez le fichier 'model.ezp' (le modèle de bandes de corona standard). Téléchargez-le et vous le trouverez probablement dans le dossier 'Téléchargements'.
+    - Ouvrez le programme GoLabel.
+    - Cliquez sur l'icône de la barre supérieure en forme de dossier avec une feuille.
+    - Sélectionnez le fichier nommé 'model.ezp' (qui se trouve probablement dans 'Téléchargements'), puis cliquez sur Ouvrir.
+    - Une fois le fichier ouvert, double-cliquez sur le texte. Dans la boîte qui s'ouvre, cliquez sur le texte d'exemple (dans ce cas "TUS HERMANOS") et il apparaîtra dans la même zone à gauche pour que vous puissiez l'éditer et écrire ce que vous souhaitez.
+    - Lorsque vous avez le texte souhaité, cliquez sur le bouton 'OK'.
+    - Allez dans 'Fichier' → 'Enregistrer sous' et enregistrez-le sur le bureau sous un autre nom.
+    - Ensuite, pour imprimer, vous devez d'abord configurer l'imprimante.
+    - Cliquez sur la huitième icône de la barre supérieure, qui sera ici une imprimante avec un engrenage orange.
+    - Une fois là, cliquez sur le menu déroulant du modèle d'imprimante et choisissez le modèle qui correspond au vôtre 'G***'.
+    - Cliquez sur 'Enregistrer' et notre imprimante sera configurée et prête.
+    - Et enfin, pour imprimer, cliquez sur la neuvième icône, qui correspond à une imprimante bleue.
+  help:
+    title: "Avez-vous besoin d'aide ?"
+    description: Si vous avez besoin d'aide, téléchargez notre programme de support afin que nous puissions nous connecter à distance à votre ordinateur et effectuer l'installation. Veuillez nous fournir un horaire de contact pour vous assister, et nous vous contacterons.
+    remoteSupport: Vous pouvez télécharger le programme depuis ce lien. <a href='http://soporte.verdnatura.es'
+      title='Soporte Verdnatura' target='_blank' style='color:#8dba25'>http://soporte.verdnatura.es</a>.
+help: Pour toute question que vous pourriez avoir, n'hésitez pas à nous la poser. <strong>Nous sommes là pour vous aider !</strong>
+salesPersonName: Je suis votre commercial et mon nom est
+salesPersonPhone: Téléphone et WhatsApp.
+salesPersonEmail: Adresse e-mail.