From 51b813f78ee08b25ba97ffa95b9ff80fc399783e Mon Sep 17 00:00:00 2001
From: "vincent@cubedesigners.com"
 <vincent@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Date: Mon, 17 Jan 2011 11:06:07 +0000
Subject: [PATCH]

---
 inc/commons/DAO/class.common.dao.client.php   |  4 +--
 .../DAO/class.common.dao.entreprise.php       | 10 +++---
 inc/commons/DAO/class.common.dao.equipier.php |  4 +--
 .../DAO/class.common.dao.utilisateur.php      |  6 ++--
 inc/commons/Metier/class.extranet.client.php  |  2 +-
 .../Metier/class.extranet.entreprise.php      |  2 +-
 .../Metier/class.extranet.equipier.php        |  2 +-
 inc/commons/class.common.core.php             |  2 +-
 inc/commons/class.common.url.php              |  2 +-
 .../Controlleur/class.extranet.ajax.php       | 16 ++++-----
 .../Controlleur/class.extranet.droits.php     |  2 +-
 .../Controlleur/class.extranet.url.php        | 34 +++++++++----------
 inc/extranet/DAO/_common.php                  |  6 ++--
 inc/extranet/DAO/class.extranet.dao.devis.php |  2 +-
 .../DAO/class.extranet.dao.fichier.php        |  6 ++--
 .../DAO/class.extranet.dao.projet.php         |  6 ++--
 inc/extranet/Metier/_common.php               |  6 ++--
 inc/extranet/Metier/class.extranet.client.php |  2 +-
 .../Metier/class.extranet.entreprise.php      |  2 +-
 .../Metier/class.extranet.equipier.php        |  2 +-
 inc/ws/Controlleur/class.ws.url.php           | 10 +++---
 inc/ws/DAO/class.ws.dao.book.php              |  2 +-
 22 files changed, 65 insertions(+), 65 deletions(-)

