feat: refs #7363 changes

db/routines/vn/procedures/item_getBalance.sql

@@ -41,7 +41,7 @@ BEGIN
 	);
 
 	INSERT INTO tItemDiary
-		WITH entries AS (
+		WITH entriesIn AS (
 			SELECT tr.landed shipped,
 					b.quantity `in`,
 					NULL `out`,
@@ -58,23 +58,22 @@ BEGIN
 					NULL clientType,
 					NULL claimFk,
 					ec.inventorySupplierFk
-				FROM buy b
+				FROM vn.buy b
-					JOIN entry e ON e.id = b.entryFk
+					JOIN vn.entry e ON e.id = b.entryFk
-					JOIN travel tr ON tr.id = e.travelFk
+					JOIN vn.travel tr ON tr.id = e.travelFk
-					JOIN supplier s ON s.id = e.supplierFk
+					JOIN vn.supplier s ON s.id = e.supplierFk
-					JOIN 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 entryConfig ec
+					JOIN vn.entryConfig ec
 				WHERE tr.landed >= vDateInventory
 					AND vWarehouseFk = tr.warehouseInFk
 					AND (s.id <> ec.inventorySupplierFk OR vDate IS NULL) 
 					AND b.itemFk = vItemFk
 					AND NOT e.isExcludedFromAvailable
 					AND NOT e.isRaid
-			),
+		), entriesOut AS (
-			deliveried AS (
 			SELECT tr.shipped,
 					NULL,
 					b.quantity,
@@ -91,16 +90,16 @@ BEGIN
 					NULL clientType,
 					NULL claimFk,
 					ec.inventorySupplierFk
-					FROM buy b
+				FROM vn.buy b
-						JOIN entry e ON e.id = b.entryFk
+					JOIN vn.entry e ON e.id = b.entryFk
-						JOIN travel tr ON tr.id = e.travelFk
+					JOIN vn.travel tr ON tr.id = e.travelFk
-						JOIN warehouse w ON w.id = tr.warehouseOutFk
+					JOIN vn.warehouse w ON w.id = tr.warehouseOutFk
-						JOIN supplier s ON s.id = e.supplierFk
+					JOIN vn.supplier s ON s.id = e.supplierFk
-						JOIN state st ON st.`code` = IF(tr.shipped < util.VN_CURDATE() 
+					JOIN vn.state st ON st.`code` = IF(tr.shipped < util.VN_CURDATE()
 						OR (tr.shipped = util.VN_CURDATE() AND tr.isReceived),
 							'DELIVERED',
 							'FREE')
-						JOIN entryConfig ec
+					JOIN vn.entryConfig ec
 				WHERE tr.shipped >= vDateInventory
 					AND vWarehouseFk = tr.warehouseOutFk
 					AND (s.id <> ec.inventorySupplierFk OR vDate IS NULL)
@@ -108,8 +107,7 @@ BEGIN
 						AND NOT e.isExcludedFromAvailable
 						AND NOT w.isFeedStock
 						AND NOT e.isRaid
-			),
+		), sales AS (
-			sales AS (
 			SELECT DATE(t.shipped) shipped,
 					s.quantity,
 					st2.alertLevel,
@@ -122,17 +120,17 @@ BEGIN
 					st.`order`,
 					c.typeFk,
 					cb.claimFk
-					FROM sale s
+				FROM vn.sale s
-						JOIN ticket t ON t.id = s.ticketFk
+					JOIN vn.ticket t ON t.id = s.ticketFk
-						LEFT JOIN ticketState ts ON ts.ticketFk = t.id
+					LEFT JOIN vn.ticketState ts ON ts.ticketFk = t.id
-						LEFT JOIN state st ON st.`code` = ts.`code`
+					LEFT JOIN vn.state st ON st.`code` = ts.`code`
-						JOIN client c ON c.id = t.clientFk
+					JOIN vn.client c ON c.id = t.clientFk
-						JOIN state st2 ON st2.`code` = IF(t.shipped < util.VN_CURDATE(),
+					JOIN vn.state st2 ON st2.`code` = IF(t.shipped < util.VN_CURDATE(),
 						'DELIVERED',
 						IF (t.shipped > util.dayEnd(util.VN_CURDATE()),
 							'FREE',
 							IFNULL(ts.code, 'FREE')))
-						LEFT JOIN claimBeginning cb ON s.id = cb.saleFk
+					LEFT JOIN vn.claimBeginning cb ON s.id = cb.saleFk
 				WHERE t.shipped >= vDateInventory
 					AND s.itemFk = vItemFk
 					AND vWarehouseFk = t.warehouseFk
@@ -153,9 +151,9 @@ BEGIN
 					s.typeFk,
 					s.claimFk,
 					NULL
-					FROM sales s
+				FROM vn.sales s
-						LEFT JOIN state stPrep ON stPrep.`code` = 'PREPARED'
+					LEFT JOIN vn.state stPrep ON stPrep.`code` = 'PREPARED'
-						LEFT JOIN saleTracking stk ON stk.saleFk = s.saleFk 
+					LEFT JOIN vn.saleTracking stk ON stk.saleFk = s.saleFk 
 						AND stk.stateFk = stPrep.id
 				GROUP BY s.saleFk
 		)	SELECT shipped,
@@ -174,9 +172,9 @@ BEGIN
 				clientType,
 				claimFk,
 				inventorySupplierFk
-					FROM entries
+				FROM entriesIn
 			UNION ALL
-				SELECT * FROM deliveried
+			SELECT * FROM entriesOut
 			UNION ALL
 			SELECT * FROM sale
 			ORDER BY shipped,