mirror of
https://github.com/Dolibarr/dolibarr.git
synced 2026-02-11 10:22:37 +01:00
Fix CI
This commit is contained in:
@@ -663,7 +663,7 @@ class RemiseCheque extends CommonObject
|
||||
// output format that does not support UTF8.
|
||||
$sav_charset_output = $outputlangs->charset_output;
|
||||
|
||||
$result = $docmodel->write_file($this, $conf->bank->dir_output.'/checkdeposits', $this->ref, $outputlangs);
|
||||
$result = $docmodel->write_file($this, $outputlangs, $conf->bank->dir_output.'/checkdeposits', $this->ref);
|
||||
if ($result > 0) {
|
||||
//$outputlangs->charset_output=$sav_charset_output;
|
||||
return 1;
|
||||
|
||||
@@ -310,7 +310,7 @@ class InterfaceLdapsynchro extends DolibarrTriggers
|
||||
/** @var UserGroup $object */
|
||||
dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
|
||||
if (getDolGlobalString('LDAP_SYNCHRO_ACTIVE') && getDolGlobalInt('LDAP_SYNCHRO_ACTIVE') === Ldap::SYNCHRO_DOLIBARR_TO_LDAP) {
|
||||
if ($object->member === null && getDolGlobalString('LDAP_SEND_EMPTY_MEMBERS_TO_GROUP')) {
|
||||
if ($object->members === null && getDolGlobalString('LDAP_SEND_EMPTY_MEMBERS_TO_GROUP')) {
|
||||
// LDAP requires that we always send members so we load them to avoid emptying group
|
||||
$object->members = $object->listUsersForGroup('', 0);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user