lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix: [ bug #1512 ] Manque des produits dans la page réapprovisionement

Browse Source
This commit is contained in:
Laurent Destailleur 2014-07-02 19:35:02 +02:00
parent 14de1d66c0
commit c2f0d84e45
2 changed files with 52 additions and 134 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/langs/en_US/stocks.lang
View File

@ -62,8 +62,8 @@ OrderStatusNotReadyToDispatch=Order has not yet or no more a status that allows
StockDiffPhysicTeoric=Reason for difference stock physical and theoretical StockDiffPhysicTeoric=Reason for difference stock physical and theoretical
NoPredefinedProductToDispatch=No predefined products for this object. So no dispatching in stock is required. NoPredefinedProductToDispatch=No predefined products for this object. So no dispatching in stock is required.
DispatchVerb=Dispatch DispatchVerb=Dispatch
StockLimitShort=Limit StockLimitShort=Limit for alert
StockLimit=Stock limit for alerts StockLimit=Stock limit for alert
PhysicalStock=Physical stock PhysicalStock=Physical stock
RealStock=Real Stock RealStock=Real Stock
VirtualStock=Virtual stock VirtualStock=Virtual stock

182
htdocs/product/stock/replenish.php
View File

@ -64,7 +64,7 @@ if (!$sortorder) {
$limit = $conf->liste_limit; $limit = $conf->liste_limit;
$offset = $limit * $page ; $offset = $limit * $page ;
// Force limit to non (currently solution to solve loosing selection when using pagination. No pagination on this page) // Force limit to no (currently solution to solve loosing selection when using pagination. No pagination on this page)
$limit = 0; $limit = 0;
@ -190,9 +190,10 @@ if ($action == 'order' && isset($_POST['valid']))
$form = new Form($db); $form = new Form($db);
$virtualdiffersfromphysical=0; $virtualdiffersfromphysical=0;
if (! empty($conf->global->STOCK_CALCULATE_ON_SHIPMENT) if (! empty($conf->global->STOCK_CALCULATE_ON_SHIPMENT) || ! empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_DISPATCH_ORDER))
|| ! empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_DISPATCH_ORDER) {
) $virtualdiffersfromphysical=1; // According to increase/decrease stock options, virtual and physical stock may differs. $virtualdiffersfromphysical=1; // According to increase/decrease stock options, virtual and physical stock may differs.
}
$usevirtualstock=-1; $usevirtualstock=-1;
if ($virtualdiffersfromphysical) if ($virtualdiffersfromphysical)
@ -206,8 +207,8 @@ $title = $langs->trans('Status');
$sql = 'SELECT p.rowid, p.ref, p.label, p.price,'; $sql = 'SELECT p.rowid, p.ref, p.label, p.price,';
$sql.= ' p.price_ttc, p.price_base_type,p.fk_product_type,'; $sql.= ' p.price_ttc, p.price_base_type,p.fk_product_type,';
$sql.= ' p.tms as datem, p.duration, p.tobuy, p.seuil_stock_alerte,'; $sql.= ' p.tms as datem, p.duration, p.tobuy,';
$sql.= ' p.desiredstock,'; $sql.= ' p.desiredstock, p.seuil_stock_alerte as alertstock,';
$sql.= ' SUM('.$db->ifsql("s.reel IS NULL", "0", "s.reel").') as stock_physique'; $sql.= ' SUM('.$db->ifsql("s.reel IS NULL", "0", "s.reel").') as stock_physique';
$sql.= ' FROM ' . MAIN_DB_PREFIX . 'product as p'; $sql.= ' FROM ' . MAIN_DB_PREFIX . 'product as p';
$sql.= ' LEFT JOIN ' . MAIN_DB_PREFIX . 'product_stock as s'; $sql.= ' LEFT JOIN ' . MAIN_DB_PREFIX . 'product_stock as s';
@ -245,10 +246,12 @@ $sql.= ' AND p.tobuy = 1';
if (!empty($canvas)) $sql .= ' AND p.canvas = "' . $db->escape($canvas) . '"'; if (!empty($canvas)) $sql .= ' AND p.canvas = "' . $db->escape($canvas) . '"';
$sql.= ' GROUP BY p.rowid, p.ref, p.label, p.price'; $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.price_ttc, p.price_base_type,p.fk_product_type, p.tms';
$sql.= ', p.duration, p.tobuy, p.seuil_stock_alerte'; $sql.= ', p.duration, p.tobuy';
$sql.= ', p.desiredstock, s.fk_product'; $sql.= ', p.desiredstock, p.seuil_stock_alerte';
$sql.= ', s.fk_product';
if($usevirtualstock) { if ($usevirtualstock)
{
$sqlCommandesCli = "(SELECT SUM(cd.qty) as qty"; $sqlCommandesCli = "(SELECT SUM(cd.qty) as qty";
$sqlCommandesCli.= " FROM ".MAIN_DB_PREFIX."commandedet as cd"; $sqlCommandesCli.= " FROM ".MAIN_DB_PREFIX."commandedet as cd";
$sqlCommandesCli.= ", ".MAIN_DB_PREFIX."commande as c"; $sqlCommandesCli.= ", ".MAIN_DB_PREFIX."commande as c";
@ -265,11 +268,14 @@ if($usevirtualstock) {
$sqlCommandesFourn.= " AND cd.fk_product = p.rowid"; $sqlCommandesFourn.= " AND cd.fk_product = p.rowid";
$sqlCommandesFourn.= " AND c.fk_statut in (3))"; $sqlCommandesFourn.= " AND c.fk_statut in (3))";
$sql.= ' HAVING p.desiredstock > SUM('.$db->ifsql("s.reel IS NULL", "0", "s.reel").')'; $sql.= ' HAVING ((p.desiredstock > 0 AND p.desiredstock > (SUM('.$db->ifsql("s.reel IS NULL", "0", "s.reel").')';
$sql.= ' - '.$db->ifsql($sqlCommandesCli.' IS NULL', '0', $sqlCommandesCli).' + '.$db->ifsql($sqlCommandesFourn.' IS NULL', '0', $sqlCommandesFourn); $sql.= ' - '.$db->ifsql($sqlCommandesCli.' IS NULL', '0', $sqlCommandesCli).' + '.$db->ifsql($sqlCommandesFourn.' IS NULL', '0', $sqlCommandesFourn).'))';
$sql.= ' OR (p.seuil_stock_alerte > 0 AND p.seuil_stock_alerte > (SUM('.$db->ifsql("s.reel IS NULL", "0", "s.reel").')';
$sql.= ' - '.$db->ifsql($sqlCommandesCli.' IS NULL', '0', $sqlCommandesCli).' + '.$db->ifsql($sqlCommandesFourn.' IS NULL', '0', $sqlCommandesFourn).'))';
$sql.= " )";
} else { } else {
$sql.= ' HAVING p.desiredstock > SUM('.$db->ifsql("s.reel IS NULL", "0", "s.reel").')'; $sql.= ' HAVING ((p.desiredstock > 0 AND (p.desiredstock > SUM('.$db->ifsql("s.reel IS NULL", "0", "s.reel").'))) OR (p.seuil_stock_alerte > 0 AND (seuil_stock_alerte > SUM('.$db->ifsql("s.reel IS NULL", "0", "s.reel").'))))';
$sql.= ' AND p.desiredstock > 0';
} }
if ($salert == 'on') // Option to see when stock is lower than alert if ($salert == 'on') // Option to see when stock is lower than alert
{ {
@ -277,8 +283,9 @@ if ($salert == 'on') // Option to see when stock is lower than alert
$alertchecked = 'checked="checked"'; $alertchecked = 'checked="checked"';
} }
$sql.= $db->order($sortfield,$sortorder); $sql.= $db->order($sortfield,$sortorder);
$sql.= $db->plimit($limit + 1, $offset); $sql.= $db->plimit($limit, $offset);
//print $sql;
dol_syslog('Execute request sql='.$sql); dol_syslog('Execute request sql='.$sql);
$resql = $db->query($sql); $resql = $db->query($sql);
if (empty($resql)) if (empty($resql))
@ -286,6 +293,7 @@ if (empty($resql))
dol_print_error($db); dol_print_error($db);
exit; exit;
} }
//print $sql;
$num = $db->num_rows($resql); $num = $db->num_rows($resql);
$i = 0; $i = 0;
@ -339,7 +347,7 @@ if ($sref || $snom || $sall || $salert || GETPOST('search', 'alpha')) {
$filters = '&sref=' . $sref . '&snom=' . $snom; $filters = '&sref=' . $sref . '&snom=' . $snom;
$filters .= '&fourn_id=' . $fourn_id; $filters .= '&fourn_id=' . $fourn_id;
$filters .= (isset($type)?'&type=' . $type:''); $filters .= (isset($type)?'&type=' . $type:'');
$filters .= '&salert=' . $salert; $filters .= '&=' . $salert;
$filters .= '&mode=' . $mode; $filters .= '&mode=' . $mode;
print_barre_liste( print_barre_liste(
$texte, $texte,
@ -368,121 +376,42 @@ $param .= '&fourn_id=' . $fourn_id . '&snom='. $snom . '&salert=' . $salert;
$param .= '&sref=' . $sref; $param .= '&sref=' . $sref;
$param .= '&mode=' . $mode; $param .= '&mode=' . $mode;
// Lines of title
print '<tr class="liste_titre"><td><input type="checkbox" onClick="toggle(this)" /></td>';
print_liste_field_titre(
$langs->trans('Ref'),
$_SERVER["PHP_SELF"],
'p.ref',
$param,
'',
'',
$sortfield,
$sortorder
);
print_liste_field_titre(
$langs->trans('Label'),
$_SERVER["PHP_SELF"],
'p.label',
$param,
'',
'',
$sortfield,
$sortorder
);
if (!empty($conf->service->enabled) && $type == 1)
{
print_liste_field_titre(
$langs->trans('Duration'),
$_SERVER["PHP_SELF"],
'p.duration',
$param,
'',
'align="center"',
$sortfield,
$sortorder
);
}
print_liste_field_titre(
$langs->trans('DesiredStock'),
$_SERVER["PHP_SELF"],
'p.desiredstock',
$param,
'',
'align="right"',
$sortfield,
$sortorder
);
$stocklabel = $langs->trans('Stock'); $stocklabel = $langs->trans('Stock');
if ($usevirtualstock == 1) $stocklabel = $langs->trans('VirtualStock'); if ($usevirtualstock == 1) $stocklabel = $langs->trans('VirtualStock');
if ($usevirtualstock == 0) $stocklabel = $langs->trans('PhysicalStock'); if ($usevirtualstock == 0) $stocklabel = $langs->trans('PhysicalStock');
print_liste_field_titre(
$stocklabel, // Lines of title
$_SERVER["PHP_SELF"], print '<tr class="liste_titre"><td><input type="checkbox" onClick="toggle(this)" /></td>';
'stock_physique',
$param, print_liste_field_titre($langs->trans('Ref'), $_SERVER["PHP_SELF"], 'p.ref', $param, '', '', $sortfield, $sortorder);
'', print_liste_field_titre($langs->trans('Label'), $_SERVER["PHP_SELF"], 'p.label', $param, '', '', $sortfield, $sortorder);
'align="right"', if (!empty($conf->service->enabled) && $type == 1) print_liste_field_titre($langs->trans('Duration'), $_SERVER["PHP_SELF"], 'p.duration', $param, '', 'align="center"', $sortfield, $sortorder);
$sortfield, print_liste_field_titre($langs->trans('DesiredStock'), $_SERVER["PHP_SELF"], 'p.desiredstock', $param, '', 'align="right"', $sortfield, $sortorder);
$sortorder print_liste_field_titre($langs->trans('StockLimitShort'), $_SERVER["PHP_SELF"], 'p.seuil_stock_alerte', $param, '', 'align="right"', $sortfield, $sortorder);
); print_liste_field_titre($stocklabel, $_SERVER["PHP_SELF"], 'stock_physique', $param, '', 'align="right"', $sortfield, $sortorder);
print_liste_field_titre( print_liste_field_titre($langs->trans('Ordered'), $_SERVER["PHP_SELF"], '', $param, '', 'align="right"', $sortfield, $sortorder);
$langs->trans('Ordered'), print_liste_field_titre($langs->trans('StockToBuy'), $_SERVER["PHP_SELF"], '', $param, '', 'align="right"', $sortfield, $sortorder);
$_SERVER["PHP_SELF"], print_liste_field_titre($langs->trans('Supplier'), $_SERVER["PHP_SELF"], '', $param, '', 'align="right"', $sortfield, $sortorder);
'',
$param,
'',
'align="right"',
$sortfield,
$sortorder
);
print_liste_field_titre(
$langs->trans('StockToBuy'),
$_SERVER["PHP_SELF"],
'',
$param,
'',
'align="right"',
$sortfield,
$sortorder
);
print_liste_field_titre(
$langs->trans('Supplier'),
$_SERVER["PHP_SELF"],
'',
$param,
'',
'align="right"',
$sortfield,
$sortorder
);
print '</tr>'; print '</tr>';
// Lignes des champs de filtre // Lignes des champs de filtre
print '<tr class="liste_titre">'. print '<tr class="liste_titre">'.
'<td class="liste_titre">&nbsp;</td>'. '<td class="liste_titre">&nbsp;</td>'.
'<td class="liste_titre">'. '<td class="liste_titre"><input class="flat" type="text" name="sref" size="8" value="'.dol_escape_htmltag($sref).'"></td>'.
'<input class="flat" type="text" name="sref" size="8" value="'.dol_escape_htmltag($sref).'">'. '<td class="liste_titre"><input class="flat" type="text" name="snom" size="8" value="'.dol_escape_htmltag($snom).'"></td>';
'</td>'. if (!empty($conf->service->enabled) && $type == 1) print '<td class="liste_titre">&nbsp;</td>';
'<td class="liste_titre">'.
'<input class="flat" type="text" name="snom" size="8" value="'.dol_escape_htmltag($snom).'">'.
'</td>';
if (!empty($conf->service->enabled) && $type == 1)
{
print '<td class="liste_titre">&nbsp;</td>';
}
print '<td class="liste_titre">&nbsp;</td>'. print '<td class="liste_titre">&nbsp;</td>'.
'<td class="liste_titre" align="right">' . $langs->trans('AlertOnly') . '&nbsp;<input type="checkbox" name="salert" ' . $alertchecked . '></td>'. '<td class="liste_titre" align="right">&nbsp;</td>'.
'<td class="liste_titre" align="right">' . $langs->trans('AlertOnly') . '&nbsp;<input type="checkbox" id="salert" name="salert" ' . $alertchecked . '></td>'.
'<td class="liste_titre" align="right">&nbsp;</td>'. '<td class="liste_titre" align="right">&nbsp;</td>'.
'<td class="liste_titre">&nbsp;</td>'. '<td class="liste_titre">&nbsp;</td>'.
'<td class="liste_titre" align="right">'. '<td class="liste_titre" align="right">'.
'<input class="liste_titre" name="button_search" type="image" src="'.img_picto($langs->trans("Search"),'search.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("Search")).'" title="'.dol_escape_htmltag($langs->trans("Search")).'">'. '<input class="liste_titre" name="button_search" type="image" src="'.img_picto($langs->trans("Search"),'search.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("Search")).'" title="'.dol_escape_htmltag($langs->trans("Search")).'">'.
'<input type="image" class="liste_titre" src="'.img_picto($langs->trans("Search"),'searchclear.png','','',1).'" name="button_removefilter" value="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'" title="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'">'. '<input type="image" class="liste_titre" src="'.img_picto($langs->trans("Search"),'searchclear.png','','',1).'" name="button_removefilter" value="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'" title="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'">'.
'</td>'. '</td>';
'</tr>'; print '</tr>';
$prod = new Product($db); $prod = new Product($db);
@ -533,35 +462,21 @@ while ($i < ($limit ? min($num, $limit) : $num))
} }
$stock_commande_fournisseur = $prod->stats_commande_fournisseur['qty']; $stock_commande_fournisseur = $prod->stats_commande_fournisseur['qty'];
$stock = $objp->stock_physique - $stock_commande_client + $stock_commande_fournisseur; $stock = $objp->stock_physique - $stock_commande_client + $stock_commande_fournisseur;
var_dump($stock_commande_fournisseur);
} }
else else
{ {
$stock = $objp->stock_physique; $stock = $objp->stock_physique;
} }
$warning=''; $warning='';
if ($objp->seuil_stock_alerte && ($stock < $objp->seuil_stock_alerte)) if ($objp->alertstock && ($stock < $objp->alertstock))
{ {
$warning = img_warning($langs->trans('StockTooLow')) . ' '; $warning = img_warning($langs->trans('StockTooLow')) . ' ';
} }
//depending on conf, use either physical stock or //depending on conf, use either physical stock or
//virtual stock to compute the stock to buy value //virtual stock to compute the stock to buy value
$stocktobuy = max($objp->desiredstock - $stock - $ordered, 0); $stocktobuy = max(max($objp->desiredstock, $objp->alertstock) - $stock - $ordered, 0);
/*
$disabled = '';
if($ordered > 0)
{
if ($ordered + $stock >= $objp->desiredstock)
{
$picto = img_picto('', 'ok', '');
$disabled = 'disabled="disabled"';
}
else {
$picto = img_picto($langs->trans("NotEnough"), 'warning', '');
}
} else {
$picto = img_picto('', 'info', '');
}*/
print '<tr '.$bc[$var].'>'; print '<tr '.$bc[$var].'>';
@ -590,6 +505,9 @@ while ($i < ($limit ? min($num, $limit) : $num))
// Desired stock // Desired stock
print '<td align="right">' . $objp->desiredstock . '</td>'; print '<td align="right">' . $objp->desiredstock . '</td>';
// Limit stock for alerr
print '<td align="right">' . $objp->alertstock . '</td>';
// Current stock // Current stock
print '<td align="right">'. $warning . $stock. '</td>'; print '<td align="right">'. $warning . $stock. '</td>';