From 80522ddb4dc49d5fbfe6188e8c6efc9433f5d7a5 Mon Sep 17 00:00:00 2001
From: Damien LASSERRE <dlasserre@scores-decisions.com>
Date: Wed, 25 Jan 2012 09:00:47 +0000
Subject: [PATCH] correction de confditions fausse

---
 library/Scores/Ciblage.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/library/Scores/Ciblage.php b/library/Scores/Ciblage.php
index 39baf95f..ef0e7b5d 100644
--- a/library/Scores/Ciblage.php
+++ b/library/Scores/Ciblage.php
@@ -37,7 +37,7 @@ Class Ciblage
 							$this->$key($valeur);
 						}
 					} else {
-						if($valeur != 'tous')
+						if($valeur != 'tous' and $valeur != "")
 							$this->$key($valeur);
 					}
 				}
@@ -105,11 +105,12 @@ Class Ciblage
 				$i++;
 			}
 		}
+		echo $this->alpha;
 	}
 	
 	protected function setAlpha($name, $valeur) 
 	{
-		$or = array('adr_cp', 'adr_dep', 'bilType');
+		$or = array('bilType');
 		$and = array('ape_entrep', 'ape_etab', 'age_entrep', 'age_etab', 'NaceEntrep', 'NaceEtab');
 		
 		if(in_array($name, $or)) {
@@ -138,7 +139,7 @@ Class Ciblage
 	}
 	
 	protected function adr_cp($valeur) {
-		$this->setAlpha('adr_cp', $valeur);
+		$this->setFilter('adr_cp', $valeur);
 	}
 	
 	protected function adr_dep($valeur) {