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-05 11:14:20 +00:00
parent 4271ecd880
commit acb6eedd2e
3 changed files with 19 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1268,7 +1268,7 @@ class Form
if (! $num) if (! $num)
{ {
print '<option value="0">-- '.$langs->trans("NoProductMatching").' --</option>'; print '<option value="0">-- '.$langs->trans("NoSupplierPriceDefinedForThisProduct").' --</option>';
} }
else else
{ {
@ -1280,37 +1280,30 @@ class Form
$objp = $this->db->fetch_object($result); $objp = $this->db->fetch_object($result);
$opt = '<option value="'.$objp->idprodfournprice.'"'; $opt = '<option value="'.$objp->idprodfournprice.'"';
if ($objp->fprice == '') $opt.=' disabled="disabled"';
$opt.= '>'.$objp->nom.' - '.$objp->ref_fourn.' - '; $opt.= '>'.$objp->nom.' - '.$objp->ref_fourn.' - ';
if ($objp->fprice != '')
if ($objp->quantity == 1)
{ {
if ($objp->quantity == 1) $opt.= price($objp->fprice);
{ $opt.= $langs->trans("Currency".$conf->monnaie)."/";
$opt.= price($objp->fprice); }
$opt.= $langs->trans("Currency".$conf->monnaie)."/";
}
$opt.= $objp->quantity; $opt.= $objp->quantity;
if ($objp->quantity == 1) if ($objp->quantity == 1)
{ {
$opt.= strtolower($langs->trans("Unit")); $opt.= strtolower($langs->trans("Unit"));
}
else
{
$opt.= strtolower($langs->trans("Units"));
}
if ($objp->quantity > 1)
{
$opt.=" - ";
$opt.= price($objp->unitprice).$langs->trans("Currency".$conf->monnaie)."/".strtolower($langs->trans("Unit"));
}
if ($objp->duration) $opt .= " - ".$objp->duration;
} }
else else
{ {
$opt.= $langs->trans("NoPriceDefinedForThisSupplier"); $opt.= strtolower($langs->trans("Units"));
} }
if ($objp->quantity > 1)
{
$opt.=" - ";
$opt.= price($objp->unitprice).$langs->trans("Currency".$conf->monnaie)."/".strtolower($langs->trans("Unit"));
}
if ($objp->duration) $opt .= " - ".$objp->duration;
$opt .= "</option>\n"; $opt .= "</option>\n";
print $opt; print $opt;

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

@ -116,6 +116,7 @@ PriceQty=Price for this quantity
PriceQtyHT=Price for this quantity HT PriceQtyHT=Price for this quantity HT
PriceQtyTTC=Price for this quantity TTC PriceQtyTTC=Price for this quantity TTC
NoPriceDefinedForThisSupplier=No price/qty defined for this supplier/product NoPriceDefinedForThisSupplier=No price/qty defined for this supplier/product
NoSupplierPriceDefinedForThisProduct=No supplier price/qty defined for this product
RecordedProducts=Products recorded RecordedProducts=Products recorded
RecordedProductsAndServices=Products/services recorded RecordedProductsAndServices=Products/services recorded
GenerateThumb=Generate thumb GenerateThumb=Generate thumb

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

@ -116,6 +116,7 @@ PriceQty=Prix pour la quantit
PriceQtyHT=Prix pour la quantité HT PriceQtyHT=Prix pour la quantité HT
PriceQtyTTC=Prix pour la quantité TTC PriceQtyTTC=Prix pour la quantité TTC
NoPriceDefinedForThisSupplier=Aucun prix/qté défini pour ce fournisseur/produit NoPriceDefinedForThisSupplier=Aucun prix/qté défini pour ce fournisseur/produit
NoSupplierPriceDefinedForThisProduct=Aucun prix/qté fournisseur défini pour ce produit
RecordedProducts=Produits en vente RecordedProducts=Produits en vente
RecordedProductsAndServices=Produits/services en vente RecordedProductsAndServices=Produits/services en vente
GenerateThumb=Générer la vignette GenerateThumb=Générer la vignette