diff --git a/htdocs/fourn/class/fournisseur.commande.class.php b/htdocs/fourn/class/fournisseur.commande.class.php index 93612387adbb0f935a47834bf26d40d3cacab175..6f6f9e9186726835cadd659982e2768d6de49e3d 100644 --- a/htdocs/fourn/class/fournisseur.commande.class.php +++ b/htdocs/fourn/class/fournisseur.commande.class.php @@ -1200,7 +1200,8 @@ class CommandeFournisseur extends CommonOrder } if ($result == 0 || $result == -1) { - $this->error="No price found for this quantity. Quantity may be too low ?"; + $langs->load("errors"); + $this->error = "Ref " . $prod->ref . " " . $langs->trans("ErrorQtyTooLowForThisSupplier"); $this->db->rollback(); dol_syslog(get_class($this)."::addline result=".$result." - ".$this->error, LOG_DEBUG); return -1; diff --git a/htdocs/product/stock/replenish.php b/htdocs/product/stock/replenish.php index 189e1d7ce706004dfc7aa3ed1ae674940ae4c645..30941ec0cc2f02fa625183a7432e72b9e129b6aa 100644 --- a/htdocs/product/stock/replenish.php +++ b/htdocs/product/stock/replenish.php @@ -137,7 +137,9 @@ if ($action == 'order' && isset($_POST['valid'])) { $id = $order->create($user); if ($id < 0) { $fail++; - setEventMessage($langs->trans('OrderFail'), 'errors'); + $msg = $langs->trans('OrderFail') . " : "; + $msg .= $order->error; + setEventMessage($msg, 'errors'); } $i++; } @@ -163,8 +165,6 @@ $sql .= ', p.tms as datem, p.duration, p.tobuy, p.seuil_stock_alerte,'; $sql .= ' SUM(COALESCE(s.reel, 0)) as stock_physique'; $sql .= ', p.desiredstock'; $sql .= ' FROM ' . MAIN_DB_PREFIX . 'product as p'; -$sql .= ' LEFT JOIN ' . MAIN_DB_PREFIX . 'product_fournisseur_price as pf'; -$sql .= ' ON p.rowid = pf.fk_product'; $sql .= ' LEFT JOIN ' . MAIN_DB_PREFIX . 'product_stock as s'; $sql .= ' ON p.rowid = s.fk_product'; $sql.= ' WHERE p.entity IN (' . getEntity("product", 1) . ')'; @@ -205,7 +205,7 @@ if (!empty($canvas)) { $sql .= ' GROUP BY p.rowid, p.ref, p.label, p.price'; $sql .= ', p.price_ttc, p.price_base_type,p.fk_product_type, p.tms'; $sql .= ', p.duration, p.tobuy, p.seuil_stock_alerte'; -$sql .= ', p.desiredstock'; +$sql .= ', p.desiredstock, s.fk_product'; $sql .= ' HAVING p.desiredstock > SUM(COALESCE(s.reel, 0))'; $sql .= ' AND p.desiredstock > 0'; if ($salert == 'on') { @@ -577,4 +577,4 @@ print ' <script type="text/javascript"> llxFooter(); $db->close(); -?> \ No newline at end of file +?>