From 77e57edb7326587b871d8718c2c0c2d4e88cb342 Mon Sep 17 00:00:00 2001 From: sparkyx Date: Wed, 25 Mar 2026 18:46:50 +0100 Subject: [PATCH] Fix bug followup: HTML code instead of accentuated letters --- include/class/document.class.php | 8 ++++---- include/class/follow_up_detail.class.php | 6 +++++- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/include/class/document.class.php b/include/class/document.class.php index 240bda017..c8ec91963 100644 --- a/include/class/document.class.php +++ b/include/class/document.class.php @@ -20,11 +20,11 @@ // Copyright Author Dany De Bontridder danydb@aevalys.eu /*! - * \file + * \file document.class.php * \brief Class Document corresponds to the table document */ /*! - * \class + * \class Document * \brief * Class Document corresponds to the table DOCUMENT */ @@ -1485,7 +1485,7 @@ class Document ." from action_gestion_comment " ."where ag_id=$1 order by AGC_ID asc limit 1" , [$p_array['ag_id']]); - return $description; + return html_entity_decode($description); } if ( isset($p_array['e_comm'])) {return $p_array['e_comm'] ; } @@ -1517,7 +1517,7 @@ class Document $aComment[$counter_comment]['tech_user'], $aComment[$counter_comment]['agc_comment']); $counter_comment++; } - return $description; + return html_entity_decode($description); } return ""; break; diff --git a/include/class/follow_up_detail.class.php b/include/class/follow_up_detail.class.php index 888a030b3..f27d3a23a 100644 --- a/include/class/follow_up_detail.class.php +++ b/include/class/follow_up_detail.class.php @@ -85,6 +85,8 @@ class Follow_Up_Detail } public function verify() { + $vat= Acc_Tva::build($this->db, $this->ad_tva_id); + $this->ad_tva_id=($vat->tva_id==-1)?0:$vat->tva_id; // Verify that the elt we want to add is correct return 0; } @@ -235,7 +237,9 @@ class Follow_Up_Detail if (trim($this->ad_quant)=="" || isNumber($this->ad_quant)==0) $this->ad_quant=0; if (trim($this->ad_tva_amount)==""||isNumber($this->ad_tva_amount)==0) $this->ad_tva_amount=0; if (trim($this->ad_total_amount)==""||isNumber($this->ad_total_amount)==0) $this->ad_total_amount=0; - if (trim($this->ad_tva_id)=="" || isNumber($this->ad_tva_id)==0) $this->ad_tva_id=0; + if (trim($this->ad_tva_id)=="" ) $this->ad_tva_id=0; + $vat= Acc_Tva::build($this->db, $this->ad_tva_id); + $this->ad_tva_id=($vat->tva_id==-1)?0:$vat->tva_id; } public static function display(Follow_Up $p_follow_up,$p_view)