Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
This commit is contained in:
commit
0d66646052
@ -2269,7 +2269,10 @@ abstract class CommonObject
|
|||||||
*/
|
*/
|
||||||
public function setPaymentMethods($id)
|
public function setPaymentMethods($id)
|
||||||
{
|
{
|
||||||
|
$error = 0; $notrigger = 0;
|
||||||
|
|
||||||
dol_syslog(get_class($this).'::setPaymentMethods('.$id.')');
|
dol_syslog(get_class($this).'::setPaymentMethods('.$id.')');
|
||||||
|
|
||||||
if ($this->statut >= 0 || $this->element == 'societe') {
|
if ($this->statut >= 0 || $this->element == 'societe') {
|
||||||
// TODO uniformize field name
|
// TODO uniformize field name
|
||||||
$fieldname = 'fk_mode_reglement';
|
$fieldname = 'fk_mode_reglement';
|
||||||
@ -2296,6 +2299,15 @@ abstract class CommonObject
|
|||||||
if (get_class($this) == 'Fournisseur') {
|
if (get_class($this) == 'Fournisseur') {
|
||||||
$this->mode_reglement_supplier_id = $id;
|
$this->mode_reglement_supplier_id = $id;
|
||||||
}
|
}
|
||||||
|
// Triggers
|
||||||
|
if (!$error && !$notrigger) {
|
||||||
|
// Call triggers
|
||||||
|
$result = $this->call_trigger(strtoupper(get_class($this)).'_MODIFY', $user);
|
||||||
|
if ($result < 0) {
|
||||||
|
$error++;
|
||||||
|
}
|
||||||
|
// End call triggers
|
||||||
|
}
|
||||||
return 1;
|
return 1;
|
||||||
} else {
|
} else {
|
||||||
dol_syslog(get_class($this).'::setPaymentMethods Error '.$this->db->error());
|
dol_syslog(get_class($this).'::setPaymentMethods Error '.$this->db->error());
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user