diff --git a/db/routines/hedera/procedures/orderRow_updateOverstocking.sql b/db/routines/hedera/procedures/orderRow_updateOverstocking.sql
new file mode 100644
index 000000000..ff8362c65
--- /dev/null
+++ b/db/routines/hedera/procedures/orderRow_updateOverstocking.sql
@@ -0,0 +1,52 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`vn`@`localhost` 
+PROCEDURE `hedera`.`orderRow_updateOverstocking`(vOrderFk INT)
+BEGIN
+/**
+* Set amount = 0 to avoid overbooking sales
+* 
+* @param vOrderFk hedera.order.id
+*/
+	DECLARE vCalcFk INT;
+	DECLARE vDone BOOL;
+	DECLARE vWarehouseFk INT;
+
+	DECLARE cWarehouses CURSOR FOR
+		SELECT DISTINCT warehouseFk
+		FROM orderRow
+		WHERE orderFk = vOrderFk
+			AND shipped = util.VN_CURDATE();
+
+	DECLARE CONTINUE HANDLER FOR NOT FOUND SET vDone = TRUE;
+
+	DECLARE EXIT HANDLER FOR SQLEXCEPTION
+	BEGIN
+		ROLLBACK;
+		RESIGNAL;
+	END;
+
+	OPEN cWarehouses;
+	checking: LOOP
+		SET vDone = FALSE;
+
+		FETCH cWarehouses INTO vWarehouseFk;
+
+		IF vDone THEN
+			LEAVE checking;
+		END IF;
+
+		CALL cache.available_refresh(vCalcFk, FALSE, vWarehouseFk, util.VN_CURDATE());
+
+		UPDATE orderRow r
+				JOIN `order` o ON o.id = r.orderFk
+				JOIN orderConfig oc
+				JOIN cache.available a ON a.calc_id = vCalcFk AND a.item_id = r.itemFk
+			SET r.amount = 0
+			WHERE ADDTIME(o.rowUpdated, oc.reserveTime) < util.VN_NOW()
+				AND a.available <= 0
+				AND r.warehouseFk = vWarehouseFk
+				AND r.orderFk = vOrderFk;
+	END LOOP;
+	CLOSE cWarehouses;
+END$$
+DELIMITER ;
\ No newline at end of file
diff --git a/db/routines/hedera/procedures/order_confirmWithUser.sql b/db/routines/hedera/procedures/order_confirmWithUser.sql
index 2b033b704..b3aab522e 100644
--- a/db/routines/hedera/procedures/order_confirmWithUser.sql
+++ b/db/routines/hedera/procedures/order_confirmWithUser.sql
@@ -12,6 +12,7 @@ BEGIN
  * @param vUser The user identifier
  */
 	DECLARE vHasRows BOOL;
+	DECLARE vHas0Amount BOOL;
 	DECLARE vDone BOOL;
 	DECLARE vWarehouseFk INT;
 	DECLARE vShipment DATE;
@@ -101,6 +102,8 @@ BEGIN
 
 	CALL order_checkEditable(vSelf);
 
+	CALL orderRow_updateOverstocking(vSelf);
+
 	-- Check order is not empty
 	SELECT COUNT(*) > 0 INTO vHasRows
 		FROM orderRow
@@ -111,6 +114,18 @@ BEGIN
 		CALL util.throw('ORDER_EMPTY');
 	END IF;
 
+	-- Check if any product has a quantity of 0
+	SELECT EXISTS (
+		SELECT id
+			FROM orderRow
+			WHERE orderFk = vSelf
+				AND amount = 0
+	) INTO vHas0Amount;
+
+	IF vHas0Amount THEN
+		CALL util.throw('Remove lines with quantity = 0 before confirming');
+	END IF;
+
 	-- Crea los tickets del pedido
 	OPEN vDates;
 	lDates: LOOP
diff --git a/db/routines/hedera/triggers/orderRow_afterInsert.sql b/db/routines/hedera/triggers/orderRow_afterInsert.sql
new file mode 100644
index 000000000..af1a1479f
--- /dev/null
+++ b/db/routines/hedera/triggers/orderRow_afterInsert.sql
@@ -0,0 +1,10 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `hedera`.`orderRow_afterInsert`
+	AFTER INSERT ON `orderRow`
+	FOR EACH ROW
+BEGIN
+	UPDATE `order` 
+		SET rowUpdated = NOW() 
+	WHERE id = NEW.orderFk;
+END$$
+DELIMITER ;
\ No newline at end of file
diff --git a/db/versions/11277-wheatChico/00-firstScript.sql b/db/versions/11277-wheatChico/00-firstScript.sql
new file mode 100644
index 000000000..c2b5963a4
--- /dev/null
+++ b/db/versions/11277-wheatChico/00-firstScript.sql
@@ -0,0 +1,3 @@
+-- Place your SQL code here
+ALTER TABLE hedera.`order` ADD IF NOT EXISTS rowUpdated DATETIME NULL 
+    COMMENT 'Timestamp for last updated record in orderRow table';