From: vincent@cubedesigners.com <vincent@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Date: Tue, 28 Sep 2010 07:35:58 +0000 (+0000)
Subject: (no commit message)
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=0f497d7f33e52cd3e8de232b95326a60f991de3d;p=cubeextranet.git

---

diff --git a/inc/extranet/Controlleur/class.extranet.core.php b/inc/extranet/Controlleur/class.extranet.core.php
index 59a07ed90..0306be5a3 100644
--- a/inc/extranet/Controlleur/class.extranet.core.php
+++ b/inc/extranet/Controlleur/class.extranet.core.php
@@ -409,10 +409,6 @@ class extranetCore extends cubeCore {
 		$this->views->createView('devis_vue', 'SELECT devis.devis_id,devis.nom,devis.lignes,devis.status,devis.total_ht,devis.date_creation,devis.email,clients.utilisateur_id AS client_id,clients.rs AS client,equipiers.prenom AS createur,equipiers.utilisateur_id AS createur_id,devis.adresse '
 			 . 'FROM devis,clients,equipiers '
 			 . 'WHERE devis.client=clients.utilisateur_id AND devis.createur=equipiers.utilisateur_id');
-		$this->views->createView('factures_vue', 'SELECT factures.facture_id,factures.nom,factures.lignes,factures.status,factures.total_ht,factures.date_creation,factures.texte_complementaire,factures.informations_paiement,factures.date_paiement,factures.adresse,factures.avoir,'
-			 . 'projets.projet_id AS projet_id,projets.nom AS projet,projets.client_id AS client_id,projets.client as client,equipiers.prenom AS createur,equipiers.utilisateur_id AS createur_id '
-			 . 'FROM factures,projets_vue projets,equipiers '
-			 . 'WHERE factures.projet=projets.projet_id AND factures.createur=equipiers.utilisateur_id AND (factures.facture_id>=0 OR factures.status=1)  ');
 		$this->views->createView('factures_payees', 'SELECT * FROM factures WHERE status=2');
 		$this->views->createView('factures_valides', 'SELECT * FROM factures WHERE status IN(1,2)');
 		$this->views->createView('projets_inter', 'SELECT projets.projet_id,projets.nom,projets.status,projets.date_debut,projets.date_fin,projets.date_creation,projets.deadline,projets.devis,'
@@ -433,6 +429,10 @@ class extranetCore extends cubeCore {
 			 . 'FROM projets_inter1 p '
 			 . 'LEFT JOIN factures_payees f ON f.projet=p.projet_id '
 			 . 'GROUP BY p.projet_id', 'TEMPTABLE');
+		$this->views->createView('factures_vue', 'SELECT factures.facture_id,factures.nom,factures.lignes,factures.status,factures.total_ht,factures.date_creation,factures.texte_complementaire,factures.informations_paiement,factures.date_paiement,factures.adresse,factures.avoir,'
+			 . 'projets.projet_id AS projet_id,projets.nom AS projet,projets.client_id AS client_id,projets.client as client,equipiers.prenom AS createur,equipiers.utilisateur_id AS createur_id '
+			 . 'FROM factures,projets_vue projets,equipiers '
+			 . 'WHERE factures.projet=projets.projet_id AND factures.createur=equipiers.utilisateur_id AND (factures.facture_id>=0 OR factures.status=1)  ');
 		$this->views->createView('projets_timereport', 'SELECT * FROM projets_vue WHERE status=0');
 		$this->views->createView('order_timereport', 'SELECT utilisateur_id,projet AS projet_id,MAX(date) AS derniere_activite FROM timereport,taches,projets WHERE taches.tache_id=timereport.tache_id AND taches.projet=projets.projet_id AND projets.status=0 GROUP BY utilisateur_id,taches.projet ORDER BY utilisateur_id ASC,MAX(date) DESC');
 		$this->views->createView('ca', 'SELECT SUM(total_ht) AS ca, YEAR(FROM_UNIXTIME(date_creation)) annee FROM factures WHERE status IN(1,2) GROUP BY annee');
diff --git a/inc/extranet/Controlleur/class.extranet.url.php b/inc/extranet/Controlleur/class.extranet.url.php
index 24a8ce539..b9250e711 100644
--- a/inc/extranet/Controlleur/class.extranet.url.php
+++ b/inc/extranet/Controlleur/class.extranet.url.php
@@ -9,7 +9,7 @@ class extranetUrl {
 		if (!is_null($core->user) && !$core->user) {
 			$args = array('login');
 		} else {
-			if ($args[0] == 'login') {
+			if (isset($args[0]) && $args[0] == 'login') {
 				http::redirect('/');
 			}
 			if (!count($args)) {