Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into

develop

Conflicts:
	htdocs/compta/facture/class/facture.class.php
This commit is contained in:
Laurent Destailleur 2020-09-09 12:51:55 +02:00
commit d236e21639
69 changed files with 17747 additions and 17747 deletions

View File

@ -5157,7 +5157,7 @@ class FactureLigne extends CommonInvoiceLine
$this->db->begin(); $this->db->begin();
// Mise a jour ligne en base // Update line in database
$sql = "UPDATE ".MAIN_DB_PREFIX."facturedet SET"; $sql = "UPDATE ".MAIN_DB_PREFIX."facturedet SET";
$sql .= " description='".$this->db->escape($this->desc)."'"; $sql .= " description='".$this->db->escape($this->desc)."'";
$sql .= ", ref_ext='".$this->db->escape($this->ref_ext)."'"; $sql .= ", ref_ext='".$this->db->escape($this->ref_ext)."'";