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

Fix: Minor fix

Browse Source
This commit is contained in:
Laurent Destailleur 2008-11-17 18:59:02 +00:00
parent 15dea5162a
commit c2cb3e3c7a
3 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/langs/fr_FR/main.lang
View File

@ -185,9 +185,11 @@ DatePlanShort=Date planif.
DateRealShort=Date réal. DateRealShort=Date réal.
DurationYear=an DurationYear=an
DurationMonth=mois DurationMonth=mois
DurationWeek=semaine
DurationDay=jour DurationDay=jour
DurationYears=ans DurationYears=ans
DurationMonths=mois DurationMonths=mois
DurationWeeks=semaines
DurationDays=jours DurationDays=jours
Year=Année Year=Année
Month=Mois Month=Mois

5
htdocs/product/fiche.php
View File

@ -915,7 +915,7 @@ if ($_GET["id"] || $_GET["ref"])
{ {
$dur=array("h"=>$langs->trans("Hours"),"d"=>$langs->trans("Days"),"w"=>$langs->trans("Weeks"),"m"=>$langs->trans("Months"),"y"=>$langs->trans("Years")); $dur=array("h"=>$langs->trans("Hours"),"d"=>$langs->trans("Days"),"w"=>$langs->trans("Weeks"),"m"=>$langs->trans("Months"),"y"=>$langs->trans("Years"));
} }
else else if ($product->duration_value > 0)
{ {
$dur=array("h"=>$langs->trans("Hour"),"d"=>$langs->trans("Day"),"w"=>$langs->trans("Week"),"m"=>$langs->trans("Month"),"y"=>$langs->trans("Year")); $dur=array("h"=>$langs->trans("Hour"),"d"=>$langs->trans("Day"),"w"=>$langs->trans("Week"),"m"=>$langs->trans("Month"),"y"=>$langs->trans("Year"));
} }
@ -936,6 +936,7 @@ if ($_GET["id"] || $_GET["ref"])
print ' '; print ' ';
} }
print "</td></tr>\n"; print "</td></tr>\n";
print '<tr><td>'.$langs->trans("Volume").'</td><td>'; print '<tr><td>'.$langs->trans("Volume").'</td><td>';
if ($product->volume != '') if ($product->volume != '')
{ {
@ -947,8 +948,10 @@ if ($_GET["id"] || $_GET["ref"])
} }
print "</td></tr>\n"; print "</td></tr>\n";
} }
// Note // Note
print '<tr><td valign="top">'.$langs->trans("Note").'</td><td>'.nl2br($product->note).'</td></tr>'; print '<tr><td valign="top">'.$langs->trans("Note").'</td><td>'.nl2br($product->note).'</td></tr>';
print "</table>\n"; print "</table>\n";
print "</div>\n<!-- CUT HERE -->\n"; print "</div>\n<!-- CUT HERE -->\n";
} }

16
htdocs/product/liste.php
View File

@ -19,11 +19,11 @@
*/ */
/** /**
\file htdocs/product/liste.php * \file htdocs/product/liste.php
\ingroup produit * \ingroup produit
\brief Page liste des produits ou services * \brief Page to list products and services
\version $Id$ * \version $Id$
*/ */
require("./pre.inc.php"); require("./pre.inc.php");
require_once(DOL_DOCUMENT_ROOT.'/product.class.php'); require_once(DOL_DOCUMENT_ROOT.'/product.class.php');
@ -305,18 +305,18 @@ if ($resql)
print '<td align="center">'; print '<td align="center">';
if (eregi('([0-9]+)y',$objp->duration,$regs)) print $regs[1].' '.$langs->trans("DurationYear"); if (eregi('([0-9]+)y',$objp->duration,$regs)) print $regs[1].' '.$langs->trans("DurationYear");
elseif (eregi('([0-9]+)m',$objp->duration,$regs)) print $regs[1].' '.$langs->trans("DurationMonth"); elseif (eregi('([0-9]+)m',$objp->duration,$regs)) print $regs[1].' '.$langs->trans("DurationMonth");
elseif (eregi('([0-9]+)w',$objp->duration,$regs)) print $regs[1].' '.$langs->trans("DurationWeek");
elseif (eregi('([0-9]+)d',$objp->duration,$regs)) print $regs[1].' '.$langs->trans("DurationDay"); elseif (eregi('([0-9]+)d',$objp->duration,$regs)) print $regs[1].' '.$langs->trans("DurationDay");
else print $objp->duration; else print $objp->duration;
print '</td>'; print '</td>';
} }
// Price // Price
print '<td align="right">'; print '<td align="right">';
if ($objp->price_base_type == 'TTC') print price($objp->price_ttc).' '.$langs->trans("TTC"); if ($objp->price_base_type == 'TTC') print price($objp->price_ttc).' '.$langs->trans("TTC");
else print price($objp->price).' '.$langs->trans("HT"); else print price($objp->price).' '.$langs->trans("HT");
print '</td>'; print '</td>';
// Affichage du stock // Affichage du stock
if ($conf->stock->enabled && $user->rights->stock->lire && $type != 1) if ($conf->stock->enabled && $user->rights->stock->lire && $type != 1)
{ {