diff --git a/htdocs/compta/facture/class/facture-rec.class.php b/htdocs/compta/facture/class/facture-rec.class.php index 2d4481daa54..3968e297ec3 100644 --- a/htdocs/compta/facture/class/facture-rec.class.php +++ b/htdocs/compta/facture/class/facture-rec.class.php @@ -571,7 +571,8 @@ class FactureRec extends CommonInvoice $sql .= " localtax2 = ".((float) $this->total_localtax2).","; $sql .= " total_ht = ".((float) $this->total_ht).","; $sql .= " total_ttc = ".((float) $this->total_ttc).","; - $sql .= " fk_societe_rib = ".(!empty($this->fk_societe_rib) ? ((int) $this->fk_societe_rib) : 'NULL');; + $sql .= " fk_societe_rib = ".(!empty($this->fk_societe_rib) ? ((int) $this->fk_societe_rib) : 'NULL'); + ; // TODO Add missing fields $sql .= " WHERE rowid = ".((int) $this->id); @@ -1599,13 +1600,13 @@ class FactureRec extends CommonInvoice /** * Return label of a status * - * @param int $recur Is it a recurring invoice ? - * @param int $status Id status (suspended or not) - * @param int $mode 0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=short label + picto, 6=long label + picto - * @param integer $alreadypaid Not used for recurring invoices - * @param int $type Type invoice - * @param int $nbofopendirectdebitorcredittransfer Nb of open direct debit or credit transfer - * @return string Label of status + * @param int $recur Is it a recurring invoice ? + * @param int $status Id status (suspended or not) + * @param int<0,6> $mode 0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=short label + picto, 6=long label + picto + * @param int $alreadypaid Not used for recurring invoices + * @param int $type Type invoice + * @param int $nbofopendirectdebitorcredittransfer @unused-param Nb of open direct debit or credit transfer + * @return string Label of status */ public function LibStatut($recur, $status, $mode = 0, $alreadypaid = -1, $type = 0, $nbofopendirectdebitorcredittransfer = 0) { diff --git a/htdocs/core/class/commoninvoice.class.php b/htdocs/core/class/commoninvoice.class.php index c2cb6cbf036..ed6066233af 100644 --- a/htdocs/core/class/commoninvoice.class.php +++ b/htdocs/core/class/commoninvoice.class.php @@ -909,13 +909,13 @@ abstract class CommonInvoice extends CommonObject /** * Return label of a status * - * @param int $paye Status field paye - * @param int $status Id status - * @param int $mode 0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=short label + picto, 6=long label + picto - * @param integer $alreadypaid 0=No payment already done, >0=Some payments were already done (we recommend to put here amount paid if you have it, -1 otherwise) - * @param int $type Type invoice. If -1, we use $this->type - * @param int $nbofopendirectdebitorcredittransfer Nb of open direct debit or credit transfer - * @return string Label of status + * @param int $paye Status field paye (or $recur) + * @param int $status Id status + * @param int<0,6> $mode 0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=short label + picto, 6=long label + picto + * @param int $alreadypaid 0=No payment already done, >0=Some payments were already done (we recommend to put here amount paid if you have it, -1 otherwise) + * @param int $type Type invoice. If -1, we use $this->type + * @param int $nbofopendirectdebitorcredittransfer Nb of open direct debit or credit transfer + * @return string Label of status */ public function LibStatut($paye, $status, $mode = 0, $alreadypaid = -1, $type = -1, $nbofopendirectdebitorcredittransfer = 0) { diff --git a/htdocs/fourn/class/fournisseur.facture-rec.class.php b/htdocs/fourn/class/fournisseur.facture-rec.class.php index 15ed1c9bb4c..9853bffe6c5 100644 --- a/htdocs/fourn/class/fournisseur.facture-rec.class.php +++ b/htdocs/fourn/class/fournisseur.facture-rec.class.php @@ -1595,13 +1595,13 @@ class FactureFournisseurRec extends CommonInvoice /** * Return label of a status * - * @param int $recur Is it a recurring invoice ? - * @param int $status Id status (suspended or not) - * @param int $mode 0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=short label + picto, 6=long label + picto - * @param integer $alreadypaid Not used for recurring invoices - * @param int $type Type invoice - * @param int $nbofopendirectdebitorcredittransfer Nb of open direct debit or credit transfer - * @return string Label of status + * @param int $recur Is it a recurring invoice ? + * @param int $status Id status (suspended or not) + * @param int<0,6> $mode 0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=short label + picto, 6=long label + picto + * @param int $alreadypaid Not used for recurring invoices + * @param int $type Type invoice + * @param int $nbofopendirectdebitorcredittransfer @unused-param Nb of open direct debit or credit transfer + * @return string Label of status */ public function LibStatut($recur, $status, $mode = 0, $alreadypaid = -1, $type = 0, $nbofopendirectdebitorcredittransfer = 0) { diff --git a/htdocs/webportal/class/webportalinvoice.class.php b/htdocs/webportal/class/webportalinvoice.class.php index d8760f38be3..c317c412541 100644 --- a/htdocs/webportal/class/webportalinvoice.class.php +++ b/htdocs/webportal/class/webportalinvoice.class.php @@ -331,14 +331,15 @@ class WebPortalInvoice extends Facture /** * Return label of a status * - * @param int $paye Status field paye - * @param int $status Id status - * @param int $mode 0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=short label + picto, 6=long label + picto - * @param int $alreadypaid 0=No payment already done, >0=Some payments were already done - * @param int $type Type invoice. If -1, we use $this->type - * @return string Label of status + * @param int $paye Status field paye + * @param int $status Id status + * @param int<0,6> $mode 0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=short label + picto, 6=long label + picto + * @param int $alreadypaid 0=No payment already done, >0=Some payments were already done + * @param int $type Type invoice. If -1, we use $this->type + * @param int $arg6 @unused-param Unused arg, keep function compatible with parent class + * @return string Label of status */ - public function LibStatut($paye, $status, $mode = 0, $alreadypaid = -1, $type = -1) + public function LibStatut($paye, $status, $mode = 0, $alreadypaid = -1, $type = -1, $arg6 = 0) { // phpcs:enable return $this->getInvoiceStatic()->LibStatut($paye, $status, $mode, $alreadypaid, $type);