diff --git a/htdocs/product/price.php b/htdocs/product/price.php
index a78174a7809..8d130f58049 100644
--- a/htdocs/product/price.php
+++ b/htdocs/product/price.php
@@ -22,10 +22,10 @@
*/
/**
- \file htdocs/product/price.php
+ \file htdocs/product/price.php
\ingroup product
- \brief Page de la fiche produit
- \version $Revision$
+ \brief Page de la fiche produit
+ \version $Revision$
*/
require("./pre.inc.php");
@@ -35,7 +35,7 @@ $langs->load("products");
$user->getrights('produit');
if (!$user->rights->produit->lire)
- accessforbidden();
+accessforbidden();
$types[0] = $langs->trans("Product");
@@ -49,7 +49,7 @@ $types[1] = $langs->trans("Service");
*
*/
-llxHeader("","","Prix");
+llxHeader("","",$langs->trans("Price"));
$product = new Product($db);
$result = $product->fetch($_GET["id"]);
@@ -68,18 +68,18 @@ $h++;
if($product->type == 0)
{
- if ($conf->stock->enabled)
+ if ($conf->stock->enabled)
{
- $head[$h][0] = DOL_URL_ROOT."/product/stock/product.php?id=".$product->id;
- $head[$h][1] = $langs->trans("Stock");
- $h++;
+ $head[$h][0] = DOL_URL_ROOT."/product/stock/product.php?id=".$product->id;
+ $head[$h][1] = $langs->trans("Stock");
+ $h++;
}
}
-
+
if ($conf->fournisseur->enabled) {
- $head[$h][0] = DOL_URL_ROOT."/product/fournisseurs.php?id=".$product->id;
- $head[$h][1] = $langs->trans("Suppliers");
- $h++;
+ $head[$h][0] = DOL_URL_ROOT."/product/fournisseurs.php?id=".$product->id;
+ $head[$h][1] = $langs->trans("Suppliers");
+ $h++;
}
$head[$h][0] = DOL_URL_ROOT."/product/photos.php?id=".$product->id;
@@ -92,53 +92,64 @@ $h++;
dolibarr_fiche_head($head, $hselected, $langs->trans("CardProduct".$product->type).' : '.$product->ref);
-
+
$sql = "SELECT p.rowid, p.price, ".$db->pdate("p.date_price")." as dp, u.login";
$sql .= " FROM ".MAIN_DB_PREFIX."product_price as p, llx_user as u";
$sql .= " WHERE fk_product = ".$product->id;
$sql .= " AND p.fk_user_author = u.rowid ";
$sql .= " ORDER BY p.date_price DESC ";
-$sql .= $db->plimit(15 ,0);
+$sql .= $db->plimit();
$result = $db->query($sql) ;
if ($result)
{
- $num = $db->num_rows();
+ $num = $db->num_rows($result);
- $i = 0;
-
- if ($num > 0)
+ if (! $num)
{
- print '
';
+ $result = $db->free($result) ;
- print '';
- print '| '.$langs->trans("AppliedPricesFrom").' | ';
- print ''.$langs->trans("Price").' | ';
- print ''.$langs->trans("ChangedBy").' | ';
- print '
';
-
- $var=True;
- while ($i < $num)
- {
- $objp = $db->fetch_object( $i);
- $var=!$var;
- print "";
- print "| ".dolibarr_print_date($objp->dp,"%d %B %Y %H:%M:%S")." | ";
- print "".price($objp->price)." | ";
- print "".$objp->login." | ";
+ // Il doit au moins y avoir la ligne de prix initial.
+ // On l'ajoute donc pour remettre à niveau pb vieilles versions
+ $product->update_price($product->id, $user);
- print "
\n";
- $i++;
- }
- $db->free();
- print "
";
- print "
";
+ $result = $db->query($sql) ;
+ $num = $db->num_rows($result);
+ }
+
+ if ($num > 0)
+ {
+ print '';
+
+ print '';
+ print '| '.$langs->trans("AppliedPricesFrom").' | ';
+ print ''.$langs->trans("Price").' | ';
+ print ''.$langs->trans("ChangedBy").' | ';
+ print '
';
+
+ $var=True;
+ $i = 0;
+ while ($i < $num)
+ {
+ $objp = $db->fetch_object($result);
+ $var=!$var;
+ print "";
+ print "| ".dolibarr_print_date($objp->dp,"%d %B %Y %H:%M:%S")." | ";
+ print "".price($objp->price)." | ";
+ print "".$objp->login." | ";
+
+ print "
\n";
+ $i++;
+ }
+ $db->free($result);
+ print "
";
+ print "
";
}
}
else
{
- dolibarr_print_error($db);
+ dolibarr_print_error($db);
}
print "\n";
@@ -146,18 +157,18 @@ print "\n";
/* ************************************************************************** */
-/* */
-/* Barre d'action */
-/* */
+/* */
+/* Barre d'action */
+/* */
/* ************************************************************************** */
print "\n