(no commit message)

diff --git a/inc/commons/DAO/class.common.dao.client.php b/inc/commons/DAO/class.common.dao.client.php
index c39c046bace5d5c1c62dfe759683f91c61c56b0e..63df074ade3ca0e0ddfb8e68f52d1e35e04e2915 100644 (file)
--- a/inc/commons/DAO/class.common.dao.client.php
+++ b/inc/commons/DAO/class.common.dao.client.php
@@ -2,7 +2,7 @@
 class commonDAOClient extends commonDAOUtilisateur {\r
        protected function singleton($r, $utilisateur = null)\r
        {\r
-               $utilisateur = new extranetClient();\r
+               $utilisateur = new commonClient();\r
                $utilisateur->rs = $r->rs;\r
                $utilisateur->adresse_facturation = $r->adresse_facturation;\r
                $utilisateur->collegues = array();\r
@@ -11,7 +11,7 @@ class commonDAOClient extends commonDAOUtilisateur {
 \r
        public function cree($utilisateur = null)\r
        {\r
-               $utilisateur = new extranetClient();\r
+               $utilisateur = new commonClient();\r
                $utilisateur->rs = '';\r
                $utilisateur->adresse_facturation = '';\r
                $utilisateur->collegues = array();\r

diff --git a/inc/commons/DAO/class.common.dao.entreprise.php b/inc/commons/DAO/class.common.dao.entreprise.php
index 4992314e2168d2e69f5f4d7321ea18cf6d7f7e89..327953269536e7bbb23183f29fb73ae602223981 100644 (file)
--- a/inc/commons/DAO/class.common.dao.entreprise.php
+++ b/inc/commons/DAO/class.common.dao.entreprise.php
@@ -2,7 +2,7 @@
 class commonDAOEntreprise extends commonDAO {\r
        protected function singleton($r)\r
        {\r
-               $entreprise = new extranetEntreprise();\r
+               $entreprise = new commonEntreprise();\r
                $entreprise->entreprise_id = $r->entreprise_id;\r
                $entreprise->nom = $r->nom;\r
                $entreprise->adresse = $r->adresse;\r
@@ -22,7 +22,7 @@ class commonDAOEntreprise extends commonDAO {
 \r
        public function cree()\r
        {\r
-               $entreprise = new extranetEntreprise();\r
+               $entreprise = new commonEntreprise();\r
                $entreprise->entreprise_id = 'new';\r
                $entreprise->date_creation = time();\r
                $entreprise->pays = 'FR';\r
@@ -63,7 +63,7 @@ class commonDAOEntreprise extends commonDAO {
        {\r
                global $core;\r
                if (!is_null($this->q)) {\r
-                       $daoClients = new extranetDAOClient($this->con);\r
+                       $daoClients = new commonDAOClient($this->con);\r
                        $where = '';\r
                        $where .= 'entreprise_id=\'' . $this->con->escape($this->q) . '\' OR ';\r
                        $where .= 'nom LIKE \'%' . $this->con->escape($this->q) . '%\' OR ';\r
@@ -91,7 +91,7 @@ class commonDAOEntreprise extends commonDAO {
                }\r
                $liste = $newList;\r
 \r
-               $daoClients = new extranetDAOClient($this->con);\r
+               $daoClients = new commonDAOClient($this->con);\r
                $contacts = $daoClients->getContactsOfEntreprises($ids);\r
                $contactSorted = array();\r
                foreach($contacts as $c) {\r
@@ -171,7 +171,7 @@ class commonDAOEntreprise extends commonDAO {
 \r
        public function getContacts($entreprise_id)\r
        {\r
-               $daoClient = new extranetDAOClient($this->con);\r
+               $daoClient = new commonDAOClient($this->con);\r
                return $daoClient->getContactsOfEntreprise($entreprise_id);\r
        }\r
 }\r

diff --git a/inc/commons/DAO/class.common.dao.equipier.php b/inc/commons/DAO/class.common.dao.equipier.php
index c04acda353e6c7678fa9fa78699d893d61355181..9b41a00d86f1cbc18e22fad9ad3ddbb0f7668998 100644 (file)
--- a/inc/commons/DAO/class.common.dao.equipier.php
+++ b/inc/commons/DAO/class.common.dao.equipier.php
@@ -2,7 +2,7 @@
 class commonDAOEquipier extends commonDAOUtilisateur {\r
        protected function singleton($r)\r
        {\r
-               $utilisateur = new extranetEquipier();\r
+               $utilisateur = new commonEquipier();\r
                $utilisateur->utilisateur_id = $r->utilisateur_id;\r
                $utilisateur->agence = $r->agence;\r
                return parent::singleton($r);\r
@@ -10,7 +10,7 @@ class commonDAOEquipier extends commonDAOUtilisateur {
 \r
        public function cree($utilisateur = null)\r
        {\r
-               $utilisateur = new extranetEquipier();\r
+               $utilisateur = new commonEquipier();\r
                $utilisateur->agence = 'Paris';\r
                $utilisateur->grade = 1;\r
                return parent::cree($utilisateur);\r

diff --git a/inc/commons/DAO/class.common.dao.utilisateur.php b/inc/commons/DAO/class.common.dao.utilisateur.php
index edaf61a0c9aea5d792ca3af60b019afbe7d61fdc..d81874454880bb906df66f17289f2984cb3adb7b 100644 (file)
--- a/inc/commons/DAO/class.common.dao.utilisateur.php
+++ b/inc/commons/DAO/class.common.dao.utilisateur.php
@@ -7,7 +7,7 @@ class commonDAOUtilisateur extends commonDAO {
                }\r
                if (is_null($utilisateur)) {\r
                        if ($r->grade == 0) {\r
-                               $utilisateur = new extranetClient();\r
+                               $utilisateur = new commonClient();\r
                                if (isset($r->ca)) {\r
                                        $utilisateur->ca = $r->ca;\r
                                }\r
@@ -15,7 +15,7 @@ class commonDAOUtilisateur extends commonDAO {
                                        $utilisateur->rs = $r->rs;\r
                                }\r
                        } else {\r
-                               $utilisateur = new extranetEquipier();\r
+                               $utilisateur = new commonEquipier();\r
                                $utilisateur->agence = $r->agence;\r
                        }\r
                }\r
@@ -85,7 +85,7 @@ class commonDAOUtilisateur extends commonDAO {
        {\r
                $utilisateur = $this->cree(null);\r
                $utilisateur->entreprise = $entreprise_id;\r
-               $daoEntreprise = new extranetDAOEntreprise($this->con);\r
+               $daoEntreprise = new commonDAOEntreprise($this->con);\r
                $entreprise = $daoEntreprise->selectById($entreprise_id);\r
                $utilisateur->adresse = $entreprise->adresse;\r
                $utilisateur->code_postal = $entreprise->code_postal;\r

diff --git a/inc/commons/Metier/class.extranet.client.php b/inc/commons/Metier/class.extranet.client.php
index 5baeacdd4af4086974665324a7fde18cb3c7b987..9753c4349fa61d94496f61aa6a7439508c817c93 100644 (file)
--- a/inc/commons/Metier/class.extranet.client.php
+++ b/inc/commons/Metier/class.extranet.client.php
@@ -1,5 +1,5 @@
 <?php\r
-class extranetClient extends commonUtilisateur {\r
+class commonClient extends commonUtilisateur {\r
        // Attributs composés\r
        protected $adresse_facturation;\r
        protected $tva_intra;\r

diff --git a/inc/commons/Metier/class.extranet.entreprise.php b/inc/commons/Metier/class.extranet.entreprise.php
index f815e7890f33fd0b9eca809d524194aeecf51a9b..1f4f220ee8d043a122699d3179723deb7aaccf09 100644 (file)
--- a/inc/commons/Metier/class.extranet.entreprise.php
+++ b/inc/commons/Metier/class.extranet.entreprise.php
@@ -1,6 +1,6 @@
 <?php\r
 \r
-class extranetEntreprise extends cubeMetier {\r
+class commonEntreprise extends cubeMetier {\r
        protected $entreprise_id;\r
        protected $nom;\r
        protected $adresse;\r

diff --git a/inc/commons/Metier/class.extranet.equipier.php b/inc/commons/Metier/class.extranet.equipier.php
index a3bc4c47943286ac3213868e4245f7d6a2f03a8b..75b577022ce15948da6e2b8952f5a19c886b7233 100644 (file)
--- a/inc/commons/Metier/class.extranet.equipier.php
+++ b/inc/commons/Metier/class.extranet.equipier.php
@@ -1,5 +1,5 @@
 <?php\r
-class extranetEquipier extends commonUtilisateur {\r
+class commonEquipier extends commonUtilisateur {\r
        protected $agence;\r
 \r
        public function getSignature()\r

diff --git a/inc/commons/class.common.core.php b/inc/commons/class.common.core.php
index afc444ce044affab275620bc7539f131d64798b4..e223dc79ab16d32fe2fa5d0943d0ce588d023689 100644 (file)
--- a/inc/commons/class.common.core.php
+++ b/inc/commons/class.common.core.php
@@ -77,7 +77,7 @@ class commonCore extends cubeCore {
                        return;\r
                }\r
                if ($this->user->grade == 0) {\r
-                       $daoClient = new extranetDAOClient($this->con);\r
+                       $daoClient = new commonDAOClient($this->con);\r
                        $this->user->collegues = $daoClient->getColleguesList($this->user->utilisateur_id);\r
                }\r
        }\r

diff --git a/inc/commons/class.common.url.php b/inc/commons/class.common.url.php
index 1dda2843a8947ff3a48e33da2473fed3c1056879..d29e5e5ca5774a471e9e4772b83df78471d2daae 100644 (file)
--- a/inc/commons/class.common.url.php
+++ b/inc/commons/class.common.url.php
@@ -98,7 +98,7 @@ class commonUrl {
                $res .= '<tr><td>Login :</td><td>' . form::field('login', 20, 64, $utilisateur->login) . '</td></tr>';\r
                $res .= '<tr><td>Langue de l\'interface :</td><td>' . form::combo('lang', cubeLang::getAvailableLangs(true), $utilisateur->lang) . '</td></tr>';\r
                $res .= '<tr><td colspan="2" class="right"><a href="#" class="submit">' . $core->typo->BoutonOK(__('Enregister')) . '</a></td></tr>';\r
-               if ($utilisateur instanceof extranetClient) {\r
+               if ($utilisateur instanceof commonClient) {\r
                        $res .= '<tr><td colspan="2"></td></tr>';\r
                        $res .= '<tr><th colspan="2">' . __('Mes informations') . '</th></tr>';\r
                        $res .= '<tr><td>' . __('Numéro de client') . ' : </td><td>' . $utilisateur->utilisateur_id . '</td></tr>';\r

diff --git a/inc/extranet/Controlleur/class.extranet.ajax.php b/inc/extranet/Controlleur/class.extranet.ajax.php
index 7a76516910e848c299f7e55af5cfbf2624d1be2c..2e3b140da3b3aa4801a156ea7a5806d6c62d354f 100644 (file)
--- a/inc/extranet/Controlleur/class.extranet.ajax.php
+++ b/inc/extranet/Controlleur/class.extranet.ajax.php
@@ -31,7 +31,7 @@ class extranetAjax {
        public static function saveClient($args, &$x)\r
        {\r
                global $core;\r
-               $dao = new extranetDAOEntreprise($core->con);\r
+               $dao = new commonDAOEntreprise($core->con);\r
                $entreprise = $dao->sauve($_POST);\r
                if ($_POST['entreprise_id'] == 'new') {\r
                        $data = $_POST['contact'];\r
@@ -43,7 +43,7 @@ class extranetAjax {
                        $data['pays'] = $entreprise->pays;\r
                        $data['grade'] = 0;\r
                        $data['adresse_facturation'] = $entreprise->adresse_facturation;\r
-                       $daoClient = new extranetDAOClient($core->con);\r
+                       $daoClient = new commonDAOClient($core->con);\r
                        try {\r
                                $daoClient->sauve($data);\r
                        }\r
@@ -60,7 +60,7 @@ class extranetAjax {
        public static function saveNotes($args, &$x)\r
        {\r
                global $core;\r
-               $dao = new extranetDAOClient($core->con);\r
+               $dao = new commonDAOClient($core->con);\r
                $dao->sauveNotes($_POST['utilisateur_id'], $_POST['notes']);\r
                $x->addClosePopup();\r
        }\r
@@ -68,7 +68,7 @@ class extranetAjax {
        public static function saveContact($args, &$x)\r
        {\r
                global $core;\r
-               $dao = new extranetDAOClient($core->con);\r
+               $dao = new commonDAOClient($core->con);\r
                $client = $dao->sauve($_POST);\r
                $x->addClosePopup();\r
                $x->addContent('devisAdresseDisplay', extranetUrl::adresse($client->utilisateur_id, null, 'devis'));\r
@@ -87,7 +87,7 @@ class extranetAjax {
        public static function supprimeClient($args, &$x)\r
        {\r
                global $core;\r
-               $dao = new extranetDAOEntreprise($core->con);\r
+               $dao = new commonDAOEntreprise($core->con);\r
                $dao->supprime($args[1]);\r
 \r
                $x->addContent('listeClients', extranetUrl::listeClients());\r
@@ -136,7 +136,7 @@ class extranetAjax {
        public static function clientDetailCa($args, &$x)\r
        {\r
                global $core;\r
-               $dao = new extranetDAOEntreprise($core->con);\r
+               $dao = new commonDAOEntreprise($core->con);\r
                $client = $dao->selectById($args[1]);\r
                return self::form('', __("Détail du chiffre d'affaire de") . ' ' . $client->nom, extranetUrl::clientDetailCa($args[1]), false);\r
        }\r
@@ -144,7 +144,7 @@ class extranetAjax {
        public static function clientDetailImpaye($args, &$x)\r
        {\r
                global $core;\r
-               $dao = new extranetDAOEntreprise($core->con);\r
+               $dao = new commonDAOEntreprise($core->con);\r
                $client = $dao->selectById($args[1]);\r
                return self::form('', __("Détail des impayés de") . ' ' . $client->nom, extranetUrl::clientDetailImpaye($args[1]), false, 4);\r
        }\r
@@ -715,7 +715,7 @@ class extranetAjax {
                extranetDroits::min(1);\r
 \r
                $daoProjet = new extranetDAOProjet($core->con);\r
-               $daoClient = new extranetDAOClient($core->con);\r
+               $daoClient = new commonDAOClient($core->con);\r
                if (is_null($daoProjet->selectById($_POST['projet'])) && (!isset($_POST['client']) || is_null($daoClient->selectById($_POST['client'])))) {\r
                        $x->addError('projet_nom');\r
                        $x->addRedirection('#');\r

diff --git a/inc/extranet/Controlleur/class.extranet.droits.php b/inc/extranet/Controlleur/class.extranet.droits.php
index d1cb554bab20ec4d24652dfe0d5f64cf7c76bbb6..f39d3b288125c76085b5a0ed22248513c92d0c01 100644 (file)
--- a/inc/extranet/Controlleur/class.extranet.droits.php
+++ b/inc/extranet/Controlleur/class.extranet.droits.php
@@ -92,7 +92,7 @@ class extranetDroits {
                if ($core->user->grade > 0) {\r
                        return true;\r
                } else {\r
-                       $dao = new extranetDAOClient($core->con);\r
+                       $dao = new commonDAOClient($core->con);\r
                        $contacts = $dao->getCollegues($utilisateur_id);\r
                        $collegues = array();\r
                        foreach($contacts as $c) {\r

diff --git a/inc/extranet/Controlleur/class.extranet.url.php b/inc/extranet/Controlleur/class.extranet.url.php
index 18e154dad6ed013f3260c704f6baf3e3e51205fc..ca4cae3d53a28ef939b5431159598bfd0542fcfc 100644 (file)
--- a/inc/extranet/Controlleur/class.extranet.url.php
+++ b/inc/extranet/Controlleur/class.extranet.url.php
@@ -31,7 +31,7 @@ class extranetUrl {
                extranetDroits::min(1);\r
                $settings = is_null($settings)?$core->user->getSettings('clients'):$settings;\r
                $change = is_null($dashboard)?'Client':'Dashboard/' . $dashboard;\r
-               $dao = new extranetDAOEntreprise($core->con);\r
+               $dao = new commonDAOEntreprise($core->con);\r
                if (isset($settings['search']) && !is_null($settings['search'])) {\r
                        $dao->setSearch($settings['search']);\r
                }\r
@@ -99,7 +99,7 @@ class extranetUrl {
        public static function clientDetailCa($entreprise_id)\r
        {\r
                global $core;\r
-               $dao = new extranetDAOEntreprise($core->con);\r
+               $dao = new commonDAOEntreprise($core->con);\r
                $annees = $dao->getCaDetails($entreprise_id);\r
                $res = '';\r
                $i = 0;\r
@@ -115,7 +115,7 @@ class extranetUrl {
        {\r
                global $core;\r
                $dao = new extranetDAOFacture($core->con);\r
-               $daoClient = new extranetDAOEntreprise($core->con);\r
+               $daoClient = new commonDAOEntreprise($core->con);\r
                $factures = $dao->getImpayesOfClient($entreprise_id);\r
                $client = $daoClient->selectById($entreprise_id);\r
                $res = '';\r
@@ -148,7 +148,7 @@ class extranetUrl {
        {\r
                global $core;\r
                extranetDroits::min(1);\r
-               $dao = new extranetDAOEntreprise($core->con);\r
+               $dao = new commonDAOEntreprise($core->con);\r
                $daoUtilisateur = new commonDAOUtilisateur($core->con);\r
                if ($entreprise_id == 'new') {\r
                        $client = $dao->cree();\r
@@ -185,7 +185,7 @@ class extranetUrl {
                        $res .= '<tr class="odd"><td>' . __('Administrateur responsable') . '</td><td>' . $d->administrateur->prenom . ' ' . $d->administrateur->nom . ' (' . $d->administrateur->rs . ')</td></tr>';\r
                }\r
                if ($entreprise_id == 'new') {\r
-                       $daoContact = new extranetDAOClient($core->con);\r
+                       $daoContact = new commonDAOClient($core->con);\r
                        $contact = $daoContact->cree();\r
                        $res .= '<tr><th colspan="2" class="light"><strong>' . __('Contact') . '</strong></th></tr>';\r
                        $res .= '<tr><td>' . __('Adresse e-mail') . '</td><td>' . form::field(array('contact[email]'), 30, 128, $contact->email) . '</td></tr>';\r
@@ -204,7 +204,7 @@ class extranetUrl {
        {\r
                global $core;\r
                extranetDroits::min(1);\r
-               $dao = new extranetDAOEntreprise($core->con);\r
+               $dao = new commonDAOEntreprise($core->con);\r
                $contacts = $dao->getContacts($entreprise_id);\r
 \r
                $res = '<table class="liste light">';\r
@@ -227,7 +227,7 @@ class extranetUrl {
                global $core;\r
                extranetDroits::min(1);\r
 \r
-               $dao = new extranetDAOClient($core->con);\r
+               $dao = new commonDAOClient($core->con);\r
                if ($client_id == 'new') {\r
                        $client = $dao->creeFromEntreprise($entreprise_id);\r
                } else {\r
@@ -529,7 +529,7 @@ class extranetUrl {
                        $projet = $dao->selectById($projet_id);\r
                }\r
 \r
-               $daoClient = new extranetDAOClient($core->con);\r
+               $daoClient = new commonDAOClient($core->con);\r
                $clients = $daoClient->getListe();\r
 \r
                $listeClients = array();\r
@@ -538,7 +538,7 @@ class extranetUrl {
                }\r
                ksort($listeClients);\r
 \r
-               $daoEquipier = new extranetDAOEquipier($core->con);\r
+               $daoEquipier = new commonDAOEquipier($core->con);\r
                $equipiers = $daoEquipier->getListe();\r
 \r
                $listeEquipiers = array();\r
@@ -1043,7 +1043,7 @@ class extranetUrl {
        public static function adresse($utilisateur_id = null, $projet_id = null, $display = 'devis', $adresse = '')\r
        {\r
                global $core;\r
-               $dao = new extranetDAOClient($core->con);\r
+               $dao = new commonDAOClient($core->con);\r
                if (!is_null($utilisateur_id)) {\r
                        $client = $dao->selectById($utilisateur_id);\r
                }\r
@@ -1401,7 +1401,7 @@ class extranetUrl {
                        $facture->lignes = $lignes;\r
                } elseif ($facture_id == 'ws') {\r
                        if (is_null($projet_id)) {\r
-                               $daoClient = new extranetDAOClient($core->con);\r
+                               $daoClient = new commonDAOClient($core->con);\r
                                $client = $daoClient->selectById($_POST['client_id']);\r
                                $facture->projet_id = 'new';\r
                                $facture->client = $client->rs;\r
@@ -1656,7 +1656,7 @@ class extranetUrl {
                $q = mb_strtolower(cubeText::removeAccents($args[2]));\r
                $suggestions = array();\r
                if ($args[1] == 'client') {\r
-                       $dao = new extranetDAOClient($core->con);\r
+                       $dao = new commonDAOClient($core->con);\r
                        $dao->setSearch($q, true);\r
                        $clients = $dao->getListe();\r
                        foreach($clients as $client) {\r
@@ -1677,7 +1677,7 @@ class extranetUrl {
                                $suggestions[] = $book->book_id . ' - ' . $book->nom;\r
                        }\r
                } elseif ($args[1] == 'wsuser') {\r
-                       $dao = new extranetDAOClient($core->con);\r
+                       $dao = new commonDAOClient($core->con);\r
                        $dao->setSearch($q, true);\r
                        $clients = $dao->getListe();\r
                        foreach($clients as $client) {\r
@@ -1766,7 +1766,7 @@ class extranetUrl {
                extranetDroits::min(2);\r
                $settings = is_null($settings)?$core->user->getSettings('equipiers'):$settings;\r
                $change = is_null($dashboard)?'Equipier':'Dashboard/' . $dashboard;\r
-               $dao = new extranetDAOEquipier($core->con);\r
+               $dao = new commonDAOEquipier($core->con);\r
                $liste = $dao->getListe($settings['orderby'], $settings['sens'], $settings['limit']);\r
 \r
                $res = '<table class="liste">';\r
@@ -1813,7 +1813,7 @@ class extranetUrl {
                $settings = $core->user->getSettings('fichiers');\r
 \r
                if ($core->user->grade > 0 && isset($args[1])) {\r
-                       $dao = new extranetDAOClient($core->con);\r
+                       $dao = new commonDAOClient($core->con);\r
                        $client = $dao->selectById($args[1]);\r
                        $_SESSION['entreprise_fichiers'] = $client->entreprise;\r
                }\r
@@ -1850,7 +1850,7 @@ class extranetUrl {
                        $titre = __('Envoyez-nous un fichier');\r
                        $texte = __('Cliquez sur le bouton Parcourir, et sélectionnez le ou les fichiers que vous souhaitez nous faire parvenir');\r
                } else {\r
-                       $dao = new extranetDAOClient($core->con);\r
+                       $dao = new commonDAOClient($core->con);\r
                        $client = $dao->selectById($for);\r
                        $titre = __('Envoyer un fichier à') . ' ' . $client->prenom . ' ' . $client->nom;\r
                        $texte = '';\r
@@ -2003,7 +2003,7 @@ class extranetUrl {
                                                $body .= ' - http://extranet.cubedesigners.com/telecharger/' . $f . "\n";\r
                                        }\r
                                } else {\r
-                                       $dao = new extranetDAOClient($core->con);\r
+                                       $dao = new commonDAOClient($core->con);\r
                                        $client = $dao->selectById($for);\r
 \r
                                        $mail->to = $core->user->email;\r

diff --git a/inc/extranet/DAO/_common.php b/inc/extranet/DAO/_common.php
index aac817cd228a0baf8360d25ec2f57b8840b5f7ce..bb1fb0255338d9846beee3008dd301e596115c59 100644 (file)
--- a/inc/extranet/DAO/_common.php
+++ b/inc/extranet/DAO/_common.php
@@ -1,12 +1,12 @@
 <?php\r
 $__autoload['extranetDAO'] = dirname(__FILE__) . '/class.extranet.dao.php';\r
-$__autoload['extranetDAOClient'] = dirname(__FILE__) . '/class.extranet.dao.client.php';\r
-$__autoload['extranetDAOEquipier'] = dirname(__FILE__) . '/class.extranet.dao.equipier.php';\r
+$__autoload['commonDAOClient'] = dirname(__FILE__) . '/class.extranet.dao.client.php';\r
+$__autoload['commonDAOEquipier'] = dirname(__FILE__) . '/class.extranet.dao.equipier.php';\r
 $__autoload['extranetDAODevis'] = dirname(__FILE__) . '/class.extranet.dao.devis.php';\r
 $__autoload['extranetDAOFacture'] = dirname(__FILE__) . '/class.extranet.dao.facture.php';\r
 $__autoload['extranetDAOProjet'] = dirname(__FILE__) . '/class.extranet.dao.projet.php';\r
 $__autoload['extranetDAOTache'] = dirname(__FILE__) . '/class.extranet.dao.tache.php';\r
 $__autoload['extranetDAOTimereport'] = dirname(__FILE__) . '/class.extranet.dao.timereport.php';\r
-$__autoload['extranetDAOEntreprise'] = dirname(__FILE__) . '/class.extranet.dao.entreprise.php';\r
+$__autoload['commonDAOEntreprise'] = dirname(__FILE__) . '/class.extranet.dao.entreprise.php';\r
 $__autoload['extranetDAOFichier'] = dirname(__FILE__) . '/class.extranet.dao.fichier.php';\r
 ?>
\ No newline at end of file

diff --git a/inc/extranet/DAO/class.extranet.dao.devis.php b/inc/extranet/DAO/class.extranet.dao.devis.php
index 4e5aab8804a10aa20660ebf018a2da286313cffa..4ccba7a4e6efd698f760c245a5b9f874fc327dcf 100644 (file)
--- a/inc/extranet/DAO/class.extranet.dao.devis.php
+++ b/inc/extranet/DAO/class.extranet.dao.devis.php
@@ -133,7 +133,7 @@ class extranetDAODevis extends commonDAO {
                        $where = '';\r
                        $where .= 'devis_id=\'' . $this->con->escape($this->q) . '\' OR ';\r
                        $where .= 'nom LIKE \'%' . $this->con->escape($this->q) . '%\'';\r
-                       $daoClient = new extranetDAOClient($this->con);\r
+                       $daoClient = new commonDAOClient($this->con);\r
                        $where .= ' OR client_id IN(' . $daoClient->querySearchByName($this->q) . ')';\r
                        $limit = null;\r
                } else {\r

diff --git a/inc/extranet/DAO/class.extranet.dao.fichier.php b/inc/extranet/DAO/class.extranet.dao.fichier.php
index 49c66da068158bdc82283b42d3074bd38d974edb..e494baa1dff414c3405e3823940a5fdfe03dcb8f 100644 (file)
--- a/inc/extranet/DAO/class.extranet.dao.fichier.php
+++ b/inc/extranet/DAO/class.extranet.dao.fichier.php
@@ -21,9 +21,9 @@ class extranetDAOFichier extends commonDAO {
 \r
        public function getListe($orderby = null, $sens = null, $limit = null)\r
        {\r
-               $dao = new extranetDAOEntreprise($this->con);\r
+               $dao = new commonDAOEntreprise($this->con);\r
                $contacts = $dao->getContacts($this->entreprise_id);\r
-               $daoEquipiers = new extranetDAOEquipier($this->con);\r
+               $daoEquipiers = new commonDAOEquipier($this->con);\r
                $eq = $daoEquipiers->selectAll();\r
                $equipiers = array();\r
                foreach($eq as $e) {\r
@@ -69,7 +69,7 @@ class extranetDAOFichier extends commonDAO {
 \r
        public function count()\r
        {\r
-               $dao = new extranetDAOEntreprise($this->con);\r
+               $dao = new commonDAOEntreprise($this->con);\r
                $contacts = $dao->getContacts($this->entreprise_id);\r
                $res = 0;\r
                foreach($contacts as $contact) {\r

diff --git a/inc/extranet/DAO/class.extranet.dao.projet.php b/inc/extranet/DAO/class.extranet.dao.projet.php
index 71a13895ebc1f9542a1c0bda445541c89fd9a884..e6097433d886e550bb389e54a073c9b1ee9b5ec5 100644 (file)
--- a/inc/extranet/DAO/class.extranet.dao.projet.php
+++ b/inc/extranet/DAO/class.extranet.dao.projet.php
@@ -167,7 +167,7 @@ class extranetDAOProjet extends commonDAO {
                                $where .= ' p.projet_id=\'' . $this->con->escape($this->q) . '\' OR ';\r
                        }\r
                        $where .= 'p.nom LIKE \'%' . $this->con->escape($this->q) . '%\'';\r
-                       $daoClient = new extranetDAOClient($this->con);\r
+                       $daoClient = new commonDAOClient($this->con);\r
                        $where .= ' OR p.client_id IN(' . $daoClient->querySearchByName($this->q) . ')';\r
                        $limit = null;\r
                } else {\r
@@ -208,7 +208,7 @@ class extranetDAOProjet extends commonDAO {
                                $where .= ' projet_id=\'' . $this->con->escape($this->q) . '\' OR ';\r
                        }\r
                        $where .= 'nom LIKE \'%' . $this->con->escape($this->q) . '%\'';\r
-                       $daoClient = new extranetDAOClient($this->con);\r
+                       $daoClient = new commonDAOClient($this->con);\r
                        $where .= ' OR client_id IN(' . $daoClient->querySearchByName($this->q) . ')';\r
                        $limit = null;\r
                } else {\r
@@ -226,7 +226,7 @@ class extranetDAOProjet extends commonDAO {
        public function querySearchByName($q)\r
        {\r
                $where = 'nom LIKE \'%' . $this->con->escape($q) . '%\'';\r
-               $daoClient = new extranetDAOClient($this->con);\r
+               $daoClient = new commonDAOClient($this->con);\r
                $where .= ' OR client IN(' . $daoClient->querySearchByName($q) . ')';\r
                $sql = 'SELECT projet_id FROM projets WHERE ' . $where;\r
                return $sql;\r

diff --git a/inc/extranet/Metier/_common.php b/inc/extranet/Metier/_common.php
index 6081a6c04ceb0af2f7703ef85ddadc60807b957e..fce10f160385aaa4d6bffaf45d4294544c0e3a38 100644 (file)
--- a/inc/extranet/Metier/_common.php
+++ b/inc/extranet/Metier/_common.php
@@ -1,6 +1,6 @@
 <?php\r
-$__autoload['extranetEquipier'] = dirname(__FILE__) . '/class.extranet.equipier.php';\r
-$__autoload['extranetClient'] = dirname(__FILE__) . '/class.extranet.client.php';\r
+$__autoload['commonEquipier'] = dirname(__FILE__) . '/class.extranet.equipier.php';\r
+$__autoload['commonClient'] = dirname(__FILE__) . '/class.extranet.client.php';\r
 $__autoload['extranetProjet'] = dirname(__FILE__) . '/class.extranet.projet.php';\r
 $__autoload['extranetTache'] = dirname(__FILE__) . '/class.extranet.tache.php';\r
 $__autoload['extranetTacheSousTraitee'] = dirname(__FILE__) . '/class.extranet.tache.soustraitee.php';\r
@@ -9,7 +9,7 @@ $__autoload['extranetTimereport'] = dirname(__FILE__) . '/class.extranet.timerep
 $__autoload['extranetDocument'] = dirname(__FILE__) . '/class.extranet.document.php';\r
 $__autoload['extranetDevis'] = dirname(__FILE__) . '/class.extranet.devis.php';\r
 $__autoload['extranetFacture'] = dirname(__FILE__) . '/class.extranet.facture.php';\r
-$__autoload['extranetEntreprise'] = dirname(__FILE__) . '/class.extranet.entreprise.php';\r
+$__autoload['commonEntreprise'] = dirname(__FILE__) . '/class.extranet.entreprise.php';\r
 $__autoload['extranetFichier'] = dirname(__FILE__) . '/class.extranet.fichier.php';\r
 \r
 \r

diff --git a/inc/extranet/Metier/class.extranet.client.php b/inc/extranet/Metier/class.extranet.client.php
index 5baeacdd4af4086974665324a7fde18cb3c7b987..9753c4349fa61d94496f61aa6a7439508c817c93 100644 (file)
--- a/inc/extranet/Metier/class.extranet.client.php
+++ b/inc/extranet/Metier/class.extranet.client.php
@@ -1,5 +1,5 @@
 <?php\r
-class extranetClient extends commonUtilisateur {\r
+class commonClient extends commonUtilisateur {\r
        // Attributs composés\r
        protected $adresse_facturation;\r
        protected $tva_intra;\r

diff --git a/inc/extranet/Metier/class.extranet.entreprise.php b/inc/extranet/Metier/class.extranet.entreprise.php
index f815e7890f33fd0b9eca809d524194aeecf51a9b..1f4f220ee8d043a122699d3179723deb7aaccf09 100644 (file)
--- a/inc/extranet/Metier/class.extranet.entreprise.php
+++ b/inc/extranet/Metier/class.extranet.entreprise.php
@@ -1,6 +1,6 @@
 <?php\r
 \r
-class extranetEntreprise extends cubeMetier {\r
+class commonEntreprise extends cubeMetier {\r
        protected $entreprise_id;\r
        protected $nom;\r
        protected $adresse;\r

diff --git a/inc/extranet/Metier/class.extranet.equipier.php b/inc/extranet/Metier/class.extranet.equipier.php
index a3bc4c47943286ac3213868e4245f7d6a2f03a8b..75b577022ce15948da6e2b8952f5a19c886b7233 100644 (file)
--- a/inc/extranet/Metier/class.extranet.equipier.php
+++ b/inc/extranet/Metier/class.extranet.equipier.php
@@ -1,5 +1,5 @@
 <?php\r
-class extranetEquipier extends commonUtilisateur {\r
+class commonEquipier extends commonUtilisateur {\r
        protected $agence;\r
 \r
        public function getSignature()\r

diff --git a/inc/ws/Controlleur/class.ws.url.php b/inc/ws/Controlleur/class.ws.url.php
index 54da9a285addb329f52535527c8e6481f70be896..df45d34be808421755411d64758741063c8d30da 100644 (file)
--- a/inc/ws/Controlleur/class.ws.url.php
+++ b/inc/ws/Controlleur/class.ws.url.php
@@ -399,7 +399,7 @@ html{height:100%}' . "\n";
                extranetDroits::min(1);\r
                $settings = is_null($settings)?$core->user->getSettings('clients'):$settings;\r
                $change = is_null($dashboard)?'Client':'Dashboard/' . $dashboard;\r
-               $dao = new extranetDAOEntreprise($core->con);\r
+               $dao = new commonDAOEntreprise($core->con);\r
                if (isset($settings['search']) && !is_null($settings['search'])) {\r
                        $dao->setSearch($settings['search']);\r
                }\r
@@ -449,7 +449,7 @@ html{height:100%}' . "\n";
        {\r
                global $core;\r
                extranetDroits::min(1);\r
-               $dao = new extranetDAOEntreprise($core->con);\r
+               $dao = new commonDAOEntreprise($core->con);\r
                $daoUtilisateur = new commonDAOUtilisateur($core->con);\r
                if ($entreprise_id == 'new') {\r
                        $client = $dao->cree();\r
@@ -486,7 +486,7 @@ html{height:100%}' . "\n";
                        $res .= '<tr class="odd"><td>' . __('Administrateur responsable') . '</td><td>' . $d->administrateur->prenom . ' ' . $d->administrateur->nom . ' (' . $d->administrateur->rs . ')</td></tr>';\r
                }\r
                if ($entreprise_id == 'new') {\r
-                       $daoContact = new extranetDAOClient($core->con);\r
+                       $daoContact = new commonDAOClient($core->con);\r
                        $contact = $daoContact->cree();\r
                        $res .= '<tr><th colspan="2" class="light"><strong>' . __('Contact') . '</strong></th></tr>';\r
                        $res .= '<tr><td>' . __('Adresse e-mail') . '</td><td>' . form::field(array('contact[email]'), 30, 128, $contact->email) . '</td></tr>';\r
@@ -505,7 +505,7 @@ html{height:100%}' . "\n";
        {\r
                global $core;\r
                extranetDroits::min(1);\r
-               $dao = new extranetDAOEntreprise($core->con);\r
+               $dao = new commonDAOEntreprise($core->con);\r
                $contacts = $dao->getContacts($entreprise_id);\r
 \r
                $res = '<table class="liste light">';\r
@@ -528,7 +528,7 @@ html{height:100%}' . "\n";
                global $core;\r
                extranetDroits::min(1);\r
 \r
-               $dao = new extranetDAOClient($core->con);\r
+               $dao = new commonDAOClient($core->con);\r
                if ($client_id == 'new') {\r
                        $client = $dao->creeFromEntreprise($entreprise_id);\r
                } else {\r

diff --git a/inc/ws/DAO/class.ws.dao.book.php b/inc/ws/DAO/class.ws.dao.book.php
index d8d60b73987ce4d4d2c29932f59e27d5a673be54..b422cffca57ca79c1dde7d6f1a0cbd68db8a9cf6 100644 (file)
--- a/inc/ws/DAO/class.ws.dao.book.php
+++ b/inc/ws/DAO/class.ws.dao.book.php
@@ -257,7 +257,7 @@ class wsDAOBook extends commonDAO {
                                $where .= ' book_id=\'' . $this->con->escape($this->q) . '\' OR ';\r
                        }\r
                        $where .= 'nom LIKE \'%' . $this->con->escape($this->q) . '%\'';\r
-                       $daoClient = new extranetDAOClient($this->con);\r
+                       $daoClient = new commonDAOClient($this->con);\r
                        $where .= ' OR proprietaire_id IN(' . $daoClient->querySearchByName($this->q) . ')';\r
                        $limit = null;\r
                } else {\r