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

Fix: Translation of Offered on PDF

Browse Source
This commit is contained in:
Laurent Destailleur 2009-01-15 00:32:10 +00:00
parent af1cede0ed
commit d370e2ff9f
9 changed files with 58 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/comm/propal.php
View File

@ -1379,7 +1379,7 @@ if ($id > 0 || ! empty($ref))
// Remise %
if ($objp->remise_percent > 0 && $objp->special_code != 3)
{
print '<td align="right">'.dol_print_reduction($objp->remise_percent)."</td>\n";
print '<td align="right">'.dol_print_reduction($objp->remise_percent,$langs)."</td>\n";
}
else
{

2
htdocs/commande/fiche.php
View File

@ -1559,7 +1559,7 @@ else
print '</td>';
if ($objp->remise_percent > 0)
{
print '<td align="right">'.dol_print_reduction($objp->remise_percent).'</td>';
print '<td align="right">'.dol_print_reduction($objp->remise_percent,$langs).'</td>';
}
else
{

2
htdocs/compta/facture.php
View File

@ -2640,7 +2640,7 @@ else
print '</td>';
if ($objp->remise_percent > 0)
{
print '<td align="right">'.dol_print_reduction($objp->remise_percent)."</td>\n";
print '<td align="right">'.dol_print_reduction($objp->remise_percent,$langs)."</td>\n";
}
else
{

2
htdocs/fourn/commande/fiche.php
View File

@ -724,7 +724,7 @@ if ($id > 0)
print '<td align="right" nowrap="nowrap">'.$commandline->qty.'</td>';
if ($commandline->remise_percent > 0)
{
print '<td align="right" nowrap="nowrap">'.dol_print_reduction($commandline->remise_percent)."</td>\n";
print '<td align="right" nowrap="nowrap">'.dol_print_reduction($commandline->remise_percent,$langs)."</td>\n";
}
else
{

2
htdocs/includes/modules/commande/pdf_einstein.modules.php
View File

@ -302,7 +302,7 @@ class pdf_einstein extends ModelePDFCommandes
$pdf->SetXY ($this->posxdiscount, $curY);
if ($com->lignes[$i]->remise_percent)
{
$pdf->MultiCell($this->postotalht-$this->posxdiscount-1, 3, dol_print_reduction($com->lignes[$i]->remise_percent), 0, 'R');
$pdf->MultiCell($this->postotalht-$this->posxdiscount-1, 3, dol_print_reduction($com->lignes[$i]->remise_percent,$outputlangs), 0, 'R');
}
// Total HT ligne

2
htdocs/includes/modules/facture/pdf_crabe.modules.php
View File

@ -321,7 +321,7 @@ class pdf_crabe extends ModelePDFFactures
$pdf->SetXY ($this->posxdiscount, $curY);
if ($fac->lignes[$i]->remise_percent)
{
$pdf->MultiCell($this->postotalht-$this->posxdiscount-1, 4, dol_print_reduction($fac->lignes[$i]->remise_percent), 0, 'R');
$pdf->MultiCell($this->postotalht-$this->posxdiscount-1, 4, dol_print_reduction($fac->lignes[$i]->remise_percent,$outputlangs), 0, 'R');
}
// Total HT ligne

2
htdocs/includes/modules/propale/pdf_propale_azur.modules.php
View File

@ -304,7 +304,7 @@ class pdf_propale_azur extends ModelePDFPropales
$pdf->SetXY ($this->posxdiscount, $curY);
if ($propale->lignes[$i]->remise_percent && $propale->lignes[$i]->special_code != 3)
{
$pdf->MultiCell($this->postotalht-$this->posxdiscount-1, 4, dol_print_reduction($propale->lignes[$i]->remise_percent), 0, 'R');
$pdf->MultiCell($this->postotalht-$this->posxdiscount-1, 4, dol_print_reduction($propale->lignes[$i]->remise_percent,$outputlangs), 0, 'R');
}
// Total HT ligne

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

@ -433,7 +433,7 @@ AutomaticCode=Automatic code
NotManaged=Not managed
FeatureDisabled=Feature disabled
MoveBox=Move box %s
Offered=Offered
Offered=Free
NotEnoughPermissions=You don't have permission for this action
SessionName=Session name
Method=Method

5
htdocs/lib/functions2.lib.php
View File

@ -522,11 +522,8 @@ function dol_set_user_page_param($db, &$user, $url='', $tab)
* \param reduction Reduction percentage
* \return string Formated reduction
*/
function dol_print_reduction($reduction=0)
function dol_print_reduction($reduction=0,$langs)
{
global $langs;
$langs->load("main");
$string = '';
if ($reduction == 100)
{