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

FIX actions on supplier proposal not saved (bad trigger name)

Browse Source 
Conflicts:
	htdocs/supplier_proposal/class/supplier_proposal.class.php
This commit is contained in:
Laurent Destailleur 2020-03-24 13:25:45 +01:00
parent a5379c7144
commit 1657a6b50a
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/supplier_proposal/card.php
View File

@ -1041,7 +1041,7 @@ if (empty($reshook))
if (!$error) if (!$error)
{ {
$result = $object->insertExtraFields('SUPPLIER_PROPOSAL_MODIFY'); $result = $object->insertExtraFields('PROPOSAL_SUPPLIER_MODIFY');
if ($result < 0) if ($result < 0)
{ {
setEventMessages($object->error, $object->errors, 'errors'); setEventMessages($object->error, $object->errors, 'errors');
@ -1433,7 +1433,7 @@ if ($action == 'create')
require_once DOL_DOCUMENT_ROOT.'/core/class/notify.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/class/notify.class.php';
$notify = new Notify($db); $notify = new Notify($db);
$text .= '<br>'; $text .= '<br>';
$text .= $notify->confirmMessage('SUPPLIER_PROPOSAL_VALIDATE', $object->socid, $object); $text .= $notify->confirmMessage('PROPOSAL_SUPPLIER_VALIDATE', $object->socid, $object);
} }
if (!$error) if (!$error)

18
htdocs/supplier_proposal/class/supplier_proposal.class.php
View File

@ -1481,7 +1481,7 @@ class SupplierProposal extends CommonObject
if (! $error && ! $notrigger) if (! $error && ! $notrigger)
{ {
// Call trigger // Call trigger
$result=$this->call_trigger('SUPPLIER_PROPOSAL_VALIDATE', $user); $result = $this->call_trigger('PROPOSAL_SUPPLIER_VALIDATE', $user);
if ($result < 0) { $error++; } if ($result < 0) { $error++; }
// End call triggers // End call triggers
} }
@ -1683,7 +1683,7 @@ class SupplierProposal extends CommonObject
if (! $notrigger) if (! $notrigger)
{ {
// Call trigger // Call trigger
$result=$this->call_trigger('SUPPLIER_PROPOSAL_REOPEN', $user); $result = $this->call_trigger('PROPOSAL_SUPPLIER_REOPEN', $user);
if ($result < 0) { $error++; } if ($result < 0) { $error++; }
// End call triggers // End call triggers
} }
@ -1736,13 +1736,13 @@ class SupplierProposal extends CommonObject
$resql=$this->db->query($sql); $resql=$this->db->query($sql);
if ($resql) if ($resql)
{ {
$modelpdf=$conf->global->SUPPLIER_PROPOSAL_ADDON_PDF_ODT_CLOSED?$conf->global->SUPPLIER_PROPOSAL_ADDON_PDF_ODT_CLOSED:$this->modelpdf; $modelpdf = $conf->global->SUPPLIER_PROPOSAL_ADDON_PDF_ODT_CLOSED ? $conf->global->SUPPLIER_PROPOSAL_ADDON_PDF_ODT_CLOSED : $this->modelpdf;
$triggerName = 'SUPPLIER_PROPOSAL_CLOSE_REFUSED'; $triggerName = 'PROPOSAL_SUPPLIER_CLOSE_REFUSED';
if ($status == 2) if ($status == 2)
{ {
$triggerName='SUPPLIER_PROPOSAL_CLOSE_SIGNED'; $triggerName = 'PROPOSAL_SUPPLIER_CLOSE_SIGNED';
$modelpdf=$conf->global->SUPPLIER_PROPOSAL_ADDON_PDF_ODT_TOBILL?$conf->global->SUPPLIER_PROPOSAL_ADDON_PDF_ODT_TOBILL:$this->modelpdf; $modelpdf = $conf->global->SUPPLIER_PROPOSAL_ADDON_PDF_ODT_TOBILL ? $conf->global->SUPPLIER_PROPOSAL_ADDON_PDF_ODT_TOBILL : $this->modelpdf;
if (! empty($conf->global->SUPPLIER_PROPOSAL_UPDATE_PRICE_ON_SUPPlIER_PROPOSAL)) // TODO This option was not tested correctly. Error if product ref does not exists if (! empty($conf->global->SUPPLIER_PROPOSAL_UPDATE_PRICE_ON_SUPPlIER_PROPOSAL)) // TODO This option was not tested correctly. Error if product ref does not exists
{ {
@ -1751,7 +1751,7 @@ class SupplierProposal extends CommonObject
} }
if ($status == 4) if ($status == 4)
{ {
$triggerName='SUPPLIER_PROPOSAL_CLASSIFY_BILLED'; $triggerName = 'PROPOSAL_SUPPLIER_CLASSIFY_BILLED';
} }
if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE))
@ -1916,7 +1916,7 @@ class SupplierProposal extends CommonObject
if (!$error) { if (!$error) {
// Call trigger // Call trigger
$result=$this->call_trigger('SUPPLIER_PROPOSAL_UNVALIDATE', $user); $result = $this->call_trigger('PROPOSAL_SUPPLIER_UNVALIDATE', $user);
if ($result < 0) $error++; if ($result < 0) $error++;
} }
@ -2034,7 +2034,7 @@ class SupplierProposal extends CommonObject
if (! $notrigger) if (! $notrigger)
{ {
// Call trigger // Call trigger
$result=$this->call_trigger('SUPPLIER_PROPOSAL_DELETE', $user); $result = $this->call_trigger('PROPOSAL_SUPPLIER_DELETE', $user);
if ($result < 0) { $error++; } if ($result < 0) { $error++; }
// End call triggers // End call triggers
} }