// Fixed merge..

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13678 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
bMancone
2012-02-28 13:20:24 +00:00
parent 5d06b01a59
commit 885cf422d0

View File

@@ -2029,7 +2029,7 @@ class AdminSupplyOrdersControllerCore extends AdminController
{
$diff = (int)$threshold;
if ($supply_order->is_template != 0)
if ($supply_order->is_template != 1)
{
$real_quantity = (int)$manager->getProductRealQuantities($item['id_product'], $item['id_product_attribute'], $supply_order->id_warehouse, true);
$diff = (int)$threshold - (int)$real_quantity;