mirror of
https://github.com/Dolibarr/dolibarr.git
synced 2026-02-08 00:52:01 +01:00
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
This commit is contained in:
@@ -398,7 +398,7 @@ class FactureRec extends CommonInvoice
|
||||
$sql .= ", '".$this->db->escape($facsrc->multicurrency_code)."'";
|
||||
$sql .= ", ".((float) $facsrc->multicurrency_tx);
|
||||
$sql .= ", ".((int) $this->suspended);
|
||||
$sql .= ", ".((int) $this->fk_societe_rib);
|
||||
$sql .= ", ".(!empty($this->fk_societe_rib) ? ((int) $this->fk_societe_rib) : 'NULL');
|
||||
$sql .= ")";
|
||||
|
||||
if ($this->db->query($sql)) {
|
||||
@@ -571,7 +571,7 @@ 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 = ".((int) $this->fk_societe_rib);
|
||||
$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);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user