From 7ad71279a7c1455e5dfcfce27b7d2ca3be205a71 Mon Sep 17 00:00:00 2001 From: ldestailleur Date: Wed, 11 Jun 2025 17:33:07 +0200 Subject: [PATCH] Fix CI --- htdocs/commande/list.php | 2 ++ htdocs/compta/facture/class/facture.class.php | 6 +++--- htdocs/core/class/commoninvoice.class.php | 6 +++--- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/htdocs/commande/list.php b/htdocs/commande/list.php index c8ef6f19c47..f2653e457aa 100644 --- a/htdocs/commande/list.php +++ b/htdocs/commande/list.php @@ -2240,6 +2240,8 @@ while ($i < $imaxinloop) { break; // Should not happen } + $typenArray = $formcompany->typent_array(1); + $notshippable = 0; $warning = 0; $text_info = ''; diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php index df1f66636a1..1e603ce7fcb 100644 --- a/htdocs/compta/facture/class/facture.class.php +++ b/htdocs/compta/facture/class/facture.class.php @@ -2744,11 +2744,11 @@ class Facture extends CommonInvoice $sql .= " paye=".(isset($this->paye) ? $this->db->escape((string) $this->paye) : 0).","; $sql .= " close_code=".(isset($this->close_code) ? "'".$this->db->escape($this->close_code)."'" : "null").","; $sql .= " close_note=".(isset($this->close_note) ? "'".$this->db->escape($this->close_note)."'" : "null").","; - $sql .= " total_tva=".(isset($this->total_tva) ? (float) $this->total_tva : "null").","; + $sql .= " total_tva=".((float) $this->total_tva).","; $sql .= " localtax1=".(isset($this->total_localtax1) ? (float) $this->total_localtax1 : "null").","; $sql .= " localtax2=".(isset($this->total_localtax2) ? (float) $this->total_localtax2 : "null").","; - $sql .= " total_ht=".(isset($this->total_ht) ? (float) $this->total_ht : "null").","; - $sql .= " total_ttc=".(isset($this->total_ttc) ? (float) $this->total_ttc : "null").","; + $sql .= " total_ht=".((float) $this->total_ht).","; + $sql .= " total_ttc=".((float) $this->total_ttc).","; $sql .= " revenuestamp=".((isset($this->revenuestamp) && $this->revenuestamp != '') ? (float) $this->revenuestamp : "null").","; $sql .= " fk_statut=".(isset($this->status) ? (int) $this->status : "null").","; $sql .= " fk_user_author=".(isset($this->user_creation_id) ? ((int) $this->user_creation_id) : "null").","; diff --git a/htdocs/core/class/commoninvoice.class.php b/htdocs/core/class/commoninvoice.class.php index 8355f1c2f29..006584699f5 100644 --- a/htdocs/core/class/commoninvoice.class.php +++ b/htdocs/core/class/commoninvoice.class.php @@ -120,11 +120,11 @@ abstract class CommonInvoice extends CommonObject */ public $total_tva; /** - * @var float + * @var float|null */ public $total_localtax1; /** - * @var float + * @var float|null */ public $total_localtax2; /** @@ -132,7 +132,7 @@ abstract class CommonInvoice extends CommonObject */ public $total_ttc; /** - * @var float + * @var float|null */ public $revenuestamp;