diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php
index 43416875d950498e648223fa00e0d439f75146b9..ffc412fba70065e6d6c2ee7a80f188141adf16fd 100644
--- a/htdocs/comm/propal/class/propal.class.php
+++ b/htdocs/comm/propal/class/propal.class.php
@@ -2611,7 +2611,8 @@ class Propal extends CommonObject
{
global $langs;
- // Charge tableau des produits prodids
+ // Load array of products prodids
+ $num_prods = 0;
$prodids = array();
$sql = "SELECT rowid";
$sql.= " FROM ".MAIN_DB_PREFIX."product";
diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php
index 8fcc7d41ef1c25484fd2b181d46006b038c3f47d..6f14d407a5de5ccd6ba4ba4a4c89024a68d02073 100644
--- a/htdocs/commande/class/commande.class.php
+++ b/htdocs/commande/class/commande.class.php
@@ -449,6 +449,8 @@ class Commande extends CommonOrder
// If stock is decremented on validate order, we must reincrement it
if (! empty($conf->stock->enabled) && $conf->global->STOCK_CALCULATE_ON_VALIDATE_ORDER == 1)
{
+ $result = 0;
+
require_once DOL_DOCUMENT_ROOT.'/product/stock/class/mouvementstock.class.php';
$langs->load("agenda");
@@ -460,22 +462,9 @@ class Commande extends CommonOrder
$mouvP = new MouvementStock($this->db);
// We increment stock of product (and sub-products)
$result=$mouvP->reception($user, $this->lines[$i]->fk_product, $idwarehouse, $this->lines[$i]->qty, 0, $langs->trans("OrderBackToDraftInDolibarr",$this->ref));
- if ($result < 0) { $error++; }
+ if ($result < 0) { $error++; $this->error=$mouvP->error; break; }
}
}
-
- if (!$error)
- {
- $this->statut=self::STATUS_DRAFT;
- $this->db->commit();
- return $result;
- }
- else
- {
- $this->error=$mouvP->error;
- $this->db->rollback();
- return $result;
- }
}
if (!$error) {
@@ -3258,7 +3247,8 @@ class Commande extends CommonOrder
dol_syslog(get_class($this)."::initAsSpecimen");
- // Charge tableau des produits prodids
+ // Load array of products prodids
+ $num_prods = 0;
$prodids = array();
$sql = "SELECT rowid";
$sql.= " FROM ".MAIN_DB_PREFIX."product";
diff --git a/htdocs/compta/facture/class/facture-rec.class.php b/htdocs/compta/facture/class/facture-rec.class.php
index 2bcd227827ef1ee82dcbeb57704ce36a8027c71e..1cf7bbf1c6e90abffb441aadc36fcdd7859eb0df 100644
--- a/htdocs/compta/facture/class/facture-rec.class.php
+++ b/htdocs/compta/facture/class/facture-rec.class.php
@@ -760,8 +760,9 @@ class FactureRec extends CommonInvoice
$arraynow=dol_getdate($now);
$nownotime=dol_mktime(0, 0, 0, $arraynow['mon'], $arraynow['mday'], $arraynow['year']);
- $prodids = array();
+ // Load array of products prodids
$num_prods = 0;
+ $prodids = array();
$sql = "SELECT rowid";
$sql.= " FROM ".MAIN_DB_PREFIX."product";
diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php
index 95d24d2ce06ce660d92b2be2c9cc7c25e316182a..aa51c63374d655bb10799a518c45e81ab8776842 100644
--- a/htdocs/compta/facture/class/facture.class.php
+++ b/htdocs/compta/facture/class/facture.class.php
@@ -3537,6 +3537,8 @@ class Facture extends CommonInvoice
$arraynow=dol_getdate($now);
$nownotime=dol_mktime(0, 0, 0, $arraynow['mon'], $arraynow['mday'], $arraynow['year']);
+ // Load array of products prodids
+ $num_prods = 0;
$prodids = array();
$sql = "SELECT rowid";
$sql.= " FROM ".MAIN_DB_PREFIX."product";
diff --git a/htdocs/contrat/class/contrat.class.php b/htdocs/contrat/class/contrat.class.php
index 47cde8e3f4071d81e457cad4072b0407e8982d8e..fd92db95dfcfb843e9a566c29800dcb64ef469f5 100644
--- a/htdocs/contrat/class/contrat.class.php
+++ b/htdocs/contrat/class/contrat.class.php
@@ -2098,6 +2098,8 @@ class Contrat extends CommonObject
{
global $user,$langs,$conf;
+ // Load array of products prodids
+ $num_prods = 0;
$prodids = array();
$sql = "SELECT rowid";
$sql.= " FROM ".MAIN_DB_PREFIX."product";
@@ -2116,8 +2118,6 @@ class Contrat extends CommonObject
}
}
-
-
// Initialise parametres
$this->id=0;
$this->specimen=1;
diff --git a/htdocs/expedition/class/expedition.class.php b/htdocs/expedition/class/expedition.class.php
index 643ad6995a9dd36ed42e08129f25c1480cacd653..814b517ed38ce08c782b8268a59847abc2abfb9b 100644
--- a/htdocs/expedition/class/expedition.class.php
+++ b/htdocs/expedition/class/expedition.class.php
@@ -1549,7 +1549,8 @@ class Expedition extends CommonObject
dol_syslog(get_class($this)."::initAsSpecimen");
- // Charge tableau des produits prodids
+ // Load array of products prodids
+ $num_prods = 0;
$prodids = array();
$sql = "SELECT rowid";
$sql.= " FROM ".MAIN_DB_PREFIX."product";
diff --git a/htdocs/fourn/class/fournisseur.facture.class.php b/htdocs/fourn/class/fournisseur.facture.class.php
index 69932f0c2324293972852645f0bb5aa656620aaa..8c1a86b03a5aace8193704081e7ae139dbe9e381 100644
--- a/htdocs/fourn/class/fournisseur.facture.class.php
+++ b/htdocs/fourn/class/fournisseur.facture.class.php
@@ -1647,7 +1647,8 @@ class FactureFournisseur extends CommonInvoice
$now = dol_now();
- // Charge tableau des produits prodids
+ // Load array of products prodids
+ $num_prods = 0;
$prodids = array();
$sql = "SELECT rowid";
diff --git a/htdocs/livraison/class/livraison.class.php b/htdocs/livraison/class/livraison.class.php
index f77239535a67859f8bf85457266cc9afec2996bd..45e86b506861d6e1e9ff22b57c67d353741272c1 100644
--- a/htdocs/livraison/class/livraison.class.php
+++ b/htdocs/livraison/class/livraison.class.php
@@ -833,7 +833,8 @@ class Livraison extends CommonObject
$now=dol_now();
- // Charge tableau des produits prodids
+ // Load array of products prodids
+ $num_prods = 0;
$prodids = array();
$sql = "SELECT rowid";
$sql.= " FROM ".MAIN_DB_PREFIX."product";
diff --git a/htdocs/supplier_proposal/class/supplier_proposal.class.php b/htdocs/supplier_proposal/class/supplier_proposal.class.php
index fd7f266e1592c2c5124d9cc5164eb04ac44ed435..00efb287dcc0b43f971a2cc72a7bc0e78cbf257c 100644
--- a/htdocs/supplier_proposal/class/supplier_proposal.class.php
+++ b/htdocs/supplier_proposal/class/supplier_proposal.class.php
@@ -2186,7 +2186,8 @@ class SupplierProposal extends CommonObject
{
global $user,$langs,$conf;
- // Charge tableau des produits prodids
+ // Load array of products prodids
+ $num_prods = 0;
$prodids = array();
$sql = "SELECT rowid";
$sql.= " FROM ".MAIN_DB_PREFIX."product";