diff --git a/inc/commons/DAO/class.common.dao.client.php b/inc/commons/DAO/class.common.dao.client.php
index c39c046ba..63df074ad 100644
--- 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 {
 	protected function singleton($r, $utilisateur = null)
 	{
-		$utilisateur = new extranetClient();
+		$utilisateur = new commonClient();
 		$utilisateur->rs = $r->rs;
 		$utilisateur->adresse_facturation = $r->adresse_facturation;
 		$utilisateur->collegues = array();
@@ -11,7 +11,7 @@ class commonDAOClient extends commonDAOUtilisateur {
 
 	public function cree($utilisateur = null)
 	{
-		$utilisateur = new extranetClient();
+		$utilisateur = new commonClient();
 		$utilisateur->rs = '';
 		$utilisateur->adresse_facturation = '';
 		$utilisateur->collegues = array();
diff --git a/inc/commons/DAO/class.common.dao.entreprise.php b/inc/commons/DAO/class.common.dao.entreprise.php
index 4992314e2..327953269 100644
--- 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 {
 	protected function singleton($r)
 	{
-		$entreprise = new extranetEntreprise();
+		$entreprise = new commonEntreprise();
 		$entreprise->entreprise_id = $r->entreprise_id;
 		$entreprise->nom = $r->nom;
 		$entreprise->adresse = $r->adresse;
@@ -22,7 +22,7 @@ class commonDAOEntreprise extends commonDAO {
 
 	public function cree()
 	{
-		$entreprise = new extranetEntreprise();
+		$entreprise = new commonEntreprise();
 		$entreprise->entreprise_id = 'new';
 		$entreprise->date_creation = time();
 		$entreprise->pays = 'FR';
@@ -63,7 +63,7 @@ class commonDAOEntreprise extends commonDAO {
 	{
 		global $core;
 		if (!is_null($this->q)) {
-			$daoClients = new extranetDAOClient($this->con);
+			$daoClients = new commonDAOClient($this->con);
 			$where = '';
 			$where .= 'entreprise_id=\'' . $this->con->escape($this->q) . '\' OR ';
 			$where .= 'nom LIKE \'%' . $this->con->escape($this->q) . '%\' OR ';
@@ -91,7 +91,7 @@ class commonDAOEntreprise extends commonDAO {
 		}
 		$liste = $newList;
 
-		$daoClients = new extranetDAOClient($this->con);
+		$daoClients = new commonDAOClient($this->con);
 		$contacts = $daoClients->getContactsOfEntreprises($ids);
 		$contactSorted = array();
 		foreach($contacts as $c) {
@@ -171,7 +171,7 @@ class commonDAOEntreprise extends commonDAO {
 
 	public function getContacts($entreprise_id)
 	{
-		$daoClient = new extranetDAOClient($this->con);
+		$daoClient = new commonDAOClient($this->con);
 		return $daoClient->getContactsOfEntreprise($entreprise_id);
 	}
 }
diff --git a/inc/commons/DAO/class.common.dao.equipier.php b/inc/commons/DAO/class.common.dao.equipier.php
index c04acda35..9b41a00d8 100644
--- 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 {
 	protected function singleton($r)
 	{
-		$utilisateur = new extranetEquipier();
+		$utilisateur = new commonEquipier();
 		$utilisateur->utilisateur_id = $r->utilisateur_id;
 		$utilisateur->agence = $r->agence;
 		return parent::singleton($r);
@@ -10,7 +10,7 @@ class commonDAOEquipier extends commonDAOUtilisateur {
 
 	public function cree($utilisateur = null)
 	{
-		$utilisateur = new extranetEquipier();
+		$utilisateur = new commonEquipier();
 		$utilisateur->agence = 'Paris';
 		$utilisateur->grade = 1;
 		return parent::cree($utilisateur);
diff --git a/inc/commons/DAO/class.common.dao.utilisateur.php b/inc/commons/DAO/class.common.dao.utilisateur.php
index edaf61a0c..d81874454 100644
--- 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 {
 		}
 		if (is_null($utilisateur)) {
 			if ($r->grade == 0) {
-				$utilisateur = new extranetClient();
+				$utilisateur = new commonClient();
 				if (isset($r->ca)) {
 					$utilisateur->ca = $r->ca;
 				}
@@ -15,7 +15,7 @@ class commonDAOUtilisateur extends commonDAO {
 					$utilisateur->rs = $r->rs;
 				}
 			} else {
-				$utilisateur = new extranetEquipier();
+				$utilisateur = new commonEquipier();
 				$utilisateur->agence = $r->agence;
 			}
 		}
@@ -85,7 +85,7 @@ class commonDAOUtilisateur extends commonDAO {
 	{
 		$utilisateur = $this->cree(null);
 		$utilisateur->entreprise = $entreprise_id;
-		$daoEntreprise = new extranetDAOEntreprise($this->con);
+		$daoEntreprise = new commonDAOEntreprise($this->con);
 		$entreprise = $daoEntreprise->selectById($entreprise_id);
 		$utilisateur->adresse = $entreprise->adresse;
 		$utilisateur->code_postal = $entreprise->code_postal;
diff --git a/inc/commons/Metier/class.extranet.client.php b/inc/commons/Metier/class.extranet.client.php
index 5baeacdd4..9753c4349 100644
--- a/inc/commons/Metier/class.extranet.client.php
+++ b/inc/commons/Metier/class.extranet.client.php
@@ -1,5 +1,5 @@
 <?php
-class extranetClient extends commonUtilisateur {
+class commonClient extends commonUtilisateur {
 	// Attributs composés
 	protected $adresse_facturation;
 	protected $tva_intra;
diff --git a/inc/commons/Metier/class.extranet.entreprise.php b/inc/commons/Metier/class.extranet.entreprise.php
index f815e7890..1f4f220ee 100644
--- a/inc/commons/Metier/class.extranet.entreprise.php
+++ b/inc/commons/Metier/class.extranet.entreprise.php
@@ -1,6 +1,6 @@
 <?php
 
-class extranetEntreprise extends cubeMetier {
+class commonEntreprise extends cubeMetier {
 	protected $entreprise_id;
 	protected $nom;
 	protected $adresse;
diff --git a/inc/commons/Metier/class.extranet.equipier.php b/inc/commons/Metier/class.extranet.equipier.php
index a3bc4c479..75b577022 100644
--- a/inc/commons/Metier/class.extranet.equipier.php
+++ b/inc/commons/Metier/class.extranet.equipier.php
@@ -1,5 +1,5 @@
 <?php
-class extranetEquipier extends commonUtilisateur {
+class commonEquipier extends commonUtilisateur {
 	protected $agence;
 
 	public function getSignature()
diff --git a/inc/commons/class.common.core.php b/inc/commons/class.common.core.php
index afc444ce0..e223dc79a 100644
--- a/inc/commons/class.common.core.php
+++ b/inc/commons/class.common.core.php
@@ -77,7 +77,7 @@ class commonCore extends cubeCore {
 			return;
 		}
 		if ($this->user->grade == 0) {
-			$daoClient = new extranetDAOClient($this->con);
+			$daoClient = new commonDAOClient($this->con);
 			$this->user->collegues = $daoClient->getColleguesList($this->user->utilisateur_id);
 		}
 	}
diff --git a/inc/commons/class.common.url.php b/inc/commons/class.common.url.php
index 1dda2843a..d29e5e5ca 100644
--- 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>';
 		$res .= '<tr><td>Langue de l\'interface :</td><td>' . form::combo('lang', cubeLang::getAvailableLangs(true), $utilisateur->lang) . '</td></tr>';
 		$res .= '<tr><td colspan="2" class="right"><a href="#" class="submit">' . $core->typo->BoutonOK(__('Enregister')) . '</a></td></tr>';
-		if ($utilisateur instanceof extranetClient) {
+		if ($utilisateur instanceof commonClient) {
 			$res .= '<tr><td colspan="2"></td></tr>';
 			$res .= '<tr><th colspan="2">' . __('Mes informations') . '</th></tr>';
 			$res .= '<tr><td>' . __('Numéro de client') . ' : </td><td>' . $utilisateur->utilisateur_id . '</td></tr>';
diff --git a/inc/extranet/Controlleur/class.extranet.ajax.php b/inc/extranet/Controlleur/class.extranet.ajax.php
index 7a7651691..2e3b140da 100644
--- 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)
 	{
 		global $core;
-		$dao = new extranetDAOEntreprise($core->con);
+		$dao = new commonDAOEntreprise($core->con);
 		$entreprise = $dao->sauve($_POST);
 		if ($_POST['entreprise_id'] == 'new') {
 			$data = $_POST['contact'];
@@ -43,7 +43,7 @@ class extranetAjax {
 			$data['pays'] = $entreprise->pays;
 			$data['grade'] = 0;
 			$data['adresse_facturation'] = $entreprise->adresse_facturation;
-			$daoClient = new extranetDAOClient($core->con);
+			$daoClient = new commonDAOClient($core->con);
 			try {
 				$daoClient->sauve($data);
 			}
@@ -60,7 +60,7 @@ class extranetAjax {
 	public static function saveNotes($args, &$x)
 	{
 		global $core;
-		$dao = new extranetDAOClient($core->con);
+		$dao = new commonDAOClient($core->con);
 		$dao->sauveNotes($_POST['utilisateur_id'], $_POST['notes']);
 		$x->addClosePopup();
 	}
@@ -68,7 +68,7 @@ class extranetAjax {
 	public static function saveContact($args, &$x)
 	{
 		global $core;
-		$dao = new extranetDAOClient($core->con);
+		$dao = new commonDAOClient($core->con);
 		$client = $dao->sauve($_POST);
 		$x->addClosePopup();
 		$x->addContent('devisAdresseDisplay', extranetUrl::adresse($client->utilisateur_id, null, 'devis'));
@@ -87,7 +87,7 @@ class extranetAjax {
 	public static function supprimeClient($args, &$x)
 	{
 		global $core;
-		$dao = new extranetDAOEntreprise($core->con);
+		$dao = new commonDAOEntreprise($core->con);
 		$dao->supprime($args[1]);
 
 		$x->addContent('listeClients', extranetUrl::listeClients());
@@ -136,7 +136,7 @@ class extranetAjax {
 	public static function clientDetailCa($args, &$x)
 	{
 		global $core;
-		$dao = new extranetDAOEntreprise($core->con);
+		$dao = new commonDAOEntreprise($core->con);
 		$client = $dao->selectById($args[1]);
 		return self::form('', __("Détail du chiffre d'affaire de") . ' ' . $client->nom, extranetUrl::clientDetailCa($args[1]), false);
 	}
@@ -144,7 +144,7 @@ class extranetAjax {
 	public static function clientDetailImpaye($args, &$x)
 	{
 		global $core;
-		$dao = new extranetDAOEntreprise($core->con);
+		$dao = new commonDAOEntreprise($core->con);
 		$client = $dao->selectById($args[1]);
 		return self::form('', __("Détail des impayés de") . ' ' . $client->nom, extranetUrl::clientDetailImpaye($args[1]), false, 4);
 	}
@@ -715,7 +715,7 @@ class extranetAjax {
 		extranetDroits::min(1);
 
 		$daoProjet = new extranetDAOProjet($core->con);
-		$daoClient = new extranetDAOClient($core->con);
+		$daoClient = new commonDAOClient($core->con);
 		if (is_null($daoProjet->selectById($_POST['projet'])) && (!isset($_POST['client']) || is_null($daoClient->selectById($_POST['client'])))) {
 			$x->addError('projet_nom');
 			$x->addRedirection('#');
diff --git a/inc/extranet/Controlleur/class.extranet.droits.php b/inc/extranet/Controlleur/class.extranet.droits.php
index d1cb554ba..f39d3b288 100644
--- 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) {
 			return true;
 		} else {
-			$dao = new extranetDAOClient($core->con);
+			$dao = new commonDAOClient($core->con);
 			$contacts = $dao->getCollegues($utilisateur_id);
 			$collegues = array();
 			foreach($contacts as $c) {
diff --git a/inc/extranet/Controlleur/class.extranet.url.php b/inc/extranet/Controlleur/class.extranet.url.php
index 18e154dad..ca4cae3d5 100644
--- 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);
 		$settings = is_null($settings)?$core->user->getSettings('clients'):$settings;
 		$change = is_null($dashboard)?'Client':'Dashboard/' . $dashboard;
-		$dao = new extranetDAOEntreprise($core->con);
+		$dao = new commonDAOEntreprise($core->con);
 		if (isset($settings['search']) && !is_null($settings['search'])) {
 			$dao->setSearch($settings['search']);
 		}
@@ -99,7 +99,7 @@ class extranetUrl {
 	public static function clientDetailCa($entreprise_id)
 	{
 		global $core;
-		$dao = new extranetDAOEntreprise($core->con);
+		$dao = new commonDAOEntreprise($core->con);
 		$annees = $dao->getCaDetails($entreprise_id);
 		$res = '';
 		$i = 0;
@@ -115,7 +115,7 @@ class extranetUrl {
 	{
 		global $core;
 		$dao = new extranetDAOFacture($core->con);
-		$daoClient = new extranetDAOEntreprise($core->con);
+		$daoClient = new commonDAOEntreprise($core->con);
 		$factures = $dao->getImpayesOfClient($entreprise_id);
 		$client = $daoClient->selectById($entreprise_id);
 		$res = '';
@@ -148,7 +148,7 @@ class extranetUrl {
 	{
 		global $core;
 		extranetDroits::min(1);
-		$dao = new extranetDAOEntreprise($core->con);
+		$dao = new commonDAOEntreprise($core->con);
 		$daoUtilisateur = new commonDAOUtilisateur($core->con);
 		if ($entreprise_id == 'new') {
 			$client = $dao->cree();
@@ -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>';
 		}
 		if ($entreprise_id == 'new') {
-			$daoContact = new extranetDAOClient($core->con);
+			$daoContact = new commonDAOClient($core->con);
 			$contact = $daoContact->cree();
 			$res .= '<tr><th colspan="2" class="light"><strong>' . __('Contact') . '</strong></th></tr>';
 			$res .= '<tr><td>' . __('Adresse e-mail') . '</td><td>' . form::field(array('contact[email]'), 30, 128, $contact->email) . '</td></tr>';
@@ -204,7 +204,7 @@ class extranetUrl {
 	{
 		global $core;
 		extranetDroits::min(1);
-		$dao = new extranetDAOEntreprise($core->con);
+		$dao = new commonDAOEntreprise($core->con);
 		$contacts = $dao->getContacts($entreprise_id);
 
 		$res = '<table class="liste light">';
@@ -227,7 +227,7 @@ class extranetUrl {
 		global $core;
 		extranetDroits::min(1);
 
-		$dao = new extranetDAOClient($core->con);
+		$dao = new commonDAOClient($core->con);
 		if ($client_id == 'new') {
 			$client = $dao->creeFromEntreprise($entreprise_id);
 		} else {
@@ -529,7 +529,7 @@ class extranetUrl {
 			$projet = $dao->selectById($projet_id);
 		}
 
-		$daoClient = new extranetDAOClient($core->con);
+		$daoClient = new commonDAOClient($core->con);
 		$clients = $daoClient->getListe();
 
 		$listeClients = array();
@@ -538,7 +538,7 @@ class extranetUrl {
 		}
 		ksort($listeClients);
 
-		$daoEquipier = new extranetDAOEquipier($core->con);
+		$daoEquipier = new commonDAOEquipier($core->con);
 		$equipiers = $daoEquipier->getListe();
 
 		$listeEquipiers = array();
@@ -1043,7 +1043,7 @@ class extranetUrl {
 	public static function adresse($utilisateur_id = null, $projet_id = null, $display = 'devis', $adresse = '')
 	{
 		global $core;
-		$dao = new extranetDAOClient($core->con);
+		$dao = new commonDAOClient($core->con);
 		if (!is_null($utilisateur_id)) {
 			$client = $dao->selectById($utilisateur_id);
 		}
@@ -1401,7 +1401,7 @@ class extranetUrl {
 			$facture->lignes = $lignes;
 		} elseif ($facture_id == 'ws') {
 			if (is_null($projet_id)) {
-				$daoClient = new extranetDAOClient($core->con);
+				$daoClient = new commonDAOClient($core->con);
 				$client = $daoClient->selectById($_POST['client_id']);
 				$facture->projet_id = 'new';
 				$facture->client = $client->rs;
@@ -1656,7 +1656,7 @@ class extranetUrl {
 		$q = mb_strtolower(cubeText::removeAccents($args[2]));
 		$suggestions = array();
 		if ($args[1] == 'client') {
-			$dao = new extranetDAOClient($core->con);
+			$dao = new commonDAOClient($core->con);
 			$dao->setSearch($q, true);
 			$clients = $dao->getListe();
 			foreach($clients as $client) {
@@ -1677,7 +1677,7 @@ class extranetUrl {
 				$suggestions[] = $book->book_id . ' - ' . $book->nom;
 			}
 		} elseif ($args[1] == 'wsuser') {
-			$dao = new extranetDAOClient($core->con);
+			$dao = new commonDAOClient($core->con);
 			$dao->setSearch($q, true);
 			$clients = $dao->getListe();
 			foreach($clients as $client) {
@@ -1766,7 +1766,7 @@ class extranetUrl {
 		extranetDroits::min(2);
 		$settings = is_null($settings)?$core->user->getSettings('equipiers'):$settings;
 		$change = is_null($dashboard)?'Equipier':'Dashboard/' . $dashboard;
-		$dao = new extranetDAOEquipier($core->con);
+		$dao = new commonDAOEquipier($core->con);
 		$liste = $dao->getListe($settings['orderby'], $settings['sens'], $settings['limit']);
 
 		$res = '<table class="liste">';
@@ -1813,7 +1813,7 @@ class extranetUrl {
 		$settings = $core->user->getSettings('fichiers');
 
 		if ($core->user->grade > 0 && isset($args[1])) {
-			$dao = new extranetDAOClient($core->con);
+			$dao = new commonDAOClient($core->con);
 			$client = $dao->selectById($args[1]);
 			$_SESSION['entreprise_fichiers'] = $client->entreprise;
 		}
@@ -1850,7 +1850,7 @@ class extranetUrl {
 			$titre = __('Envoyez-nous un fichier');
 			$texte = __('Cliquez sur le bouton Parcourir, et sélectionnez le ou les fichiers que vous souhaitez nous faire parvenir');
 		} else {
-			$dao = new extranetDAOClient($core->con);
+			$dao = new commonDAOClient($core->con);
 			$client = $dao->selectById($for);
 			$titre = __('Envoyer un fichier à') . ' ' . $client->prenom . ' ' . $client->nom;
 			$texte = '';
@@ -2003,7 +2003,7 @@ class extranetUrl {
 						$body .= ' - http://extranet.cubedesigners.com/telecharger/' . $f . "\n";
 					}
 				} else {
-					$dao = new extranetDAOClient($core->con);
+					$dao = new commonDAOClient($core->con);
 					$client = $dao->selectById($for);
 
 					$mail->to = $core->user->email;
diff --git a/inc/extranet/DAO/_common.php b/inc/extranet/DAO/_common.php
index aac817cd2..bb1fb0255 100644
--- a/inc/extranet/DAO/_common.php
+++ b/inc/extranet/DAO/_common.php
@@ -1,12 +1,12 @@
 <?php
 $__autoload['extranetDAO'] = dirname(__FILE__) . '/class.extranet.dao.php';
-$__autoload['extranetDAOClient'] = dirname(__FILE__) . '/class.extranet.dao.client.php';
-$__autoload['extranetDAOEquipier'] = dirname(__FILE__) . '/class.extranet.dao.equipier.php';
+$__autoload['commonDAOClient'] = dirname(__FILE__) . '/class.extranet.dao.client.php';
+$__autoload['commonDAOEquipier'] = dirname(__FILE__) . '/class.extranet.dao.equipier.php';
 $__autoload['extranetDAODevis'] = dirname(__FILE__) . '/class.extranet.dao.devis.php';
 $__autoload['extranetDAOFacture'] = dirname(__FILE__) . '/class.extranet.dao.facture.php';
 $__autoload['extranetDAOProjet'] = dirname(__FILE__) . '/class.extranet.dao.projet.php';
 $__autoload['extranetDAOTache'] = dirname(__FILE__) . '/class.extranet.dao.tache.php';
 $__autoload['extranetDAOTimereport'] = dirname(__FILE__) . '/class.extranet.dao.timereport.php';
-$__autoload['extranetDAOEntreprise'] = dirname(__FILE__) . '/class.extranet.dao.entreprise.php';
+$__autoload['commonDAOEntreprise'] = dirname(__FILE__) . '/class.extranet.dao.entreprise.php';
 $__autoload['extranetDAOFichier'] = dirname(__FILE__) . '/class.extranet.dao.fichier.php';
 ?>
\ 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 4e5aab880..4ccba7a4e 100644
--- 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 = '';
 			$where .= 'devis_id=\'' . $this->con->escape($this->q) . '\' OR ';
 			$where .= 'nom LIKE \'%' . $this->con->escape($this->q) . '%\'';
-			$daoClient = new extranetDAOClient($this->con);
+			$daoClient = new commonDAOClient($this->con);
 			$where .= ' OR client_id IN(' . $daoClient->querySearchByName($this->q) . ')';
 			$limit = null;
 		} else {
diff --git a/inc/extranet/DAO/class.extranet.dao.fichier.php b/inc/extranet/DAO/class.extranet.dao.fichier.php
index 49c66da06..e494baa1d 100644
--- 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 {
 
 	public function getListe($orderby = null, $sens = null, $limit = null)
 	{
-		$dao = new extranetDAOEntreprise($this->con);
+		$dao = new commonDAOEntreprise($this->con);
 		$contacts = $dao->getContacts($this->entreprise_id);
-		$daoEquipiers = new extranetDAOEquipier($this->con);
+		$daoEquipiers = new commonDAOEquipier($this->con);
 		$eq = $daoEquipiers->selectAll();
 		$equipiers = array();
 		foreach($eq as $e) {
@@ -69,7 +69,7 @@ class extranetDAOFichier extends commonDAO {
 
 	public function count()
 	{
-		$dao = new extranetDAOEntreprise($this->con);
+		$dao = new commonDAOEntreprise($this->con);
 		$contacts = $dao->getContacts($this->entreprise_id);
 		$res = 0;
 		foreach($contacts as $contact) {
diff --git a/inc/extranet/DAO/class.extranet.dao.projet.php b/inc/extranet/DAO/class.extranet.dao.projet.php
index 71a13895e..e6097433d 100644
--- 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 ';
 			}
 			$where .= 'p.nom LIKE \'%' . $this->con->escape($this->q) . '%\'';
-			$daoClient = new extranetDAOClient($this->con);
+			$daoClient = new commonDAOClient($this->con);
 			$where .= ' OR p.client_id IN(' . $daoClient->querySearchByName($this->q) . ')';
 			$limit = null;
 		} else {
@@ -208,7 +208,7 @@ class extranetDAOProjet extends commonDAO {
 				$where .= ' projet_id=\'' . $this->con->escape($this->q) . '\' OR ';
 			}
 			$where .= 'nom LIKE \'%' . $this->con->escape($this->q) . '%\'';
-			$daoClient = new extranetDAOClient($this->con);
+			$daoClient = new commonDAOClient($this->con);
 			$where .= ' OR client_id IN(' . $daoClient->querySearchByName($this->q) . ')';
 			$limit = null;
 		} else {
@@ -226,7 +226,7 @@ class extranetDAOProjet extends commonDAO {
 	public function querySearchByName($q)
 	{
 		$where = 'nom LIKE \'%' . $this->con->escape($q) . '%\'';
-		$daoClient = new extranetDAOClient($this->con);
+		$daoClient = new commonDAOClient($this->con);
 		$where .= ' OR client IN(' . $daoClient->querySearchByName($q) . ')';
 		$sql = 'SELECT projet_id FROM projets WHERE ' . $where;
 		return $sql;
diff --git a/inc/extranet/Metier/_common.php b/inc/extranet/Metier/_common.php
index 6081a6c04..fce10f160 100644
--- a/inc/extranet/Metier/_common.php
+++ b/inc/extranet/Metier/_common.php
@@ -1,6 +1,6 @@
 <?php
-$__autoload['extranetEquipier'] = dirname(__FILE__) . '/class.extranet.equipier.php';
-$__autoload['extranetClient'] = dirname(__FILE__) . '/class.extranet.client.php';
+$__autoload['commonEquipier'] = dirname(__FILE__) . '/class.extranet.equipier.php';
+$__autoload['commonClient'] = dirname(__FILE__) . '/class.extranet.client.php';
 $__autoload['extranetProjet'] = dirname(__FILE__) . '/class.extranet.projet.php';
 $__autoload['extranetTache'] = dirname(__FILE__) . '/class.extranet.tache.php';
 $__autoload['extranetTacheSousTraitee'] = dirname(__FILE__) . '/class.extranet.tache.soustraitee.php';
@@ -9,7 +9,7 @@ $__autoload['extranetTimereport'] = dirname(__FILE__) . '/class.extranet.timerep
 $__autoload['extranetDocument'] = dirname(__FILE__) . '/class.extranet.document.php';
 $__autoload['extranetDevis'] = dirname(__FILE__) . '/class.extranet.devis.php';
 $__autoload['extranetFacture'] = dirname(__FILE__) . '/class.extranet.facture.php';
-$__autoload['extranetEntreprise'] = dirname(__FILE__) . '/class.extranet.entreprise.php';
+$__autoload['commonEntreprise'] = dirname(__FILE__) . '/class.extranet.entreprise.php';
 $__autoload['extranetFichier'] = dirname(__FILE__) . '/class.extranet.fichier.php';
 
 
diff --git a/inc/extranet/Metier/class.extranet.client.php b/inc/extranet/Metier/class.extranet.client.php
index 5baeacdd4..9753c4349 100644
--- a/inc/extranet/Metier/class.extranet.client.php
+++ b/inc/extranet/Metier/class.extranet.client.php
@@ -1,5 +1,5 @@
 <?php
-class extranetClient extends commonUtilisateur {
+class commonClient extends commonUtilisateur {
 	// Attributs composés
 	protected $adresse_facturation;
 	protected $tva_intra;
diff --git a/inc/extranet/Metier/class.extranet.entreprise.php b/inc/extranet/Metier/class.extranet.entreprise.php
index f815e7890..1f4f220ee 100644
--- a/inc/extranet/Metier/class.extranet.entreprise.php
+++ b/inc/extranet/Metier/class.extranet.entreprise.php
@@ -1,6 +1,6 @@
 <?php
 
-class extranetEntreprise extends cubeMetier {
+class commonEntreprise extends cubeMetier {
 	protected $entreprise_id;
 	protected $nom;
 	protected $adresse;
diff --git a/inc/extranet/Metier/class.extranet.equipier.php b/inc/extranet/Metier/class.extranet.equipier.php
index a3bc4c479..75b577022 100644
--- a/inc/extranet/Metier/class.extranet.equipier.php
+++ b/inc/extranet/Metier/class.extranet.equipier.php
@@ -1,5 +1,5 @@
 <?php
-class extranetEquipier extends commonUtilisateur {
+class commonEquipier extends commonUtilisateur {
 	protected $agence;
 
 	public function getSignature()
diff --git a/inc/ws/Controlleur/class.ws.url.php b/inc/ws/Controlleur/class.ws.url.php
index 54da9a285..df45d34be 100644
--- 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);
 		$settings = is_null($settings)?$core->user->getSettings('clients'):$settings;
 		$change = is_null($dashboard)?'Client':'Dashboard/' . $dashboard;
-		$dao = new extranetDAOEntreprise($core->con);
+		$dao = new commonDAOEntreprise($core->con);
 		if (isset($settings['search']) && !is_null($settings['search'])) {
 			$dao->setSearch($settings['search']);
 		}
@@ -449,7 +449,7 @@ html{height:100%}' . "\n";
 	{
 		global $core;
 		extranetDroits::min(1);
-		$dao = new extranetDAOEntreprise($core->con);
+		$dao = new commonDAOEntreprise($core->con);
 		$daoUtilisateur = new commonDAOUtilisateur($core->con);
 		if ($entreprise_id == 'new') {
 			$client = $dao->cree();
@@ -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>';
 		}
 		if ($entreprise_id == 'new') {
-			$daoContact = new extranetDAOClient($core->con);
+			$daoContact = new commonDAOClient($core->con);
 			$contact = $daoContact->cree();
 			$res .= '<tr><th colspan="2" class="light"><strong>' . __('Contact') . '</strong></th></tr>';
 			$res .= '<tr><td>' . __('Adresse e-mail') . '</td><td>' . form::field(array('contact[email]'), 30, 128, $contact->email) . '</td></tr>';
@@ -505,7 +505,7 @@ html{height:100%}' . "\n";
 	{
 		global $core;
 		extranetDroits::min(1);
-		$dao = new extranetDAOEntreprise($core->con);
+		$dao = new commonDAOEntreprise($core->con);
 		$contacts = $dao->getContacts($entreprise_id);
 
 		$res = '<table class="liste light">';
@@ -528,7 +528,7 @@ html{height:100%}' . "\n";
 		global $core;
 		extranetDroits::min(1);
 
-		$dao = new extranetDAOClient($core->con);
+		$dao = new commonDAOClient($core->con);
 		if ($client_id == 'new') {
 			$client = $dao->creeFromEntreprise($entreprise_id);
 		} else {
diff --git a/inc/ws/DAO/class.ws.dao.book.php b/inc/ws/DAO/class.ws.dao.book.php
index d8d60b739..b422cffca 100644
--- 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 ';
 			}
 			$where .= 'nom LIKE \'%' . $this->con->escape($this->q) . '%\'';
-			$daoClient = new extranetDAOClient($this->con);
+			$daoClient = new commonDAOClient($this->con);
 			$where .= ' OR proprietaire_id IN(' . $daoClient->querySearchByName($this->q) . ')';
 			$limit = null;
 		} else {
-- 
2.39.5