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

FIX properties on proposal must not be modified if error

Browse Source
This commit is contained in:
Laurent Destailleur 2018-10-08 18:15:46 +02:00
parent c930218dd2
commit 91038af84d
1 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2420,16 +2420,16 @@ class Propal extends CommonObject
if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE))
{ {
// Define output language // Define output language
$outputlangs = $langs; $outputlangs = $langs;
if (! empty($conf->global->MAIN_MULTILANGS)) if (! empty($conf->global->MAIN_MULTILANGS))
{ {
$outputlangs = new Translate("",$conf); $outputlangs = new Translate("",$conf);
$newlang=(GETPOST('lang_id','aZ09') ? GETPOST('lang_id','aZ09') : $this->thirdparty->default_lang); $newlang=(GETPOST('lang_id','aZ09') ? GETPOST('lang_id','aZ09') : $this->thirdparty->default_lang);
$outputlangs->setDefaultLang($newlang); $outputlangs->setDefaultLang($newlang);
} }
//$ret=$object->fetch($id); // Reload to get new records //$ret=$object->fetch($id); // Reload to get new records
$this->generateDocument($modelpdf, $outputlangs); $this->generateDocument($modelpdf, $outputlangs);
} }
if (! $error) if (! $error)
@ -2437,7 +2437,7 @@ class Propal extends CommonObject
$this->oldcopy= clone $this; $this->oldcopy= clone $this;
$this->statut = $statut; $this->statut = $statut;
$this->date_cloture = $now; $this->date_cloture = $now;
$this->note_private = $note; $this->note_private = $newprivatenote;
} }
if (! $notrigger && empty($error)) if (! $notrigger && empty($error))
@ -2448,13 +2448,17 @@ class Propal extends CommonObject
// End call triggers // End call triggers
} }
if ( ! $error ) if (! $error)
{ {
$this->db->commit(); $this->db->commit();
return 1; return 1;
} }
else else
{ {
$this->statut = $this->oldcopy->statut;
$this->date_cloture = $this->oldcopy->date_cloture;
$this->note_private = $this->oldcopy->note_private;
$this->db->rollback(); $this->db->rollback();
return -1; return -1;
} }