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

Fix: traduction

Browse Source
This commit is contained in:
Regis Houssin 2007-09-04 22:22:14 +00:00
parent ba7ff0ed08
commit 700b5872ab
3 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
htdocs/html.form.class.php
View File

@ -1143,6 +1143,8 @@ class Form
{ {
global $langs,$conf; global $langs,$conf;
$langs->load('stocks');
$sql = "SELECT p.rowid, p.label, p.ref, p.price, p.duration,"; $sql = "SELECT p.rowid, p.label, p.ref, p.price, p.duration,";
$sql.= " pf.ref_fourn, pfp.rowid as idprodfournprice, pfp.price as fprice, pfp.quantity, pfp.unitprice"; $sql.= " pf.ref_fourn, pfp.rowid as idprodfournprice, pfp.price as fprice, pfp.quantity, pfp.unitprice";
$sql.= " FROM ".MAIN_DB_PREFIX."product as p"; $sql.= " FROM ".MAIN_DB_PREFIX."product as p";
@ -1196,11 +1198,19 @@ class Form
if ($objp->fprice != '') if ($objp->fprice != '')
{ {
$opt.= price($objp->fprice); $opt.= price($objp->fprice);
$opt.= $langs->trans("Currency".$conf->monnaie)."/".$objp->quantity.$langs->trans("Units"); $opt.= $langs->trans("Currency".$conf->monnaie)."/".$objp->quantity;
if ($objp->quantity == 1)
{
$opt.= strtolower($langs->trans("Unit"));
}
else
{
$opt.= strtolower($langs->trans("Units"));
}
if ($objp->quantity > 1) if ($objp->quantity > 1)
{ {
$opt.=" - "; $opt.=" - ";
$opt.= price($objp->unitprice).$langs->trans("Currency".$conf->monnaie)."/".$langs->trans("Unit"); $opt.= price($objp->unitprice).$langs->trans("Currency".$conf->monnaie)."/".strtolower($langs->trans("Unit"));
} }
if ($objp->duration) $opt .= " - ".$objp->duration; if ($objp->duration) $opt .= " - ".$objp->duration;
} }

1
htdocs/langs/en_US/stocks.lang
View File

@ -26,6 +26,7 @@ NumberOfProducts=Total number of products
LastMovement=Last movement LastMovement=Last movement
LastMovements=Last movements LastMovements=Last movements
Units=Units Units=Units
Unit=Unit
StockCorrection=Stock correction StockCorrection=Stock correction
StockMovement=Transfer StockMovement=Transfer
StockMovements=Stock transfers StockMovements=Stock transfers

1
htdocs/langs/fr_FR/stocks.lang
View File

@ -26,6 +26,7 @@ NumberOfProducts=Nombre total de produits
LastMovement=Dernier mouvement LastMovement=Dernier mouvement
LastMovements=Derniers mouvements LastMovements=Derniers mouvements
Units=Unités Units=Unités
Unit=Unité
StockCorrection=Correction stock StockCorrection=Correction stock
StockMovement=Transfert StockMovement=Transfert
StockMovements=Mouvements de stock StockMovements=Mouvements de stock