lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote branch 'upstream/develop' into develop

Browse Source
This commit is contained in:
frederic34 2014-06-13 17:04:14 +02:00
commit 0cd4218986
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
htdocs/comm/propal/class/propal.class.php
View File

@ -1349,10 +1349,10 @@ class Propal extends CommonObject
{ {
// Rename of propal directory ($this->ref = old ref, $num = new ref) // Rename of propal directory ($this->ref = old ref, $num = new ref)
// to not lose the linked files // to not lose the linked files
$facref = dol_sanitizeFileName($this->ref); $oldref = dol_sanitizeFileName($this->ref);
$snumfa = dol_sanitizeFileName($num); $newref = dol_sanitizeFileName($num);
$dirsource = $conf->propal->dir_output.'/'.$facref; $dirsource = $conf->propal->dir_output.'/'.$oldref;
$dirdest = $conf->propal->dir_output.'/'.$snumfa; $dirdest = $conf->propal->dir_output.'/'.$newref;
if (file_exists($dirsource)) if (file_exists($dirsource))
{ {
dol_syslog(get_class($this)."::validate rename dir ".$dirsource." into ".$dirdest); dol_syslog(get_class($this)."::validate rename dir ".$dirsource." into ".$dirdest);
@ -1362,15 +1362,17 @@ class Propal extends CommonObject
dol_syslog("Rename ok"); dol_syslog("Rename ok");
// Deleting old PDF in new rep // Deleting old PDF in new rep
dol_delete_file($conf->propal->dir_output.'/'.$snumfa.'/'.$facref.'*.*'); dol_delete_file($conf->propal->dir_output.'/'.$newref.'/'.$oldref.'*.*');
} }
} }
} }
$this->ref=$num;
$this->brouillon=0; $this->brouillon=0;
$this->statut = 1; $this->statut = 1;
$this->user_valid_id=$user->id; $this->user_valid_id=$user->id;
$this->datev=$now; $this->datev=$now;
$this->db->commit(); $this->db->commit();
return 1; return 1;
} }