From c62c7c0b1f1456ff0251db78d72258efa81295a9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20Salvador?= <csalvador@gpcsolutions.fr>
Date: Mon, 16 Sep 2013 12:15:03 +0200
Subject: [PATCH 1/2] Stock calculation was wrong in certain cases, should be
 ok now

---
 htdocs/product/stock/replenish.php | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/htdocs/product/stock/replenish.php b/htdocs/product/stock/replenish.php
index 189e1d7ce70..eedee585cee 100644
--- a/htdocs/product/stock/replenish.php
+++ b/htdocs/product/stock/replenish.php
@@ -163,8 +163,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 +203,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 +575,4 @@ print ' <script type="text/javascript">
 llxFooter();
 
 $db->close();
-?>
\ No newline at end of file
+?>

From 967c20e3e9ed0f5547e71e48b6794a7a0a157180 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20Salvador?= <csalvador@gpcsolutions.fr>
Date: Mon, 16 Sep 2013 14:31:56 +0200
Subject: [PATCH 2/2] Improved error message

---
 htdocs/fourn/class/fournisseur.commande.class.php | 3 ++-
 htdocs/product/stock/replenish.php                | 4 +++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/htdocs/fourn/class/fournisseur.commande.class.php b/htdocs/fourn/class/fournisseur.commande.class.php
index 93612387adb..6f6f9e91867 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 eedee585cee..30941ec0cc2 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') . "&nbsp;:&nbsp;";
+                $msg .= $order->error;
+                setEventMessage($msg, 'errors');
             }
             $i++;
         }