diff --git a/htdocs/core/class/commoninvoice.class.php b/htdocs/core/class/commoninvoice.class.php index 8ea15b31938..6e939a6278c 100644 --- a/htdocs/core/class/commoninvoice.class.php +++ b/htdocs/core/class/commoninvoice.class.php @@ -472,26 +472,26 @@ abstract class CommonInvoice extends CommonObject $statusType='status0'; $prefix='Short'; if (! $paye){ - if ($status == 0){ + if ($status == 0) { $labelstatut = $langs->trans('BillStatusDraft'); $labelstatutShort = $langs->trans('Bill'.$prefix.'StatusDraft'); } - elseif (($status == 3 || $status == 2) && $alreadypaid <= 0){ + elseif (($status == 3 || $status == 2) && $alreadypaid <= 0) { $labelstatut = $langs->trans('BillStatusClosedUnpaid'); $labelstatutShort = $langs->trans('Bill'.$prefix.'StatusClosedUnpaid'); $statusType='status5'; } - elseif (($status == 3 || $status == 2) && $alreadypaid > 0){ + elseif (($status == 3 || $status == 2) && $alreadypaid > 0) { $labelstatut = $langs->trans('BillStatusClosedPaidPartially'); $labelstatutShort = $langs->trans('Bill'.$prefix.'StatusClosedPaidPartially'); $statusType='status9'; } - elseif ($alreadypaid <= 0){ + elseif ($alreadypaid <= 0) { $labelstatut = $langs->trans('BillStatusNotPaid'); $labelstatutShort = $langs->trans('Bill'.$prefix.'StatusNotPaid'); $statusType='status1'; } - else{ + else { $labelstatut = $langs->trans('BillStatusStarted'); $labelstatutShort = $langs->trans('Bill'.$prefix.'StatusStarted'); $statusType='status3'; @@ -500,7 +500,7 @@ abstract class CommonInvoice extends CommonObject else { $statusType='status6'; - + if ($type == self::TYPE_CREDIT_NOTE){ $labelstatut = $langs->trans('BillStatusPaidBackOrConverted'); // credit note $labelstatutShort = $langs->trans('Bill'.$prefix.'StatusPaidBackOrConverted'); // credit note @@ -514,8 +514,8 @@ abstract class CommonInvoice extends CommonObject $labelstatutShort = $langs->trans('Bill'.$prefix.'StatusPaid'); } } - - + + return dolGetStatus($labelstatut, $labelstatutShort, '', $statusType, $mode); } @@ -525,7 +525,7 @@ abstract class CommonInvoice extends CommonObject * conditions de reglements de la facture et date de facturation. * * @param integer $cond_reglement Condition of payment (code or id) to use. If 0, we use current condition. - * @return date Date limite de reglement si ok, <0 si ko + * @return integer Date limite de reglement si ok, <0 si ko */ public function calculate_date_lim_reglement($cond_reglement = 0) { diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php index dcb64f47d9f..3499e327f80 100644 --- a/htdocs/core/lib/functions.lib.php +++ b/htdocs/core/lib/functions.lib.php @@ -1493,7 +1493,7 @@ function dol_banner_tab($object, $paramid, $morehtml = '', $shownav = 1, $fieldi elseif (in_array($object->element, array('facture', 'invoice', 'invoice_supplier', 'chargesociales', 'loan'))) { $tmptxt=$object->getLibStatut(6, $object->totalpaye); - if (empty($tmptxt) || $tmptxt == $object->getLibStatut(3) || $conf->browser->layout=='phone') $tmptxt=$object->getLibStatut(5, $object->totalpaye); + if (empty($tmptxt) || $tmptxt == $object->getLibStatut(3)) $tmptxt=$object->getLibStatut(5, $object->totalpaye); $morehtmlstatus.=$tmptxt; } elseif ($object->element == 'contrat' || $object->element == 'contract') @@ -8037,7 +8037,7 @@ function dolGetStatus($statusLabel = '', $statusLabelShort = '', $html = '', $st $return = $htmlImg .' '. $htmlLabel; } elseif ($displayMode === 5) { - $return = $htmlLabelShort .' '. $htmlImg; + $return = $displayMode.$htmlLabelShort .' '. $htmlImg; } else { // $displayMode >= 6 $return = $htmlLabel .' '. $htmlImg;