Fix bug followup: HTML code instead of accentuated letters
This commit is contained in:
parent
d5e76d4975
commit
77e57edb73
2 changed files with 9 additions and 5 deletions
|
|
@ -20,11 +20,11 @@
|
||||||
// Copyright Author Dany De Bontridder danydb@aevalys.eu
|
// Copyright Author Dany De Bontridder danydb@aevalys.eu
|
||||||
|
|
||||||
/*!
|
/*!
|
||||||
* \file
|
* \file document.class.php
|
||||||
* \brief Class Document corresponds to the table document
|
* \brief Class Document corresponds to the table document
|
||||||
*/
|
*/
|
||||||
/*!
|
/*!
|
||||||
* \class
|
* \class Document
|
||||||
* \brief
|
* \brief
|
||||||
* Class Document corresponds to the table DOCUMENT
|
* Class Document corresponds to the table DOCUMENT
|
||||||
*/
|
*/
|
||||||
|
|
@ -1485,7 +1485,7 @@ class Document
|
||||||
." from action_gestion_comment "
|
." from action_gestion_comment "
|
||||||
."where ag_id=$1 order by AGC_ID asc limit 1"
|
."where ag_id=$1 order by AGC_ID asc limit 1"
|
||||||
, [$p_array['ag_id']]);
|
, [$p_array['ag_id']]);
|
||||||
return $description;
|
return html_entity_decode($description);
|
||||||
}
|
}
|
||||||
if ( isset($p_array['e_comm'])) {return $p_array['e_comm'] ; }
|
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']);
|
$aComment[$counter_comment]['tech_user'], $aComment[$counter_comment]['agc_comment']);
|
||||||
$counter_comment++;
|
$counter_comment++;
|
||||||
}
|
}
|
||||||
return $description;
|
return html_entity_decode($description);
|
||||||
}
|
}
|
||||||
return "";
|
return "";
|
||||||
break;
|
break;
|
||||||
|
|
|
||||||
|
|
@ -85,6 +85,8 @@ class Follow_Up_Detail
|
||||||
}
|
}
|
||||||
public function verify()
|
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
|
// Verify that the elt we want to add is correct
|
||||||
return 0;
|
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_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_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_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)
|
public static function display(Follow_Up $p_follow_up,$p_view)
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue