Merge branch 'dev' into 7357_dipole_review

db/routines/vn/procedures/itemShelving_filterBuyer.sql

@@ -21,7 +21,8 @@ proc:BEGIN
 				sub.downstairs,
 				sub.visible,
 				CAST(visible - upstairs - downstairs AS DECIMAL(10,0)) nicho,
-				sub.name itemColour
+				sub.name itemColour,
+				CAST(sub2.pendiente AS DECIMAL(10,0)) pendingAmount
 			FROM (SELECT iss.itemFk,
 						CONCAT(i.longName, '   ', IFNULL(i.size, ''),'   ', IFNULL(i.subName, '') ) longName,
 						'' size,
@@ -58,7 +59,8 @@ proc:BEGIN
 					0,
 					v.visible,
 					v.visible nicho,
-					ik.name itemColour
+					ik.name itemColour,
+					CAST(sub5.pendiente AS DECIMAL(10,0)) pendingAmount
 				FROM cache.visible v
 					JOIN item i ON i.id = v.item_id
 					LEFT JOIN ink ik ON ik.id = i.inkFk

db/versions/11114-goldenDracena/00-firstScript.sql

@@ -0,0 +1,18 @@
+-- Place your SQL code here
+CREATE TABLE IF NOT EXISTS vn.travelKgPercentage (
+	value INT(3) PRIMARY KEY,
+	className VARCHAR(50)
+);
+
+INSERT IGNORE INTO vn.travelKgPercentage (value, className) 
+	VALUES
+		(80, 'primary'),
+		(100, 'alert');
+
+INSERT IGNORE INTO salix.ACL
+	SET model = 'TravelKgPercentage',
+		property = '*',
+		accessType = 'READ',
+		permission = 'ALLOW',
+		principalType = 'ROLE',
+		principalId = 'employee';