|
@@ -1298,8 +1298,8 @@ class ExpenseReport extends CommonObject
|
|
|
$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element;
|
|
|
$sql .= " SET ref = '".$this->db->escape($num)."',";
|
|
|
$sql .= " fk_statut = ".self::STATUS_VALIDATED.",";
|
|
|
- $sql .= " date_valid='".$this->db->idate($this->date_valid)."',";
|
|
|
- $sql .= " fk_user_valid = ".$user->id;
|
|
|
+ $sql .= " date_valid = '".$this->db->idate($this->date_valid)."',";
|
|
|
+ $sql .= " fk_user_valid = ".((int) $user->id);
|
|
|
$sql .= " WHERE rowid = ".((int) $this->id);
|
|
|
|
|
|
$resql = $this->db->query($sql);
|
|
@@ -1322,7 +1322,7 @@ class ExpenseReport extends CommonObject
|
|
|
|
|
|
// Now we rename also files into index
|
|
|
$sql = 'UPDATE '.MAIN_DB_PREFIX."ecm_files set filename = CONCAT('".$this->db->escape($this->newref)."', SUBSTR(filename, ".(strlen($this->ref) + 1).")), filepath = 'expensereport/".$this->db->escape($this->newref)."'";
|
|
|
- $sql .= " WHERE filename LIKE '".$this->db->escape($this->ref)."%' AND filepath = 'expensereport/".$this->db->escape($this->ref)."' and entity = ".$conf->entity;
|
|
|
+ $sql .= " WHERE filename LIKE '".$this->db->escape($this->ref)."%' AND filepath = 'expensereport/".$this->db->escape($this->ref)."' AND entity = ".((int) $this->entity);
|
|
|
$resql = $this->db->query($sql);
|
|
|
if (!$resql) {
|
|
|
$error++; $this->error = $this->db->lasterror();
|
|
@@ -1331,15 +1331,15 @@ class ExpenseReport extends CommonObject
|
|
|
// We rename directory ($this->ref = old ref, $num = new ref) in order not to lose the attachments
|
|
|
$oldref = dol_sanitizeFileName($this->ref);
|
|
|
$newref = dol_sanitizeFileName($num);
|
|
|
- $dirsource = $conf->expensereport->dir_output.'/'.$oldref;
|
|
|
- $dirdest = $conf->expensereport->dir_output.'/'.$newref;
|
|
|
+ $dirsource = $conf->expensereport->multidir_output[$this->entity].'/'.$oldref;
|
|
|
+ $dirdest = $conf->expensereport->multidir_output[$this->entity].'/'.$newref;
|
|
|
if (!$error && file_exists($dirsource)) {
|
|
|
dol_syslog(get_class($this)."::setValidate() rename dir ".$dirsource." into ".$dirdest);
|
|
|
|
|
|
if (@rename($dirsource, $dirdest)) {
|
|
|
dol_syslog("Rename ok");
|
|
|
// Rename docs starting with $oldref with $newref
|
|
|
- $listoffiles = dol_dir_list($conf->expensereport->dir_output.'/'.$newref, 'files', 1, '^'.preg_quote($oldref, '/'));
|
|
|
+ $listoffiles = dol_dir_list($dirdest, 'files', 1, '^'.preg_quote($oldref, '/'));
|
|
|
foreach ($listoffiles as $fileentry) {
|
|
|
$dirsource = $fileentry['name'];
|
|
|
$dirdest = preg_replace('/^'.preg_quote($oldref, '/').'/', $newref, $dirsource);
|