Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-11 03:51:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

On affiche l'intitul "offert" au lieu de 100% pour une rduction

Browse Source
This commit is contained in:
Regis Houssin
2007-12-06 22:13:46 +00:00
parent a76638ebf9
commit ef35fb8407
9 changed files with 33 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/comm/propal.php
View File

@@ -1233,7 +1233,7 @@ if ($_GET['propalid'] > 0)
// Remise % // Remise %
if ($objp->remise_percent > 0) if ($objp->remise_percent > 0)
{ {
print '<td align="right">'.$objp->remise_percent."%</td>\n"; print '<td align="right">'.dolibarr_print_reduction($objp->remise_percent)."</td>\n";
} }
else else
{ {

4
htdocs/commande/fiche.php
View File

@@ -924,7 +924,7 @@ if ($_GET['action'] == 'create' && $user->rights->commande->creer)
print '<tr class="liste_titre"><td>'.$langs->trans('Ref').'</td><td>'.$langs->trans('Product').'</td>'; print '<tr class="liste_titre"><td>'.$langs->trans('Ref').'</td><td>'.$langs->trans('Product').'</td>';
print '<td align="right">'.$langs->trans('Price').'</td>'; print '<td align="right">'.$langs->trans('Price').'</td>';
print '<td align="center">'.$langs->trans('Qty').'</td>'; print '<td align="center">'.$langs->trans('Qty').'</td>';
print '<td align="center">'.$langs->trans('Reductionshort').'</td>'; print '<td align="center">'.$langs->trans('ReductionShort').'</td>';
print '</tr>'; print '</tr>';
$var=false; $var=false;
@@ -1399,7 +1399,7 @@ else
print '</td>'; print '</td>';
if ($objp->remise_percent > 0) if ($objp->remise_percent > 0)
{ {
print '<td align="right">'.$objp->remise_percent.'%</td>'; print '<td align="right">'.dolibarr_print_reduction($objp->remise_percent).'</td>';
} }
else else
{ {

2
htdocs/compta/facture.php
View File

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

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

@@ -296,7 +296,7 @@ class pdf_einstein extends ModelePDFCommandes
$pdf->SetXY ($this->posxdiscount, $curY); $pdf->SetXY ($this->posxdiscount, $curY);
if ($com->lignes[$i]->remise_percent) if ($com->lignes[$i]->remise_percent)
{ {
$pdf->MultiCell(14, 4, $com->lignes[$i]->remise_percent."%", 0, 'R'); $pdf->MultiCell(14, 4, dolibarr_print_reduction($com->lignes[$i]->remise_percent), 0, 'R');
} }
// Total HT ligne // Total HT ligne

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

@@ -307,7 +307,7 @@ class pdf_crabe extends ModelePDFFactures
$pdf->SetXY ($this->posxdiscount, $curY); $pdf->SetXY ($this->posxdiscount, $curY);
if ($fac->lignes[$i]->remise_percent) if ($fac->lignes[$i]->remise_percent)
{ {
$pdf->MultiCell(14, 4, $fac->lignes[$i]->remise_percent."%", 0, 'R'); $pdf->MultiCell(14, 4, dolibarr_print_reduction($fac->lignes[$i]->remise_percent), 0, 'R');
} }
// Total HT ligne // Total HT ligne

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

@@ -294,7 +294,7 @@ class pdf_propale_azur extends ModelePDFPropales
$pdf->SetXY ($this->posxdiscount, $curY); $pdf->SetXY ($this->posxdiscount, $curY);
if ($propale->lignes[$i]->remise_percent) if ($propale->lignes[$i]->remise_percent)
{ {
$pdf->MultiCell(14, 4, $propale->lignes[$i]->remise_percent."%", 0, 'R'); $pdf->MultiCell(14, 4, dolibarr_print_reduction($propale->lignes[$i]->remise_percent), 0, 'R');
} }
// Total HT ligne // Total HT ligne

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

@@ -393,6 +393,7 @@ AutomaticCode=Automatic code
NotManaged=Not managed NotManaged=Not managed
FeatureDisabled=Feature disabled FeatureDisabled=Feature disabled
MoveBox=Move box %s MoveBox=Move box %s
Offered=Offered
# Week day # Week day
Monday=Monday Monday=Monday
Tuesday=Tuesday Tuesday=Tuesday

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

@@ -394,6 +394,7 @@ AutomaticCode=Cr
NotManaged=Non g<>r<EFBFBD> NotManaged=Non g<>r<EFBFBD>
FeatureDisabled=Fonction d<>sactiv<69>e FeatureDisabled=Fonction d<>sactiv<69>e
MoveBox=D<>placer la boite %s MoveBox=D<>placer la boite %s
Offered=Offert
# Week day # Week day
Monday=Lundi Monday=Lundi
Tuesday=Mardi Tuesday=Mardi

24
htdocs/lib/functions.inc.php
View File

@@ -3849,4 +3849,28 @@ function monthArrayOrSelected($selected=0)
} }
} }
/**
\brief Returns formated reduction
\param reduction Reduction percentage
\return string Formated reduction
*/
function dolibarr_print_reduction($reduction=0)
{
global $langs;
$langs->load("main");
$string = '';
if ($reduction == 100)
{
$string = $langs->trans("Offered");
}
else
{
$string = $reduction.'%';
}
return $string;
}
?> ?>