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

Fix: Corrections divers sur affichage des produits et stocks

Browse Source
This commit is contained in:
Laurent Destailleur 2007-11-13 20:59:12 +00:00
parent fb6cf9da81
commit fc6d6fdcb7
3 changed files with 24 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
htdocs/product/fiche.php
View File

@ -568,6 +568,8 @@ if ($_GET["action"] == 'create' && $user->rights->produit->creer)
print $langs->trans("RefAlreadyExists"); print $langs->trans("RefAlreadyExists");
} }
print '</td></tr>'; print '</td></tr>';
// Label
print '<tr><td>'.$langs->trans("Label").'</td><td><input name="libelle" size="40" value="'.$product->libelle.'"></td></tr>'; print '<tr><td>'.$langs->trans("Label").'</td><td><input name="libelle" size="40" value="'.$product->libelle.'"></td></tr>';
if($conf->global->PRODUIT_MULTIPRICES == 1) if($conf->global->PRODUIT_MULTIPRICES == 1)
@ -593,15 +595,18 @@ if ($_GET["action"] == 'create' && $user->rights->produit->creer)
print '</td></tr>'; print '</td></tr>';
} }
// VAT
print '<tr><td>'.$langs->trans("VATRate").'</td><td>'; print '<tr><td>'.$langs->trans("VATRate").'</td><td>';
print $html->select_tva("tva_tx",$conf->defaulttx,$mysoc,''); print $html->select_tva("tva_tx",$conf->defaulttx,$mysoc,'');
print '</td></tr>'; print '</td></tr>';
// Status
print '<tr><td>'.$langs->trans("Status").'</td><td>'; print '<tr><td>'.$langs->trans("Status").'</td><td>';
$statutarray=array('1' => $langs->trans("OnSell"), '0' => $langs->trans("NotOnSell")); $statutarray=array('1' => $langs->trans("OnSell"), '0' => $langs->trans("NotOnSell"));
$html->select_array('statut',$statutarray,$_POST["statut"]); $html->select_array('statut',$statutarray,$_POST["statut"]);
print '</td></tr>'; print '</td></tr>';
// Stock min level
if ($_GET["type"] != 1 && $conf->stock->enabled) if ($_GET["type"] != 1 && $conf->stock->enabled)
{ {
print '<tr><td>Seuil stock</td><td>'; print '<tr><td>Seuil stock</td><td>';
@ -840,6 +845,7 @@ if ($_GET["id"] || $_GET["ref"])
} }
print '</td></tr>'; print '</td></tr>';
} }
// Statut // Statut
print '<tr><td>'.$langs->trans("Status").'</td><td>'; print '<tr><td>'.$langs->trans("Status").'</td><td>';
print $product->getLibStatut(2); print $product->getLibStatut(2);
@ -852,22 +858,15 @@ if ($_GET["id"] || $_GET["ref"])
if ($product->isproduct() && $conf->stock->enabled) if ($product->isproduct() && $conf->stock->enabled)
{ {
print '<tr><td>'.$langs->trans("Stock").'</td>'; print '<tr><td>'.$langs->trans("Stock").'</td>';
if ($product->no_stock) if ($product->stock_reel < $product->seuil_stock_alerte)
{ {
print "<td>".$langs->trans("NoStockForThisProduct"); print '<td>'.$product->stock_reel.' '.img_warning().' (Seuil: '.$product->seuil_stock_alerte.')</td>';
} }
else else
{ {
if ($product->stock_reel <= $product->seuil_stock_alerte) print "<td>".$product->stock_reel.'</td>';
{
print '<td>'.img_warning().' '.$product->stock_reel.' Seuil : '.$product->seuil_stock_alerte;
}
else
{
print "<td>".$product->stock_reel;
}
} }
print '</td></tr>'; print '</tr>';
} }
// Description // Description

11
htdocs/product/reassort.php
View File

@ -1,6 +1,6 @@
<?php <?php
/* Copyright (C) 2001-2006 Rodolphe Quiedeville <rodolphe@quiedeville.org> /* Copyright (C) 2001-2006 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2004-2006 Laurent Destailleur <eldy@users.sourceforge.net> * Copyright (C) 2004-2007 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2005-2006 Regis Houssin <regis@dolibarr.fr> * Copyright (C) 2005-2006 Regis Houssin <regis@dolibarr.fr>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
@ -18,7 +18,6 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
* *
* $Id$ * $Id$
* $Source$
*/ */
/** /**
@ -81,11 +80,11 @@ $sql = 'SELECT p.rowid, p.ref, p.label, p.price, p.fk_product_type, '.$db->pdate
$sql.= ' p.duration, p.envente as statut, p.seuil_stock_alerte,'; $sql.= ' p.duration, p.envente as statut, p.seuil_stock_alerte,';
$sql.= ' p.stock_commande,'; $sql.= ' p.stock_commande,';
$sql.= ' SUM(s.reel) as stock,'; $sql.= ' SUM(s.reel) as stock,';
// \TODO Bug ? On soustrait le stock commandé alors qu'il ait stocké en base en négatif. Du coup on additionne ! // \FIXME Bug ? On soustrait le stock commandé alors qu'il ait stocké en base en négatif. Du coup on additionne !
$sql.= ' (SUM(s.reel) - p.stock_commande) as stock_dispo'; $sql.= ' (SUM(s.reel) - p.stock_commande) as stock_dispo';
$sql.= ' FROM '.MAIN_DB_PREFIX.'product as p'; // '.MAIN_DB_PREFIX.'product_det as d'; //en attendant le debugage $sql.= ' FROM '.MAIN_DB_PREFIX.'product_stock as s,'; // '.MAIN_DB_PREFIX.'product_det as d'; //en attendant le debugage
$sql.= ',' .MAIN_DB_PREFIX.'product_stock as s'; $sql.= ' '.MAIN_DB_PREFIX.'product as p';
if ($catid || ($conf->categorie->enabled && !$user->rights->categorie->voir)) if ($catid || ($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_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 as c ON cp.fk_categorie = c.rowid";

25
htdocs/product/stock/product.php
View File

@ -145,22 +145,15 @@ if ($_GET["id"] || $_GET["ref"])
// Stock // Stock
print '<tr><td>'.$langs->trans("TotalStock").'</td>'; print '<tr><td>'.$langs->trans("TotalStock").'</td>';
if ($product->no_stock) if ($product->stock_reel < $product->seuil_stock_alerte)
{ {
print "<td>".$langs->trans("NoStockForThisProduct"); print '<td>'.$product->stock_reel.' '.img_warning().' (Seuil: '.$product->seuil_stock_alerte.')</td>';
} }
else else
{ {
if ($product->stock_reel <= $product->seuil_stock_alerte) print "<td>".$product->stock_reel.'</td>';
{ }
print '<td>'.img_warning().' '.$product->stock_reel.' '.$langs->trans("StockLimit").' : '.$product->seuil_stock_alerte; print '</tr>';
}
else
{
print "<td>".$product->stock_reel;
}
}
print '</td></tr>';
// Nbre de commande clients en cours // Nbre de commande clients en cours