Make message more clear
This commit is contained in:
Laurent Destailleur
parent
40a2be8db6
commit
44a8179a5a
@ -32,7 +32,7 @@ ErrorFunctionNotAvailableInPHP=Function <b>%s</b> is required for this feature b
|
||||
ErrorDirAlreadyExists=A directory with this name already exists.
|
||||
ErrorFieldCanNotContainSpecialCharacters=Field <b>%s</b> must not contains special characters.
|
||||
WarningAllowUrlFopenMustBeOn=Parameter <b>allow_url_fopen</b> must be set to <b>on</b> in filer <b>php.ini</b> for having this module working completely. You must modify this file manually.
|
||||
WarningBuildScriptNotRunned=Script <b>%s</b> was not yet ran to build graphics.
|
||||
WarningBuildScriptNotRunned=Script <b>%s</b> was not yet ran to build graphics, or there is no data to show.
|
||||
WarningBookmarkAlreadyExists=A bookmark with this title or this target (URL) already exists.
|
||||
WarningPassIsEmpty=Warning, database password is empty. This is a security hole. You should add a password to your database and change your conf.php file to reflect this.
|
||||
ErrorNoAccountancyModuleLoaded=No accountancy module activated
|
||||
@ -32,7 +32,7 @@ ErrorFunctionNotAvailableInPHP=La fonction <b>%s</b> est requise pour cette fonc
|
||||
ErrorDirAlreadyExists=Un répertoire portant ce nom existe déjà.
|
||||
ErrorFieldCanNotContainSpecialCharacters=Le champ <b>%s</b> ne peut contenir de caractères spéciaux.
|
||||
WarningAllowUrlFopenMustBeOn=Attention, le paramètre <b>allow_url_fopen</b> doit etre positionné à <b>on</b> dans le fichier <b>php.ini</b> pour que ce module soit pleinement opérationnel. Vous devez modifier ce fichier manuellement.
|
||||
WarningBuildScriptNotRunned=Le script <b>%s</b> n'a pas encore été lancé pour générer les graphiques.
|
||||
WarningBuildScriptNotRunned=Le script <b>%s</b> n'a pas encore été lancé pour générer les graphiques ou il n'y a aucune donnée à afficher.
|
||||
WarningBookmarkAlreadyExists=Un marque-page avec ce titre ou cette destination (URL) existe déjà.
|
||||
WarningPassIsEmpty=Attention, le mot de passe de la base de donnée Dolibarr est vide. Cela représente une faille de sécurité. Il est recommandé d'ajouter manuellement un mot de passe à la base et de modifier le fichier conf.php pour refléter ce changement.
|
||||
ErrorNoAccountancyModuleLoaded=Aucun module de comptabilité activé
|
||||
@ -18,7 +18,7 @@
|
||||
*/
|
||||
|
||||
/**
|
||||
* \file htdocs/product/stock/fiche.php
|
||||
* \file htdocs/product/stock/fiche-valo.php
|
||||
* \ingroup stock
|
||||
* \brief Page fiche de valorisation du stock dans l'entrepot
|
||||
* \version $Id$
|
||||
@ -128,7 +128,9 @@ if ($_GET["id"])
|
||||
print "<div class=\"graph\">\n";
|
||||
$year = strftime("%Y",time());
|
||||
|
||||
if (file_exists(DOL_DATA_ROOT.'/entrepot/temp/entrepot-'.$entrepot->id.'-'.($year).'.png'))
|
||||
$file=DOL_DATA_ROOT.'/entrepot/temp/entrepot-'.$entrepot->id.'-'.($year).'.png';
|
||||
|
||||
if (file_exists($file))
|
||||
{
|
||||
$url=DOL_URL_ROOT.'/viewimage.php?modulepart=graph_stock&file=entrepot-'.$entrepot->id.'-'.$year.'.png';
|
||||
print '<img src="'.$url.'" alt="Valorisation du stock année '.($year).'">';
|
||||
|
||||
@ -17,11 +17,11 @@
|
||||
*/
|
||||
|
||||
/**
|
||||
\file htdocs/product/stock/info.php
|
||||
\ingroup facture
|
||||
\brief Page des informations d'un entrepot
|
||||
\version $Id$
|
||||
*/
|
||||
\file htdocs/product/stock/info.php
|
||||
\ingroup facture
|
||||
\brief Page des informations d'un entrepot
|
||||
\version $Id$
|
||||
*/
|
||||
|
||||
require("./pre.inc.php");
|
||||
|
||||
@ -57,22 +57,22 @@ $head[$h][0] = DOL_URL_ROOT.'/product/stock/fiche-valo.php?id='.$entrepot->id;
|
||||
$head[$h][1] = $langs->trans("EnhancedValue");
|
||||
$h++;
|
||||
|
||||
if ($conf->global->STOCK_USE_WAREHOUSE_BY_USER)
|
||||
{
|
||||
// Add the constant STOCK_USE_WAREHOUSE_BY_USER in cont table to use this feature.
|
||||
// Should not be enabled by defaut because does not work yet correctly because
|
||||
// there is no way to add values in the table llx_user_entrepot
|
||||
$head[$h][0] = DOL_URL_ROOT.'/product/stock/user.php?id='.$entrepot->id;
|
||||
$head[$h][1] = $langs->trans("Users");
|
||||
$h++;
|
||||
}
|
||||
if ($conf->global->STOCK_USE_WAREHOUSE_BY_USER)
|
||||
{
|
||||
// Add the constant STOCK_USE_WAREHOUSE_BY_USER in cont table to use this feature.
|
||||
// Should not be enabled by defaut because does not work yet correctly because
|
||||
// there is no way to add values in the table llx_user_entrepot
|
||||
$head[$h][0] = DOL_URL_ROOT.'/product/stock/user.php?id='.$entrepot->id;
|
||||
$head[$h][1] = $langs->trans("Users");
|
||||
$h++;
|
||||
}
|
||||
|
||||
$head[$h][0] = DOL_URL_ROOT.'/product/stock/info.php?id='.$entrepot->id;
|
||||
$head[$h][1] = $langs->trans("Info");
|
||||
$hselected=$h;
|
||||
$h++;
|
||||
|
||||
dolibarr_fiche_head($head, $hselected, $langs->trans("Warehouse").': '.$entrepot->libelle);
|
||||
dolibarr_fiche_head($head, $hselected, $langs->trans("Warehouse"));
|
||||
|
||||
|
||||
print '<table width="100%"><tr><td>';
|
||||
|
||||
@ -19,11 +19,11 @@
|
||||
*/
|
||||
|
||||
/**
|
||||
\file htdocs/product/stock/mouvement.php
|
||||
\ingroup stock
|
||||
\brief Page liste des mouvements de stocks
|
||||
\version $Id$
|
||||
*/
|
||||
\file htdocs/product/stock/mouvement.php
|
||||
\ingroup stock
|
||||
\brief Page liste des mouvements de stocks
|
||||
\version $Id$
|
||||
*/
|
||||
|
||||
require("./pre.inc.php");
|
||||
|
||||
@ -53,15 +53,15 @@ $sql.= " m.value, ".$db->pdate("m.datem")." as datem";
|
||||
$sql.= " FROM ".MAIN_DB_PREFIX."entrepot as s, ".MAIN_DB_PREFIX."stock_mouvement as m, ".MAIN_DB_PREFIX."product as p";
|
||||
if ($conf->categorie->enabled && !$user->rights->categorie->voir)
|
||||
{
|
||||
$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."categorie_product as cp ON cp.fk_product = p.rowid";
|
||||
$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."categorie as c ON cp.fk_categorie = c.rowid";
|
||||
$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."categorie_product as cp ON cp.fk_product = p.rowid";
|
||||
$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."categorie as c ON cp.fk_categorie = c.rowid";
|
||||
}
|
||||
$sql .= " WHERE m.fk_product = p.rowid AND m.fk_entrepot = s.rowid";
|
||||
if ($_GET["id"])
|
||||
$sql .= " AND s.rowid ='".$_GET["id"]."'";
|
||||
$sql .= " AND s.rowid ='".$_GET["id"]."'";
|
||||
if ($conf->categorie->enabled && !$user->rights->categorie->voir)
|
||||
{
|
||||
$sql.= " AND IFNULL(c.visible,1)=1";
|
||||
$sql.= " AND IFNULL(c.visible,1)=1";
|
||||
}
|
||||
$sql .= " ORDER BY $sortfield $sortorder ";
|
||||
$sql .= $db->plimit($conf->liste_limit + 1 ,$offset);
|
||||
@ -69,29 +69,29 @@ $resql = $db->query($sql) ;
|
||||
|
||||
if ($resql)
|
||||
{
|
||||
$num = $db->num_rows($resql);
|
||||
$num = $db->num_rows($resql);
|
||||
|
||||
if ($_GET["id"])
|
||||
{
|
||||
$entrepot = new Entrepot($db);
|
||||
$result = $entrepot->fetch($_GET["id"]);
|
||||
if ($result < 0)
|
||||
if ($_GET["id"])
|
||||
{
|
||||
$entrepot = new Entrepot($db);
|
||||
$result = $entrepot->fetch($_GET["id"]);
|
||||
if ($result < 0)
|
||||
{
|
||||
dolibarr_print_error($db);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
$i = 0;
|
||||
$i = 0;
|
||||
|
||||
$texte = $langs->trans("ListOfStockMovements");
|
||||
llxHeader("","",$texte);
|
||||
$texte = $langs->trans("ListOfStockMovements");
|
||||
llxHeader("","",$texte);
|
||||
|
||||
|
||||
/*
|
||||
* Affichage onglets
|
||||
*/
|
||||
if ($_GET["id"])
|
||||
{
|
||||
/*
|
||||
* Affichage onglets
|
||||
*/
|
||||
if ($_GET["id"])
|
||||
{
|
||||
$h = 0;
|
||||
|
||||
$head[$h][0] = DOL_URL_ROOT.'/product/stock/fiche.php?id='.$entrepot->id;
|
||||
@ -104,18 +104,18 @@ if ($resql)
|
||||
$h++;
|
||||
|
||||
$head[$h][0] = DOL_URL_ROOT.'/product/stock/fiche-valo.php?id='.$entrepot->id;
|
||||
$head[$h][1] = $langs->trans("EnhancedValue");
|
||||
$h++;
|
||||
$head[$h][1] = $langs->trans("EnhancedValue");
|
||||
$h++;
|
||||
|
||||
if ($conf->global->STOCK_USE_WAREHOUSE_BY_USER)
|
||||
{
|
||||
// Add the constant STOCK_USE_WAREHOUSE_BY_USER in cont table to use this feature.
|
||||
// Should not be enabled by defaut because does not work yet correctly because
|
||||
// there is no way to add values in the table llx_user_entrepot
|
||||
$head[$h][0] = DOL_URL_ROOT.'/product/stock/user.php?id='.$entrepot->id;
|
||||
$head[$h][1] = $langs->trans("Users");
|
||||
$h++;
|
||||
}
|
||||
if ($conf->global->STOCK_USE_WAREHOUSE_BY_USER)
|
||||
{
|
||||
// Add the constant STOCK_USE_WAREHOUSE_BY_USER in cont table to use this feature.
|
||||
// Should not be enabled by defaut because does not work yet correctly because
|
||||
// there is no way to add values in the table llx_user_entrepot
|
||||
$head[$h][0] = DOL_URL_ROOT.'/product/stock/user.php?id='.$entrepot->id;
|
||||
$head[$h][1] = $langs->trans("Users");
|
||||
$h++;
|
||||
}
|
||||
|
||||
$head[$h][0] = DOL_URL_ROOT.'/product/stock/info.php?id='.$entrepot->id;
|
||||
$head[$h][1] = $langs->trans("Info");
|
||||
@ -123,26 +123,27 @@ if ($resql)
|
||||
|
||||
dolibarr_fiche_head($head, $hselected, $langs->trans("Warehouse"));
|
||||
|
||||
print '<table class="border" width="100%">';
|
||||
print '<table class="border" width="100%">';
|
||||
|
||||
// Ref
|
||||
print '<tr><td width="25%">'.$langs->trans("Ref").'</td><td colspan="3">';
|
||||
print $form->showrefnav($entrepot,'id','',1,'rowid','libelle');
|
||||
print '</td>';
|
||||
|
||||
print '<tr><td>'.$langs->trans("LocationSummary").'</td><td colspan="3">'.$entrepot->lieu.'</td></tr>';
|
||||
print '<tr><td>'.$langs->trans("LocationSummary").'</td><td colspan="3">'.$entrepot->lieu.'</td></tr>';
|
||||
|
||||
// Statut
|
||||
print '<tr><td>'.$langs->trans("Status").'</td><td colspan="3">'.$entrepot->getLibStatut(4).'</td></tr>';
|
||||
print '<tr><td>'.$langs->trans("Status").'</td><td colspan="3">'.$entrepot->getLibStatut(4).'</td></tr>';
|
||||
|
||||
print "</table>";
|
||||
print "</table>";
|
||||
|
||||
print '</div>';
|
||||
print '</div>';
|
||||
}
|
||||
|
||||
|
||||
$param="&id=".$_GET["id"]."&sref=$sref&snom=$snom";
|
||||
print_barre_liste($texte, $page, "mouvement.php", $param, $sortfield, $sortorder,'',$num);
|
||||
print_barre_liste($texte, $page, "mouvement.php", $param, $sortfield, $sortorder,'',$num,0,'');
|
||||
|
||||
print '<table class="noborder" width="100%">';
|
||||
print "<tr class=\"liste_titre\">";
|
||||
print_liste_field_titre($langs->trans("Date"),"mouvement.php", "m.datem","",$param,"",$sortfield,$sortorder);
|
||||
|
||||
Loading…
Reference in New Issue
Block a user