2
0
forked from Wavyzz/dolibarr

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

This commit is contained in:
Laurent Destailleur
2024-11-21 19:34:59 +01:00
12 changed files with 46 additions and 15 deletions

View File

@@ -947,6 +947,7 @@ class Commande extends CommonOrder
$this->fk_multicurrency = 0;
$this->multicurrency_tx = 1;
}
$this->entity = setEntity($this);
dol_syslog(get_class($this)."::create user=".$user->id);
@@ -1010,7 +1011,7 @@ class Commande extends CommonOrder
$sql .= ", ".(!empty($this->warehouse_id) && $this->warehouse_id > 0 ? ((int) $this->warehouse_id) : 'NULL');
$sql .= ", ".(int) $this->fk_incoterms;
$sql .= ", '".$this->db->escape($this->location_incoterms)."'";
$sql .= ", ".setEntity($this);
$sql .= ", ".(int) $this->entity;
$sql .= ", ".($this->module_source ? "'".$this->db->escape($this->module_source)."'" : "null");
$sql .= ", ".($this->pos_source != '' ? "'".$this->db->escape($this->pos_source)."'" : "null");
$sql .= ", ".(int) $this->fk_multicurrency;