diff --git a/htdocs/product/stock/replenish.php b/htdocs/product/stock/replenish.php
index 7738f757d85..465ffd9d11a 100644
--- a/htdocs/product/stock/replenish.php
+++ b/htdocs/product/stock/replenish.php
@@ -266,7 +266,14 @@ if ($resql) {
$helpurl .= 'ES:Módulo_Stocks';
$texte = $langs->trans('Replenishment');
llxHeader('', $title, $helpurl, $texte);
-
+ $head = array();
+ $head[0][0] = DOL_URL_ROOT.'/product/stock/replenish.php';
+ $head[0][1] = $title;
+ $head[0][2] = 'replenish';
+ $head[1][0] = DOL_URL_ROOT.'/product/stock/replenishorders.php';
+ $head[1][1] = $langs->trans("ReplenishmentOrders");
+ $head[1][2] = 'replenishorders';
+ dol_fiche_head($head, 'replenish', $title, 0, 'stock');
if ($sref || $snom || $sall || GETPOST('search')) {
print_barre_liste($texte,
$page,
@@ -305,7 +312,7 @@ if ($resql) {
print '';
print '';
print '';
-
+ //print '';
print '
';
// Filter on categories
@@ -589,220 +596,6 @@ else {
dol_print_error($db);
}
-$commandestatic = new CommandeFournisseur($db);
-$sref = GETPOST('search_ref');
-$snom = GETPOST('search_nom');
-$suser = GETPOST('search_user');
-$sttc = GETPOST('search_ttc');
-$sall = GETPOST('search_all');
-
-$page = GETPOST('page', 'int');
-
-$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';
-$sql .= ", cf.fk_user_author, u.login";
-$sql .= ' FROM (' . MAIN_DB_PREFIX . 'societe as s,';
-$sql .= ' ' . MAIN_DB_PREFIX . 'commande_fournisseur as cf';
-if (!$user->rights->societe->client->voir && !$socid) {
- $sql.= ', ' . MAIN_DB_PREFIX . 'societe_commerciaux as sc';
-}
-$sql .= ') LEFT JOIN ' . MAIN_DB_PREFIX . 'user as u ';
-$sql .= 'ON cf.fk_user_author = u.rowid';
-$sql .= ' WHERE cf.fk_soc = s.rowid ';
-$sql .= ' AND cf.entity = ' . $conf->entity;
-$sql .= ' AND cf.source = 42';
-$sql .= ' AND cf.fk_statut < 5';
-
-if (!$user->rights->societe->client->voir && !$socid) {
- $sql .= ' AND s.rowid = sc.fk_soc AND sc.fk_user = ' . $user->id;
-}
-if ($sref) {
- $sql .= ' AND cf.ref LIKE "%' . $db->escape($sref) . '%"';
-}
-if ($snom) {
- $sql .= ' AND s.nom LIKE "%' . $db->escape($snom) . '%"';
-}
-if ($suser) {
- $sql .= ' AND u.login LIKE "%' . $db->escape($suser) . '%"';
-}
-if ($sttc) {
- $sql .= ' AND total_ttc = ' . price2num($sttc);
-}
-if ($sall) {
- $sql .= ' AND (cf.ref LIKE "%' . $db->escape($sall) . '%" ';
- $sql .= 'OR cf.note LIKE "%' . $db->escape($sall) . '%")';
-}
-if ($socid) {
- $sql .= ' AND s.rowid = ' . $socid;
-}
-
-if (GETPOST('statut'))
-{
- $sql .= ' AND fk_statut = ' . GETPOST('statut');
-}
-
-$sql .= " ORDER BY $sortfield $sortorder " . $db->plimit($conf->liste_limit+1, $offset);
-$resql = $db->query($sql);
-if ($resql) {
-
- $num = $db->num_rows($resql);
- $i = 0;
-
-
- print_barre_liste($langs->trans('ReplenishmentOrders'),
- $page,
- 'replenish.php',
- '',
- $sortfield,
- $sortorder,
- '',
- $num
- );
- print '';
-
- $db->free($resql);
-}
-
llxFooter();
$db->close();
?>
diff --git a/htdocs/product/stock/replenishorders.php b/htdocs/product/stock/replenishorders.php
new file mode 100644
index 00000000000..c06cf405ffa
--- /dev/null
+++ b/htdocs/product/stock/replenishorders.php
@@ -0,0 +1,269 @@
+
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+
+/**
+ * \file htdocs/product/stock/replenishorders.php
+ * \ingroup produit
+ * \brief Page to list replenishment orders
+ */
+require '../../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.form.class.php';
+require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
+require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.class.php';
+
+$langs->load("products");
+$langs->load("stocks");
+$langs->load("orders");
+
+// Security check
+if ($user->societe_id) $socid=$user->societe_id;
+$result=restrictedArea($user,'produit|service');
+
+$helpurl = 'EN:Module_Stocks_En|FR:Module_Stock|';
+$helpurl .= 'ES:Módulo_Stocks';
+$texte = $langs->trans('ReplenishmentOrders');
+llxHeader('', $texte, $helpurl, $texte);
+$head = array();
+$head[0][0] = DOL_URL_ROOT.'/product/stock/replenish.php';
+$head[0][1] = $langs->trans('Replenishment');
+$head[0][2] = 'replenish';
+$head[1][0] = DOL_URL_ROOT.'/product/stock/replenishorders.php';
+$head[1][1] = $langs->trans("ReplenishmentOrders");
+$head[1][2] = 'replenishorders';
+dol_fiche_head($head, 'replenishorders', $langs->trans("Replenishment"), 0, 'stock');
+$commandestatic = new CommandeFournisseur($db);
+$sref = GETPOST('search_ref');
+$snom = GETPOST('search_nom');
+$suser = GETPOST('search_user');
+$sttc = GETPOST('search_ttc');
+$sall = GETPOST('search_all');
+
+$page = GETPOST('page', 'int');
+
+$sortorder = GETPOST('sortorder');
+$sortfield = GETPOST('sortfield');
+if(!$sortorder) $sortorder = 'DESC';
+if(!$sortfield) $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';
+$sql .= ", cf.fk_user_author, u.login";
+$sql .= ' FROM (' . MAIN_DB_PREFIX . 'societe as s,';
+$sql .= ' ' . MAIN_DB_PREFIX . 'commande_fournisseur as cf';
+if (!$user->rights->societe->client->voir && !$socid) {
+ $sql.= ', ' . MAIN_DB_PREFIX . 'societe_commerciaux as sc';
+}
+$sql .= ') LEFT JOIN ' . MAIN_DB_PREFIX . 'user as u ';
+$sql .= 'ON cf.fk_user_author = u.rowid';
+$sql .= ' WHERE cf.fk_soc = s.rowid ';
+$sql .= ' AND cf.entity = ' . $conf->entity;
+$sql .= ' AND cf.source = 42';
+$sql .= ' AND cf.fk_statut < 5';
+
+if (!$user->rights->societe->client->voir && !$socid) {
+ $sql .= ' AND s.rowid = sc.fk_soc AND sc.fk_user = ' . $user->id;
+}
+if ($sref) {
+ $sql .= ' AND cf.ref LIKE "%' . $db->escape($sref) . '%"';
+}
+if ($snom) {
+ $sql .= ' AND s.nom LIKE "%' . $db->escape($snom) . '%"';
+}
+if ($suser) {
+ $sql .= ' AND u.login LIKE "%' . $db->escape($suser) . '%"';
+}
+if ($sttc) {
+ $sql .= ' AND cf.total_ttc = ' . price2num($sttc);
+}
+if ($sall) {
+ $sql .= ' AND (cf.ref LIKE "%' . $db->escape($sall) . '%" ';
+ $sql .= 'OR cf.note LIKE "%' . $db->escape($sall) . '%")';
+}
+if ($socid) {
+ $sql .= ' AND s.rowid = ' . $socid;
+}
+
+if (GETPOST('statut'))
+{
+ $sql .= ' AND fk_statut = ' . GETPOST('statut');
+}
+
+$sql .= " ORDER BY $sortfield $sortorder " . $db->plimit($conf->liste_limit+1, $offset);
+$resql = $db->query($sql);
+if ($resql) {
+
+ $num = $db->num_rows($resql);
+ $i = 0;
+
+
+ print_barre_liste($langs->trans('ReplenishmentOrders'),
+ $page,
+ 'replenishorders.php',
+ '',
+ $sortfield,
+ $sortorder,
+ '',
+ $num
+ );
+ print '';
+
+ $db->free($resql);
+}
+
+llxFooter();
+$db->close();
+?>