Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity

New: Gestion des escomptes

Browse Source
This commit is contained in:
Laurent Destailleur
2006-08-20 02:26:11 +00:00
parent 64a63940c3
commit 5eb13161ab
6 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/compta/facture.php
View File

@@ -1635,7 +1635,9 @@ else
print '<tr><td colspan="2" align="right">'.$langs->trans("Billed").' :</td><td align="right" style="border: 1px solid;">'.price($fac->total_ttc).'</td><td>'.$langs->trans('Currency'.$conf->monnaie).'</td></tr>';
if ($fac->close_code == 'escompte')
{
print '<tr><td colspan="2" align="right">'.$langs->trans("EscompteOffered").' :</td><td align="right">'.price($fac->total_ttc - $totalpaye).'</td><td>'.$langs->trans('Currency'.$conf->monnaie).'</td></tr>';
print '<tr><td colspan="2" align="right" nowrap="1">';
$html->textwithhelp($langs->trans("Escompte").':',$langs->trans("HelpEscompte"),-1);
print '</td><td align="right">'.price($fac->total_ttc - $totalpaye).'</td><td>'.$langs->trans('Currency'.$conf->monnaie).'</td></tr>';
}
print '<tr><td colspan="2" align="right">'.$langs->trans('RemainderToPay').' :</td>';
print '<td align="right" style="border: 1px solid;" bgcolor="#f0f0f0"><b>'.price($resteapayer).'</b></td><td>'.$langs->trans('Currency'.$conf->monnaie).'</td></tr>';

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

@@ -152,6 +152,7 @@ DiscountOfferedBy=Granted by
DiscountStillRemaining=Discount still remaining
DiscountAlreadyCounted=Discount already counted
BillAddress=Bill address
HelpEscompte=This discount is a discount granted to customer because its paiement was made before term.
# PaymentConditions
PaymentConditionShortRECEP=After reception
PaymentConditionRECEP=After invoice reception

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

@@ -152,6 +152,7 @@ DiscountOfferedBy=Accord
DiscountStillRemaining=Remises fixes restant en cours
DiscountAlreadyCounted=Remises fixes d<>j<EFBFBD> appliqu<71>es
BillAddress=Adresse de facturation
HelpEscompte=Un <b>escompte</b> est une remise accord<72>e, sur une facture donn<6E>e, <20> un client car ce dernier a r<>alis<69> son paiement bien avant l'<27>ch<63>ance.
# PaymentConditions
PaymentConditionShortRECEP=A r<>ception
PaymentConditionRECEP=A r<>ception de facture

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

@@ -761,7 +761,7 @@ function img_help($usehelpcursor=1,$usealttitle=1)
global $conf,$langs;
$s ='<img ';
if ($usehelpcursor) $s.='style="cursor: help;" ';
$s.='src="'.DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/help.png" border="0"';
$s.='src="'.DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/info.png" border="0"';
if ($usealttitle) $s.=' alt="'.$langs->trans("Info").'" title="'.$langs->trans("Info");
$s.='">';
return $s;

4
htdocs/user/fiche.php
View File

@@ -713,7 +713,7 @@ else
}
else
{
print '<img width="100" src="'.DOL_URL_ROOT.'/theme/nophoto.jpg">';
print '<img width="100" src="'.DOL_URL_ROOT.'/theme/common/nophoto.jpg">';
}
print '</td></tr>';
@@ -1040,7 +1040,7 @@ else
}
else
{
print '<img src="'.DOL_URL_ROOT.'/theme/nophoto.jpg">';
print '<img src="'.DOL_URL_ROOT.'/theme/common/nophoto.jpg">';
}
if ($caneditfield)
{

5
htdocs/user/param_ihm.php
View File

@@ -242,7 +242,8 @@ function show_theme($fuser,$edit=0)
$i=0;
while (($subdir = readdir($handle))!==false)
{
if (is_dir($dirtheme."/".$subdir) && substr($subdir, 0, 1) <> '.' && substr($subdir, 0, 3) <> 'CVS')
if (is_dir($dirtheme."/".$subdir) && substr($subdir, 0, 1) <> '.'
&& substr($subdir, 0, 3) <> 'CVS' && ! eregi('common',$subdir))
{
if ($i % $thumbsbyrow == 0)
{
@@ -251,7 +252,7 @@ function show_theme($fuser,$edit=0)
print '<td align="center">';
$file=$dirtheme."/".$subdir."/thumb.png";
if (! file_exists($file)) $file=$dirtheme."/nophoto.jpg";
if (! file_exists($file)) $file=$dirtheme."/common/nophoto.jpg";
print '<table><tr><td><img src="'.$file.'" width="80" height="60"></td></tr><tr><td align="center">';
if ($subdir == $fuser->conf->MAIN_THEME)
{