Merge pull request #10264 from hregis/7.0_price

FIX avoid Class 'AdherentType' not found
This commit is contained in:
Laurent Destailleur 2018-12-22 18:16:40 +01:00 committed by GitHub
commit b76c45e8d0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -436,9 +436,10 @@ class InterfaceLdapsynchro extends DolibarrTriggers
// For member type // For member type
if (! empty($conf->global->LDAP_MEMBER_TYPE_ACTIVE) && (string) $conf->global->LDAP_MEMBER_TYPE_ACTIVE == '1') if (! empty($conf->global->LDAP_MEMBER_TYPE_ACTIVE) && (string) $conf->global->LDAP_MEMBER_TYPE_ACTIVE == '1')
{ {
$membertype=new AdherentType($this->db);
if ($object->typeid > 0) if ($object->typeid > 0)
{ {
require_once DOL_DOCUMENT_ROOT."/adherents/class/adherent_type.class.php";
$membertype=new AdherentType($this->db);
$membertype->fetch($object->typeid); $membertype->fetch($object->typeid);
$membertype->listMembersForMemberType(); $membertype->listMembersForMemberType();
@ -555,6 +556,8 @@ class InterfaceLdapsynchro extends DolibarrTriggers
// For member type // For member type
if (! empty($conf->global->LDAP_MEMBER_TYPE_ACTIVE) && (string) $conf->global->LDAP_MEMBER_TYPE_ACTIVE == '1') if (! empty($conf->global->LDAP_MEMBER_TYPE_ACTIVE) && (string) $conf->global->LDAP_MEMBER_TYPE_ACTIVE == '1')
{ {
require_once DOL_DOCUMENT_ROOT."/adherents/class/adherent_type.class.php";
/* /*
* Change member info * Change member info
*/ */
@ -679,6 +682,8 @@ class InterfaceLdapsynchro extends DolibarrTriggers
{ {
if ($object->typeid > 0) if ($object->typeid > 0)
{ {
require_once DOL_DOCUMENT_ROOT."/adherents/class/adherent_type.class.php";
/* /*
* Remove member in member type * Remove member in member type
*/ */