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

Fix: Libell statut sur avoir convertis en rduction

Browse Source
This commit is contained in:
Laurent Destailleur 2007-04-25 20:05:34 +00:00
parent 3f0f7a2b1b
commit 296b296db7
4 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/compta/facture.php
View File

@ -3135,7 +3135,7 @@ else
// Affiche statut de la facture // Affiche statut de la facture
print '<td align="right" nowrap="nowrap">'; print '<td align="right" nowrap="nowrap">';
print $facturestatic->LibStatut($objp->paye,$objp->fk_statut,5,$objp->am); print $facturestatic->LibStatut($objp->paye,$objp->fk_statut,5,$objp->am,$objp->type);
print "</td></tr>\n"; print "</td></tr>\n";
$total+=$objp->total; $total+=$objp->total;
$total_ttc+=$objp->total_ttc; $total_ttc+=$objp->total_ttc;

23
htdocs/facture.class.php
View File

@ -1824,7 +1824,7 @@ class Facture extends CommonObject
*/ */
function getLibStatut($mode=0,$alreadypayed=-1) function getLibStatut($mode=0,$alreadypayed=-1)
{ {
return $this->LibStatut($this->paye,$this->statut,$mode,$alreadypayed); return $this->LibStatut($this->paye,$this->statut,$mode,$alreadypayed,$this->type);
} }
/** /**
@ -1833,9 +1833,10 @@ class Facture extends CommonObject
* \param statut Id statut * \param statut Id statut
* \param mode 0=libellé long, 1=libellé court, 2=Picto + Libellé court, 3=Picto, 4=Picto + Libellé long, 5=Libellé court + Picto * \param mode 0=libellé long, 1=libellé court, 2=Picto + Libellé court, 3=Picto, 4=Picto + Libellé long, 5=Libellé court + Picto
* \param alreadypayed Montant deja payé * \param alreadypayed Montant deja payé
* \param type Type facture
* \return string Libellé du statut * \return string Libellé du statut
*/ */
function LibStatut($paye,$statut,$mode=0,$alreadypayed=-1) function LibStatut($paye,$statut,$mode=0,$alreadypayed=-1,$type=0)
{ {
global $langs; global $langs;
$langs->load('bills'); $langs->load('bills');
@ -1853,7 +1854,8 @@ class Facture extends CommonObject
} }
else else
{ {
return $langs->trans('Bill'.$prefix.'StatusPayed'); if ($type == 2) return $langs->trans('Bill'.$prefix.'StatusPayedBackOrConverted');
else return $langs->trans('Bill'.$prefix.'StatusPayed');
} }
} }
if ($mode == 1) if ($mode == 1)
@ -1869,7 +1871,8 @@ class Facture extends CommonObject
} }
else else
{ {
return $langs->trans('Bill'.$prefix.'StatusPayed'); if ($type == 2) return $langs->trans('Bill'.$prefix.'StatusPayedBackOrConverted');
else return $langs->trans('Bill'.$prefix.'StatusPayed');
} }
} }
if ($mode == 2) if ($mode == 2)
@ -1885,7 +1888,8 @@ class Facture extends CommonObject
} }
else else
{ {
return img_picto($langs->trans('BillStatusPayed'),'statut6').' '.$langs->trans('Bill'.$prefix.'StatusPayed'); if ($type == 2) return img_picto($langs->trans('BillStatusPayedBackOrConverted'),'statut6').' '.$langs->trans('Bill'.$prefix.'StatusPayedBackOrConverted');
else return img_picto($langs->trans('BillStatusPayed'),'statut6').' '.$langs->trans('Bill'.$prefix.'StatusPayed');
} }
} }
if ($mode == 3) if ($mode == 3)
@ -1901,7 +1905,8 @@ class Facture extends CommonObject
} }
else else
{ {
return img_picto($langs->trans('BillStatusPayed'),'statut6'); if ($type == 2) return img_picto($langs->trans('BillStatusPayedBackOrConverted'),'statut6');
else return img_picto($langs->trans('BillStatusPayed'),'statut6');
} }
} }
if ($mode == 4) if ($mode == 4)
@ -1916,7 +1921,8 @@ class Facture extends CommonObject
} }
else else
{ {
return img_picto($langs->trans('BillStatusPayed'),'statut6').' '.$langs->trans('BillStatusPayed'); if ($type == 2) return img_picto($langs->trans('BillStatusPayedBackOrConverted'),'statut6').' '.$langs->trans('BillStatusPayedBackOrConverted');
else return img_picto($langs->trans('BillStatusPayed'),'statut6').' '.$langs->trans('BillStatusPayed');
} }
} }
if ($mode == 5) if ($mode == 5)
@ -1932,7 +1938,8 @@ class Facture extends CommonObject
} }
else else
{ {
return $langs->trans('Bill'.$prefix.'StatusPayed').' '.img_picto($langs->trans('BillStatusPayed'),'statut6'); if ($type == 2) return $langs->trans('Bill'.$prefix.'StatusPayedBackOrConverted').' '.img_picto($langs->trans('BillStatusPayedBackOrConverted'),'statut6');
else return $langs->trans('Bill'.$prefix.'StatusPayed').' '.img_picto($langs->trans('BillStatusPayed'),'statut6');
} }
} }
} }

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

