From a56832d5210e5ed55ba2255f5cd98a0ed92e2da3 Mon Sep 17 00:00:00 2001 From: Philippe Grand Date: Thu, 25 Mar 2010 13:51:24 +0000 Subject: [PATCH] move contact class file to contact directory --- dev/initdata/generate-commande.php | 2 +- dev/initdata/generate-produit.php | 2 +- dev/initdata/generate-societe.php | 2 +- htdocs/admin/ldap_contacts.php | 2 +- htdocs/comm/action/document.php | 2 +- htdocs/comm/action/fiche.php | 2 +- htdocs/comm/action/index.php | 2 +- htdocs/comm/action/info.php | 2 +- htdocs/comm/action/listactions.php | 2 +- htdocs/comm/action/rapport/index.php | 2 +- htdocs/comm/fiche.php | 2 +- htdocs/comm/multiprix.php | 2 +- htdocs/comm/propal/contact.php | 2 +- htdocs/comm/propal/propal.class.php | 2 +- htdocs/comm/prospect/fiche.php | 2 +- htdocs/comm/remise.php | 2 +- htdocs/commande/contact.php | 2 +- htdocs/commonobject.class.php | 2 +- htdocs/compta/clients.php | 2 +- htdocs/compta/facture/contact.php | 2 +- htdocs/compta/fiche.php | 2 +- htdocs/{ => contact}/contact.class.php | 2 +- htdocs/contact/exportimport.php | 2 +- htdocs/contact/fiche.php | 2 +- htdocs/contact/index.php | 2 +- htdocs/contact/info.php | 2 +- htdocs/contact/ldap.php | 2 +- htdocs/contact/perso.php | 2 +- htdocs/contact/vcard.php | 2 +- htdocs/contrat/contact.php | 2 +- htdocs/fichinter/contact.php | 2 +- htdocs/fichinter/index.php | 2 +- htdocs/fichinter/rapport.php | 2 +- htdocs/fourn/commande/contact.php | 2 +- htdocs/fourn/commande/index.php | 2 +- htdocs/fourn/facture/contact.php | 2 +- htdocs/fourn/fiche.php | 2 +- htdocs/html.form.class.php | 2 +- .../modules/expedition/pdf/pdf_expedition_merou.modules.php | 2 +- .../includes/triggers/interface_modAgenda_ActionsAuto.class.php | 2 +- htdocs/oscommerce_ws/produits/osc_categories.class.php | 2 +- htdocs/projet/contact.php | 2 +- htdocs/projet/tasks/contact.php | 2 +- htdocs/soc.php | 2 +- htdocs/societe.php | 2 +- htdocs/societe/agenda.php | 2 +- htdocs/societe/notify/fiche.php | 2 +- htdocs/user/fiche.php | 2 +- htdocs/user/group/ldap.php | 2 +- htdocs/user/passwordforgotten.php | 2 +- scripts/company/sync_contacts_dolibarr2ldap.php | 2 +- 51 files changed, 51 insertions(+), 51 deletions(-) rename htdocs/{ => contact}/contact.class.php (99%) diff --git a/dev/initdata/generate-commande.php b/dev/initdata/generate-commande.php index ee27869e0cf..48f01c19964 100644 --- a/dev/initdata/generate-commande.php +++ b/dev/initdata/generate-commande.php @@ -36,7 +36,7 @@ if (substr($sapi_type, 0, 3) == 'cgi') { $path=preg_replace('/generate-commande.php/i','',$_SERVER["PHP_SELF"]); require ($path."../htdocs/master.inc.php"); include_once(DOL_DOCUMENT_ROOT."/societe.class.php"); -include_once(DOL_DOCUMENT_ROOT."/contact.class.php"); +include_once(DOL_DOCUMENT_ROOT."/contact/contact.class.php"); include_once(DOL_DOCUMENT_ROOT."/facture.class.php"); include_once(DOL_DOCUMENT_ROOT."/product/product.class.php"); include_once(DOL_DOCUMENT_ROOT."/paiement.class.php"); diff --git a/dev/initdata/generate-produit.php b/dev/initdata/generate-produit.php index 30983dcf8f9..17b01e8e747 100644 --- a/dev/initdata/generate-produit.php +++ b/dev/initdata/generate-produit.php @@ -36,7 +36,7 @@ if (substr($sapi_type, 0, 3) == 'cgi') { $path=preg_replace('/generate-produit.php/i','',$_SERVER["PHP_SELF"]); require ($path."../htdocs/master.inc.php"); include_once(DOL_DOCUMENT_ROOT."/societe.class.php"); -include_once(DOL_DOCUMENT_ROOT."/contact.class.php"); +include_once(DOL_DOCUMENT_ROOT."/contact/contact.class.php"); include_once(DOL_DOCUMENT_ROOT."/facture.class.php"); include_once(DOL_DOCUMENT_ROOT."/product/product.class.php"); include_once(DOL_DOCUMENT_ROOT."/paiement.class.php"); diff --git a/dev/initdata/generate-societe.php b/dev/initdata/generate-societe.php index 24a81d01ff9..dda3b628423 100644 --- a/dev/initdata/generate-societe.php +++ b/dev/initdata/generate-societe.php @@ -36,7 +36,7 @@ if (substr($sapi_type, 0, 3) == 'cgi') { $path=preg_replace('/generate-societe.php/i','',$_SERVER["PHP_SELF"]); require ($path."../htdocs/master.inc.php"); include_once(DOL_DOCUMENT_ROOT."/societe.class.php"); -include_once(DOL_DOCUMENT_ROOT."/contact.class.php"); +include_once(DOL_DOCUMENT_ROOT."/contact/contact.class.php"); include_once(DOL_DOCUMENT_ROOT."/facture.class.php"); include_once(DOL_DOCUMENT_ROOT."/product/product.class.php"); include_once(DOL_DOCUMENT_ROOT."/paiement.class.php"); diff --git a/htdocs/admin/ldap_contacts.php b/htdocs/admin/ldap_contacts.php index e0b07cbb269..52b409efc1b 100644 --- a/htdocs/admin/ldap_contacts.php +++ b/htdocs/admin/ldap_contacts.php @@ -31,7 +31,7 @@ require("../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/lib/admin.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."/contact.class.php"); +require_once(DOL_DOCUMENT_ROOT."/contact/contact.class.php"); $langs->load("admin"); $langs->load("errors"); diff --git a/htdocs/comm/action/document.php b/htdocs/comm/action/document.php index 1b6c9ba80ab..7dd98aae349 100755 --- a/htdocs/comm/action/document.php +++ b/htdocs/comm/action/document.php @@ -29,7 +29,7 @@ require_once("./pre.inc.php"); require_once(DOL_DOCUMENT_ROOT."/lib/agenda.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/contact.class.php"); +require_once(DOL_DOCUMENT_ROOT."/contact/contact.class.php"); require_once(DOL_DOCUMENT_ROOT."/cactioncomm.class.php"); require_once(DOL_DOCUMENT_ROOT."/actioncomm.class.php"); require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php"); diff --git a/htdocs/comm/action/fiche.php b/htdocs/comm/action/fiche.php index 39f961e7f4b..cb9657eb7c8 100644 --- a/htdocs/comm/action/fiche.php +++ b/htdocs/comm/action/fiche.php @@ -28,7 +28,7 @@ require_once("./pre.inc.php"); require_once(DOL_DOCUMENT_ROOT."/lib/agenda.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/contact.class.php"); +require_once(DOL_DOCUMENT_ROOT."/contact/contact.class.php"); require_once(DOL_DOCUMENT_ROOT."/user/user.class.php"); require_once(DOL_DOCUMENT_ROOT."/cactioncomm.class.php"); require_once(DOL_DOCUMENT_ROOT."/actioncomm.class.php"); diff --git a/htdocs/comm/action/index.php b/htdocs/comm/action/index.php index 429add9d630..574f88c0730 100644 --- a/htdocs/comm/action/index.php +++ b/htdocs/comm/action/index.php @@ -27,7 +27,7 @@ */ require_once("./pre.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/contact.class.php"); +require_once(DOL_DOCUMENT_ROOT."/contact/contact.class.php"); require_once(DOL_DOCUMENT_ROOT."/actioncomm.class.php"); require_once(DOL_DOCUMENT_ROOT."/lib/date.lib.php"); require_once(DOL_DOCUMENT_ROOT."/lib/agenda.lib.php"); diff --git a/htdocs/comm/action/info.php b/htdocs/comm/action/info.php index aff261b9bea..07d9f29ffc5 100644 --- a/htdocs/comm/action/info.php +++ b/htdocs/comm/action/info.php @@ -27,7 +27,7 @@ require("./pre.inc.php"); require_once(DOL_DOCUMENT_ROOT."/lib/agenda.lib.php"); require_once(DOL_DOCUMENT_ROOT."/lib/functions2.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/contact.class.php"); +require_once(DOL_DOCUMENT_ROOT."/contact/contact.class.php"); require_once(DOL_DOCUMENT_ROOT."/cactioncomm.class.php"); require_once(DOL_DOCUMENT_ROOT."/actioncomm.class.php"); diff --git a/htdocs/comm/action/listactions.php b/htdocs/comm/action/listactions.php index 7cefcda7cef..8448e99af9d 100644 --- a/htdocs/comm/action/listactions.php +++ b/htdocs/comm/action/listactions.php @@ -27,7 +27,7 @@ */ require_once("./pre.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/contact.class.php"); +require_once(DOL_DOCUMENT_ROOT."/contact/contact.class.php"); require_once(DOL_DOCUMENT_ROOT."/actioncomm.class.php"); require_once(DOL_DOCUMENT_ROOT."/lib/date.lib.php"); require_once(DOL_DOCUMENT_ROOT."/lib/agenda.lib.php"); diff --git a/htdocs/comm/action/rapport/index.php b/htdocs/comm/action/rapport/index.php index 24ecbc43ea3..34d1aa6b19c 100644 --- a/htdocs/comm/action/rapport/index.php +++ b/htdocs/comm/action/rapport/index.php @@ -28,7 +28,7 @@ require_once("./pre.inc.php"); require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/contact.class.php"); +require_once(DOL_DOCUMENT_ROOT."/contact/contact.class.php"); require_once(DOL_DOCUMENT_ROOT."/actioncomm.class.php"); require_once(DOL_DOCUMENT_ROOT."/includes/modules/action/rapport.pdf.php"); diff --git a/htdocs/comm/fiche.php b/htdocs/comm/fiche.php index 10bcccdea64..ed519d77a78 100644 --- a/htdocs/comm/fiche.php +++ b/htdocs/comm/fiche.php @@ -31,7 +31,7 @@ require_once("./pre.inc.php"); require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/contact.class.php"); +require_once(DOL_DOCUMENT_ROOT."/contact/contact.class.php"); if ($conf->facture->enabled) require_once(DOL_DOCUMENT_ROOT."/facture.class.php"); if ($conf->propal->enabled) require_once(DOL_DOCUMENT_ROOT."/comm/propal/propal.class.php"); if ($conf->commande->enabled) require_once(DOL_DOCUMENT_ROOT."/commande/commande.class.php"); diff --git a/htdocs/comm/multiprix.php b/htdocs/comm/multiprix.php index e641b5a3f27..fadc52b3304 100644 --- a/htdocs/comm/multiprix.php +++ b/htdocs/comm/multiprix.php @@ -27,7 +27,7 @@ require_once("./pre.inc.php"); require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/contact.class.php"); +require_once(DOL_DOCUMENT_ROOT."/contact/contact.class.php"); $langs->load("orders"); $langs->load("companies"); diff --git a/htdocs/comm/propal/contact.php b/htdocs/comm/propal/contact.php index 1ca4a5d7cb0..3303f8073d0 100644 --- a/htdocs/comm/propal/contact.php +++ b/htdocs/comm/propal/contact.php @@ -26,7 +26,7 @@ require ("./pre.inc.php"); require_once(DOL_DOCUMENT_ROOT."/comm/propal/propal.class.php"); -require_once(DOL_DOCUMENT_ROOT."/contact.class.php"); +require_once(DOL_DOCUMENT_ROOT."/contact/contact.class.php"); require_once(DOL_DOCUMENT_ROOT."/lib/propal.lib.php"); require_once(DOL_DOCUMENT_ROOT.'/html.formcompany.class.php'); diff --git a/htdocs/comm/propal/propal.class.php b/htdocs/comm/propal/propal.class.php index c89539b0ea1..44608301056 100644 --- a/htdocs/comm/propal/propal.class.php +++ b/htdocs/comm/propal/propal.class.php @@ -33,7 +33,7 @@ require_once(DOL_DOCUMENT_ROOT ."/commonobject.class.php"); require_once(DOL_DOCUMENT_ROOT ."/product/product.class.php"); -require_once(DOL_DOCUMENT_ROOT ."/contact.class.php"); +require_once(DOL_DOCUMENT_ROOT ."/contact/contact.class.php"); /** diff --git a/htdocs/comm/prospect/fiche.php b/htdocs/comm/prospect/fiche.php index efaf12be8a7..5dfbbf250c2 100644 --- a/htdocs/comm/prospect/fiche.php +++ b/htdocs/comm/prospect/fiche.php @@ -29,7 +29,7 @@ require_once("../../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php"); require_once(DOL_DOCUMENT_ROOT."/comm/prospect/prospect.class.php"); require_once(DOL_DOCUMENT_ROOT."/html.formcompany.class.php"); -require_once(DOL_DOCUMENT_ROOT."/contact.class.php"); +require_once(DOL_DOCUMENT_ROOT."/contact/contact.class.php"); require_once(DOL_DOCUMENT_ROOT."/actioncomm.class.php"); if ($conf->propal->enabled) require_once(DOL_DOCUMENT_ROOT."/comm/propal/propal.class.php"); diff --git a/htdocs/comm/remise.php b/htdocs/comm/remise.php index 0bfceb02a58..2a041d4f4c8 100644 --- a/htdocs/comm/remise.php +++ b/htdocs/comm/remise.php @@ -26,7 +26,7 @@ require_once("./pre.inc.php"); require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/contact.class.php"); +require_once(DOL_DOCUMENT_ROOT."/contact/contact.class.php"); $langs->load("companies"); $langs->load("orders"); diff --git a/htdocs/commande/contact.php b/htdocs/commande/contact.php index e1576065d9a..16247a9e615 100644 --- a/htdocs/commande/contact.php +++ b/htdocs/commande/contact.php @@ -27,7 +27,7 @@ require ("./pre.inc.php"); require_once(DOL_DOCUMENT_ROOT."/commande/commande.class.php"); -require_once(DOL_DOCUMENT_ROOT."/contact.class.php"); +require_once(DOL_DOCUMENT_ROOT."/contact/contact.class.php"); require_once(DOL_DOCUMENT_ROOT."/lib/order.lib.php"); require_once(DOL_DOCUMENT_ROOT.'/html.formcompany.class.php'); diff --git a/htdocs/commonobject.class.php b/htdocs/commonobject.class.php index a4b9823d847..ed729795e36 100644 --- a/htdocs/commonobject.class.php +++ b/htdocs/commonobject.class.php @@ -339,7 +339,7 @@ class CommonObject */ function fetch_contact($contactid) { - require_once(DOL_DOCUMENT_ROOT."/contact.class.php"); + require_once(DOL_DOCUMENT_ROOT."/contact/contact.class.php"); $contact = new Contact($this->db); $result=$contact->fetch($contactid); $this->contact = $contact; diff --git a/htdocs/compta/clients.php b/htdocs/compta/clients.php index 4bdc94a05df..81019a51cae 100644 --- a/htdocs/compta/clients.php +++ b/htdocs/compta/clients.php @@ -26,7 +26,7 @@ */ require_once("./pre.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/contact.class.php"); +require_once(DOL_DOCUMENT_ROOT."/contact/contact.class.php"); require_once(DOL_DOCUMENT_ROOT."/actioncomm.class.php"); // Secrutiy check diff --git a/htdocs/compta/facture/contact.php b/htdocs/compta/facture/contact.php index 7114ac3a1d3..7e47ea118af 100644 --- a/htdocs/compta/facture/contact.php +++ b/htdocs/compta/facture/contact.php @@ -26,7 +26,7 @@ require ("./pre.inc.php"); require_once(DOL_DOCUMENT_ROOT."/facture.class.php"); -require_once(DOL_DOCUMENT_ROOT."/contact.class.php"); +require_once(DOL_DOCUMENT_ROOT."/contact/contact.class.php"); require_once(DOL_DOCUMENT_ROOT.'/discount.class.php'); require_once(DOL_DOCUMENT_ROOT.'/lib/invoice.lib.php'); require_once(DOL_DOCUMENT_ROOT.'/html.formcompany.class.php'); diff --git a/htdocs/compta/fiche.php b/htdocs/compta/fiche.php index 717b1ecf1d2..9cb00ef03f5 100644 --- a/htdocs/compta/fiche.php +++ b/htdocs/compta/fiche.php @@ -28,7 +28,7 @@ require("./pre.inc.php"); require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/contact.class.php"); +require_once(DOL_DOCUMENT_ROOT."/contact/contact.class.php"); require_once(DOL_DOCUMENT_ROOT."/facture.class.php"); $langs->load("companies"); diff --git a/htdocs/contact.class.php b/htdocs/contact/contact.class.php similarity index 99% rename from htdocs/contact.class.php rename to htdocs/contact/contact.class.php index 19697c6bf37..8134bf6af56 100644 --- a/htdocs/contact.class.php +++ b/htdocs/contact/contact.class.php @@ -22,7 +22,7 @@ */ /** - * \file htdocs/contact.class.php + * \file htdocs/contact/contact.class.php * \ingroup societe * \brief File of contacts class * \version $Id$ diff --git a/htdocs/contact/exportimport.php b/htdocs/contact/exportimport.php index 957628adc58..957a70f05e1 100644 --- a/htdocs/contact/exportimport.php +++ b/htdocs/contact/exportimport.php @@ -25,7 +25,7 @@ */ require("./pre.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/contact.class.php"); +require_once(DOL_DOCUMENT_ROOT."/contact/contact.class.php"); require_once(DOL_DOCUMENT_ROOT."/lib/contact.lib.php"); $langs->load("companies"); diff --git a/htdocs/contact/fiche.php b/htdocs/contact/fiche.php index 0766bfdb093..b01f3f419c2 100644 --- a/htdocs/contact/fiche.php +++ b/htdocs/contact/fiche.php @@ -29,7 +29,7 @@ require("./pre.inc.php"); require_once(DOL_DOCUMENT_ROOT."/actioncomm.class.php"); -require_once(DOL_DOCUMENT_ROOT."/contact.class.php"); +require_once(DOL_DOCUMENT_ROOT."/contact/contact.class.php"); require_once(DOL_DOCUMENT_ROOT."/lib/contact.lib.php"); require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php"); require_once(DOL_DOCUMENT_ROOT."/html.formcompany.class.php"); diff --git a/htdocs/contact/index.php b/htdocs/contact/index.php index 4f68ba2f6d3..06cf6904a82 100644 --- a/htdocs/contact/index.php +++ b/htdocs/contact/index.php @@ -27,7 +27,7 @@ */ require("./pre.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/contact.class.php"); +require_once(DOL_DOCUMENT_ROOT."/contact/contact.class.php"); $langs->load("companies"); $langs->load("suppliers"); diff --git a/htdocs/contact/info.php b/htdocs/contact/info.php index 183193bb360..fb047afcf70 100644 --- a/htdocs/contact/info.php +++ b/htdocs/contact/info.php @@ -26,7 +26,7 @@ require("./pre.inc.php"); require_once(DOL_DOCUMENT_ROOT."/lib/functions2.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/contact.class.php"); +require_once(DOL_DOCUMENT_ROOT."/contact/contact.class.php"); require_once(DOL_DOCUMENT_ROOT."/lib/contact.lib.php"); $langs->load("companies"); diff --git a/htdocs/contact/ldap.php b/htdocs/contact/ldap.php index 8c181597cfd..a51ace0631a 100644 --- a/htdocs/contact/ldap.php +++ b/htdocs/contact/ldap.php @@ -25,7 +25,7 @@ */ require("./pre.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/contact.class.php"); +require_once(DOL_DOCUMENT_ROOT."/contact/contact.class.php"); require_once(DOL_DOCUMENT_ROOT."/lib/contact.lib.php"); require_once(DOL_DOCUMENT_ROOT."/lib/ldap.class.php"); require_once(DOL_DOCUMENT_ROOT."/lib/ldap.lib.php"); diff --git a/htdocs/contact/perso.php b/htdocs/contact/perso.php index eaf0f1eab0f..6bce12f2824 100644 --- a/htdocs/contact/perso.php +++ b/htdocs/contact/perso.php @@ -25,7 +25,7 @@ */ require("./pre.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/contact.class.php"); +require_once(DOL_DOCUMENT_ROOT."/contact/contact.class.php"); require_once(DOL_DOCUMENT_ROOT."/lib/contact.lib.php"); $langs->load("companies"); diff --git a/htdocs/contact/vcard.php b/htdocs/contact/vcard.php index d159b8ec18f..1a094373a38 100644 --- a/htdocs/contact/vcard.php +++ b/htdocs/contact/vcard.php @@ -25,7 +25,7 @@ */ require("./pre.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/contact.class.php"); +require_once(DOL_DOCUMENT_ROOT."/contact/contact.class.php"); require_once(DOL_DOCUMENT_ROOT."/societe.class.php"); require_once(DOL_DOCUMENT_ROOT."/includes/vcard/vcard.class.php"); diff --git a/htdocs/contrat/contact.php b/htdocs/contrat/contact.php index dc85ce5b37e..70b8926fe56 100644 --- a/htdocs/contrat/contact.php +++ b/htdocs/contrat/contact.php @@ -27,7 +27,7 @@ require ("./pre.inc.php"); require_once(DOL_DOCUMENT_ROOT.'/lib/contract.lib.php'); require_once(DOL_DOCUMENT_ROOT."/contrat/contrat.class.php"); -require_once(DOL_DOCUMENT_ROOT."/contact.class.php"); +require_once(DOL_DOCUMENT_ROOT."/contact/contact.class.php"); require_once(DOL_DOCUMENT_ROOT.'/html.formcompany.class.php'); diff --git a/htdocs/fichinter/contact.php b/htdocs/fichinter/contact.php index 07d43424b7a..c234c8da2b2 100644 --- a/htdocs/fichinter/contact.php +++ b/htdocs/fichinter/contact.php @@ -26,7 +26,7 @@ require ("./pre.inc.php"); require_once(DOL_DOCUMENT_ROOT."/fichinter/fichinter.class.php"); -require_once(DOL_DOCUMENT_ROOT."/contact.class.php"); +require_once(DOL_DOCUMENT_ROOT."/contact/contact.class.php"); require_once(DOL_DOCUMENT_ROOT."/lib/fichinter.lib.php"); require_once(DOL_DOCUMENT_ROOT.'/html.formcompany.class.php'); diff --git a/htdocs/fichinter/index.php b/htdocs/fichinter/index.php index 814d15bb6cd..a6f3f97cf19 100644 --- a/htdocs/fichinter/index.php +++ b/htdocs/fichinter/index.php @@ -26,7 +26,7 @@ */ require("./pre.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/contact.class.php"); +require_once(DOL_DOCUMENT_ROOT."/contact/contact.class.php"); require_once(DOL_DOCUMENT_ROOT."/fichinter/fichinter.class.php"); require_once(DOL_DOCUMENT_ROOT."/lib/date.lib.php"); diff --git a/htdocs/fichinter/rapport.php b/htdocs/fichinter/rapport.php index 50d57ff5785..616bc1262a4 100644 --- a/htdocs/fichinter/rapport.php +++ b/htdocs/fichinter/rapport.php @@ -21,7 +21,7 @@ */ require("./pre.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/contact.class.php"); +require_once(DOL_DOCUMENT_ROOT."/contact/contact.class.php"); // Security check if ($user->societe_id) $socid=$user->societe_id; diff --git a/htdocs/fourn/commande/contact.php b/htdocs/fourn/commande/contact.php index 8525783b8ff..707fa5fed84 100644 --- a/htdocs/fourn/commande/contact.php +++ b/htdocs/fourn/commande/contact.php @@ -27,7 +27,7 @@ require ("./pre.inc.php"); require_once(DOL_DOCUMENT_ROOT."/fourn/fournisseur.commande.class.php"); -require_once(DOL_DOCUMENT_ROOT."/contact.class.php"); +require_once(DOL_DOCUMENT_ROOT."/contact/contact.class.php"); require_once DOL_DOCUMENT_ROOT."/lib/fourn.lib.php"; require_once(DOL_DOCUMENT_ROOT.'/html.formcompany.class.php'); diff --git a/htdocs/fourn/commande/index.php b/htdocs/fourn/commande/index.php index 33e8aea9d77..9eeab916ae6 100644 --- a/htdocs/fourn/commande/index.php +++ b/htdocs/fourn/commande/index.php @@ -26,7 +26,7 @@ */ require("./pre.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/contact.class.php"); +require_once(DOL_DOCUMENT_ROOT."/contact/contact.class.php"); // Security check $orderid = isset($_GET["orderid"])?$_GET["orderid"]:''; diff --git a/htdocs/fourn/facture/contact.php b/htdocs/fourn/facture/contact.php index c2e0ff6d410..3513db19436 100644 --- a/htdocs/fourn/facture/contact.php +++ b/htdocs/fourn/facture/contact.php @@ -27,7 +27,7 @@ require ("./pre.inc.php"); require_once(DOL_DOCUMENT_ROOT."/fourn/fournisseur.facture.class.php"); -require_once(DOL_DOCUMENT_ROOT."/contact.class.php"); +require_once(DOL_DOCUMENT_ROOT."/contact/contact.class.php"); require_once(DOL_DOCUMENT_ROOT.'/lib/fourn.lib.php'); require_once(DOL_DOCUMENT_ROOT.'/html.formcompany.class.php'); diff --git a/htdocs/fourn/fiche.php b/htdocs/fourn/fiche.php index 82e577c4022..7946528a6ce 100644 --- a/htdocs/fourn/fiche.php +++ b/htdocs/fourn/fiche.php @@ -28,7 +28,7 @@ */ require('./pre.inc.php'); -require_once(DOL_DOCUMENT_ROOT."/contact.class.php"); +require_once(DOL_DOCUMENT_ROOT."/contact/contact.class.php"); require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php"); $langs->load('suppliers'); diff --git a/htdocs/html.form.class.php b/htdocs/html.form.class.php index 8d45dc594e5..acd58c5e81e 100644 --- a/htdocs/html.form.class.php +++ b/htdocs/html.form.class.php @@ -2054,7 +2054,7 @@ class Form { if ($selected) { - require_once(DOL_DOCUMENT_ROOT ."/contact.class.php"); + require_once(DOL_DOCUMENT_ROOT ."/contact/contact.class.php"); //$this->load_cache_contacts(); //print $this->cache_contacts[$selected]; $contact=new Contact($this->db); diff --git a/htdocs/includes/modules/expedition/pdf/pdf_expedition_merou.modules.php b/htdocs/includes/modules/expedition/pdf/pdf_expedition_merou.modules.php index d2a8db65789..403a9b890e7 100644 --- a/htdocs/includes/modules/expedition/pdf/pdf_expedition_merou.modules.php +++ b/htdocs/includes/modules/expedition/pdf/pdf_expedition_merou.modules.php @@ -27,7 +27,7 @@ */ require_once DOL_DOCUMENT_ROOT."/includes/modules/expedition/pdf/ModelePdfExpedition.class.php"; -require_once DOL_DOCUMENT_ROOT."/contact.class.php"; +require_once DOL_DOCUMENT_ROOT."/contact/contact.class.php"; require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php"); diff --git a/htdocs/includes/triggers/interface_modAgenda_ActionsAuto.class.php b/htdocs/includes/triggers/interface_modAgenda_ActionsAuto.class.php index 359eb2a0210..d4d7fe96b00 100644 --- a/htdocs/includes/triggers/interface_modAgenda_ActionsAuto.class.php +++ b/htdocs/includes/triggers/interface_modAgenda_ActionsAuto.class.php @@ -438,7 +438,7 @@ class InterfaceActionsAuto $now=dol_now('tzserver'); // Insertion action - require_once(DOL_DOCUMENT_ROOT.'/contact.class.php'); + require_once(DOL_DOCUMENT_ROOT.'/contact/contact.class.php'); require_once(DOL_DOCUMENT_ROOT.'/actioncomm.class.php'); $actioncomm = new ActionComm($this->db); $actioncomm->type_code = $object->actiontypecode; diff --git a/htdocs/oscommerce_ws/produits/osc_categories.class.php b/htdocs/oscommerce_ws/produits/osc_categories.class.php index 2713a9bc34a..166f29f9286 100644 --- a/htdocs/oscommerce_ws/produits/osc_categories.class.php +++ b/htdocs/oscommerce_ws/produits/osc_categories.class.php @@ -28,7 +28,7 @@ // Put here all includes required by your script //require_once(DOL_DOCUMENT_ROOT."/societe.class.php"); -//require_once(DOL_DOCUMENT_ROOT."/contact.class.php"); +//require_once(DOL_DOCUMENT_ROOT."/contact/contact.class.php"); //require_once(DOL_DOCUMENT_ROOT."/product/product.class.php"); diff --git a/htdocs/projet/contact.php b/htdocs/projet/contact.php index bda75869b85..3b928f380a3 100644 --- a/htdocs/projet/contact.php +++ b/htdocs/projet/contact.php @@ -25,7 +25,7 @@ require("../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/projet/project.class.php"); -require_once(DOL_DOCUMENT_ROOT."/contact.class.php"); +require_once(DOL_DOCUMENT_ROOT."/contact/contact.class.php"); require_once(DOL_DOCUMENT_ROOT."/lib/project.lib.php"); require_once(DOL_DOCUMENT_ROOT.'/html.formcompany.class.php'); diff --git a/htdocs/projet/tasks/contact.php b/htdocs/projet/tasks/contact.php index 9b88fa1e4b0..0525ab48b97 100644 --- a/htdocs/projet/tasks/contact.php +++ b/htdocs/projet/tasks/contact.php @@ -28,7 +28,7 @@ require ("../../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/projet/project.class.php"); require_once(DOL_DOCUMENT_ROOT."/projet/tasks/task.class.php"); -require_once(DOL_DOCUMENT_ROOT."/contact.class.php"); +require_once(DOL_DOCUMENT_ROOT."/contact/contact.class.php"); require_once(DOL_DOCUMENT_ROOT."/lib/project.lib.php"); require_once(DOL_DOCUMENT_ROOT.'/html.formcompany.class.php'); diff --git a/htdocs/soc.php b/htdocs/soc.php index 0b9a0ecb02b..362d3d79a0f 100644 --- a/htdocs/soc.php +++ b/htdocs/soc.php @@ -34,7 +34,7 @@ require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php"); 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.class.php"); +require_once(DOL_DOCUMENT_ROOT."/contact/contact.class.php"); if ($conf->adherent->enabled) require_once(DOL_DOCUMENT_ROOT."/adherents/adherent.class.php"); $langs->load("companies"); diff --git a/htdocs/societe.php b/htdocs/societe.php index 54a9d20bc6e..2f08327c0c0 100644 --- a/htdocs/societe.php +++ b/htdocs/societe.php @@ -26,7 +26,7 @@ */ require_once("./main.inc.php"); -include_once(DOL_DOCUMENT_ROOT."/contact.class.php"); +include_once(DOL_DOCUMENT_ROOT."/contact/contact.class.php"); $langs->load("companies"); $langs->load("customers"); diff --git a/htdocs/societe/agenda.php b/htdocs/societe/agenda.php index bd71f3c26b2..ae3e26ed7e1 100644 --- a/htdocs/societe/agenda.php +++ b/htdocs/societe/agenda.php @@ -28,7 +28,7 @@ */ require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/contact.class.php"); +require_once(DOL_DOCUMENT_ROOT."/contact/contact.class.php"); require_once(DOL_DOCUMENT_ROOT."/facture.class.php"); $langs->load("companies"); diff --git a/htdocs/societe/notify/fiche.php b/htdocs/societe/notify/fiche.php index e8dc674bab0..cf4195356fa 100644 --- a/htdocs/societe/notify/fiche.php +++ b/htdocs/societe/notify/fiche.php @@ -26,7 +26,7 @@ require("../../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/contact.class.php"); +require_once(DOL_DOCUMENT_ROOT."/contact/contact.class.php"); $langs->load("companies"); $langs->load("mails"); diff --git a/htdocs/user/fiche.php b/htdocs/user/fiche.php index 2000873cb84..c05bce0a118 100644 --- a/htdocs/user/fiche.php +++ b/htdocs/user/fiche.php @@ -30,7 +30,7 @@ require("../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/user/user.class.php"); require_once(DOL_DOCUMENT_ROOT."/user/group/usergroup.class.php"); -require_once(DOL_DOCUMENT_ROOT."/contact.class.php"); +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"); diff --git a/htdocs/user/group/ldap.php b/htdocs/user/group/ldap.php index d3649fb5899..c57de82185b 100644 --- a/htdocs/user/group/ldap.php +++ b/htdocs/user/group/ldap.php @@ -26,7 +26,7 @@ require("../../main.inc.php"); require_once(DOL_DOCUMENT_ROOT.'/user/group/usergroup.class.php'); -require_once(DOL_DOCUMENT_ROOT."/contact.class.php"); +require_once(DOL_DOCUMENT_ROOT."/contact/contact.class.php"); require_once(DOL_DOCUMENT_ROOT."/lib/usergroups.lib.php"); require_once(DOL_DOCUMENT_ROOT."/lib/ldap.class.php"); require_once(DOL_DOCUMENT_ROOT."/lib/ldap.lib.php"); diff --git a/htdocs/user/passwordforgotten.php b/htdocs/user/passwordforgotten.php index a19f214f857..6321c1f8520 100644 --- a/htdocs/user/passwordforgotten.php +++ b/htdocs/user/passwordforgotten.php @@ -25,7 +25,7 @@ define("NOLOGIN",1); // This means this output page does not require to be logged. require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/contact.class.php"); +require_once(DOL_DOCUMENT_ROOT."/contact/contact.class.php"); require_once(DOL_DOCUMENT_ROOT."/lib/ldap.class.php"); require_once(DOL_DOCUMENT_ROOT."/lib/usergroups.lib.php"); diff --git a/scripts/company/sync_contacts_dolibarr2ldap.php b/scripts/company/sync_contacts_dolibarr2ldap.php index 27fea75014b..8099146162e 100644 --- a/scripts/company/sync_contacts_dolibarr2ldap.php +++ b/scripts/company/sync_contacts_dolibarr2ldap.php @@ -44,7 +44,7 @@ $now=$argv[1]; $version='$Revision$'; require_once($path."../../htdocs/master.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/contact.class.php"); +require_once(DOL_DOCUMENT_ROOT."/contact/contact.class.php"); require_once(DOL_DOCUMENT_ROOT."/user/user.class.php"); require_once(DOL_DOCUMENT_ROOT."/lib/ldap.class.php");