Trad: Quelques traduction sur gestion stock
Look: Ajout picto sur stats produit
This commit is contained in:
parent
f6b5ad0c02
commit
ef43e34e21
@ -244,7 +244,7 @@ if ($_GET["id"] || $_GET["ref"])
|
|||||||
if ($ret < 0) dolibarr_print_error($db);
|
if ($ret < 0) dolibarr_print_error($db);
|
||||||
$langs->load("propal");
|
$langs->load("propal");
|
||||||
print '<tr><td>';
|
print '<tr><td>';
|
||||||
print '<a href="propal.php?id='.$product->id.'">'.$langs->trans("Proposals").'</a>';
|
print '<a href="propal.php?id='.$product->id.'">'.img_object('','propal').' '.$langs->trans("Proposals").'</a>';
|
||||||
print '</td><td align="right">';
|
print '</td><td align="right">';
|
||||||
print $product->stats_propale['customers'];
|
print $product->stats_propale['customers'];
|
||||||
print '</td><td align="right">';
|
print '</td><td align="right">';
|
||||||
@ -261,7 +261,7 @@ if ($_GET["id"] || $_GET["ref"])
|
|||||||
if ($ret < 0) dolibarr_print_error($db);
|
if ($ret < 0) dolibarr_print_error($db);
|
||||||
$langs->load("orders");
|
$langs->load("orders");
|
||||||
print '<tr><td>';
|
print '<tr><td>';
|
||||||
print '<a href="commande.php?id='.$product->id.'">'.$langs->trans("Orders").'</a>';
|
print '<a href="commande.php?id='.$product->id.'">'.img_object('','order').' '.$langs->trans("Orders").'</a>';
|
||||||
print '</td><td align="right">';
|
print '</td><td align="right">';
|
||||||
print $product->stats_commande['customers'];
|
print $product->stats_commande['customers'];
|
||||||
print '</td><td align="right">';
|
print '</td><td align="right">';
|
||||||
@ -278,7 +278,7 @@ if ($_GET["id"] || $_GET["ref"])
|
|||||||
if ($ret < 0) dolibarr_print_error($db);
|
if ($ret < 0) dolibarr_print_error($db);
|
||||||
$langs->load("contracts");
|
$langs->load("contracts");
|
||||||
print '<tr><td>';
|
print '<tr><td>';
|
||||||
print '<a href="contrat.php?id='.$product->id.'">'.$langs->trans("Contracts").'</a>';
|
print '<a href="contrat.php?id='.$product->id.'">'.img_object('','contract').' '.$langs->trans("Contracts").'</a>';
|
||||||
print '</td><td align="right">';
|
print '</td><td align="right">';
|
||||||
print $product->stats_contrat['customers'];
|
print $product->stats_contrat['customers'];
|
||||||
print '</td><td align="right">';
|
print '</td><td align="right">';
|
||||||
@ -295,7 +295,7 @@ if ($_GET["id"] || $_GET["ref"])
|
|||||||
if ($ret < 0) dolibarr_print_error($db);
|
if ($ret < 0) dolibarr_print_error($db);
|
||||||
$langs->load("bills");
|
$langs->load("bills");
|
||||||
print '<tr><td>';
|
print '<tr><td>';
|
||||||
print '<a href="facture.php?id='.$product->id.'">'.$langs->trans("Bills").'</a>';
|
print '<a href="facture.php?id='.$product->id.'">'.img_object('','bill').' '.$langs->trans("Bills").'</a>';
|
||||||
print '</td><td align="right">';
|
print '</td><td align="right">';
|
||||||
print $product->stats_facture['customers'];
|
print $product->stats_facture['customers'];
|
||||||
print '</td><td align="right">';
|
print '</td><td align="right">';
|
||||||
|
|||||||
@ -331,5 +331,27 @@ class Entrepot
|
|||||||
return $this->statuts[$statut];
|
return $this->statuts[$statut];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* \brief Renvoie nom clicable (avec eventuellement le picto)
|
||||||
|
* \param withpicto Inclut le picto dans le lien
|
||||||
|
* \param option Sur quoi pointe le lien
|
||||||
|
* \return string Chaine avec URL
|
||||||
|
*/
|
||||||
|
function getNomUrl($withpicto=0,$option='')
|
||||||
|
{
|
||||||
|
global $langs;
|
||||||
|
|
||||||
|
$result='';
|
||||||
|
|
||||||
|
$lien='<a href="'.DOL_URL_ROOT.'/product/stock/fiche.php?id='.$this->id.'">';
|
||||||
|
$lienfin='</a>';
|
||||||
|
|
||||||
|
if ($withpicto) $result.=($lien.img_object($langs->trans("ShowStock"),'stock').$lienfin.' ');
|
||||||
|
$result.=$lien.$this->libelle.$lienfin;
|
||||||
|
return $result;
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
?>
|
?>
|
||||||
|
|||||||
@ -226,7 +226,7 @@ if ($_GET["id"] || $_GET["ref"])
|
|||||||
// Stock
|
// Stock
|
||||||
if ($product->type == 0 && $conf->stock->enabled)
|
if ($product->type == 0 && $conf->stock->enabled)
|
||||||
{
|
{
|
||||||
print '<tr><td><a href="'.DOL_URL_ROOT.'/product/stock/product.php?id='.$product->id.'">'.$langs->trans("Stock").'</a></td>';
|
print '<tr><td>'.$langs->trans("TotalStock").'</td>';
|
||||||
if ($product->no_stock)
|
if ($product->no_stock)
|
||||||
{
|
{
|
||||||
print "<td>Pas de définition de stock pour ce produit";
|
print "<td>Pas de définition de stock pour ce produit";
|
||||||
@ -247,30 +247,6 @@ if ($_GET["id"] || $_GET["ref"])
|
|||||||
|
|
||||||
print "</table>";
|
print "</table>";
|
||||||
|
|
||||||
/*
|
|
||||||
* Contenu des stocks
|
|
||||||
*/
|
|
||||||
print '<br><table class="noborder" width="100%">';
|
|
||||||
print '<tr class="liste_titre"><td width="40%">'.$langs->trans("Warehouse").'</td><td width="60%">Valeur du stock</td></tr>';
|
|
||||||
$sql = "SELECT e.rowid, e.label, ps.reel FROM ".MAIN_DB_PREFIX."entrepot as e, ".MAIN_DB_PREFIX."product_stock as ps";
|
|
||||||
$sql .= " WHERE ps.fk_entrepot = e.rowid AND ps.fk_product = ".$product->id;
|
|
||||||
$sql .= " ORDER BY lower(e.label)";
|
|
||||||
|
|
||||||
$resql=$db->query($sql);
|
|
||||||
if ($resql)
|
|
||||||
{
|
|
||||||
$num = $db->num_rows($resql);
|
|
||||||
$i = 0; $total = 0;
|
|
||||||
while ($i < $num)
|
|
||||||
{
|
|
||||||
$obj = $db->fetch_object($resql);
|
|
||||||
print '<tr><td width="40%">'.$obj->label.'</td><td>'.$obj->reel.'</td></tr>'; ;
|
|
||||||
$total = $total + $obj->reel;
|
|
||||||
$i++;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
print '<tr class="liste_total"><td align="right" class="liste_total">'.$langs->trans("Total").':</td><td class="liste_total">'.$total."</td></tr></table>";
|
|
||||||
|
|
||||||
}
|
}
|
||||||
print '</div>';
|
print '</div>';
|
||||||
|
|
||||||
@ -279,12 +255,14 @@ if ($_GET["id"] || $_GET["ref"])
|
|||||||
*/
|
*/
|
||||||
if ($_GET["action"] == "correction")
|
if ($_GET["action"] == "correction")
|
||||||
{
|
{
|
||||||
print_titre ("Correction du stock");
|
print_titre($langs->trans("StockCorrection"));
|
||||||
print "<form action=\"product.php?id=$product->id\" method=\"post\">\n";
|
print "<form action=\"product.php?id=$product->id\" method=\"post\">\n";
|
||||||
print '<input type="hidden" name="action" value="correct_stock">';
|
print '<input type="hidden" name="action" value="correct_stock">';
|
||||||
print '<table class="border" width="100%"><tr>';
|
print '<table class="border" width="100%"><tr>';
|
||||||
print '<td width="20%">'.$langs->trans("Warehouse").'</td><td width="20%"><select name="id_entrepot">';
|
print '<td width="20%">'.$langs->trans("Warehouse").'</td>';
|
||||||
|
|
||||||
|
// Entrepot
|
||||||
|
print '<td width="20%"><select class="flat" name="id_entrepot">';
|
||||||
$sql = "SELECT e.rowid, e.label FROM ".MAIN_DB_PREFIX."entrepot as e";
|
$sql = "SELECT e.rowid, e.label FROM ".MAIN_DB_PREFIX."entrepot as e";
|
||||||
$sql .= " WHERE statut = 1";
|
$sql .= " WHERE statut = 1";
|
||||||
$sql .= " ORDER BY lower(e.label)";
|
$sql .= " ORDER BY lower(e.label)";
|
||||||
@ -302,11 +280,12 @@ if ($_GET["id"] || $_GET["ref"])
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
print '</select></td>';
|
print '</select></td>';
|
||||||
print '<td width="20%"><select name="mouvement">';
|
print '<td width="20%">';
|
||||||
|
print '<select name="mouvement" class="flat">';
|
||||||
print '<option value="0">'.$langs->trans("Add").'</option>';
|
print '<option value="0">'.$langs->trans("Add").'</option>';
|
||||||
print '<option value="1">'.$langs->trans("Delete").'</option>';
|
print '<option value="1">'.$langs->trans("Delete").'</option>';
|
||||||
print '</select></td>';
|
print '</select></td>';
|
||||||
print '<td width="20%">Nb de pièce</td><td width="20%"><input name="nbpiece" size="10" value=""></td></tr>';
|
print '<td width="20%">'.$langs->trans("NumberOfUnit").'</td><td width="20%"><input class="flat" name="nbpiece" size="10" value=""></td></tr>';
|
||||||
print '<tr><td colspan="5" align="center"><input type="submit" class="button" value="'.$langs->trans('Save').'"> ';
|
print '<tr><td colspan="5" align="center"><input type="submit" class="button" value="'.$langs->trans('Save').'"> ';
|
||||||
print '<input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'"></td></tr>';
|
print '<input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'"></td></tr>';
|
||||||
print '</table>';
|
print '</table>';
|
||||||
@ -419,19 +398,58 @@ print "<div class=\"tabsAction\">\n";
|
|||||||
|
|
||||||
if ($_GET["action"] == '' )
|
if ($_GET["action"] == '' )
|
||||||
{
|
{
|
||||||
if ($user->rights->stock->mouvement->creer)
|
if ($user->rights->stock->mouvement->creer)
|
||||||
{
|
{
|
||||||
print '<a class="tabAction" href="product.php?id='.$product->id.'&action=transfert">Transfert</a>';
|
print '<a class="tabAction" href="product.php?id='.$product->id.'&action=transfert">'.$langs->trans("StockMovement").'</a>';
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($user->rights->stock->creer)
|
if ($user->rights->stock->creer)
|
||||||
{
|
{
|
||||||
print '<a class="tabAction" href="product.php?id='.$product->id.'&action=correction">Correction stock</a>';
|
print '<a class="tabAction" href="product.php?id='.$product->id.'&action=correction">'.$langs->trans("StockCorrection").'</a>';
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
print '</div>';
|
print '</div>';
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Contenu des stocks
|
||||||
|
*/
|
||||||
|
print '<br><table class="noborder" width="100%">';
|
||||||
|
print '<tr class="liste_titre"><td width="40%">'.$langs->trans("Warehouse").'</td>';
|
||||||
|
print '<td align="right">'.$langs->trans("NumberOfUnit").'</td></tr>';
|
||||||
|
|
||||||
|
$sql = "SELECT e.rowid, e.label, ps.reel FROM ".MAIN_DB_PREFIX."entrepot as e, ".MAIN_DB_PREFIX."product_stock as ps";
|
||||||
|
$sql .= " WHERE ps.fk_entrepot = e.rowid AND ps.fk_product = ".$product->id;
|
||||||
|
$sql .= " ORDER BY lower(e.label)";
|
||||||
|
|
||||||
|
$entrepotstatic=new Entrepot($db);
|
||||||
|
|
||||||
|
$resql=$db->query($sql);
|
||||||
|
if ($resql)
|
||||||
|
{
|
||||||
|
$num = $db->num_rows($resql);
|
||||||
|
$i=0; $total=0; $var=false;
|
||||||
|
while ($i < $num)
|
||||||
|
{
|
||||||
|
$obj = $db->fetch_object($resql);
|
||||||
|
$entrepotstatic->id=$obj->rowid;
|
||||||
|
$entrepotstatic->libelle=$obj->label;
|
||||||
|
print '<tr '.$bc[$var].'>';
|
||||||
|
print '<td>'.$entrepotstatic->getNomUrl(1).'</td>';
|
||||||
|
print '<td align="right">'.$obj->reel.'</td>';
|
||||||
|
print '</tr>'; ;
|
||||||
|
$total = $total + $obj->reel;
|
||||||
|
$i++;
|
||||||
|
$var=!$var;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
print '<tr class="liste_total"><td align="right" class="liste_total">'.$langs->trans("Total").':</td><td class="liste_total" align="right">'.$total."</td></tr>";
|
||||||
|
print "</table>";
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
$db->close();
|
$db->close();
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user