diff --git a/Nop.Plugin.Misc.AIPlugin/Areas/Admin/Views/Order/_CustomOrderDetails.Products.cshtml b/Nop.Plugin.Misc.AIPlugin/Areas/Admin/Views/Order/_CustomOrderDetails.Products.cshtml
index 3a583bd..b48764c 100644
--- a/Nop.Plugin.Misc.AIPlugin/Areas/Admin/Views/Order/_CustomOrderDetails.Products.cshtml
+++ b/Nop.Plugin.Misc.AIPlugin/Areas/Admin/Views/Order/_CustomOrderDetails.Products.cshtml
@@ -22,6 +22,9 @@
         var discountInclTax = parseFloat($('#pvDiscountInclTax'+itemId).val()) || 0;
         var discountExclTax = parseFloat($('#pvDiscountExclTax'+itemId).val()) || 0;
 
+        //if (maxQuantity < currentQuantity) maxQuantity = currentQuantity;
+        //console.log(maxQuantity);
+
         if (quantity > maxQuantity || quantity < 1) {
             if (quantity > maxQuantity) quantity = maxQuantity; else quantity = 1;
             $('#pvQuantity' + itemId).val(quantity);
@@ -101,7 +104,7 @@
                         <script>
                             $(function() {
                                 toggleOrderItemEditGlobal(false, @(item.Id));
-                                setupAutoCalculationGlobal(@(item.Id), @(item.ProductStockQuantity + item.ProductIncomingQuantity + item.Quantity));
+                                setupAutoCalculationGlobal(@(item.Id), @(Math.Max(item.ProductStockQuantity + item.ProductIncomingQuantity + item.Quantity, item.Quantity)));
                             });
                         </script>
                     }
@@ -291,7 +294,7 @@
                                         <div id="pnlEditPvQuantity@(item.Id)">
                                             <div class="form-group row">
                                                 <div class="col-md-8 offset-md-2">
-                                                    <input name="pvQuantity@(item.Id)" type="number" max="@(item.ProductStockQuantity + item.ProductIncomingQuantity + item.Quantity)" min="1"
+                                                    <input name="pvQuantity@(item.Id)" type="number" max="@(Math.Max(item.ProductStockQuantity + item.ProductIncomingQuantity + item.Quantity, item.Quantity))" min="1"
                                                            value="@item.Quantity" id="pvQuantity@(item.Id)" class="form-control input-sm" />
                                                 </div>
                                             </div>