|
@@ -102,7 +102,7 @@ class PaymentTerm // extends CommonObject
|
|
|
$sql.= "decalage";
|
|
|
$sql.= ") VALUES (";
|
|
|
$sql.= " ".(! isset($this->rowid)?'NULL':"'".$this->db->escape($this->rowid)."'").",";
|
|
|
- $sql.= " ".(! isset($this->entity)?getEntity('c_payment_term'):"'".$this->db->escape($this->entity)."'").",";
|
|
|
+ $sql.= " ".(! isset($this->entity)?$conf->entity:"'".$this->db->escape($this->entity)."'").",";
|
|
|
$sql.= " ".(! isset($this->code)?'NULL':"'".$this->db->escape($this->code)."'").",";
|
|
|
$sql.= " ".(! isset($this->sortorder)?'NULL':"'".$this->db->escape($this->sortorder)."'").",";
|
|
|
$sql.= " ".(! isset($this->active)?'NULL':"'".$this->db->escape($this->active)."'").",";
|
|
@@ -181,7 +181,6 @@ class PaymentTerm // extends CommonObject
|
|
|
|
|
|
$sql.= " FROM ".MAIN_DB_PREFIX."c_payment_term as t";
|
|
|
$sql.= " WHERE t.rowid = ".$id;
|
|
|
- $sql.= " AND t.entity = " . getEntity('c_payment_term');
|
|
|
|
|
|
dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
|
|
|
$resql=$this->db->query($sql);
|
|
@@ -221,36 +220,36 @@ class PaymentTerm // extends CommonObject
|
|
|
*
|
|
|
* @return int <0 if KO, >0 if OK
|
|
|
*/
|
|
|
- function getDefaultId()
|
|
|
- {
|
|
|
- global $langs;
|
|
|
+ function getDefaultId()
|
|
|
+ {
|
|
|
+ global $conf, $langs;
|
|
|
|
|
|
- $ret=0;
|
|
|
+ $ret=0;
|
|
|
|
|
|
- $sql = "SELECT";
|
|
|
+ $sql = "SELECT";
|
|
|
$sql.= " t.rowid";
|
|
|
- $sql.= " FROM ".MAIN_DB_PREFIX."c_payment_term as t";
|
|
|
- $sql.= " WHERE t.code = 'RECEP'";
|
|
|
- $sql.= " AND t.entity = " . getEntity('c_payment_term');
|
|
|
+ $sql.= " FROM ".MAIN_DB_PREFIX."c_payment_term as t";
|
|
|
+ $sql.= " WHERE t.code = 'RECEP'";
|
|
|
+ $sql.= " AND t.entity = " . $conf->entity;
|
|
|
|
|
|
- dol_syslog(get_class($this)."::getDefaultId", LOG_DEBUG);
|
|
|
- $resql=$this->db->query($sql);
|
|
|
- if ($resql)
|
|
|
- {
|
|
|
- if ($this->db->num_rows($resql))
|
|
|
- {
|
|
|
- $obj = $this->db->fetch_object($resql);
|
|
|
- if ($obj) $ret=$obj->rowid;
|
|
|
- }
|
|
|
- $this->db->free($resql);
|
|
|
- return $ret;
|
|
|
- }
|
|
|
- else
|
|
|
- {
|
|
|
- $this->error="Error ".$this->db->lasterror();
|
|
|
- return -1;
|
|
|
- }
|
|
|
- }
|
|
|
+ dol_syslog(get_class($this)."::getDefaultId", LOG_DEBUG);
|
|
|
+ $resql=$this->db->query($sql);
|
|
|
+ if ($resql)
|
|
|
+ {
|
|
|
+ if ($this->db->num_rows($resql))
|
|
|
+ {
|
|
|
+ $obj = $this->db->fetch_object($resql);
|
|
|
+ if ($obj) $ret=$obj->rowid;
|
|
|
+ }
|
|
|
+ $this->db->free($resql);
|
|
|
+ return $ret;
|
|
|
+ }
|
|
|
+ else
|
|
|
+ {
|
|
|
+ $this->error="Error ".$this->db->lasterror();
|
|
|
+ return -1;
|
|
|
+ }
|
|
|
+ }
|
|
|
|
|
|
|
|
|
/**
|
|
@@ -293,7 +292,6 @@ class PaymentTerm // extends CommonObject
|
|
|
$sql.= " nbjour=".(isset($this->nbjour)?$this->nbjour:"null").",";
|
|
|
$sql.= " decalage=".(isset($this->decalage)?$this->decalage:"null")."";
|
|
|
$sql.= " WHERE rowid = " . $this->id;
|
|
|
- $sql.= " AND entity = " . getEntity('c_payment_term');
|
|
|
|
|
|
$this->db->begin();
|
|
|
|
|
@@ -350,7 +348,6 @@ class PaymentTerm // extends CommonObject
|
|
|
|
|
|
$sql = "DELETE FROM ".MAIN_DB_PREFIX."c_payment_term";
|
|
|
$sql.= " WHERE rowid = " . $this->id;
|
|
|
- $sql.= " AND t.entity = " . getEntity('c_payment_term');
|
|
|
|
|
|
$this->db->begin();
|
|
|
|