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

Fix: Corrige pb compatibilit avec vieilles versions.

Browse Source
This commit is contained in:
Laurent Destailleur 2005-04-09 15:12:39 +00:00
parent 4471e40ee3
commit a948864f9e
1 changed files with 58 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

93
htdocs/product/price.php
View File

@ -22,10 +22,10 @@
*/ */
/** /**
\file htdocs/product/price.php \file htdocs/product/price.php
\ingroup product \ingroup product
\brief Page de la fiche produit \brief Page de la fiche produit
\version $Revision$ \version $Revision$
*/ */
require("./pre.inc.php"); require("./pre.inc.php");
@ -35,7 +35,7 @@ $langs->load("products");
$user->getrights('produit'); $user->getrights('produit');
if (!$user->rights->produit->lire) if (!$user->rights->produit->lire)
accessforbidden(); accessforbidden();
$types[0] = $langs->trans("Product"); $types[0] = $langs->trans("Product");
@ -49,7 +49,7 @@ $types[1] = $langs->trans("Service");
* *
*/ */
llxHeader("","","Prix"); llxHeader("","",$langs->trans("Price"));
$product = new Product($db); $product = new Product($db);
$result = $product->fetch($_GET["id"]); $result = $product->fetch($_GET["id"]);
@ -68,18 +68,18 @@ $h++;
if($product->type == 0) 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][0] = DOL_URL_ROOT."/product/stock/product.php?id=".$product->id;
$head[$h][1] = $langs->trans("Stock"); $head[$h][1] = $langs->trans("Stock");
$h++; $h++;
} }
} }
if ($conf->fournisseur->enabled) { if ($conf->fournisseur->enabled) {
$head[$h][0] = DOL_URL_ROOT."/product/fournisseurs.php?id=".$product->id; $head[$h][0] = DOL_URL_ROOT."/product/fournisseurs.php?id=".$product->id;
$head[$h][1] = $langs->trans("Suppliers"); $head[$h][1] = $langs->trans("Suppliers");
$h++; $h++;
} }
$head[$h][0] = DOL_URL_ROOT."/product/photos.php?id=".$product->id; $head[$h][0] = DOL_URL_ROOT."/product/photos.php?id=".$product->id;
@ -99,46 +99,57 @@ $sql .= " FROM ".MAIN_DB_PREFIX."product_price as p, llx_user as u";
$sql .= " WHERE fk_product = ".$product->id; $sql .= " WHERE fk_product = ".$product->id;
$sql .= " AND p.fk_user_author = u.rowid "; $sql .= " AND p.fk_user_author = u.rowid ";
$sql .= " ORDER BY p.date_price DESC "; $sql .= " ORDER BY p.date_price DESC ";
$sql .= $db->plimit(15 ,0); $sql .= $db->plimit();
$result = $db->query($sql) ; $result = $db->query($sql) ;
if ($result) if ($result)
{ {
$num = $db->num_rows(); $num = $db->num_rows($result);
$i = 0; if (! $num)
if ($num > 0)
{ {
print '<table class="noborder" width="100%">'; $result = $db->free($result) ;
print '<tr class="liste_titre">'; // Il doit au moins y avoir la ligne de prix initial.
print '<td>'.$langs->trans("AppliedPricesFrom").'</td>'; // On l'ajoute donc pour remettre à niveau pb vieilles versions
print '<td>'.$langs->trans("Price").'</td>'; $product->update_price($product->id, $user);
print '<td>'.$langs->trans("ChangedBy").'</td>';
print '</tr>';
$var=True; $result = $db->query($sql) ;
while ($i < $num) $num = $db->num_rows($result);
{ }
$objp = $db->fetch_object( $i);
$var=!$var;
print "<tr $bc[$var]>";
print "<td>".dolibarr_print_date($objp->dp,"%d %B %Y %H:%M:%S")."</td>";
print "<td>".price($objp->price)."</td>";
print "<td>".$objp->login."</td>";
print "</tr>\n"; if ($num > 0)
$i++; {
} print '<table class="noborder" width="100%">';
$db->free();
print "</table>"; print '<tr class="liste_titre">';
print "<br>"; print '<td>'.$langs->trans("AppliedPricesFrom").'</td>';
print '<td>'.$langs->trans("Price").'</td>';
print '<td>'.$langs->trans("ChangedBy").'</td>';
print '</tr>';
$var=True;
$i = 0;
while ($i < $num)
{
$objp = $db->fetch_object($result);
$var=!$var;
print "<tr $bc[$var]>";
print "<td>".dolibarr_print_date($objp->dp,"%d %B %Y %H:%M:%S")."</td>";
print "<td>".price($objp->price)."</td>";
print "<td>".$objp->login."</td>";
print "</tr>\n";
$i++;
}
$db->free($result);
print "</table>";
print "<br>";
} }
} }
else else
{ {
dolibarr_print_error($db); dolibarr_print_error($db);
} }
print "</div>\n"; print "</div>\n";
@ -155,9 +166,9 @@ print "\n<div class=\"tabsAction\">\n";
if ($_GET["action"] == '') if ($_GET["action"] == '')
{ {
if ($user->rights->produit->modifier || $user->rights->produit->creer) if ($user->rights->produit->modifier || $user->rights->produit->creer)
{ {
print '<a class="tabAction" href="fiche.php?action=edit_price&amp;id='.$product->id.'">'.$langs->trans("UpdatePrice").'</a>'; print '<a class="tabAction" href="fiche.php?action=edit_price&amp;id='.$product->id.'">'.$langs->trans("UpdatePrice").'</a>';
} }
} }