@ -81,6 +81,7 @@ TotalTTCToYourCredit=Total TTC to your credit
BillStatus=Invoice status BillStatus=Invoice status
BillStatusDraft=Draft (needs to be validated) BillStatusDraft=Draft (needs to be validated)
BillStatusPayed=Payed BillStatusPayed=Payed
BillStatusPayedBackOrConverted=Payed or converted into discount
BillStatusCanceled=Abandonned BillStatusCanceled=Abandonned
BillStatusValidated=Validated (needs to be payed) BillStatusValidated=Validated (needs to be payed)
BillStatusStarted=Started BillStatusStarted=Started
@ -89,6 +90,7 @@ BillStatusClosedUnpayed=Closed (unpayed)
BillStatusClosedPayedPartially=Payed (partially) BillStatusClosedPayedPartially=Payed (partially)
BillShortStatusDraft=Draft BillShortStatusDraft=Draft
BillShortStatusPayed=Payed BillShortStatusPayed=Payed
BillShortStatusPayedBackOrConverted=Processed
BillShortStatusCanceled=Abandonned BillShortStatusCanceled=Abandonned
BillShortStatusValidated=Validated BillShortStatusValidated=Validated
BillShortStatusStarted=Started BillShortStatusStarted=Started

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

@ -81,6 +81,7 @@ TotalTTCToYourCredit=Total TTC
BillStatus=État de la facture BillStatus=État de la facture
BillStatusDraft=Brouillon (à valider) BillStatusDraft=Brouillon (à valider)
BillStatusPayed=Payée BillStatusPayed=Payée
BillStatusPayedBackOrConverted=Remboursé ou converti en réduction
BillStatusCanceled=Abandonnée BillStatusCanceled=Abandonnée
BillStatusValidated=Validée (à payer) BillStatusValidated=Validée (à payer)
BillStatusStarted=Réglement commencé BillStatusStarted=Réglement commencé
@ -89,6 +90,7 @@ BillStatusClosedUnpayed=Ferm
BillStatusClosedPayedPartially=Payée (partiellement) BillStatusClosedPayedPartially=Payée (partiellement)
BillShortStatusDraft=Brouillon BillShortStatusDraft=Brouillon
BillShortStatusPayed=Payée BillShortStatusPayed=Payée
BillShortStatusPayedBackOrConverted=Traité
BillShortStatusCanceled=Abandonnée BillShortStatusCanceled=Abandonnée
BillShortStatusValidated=Validée BillShortStatusValidated=Validée
BillShortStatusStarted=Commencée BillShortStatusStarted=Commencée