diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php index d746bf4a812..acb66eb1ebb 100644 --- a/htdocs/product/class/product.class.php +++ b/htdocs/product/class/product.class.php @@ -5271,7 +5271,7 @@ class Product extends CommonObject $stock_sending_client = $this->stats_expedition['qty']; } if ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD)) || !empty($conf->supplier_order->enabled)) { - $filterStatus = empty($conf->global->SUPPLIER_ORDER_STATUS_FOR_VIRTUAL_STOCK) ? '2,3,4' : $conf->global->SUPPLIER_ORDER_STATUS_FOR_VIRTUAL_STOCK; + $filterStatus = empty($conf->global->SUPPLIER_ORDER_STATUS_FOR_VIRTUAL_STOCK) ? '3,4' : $conf->global->SUPPLIER_ORDER_STATUS_FOR_VIRTUAL_STOCK; if (isset($includedraftpoforvirtual)) { $filterStatus = '0,1,2,'.$filterStatus; // 1,2 may have already been inside $filterStatus but it is better to have twice than missing $filterStatus does not include them } diff --git a/htdocs/takepos/pay.php b/htdocs/takepos/pay.php index 60a4840471e..4bd20f33f4b 100644 --- a/htdocs/takepos/pay.php +++ b/htdocs/takepos/pay.php @@ -37,9 +37,9 @@ if (!defined('NOREQUIREMENU')) { if (!defined('NOREQUIREHTML')) { define('NOREQUIREHTML', '1'); } -if (!defined('NOREQUIREAJAX')) { - define('NOREQUIREAJAX', '1'); -} +//if (!defined('NOREQUIREAJAX')) { +// define('NOREQUIREAJAX', '1'); +//} require '../main.inc.php'; // Load $user and permissions require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php'; @@ -258,37 +258,33 @@ if ($conf->global->TAKEPOS_NUMPAD == 0) {