diff --git a/htdocs/fourn/class/fournisseur.commande.class.php b/htdocs/fourn/class/fournisseur.commande.class.php
index 35534ad823f..e00c80d92de 100644
--- a/htdocs/fourn/class/fournisseur.commande.class.php
+++ b/htdocs/fourn/class/fournisseur.commande.class.php
@@ -951,7 +951,7 @@ class CommandeFournisseur extends CommonOrder
//$sql.= ", ".$this->db->idate($now);
$sql.= ", ".$user->id;
$sql.= ", 0";
- $sql.= ", 0";
+ $sql.= ", ".($this->source? $this->source : 0);
$sql.= ", '".$conf->global->COMMANDE_SUPPLIER_ADDON_PDF."'";
//$sql.= ", ".$this->mode_reglement_id;
$sql.= ")";
diff --git a/htdocs/langs/en_US/orders.lang b/htdocs/langs/en_US/orders.lang
index 393678ed4c4..7a4833ab54b 100644
--- a/htdocs/langs/en_US/orders.lang
+++ b/htdocs/langs/en_US/orders.lang
@@ -160,4 +160,5 @@ OrderByPhone=Phone
CreateInvoiceForThisCustomer=Bill orders
NoOrdersToInvoice=No orders billable
CloseProcessedOrdersAutomatically=Classify "Processed" all selected orders.
-MenuOrdersToBill2=Billables orders
\ No newline at end of file
+MenuOrdersToBill2=Billables orders
+OrderCreation=Order creation
diff --git a/htdocs/langs/en_US/stocks.lang b/htdocs/langs/en_US/stocks.lang
index df33e4f49ee..140c0807be1 100644
--- a/htdocs/langs/en_US/stocks.lang
+++ b/htdocs/langs/en_US/stocks.lang
@@ -91,3 +91,5 @@ NoStockAction=No stock action
LastWaitingSupplierOrders=Orders waiting for receptions
DesiredStock=Desired stock
StockToBuy=Stock to buy
+Replenishment=Replenishment
+ReplenishmentOrders=Replenishment orders
diff --git a/htdocs/langs/fr_FR/orders.lang b/htdocs/langs/fr_FR/orders.lang
index 1091b4c2844..f4ae2622c77 100644
--- a/htdocs/langs/fr_FR/orders.lang
+++ b/htdocs/langs/fr_FR/orders.lang
@@ -161,3 +161,4 @@ CreateInvoiceForThisCustomer=Facturer commandes
NoOrdersToInvoice=Pas de commandes facturables
CloseProcessedOrdersAutomatically=Classer automatiquement à "Traitées" les commandes sélectionnées.
MenuOrdersToBill2=Commandes à facturer
+OrderCreation=Date de création
diff --git a/htdocs/langs/fr_FR/stocks.lang b/htdocs/langs/fr_FR/stocks.lang
index 324823ab75e..c9f8621d14d 100644
--- a/htdocs/langs/fr_FR/stocks.lang
+++ b/htdocs/langs/fr_FR/stocks.lang
@@ -91,3 +91,5 @@ NoStockAction=Pas d'action sur l'entrepôt
LastWaitingSupplierOrders=Commandes en attente de réception
DesiredStock=Stock désiré
StockToBuy=Stock à acheter
+Replenishment=Réapprovisionnement
+ReplenishmentOrders=Commandes de réapprovisionnement
diff --git a/htdocs/product/replenish.php b/htdocs/product/replenish.php
index ce9490cf4e5..bd8b1400d93 100644
--- a/htdocs/product/replenish.php
+++ b/htdocs/product/replenish.php
@@ -100,7 +100,7 @@ if($action == 'order'){
$sql .= ' from '.MAIN_DB_PREFIX.'product_fournisseur_price';
$sql .= ' where rowid = '.$supplierpriceid;
$resql = $db->query($sql);
- if($resql) {
+ if($resql && $db->num_rows($resql) > 0) {
//might need some value checks
$obj = $db->fetch_object($resql);
$line = new CommandeFournisseurLigne($db);
@@ -117,35 +117,33 @@ if($action == 'order'){
}
}
}
- //At this point we know how many orders we need and what lines they have
+ //we now know how many orders we need and what lines they have
$i = 0;
$orders = array();
$suppliersid = array_keys($suppliers);
foreach($suppliers as $supplier){
$order = new CommandeFournisseur($db);
$order->socid = $suppliersid[$i];
+ //little trick to know which orders have been generated this way
$order->source = 42;
- $i++;
foreach($supplier['lines'] as $line){
$order->lines[] = $line;
}
$id = $order->create($user);
- if($id) {
- //emulate what fourn/commande/liste.php does
+ if($id < 0) {
+ //error stuff
}
+ $i++;
}
}
-// None
-
-
/*
* View
*/
$htmlother=new FormOther($db);
-$title=$langs->trans("ProductsAndServices");
+$title=$langs->trans("Replenishment");
$sql = 'SELECT p.rowid, p.ref, p.label, p.barcode, p.price, p.price_ttc, p.price_base_type,';
$sql.= ' p.fk_product_type, p.tms as datem,';
@@ -221,17 +219,7 @@ if ($resql)
$helpurl='';
$helpurl='EN:Module_Stocks_En|FR:Module_Stock|ES:Módulo_Stocks';
-
- if (isset($type))
- {
- if ($type==1) { $texte = $langs->trans("Services"); }
- else { $texte = $langs->trans("Products"); }
- } else {
- $texte = $langs->trans("ProductsAndServices");
- }
- $texte.=' ('.$langs->trans("Stocks").')';
-
-
+ $texte = $langs->trans('Replenishment');
llxHeader("",$title,$helpurl,$texte);
if ($sref || $snom || $sall || GETPOST('search'))
@@ -410,11 +398,17 @@ else
}
$commandestatic=new CommandeFournisseur($db);
+$sref=GETPOST('search_ref');
+$snom=GETPOST('search_nom');
+$suser=GETPOST('search_user');
+$sttc=GETPOST('search_ttc');
+$sall=GETPOST('search_all');
-$sortorder = GETPOST('sortorder','alpha');
-$sortfield = GETPOST('sortfield','alpha');
-if($sortorder == '') $sortorder="DESC";
-if($sortfield == '') $sortfield="cf.date_creation";
+$page = GETPOST('page','int');
+/*$sortorder = GETPOST('sortorder','alpha');
+$sortfield = GETPOST('sortfield','alpha');*/
+$sortorder="DESC";
+$sortfield="cf.date_creation";
$offset = $conf->liste_limit * $page ;
$sql = "SELECT s.rowid as socid, s.nom, cf.date_creation as dc,";
$sql.= " cf.rowid,cf.ref, cf.fk_statut, cf.total_ttc, cf.fk_user_author,";
@@ -465,16 +459,16 @@ if ($resql)
$i = 0;
- print_barre_liste($title, $page, "replenishment.php", "", $sortfield, $sortorder, '', $num);
- print '