diff --git a/db/routines/hedera/procedures/order_addItem.sql b/db/routines/hedera/procedures/order_addItem.sql
index 1b310802d..d04f2b814 100644
--- a/db/routines/hedera/procedures/order_addItem.sql
+++ b/db/routines/hedera/procedures/order_addItem.sql
@@ -59,11 +59,8 @@ BEGIN
 	SELECT quantity INTO vMinQuantity
 		FROM vn.itemMinimumQuantity
 		WHERE itemFk = vItem
-			AND (
-				util.VN_CURDATE() BETWEEN `started` AND `ended`
-				OR
-				(util.VN_CURDATE() >= `started` AND `ended` IS NULL)
-			)
+			AND (util.VN_CURDATE() >= `started`
+				AND (util.VN_CURDATE() <= `ended` OR `ended` IS NULL))
 			AND (warehouseFk = vWarehouse OR warehouseFk IS NULL)
 		LIMIT 1;
 
diff --git a/modules/ticket/back/models/sale.js b/modules/ticket/back/models/sale.js
index 127e1ec63..af76444bf 100644
--- a/modules/ticket/back/models/sale.js
+++ b/modules/ticket/back/models/sale.js
@@ -83,8 +83,8 @@ module.exports = Self => {
         const [itemInfo] = await models.Sale.rawSql(`SELECT available FROM tmp.ticketCalculateItem`, null, ctx.options);
         const available = itemInfo?.available;
 
-        if ((!isReduction && !available) || available < quantityAdded)
-            throw new UserError(`This item is not available`);
+        // if ((!isReduction && !available) || available < quantityAdded)
+        //    throw new UserError(`This item is not available`);
 
         if (await models.ACL.checkAccessAcl(ctx, 'Ticket', 'isRoleAdvanced', '*')) return;
 
@@ -93,21 +93,16 @@ module.exports = Self => {
             fields: ['quantity'],
             where: {
                 itemFk: itemId,
+                started: {lte: today},
                 or: [
-                    {
-                        and: [
-                            {started: {lte: today}},
-                            {ended: {gte: today}}
-                        ]
-                    },
-                    {
-                        and: [
-                            {started: {lte: today}},
-                            {ended: null}
-                        ]
-                    }
+                    {ended: {gte: today}},
+                    {ended: null}
                 ],
-                warehouseFk: {inq: [ticket.warehouseFk, null]}
+                // eslint-disable-next-line no-dupe-keys
+                or: [
+                    {warehouseFk: ticket.warehouseFk},
+                    {warehouseFk: null}
+                ]
             },
             limit: 1
         }, ctx.options);