From 7d88487c80a78919190eaef2aafcdfdd9e9674e5 Mon Sep 17 00:00:00 2001 From: Philippe Grand Date: Sun, 25 Apr 2010 10:50:09 +0000 Subject: [PATCH] according to new tree directory --- htdocs/adherents/card_subscriptions.php | 8 ++++---- htdocs/adherents/cartes/carte.php | 2 +- htdocs/adherents/cartes/etiquette.php | 2 +- htdocs/adherents/{ => class}/adherent.class.php | 2 +- htdocs/adherents/{ => class}/adherent_options.class.php | 0 htdocs/adherents/{ => class}/adherent_type.class.php | 0 htdocs/adherents/{ => class}/cotisation.class.php | 2 +- htdocs/adherents/cotisations.php | 4 ++-- htdocs/adherents/fiche.php | 8 ++++---- htdocs/adherents/fiche_subscription.php | 4 ++-- htdocs/adherents/index.php | 4 ++-- htdocs/adherents/info.php | 2 +- htdocs/adherents/info_subscription.php | 4 ++-- htdocs/adherents/ldap.php | 4 ++-- htdocs/adherents/liste.php | 4 ++-- htdocs/adherents/note.php | 2 +- htdocs/adherents/options.php | 2 +- htdocs/adherents/type.php | 4 ++-- htdocs/admin/ldap_members.php | 4 ++-- htdocs/categories/categorie.php | 8 ++++---- htdocs/categories/viewcat.php | 2 +- htdocs/compta/bank/account.php | 2 +- htdocs/compta/bank/rappro.php | 2 +- htdocs/index.php | 4 ++-- htdocs/public/members/new.php | 6 +++--- htdocs/public/members/public_card.php | 6 +++--- htdocs/public/paybox/newpayment.php | 4 ++-- htdocs/soc.php | 2 +- htdocs/user/fiche.php | 2 +- htdocs/user/user.class.php | 4 ++-- scripts/members/sync_members_dolibarr2ldap.php | 2 +- scripts/members/sync_members_ldap2dolibarr.php | 4 ++-- 32 files changed, 55 insertions(+), 55 deletions(-) rename htdocs/adherents/{ => class}/adherent.class.php (99%) rename htdocs/adherents/{ => class}/adherent_options.class.php (100%) rename htdocs/adherents/{ => class}/adherent_type.class.php (100%) rename htdocs/adherents/{ => class}/cotisation.class.php (99%) diff --git a/htdocs/adherents/card_subscriptions.php b/htdocs/adherents/card_subscriptions.php index 7d4979c5fa8..eda2bdc500c 100644 --- a/htdocs/adherents/card_subscriptions.php +++ b/htdocs/adherents/card_subscriptions.php @@ -27,10 +27,10 @@ require("../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/lib/member.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/adherents/adherent.class.php"); -require_once(DOL_DOCUMENT_ROOT."/adherents/adherent_type.class.php"); -require_once(DOL_DOCUMENT_ROOT."/adherents/adherent_options.class.php"); -require_once(DOL_DOCUMENT_ROOT."/adherents/cotisation.class.php"); +require_once(DOL_DOCUMENT_ROOT."/adherents/class/adherent.class.php"); +require_once(DOL_DOCUMENT_ROOT."/adherents/class/adherent_type.class.php"); +require_once(DOL_DOCUMENT_ROOT."/adherents/class/adherent_options.class.php"); +require_once(DOL_DOCUMENT_ROOT."/adherents/class/cotisation.class.php"); require_once(DOL_DOCUMENT_ROOT."/compta/bank/account.class.php"); $langs->load("companies"); diff --git a/htdocs/adherents/cartes/carte.php b/htdocs/adherents/cartes/carte.php index 164c6ad44ff..b4130b781d6 100755 --- a/htdocs/adherents/cartes/carte.php +++ b/htdocs/adherents/cartes/carte.php @@ -26,7 +26,7 @@ */ require("../../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/adherents/adherent.class.php"); +require_once(DOL_DOCUMENT_ROOT."/adherents/class/adherent.class.php"); require_once(DOL_DOCUMENT_ROOT."/includes/modules/member/cards/modules_cards.php"); diff --git a/htdocs/adherents/cartes/etiquette.php b/htdocs/adherents/cartes/etiquette.php index a1d5f3cf18a..4c154af0cb9 100755 --- a/htdocs/adherents/cartes/etiquette.php +++ b/htdocs/adherents/cartes/etiquette.php @@ -27,7 +27,7 @@ require("../../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/adherents/adherent.class.php"); +require_once(DOL_DOCUMENT_ROOT."/adherents/class/adherent.class.php"); require_once(DOL_DOCUMENT_ROOT.'/includes/modules/member/PDF_card.class.php'); diff --git a/htdocs/adherents/adherent.class.php b/htdocs/adherents/class/adherent.class.php similarity index 99% rename from htdocs/adherents/adherent.class.php rename to htdocs/adherents/class/adherent.class.php index 04c3a9a2bee..c7a9494cb7a 100644 --- a/htdocs/adherents/adherent.class.php +++ b/htdocs/adherents/class/adherent.class.php @@ -29,7 +29,7 @@ */ require_once(DOL_DOCUMENT_ROOT."/core/commonobject.class.php"); -require_once(DOL_DOCUMENT_ROOT."/adherents/cotisation.class.php"); +require_once(DOL_DOCUMENT_ROOT."/adherents/class/cotisation.class.php"); require_once(DOL_DOCUMENT_ROOT."/lib/functions2.lib.php"); diff --git a/htdocs/adherents/adherent_options.class.php b/htdocs/adherents/class/adherent_options.class.php similarity index 100% rename from htdocs/adherents/adherent_options.class.php rename to htdocs/adherents/class/adherent_options.class.php diff --git a/htdocs/adherents/adherent_type.class.php b/htdocs/adherents/class/adherent_type.class.php similarity index 100% rename from htdocs/adherents/adherent_type.class.php rename to htdocs/adherents/class/adherent_type.class.php diff --git a/htdocs/adherents/cotisation.class.php b/htdocs/adherents/class/cotisation.class.php similarity index 99% rename from htdocs/adherents/cotisation.class.php rename to htdocs/adherents/class/cotisation.class.php index 86f5d3b44b1..656ee2aa335 100644 --- a/htdocs/adherents/cotisation.class.php +++ b/htdocs/adherents/class/cotisation.class.php @@ -209,7 +209,7 @@ class Cotisation extends CommonObject $num=$this->db->affected_rows($resql); if ($num) { - require_once(DOL_DOCUMENT_ROOT."/adherents/adherent.class.php"); + require_once(DOL_DOCUMENT_ROOT."/adherents/class/adherent.class.php"); $member=new Adherent($this->db); $result=$member->fetch($this->fk_adherent); $result=$member->update_end_date($user); diff --git a/htdocs/adherents/cotisations.php b/htdocs/adherents/cotisations.php index 82695d5f97f..2dbc4ebaed8 100644 --- a/htdocs/adherents/cotisations.php +++ b/htdocs/adherents/cotisations.php @@ -26,8 +26,8 @@ */ require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/adherents/adherent.class.php"); -require_once(DOL_DOCUMENT_ROOT."/adherents/cotisation.class.php"); +require_once(DOL_DOCUMENT_ROOT."/adherents/class/adherent.class.php"); +require_once(DOL_DOCUMENT_ROOT."/adherents/class/cotisation.class.php"); require_once(DOL_DOCUMENT_ROOT."/compta/bank/account.class.php"); $langs->load("members"); diff --git a/htdocs/adherents/fiche.php b/htdocs/adherents/fiche.php index be17ae45074..e0b623dbf48 100644 --- a/htdocs/adherents/fiche.php +++ b/htdocs/adherents/fiche.php @@ -30,10 +30,10 @@ require_once(DOL_DOCUMENT_ROOT."/lib/member.lib.php"); require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php"); require_once(DOL_DOCUMENT_ROOT."/lib/images.lib.php"); require_once(DOL_DOCUMENT_ROOT."/lib/functions2.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/adherents/adherent.class.php"); -require_once(DOL_DOCUMENT_ROOT."/adherents/adherent_type.class.php"); -require_once(DOL_DOCUMENT_ROOT."/adherents/adherent_options.class.php"); -require_once(DOL_DOCUMENT_ROOT."/adherents/cotisation.class.php"); +require_once(DOL_DOCUMENT_ROOT."/adherents/class/adherent.class.php"); +require_once(DOL_DOCUMENT_ROOT."/adherents/class/adherent_type.class.php"); +require_once(DOL_DOCUMENT_ROOT."/adherents/class/adherent_options.class.php"); +require_once(DOL_DOCUMENT_ROOT."/adherents/class/cotisation.class.php"); require_once(DOL_DOCUMENT_ROOT."/compta/bank/account.class.php"); require_once(DOL_DOCUMENT_ROOT."/html.formcompany.class.php"); diff --git a/htdocs/adherents/fiche_subscription.php b/htdocs/adherents/fiche_subscription.php index dbe377ec4a6..b16c9570c19 100644 --- a/htdocs/adherents/fiche_subscription.php +++ b/htdocs/adherents/fiche_subscription.php @@ -25,8 +25,8 @@ require("../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/lib/member.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/adherents/adherent.class.php"); -require_once(DOL_DOCUMENT_ROOT."/adherents/cotisation.class.php"); +require_once(DOL_DOCUMENT_ROOT."/adherents/class/adherent.class.php"); +require_once(DOL_DOCUMENT_ROOT."/adherents/class/cotisation.class.php"); require_once(DOL_DOCUMENT_ROOT."/compta/bank/account.class.php"); $langs->load("companies"); diff --git a/htdocs/adherents/index.php b/htdocs/adherents/index.php index 92e2d8d6984..a48e86c87a1 100644 --- a/htdocs/adherents/index.php +++ b/htdocs/adherents/index.php @@ -25,8 +25,8 @@ */ require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/adherents/adherent.class.php"); -require_once(DOL_DOCUMENT_ROOT."/adherents/adherent_type.class.php"); +require_once(DOL_DOCUMENT_ROOT."/adherents/class/adherent.class.php"); +require_once(DOL_DOCUMENT_ROOT."/adherents/class/adherent_type.class.php"); $langs->load("companies"); diff --git a/htdocs/adherents/info.php b/htdocs/adherents/info.php index 98cbc4be4cd..6831ef8174a 100644 --- a/htdocs/adherents/info.php +++ b/htdocs/adherents/info.php @@ -26,7 +26,7 @@ require("../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/lib/functions2.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/adherents/adherent.class.php"); +require_once(DOL_DOCUMENT_ROOT."/adherents/class/adherent.class.php"); require_once(DOL_DOCUMENT_ROOT."/lib/member.lib.php"); $langs->load("companies"); diff --git a/htdocs/adherents/info_subscription.php b/htdocs/adherents/info_subscription.php index b1556263988..aa261cad009 100644 --- a/htdocs/adherents/info_subscription.php +++ b/htdocs/adherents/info_subscription.php @@ -26,9 +26,9 @@ require("../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/lib/functions2.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/adherents/adherent.class.php"); +require_once(DOL_DOCUMENT_ROOT."/adherents/class/adherent.class.php"); require_once(DOL_DOCUMENT_ROOT."/lib/member.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/adherents/cotisation.class.php"); +require_once(DOL_DOCUMENT_ROOT."/adherents/class/cotisation.class.php"); $langs->load("companies"); $langs->load("bills"); diff --git a/htdocs/adherents/ldap.php b/htdocs/adherents/ldap.php index 5cf67c786cb..1bdac5e9eee 100644 --- a/htdocs/adherents/ldap.php +++ b/htdocs/adherents/ldap.php @@ -28,8 +28,8 @@ require("../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/lib/member.lib.php"); require_once(DOL_DOCUMENT_ROOT."/lib/ldap.class.php"); require_once(DOL_DOCUMENT_ROOT."/lib/ldap.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/adherents/adherent.class.php"); -require_once(DOL_DOCUMENT_ROOT."/adherents/adherent_type.class.php"); +require_once(DOL_DOCUMENT_ROOT."/adherents/class/adherent.class.php"); +require_once(DOL_DOCUMENT_ROOT."/adherents/class/adherent_type.class.php"); $langs->load("companies"); $langs->load("members"); diff --git a/htdocs/adherents/liste.php b/htdocs/adherents/liste.php index 87511fb73bf..371d721ea9c 100644 --- a/htdocs/adherents/liste.php +++ b/htdocs/adherents/liste.php @@ -26,8 +26,8 @@ */ require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/adherents/adherent.class.php"); -require_once(DOL_DOCUMENT_ROOT."/adherents/adherent_type.class.php"); +require_once(DOL_DOCUMENT_ROOT."/adherents/class/adherent.class.php"); +require_once(DOL_DOCUMENT_ROOT."/adherents/class/adherent_type.class.php"); $langs->load("members"); $langs->load("companies"); diff --git a/htdocs/adherents/note.php b/htdocs/adherents/note.php index b0b400de395..d05fbc63563 100644 --- a/htdocs/adherents/note.php +++ b/htdocs/adherents/note.php @@ -26,7 +26,7 @@ require("../main.inc.php"); require_once(DOL_DOCUMENT_ROOT.'/lib/member.lib.php'); -require_once(DOL_DOCUMENT_ROOT.'/adherents/adherent.class.php'); +require_once(DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php'); $action=isset($_GET["action"])?$_GET["action"]:(isset($_POST["action"])?$_POST["action"]:""); $id=isset($_GET["id"])?$_GET["id"]:(isset($_POST["id"])?$_POST["id"]:""); diff --git a/htdocs/adherents/options.php b/htdocs/adherents/options.php index 428f874905b..33a41e9715b 100644 --- a/htdocs/adherents/options.php +++ b/htdocs/adherents/options.php @@ -26,7 +26,7 @@ */ require("../main.inc.php"); -require(DOL_DOCUMENT_ROOT."/adherents/adherent_options.class.php"); +require(DOL_DOCUMENT_ROOT."/adherents/class/adherent_options.class.php"); $langs->load("members"); diff --git a/htdocs/adherents/type.php b/htdocs/adherents/type.php index 4b839604369..14434a20ee3 100644 --- a/htdocs/adherents/type.php +++ b/htdocs/adherents/type.php @@ -26,8 +26,8 @@ */ require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/adherents/adherent.class.php"); -require_once(DOL_DOCUMENT_ROOT."/adherents/adherent_type.class.php"); +require_once(DOL_DOCUMENT_ROOT."/adherents/class/adherent.class.php"); +require_once(DOL_DOCUMENT_ROOT."/adherents/class/adherent_type.class.php"); $langs->load("members"); diff --git a/htdocs/admin/ldap_members.php b/htdocs/admin/ldap_members.php index 26c33077805..2311fd4c577 100644 --- a/htdocs/admin/ldap_members.php +++ b/htdocs/admin/ldap_members.php @@ -29,8 +29,8 @@ require("../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/adherents/adherent.class.php"); -require_once(DOL_DOCUMENT_ROOT."/adherents/adherent_type.class.php"); +require_once(DOL_DOCUMENT_ROOT."/adherents/class/adherent.class.php"); +require_once(DOL_DOCUMENT_ROOT."/adherents/class/adherent_type.class.php"); require_once(DOL_DOCUMENT_ROOT."/lib/ldap.class.php"); require_once(DOL_DOCUMENT_ROOT."/lib/ldap.lib.php"); diff --git a/htdocs/categories/categorie.php b/htdocs/categories/categorie.php index a72a3187a05..1e2b279b9fb 100644 --- a/htdocs/categories/categorie.php +++ b/htdocs/categories/categorie.php @@ -107,7 +107,7 @@ if ($_REQUEST["removecat"]) } if ($_REQUEST["type"] == 3 && $user->rights->adherent->creer) { - require_once(DOL_DOCUMENT_ROOT."/adherents/adherent.class.php"); + require_once(DOL_DOCUMENT_ROOT."/adherents/class/adherent.class.php"); $object = new Adherent($db); $result = $object->fetch($objectid); } @@ -145,7 +145,7 @@ if (isset($_REQUEST["catMere"]) && $_REQUEST["catMere"]>=0) } if ($_REQUEST["type"]==3 && $user->rights->adherent->creer) { - require_once(DOL_DOCUMENT_ROOT."/adherents/adherent.class.php"); + require_once(DOL_DOCUMENT_ROOT."/adherents/class/adherent.class.php"); $object = new Adherent($db); $result = $object->fetch($objectid); $type = 'member'; @@ -329,8 +329,8 @@ else if ($_GET["id"] || $_GET["ref"]) * Fiche categorie d'adherent */ require_once(DOL_DOCUMENT_ROOT."/lib/member.lib.php"); - require_once(DOL_DOCUMENT_ROOT."/adherents/adherent.class.php"); - require_once(DOL_DOCUMENT_ROOT."/adherents/adherent_type.class.php"); + require_once(DOL_DOCUMENT_ROOT."/adherents/class/adherent.class.php"); + require_once(DOL_DOCUMENT_ROOT."/adherents/class/adherent_type.class.php"); // Produit $member = new Adherent($db); diff --git a/htdocs/categories/viewcat.php b/htdocs/categories/viewcat.php index e8eec0a0939..313b2f41adf 100644 --- a/htdocs/categories/viewcat.php +++ b/htdocs/categories/viewcat.php @@ -332,7 +332,7 @@ if($c->type == 2) // List of members if ($c->type == 3) { - require_once(DOL_DOCUMENT_ROOT."/adherents/Adherent.class.php"); + require_once(DOL_DOCUMENT_ROOT."/adherents/class/Adherent.class.php"); $prods = $c->get_type("member","Adherent"); if ($prods < 0) diff --git a/htdocs/compta/bank/account.php b/htdocs/compta/bank/account.php index f6c0d84950d..00df369db16 100644 --- a/htdocs/compta/bank/account.php +++ b/htdocs/compta/bank/account.php @@ -30,7 +30,7 @@ require("./pre.inc.php"); // We use pre.inc.php to have a dynamic menu require_once(DOL_DOCUMENT_ROOT."/lib/bank.lib.php"); require_once(DOL_DOCUMENT_ROOT."/societe/societe.class.php"); -require_once(DOL_DOCUMENT_ROOT."/adherents/adherent.class.php"); +require_once(DOL_DOCUMENT_ROOT."/adherents/class/adherent.class.php"); require_once(DOL_DOCUMENT_ROOT."/compta/chargesociales.class.php"); require_once(DOL_DOCUMENT_ROOT."/compta/paiement/class/paiement.class.php"); require_once(DOL_DOCUMENT_ROOT."/compta/tva/tva.class.php"); diff --git a/htdocs/compta/bank/rappro.php b/htdocs/compta/bank/rappro.php index 1bcefde278b..0fffad02409 100644 --- a/htdocs/compta/bank/rappro.php +++ b/htdocs/compta/bank/rappro.php @@ -27,7 +27,7 @@ require("./pre.inc.php"); require_once(DOL_DOCUMENT_ROOT."/lib/bank.lib.php"); require_once(DOL_DOCUMENT_ROOT."/societe/societe.class.php"); -require_once(DOL_DOCUMENT_ROOT."/adherents/adherent.class.php"); +require_once(DOL_DOCUMENT_ROOT."/adherents/class/adherent.class.php"); require_once(DOL_DOCUMENT_ROOT."/compta/chargesociales.class.php"); require_once(DOL_DOCUMENT_ROOT."/compta/paiement/class/paiement.class.php"); require_once(DOL_DOCUMENT_ROOT."/compta/tva/tva.class.php"); diff --git a/htdocs/index.php b/htdocs/index.php index afbe0e1f319..30f57f29a90 100644 --- a/htdocs/index.php +++ b/htdocs/index.php @@ -129,7 +129,7 @@ if ($user->societe_id == 0) $includes=array(DOL_DOCUMENT_ROOT."/societe/client.class.php", DOL_DOCUMENT_ROOT."/comm/prospect/prospect.class.php", DOL_DOCUMENT_ROOT."/fourn/fournisseur.class.php", - DOL_DOCUMENT_ROOT."/adherents/adherent.class.php", + DOL_DOCUMENT_ROOT."/adherents/class/adherent.class.php", DOL_DOCUMENT_ROOT."/product/product.class.php", DOL_DOCUMENT_ROOT."/product/service.class.php", DOL_DOCUMENT_ROOT."/comm/propal/propal.class.php", @@ -528,7 +528,7 @@ if ($conf->adherent->enabled && $user->rights->adherent->lire && ! $user->societ { $langs->load("members"); - include_once(DOL_DOCUMENT_ROOT."/adherents/adherent.class.php"); + include_once(DOL_DOCUMENT_ROOT."/adherents/class/adherent.class.php"); $board=new Adherent($db); $board->load_board($user); diff --git a/htdocs/public/members/new.php b/htdocs/public/members/new.php index 6f45c2c1a46..ec497b07d47 100644 --- a/htdocs/public/members/new.php +++ b/htdocs/public/members/new.php @@ -29,9 +29,9 @@ define("NOLOGIN",1); // This means this output page does not require to be logg define("NOCSRFCHECK",1); // We accept to go on this page from external web site. require("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/adherents/adherent.class.php"); -require_once(DOL_DOCUMENT_ROOT."/adherents/adherent_type.class.php"); -require_once(DOL_DOCUMENT_ROOT."/adherents/adherent_options.class.php"); +require_once(DOL_DOCUMENT_ROOT."/adherents/class/adherent.class.php"); +require_once(DOL_DOCUMENT_ROOT."/adherents/class/adherent_type.class.php"); +require_once(DOL_DOCUMENT_ROOT."/adherents/class/adherent_options.class.php"); require_once(DOL_DOCUMENT_ROOT."/html.form.class.php"); // Security check diff --git a/htdocs/public/members/public_card.php b/htdocs/public/members/public_card.php index 2701942932e..bd244b9f035 100644 --- a/htdocs/public/members/public_card.php +++ b/htdocs/public/members/public_card.php @@ -29,9 +29,9 @@ define("NOLOGIN",1); // This means this output page does not require to be logg define("NOCSRFCHECK",1); // We accept to go on this page from external web site. require("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/adherents/adherent.class.php"); -require_once(DOL_DOCUMENT_ROOT."/adherents/adherent_type.class.php"); -require_once(DOL_DOCUMENT_ROOT."/adherents/adherent_options.class.php"); +require_once(DOL_DOCUMENT_ROOT."/adherents/class/adherent.class.php"); +require_once(DOL_DOCUMENT_ROOT."/adherents/class/adherent_type.class.php"); +require_once(DOL_DOCUMENT_ROOT."/adherents/class/adherent_options.class.php"); // Security check if (empty($conf->adherent->enabled)) accessforbidden('',1,1,1); diff --git a/htdocs/public/paybox/newpayment.php b/htdocs/public/paybox/newpayment.php index 9096f6d4023..49dcbdc5fc3 100644 --- a/htdocs/public/paybox/newpayment.php +++ b/htdocs/public/paybox/newpayment.php @@ -549,8 +549,8 @@ if ($_REQUEST["amount"] == 'membersubscription') $found=true; $langs->load("members"); - require_once(DOL_DOCUMENT_ROOT."/adherents/adherent.class.php"); - require_once(DOL_DOCUMENT_ROOT."/adherents/cotisation.class.php"); + require_once(DOL_DOCUMENT_ROOT."/adherents/class/adherent.class.php"); + require_once(DOL_DOCUMENT_ROOT."/adherents/class/cotisation.class.php"); $member=new Adherent($db); $result=$member->fetch('',$_REQUEST["ref"]); diff --git a/htdocs/soc.php b/htdocs/soc.php index ed7a5f88dd7..f2d4fc16ecd 100644 --- a/htdocs/soc.php +++ b/htdocs/soc.php @@ -35,7 +35,7 @@ require_once(DOL_DOCUMENT_ROOT."/html.formadmin.class.php"); require_once(DOL_DOCUMENT_ROOT."/html.formcompany.class.php"); require_once(DOL_DOCUMENT_ROOT."/html.formfile.class.php"); require_once(DOL_DOCUMENT_ROOT."/contact/contact.class.php"); -if ($conf->adherent->enabled) require_once(DOL_DOCUMENT_ROOT."/adherents/adherent.class.php"); +if ($conf->adherent->enabled) require_once(DOL_DOCUMENT_ROOT."/adherents/class/adherent.class.php"); $langs->load("companies"); $langs->load("commercial"); diff --git a/htdocs/user/fiche.php b/htdocs/user/fiche.php index c05bce0a118..a825e376de6 100644 --- a/htdocs/user/fiche.php +++ b/htdocs/user/fiche.php @@ -34,7 +34,7 @@ require_once(DOL_DOCUMENT_ROOT."/contact/contact.class.php"); require_once(DOL_DOCUMENT_ROOT."/lib/images.lib.php"); require_once(DOL_DOCUMENT_ROOT."/lib/usergroups.lib.php"); if ($conf->ldap->enabled) require_once(DOL_DOCUMENT_ROOT."/lib/ldap.class.php"); -if ($conf->adherent->enabled) require_once(DOL_DOCUMENT_ROOT."/adherents/adherent.class.php"); +if ($conf->adherent->enabled) require_once(DOL_DOCUMENT_ROOT."/adherents/class/adherent.class.php"); // Define value to know what current user can do on users $canadduser=($user->admin || $user->rights->user->user->creer); diff --git a/htdocs/user/user.class.php b/htdocs/user/user.class.php index 654afce40aa..360330c4afb 100644 --- a/htdocs/user/user.class.php +++ b/htdocs/user/user.class.php @@ -1065,7 +1065,7 @@ class User extends CommonObject { if ($this->fk_member > 0 && ! $nosyncmember) { - require_once(DOL_DOCUMENT_ROOT."/adherents/adherent.class.php"); + require_once(DOL_DOCUMENT_ROOT."/adherents/class/adherent.class.php"); // This user is linked with a member, so we also update members informations // if this is an update. @@ -1227,7 +1227,7 @@ class User extends CommonObject if ($this->fk_member && ! $nosyncmember) { - require_once(DOL_DOCUMENT_ROOT."/adherents/adherent.class.php"); + require_once(DOL_DOCUMENT_ROOT."/adherents/class/adherent.class.php"); // This user is linked with a member, so we also update members informations // if this is an update. diff --git a/scripts/members/sync_members_dolibarr2ldap.php b/scripts/members/sync_members_dolibarr2ldap.php index 55af54adbfc..aa314659871 100644 --- a/scripts/members/sync_members_dolibarr2ldap.php +++ b/scripts/members/sync_members_dolibarr2ldap.php @@ -42,7 +42,7 @@ $error=0; require_once($path."../../htdocs/master.inc.php"); require_once(DOL_DOCUMENT_ROOT."/lib/ldap.class.php"); -require_once(DOL_DOCUMENT_ROOT."/adherents/adherent.class.php"); +require_once(DOL_DOCUMENT_ROOT."/adherents/class/adherent.class.php"); $langs->load("main"); diff --git a/scripts/members/sync_members_ldap2dolibarr.php b/scripts/members/sync_members_ldap2dolibarr.php index 89565199a3f..9989ec3ba7c 100644 --- a/scripts/members/sync_members_ldap2dolibarr.php +++ b/scripts/members/sync_members_ldap2dolibarr.php @@ -43,8 +43,8 @@ $forcecommit=0; require_once($path."../../htdocs/master.inc.php"); require_once(DOL_DOCUMENT_ROOT."/lib/ldap.class.php"); -require_once(DOL_DOCUMENT_ROOT."/adherents/adherent.class.php"); -require_once(DOL_DOCUMENT_ROOT."/adherents/cotisation.class.php"); +require_once(DOL_DOCUMENT_ROOT."/adherents/class/adherent.class.php"); +require_once(DOL_DOCUMENT_ROOT."/adherents/class/cotisation.class.php"); $langs->load("main");