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

Use english

Browse Source
This commit is contained in:
Laurent Destailleur 2020-09-02 18:57:56 +02:00
parent 2a4f0fc034
commit a984c8e969
1 changed files with 6 additions and 6 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

@ -2504,12 +2504,12 @@ class Propal extends CommonObject
* Close the commercial proposal * Close the commercial proposal
* *
* @param User $user Object user that close * @param User $user Object user that close
* @param int $statut Statut * @param int $status Status
* @param string $note Complete private note with this note * @param string $note Complete private note with this note
* @param int $notrigger 1=Does not execute triggers, 0=Execute triggers * @param int $notrigger 1=Does not execute triggers, 0=Execute triggers
* @return int <0 if KO, >0 if OK * @return int <0 if KO, >0 if OK
*/ */
public function cloture($user, $statut, $note = "", $notrigger = 0) public function cloture($user, $status, $note = "", $notrigger = 0)
{ {
global $langs, $conf; global $langs, $conf;
@ -2521,7 +2521,7 @@ class Propal extends CommonObject
$newprivatenote = dol_concatdesc($this->note_private, $note); $newprivatenote = dol_concatdesc($this->note_private, $note);
$sql = "UPDATE ".MAIN_DB_PREFIX."propal"; $sql = "UPDATE ".MAIN_DB_PREFIX."propal";
$sql .= " SET fk_statut = ".$statut.", note_private = '".$this->db->escape($newprivatenote)."', date_cloture='".$this->db->idate($now)."', fk_user_cloture=".$user->id; $sql .= " SET fk_statut = ".$status.", note_private = '".$this->db->escape($newprivatenote)."', date_cloture='".$this->db->idate($now)."', fk_user_cloture=".$user->id;
$sql .= " WHERE rowid = ".$this->id; $sql .= " WHERE rowid = ".$this->id;
$resql = $this->db->query($sql); $resql = $this->db->query($sql);
@ -2530,7 +2530,7 @@ class Propal extends CommonObject
$modelpdf = $conf->global->PROPALE_ADDON_PDF_ODT_CLOSED ? $conf->global->PROPALE_ADDON_PDF_ODT_CLOSED : $this->modelpdf; $modelpdf = $conf->global->PROPALE_ADDON_PDF_ODT_CLOSED ? $conf->global->PROPALE_ADDON_PDF_ODT_CLOSED : $this->modelpdf;
$triggerName = 'PROPAL_CLOSE_REFUSED'; $triggerName = 'PROPAL_CLOSE_REFUSED';
if ($statut == self::STATUS_SIGNED) if ($status == self::STATUS_SIGNED)
{ {
$triggerName = 'PROPAL_CLOSE_SIGNED'; $triggerName = 'PROPAL_CLOSE_SIGNED';
$modelpdf = $conf->global->PROPALE_ADDON_PDF_ODT_TOBILL ? $conf->global->PROPALE_ADDON_PDF_ODT_TOBILL : $this->modelpdf; $modelpdf = $conf->global->PROPALE_ADDON_PDF_ODT_TOBILL ? $conf->global->PROPALE_ADDON_PDF_ODT_TOBILL : $this->modelpdf;
@ -2547,7 +2547,7 @@ class Propal extends CommonObject
return -2; return -2;
} }
} }
if ($statut == self::STATUS_BILLED) // Why this ? if ($status == self::STATUS_BILLED) // Why this ?
{ {
$triggerName = 'PROPAL_CLASSIFY_BILLED'; $triggerName = 'PROPAL_CLASSIFY_BILLED';
} }
@ -2569,7 +2569,7 @@ class Propal extends CommonObject
if (!$error) if (!$error)
{ {
$this->oldcopy = clone $this; $this->oldcopy = clone $this;
$this->statut = $statut; $this->statut = $status;
$this->date_cloture = $now; $this->date_cloture = $now;
$this->note_private = $newprivatenote; $this->note_private = $newprivatenote;
} }