From: vincent@cubedesigners.com <vincent@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Date: Mon, 29 Aug 2011 11:43:37 +0000 (+0000)
Subject: (no commit message)
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=63cf9bf138c369551b2a707841b94780d429017e;p=cubeextranet.git

---

diff --git a/inc/extranet/Controlleur/class.extranet.ajax.php b/inc/extranet/Controlleur/class.extranet.ajax.php
index c71962043..50a53ae13 100644
--- a/inc/extranet/Controlleur/class.extranet.ajax.php
+++ b/inc/extranet/Controlleur/class.extranet.ajax.php
@@ -1,8 +1,8 @@
 <?php
+
 class extranetAjax {
 
-	public static function formClient($args, &$x)
-	{
+	public static function formClient($args, &$x) {
 		global $core;
 		if ($args[1] == 'new') {
 			$extra = '';
@@ -14,22 +14,19 @@ class extranetAjax {
 		commonAjax::form('saveClient', __("Edition d'un client"), extranetUrl::formClient($args[1]), false, 2, '', $extra);
 	}
 
-	public static function formContact($args, &$x)
-	{
+	public static function formContact($args, &$x) {
 		if (!isset($args[2])) {
 			$args[2] = null;
 		}
 		commonAjax::form('saveContact', __("Edition d'un contact"), extranetUrl::formContact($args[1], $args[2]));
 	}
 
-	public static function formNotes($args, &$x)
-	{
+	public static function formNotes($args, &$x) {
 		global $core;
 		commonAjax::form('saveNotes', __('Edition des notes'), extranetUrl::formNotes($args[1]));
 	}
 
-	public static function saveClient($args, &$x)
-	{
+	public static function saveClient($args, &$x) {
 		global $core;
 		$dao = new commonDAOEntreprise($core->con);
 		$entreprise = $dao->sauve($_POST);
@@ -46,8 +43,7 @@ class extranetAjax {
 			$daoClient = new commonDAOClient($core->con);
 			try {
 				$daoClient->sauve($data);
-			}
-			catch(exception $e) {
+			} catch (exception $e) {
 				fb($e);
 				$dao->supprime($entreprise->entreprise_id);
 			}
@@ -57,16 +53,14 @@ class extranetAjax {
 		$x->addClosePopup();
 	}
 
-	public static function saveNotes($args, &$x)
-	{
+	public static function saveNotes($args, &$x) {
 		global $core;
 		$dao = new commonDAOClient($core->con);
 		$dao->sauveNotes($_POST['utilisateur_id'], $_POST['notes']);
 		$x->addClosePopup();
 	}
 
-	public static function saveContact($args, &$x)
-	{
+	public static function saveContact($args, &$x) {
 		global $core;
 		$dao = new commonDAOClient($core->con);
 		$client = $dao->sauve($_POST);
@@ -76,7 +70,7 @@ class extranetAjax {
 		$x->addContent('listeContacts', extranetUrl::listeContacts($client->entreprise));
 		$contacts = array();
 		$client_contacts = $dao->getContactsOfEntreprise($client->entreprise);
-		foreach($client_contacts as $c) {
+		foreach ($client_contacts as $c) {
 			$contacts[] = '<a href="#" class="popup" rel="formContact/' . $c->utilisateur_id . '">' . $c->prenom . ' ' . $c->nom . '</a>';
 		}
 		$x->addContent('contacts_' . $client->entreprise, implode(', ', $contacts));
@@ -84,8 +78,7 @@ class extranetAjax {
 		$x->addPopupDimensions();
 	}
 
-	public static function supprimeClient($args, &$x)
-	{
+	public static function supprimeClient($args, &$x) {
 		global $core;
 		$dao = new commonDAOEntreprise($core->con);
 		$dao->supprime($args[1]);
@@ -93,36 +86,31 @@ class extranetAjax {
 		$x->addContent('listeClients', extranetUrl::listeClients());
 	}
 
-	public static function searchClients($args, &$x)
-	{
+	public static function searchClients($args, &$x) {
 		$x->addContent('listeClients', extranetUrl::listeClients());
 	}
 
-	public static function sortClient($args, &$x)
-	{
+	public static function sortClient($args, &$x) {
 		commonAjax::sort('clients', $args[1]);
 		$x->addContent('listeClients', extranetUrl::listeClients());
 	}
-	public static function sortEquipier($args, &$x)
-	{
+
+	public static function sortEquipier($args, &$x) {
 		commonAjax::sort('equipiers', $args[1]);
 		$x->addContent('listeEquipiers', extranetUrl::listeRh());
 	}
 
-	public static function pageClient($args, &$x)
-	{
+	public static function pageClient($args, &$x) {
 		commonAjax::page('clients', $args[1]);
 		$x->addContent('listeClients', extranetUrl::listeClients());
 	}
 
-	public static function parPageClient($args, &$x)
-	{
+	public static function parPageClient($args, &$x) {
 		commonAjax::parPage('clients', $_POST['par_page']);
 		$x->addContent('listeClients', extranetUrl::listeClients());
 	}
 
-	public static function filtreClients($args, &$x)
-	{
+	public static function filtreClients($args, &$x) {
 		if (isset($args[1]) && $args[1] == 'efface') {
 			commonAjax::filtre('clients');
 			$x->addReload();
@@ -133,30 +121,39 @@ class extranetAjax {
 		}
 	}
 
-	public static function clientDetailCa($args, &$x)
-	{
+	public static function clientDetailCa($args, &$x) {
 		global $core;
 		$dao = new commonDAOEntreprise($core->con);
 		$client = $dao->selectById($args[1]);
 		return commonAjax::form('', __("Détail du chiffre d'affaire de") . ' ' . $client->nom, extranetUrl::clientDetailCa($args[1]), false);
 	}
 
-	public static function clientDetailImpaye($args, &$x)
-	{
+	public static function clientDetailImpaye($args, &$x) {
 		global $core;
 		$dao = new commonDAOEntreprise($core->con);
 		$client = $dao->selectById($args[1]);
 		return commonAjax::form('', __("Détail des impayés de") . ' ' . $client->nom, extranetUrl::clientDetailImpaye($args[1]), false, 4);
 	}
 
-	public static function formProjet($args, &$x)
-	{
+	public static function formProjet($args, &$x) {
 		commonAjax::form('saveProjet', __("Edition d'un projet"), extranetUrl::formProjet($args[1]));
 	}
 
-	public static function saveProjet($args, &$x)
-	{
+	public static function saveProjet($args, &$x) {
 		global $core;
+
+		$error = false;
+		if ($_POST['client'] == '') {
+			$x->addError('client');
+			$error = true;
+		} else {
+			$x->addOk('client');
+		}
+
+		if ($error) {
+			return;
+		}
+
 		$dao = new extranetDAOProjet($core->con);
 		$id = $dao->sauve($_POST);
 
@@ -164,8 +161,7 @@ class extranetAjax {
 		$x->addRedirection(SITE_PATH . 'projet/' . $id);
 	}
 
-	public static function changeProjetStatus($args, &$x)
-	{
+	public static function changeProjetStatus($args, &$x) {
 		global $core;
 		$dao = new extranetDAOProjet($core->con);
 		$dao->changeStatus($args[1]);
@@ -173,8 +169,7 @@ class extranetAjax {
 		$x->addContent('listeProjet', extranetUrl::listeProjet($args[1]));
 	}
 
-	public static function changeProjetsStatus($args, &$x)
-	{
+	public static function changeProjetsStatus($args, &$x) {
 		global $core;
 		$dao = new extranetDAOProjet($core->con);
 		$dao->changeStatus($args[1]);
@@ -182,8 +177,7 @@ class extranetAjax {
 		$x->addContent('listeProjets', extranetUrl::listeProjets($args[1]));
 	}
 
-	public static function supprimeProjet($args, &$x)
-	{
+	public static function supprimeProjet($args, &$x) {
 		global $core;
 		$dao = new extranetDAOProjet($core->con);
 		$dao->supprime($args[1]);
@@ -191,30 +185,26 @@ class extranetAjax {
 		$x->addRedirection(SITE_PATH . 'projets');
 	}
 
-	public static function searchProjets($args, &$x)
-	{
+	public static function searchProjets($args, &$x) {
 		$x->addContent('listeProjets', extranetUrl::listeProjets());
 	}
 
-	public static function pageProjet($args, &$x)
-	{
+	public static function pageProjet($args, &$x) {
 		commonAjax::page('projets', $args[1]);
 		$x->addContent('listeProjets', extranetUrl::listeProjets());
 	}
-	public static function parPageProjet($args, &$x)
-	{
+
+	public static function parPageProjet($args, &$x) {
 		commonAjax::parPage('projets', $_POST['par_page']);
 		$x->addContent('listeProjets', extranetUrl::listeProjets());
 	}
 
-	public static function sortProjet($args, &$x)
-	{
+	public static function sortProjet($args, &$x) {
 		commonAjax::sort('projets', $args[1]);
 		$x->addContent('listeProjets', extranetUrl::listeProjets());
 	}
 
-	public static function filtreProjet($args, &$x)
-	{
+	public static function filtreProjet($args, &$x) {
 		if (isset($args[1]) && $args[1] == 'efface') {
 			commonAjax::filtre('projets');
 			$x->addReload();
@@ -225,20 +215,17 @@ class extranetAjax {
 		}
 	}
 
-	public static function formTacheNormale($args, &$x)
-	{
-		$projet = isset($args[2])?$args[2]:null;
+	public static function formTacheNormale($args, &$x) {
+		$projet = isset($args[2]) ? $args[2] : null;
 		commonAjax::form('saveTache', __("Edition d'un tâche"), extranetUrl::formTacheNormale($args[1], $projet));
 	}
 
-	public static function formTacheSousTraitee($args, &$x)
-	{
-		$projet = isset($args[2])?$args[2]:null;
+	public static function formTacheSousTraitee($args, &$x) {
+		$projet = isset($args[2]) ? $args[2] : null;
 		commonAjax::form('saveTache', __("Edition d'un tâche sous-traitée"), extranetUrl::formTacheSousTraitee($args[1], $projet));
 	}
 
-	public static function saveTache($args, &$x)
-	{
+	public static function saveTache($args, &$x) {
 		global $core;
 		$dao = new extranetDAOTache($core->con);
 		$dao->sauve($_POST);
@@ -247,8 +234,7 @@ class extranetAjax {
 		$x->addClosePopup();
 	}
 
-	public static function supprimeTache($args, &$x)
-	{
+	public static function supprimeTache($args, &$x) {
 		global $core;
 		$dao = new extranetDAOTache($core->con);
 		$tache = $dao->selectById($args[1]);
@@ -257,8 +243,7 @@ class extranetAjax {
 		$x->addContent('listeProjet', extranetUrl::listeProjet($tache->projet));
 	}
 
-	public static function saveTimereport($args, &$x)
-	{
+	public static function saveTimereport($args, &$x) {
 		global $core;
 		$date = $args[1];
 		$heures = $args[3];
@@ -269,15 +254,15 @@ class extranetAjax {
 		// Mise a jour des valeurs pour le projet et la tâche
 		$daoProjet = new extranetDAOProjet($core->con);
 		$projet = $daoProjet->getProjetByTache($tache_id);
-		foreach($projet as $p) {
-			$p->progression = !$p->progression?'-':$p->progression . '%';
-			$p->jours_consommes = !$p->jours_consommes?'-':$p->jours_consommes;
-			foreach($p->taches as $t) {
+		foreach ($projet as $p) {
+			$p->progression = !$p->progression ? '-' : $p->progression . '%';
+			$p->jours_consommes = !$p->jours_consommes ? '-' : $p->jours_consommes;
+			foreach ($p->taches as $t) {
 				if ($t->tache_id != $tache_id) {
 					continue;
 				}
-				$t->progression = !$t->progression?'-':$t->progression . '%';
-				$t->jours_consommes = !$t->jours_consommes?'-':$t->jours_consommes;
+				$t->progression = !$t->progression ? '-' : $t->progression . '%';
+				$t->jours_consommes = !$t->jours_consommes ? '-' : $t->jours_consommes;
 				break;
 			}
 			$x->addContent('progress_projet_' . $p->projet_id, $p->progression);
@@ -287,31 +272,26 @@ class extranetAjax {
 		}
 	}
 
-	public static function sortTimereport($args, &$x)
-	{
+	public static function sortTimereport($args, &$x) {
 		commonAjax::sort('timereport', $args[1]);
 		$x->addContent('listeTimereport', extranetUrl::listeTimereport());
 	}
 
-	public static function pageTimereport($args, &$x)
-	{
+	public static function pageTimereport($args, &$x) {
 		commonAjax::page('timereport', $args[1]);
 		$x->addContent('listeTimereport', extranetUrl::listeTimereport());
 	}
 
-	public static function searchTimereport($args, &$x)
-	{
+	public static function searchTimereport($args, &$x) {
 		$x->addContent('listeTimereport', extranetUrl::listeTimereport());
 	}
 
-	public static function parPageTimereport($args, &$x)
-	{
+	public static function parPageTimereport($args, &$x) {
 		commonAjax::parPage('timereport', $_POST['par_page']);
 		$x->addContent('listeTimereport', extranetUrl::listeTimereport());
 	}
 
-	public static function filtreTimereport($args, &$x)
-	{
+	public static function filtreTimereport($args, &$x) {
 		if (isset($args[1]) && $args[1] == 'efface') {
 			commonAjax::filtre('timereport');
 			$x->addReload();
@@ -322,8 +302,7 @@ class extranetAjax {
 		}
 	}
 
-	public static function changeDevisStatus($args, &$x)
-	{
+	public static function changeDevisStatus($args, &$x) {
 		global $core;
 		$dao = new extranetDAODevis($core->con);
 		$dao->changeStatus($args[1], $args[2]);
@@ -337,8 +316,7 @@ class extranetAjax {
 		}
 	}
 
-	public static function supprimeDevis($args, &$x)
-	{
+	public static function supprimeDevis($args, &$x) {
 		global $core;
 		$dao = new extranetDAODevis($core->con);
 		$dao->supprime($args[1]);
@@ -348,31 +326,26 @@ class extranetAjax {
 		$x->addContent('listeDevis', extranetUrl::listeDevis());
 	}
 
-	public static function searchDevis($args, &$x)
-	{
+	public static function searchDevis($args, &$x) {
 		$x->addContent('listeDevis', extranetUrl::listeDevis());
 	}
 
-	public static function pageDevis($args, &$x)
-	{
+	public static function pageDevis($args, &$x) {
 		commonAjax::page('devis', $args[1]);
 		$x->addContent('listeDevis', extranetUrl::listeDevis());
 	}
 
-	public static function parPageDevis($args, &$x)
-	{
+	public static function parPageDevis($args, &$x) {
 		commonAjax::parPage('devis', $_POST['par_page']);
 		$x->addContent('listeDevis', extranetUrl::listeDevis());
 	}
 
-	public static function sortDevis($args, &$x)
-	{
+	public static function sortDevis($args, &$x) {
 		commonAjax::sort('devis', $args[1]);
 		$x->addContent('listeDevis', extranetUrl::listeDevis());
 	}
 
-	public static function filtreDevis($args, &$x)
-	{
+	public static function filtreDevis($args, &$x) {
 		if (isset($args[1]) && $args[1] == 'efface') {
 			commonAjax::filtre('devis');
 			$x->addReload();
@@ -383,14 +356,12 @@ class extranetAjax {
 		}
 	}
 
-	public static function sortDevisClient($args, &$x)
-	{
+	public static function sortDevisClient($args, &$x) {
 		commonAjax::sort('devis', $args[1]);
 		$x->addContent('listeDevis', extranetUrl::listeDevisClient());
 	}
 
-	public static function expedieDevis($args, &$x)
-	{
+	public static function expedieDevis($args, &$x) {
 		global $core;
 		$dao = new extranetDAODevis($core->con);
 		$devis = $dao->selectByID($args[2]);
@@ -416,16 +387,14 @@ class extranetAjax {
 		$x->addRedirection(SITE_PATH . 'devis');
 	}
 
-	public static function duplicateDevis($args, &$x)
-	{
+	public static function duplicateDevis($args, &$x) {
 		global $core;
 		$dao = new extranetDAODevis($core->con);
 		$devis = $dao->duplique($args[1], $core->user->utilisateur_id);
 		$x->addRedirection(SITE_PATH . 'editedevis/' . $devis->devis_id);
 	}
 
-	public static function changeFactureStatus($args, &$x)
-	{
+	public static function changeFactureStatus($args, &$x) {
 		global $core;
 		$dao = new extranetDAOFacture($core->con);
 		$dao->changeStatus($args[1], $args[2]);
@@ -433,13 +402,11 @@ class extranetAjax {
 		$x->addContent('listeFactures', extranetUrl::listeFactures());
 	}
 
-	public static function changeFacturePaiement($args, &$x)
-	{
+	public static function changeFacturePaiement($args, &$x) {
 		return commonAjax::form('saveFacturePaiement', __('Informations relatives au paiement de la facture'), extranetUrl::formFacturePaiement($args[1]));
 	}
 
-	public static function saveFacturePaiement($args, &$x)
-	{
+	public static function saveFacturePaiement($args, &$x) {
 		global $core;
 		$dao = new extranetDAOFacture($core->con);
 		$dao->savePaiement($_POST);
@@ -447,8 +414,7 @@ class extranetAjax {
 		$x->addContent('listeFactures', extranetUrl::listeFactures());
 	}
 
-	public static function supprimeFacture($args, &$x)
-	{
+	public static function supprimeFacture($args, &$x) {
 		global $core;
 		$dao = new extranetDAOFacture($core->con);
 		$dao->supprime($args[1]);
@@ -457,8 +423,7 @@ class extranetAjax {
 		$x->addContent('listeFactures', extranetUrl::listeFactures());
 	}
 
-	public static function valideFacture($args, &$x)
-	{
+	public static function valideFacture($args, &$x) {
 		global $core;
 		$dao = new extranetDAOFacture($core->con);
 		$dao->valide($args[1]);
@@ -466,31 +431,26 @@ class extranetAjax {
 		$x->addRedirection(SITE_PATH . 'factures');
 	}
 
-	public static function searchFactures($args, &$x)
-	{
+	public static function searchFactures($args, &$x) {
 		$x->addContent('listeFactures', extranetUrl::listeFactures());
 	}
 
-	public static function pageFacture($args, &$x)
-	{
+	public static function pageFacture($args, &$x) {
 		commonAjax::page('factures', $args[1]);
 		$x->addContent('listeFactures', extranetUrl::listeFactures());
 	}
 
-	public static function parPageFacture($args, &$x)
-	{
+	public static function parPageFacture($args, &$x) {
 		commonAjax::parPage('factures', $_POST['par_page']);
 		$x->addContent('listeFactures', extranetUrl::listeFactures());
 	}
 
-	public static function sortFacture($args, &$x)
-	{
+	public static function sortFacture($args, &$x) {
 		commonAjax::sort('factures', $args[1]);
 		$x->addContent('listeFactures', extranetUrl::listeFactures());
 	}
 
-	public static function filtreFactures($args, &$x)
-	{
+	public static function filtreFactures($args, &$x) {
 		if (isset($args[1]) && $args[1] == 'efface') {
 			commonAjax::filtre('factures');
 			$x->addReload();
@@ -501,8 +461,7 @@ class extranetAjax {
 		}
 	}
 
-	public static function sauveFactures($args, &$x)
-	{
+	public static function sauveFactures($args, &$x) {
 		global $core;
 		$dao = new extranetDAOFacture($core->con);
 		$dao->sauve($_POST);
@@ -510,8 +469,7 @@ class extranetAjax {
 		$x->addRedirection(SITE_PATH . 'factures');
 	}
 
-	public static function duplicateFacture($args, &$x)
-	{
+	public static function duplicateFacture($args, &$x) {
 		global $core;
 
 		$dao = new extranetDAOFacture($core->con);
@@ -520,18 +478,16 @@ class extranetAjax {
 		$x->addRedirection(SITE_PATH . 'editefacture/' . $facture->facture_id);
 	}
 
-	public static function formPrintFactures($args, &$x)
-	{
+	public static function formPrintFactures($args, &$x) {
 		commonAjax::form('printFactures', __('Imprimer des factures'), extranetUrl::formPrintFactures(), __("Lancer l'impression"));
 	}
 
-	public static function printFactures($args, &$x)
-	{
+	public static function printFactures($args, &$x) {
 		global $core;
 		$factures = cubeArray::parseRange($_POST['factures']);
 
 		$liste = array();
-		foreach($factures as $f) {
+		foreach ($factures as $f) {
 			if (file_exists(ROOT . '/factures/' . $f . '.pdf')) {
 				$liste[] = ROOT . '/factures/' . $f . '.pdf';
 			}
@@ -550,10 +506,7 @@ class extranetAjax {
 		$core->sauvePreferencesUtilisateur();
 	}
 
-
-
-	public static function getAdresseForDevis($args, &$x)
-	{
+	public static function getAdresseForDevis($args, &$x) {
 		$adresse = commonUrl::adresse($args[1], null, 'devis');
 		if (!$adresse) {
 			$x->addError('client_nom', '');
@@ -562,8 +515,7 @@ class extranetAjax {
 		}
 	}
 
-	public static function getAdresseForFacture($args, &$x)
-	{
+	public static function getAdresseForFacture($args, &$x) {
 		$adresse = commonUrl::adresse(null, $args[1], 'facture');
 		if (!$adresse) {
 			$x->addError('projet_nom', '');
@@ -572,15 +524,13 @@ class extranetAjax {
 		}
 	}
 
-	public static function saveTrad($args, &$x)
-	{
+	public static function saveTrad($args, &$x) {
 		$data = cubeLang::dataToFile($_POST);
 		file_put_contents(L10N . '/en/main.lang.php', $data);
 		$x->addAlert(__('Traductions sauvegardées'));
 	}
 
-	public static function previewDevis($args, &$x)
-	{
+	public static function previewDevis($args, &$x) {
 		global $core;
 
 		$daoUtilisateur = new commonDAOUtilisateur($core->con);
@@ -597,8 +547,7 @@ class extranetAjax {
 		$x->addRedirection(SITE_PATH . 'previewDevis/' . $devis->devis_id);
 	}
 
-	public static function previewFacture($args, &$x)
-	{
+	public static function previewFacture($args, &$x) {
 		global $core;
 		commonDroits::min(1);
 
@@ -616,8 +565,7 @@ class extranetAjax {
 		$x->addRedirection(SITE_PATH . 'previewFacture/' . $facture->facture_id);
 	}
 
-	public static function chargesDetails($args, &$x)
-	{
+	public static function chargesDetails($args, &$x) {
 		commonAjax::form('', sprintf(__("Détails des charges de l'année %s"), date('Y')), extranetPageChiffres::chargesDetails($args), '', 3, 'liste');
 	}
 
diff --git a/inc/extranet/Controlleur/class.extranet.droits.php b/inc/extranet/Controlleur/class.extranet.droits.php
index 9cbe23028..9f623d1e1 100644
--- a/inc/extranet/Controlleur/class.extranet.droits.php
+++ b/inc/extranet/Controlleur/class.extranet.droits.php
@@ -37,6 +37,7 @@ class extranetDroits {
 
 	public static function projet($projet, $error)
 	{
+		fb($projet);
 		return self::verifDroits($projet->chef_id, 0, 'w', $error);
 	}
 
diff --git a/inc/extranet/Controlleur/class.extranet.url.php b/inc/extranet/Controlleur/class.extranet.url.php
index fe5435db1..1ccf63278 100644
--- a/inc/extranet/Controlleur/class.extranet.url.php
+++ b/inc/extranet/Controlleur/class.extranet.url.php
@@ -431,6 +431,7 @@ class extranetUrl {
 
 		$dao = new extranetDAOProjet($core->con);
 		$projet = $dao->selectById($projet_id);
+		fb($projet_id);
 
 		$hasFacture = $dao->hasFacture($projet_id);
 
@@ -533,9 +534,13 @@ class extranetUrl {
 
 		$listeClients = array();
 		foreach ($clients as $client) {
-			$listeClients[$client->rs . ' (' . $client->prenom . ' ' . $client->nom . ')'] = $client->utilisateur_id;
+			if (empty($client->utilisateur_id)) {
+				continue;
+			}
+			$listeClients[trim($client->rs) . ' (' . $client->prenom . ' ' . $client->nom . ')'] = $client->utilisateur_id;
 		}
 		ksort($listeClients);
+		$listeClients = array_merge(array('--' => ''), $listeClients);
 
 		$daoEquipier = new commonDAOEquipier($core->con);
 		$equipiers = $daoEquipier->getListe();
diff --git a/inc/extranet/DAO/class.extranet.dao.projet.php b/inc/extranet/DAO/class.extranet.dao.projet.php
index 499c98085..0d61ff428 100644
--- a/inc/extranet/DAO/class.extranet.dao.projet.php
+++ b/inc/extranet/DAO/class.extranet.dao.projet.php
@@ -123,6 +123,7 @@ class extranetDAOProjet extends commonDAO {
 	public function selectById($projet_id)
 	{
 		$r = $this->con->select('SELECT * FROM projets_vue WHERE projet_id=\'' . $this->con->escape($projet_id) . '\'');
+		
 		$liste = $this->factory($r);
 		if (count($liste)) {
 			return $liste[0];
diff --git a/inc/ws/Controlleur/class.ws.ajax.php b/inc/ws/Controlleur/class.ws.ajax.php
index 7ab082246..c0064b9de 100644
--- a/inc/ws/Controlleur/class.ws.ajax.php
+++ b/inc/ws/Controlleur/class.ws.ajax.php
@@ -583,7 +583,7 @@ class wsAjax extends cubeAjax {
 		//$mail->to = 'tech@fluidbook.com';
 		$mail->to = $r->email;
 		$mail->bcc='tech@fluidbook.com';
-		fb($mail->send());
+		$mail->send();
 	}
 
 	public static function reponseDemande($args, &$x) {
diff --git a/inc/ws/Controlleur/class.ws.users.tree.php b/inc/ws/Controlleur/class.ws.users.tree.php
index d8e372eb2..c7530f582 100644
--- a/inc/ws/Controlleur/class.ws.users.tree.php
+++ b/inc/ws/Controlleur/class.ws.users.tree.php
@@ -1,6 +1,7 @@
 <?php
 
 class wsUsersTree {
+
 	protected $users;
 	protected $admins;
 	protected $grades;
@@ -8,16 +9,13 @@ class wsUsersTree {
 	protected $rights;
 	protected $entreprises;
 	protected $entreprises_tree;
-
 	protected $con;
 
-	public function __construct(&$con)
-	{
+	public function __construct(&$con) {
 		$this->con = $con;
 	}
 
-	public function refreshWSUsersTree()
-	{
+	public function refreshWSUsersTree() {
 		$this->con->execute('TRUNCATE TABLE ws_users_tree');
 		$this->con->execute('TRUNCATE TABLE ws_entreprises_tree');
 
@@ -28,7 +26,7 @@ class wsUsersTree {
 
 		$this->rights = array();
 
-		$r = $this->con->select('SELECT * FROM utilisateurs u,entreprises e WHERE u.entreprise=e.entreprise_id AND e.ws_grade>0 ORDER BY e.ws_grade ASC');
+		$r = $this->con->select('SELECT * FROM utilisateurs u LEFT JOIN entreprises e ON u.entreprise=e.entreprise_id WHERE e.ws_grade>0 ORDER BY e.ws_grade ASC');
 		while ($r->fetch()) {
 			$this->entreprises[$r->utilisateur_id] = $r->entreprise_id;
 			$this->users[$r->utilisateur_id] = $r->ws_admin;
@@ -49,13 +47,19 @@ class wsUsersTree {
 
 		$evu = array();
 
-		foreach($this->users as $utilisateur_id => $admin) {
+		foreach ($this->users as $utilisateur_id => $admin) {
 			$facturable_id = $administrateur_id = 0;
 			$this->getFacturableOf($utilisateur_id, $facturable_id, $administrateur_id, 1);
+
+			if (!isset($this->entreprises[$facturable_id]) || is_null($this->entreprises[$facturable_id])) {
+				//$this->entreprises[$facturable_id]=$this->entreprises[$utilisateur_id];
+			}
+
+
 			$c->utilisateur_id = $utilisateur_id;
 			$ce->entreprise_id = $c->entreprise_id = $this->entreprises[$utilisateur_id];
 			$c->facturable_id = $facturable_id;
-			$ce->facturable_entreprise_id = $c->facturable_entreprise_id = $this->entreprises[$facturable_id] ;
+			$ce->facturable_entreprise_id = $c->facturable_entreprise_id = $this->entreprises[$facturable_id];
 			$ce->administrateur_id = $c->administrateur_id = $administrateur_id;
 			$c->insert();
 			if (isset($evu[$c->entreprise_id])) {
@@ -65,11 +69,11 @@ class wsUsersTree {
 			$evu[$c->entreprise_id] = true;
 		}
 		// Fabrication de la liste des droits à partir de l'arbre
-		$j=0;
-		for($i = 1;$i <=5;$i++) {
-			foreach($this->admins as $admin_id => $list) {
+		$j = 0;
+		for ($i = 1; $i <= 5; $i++) {
+			foreach ($this->admins as $admin_id => $list) {
 				$newlist = $list;
-				foreach($list as $uid) {
+				foreach ($list as $uid) {
 					if ($uid != $admin_id && isset($this->admins[$uid])) {
 						$newlist = array_merge($this->admins[$uid], $newlist);
 					}
@@ -78,38 +82,37 @@ class wsUsersTree {
 			}
 		}
 		// Ajout des droits personnels
-		foreach($this->users as $uid => $admin) {
+		foreach ($this->users as $uid => $admin) {
 			$this->admins[$uid][] = $uid;
 		}
 		// Echange des droits entre collègues
-		foreach($this->admins as $admin_id => $list) {
+		foreach ($this->admins as $admin_id => $list) {
 			$e = $this->entreprises[$admin_id];
 			$collegues = array_keys($this->entreprises, $e);
 			$newlist = $this->admins[$admin_id];
-			foreach($collegues as $c) {
+			foreach ($collegues as $c) {
 				$newlist = array_merge($newlist, $this->admins[$c]);
 			}
 			$newlist = array_unique($newlist);
 			$this->admins[$admin_id] = $newlist;
-			foreach($collegues as $c) {
+			foreach ($collegues as $c) {
 				$this->admins[$c] = $newlist;
 			}
 		}
 
-		foreach($this->admins as $admin => $list) {
+		foreach ($this->admins as $admin => $list) {
 			$this->admins[$admin] = array_unique($list);
 			sort($this->admins[$admin]);
 		}
 
 		$c = $this->con->openCursor('utilisateurs');
-		foreach($this->admins as $admin => $list) {
+		foreach ($this->admins as $admin => $list) {
 			$c->ws_rights = implode(',', $list);
 			$c->update('WHERE utilisateur_id=\'' . $this->con->escape($admin) . '\'');
 		}
 	}
 
-	protected function getFacturableOf($utilisateur_id, &$facturable_id, &$administrateur_id, $level)
-	{
+	protected function getFacturableOf($utilisateur_id, &$facturable_id, &$administrateur_id, $level) {
 		if (in_array($utilisateur_id, $this->facturables)) {
 			$facturable_id = $utilisateur_id;
 			$administrateur_id = $this->users[$utilisateur_id];
@@ -124,16 +127,17 @@ class wsUsersTree {
 		return $this->getFacturableOf($this->users[$utilisateur_id], $facturable_id, $administrateur_id, $level + 1);
 	}
 
-	protected function getFacturables()
-	{
+	protected function getFacturables() {
 		$res = array();
-		foreach($this->users as $utilisateur_id => $admin) {
+		foreach ($this->users as $utilisateur_id => $admin) {
 			if ($this->grades[$admin] == 5) {
 				$res[] = $utilisateur_id;
 			}
 		}
+		sort($res);
 		return $res;
 	}
+
 }
 
 ?>
\ No newline at end of file