diff --git a/application/controllers/ServiceController.php b/application/controllers/ServiceController.php
index 356ff1dd..78078734 100644
--- a/application/controllers/ServiceController.php
+++ b/application/controllers/ServiceController.php
@@ -102,8 +102,9 @@ class ServiceController extends Zend_Controller_Action
         require_once $pathServiceClassPhp;
 
         // --- Get hostname - add compatibility with Reverse Proxy
-        $hostName = $this->getRequest()->getHttpHost();
-        $fichierWsdl = $hostName . '-' . $fichierWsdl;
+        $hostName = $request->getHttpHost();
+        $hostScheme = $request->getScheme();
+        $fichierWsdl = $hostName . '-' . $hostScheme . '-' . $fichierWsdl;
         $c = Zend_registry::get('config');
         $wsdlPath = $c->profil->path->shared . '/wsdl';
 
@@ -151,7 +152,7 @@ class ServiceController extends Zend_Controller_Action
                 && file_exists($wsdlPath . '/' . $fichierWsdl)) {
                 $server = new Zend_Soap_Server($wsdlPath . '/' . $fichierWsdl);
             } else {
-                $server = new Zend_Soap_Server('http://'.$hostName.'/'.$pathServiceUrl);
+                $server = new Zend_Soap_Server($hostScheme.'://'.$hostName.'/'.$pathServiceUrl);
             }
 
             // --- Sonde paramètres server
diff --git a/bin/greffe.php b/bin/greffe.php
index 87bee4e7..8b6b23bf 100644
--- a/bin/greffe.php
+++ b/bin/greffe.php
@@ -41,7 +41,7 @@ if (isset($opts->list)){
 $types = array('bi', 'ac');
 
 //Configuration FTP
-define ('ACTES_IGNUM_FTP_URL', '192.168.3.202');
+define ('ACTES_IGNUM_FTP_URL', 'ftp.scores-decisions.com');
 define ('ACTES_IGNUM_FTP_USER',	'mpc2500');
 define ('ACTES_IGNUM_FTP_PASS',	'passmpc78');
 define ('ACTES_IGNUM_LOCAL_DIR', $c->profil->path->shared.'/files/');
@@ -116,8 +116,8 @@ function sendMail($commande, $type){
     $message.= "Save paper - think before you print";
     $message.= "\n";
 
-	$headers =  'From: infoslegales@scores-decisions.com' . "\r\n" .
-				'Reply-To: infoslegales@scores-decisions.com';
+	$headers =  'From: support@scores-decisions.com' . "\r\n" .
+				'Reply-To: support@scores-decisions.com';
 
 	if ( mail(strtolower($commande->email), $subject, utf8_decode($message), $headers) ){
 		echo date ('Y/m/d - H:i:s').' - Un email a été envoyé à '.$commande->email." pour la commande ".$commande->id.".\n";
diff --git a/library/WsScore/Entreprise/v0.7/Service.php b/library/WsScore/Entreprise/v0.7/Service.php
index dc877220..f1a81cdb 100644
--- a/library/WsScore/Entreprise/v0.7/Service.php
+++ b/library/WsScore/Entreprise/v0.7/Service.php
@@ -4189,15 +4189,17 @@ class Entreprise extends Scores_Ws_Server
 	        $_SERVER['PHP_AUTH_USER'].", hash:".$_SERVER['PHP_AUTH_PW']);
 
 		$error = new StatusReturn();
+
 		//Test connexion à la base de données
-		$db = new Metier_Util_Db();
-		if (!$db) {
-			$error->statusCode = 9000;
-			$error->statusMsg = $this->listError['9000'];
+		$this->conn->connect();
+		if ($this->conn->isConnected()) {
+		    $error->statusCode = 3000;
+		    $error->statusMsg = $this->listError['3000'];
 		} else {
-			$error->statusCode = 3000;
-			$error->statusMsg = $this->listError['3000'];
+		    $error->statusCode = 9000;
+		    $error->statusMsg = $this->listError['9000'];
 		}
+
 		return $error;
 	}
 
diff --git a/library/WsScore/Entreprise/v0.8/Service.php b/library/WsScore/Entreprise/v0.8/Service.php
index f3acfa04..26e5b952 100644
--- a/library/WsScore/Entreprise/v0.8/Service.php
+++ b/library/WsScore/Entreprise/v0.8/Service.php
@@ -290,8 +290,6 @@ class Entreprise extends Scores_Ws_Server
 	        $this->sendError('1020');
 	    }
 
-	    $db = Zend_Db_Table_Abstract::getDefaultAdapter();
-
 	    $output = new AvisRncs();
         $rncs = new Metier_Partenaires_MRncs();
 
@@ -342,17 +340,22 @@ class Entreprise extends Scores_Ws_Server
 
         	//Date du dernier bilan - MOIS/JOUR au pire chercher dans l'annonce
         	try {
-        		$bilanM = new Application_Model_JoBilans();
-        		$sql = $bilanM->select(true)
-        		->columns(array('dateExercice'))
-        		->where('siren=?', $siren)
-        		->order('dateExercice DESC')->limit(1);
-        		$result = $bilanM->fetchRow($sql);
-        		if ($result !== null) {
-        			$output->CompteArretMois = substr($result->dateExercice,4,2);
-        			$output->CompteArretJour = substr($result->dateExercice,6,2);
-        		}
-        	} catch(Zend_Db_Exception $e) {}
+        	    $sql = "SELECT dateExercice FROM jo.bilans WHERE siren=:siren
+        	        ORDER BY dateExercice LIMIT 0,1";
+        	    $stmt = $this->conn->prepare($sql);
+        	    $stmt->bindValue('siren', $siren);
+        	    $stmt->execute();
+        	    if ($stmt->rowCount() > 0) {
+        	        $result = $stmt->fetch(\PDO::FETCH_OBJ);
+        	        $output->CompteArretMois = substr($result->dateExercice,4,2);
+        	        $output->CompteArretJour = substr($result->dateExercice,6,2);
+        	    }
+        	} catch(\Doctrine\DBAL\DBALException $e) {
+        	    if ($this->logger !== null) {
+        	        $this->logger->error($e->getMessage());
+        	    }
+        	}
+
 
         	//=> Avec l'adresse du premier siège
         	$output->ConstitutionTribunalCode = '';
@@ -361,8 +364,7 @@ class Entreprise extends Scores_Ws_Server
         	$iInsee = new Metier_Insee_MInsee();
         	$dirs = $iInsee->getDirigeants($siren, false);
         	$liste = array();
-        	foreach ($dirs as $nb => $dir)
-        	{
+        	foreach ($dirs as $nb => $dir) {
         		$dirigeant = new AvisRncsAdmin();
 
         		$dirigeant->Code = $dir['Fonction'];
@@ -829,31 +831,31 @@ class Entreprise extends Scores_Ws_Server
 		$this->permission('liens');
 
 		//Load country table
-		try {
-		    $countryM = new Application_Model_JoTabPays();
-		    $sql = $countryM->select()->from($countryM, array('codPays3', 'libPays'));
-		    $result = $countryM->fetchAll($sql);
-	    } catch (Zend_Db_Adapter_Exception $e) {
-	        if ($this->User->idClient==1) {
-		        throw new SoapFault('ERR', $e->getMessage());
-		    } else {
-		        throw new SoapFault('ERR', "Application error");
-		    }
-	    } catch (Zend_Exception $e) {
-	        throw new SoapFault('ERR', "Application error");
+	    try {
+	        $sql = "SELECT codPays3, libPays FROM jo.tabPays";
+	        $stmt = $this->conn->prepare($sql);
+	        $stmt->execute();
+	    } catch(\Doctrine\DBAL\DBALException $e) {
+	        if ($this->logger !== null) {
+	            $this->logger->error($e->getMessage());
+	        }
+	        if ($this->User->idClient == 1) {
+	            throw new SoapFault('ERR', $e->getMessage());
+	        } else {
+	            throw new SoapFault('ERR', "Application error");
+	        }
 	    }
 
 		$tabPays = array();
-		if ( $result->count()>0 ) {
-		    foreach ( $result as $item ) {
+		if ($stmt->rowCount() > 0) {
+		    while ($item = $stmt->fetch(\PDO::FETCH_OBJ)) {
 		        $tabPays[$item->codPays3] = $item->libPays;
 		    }
 		}
 
 		$tabAct = $tabPar = $tabDir = array();
 
-		try
-		{
+		try {
 		    $liensM = new Metier_Liens_Base();
 		    $liensM->setId($siren, 'siren');
 
@@ -892,23 +894,30 @@ class Entreprise extends Scores_Ws_Server
 
     		        $nbIdNum = 3;
 	                $refs = array();
-	                $idM = new Application_Model_Sdv1TabIdLocal();
 	                for ($i=0;$i<$nbIdNum;$i++) {
 	                    if( !empty($item->{'idLoc'.$i.'Num'}) ) {
 	                        $ref = new LienRefId();
 	                        $ref->num = $item->{'idLoc'.$i.'Num'};
 
-	                        if ( !empty($item->{'idLoc'.$i.'Type'}) ) {
-    	                        $sql = $idM->select()->from($idM, array('idLocal', 'idPrincipal'))
-    	                            ->where('id=?', $item->{'idLoc'.$i.'Type'});
-    	                        $result = $idM->fetchRow($sql);
-    	                        if (null!==$result) {
-    	                            $ref->label = $result->idLocal;
-    	                            $ref->type = $result->idPrincipal;
-    	                        } else {
-    	                            $ref->label = '';
-    	                            $ref->type = 0;
-    	                        }
+	                        if (!empty($item->{'idLoc'.$i.'Type'})) {
+	                            try {
+	                                $sql = "SELECT idLocal, idPrincipal FROM sdv1.tabIdLocal WHERE id=:id";
+	                                $stmt = $this->conn->prepare($sql);
+	                                $stmt->bindValue('id', $item->{'idLoc'.$i.'Type'});
+	                                $stmt->execute();
+	                                if ($stmt->rowCount() > 0) {
+	                                    $result = $stmt->fetch(\PDO::FETCH_OBJ);
+	                                    $ref->label = $result->idLocal;
+	                                    $ref->type = $result->idPrincipal;
+	                                } else {
+	                                    $ref->label = '';
+	                                    $ref->type = 0;
+	                                }
+	                            } catch(\Doctrine\DBAL\DBALException $e) {
+	                                if ($this->logger !== null) {
+	                                    $this->logger->error($e->getMessage());
+	                                }
+	                            }
 	                        } else {
 	                            $ref->label = 'Identifiant local';
 	                            $ref->type = 1;
@@ -923,7 +932,7 @@ class Entreprise extends Scores_Ws_Server
     		    }
     		}
 
-    		//Participations
+    		// Participations
     		$liens = $liensM->getParticipations(null, true);
     		if (count($liens)>0) {
     		    foreach ( $liens as $item ) {
@@ -958,22 +967,28 @@ class Entreprise extends Scores_Ws_Server
 
     		        $nbIdNum = 3;
 	                $refs = array();
-	                $idM = new Application_Model_Sdv1TabIdLocal();
 	                for ($i=0;$i<$nbIdNum;$i++) {
 	                    if( !empty($item->{'idLoc'.$i.'Num'}) ) {
 	                        $ref = new LienRefId();
 	                        $ref->num = $item->{'idLoc'.$i.'Num'};
-
-	                        if ( !empty($item->{'idLoc'.$i.'Type'}) ) {
-    	                        $sql = $idM->select()->from($idM, array('idLocal', 'idPrincipal'))
-    	                            ->where('id=?', $item->{'idLoc'.$i.'Type'});
-    	                        $result = $idM->fetchRow($sql);
-    	                        if (null!==$result) {
-    	                            $ref->label = $result->idLocal;
-    	                            $ref->type = $result->idPrincipal;
-    	                        } else {
-    	                            $ref->label = '';
-    	                            $ref->type = 0;
+	                        if (!empty($item->{'idLoc'.$i.'Type'})) {
+    	                        try {
+    	                            $sql = "SELECT idLocal, idPrincipal FROM sdv1.tabIdLocal WHERE id=:id";
+    	                            $stmt = $this->conn->prepare($sql);
+    	                            $stmt->bindValue('id', $item->{'idLoc'.$i.'Type'});
+    	                            $stmt->execute();
+    	                            if ($stmt->rowCount() > 0) {
+    	                                $result = $stmt->fetch(\PDO::FETCH_OBJ);
+    	                                $ref->label = $result->idLocal;
+    	                                $ref->type = $result->idPrincipal;
+    	                            } else {
+    	                                $ref->label = '';
+    	                                $ref->type = 0;
+    	                            }
+    	                        } catch(\Doctrine\DBAL\DBALException $e) {
+    	                            if ($this->logger !== null) {
+    	                                $this->logger->error($e->getMessage());
+    	                            }
     	                        }
 	                        } else {
 	                            $ref->label = 'Identifiant local';
@@ -1045,35 +1060,36 @@ class Entreprise extends Scores_Ws_Server
 	    $this->authenticate();
 	    $this->permission('liens');
 
+	    //Load country table
 	    try {
-		    $countryM = new Application_Model_JoTabPays();
-		    $sql = $countryM->select()->from($countryM, array('codPays3', 'libPays'));
-		    $result = $countryM->fetchAll($sql);
-	    } catch (Zend_Db_Adapter_Exception $e) {
-	        if ($this->User->idClient==1) {
-		        throw new SoapFault('ERR', $e->getMessage());
-		    } else {
-		        throw new SoapFault('ERR', "Application error");
-		    }
-	    } catch (Zend_Exception $e) {
-	        throw new SoapFault('ERR', "Application error");
+	        $sql = "SELECT codPays3, libPays FROM jo.tabPays";
+	        $stmt = $this->conn->prepare($sql);
+	        $stmt->execute();
+	    } catch(\Doctrine\DBAL\DBALException $e) {
+	        if ($this->logger !== null) {
+	            $this->logger->error($e->getMessage());
+	        }
+	        if ($this->User->idClient == 1) {
+	            throw new SoapFault('ERR', $e->getMessage());
+	        } else {
+	            throw new SoapFault('ERR', "Application error");
+	        }
 	    }
 
-		$tabPays = array();
-		if ( $result->count()>0 ) {
-		    foreach ( $result as $item ) {
-		        $tabPays[$item->codPays3] = $item->libPays;
-		    }
-		}
+	    $tabPays = array();
+	    if ($stmt->rowCount() > 0) {
+	        while ($item = $stmt->fetch(\PDO::FETCH_OBJ)) {
+	            $tabPays[$item->codPays3] = $item->libPays;
+	        }
+	    }
 
 	    $tabAct = $tabPar = $tabDir = array();
 
-	    try
-	    {
+	    try {
 	        $liensM = new Metier_Liens_Base();
 	        $liensM->setId($id);
 
-	        //Actionnaires
+	        // Actionnaires
 	        $liens = $liensM->getActionnaires(null, true);
 	        if (count($liens)>0) {
 	            foreach ( $liens as $item ) {
@@ -1108,23 +1124,29 @@ class Entreprise extends Scores_Ws_Server
 
 	                $nbIdNum = 3;
 	                $refs = array();
-	                $idM = new Application_Model_Sdv1TabIdLocal();
 	                for ($i=0;$i<$nbIdNum;$i++) {
 	                    if( !empty($item->{'idLoc'.$i.'Num'}) ) {
 	                        $ref = new LienRefId();
 	                        $ref->num = $item->{'idLoc'.$i.'Num'};
-
-	                        if ( !empty($item->{'idLoc'.$i.'Type'}) ) {
-    	                        $sql = $idM->select()->from($idM, array('idLocal', 'idPrincipal'))
-    	                            ->where('id=?', $item->{'idLoc'.$i.'Type'});
-    	                        $result = $idM->fetchRow($sql);
-    	                        if (null!==$result) {
-    	                            $ref->label = $result->idLocal;
-    	                            $ref->type = $result->idPrincipal;
-    	                        } else {
-    	                            $ref->label = '';
-    	                            $ref->type = 0;
-    	                        }
+	                        if (!empty($item->{'idLoc'.$i.'Type'})) {
+	                            try {
+	                                $sql = "SELECT idLocal, idPrincipal FROM sdv1.tabIdLocal WHERE id=:id";
+	                                $stmt = $this->conn->prepare($sql);
+	                                $stmt->bindValue('id', $item->{'idLoc'.$i.'Type'});
+	                                $stmt->execute();
+	                                if ($stmt->rowCount() > 0) {
+	                                    $result = $stmt->fetch(\PDO::FETCH_OBJ);
+	                                    $ref->label = $result->idLocal;
+	                                    $ref->type = $result->idPrincipal;
+	                                } else {
+	                                    $ref->label = '';
+	                                    $ref->type = 0;
+	                                }
+	                            } catch(\Doctrine\DBAL\DBALException $e) {
+	                                if ($this->logger !== null) {
+	                                    $this->logger->error($e->getMessage());
+	                                }
+	                            }
 	                        } else {
 	                            $ref->label = 'Identifiant local';
 	                            $ref->type = 1;
@@ -1139,7 +1161,7 @@ class Entreprise extends Scores_Ws_Server
 	            }
 	        }
 
-	        //Participations
+	        // Participations
 	        $liens = $liensM->getParticipations(null, true);
 	        if (count($liens)>0) {
 	            foreach ( $liens as $item ) {
@@ -1174,23 +1196,29 @@ class Entreprise extends Scores_Ws_Server
 
 	                $nbIdNum = 3;
 	                $refs = array();
-	                $idM = new Application_Model_Sdv1TabIdLocal();
 	                for ($i=0;$i<$nbIdNum;$i++) {
-	                    if( !empty($item->{'idLoc'.$i.'Num'}) ) {
+	                    if (!empty($item->{'idLoc'.$i.'Num'})) {
 	                        $ref = new LienRefId();
 	                        $ref->num = $item->{'idLoc'.$i.'Num'};
-
-	                        if ( !empty($item->{'idLoc'.$i.'Type'}) ) {
-    	                        $sql = $idM->select()->from($idM, array('idLocal', 'idPrincipal'))
-    	                            ->where('id=?', $item->{'idLoc'.$i.'Type'});
-    	                        $result = $idM->fetchRow($sql);
-    	                        if (null!==$result) {
-    	                            $ref->label = $result->idLocal;
-    	                            $ref->type = $result->idPrincipal;
-    	                        } else {
-    	                            $ref->label = '';
-    	                            $ref->type = 0;
-    	                        }
+	                        if (!empty($item->{'idLoc'.$i.'Type'})) {
+	                            try {
+	                                $sql = "SELECT idLocal, idPrincipal FROM sdv1.tabIdLocal WHERE id=:id";
+	                                $stmt = $this->conn->prepare($sql);
+	                                $stmt->bindValue('id', $item->{'idLoc'.$i.'Type'});
+	                                $stmt->execute();
+	                                if ($stmt->rowCount() > 0) {
+	                                    $result = $stmt->fetch(\PDO::FETCH_OBJ);
+	                                    $ref->label = $result->idLocal;
+	                                    $ref->type = $result->idPrincipal;
+	                                } else {
+	                                    $ref->label = '';
+	                                    $ref->type = 0;
+	                                }
+	                            } catch(\Doctrine\DBAL\DBALException $e) {
+	                                if ($this->logger !== null) {
+	                                    $this->logger->error($e->getMessage());
+	                                }
+	                            }
 	                        } else {
 	                            $ref->label = 'Identifiant local';
 	                            $ref->type = 1;
@@ -1262,23 +1290,27 @@ class Entreprise extends Scores_Ws_Server
 	    $this->authenticate();
 	    $this->permission('liens');
 
-	    $refM = new Application_Model_JoLiensRef();
-
 	    try {
-	        $rows = $refM->find($id);
-	    } catch (Zend_Db_Exception $e) {
-	        if ($this->User->idClient!=1) {
-	            throw new SoapFault('ERR', "Application error");
-	        } else {
-	            throw new SoapFault('ERR', $e->getMessage());
-	        }
-	    }
+	        $sql = "SELECT * FROM jo.liensRef WHERE id=:id";
+	        $stmt = $this->conn->prepare($sql);
+	        $stmt->bindValue('id', $id);
+	        $stmt->execute();
+	    } catch(\Doctrine\DBAL\DBALException $e) {
+            if ($this->logger !== null) {
+                $this->logger->error($e->getMessage());
+            }
+            if ($this->User->idClient == 1) {
+                throw new SoapFault('ERR', $e->getMessage());
+            } else {
+                throw new SoapFault('ERR', "Application error");
+            }
+        }
 
-	    if ($rows->count()==0) {
+	    if ($stmt->rowCount() == 0) {
 	        throw new SoapFault('MSG', 'Aucun résultat');
 	    }
 
-	    $result = $rows->current()->toArray();
+	    $result = $stmt->fetch(\PDO::FETCH_ASSOC);
 
 	    $output = new LienRef();
 	    $output->siren = $result['siren'];
@@ -1319,20 +1351,27 @@ class Entreprise extends Scores_Ws_Server
 
 	    $nbIdNum = 3;
         $refs = array();
-        $idM = new Application_Model_Sdv1TabIdLocal();
         for ($i=0;$i<$nbIdNum;$i++) {
-            if( !empty($result['idLoc'.$i.'Type']) ) {
+            if(!empty($result['idLoc'.$i.'Type'])) {
                 $ref = new LienRefId();
                 $ref->num = $result['idLoc'.$i.'Num'];
-                $sql = $idM->select()->from($idM, array('idLocal', 'idPrincipal'))
-                    ->where('id=?', $result['idLoc'.$i.'Type']);
-                $result = $idM->fetchRow($sql);
-                if (null!==$result) {
-                    $ref->label = $result->idLocal;
-                    $ref->type = $result->idPrincipal;
-                } else {
-                    $ref->label = '';
-                    $ref->type = 0;
+                try {
+                    $sql = "SELECT idLocal, idPrincipal FROM sdv1.tabIdLocal WHERE id=:id";
+                    $stmt = $this->conn->prepare($sql);
+                    $stmt->bindValue('id', $result['idLoc'.$i.'Type']);
+                    $stmt->execute();
+                    if ($stmt->rowCount() > 0) {
+                        $id = $stmt->fetch(\PDO::FETCH_OBJ);
+                        $ref->label = $id->idLocal;
+                        $ref->type = $id->idPrincipal;
+                    } else {
+                        $ref->label = '';
+                        $ref->type = 0;
+                    }
+                } catch(\Doctrine\DBAL\DBALException $e) {
+                    if ($this->logger !== null) {
+                        $this->logger->error($e->getMessage());
+                    }
                 }
 
                 $refs[] = $ref;
@@ -1824,9 +1863,14 @@ class Entreprise extends Scores_Ws_Server
 
 		if ( is_array($anns) && $nbReponses > 0 ) {
 			foreach ($anns as $nb => $ann) {
-				if ($isList===true && $nb<$position) { continue; }
+				if ($isList === true && $nb < $position) {
+				    continue;
+				}
+
 				$cpt++;
-				if ($isList===true && $cpt>$nbRep) { break; }
+				if ($isList === true && $cpt > $nbRep) {
+				    break;
+				}
 
 				/**
 				 * Si l'annonce est une annonce BODACC alors
@@ -1834,15 +1878,25 @@ class Entreprise extends Scores_Ws_Server
 				 */
 				$entites = array();
     			if (in_array($ann['BodaccCode'], array('BODA', 'BODB', 'BODC'))) {
-    				$detailM = new Application_Model_JoBodaccDetail();
-    				$sql = $detailM->select()->from($detailM, array(
-    				        'LPAD(siren, 9, 0) AS siren',
-    				        'LPAD(nic, 5, 0) AS nic',
-    				        'raisonSociale','adresse', 'codePostal', 'ville', 'typeEven')
-    				       )->where('id=?', $ann['id']);
-    				$result = $detailM->fetchAll($sql);
-    				if (count($result)>1) {
-    				    foreach ($result as $entity) {
+    			    try {
+    			        $sql = "SELECT LPAD(siren, 9, 0) AS siren, LPAD(nic, 5, 0) AS nic, raisonSociale,
+    			            adresse, codePostal, ville, typeEven FROM jo.bodacc_detail WHERE id=:id";
+    			        $stmt = $this->conn->prepare($sql);
+    			        $stmt->bindValue('id', $ann['id']);
+    			        $stmt->execute();
+    			    } catch(\Doctrine\DBAL\DBALException $e) {
+    			        if ($this->logger !== null) {
+    			            $this->logger->error($e->getMessage());
+    			        }
+    			        if ($this->User->idClient == 1) {
+    			            throw new SoapFault('ERR', $e->getMessage());
+    			        } else {
+    			            throw new SoapFault('ERR', "Application error");
+    			        }
+    			    }
+
+    				if ($stmt->rowCount() > 1) {
+    				    while ($entity = $stmt->fetch(\PDO::FETCH_OBJ)) {
     				        $entite = new AnnonceEntite();
     				        $entite->siret = $entity->siren . $entity->nic;
     				        $entite->raisonSociale = $entity->raisonSociale;
@@ -1858,7 +1912,7 @@ class Entreprise extends Scores_Ws_Server
     				}
 				}
 
-				//List events
+				// List events
 				$evens = array();
 				foreach ($ann['evenements'] as $tabEven) {
 					$even = new AnnonceEvenement();
@@ -2060,14 +2114,19 @@ class Entreprise extends Scores_Ws_Server
 			    $entites[] = $entite;
 
 			    //Search titulaire
-			    $boamplotsM = new Application_Model_JoBoampLots();
-			    $sql = $boamplotsM->select()->from($boamplotsM, array(
-                        'LPAD(siren, 9, 000000000) AS siren',
-                        'LPAD(nic, 5, 00000) AS nic', 'nom','adresse','cp', 'ville', 'pays')
-                    )->where('idAnn=?', substr($ann['id'],2));
-			    $result = $boamplotsM->fetchAll($sql);
-			    if (count($result) > 0) {
-				    foreach ($result as $entity) {
+				try {
+				    $sql = "SELECT LPAD(siren, 9, 000000000) AS siren, LPAD(nic, 5, 00000) AS nic, nom, adresse, cp, ville, pays
+				        FROM jo.boamp_lots WHERE idAnn=:id";
+				    $stmt = $this->conn->prepare($sql);
+				    $stmt->bindValue('id', substr($ann['id'],2));
+				    $stmt->execute();
+				} catch(\Doctrine\DBAL\DBALException $e) {
+				    if ($this->logger !== null) {
+				        $this->logger->error($e->getMessage());
+				    }
+				}
+				if ($stmt->rowCount() > 0) {
+				    while ($entity = $stmt->fetch(\PDO::FETCH_OBJ)) {
 				        $entite = new AnnonceEntite();
 				        $entite->siret = $entity->siren.$entity->nic;
 				        $entite->raisonSociale = $entity->nom;
@@ -3877,12 +3936,20 @@ class Entreprise extends Scores_Ws_Server
 			 * Calcul d'initialisation du score lors d'un ajout
 			 */
 			if ( $source == 'score' ) {
-				$survM = new Application_Model_JoScoresSurveillance();
-				$item = $survM->find($siren);
-				if ( $item === null ) {
-					require_once 'Metier/Scores/MScores.php';
-					calculIndiScore($siren, 0, false, 0);
-				}
+			    try {
+			        $sql = "SELECT * FROM jo.scores_surveillance WHERE siren=:siren";
+			        $stmt = $this->conn->prepare($sql);
+			        $stmt->bindValue('siren', $siren);
+			        $stmt->execute();
+			        if ($stmt->rowCount() == 0) {
+			            require_once 'Metier/Scores/MScores.php';
+			            calculIndiScore($siren, 0, false, 0);
+			        }
+			    } catch (\Doctrine\DBAL\DBALException $e) {
+			        if ($this->logger !== null) {
+			            $this->logger->error($e->getMessage());
+			        }
+			    }
 			}
 
 			$where = "source='$source' AND login='$login' AND email='$email' AND siren=$siren AND nic=$nic AND ref='$ref'";
@@ -4357,28 +4424,29 @@ class Entreprise extends Scores_Ws_Server
 	    //Check SIREN
 
 	    //Lecture de la base de données
-	    try {
-    	    $bilansM = new Application_Model_JoGreffesBilans();
-    	    $sql = $bilansM->select()
-    	       ->where('siren=?', $siren)
-    	       ->where('actif=1')
-    	       ->order('date_cloture DESC')
-    	       ->order('num_depot DESC')
-    	       ->order('dateInsert DESC')
-    	       ->limit(1);
-    	    $row = $bilansM->fetchRow($sql);
-	    } catch (Zend_Db_Exception $e) {
-	        if ($this->User->idClient==1) {
+        try {
+	        $sql = "SELECT * FROM jo.greffes_bilans WHERE siren=:siren AND actif=1
+	            ORDER BY date_cloture DESC, num_depot DESC, dateInsert DESC";
+	        $stmt = $this->conn->prepare($sql);
+	        $stmt->bindValue('siren', $siren);
+	        $stmt->execute();
+	    } catch(\Doctrine\DBAL\DBALException $e) {
+	        if ($this->logger !== null) {
+	            $this->logger->error($e->getMessage());
+	        }
+	        if ($this->User->idClient == 1) {
 	            throw new SoapFault('ERR', $e->getMessage());
 	        } else {
 	            throw new SoapFault('ERR', "Application error");
 	        }
 	    }
 
-	    if ( $row === null ) {
-	        return null;
+	    if ($stmt->rowCount() == 0) {
+	       return null;
 	    }
 
+	    $row = $stmt->fetch(\PDO::FETCH_OBJ);
+
         $liasseInfos = new LiasseInfos();
         $liasseInfos->Id = $row->id;
         $liasseInfos->BilanDateCloture = $row->date_cloture;
@@ -4425,21 +4493,26 @@ class Entreprise extends Scores_Ws_Server
             //Surcharge des codes de saisie
             $date = DateTime::createFromFormat('Y-m-d', $row->date_cloture);
             try {
-                $liasseM = new Application_Model_JoBilans();
-                $sql = $liasseM->select()
-                    ->where('siren=?', $siren)
-                    ->where('typeBilan=?', $liasseInfos->BilanType)
-                    ->where('dateExercice=?', $date->format('Ymd'));
-                $row = $liasseM->fetchRow($sql);
-            } catch (Zend_Db_Exception $e) {
-                //file_put_contents('debug.log', $e->getMessage()."\n", FILE_APPEND);
-            }
-            if ( $row !== null ) {
-                $liasseInfos->SaisieDate = substr($row->dateProvPartenaire,0,4) .
-                    '-' . substr($row->dateProvPartenaire,4,2) .
-                    '-' . substr($row->dateProvPartenaire,6,2);
-                $liasseInfos->SaisieCode = '00';
+                $sql = "SELECT * FROM jo.bilans
+                    WHERE siren=:siren AND typeBilan=:type AND dateExercice=:date";
+                $stmt = $this->conn->prepare($sql);
+                $stmt->bindValue('siren', $siren);
+                $stmt->bindValue('type', $liasseInfos->BilanType);
+                $stmt->bindValue('date', $date->format('Ymd'));
+                $stmt->execute();
+                if ($stmt->rowCount() > 0) {
+                    $row = $stmt->fetch(\PDO::FETCH_OBJ);
+                    $liasseInfos->SaisieDate = substr($row->dateProvPartenaire,0,4) .
+                        '-' . substr($row->dateProvPartenaire,4,2) .
+                        '-' . substr($row->dateProvPartenaire,6,2);
+                    $liasseInfos->SaisieCode = '00';
+                }
+            } catch(\Doctrine\DBAL\DBALException $e) {
+                if ($this->logger !== null) {
+                    $this->logger->error($e->getMessage());
+                }
             }
+
         }
 
         return $liasseInfos;
@@ -5295,7 +5368,7 @@ class Entreprise extends Scores_Ws_Server
 	{
 		$this->authenticate();
 
-		//Init
+		// Init
 		if ( intval($companyId) == 0 ) {
 			$this->sendError('1010');
 		} elseif ( strlen($companyId)!=9 ) {
@@ -5305,77 +5378,94 @@ class Entreprise extends Scores_Ws_Server
 		if ( empty($nbItems) || $nbItems > 100 ) { $nbItems = 100; }
 		if ( !empty($type) ) { $type = strtoupper($type); }
 
-		//SQL
-		$listM = new Application_Model_JoAssoSubventions();
-		$countsql = $listM->select()->from($listM, array('COUNT(*) AS num'));
-		$sql = $listM->select()->from($listM, array(
-				'id',
-				'millesime', //Annee
-				'sirenAsso', //sirenIn
-				'nomAsso',
-				'sirenOrigine', //sirenOut
-				'libOrigine', //Origine
-				'libImputation', //Programme
-				'mtSubvention', //Montant
- 		));
+		// SQL
+		$qbList = $this->conn->createQueryBuilder();
+		$qbCount = $this->conn->createQueryBuilder();
+		$qbList->select(array(
+                'id',
+    			'millesime', //Annee
+    			'sirenAsso', //sirenIn
+    			'nomAsso',
+    			'sirenOrigine', //sirenOut
+    			'libOrigine', //Origine
+    			'libImputation', //Programme
+    			'mtSubvention', //Montant
+     		))->from(jo.asso_subventions);
+		$qbCount->select('COUNT(*) AS num')->from('jo.asso_subventions');
 
-		//Subvention reçues => sirenAsso = companyId
+		// Subvention reçues => sirenAsso = companyId
 		if ($type == 'IN') {
-			$sql->where('sirenAsso=?', $companyId);
-			$countsql->where('sirenAsso=?', $companyId);
+		    $qbList->where('sirenAsso=:companyId')->setParameter('companyId', $companyId);
+		    $qbCount->where('sirenAsso=:companyId')->setParameter('companyId', $companyId);
 		}
-		//Subvention reçues => sirenOrigine = companyId
+		// Subvention reçues => sirenOrigine = companyId
 		elseif ($type == 'OUT') {
-			$sql->where('sirenOrigine=?', $companyId);
-			$countsql->where('sirenOrigine=?', $companyId);
+		    $qbList->where('sirenOrigine=:companyId')->setParameter('companyId', $companyId);
+		    $qbCount->where('sirenOrigine=:companyId')->setParameter('companyId', $companyId);
 		}
-		//All
+		// All
 		else {
-			$sql->where('sirenAsso=?', $companyId)
-				->orWhere('sirenOrigine=?', $companyId);
-			$countsql->where('sirenAsso=?', $companyId)
-					->orWhere('sirenOrigine=?', $companyId);
+		    $qbList->where('sirenAsso=:companyId')->orWhere('sirenOrigine=:companyId')->setParameter('companyId', $companyId);
+		    $qbCount->where('sirenAsso=:companyId')->orWhere('sirenOrigine=:companyId')->setParameter('companyId', $companyId);
 		}
-		$sql->order('millesime DESC')->limit($nbItems, $offset);
+		$qbList->orderBy('millesime DESC')->setFirstResult($offset)->setMaxResults($nbItems);
 
-		$count = $listM->fetchRow($countsql);
-		$nbReponsesTotal = 0;
-		if ( $count!==null ) {
-			$nbReponsesTotal = $count->num;
+		try {
+            $stmt = $qbCount->execute();
+		} catch(\Doctrine\DBAL\DBALException $e) {
+		    if ($this->logger !== null) {
+		        $this->logger->error($e->getMessage());
+		    }
+		    if ($this->User->idClient == 1) {
+		        throw new SoapFault('ERR', $e->getMessage());
+		    } else {
+		        throw new SoapFault('ERR', "Application error");
+		    }
 		}
 
-		if ( $nbReponsesTotal != 0 ) {
+		$count = $stmt->fetch(\PDO::FETCH_OBJ);
+        $nbReponsesTotal = $count->num;
 
-			$rows = $listM->fetchAll($sql);
+		if ($nbReponsesTotal > 0) {
+
+		    try {
+                $stmt = $qbList->execute();
+		    } catch(\Doctrine\DBAL\DBALException $e) {
+		        if ($this->logger !== null) {
+		            $this->logger->error($e->getMessage());
+		        }
+		        if ($this->User->idClient == 1) {
+		            throw new SoapFault('ERR', $e->getMessage());
+		        } else {
+		            throw new SoapFault('ERR', "Application error");
+		        }
+		    }
 
 			$output = new SubventionList();
 			$output->nbReponsesTotal = $nbReponsesTotal;
 			$result = array();
 
-			if ( $rows !== null ) {
-				foreach ( $rows as $row ) {
-
-					$item = new Subvention();
-					$item->Id = $row->id;
-					if ( $row->sirenAsso == $companyId ) {
-						$item->Type = 'IN';
-					} elseif ( $row->sirenOrigine == $companyId ) {
-						$item->Type = 'OUT';
-					}
-					$item->Millesime = $row->millesime;
-					$item->AssoSiren = $row->sirenAsso;
-					$item->AssoNom = $row->nomAsso;
-					$item->OrigineSiren = $row->sirenOrigine;
-					$item->OrigineLib = $row->libOrigine;
-					$item->Programme  = $row->libImputation;
-					$item->Montant = $row->mtSubvention;
-
-					$result[] = $item;
+			while ($row = $stmt->fetch(\PDO::FETCH_OBJ)) {
+				$item = new Subvention();
+				$item->Id = $row->id;
+				if ( $row->sirenAsso == $companyId ) {
+					$item->Type = 'IN';
+				} elseif ( $row->sirenOrigine == $companyId ) {
+					$item->Type = 'OUT';
 				}
-				$output->result = $result;
-				$this->wsLog('subventionlist', $companyId);
+				$item->Millesime = $row->millesime;
+				$item->AssoSiren = $row->sirenAsso;
+				$item->AssoNom = $row->nomAsso;
+				$item->OrigineSiren = $row->sirenOrigine;
+				$item->OrigineLib = $row->libOrigine;
+				$item->Programme  = $row->libImputation;
+				$item->Montant = $row->mtSubvention;
+
+				$result[] = $item;
 			}
 
+			$output->result = $result;
+			$this->wsLog('subventionlist', $companyId);
 		}
 
 		return $output;
@@ -5391,14 +5481,27 @@ class Entreprise extends Scores_Ws_Server
 	{
 		$this->authenticate();
 
-		$subventionM = new Application_Model_JoAssoSubventions();
-		$row = $subventionM->find($id);
+		try {
+		    $sql = "SELECT * FROM jo.asso_subventions WHERE id=:id";
+		    $stmt = $this->conn->prepare($sql);
+		    $stmt->bindValue('id', $id);
+		    $stmt->execute();
+		} catch(\Doctrine\DBAL\DBALException $e) {
+		    if ($this->logger !== null) {
+		        $this->logger->error($e->getMessage());
+		    }
+		    if ($this->User->idClient == 1) {
+		        throw new SoapFault('ERR', $e->getMessage());
+		    } else {
+		        throw new SoapFault('ERR', "Application error");
+		    }
+		}
 
-		if (null === row) {
+		if ($stmt->rowCount() == 0) {
 			throw new SoapFault('MSG', "Aucun résultat");
 		}
 
-		$data = $row->current();
+		$data = $stmt->fetch(\PDO::FETCH_OBJ);
 
     	$item = new SubventionDetail();
     	$item->Millesime = $data->millesime;
@@ -5433,15 +5536,17 @@ class Entreprise extends Scores_Ws_Server
 	        $_SERVER['PHP_AUTH_USER'].", hash:".$_SERVER['PHP_AUTH_PW']);
 
 		$error = new StatusReturn();
+
 		//Test connexion à la base de données
-		$db = new Metier_Util_Db();
-		if (!$db) {
-			$error->statusCode = 9000;
-			$error->statusMsg = $this->listError['9000'];
+		$this->conn->connect();
+		if ($this->conn->isConnected()) {
+		    $error->statusCode = 3000;
+		    $error->statusMsg = $this->listError['3000'];
 		} else {
-			$error->statusCode = 3000;
-			$error->statusMsg = $this->listError['3000'];
+		    $error->statusCode = 9000;
+		    $error->statusMsg = $this->listError['9000'];
 		}
+
 		return $error;
 	}
 
diff --git a/library/WsScore/Entreprise/v0.9/Service.php b/library/WsScore/Entreprise/v0.9/Service.php
index dcec3fdc..d69dc978 100644
--- a/library/WsScore/Entreprise/v0.9/Service.php
+++ b/library/WsScore/Entreprise/v0.9/Service.php
@@ -632,10 +632,12 @@ class Entreprise extends Scores_Ws_Server
             ORDER BY insDate DESC;";
 
         try {
-            $db = Zend_Db_Table_Abstract::getDefaultAdapter();
-            $privResult = $db->fetchAll($privSql, null, Zend_Db::FETCH_OBJ);
-        } catch(Zend_Db_Exception $e) {
-            if ($this->User->idClient==1) {
+            $stmt = $this->conn->executeQuery($privSql);
+        } catch(\Doctrine\DBAL\DBALException $e) {
+            if ($this->logger !== null) {
+                $this->logger->error($e->getMessage());
+            }
+            if ($this->User->idClient == 1) {
                 throw new SoapFault('ERR', $e->getMessage());
             } else {
                 throw new SoapFault('ERR', "Application error");
@@ -649,8 +651,8 @@ class Entreprise extends Scores_Ws_Server
 
         $privileges = array();
         $cumul = array();
-        if (count($privResult) > 0) {
-            foreach($privResult as $p) {
+        if ($stmt->rowCount() > 0) {
+            while ($p = $stmt->fetch(\PDO::FETCH_OBJ)) {
                 // ---  Cumul des privileges par type  (Nb, Montant)
                 $output->NbTotal++;
                 $output->MtTotal+= $p->insMontant;
@@ -733,17 +735,19 @@ class Entreprise extends Scores_Ws_Server
     	    WHERE siren=$companyId AND id=$id";
 
 	    try {
-	        $db = Zend_Db_Table_Abstract::getDefaultAdapter();
-	        $p = $db->fetchRow($privSql, null, Zend_Db::FETCH_OBJ);
-	    } catch(Zend_Db_Exception $e) {
-	        if ($this->User->idClient==1) {
+	        $stmt = $this->conn->executeQuery($privSql);
+	    } catch(\Doctrine\DBAL\DBALException $e) {
+	        if ($this->logger !== null) {
+	            $this->logger->error($e->getMessage());
+	        }
+	        if ($this->User->idClient == 1) {
 	            throw new SoapFault('ERR', $e->getMessage());
 	        } else {
 	            throw new SoapFault('ERR', "Application error");
 	        }
 	    }
 
-	    $iRncs = new Metier_Partenaires_MRncs();
+	    $p = $stmt->fetch(\PDO::FETCH_OBJ);
 
 	    $privilege = new PrivilegeDetail();
 	    $privilege->Id = $p->id;
@@ -768,6 +772,7 @@ class Entreprise extends Scores_Ws_Server
 	    $privilege->Devise = $p->insDev;
 	    $privilege->DebiteurNum = $p->numDebiteur;
 	    $privilege->Greffe = $p->greffe;
+	    $iRncs = new Metier_Partenaires_MRncs();
 	    $privilege->GreffeLabel = $iRncs->getLibTribunal($p->greffe);
         $privilege->RadiationDate = $p->radDate;
         $privilege->RadiationMention = $p->radMention;
@@ -829,37 +834,46 @@ class Entreprise extends Scores_Ws_Server
             $tiers = 'DE';
         }
 
-        $db = Zend_Db_Table_Abstract::getDefaultAdapter();
-
         // --- Recherche de tiers (type DE ou DF) apparaissant dans les affaires
-        $tierSql = "SELECT count(idAffaire) AS Nb FROM jo.greffes_affaires_siren " .
-            "WHERE entSiren=".$companyId." AND qualite='".$tiers."'";
         try {
-            $tierResult = $db->fetchRow($tierSql, null, Zend_DB::FETCH_OBJ);
-        } catch (Zend_Db_Exception $e) {
-            if ($this->User->idClient==1) {
+            $sql = "SELECT count(idAffaire) AS Nb FROM jo.greffes_affaires_siren
+                WHERE entSiren=:siren AND qualite=:qualite";
+            $stmt = $this->conn->prepare($sql);
+            $stmt->bindValue('siren', $companyId);
+            $stmt->bindValue('qualite', $tiers);
+            $stmt->execute();
+        } catch(\Doctrine\DBAL\DBALException $e) {
+            if ($this->logger !== null) {
+                $this->logger->error($e->getMessage());
+            }
+            if ($this->User->idClient == 1) {
                 throw new SoapFault('ERR', $e->getMessage());
             } else {
                 throw new SoapFault('ERR', "Application error");
             }
         }
-        $totalNb = 0;
-        if ($tierResult !== null) {
-            $totalNb = $tierResult->Nb;
-        }
+
+        $tierResult = $stmt->fetch(\PDO::FETCH_OBJ);
+        $totalNb = $tierResult->Nb;
 
         $output = new GreffeAffaireList();
         $output->Nb = $totalNb;
 
-        if (count($totalNb) > 0) {
+        if ($totalNb > 0) {
             // --- Selection des affaires
-            $tierSubQuery = "SELECT idAffaire FROM jo.greffes_affaires_siren " .
-                "WHERE entSiren=".$companyId." AND qualite='".$tiers."' GROUP BY idAffaire";
-            $affaireSql = "SELECT id, idAffaire, numGreffe, natureDemande, codNatureDemande, etatAffaire, dateEnrolement FROM jo.greffes_affaires ".
-                "WHERE idAffaire IN (".$tierSubQuery.") ORDER BY dateEnrolement DESC LIMIT $p,$limit";
             try {
-                $affaireResult = $db->fetchAll($affaireSql, null, Zend_DB::FETCH_OBJ);
-            } catch (Zend_Db_Exception $e) {
+                $tierSubQuery = "SELECT idAffaire FROM jo.greffes_affaires_siren
+                    WHERE entSiren=:siren AND qualite=:qualite GROUP BY idAffaire";
+                $affaireSql = "SELECT id, idAffaire, numGreffe, natureDemande, codNatureDemande, etatAffaire, dateEnrolement FROM jo.greffes_affaires
+                    WHERE idAffaire IN (".$tierSubQuery.") ORDER BY dateEnrolement DESC LIMIT $p,$limit";
+                $stmt = $this->conn->prepare($affaireSql);
+                $stmt->bindValue('siren', $companyId);
+                $stmt->bindValue('qualite', $tiers);
+                $stmt->execute();
+            } catch(\Doctrine\DBAL\DBALException $e) {
+                if ($this->logger !== null) {
+                    $this->logger->error($e->getMessage());
+                }
                 if ($this->User->idClient==1) {
                     throw new SoapFault('ERR', $e->getMessage());
                 } else {
@@ -871,8 +885,8 @@ class Entreprise extends Scores_Ws_Server
             $categories = include APPLICATION_PATH . '/../library/Metier/Table/AffairesTypes.php';
 
             $affaireList = array();
-            if (count($affaireResult) > 0) {
-                foreach ($affaireResult as $a) {
+            if ($stmt->rowCount() > 0) {
+                while ($a = $stmt->fetch(\PDO::FETCH_OBJ)) {
 
                     // --- Formattage
                     $item = new GreffeAffaire();
@@ -896,18 +910,25 @@ class Entreprise extends Scores_Ws_Server
                     } elseif ($tiers == 'DF') {
                         $tiersQualite = 'DE';
                     }
-                    $tierSql = "SELECT nomPartie FROM jo.greffes_affaires_siren WHERE idAffaire='".$a->idAffaire."' AND qualite='".$tiersQualite."'";
                     try {
-                        $tierResult = $db->fetchAll($tierSql, null, Zend_DB::FETCH_OBJ);
-                    } catch (Zend_Db_Exception $e) {
-                        if ($this->User->idClient==1) {
+                        $sql = "SELECT nomPartie FROM jo.greffes_affaires_siren WHERE idAffaire=:id AND qualite=:qualite";
+                        $tierStmt = $this->conn->prepare($sql);
+                        $tierStmt->bindValue('id', $a->idAffaire);
+                        $tierStmt->bindValue('qualite', $tiers);
+                        $tierStmt->execute();
+                    } catch(\Doctrine\DBAL\DBALException $e) {
+                        if ($this->logger !== null) {
+                            $this->logger->error($e->getMessage());
+                        }
+                        if ($this->User->idClient == 1) {
                             throw new SoapFault('ERR', $tierSql . " - " . $e->getMessage());
                         } else {
                             throw new SoapFault('ERR', "Application error");
                         }
                     }
-                    if (count($tierResult) > 0) {
-                        foreach ($tierResult as $t) {
+
+                    if ($tierStmt->rowCount() > 0) {
+                        while ($t = $tierStmt->fetch(\PDO::FETCH_OBJ)) {
                             $item->TierName[] = $t->nomPartie;
                         }
                     }
@@ -934,13 +955,16 @@ class Entreprise extends Scores_Ws_Server
         $this->authenticate();
         $this->permission('contentieux');
 
-        $db = Zend_Db_Table_Abstract::getDefaultAdapter();
-
-        $affaireSql = "SELECT id, idAffaire, numGreffe, natureDemande, codNatureDemande, etatAffaire, dateEnrolement FROM jo.greffes_affaires ".
-            "WHERE id=".$id;
         try {
-            $affaireResult = $db->fetchRow($affaireSql, null, Zend_DB::FETCH_OBJ);
-        } catch (Zend_Db_Exception $e) {
+            $sql = "SELECT id, idAffaire, numGreffe, natureDemande, codNatureDemande, etatAffaire, dateEnrolement
+                FROM jo.greffes_affaires WHERE id=:id";
+            $stmt = $this->conn->prepare($sql);
+            $stmt->bindValue('id', $id);
+            $stmt->execute();
+        } catch(\Doctrine\DBAL\DBALException $e) {
+            if ($this->logger !== null) {
+                $this->logger->error($e->getMessage());
+            }
             if ($this->User->idClient == 1) {
                 throw new SoapFault('ERR', $e->getMessage());
             } else {
@@ -949,17 +973,22 @@ class Entreprise extends Scores_Ws_Server
         }
 
         // --- Aucun resultat
-        if ($affaireResult === null) {
+        if ($stmt->rowCount() == 0) {
             throw new SoapFault('MSG', "Aucun résultat");
         }
 
+        $affaireResult = $stmt->fetch(\PDO::FETCH_OBJ);
+
         // --- Selection des Entités
         $tiers = array();
         $entiteSql = "SELECT * FROM jo.greffes_affaires_siren WHERE idAffaire='".$affaireResult->idAffaire."' ORDER BY FIELD(qualite, 'DE', 'DF')";
         try {
-            $entiteResult = $db->fetchAll($entiteSql, null, Zend_DB::FETCH_OBJ);
-            if (count($entiteResult) > 0) {
-                foreach ($entiteResult as $item) {
+            $sql = "SELECT * FROM jo.greffes_affaires_siren WHERE idAffaire=:id ORDER BY FIELD(qualite, 'DE', 'DF')";
+            $stmt = $this->conn->prepare($sql);
+            $stmt->bindValue('id', $affaireResult->idAffaire);
+            $stmt->execute();
+            if ($stmt->rowCount() > 0) {
+                while($item = $stmt->fetch(\PDO::FETCH_OBJ)) {
                     $entite = new GreffeAffaireTiers();
                     $entite->companyId = $item->entSiren;
                     $entite->companyNom = $item->nomPartie;
@@ -985,7 +1014,10 @@ class Entreprise extends Scores_Ws_Server
                 }
             }
 
-        } catch (Zend_Db_Exception $e) {
+        } catch(\Doctrine\DBAL\DBALException $e) {
+            if ($this->logger !== null) {
+                $this->logger->error($e->getMessage());
+            }
             if ($this->User->idClient == 1) {
                 throw new SoapFault('ERR', $e->getMessage());
             } else {
@@ -995,11 +1027,13 @@ class Entreprise extends Scores_Ws_Server
 
         // --- Selection de l'historique
         $histo = array();
-        $histoSql = "SELECT * FROM jo.greffes_affaires_histo WHERE idAffaire='".$affaireResult->idAffaire."' ORDER BY dateDecision DESC";
         try {
-            $histoResult = $db->fetchAll($histoSql, null, Zend_DB::FETCH_OBJ);
-            if (count($histoResult) > 0) {
-                foreach ($histoResult as $h){
+            $sql = "SELECT * FROM jo.greffes_affaires_histo WHERE idAffaire=:id ORDER BY dateDecision DESC";
+            $stmt = $this->conn->prepare($sql);
+            $stmt->bindValue('id', $affaireResult->idAffaire);
+            $stmt->execute();
+            if ($stmt->rowCount() > 0) {
+                while ($h = $stmt->fetch(\PDO::FETCH_OBJ)) {
                     $decision = new GreffeAffaireHisto();
                     $decision->Label = $h->libelleDecision;
                     $decision->Date = $h->dateDecision;
@@ -1007,8 +1041,11 @@ class Entreprise extends Scores_Ws_Server
                     $histo[] = $decision;
                 }
             }
-
-        } catch (Zend_Db_Exception $e) {}
+        } catch(\Doctrine\DBAL\DBALException $e) {
+            if ($this->logger !== null) {
+                $this->logger->error($e->getMessage());
+            }
+        }
 
         // --- Formattage
         $status = include APPLICATION_PATH . '/../library/Metier/Ctx/AffaireStatus.php';
@@ -1357,8 +1394,6 @@ class Entreprise extends Scores_Ws_Server
 	        throw new SoapFault('ERR', 'Identifiant incorrect.');
 	    }
 
-	    $db = Zend_Db_Table_Abstract::getDefaultAdapter();
-
 	    $cadastre = new Metier_Partenaires_MCadastre();
 	    $cadastre->setId($companyId);
         $patrimoine = array();
diff --git a/library/WsScore/Interne/v0.6/Service.php b/library/WsScore/Interne/v0.6/Service.php
index d97da90a..7b62fdab 100644
--- a/library/WsScore/Interne/v0.6/Service.php
+++ b/library/WsScore/Interne/v0.6/Service.php
@@ -2715,14 +2715,16 @@ class Interne extends Scores_Ws_Server
         $this->authenticate();
 
         try {
-            $db = Zend_Db_Table_Abstract::getDefaultAdapter();
-            $db->setFetchMode(Zend_Db::FETCH_OBJ);
-            $sql = $db->select()->from('rncs_even', '*', 'jo')
-                ->join('tabEvenRncs', 'rncs_even.codeEven = tabEvenRncs.codeEven', array('libEven'), 'jo')
-                ->where('rncs_even.siren=?', $companyId);
-            $result = $db->fetchAll($sql);
-        } catch (Zend_Db_Exception $e) {
-            if ($this->User->idClient==1) {
+            $sql = "SELECT r.*, t.libEven FROM jo.rncs_even r, jo.tabEvenRncs t
+                WHERE r.codeEven = t.codeEven AND r.siren=:siren";
+            $stmt = $this->conn->prepare($sql);
+            $stmt->bindValue('siren', $companyId);
+            $stmt->execute();
+        } catch(\Doctrine\DBAL\DBALException $e) {
+            if ($this->logger !== null) {
+                $this->logger->error($e->getMessage());
+            }
+            if ($this->User->idClient == 1) {
                 throw new SoapFault('ERR', $e->getMessage());
             } else {
                 throw new SoapFault('ERR', "Application error");
@@ -2730,8 +2732,8 @@ class Interne extends Scores_Ws_Server
         }
 
         $evenList = array();
-        if (count($result) > 0) {
-            foreach ($result as $item) {
+        if ($stmt->rowCount() > 0) {
+            while($item = $stmt->fetch(\PDO::FETCH_OBJ)) {
                 $even = new RncsEven();
                 $even->Code = $item->codeEven;
                 $even->Label = $item->libEven;
@@ -2755,14 +2757,16 @@ class Interne extends Scores_Ws_Server
         $this->authenticate();
 
         try {
-            $db = Zend_Db_Table_Abstract::getDefaultAdapter();
-            $db->setFetchMode(Zend_Db::FETCH_OBJ);
-            $sql = $db->select()->from('rncs_jugements', array('siren', 'codeJugement', 'dateEffet', 'typeDate', 'dateInsert'), 'jo')
-                ->join('tabJugeRncs', 'rncs_jugements.codeJugement = tabJugeRncs.codJugement', array('libJugement'), 'jo')
-                ->where('rncs_jugements.siren=?', $companyId);
-            $result = $db->fetchAll($sql);
-        } catch (Zend_Db_Exception $e) {
-            if ($this->User->idClient==1) {
+            $sql = "SELECT siren, r.codeJugement, r.dateEffet, r.typeDate, r.dateInsert, t.libJugement FROM jo.rncs_jugements r, jo.tabJugeRncs t
+                WHERE r.codeJugement = t.codJugement AND r.siren=:siren";
+            $stmt = $this->conn->prepare($sql);
+            $stmt->bindValue('siren', $companyId);
+            $stmt->execute();
+        } catch(\Doctrine\DBAL\DBALException $e) {
+            if ($this->logger !== null) {
+                $this->logger->error($e->getMessage());
+            }
+            if ($this->User->idClient == 1) {
                 throw new SoapFault('ERR', $e->getMessage());
             } else {
                 throw new SoapFault('ERR', "Application error");
@@ -2770,8 +2774,8 @@ class Interne extends Scores_Ws_Server
         }
 
         $evenList = array();
-        if (count($result) > 0) {
-            foreach ($result as $item) {
+        if ($stmt->rowCount() > 0) {
+            while($item = $stmt->fetch(\PDO::FETCH_OBJ)) {
                 $even = new RncsJugement();
                 $even->Code = $item->codeJugement;
                 $even->Label = $item->libJugement;
diff --git a/library/WsScore/Order/v0.1/Service.php b/library/WsScore/Order/v0.1/Service.php
index 8fa5a100..100ba04a 100644
--- a/library/WsScore/Order/v0.1/Service.php
+++ b/library/WsScore/Order/v0.1/Service.php
@@ -403,7 +403,7 @@ class Order extends Scores_Ws_Server
 			    $item = $stmt->fetch(\PDO::FETCH_OBJ);
 			}
 		}
-		catch(Zend_Db_Exception $e) {
+		catch(\Doctrine\DBAL\DBALException $e) {
 			if ($this->User->idClient == 1) {
 				throw new SoapFault('ERR', $e->getMessage());
 			} else {
diff --git a/library/WsScore/ServicesConfig.php b/library/WsScore/ServicesConfig.php
index 03b534a0..9cafc0db 100644
--- a/library/WsScore/ServicesConfig.php
+++ b/library/WsScore/ServicesConfig.php
@@ -25,7 +25,6 @@ return array(
     'gestion' => array(
         'actif' => true,
         'versions' => array(
-            '0.4' => array( 'actif' => true, 'defaut' => 'beta' ),
             '0.3' => array( 'actif' => true, 'defaut' => true ),
         ),
         'idClient' => array(1),
diff --git a/public/assets/themes/default/js/jquery.form.js b/public/assets/themes/default/js/jquery.form.js
deleted file mode 100644
index 111bf001..00000000
--- a/public/assets/themes/default/js/jquery.form.js
+++ /dev/null
@@ -1,923 +0,0 @@
-/*!
- * jQuery Form Plugin
- * version: 2.85 (23-SEP-2011)
- * @requires jQuery v1.3.2 or later
- *
- * Examples and documentation at: http://malsup.com/jquery/form/
- * Dual licensed under the MIT and GPL licenses:
- *   http://www.opensource.org/licenses/mit-license.php
- *   http://www.gnu.org/licenses/gpl.html
- */
-;(function($) {
-
-/*
-	Usage Note:
-	-----------
-	Do not use both ajaxSubmit and ajaxForm on the same form.  These
-	functions are intended to be exclusive.  Use ajaxSubmit if you want
-	to bind your own submit handler to the form.  For example,
-
-	$(document).ready(function() {
-		$('#myForm').bind('submit', function(e) {
-			e.preventDefault(); // <-- important
-			$(this).ajaxSubmit({
-				target: '#output'
-			});
-		});
-	});
-
-	Use ajaxForm when you want the plugin to manage all the event binding
-	for you.  For example,
-
-	$(document).ready(function() {
-		$('#myForm').ajaxForm({
-			target: '#output'
-		});
-	});
-
-	When using ajaxForm, the ajaxSubmit function will be invoked for you
-	at the appropriate time.
-*/
-
-/**
- * ajaxSubmit() provides a mechanism for immediately submitting
- * an HTML form using AJAX.
- */
-$.fn.ajaxSubmit = function(options) {
-	// fast fail if nothing selected (http://dev.jquery.com/ticket/2752)
-	if (!this.length) {
-		log('ajaxSubmit: skipping submit process - no element selected');
-		return this;
-	}
-	
-	var method, action, url, $form = this;
-
-	if (typeof options == 'function') {
-		options = { success: options };
-	}
-
-	method = this.attr('method');
-	action = this.attr('action');
-	url = (typeof action === 'string') ? $.trim(action) : '';
-	url = url || window.location.href || '';
-	if (url) {
-		// clean url (don't include hash vaue)
-		url = (url.match(/^([^#]+)/)||[])[1];
-	}
-
-	options = $.extend(true, {
-		url:  url,
-		success: $.ajaxSettings.success,
-		type: method || 'GET',
-		iframeSrc: /^https/i.test(window.location.href || '') ? 'javascript:false' : 'about:blank'
-	}, options);
-
-	// hook for manipulating the form data before it is extracted;
-	// convenient for use with rich editors like tinyMCE or FCKEditor
-	var veto = {};
-	this.trigger('form-pre-serialize', [this, options, veto]);
-	if (veto.veto) {
-		log('ajaxSubmit: submit vetoed via form-pre-serialize trigger');
-		return this;
-	}
-
-	// provide opportunity to alter form data before it is serialized
-	if (options.beforeSerialize && options.beforeSerialize(this, options) === false) {
-		log('ajaxSubmit: submit aborted via beforeSerialize callback');
-		return this;
-	}
-
-	var n,v,a = this.formToArray(options.semantic);
-	if (options.data) {
-		options.extraData = options.data;
-		for (n in options.data) {
-			if( $.isArray(options.data[n]) ) {
-				for (var k in options.data[n]) {
-					a.push( { name: n, value: options.data[n][k] } );
-				}
-			}
-			else {
-				v = options.data[n];
-				v = $.isFunction(v) ? v() : v; // if value is fn, invoke it
-				a.push( { name: n, value: v } );
-			}
-		}
-	}
-
-	// give pre-submit callback an opportunity to abort the submit
-	if (options.beforeSubmit && options.beforeSubmit(a, this, options) === false) {
-		log('ajaxSubmit: submit aborted via beforeSubmit callback');
-		return this;
-	}
-
-	// fire vetoable 'validate' event
-	this.trigger('form-submit-validate', [a, this, options, veto]);
-	if (veto.veto) {
-		log('ajaxSubmit: submit vetoed via form-submit-validate trigger');
-		return this;
-	}
-
-	var q = $.param(a);
-
-	if (options.type.toUpperCase() == 'GET') {
-		options.url += (options.url.indexOf('?') >= 0 ? '&' : '?') + q;
-		options.data = null;  // data is null for 'get'
-	}
-	else {
-		options.data = q; // data is the query string for 'post'
-	}
-
-	var callbacks = [];
-	if (options.resetForm) {
-		callbacks.push(function() { $form.resetForm(); });
-	}
-	if (options.clearForm) {
-		callbacks.push(function() { $form.clearForm(); });
-	}
-
-	// perform a load on the target only if dataType is not provided
-	if (!options.dataType && options.target) {
-		var oldSuccess = options.success || function(){};
-		callbacks.push(function(data) {
-			var fn = options.replaceTarget ? 'replaceWith' : 'html';
-			$(options.target)[fn](data).each(oldSuccess, arguments);
-		});
-	}
-	else if (options.success) {
-		callbacks.push(options.success);
-	}
-
-	options.success = function(data, status, xhr) { // jQuery 1.4+ passes xhr as 3rd arg
-		var context = options.context || options;   // jQuery 1.4+ supports scope context 
-		for (var i=0, max=callbacks.length; i < max; i++) {
-			callbacks[i].apply(context, [data, status, xhr || $form, $form]);
-		}
-	};
-
-	// are there files to upload?
-	var fileInputs = $('input:file', this).length > 0;
-	var mp = 'multipart/form-data';
-	var multipart = ($form.attr('enctype') == mp || $form.attr('encoding') == mp);
-
-	// options.iframe allows user to force iframe mode
-	// 06-NOV-09: now defaulting to iframe mode if file input is detected
-   if (options.iframe !== false && (fileInputs || options.iframe || multipart)) {
-	   // hack to fix Safari hang (thanks to Tim Molendijk for this)
-	   // see:  http://groups.google.com/group/jquery-dev/browse_thread/thread/36395b7ab510dd5d
-	   if (options.closeKeepAlive) {
-		   $.get(options.closeKeepAlive, function() { fileUpload(a); });
-		}
-	   else {
-		   fileUpload(a);
-		}
-   }
-   else {
-		// IE7 massage (see issue 57)
-		if ($.browser.msie && method == 'get' && typeof options.type === "undefined") {
-			var ieMeth = $form[0].getAttribute('method');
-			if (typeof ieMeth === 'string')
-				options.type = ieMeth;
-		}
-		$.ajax(options);
-   }
-
-	// fire 'notify' event
-	this.trigger('form-submit-notify', [this, options]);
-	return this;
-
-
-	// private function for handling file uploads (hat tip to YAHOO!)
-	function fileUpload(a) {
-		var form = $form[0], el, i, s, g, id, $io, io, xhr, sub, n, timedOut, timeoutHandle;
-        var useProp = !!$.fn.prop;
-
-        if (a) {
-            if ( useProp ) {
-            	// ensure that every serialized input is still enabled
-              	for (i=0; i < a.length; i++) {
-                    el = $(form[a[i].name]);
-                    el.prop('disabled', false);
-              	}
-            } else {
-              	for (i=0; i < a.length; i++) {
-                    el = $(form[a[i].name]);
-                    el.removeAttr('disabled');
-              	}
-            };
-        }
-
-		if ($(':input[name=submit],:input[id=submit]', form).length) {
-			// if there is an input with a name or id of 'submit' then we won't be
-			// able to invoke the submit fn on the form (at least not x-browser)
-			alert('Error: Form elements must not have name or id of "submit".');
-			return;
-		}
-		
-		s = $.extend(true, {}, $.ajaxSettings, options);
-		s.context = s.context || s;
-		id = 'jqFormIO' + (new Date().getTime());
-		if (s.iframeTarget) {
-			$io = $(s.iframeTarget);
-			n = $io.attr('name');
-			if (n == null)
-			 	$io.attr('name', id);
-			else
-				id = n;
-		}
-		else {
-			$io = $('<iframe name="' + id + '" src="'+ s.iframeSrc +'" />');
-			$io.css({ position: 'absolute', top: '-1000px', left: '-1000px' });
-		}
-		io = $io[0];
-
-
-		xhr = { // mock object
-			aborted: 0,
-			responseText: null,
-			responseXML: null,
-			status: 0,
-			statusText: 'n/a',
-			getAllResponseHeaders: function() {},
-			getResponseHeader: function() {},
-			setRequestHeader: function() {},
-			abort: function(status) {
-				var e = (status === 'timeout' ? 'timeout' : 'aborted');
-				log('aborting upload... ' + e);
-				this.aborted = 1;
-				$io.attr('src', s.iframeSrc); // abort op in progress
-				xhr.error = e;
-				s.error && s.error.call(s.context, xhr, e, status);
-				g && $.event.trigger("ajaxError", [xhr, s, e]);
-				s.complete && s.complete.call(s.context, xhr, e);
-			}
-		};
-
-		g = s.global;
-		// trigger ajax global events so that activity/block indicators work like normal
-		if (g && ! $.active++) {
-			$.event.trigger("ajaxStart");
-		}
-		if (g) {
-			$.event.trigger("ajaxSend", [xhr, s]);
-		}
-
-		if (s.beforeSend && s.beforeSend.call(s.context, xhr, s) === false) {
-			if (s.global) {
-				$.active--;
-			}
-			return;
-		}
-		if (xhr.aborted) {
-			return;
-		}
-
-		// add submitting element to data if we know it
-		sub = form.clk;
-		if (sub) {
-			n = sub.name;
-			if (n && !sub.disabled) {
-				s.extraData = s.extraData || {};
-				s.extraData[n] = sub.value;
-				if (sub.type == "image") {
-					s.extraData[n+'.x'] = form.clk_x;
-					s.extraData[n+'.y'] = form.clk_y;
-				}
-			}
-		}
-		
-		var CLIENT_TIMEOUT_ABORT = 1;
-		var SERVER_ABORT = 2;
-
-		function getDoc(frame) {
-			var doc = frame.contentWindow ? frame.contentWindow.document : frame.contentDocument ? frame.contentDocument : frame.document;
-			return doc;
-		}
-		
-		// take a breath so that pending repaints get some cpu time before the upload starts
-		function doSubmit() {
-			// make sure form attrs are set
-			var t = $form.attr('target'), a = $form.attr('action');
-
-			// update form attrs in IE friendly way
-			form.setAttribute('target',id);
-			if (!method) {
-				form.setAttribute('method', 'POST');
-			}
-			if (a != s.url) {
-				form.setAttribute('action', s.url);
-			}
-
-			// ie borks in some cases when setting encoding
-			if (! s.skipEncodingOverride && (!method || /post/i.test(method))) {
-				$form.attr({
-					encoding: 'multipart/form-data',
-					enctype:  'multipart/form-data'
-				});
-			}
-
-			// support timout
-			if (s.timeout) {
-				timeoutHandle = setTimeout(function() { timedOut = true; cb(CLIENT_TIMEOUT_ABORT); }, s.timeout);
-			}
-			
-			// look for server aborts
-			function checkState() {
-				try {
-					var state = getDoc(io).readyState;
-					log('state = ' + state);
-					if (state.toLowerCase() == 'uninitialized')
-						setTimeout(checkState,50);
-				}
-				catch(e) {
-					log('Server abort: ' , e, ' (', e.name, ')');
-					cb(SERVER_ABORT);
-					timeoutHandle && clearTimeout(timeoutHandle);
-					timeoutHandle = undefined;
-				}
-			}
-
-			// add "extra" data to form if provided in options
-			var extraInputs = [];
-			try {
-				if (s.extraData) {
-					for (var n in s.extraData) {
-						extraInputs.push(
-							$('<input type="hidden" name="'+n+'" />').attr('value',s.extraData[n])
-								.appendTo(form)[0]);
-					}
-				}
-
-				if (!s.iframeTarget) {
-					// add iframe to doc and submit the form
-					$io.appendTo('body');
-	                io.attachEvent ? io.attachEvent('onload', cb) : io.addEventListener('load', cb, false);
-				}
-				setTimeout(checkState,15);
-				form.submit();
-			}
-			finally {
-				// reset attrs and remove "extra" input elements
-				form.setAttribute('action',a);
-				if(t) {
-					form.setAttribute('target', t);
-				} else {
-					$form.removeAttr('target');
-				}
-				$(extraInputs).remove();
-			}
-		}
-
-		if (s.forceSync) {
-			doSubmit();
-		}
-		else {
-			setTimeout(doSubmit, 10); // this lets dom updates render
-		}
-
-		var data, doc, domCheckCount = 50, callbackProcessed;
-
-		function cb(e) {
-			if (xhr.aborted || callbackProcessed) {
-				return;
-			}
-			try {
-				doc = getDoc(io);
-			}
-			catch(ex) {
-				log('cannot access response document: ', ex);
-				e = SERVER_ABORT;
-			}
-			if (e === CLIENT_TIMEOUT_ABORT && xhr) {
-				xhr.abort('timeout');
-				return;
-			}
-			else if (e == SERVER_ABORT && xhr) {
-				xhr.abort('server abort');
-				return;
-			}
-
-			if (!doc || doc.location.href == s.iframeSrc) {
-				// response not received yet
-				if (!timedOut)
-					return;
-			}
-            io.detachEvent ? io.detachEvent('onload', cb) : io.removeEventListener('load', cb, false);
-
-			var status = 'success', errMsg;
-			try {
-				if (timedOut) {
-					throw 'timeout';
-				}
-
-				var isXml = s.dataType == 'xml' || doc.XMLDocument || $.isXMLDoc(doc);
-				log('isXml='+isXml);
-				if (!isXml && window.opera && (doc.body == null || doc.body.innerHTML == '')) {
-					if (--domCheckCount) {
-						// in some browsers (Opera) the iframe DOM is not always traversable when
-						// the onload callback fires, so we loop a bit to accommodate
-						log('requeing onLoad callback, DOM not available');
-						setTimeout(cb, 250);
-						return;
-					}
-					// let this fall through because server response could be an empty document
-					//log('Could not access iframe DOM after mutiple tries.');
-					//throw 'DOMException: not available';
-				}
-
-				//log('response detected');
-                var docRoot = doc.body ? doc.body : doc.documentElement;
-                xhr.responseText = docRoot ? docRoot.innerHTML : null;
-				xhr.responseXML = doc.XMLDocument ? doc.XMLDocument : doc;
-				if (isXml)
-					s.dataType = 'xml';
-				xhr.getResponseHeader = function(header){
-					var headers = {'content-type': s.dataType};
-					return headers[header];
-				};
-                // support for XHR 'status' & 'statusText' emulation :
-                if (docRoot) {
-                    xhr.status = Number( docRoot.getAttribute('status') ) || xhr.status;
-                    xhr.statusText = docRoot.getAttribute('statusText') || xhr.statusText;
-                }
-
-				var dt = (s.dataType || '').toLowerCase();
-				var scr = /(json|script|text)/.test(dt);
-				if (scr || s.textarea) {
-					// see if user embedded response in textarea
-					var ta = doc.getElementsByTagName('textarea')[0];
-					if (ta) {
-						xhr.responseText = ta.value;
-                        // support for XHR 'status' & 'statusText' emulation :
-                        xhr.status = Number( ta.getAttribute('status') ) || xhr.status;
-                        xhr.statusText = ta.getAttribute('statusText') || xhr.statusText;
-					}
-					else if (scr) {
-						// account for browsers injecting pre around json response
-						var pre = doc.getElementsByTagName('pre')[0];
-						var b = doc.getElementsByTagName('body')[0];
-						if (pre) {
-							xhr.responseText = pre.textContent ? pre.textContent : pre.innerText;
-						}
-						else if (b) {
-							xhr.responseText = b.textContent ? b.textContent : b.innerText;
-						}
-					}
-				}
-				else if (dt == 'xml' && !xhr.responseXML && xhr.responseText != null) {
-					xhr.responseXML = toXml(xhr.responseText);
-				}
-
-                try {
-                    data = httpData(xhr, dt, s);
-                }
-                catch (e) {
-                    status = 'parsererror';
-                    xhr.error = errMsg = (e || status);
-                }
-			}
-			catch (e) {
-				log('error caught: ',e);
-				status = 'error';
-                xhr.error = errMsg = (e || status);
-			}
-
-			if (xhr.aborted) {
-				log('upload aborted');
-				status = null;
-			}
-
-            if (xhr.status) { // we've set xhr.status
-                status = (xhr.status >= 200 && xhr.status < 300 || xhr.status === 304) ? 'success' : 'error';
-            }
-
-			// ordering of these callbacks/triggers is odd, but that's how $.ajax does it
-			if (status === 'success') {
-				s.success && s.success.call(s.context, data, 'success', xhr);
-				g && $.event.trigger("ajaxSuccess", [xhr, s]);
-			}
-            else if (status) {
-				if (errMsg == undefined)
-					errMsg = xhr.statusText;
-				s.error && s.error.call(s.context, xhr, status, errMsg);
-				g && $.event.trigger("ajaxError", [xhr, s, errMsg]);
-            }
-
-			g && $.event.trigger("ajaxComplete", [xhr, s]);
-
-			if (g && ! --$.active) {
-				$.event.trigger("ajaxStop");
-			}
-
-			s.complete && s.complete.call(s.context, xhr, status);
-
-			callbackProcessed = true;
-			if (s.timeout)
-				clearTimeout(timeoutHandle);
-
-			// clean up
-			setTimeout(function() {
-				if (!s.iframeTarget)
-					$io.remove();
-				xhr.responseXML = null;
-			}, 100);
-		}
-
-		var toXml = $.parseXML || function(s, doc) { // use parseXML if available (jQuery 1.5+)
-			if (window.ActiveXObject) {
-				doc = new ActiveXObject('Microsoft.XMLDOM');
-				doc.async = 'false';
-				doc.loadXML(s);
-			}
-			else {
-				doc = (new DOMParser()).parseFromString(s, 'text/xml');
-			}
-			return (doc && doc.documentElement && doc.documentElement.nodeName != 'parsererror') ? doc : null;
-		};
-		var parseJSON = $.parseJSON || function(s) {
-			return window['eval']('(' + s + ')');
-		};
-
-		var httpData = function( xhr, type, s ) { // mostly lifted from jq1.4.4
-
-			var ct = xhr.getResponseHeader('content-type') || '',
-				xml = type === 'xml' || !type && ct.indexOf('xml') >= 0,
-				data = xml ? xhr.responseXML : xhr.responseText;
-
-			if (xml && data.documentElement.nodeName === 'parsererror') {
-				$.error && $.error('parsererror');
-			}
-			if (s && s.dataFilter) {
-				data = s.dataFilter(data, type);
-			}
-			if (typeof data === 'string') {
-				if (type === 'json' || !type && ct.indexOf('json') >= 0) {
-					data = parseJSON(data);
-				} else if (type === "script" || !type && ct.indexOf("javascript") >= 0) {
-					$.globalEval(data);
-				}
-			}
-			return data;
-		};
-	}
-};
-
-/**
- * ajaxForm() provides a mechanism for fully automating form submission.
- *
- * The advantages of using this method instead of ajaxSubmit() are:
- *
- * 1: This method will include coordinates for <input type="image" /> elements (if the element
- *	is used to submit the form).
- * 2. This method will include the submit element's name/value data (for the element that was
- *	used to submit the form).
- * 3. This method binds the submit() method to the form for you.
- *
- * The options argument for ajaxForm works exactly as it does for ajaxSubmit.  ajaxForm merely
- * passes the options argument along after properly binding events for submit elements and
- * the form itself.
- */
-$.fn.ajaxForm = function(options) {
-	// in jQuery 1.3+ we can fix mistakes with the ready state
-	if (this.length === 0) {
-		var o = { s: this.selector, c: this.context };
-		if (!$.isReady && o.s) {
-			log('DOM not ready, queuing ajaxForm');
-			$(function() {
-				$(o.s,o.c).ajaxForm(options);
-			});
-			return this;
-		}
-		// is your DOM ready?  http://docs.jquery.com/Tutorials:Introducing_$(document).ready()
-		log('terminating; zero elements found by selector' + ($.isReady ? '' : ' (DOM not ready)'));
-		return this;
-	}
-
-	return this.ajaxFormUnbind().bind('submit.form-plugin', function(e) {
-		if (!e.isDefaultPrevented()) { // if event has been canceled, don't proceed
-			e.preventDefault();
-			$(this).ajaxSubmit(options);
-		}
-	}).bind('click.form-plugin', function(e) {
-		var target = e.target;
-		var $el = $(target);
-		if (!($el.is(":submit,input:image"))) {
-			// is this a child element of the submit el?  (ex: a span within a button)
-			var t = $el.closest(':submit');
-			if (t.length == 0) {
-				return;
-			}
-			target = t[0];
-		}
-		var form = this;
-		form.clk = target;
-		if (target.type == 'image') {
-			if (e.offsetX != undefined) {
-				form.clk_x = e.offsetX;
-				form.clk_y = e.offsetY;
-			} else if (typeof $.fn.offset == 'function') { // try to use dimensions plugin
-				var offset = $el.offset();
-				form.clk_x = e.pageX - offset.left;
-				form.clk_y = e.pageY - offset.top;
-			} else {
-				form.clk_x = e.pageX - target.offsetLeft;
-				form.clk_y = e.pageY - target.offsetTop;
-			}
-		}
-		// clear form vars
-		setTimeout(function() { form.clk = form.clk_x = form.clk_y = null; }, 100);
-	});
-};
-
-// ajaxFormUnbind unbinds the event handlers that were bound by ajaxForm
-$.fn.ajaxFormUnbind = function() {
-	return this.unbind('submit.form-plugin click.form-plugin');
-};
-
-/**
- * formToArray() gathers form element data into an array of objects that can
- * be passed to any of the following ajax functions: $.get, $.post, or load.
- * Each object in the array has both a 'name' and 'value' property.  An example of
- * an array for a simple login form might be:
- *
- * [ { name: 'username', value: 'jresig' }, { name: 'password', value: 'secret' } ]
- *
- * It is this array that is passed to pre-submit callback functions provided to the
- * ajaxSubmit() and ajaxForm() methods.
- */
-$.fn.formToArray = function(semantic) {
-	var a = [];
-	if (this.length === 0) {
-		return a;
-	}
-
-	var form = this[0];
-	var els = semantic ? form.getElementsByTagName('*') : form.elements;
-	if (!els) {
-		return a;
-	}
-
-	var i,j,n,v,el,max,jmax;
-	for(i=0, max=els.length; i < max; i++) {
-		el = els[i];
-		n = el.name;
-		if (!n) {
-			continue;
-		}
-
-		if (semantic && form.clk && el.type == "image") {
-			// handle image inputs on the fly when semantic == true
-			if(!el.disabled && form.clk == el) {
-				a.push({name: n, value: $(el).val()});
-				a.push({name: n+'.x', value: form.clk_x}, {name: n+'.y', value: form.clk_y});
-			}
-			continue;
-		}
-
-		v = $.fieldValue(el, true);
-		if (v && v.constructor == Array) {
-			for(j=0, jmax=v.length; j < jmax; j++) {
-				a.push({name: n, value: v[j]});
-			}
-		}
-		else if (v !== null && typeof v != 'undefined') {
-			a.push({name: n, value: v});
-		}
-	}
-
-	if (!semantic && form.clk) {
-		// input type=='image' are not found in elements array! handle it here
-		var $input = $(form.clk), input = $input[0];
-		n = input.name;
-		if (n && !input.disabled && input.type == 'image') {
-			a.push({name: n, value: $input.val()});
-			a.push({name: n+'.x', value: form.clk_x}, {name: n+'.y', value: form.clk_y});
-		}
-	}
-	return a;
-};
-
-/**
- * Serializes form data into a 'submittable' string. This method will return a string
- * in the format: name1=value1&amp;name2=value2
- */
-$.fn.formSerialize = function(semantic) {
-	//hand off to jQuery.param for proper encoding
-	return $.param(this.formToArray(semantic));
-};
-
-/**
- * Serializes all field elements in the jQuery object into a query string.
- * This method will return a string in the format: name1=value1&amp;name2=value2
- */
-$.fn.fieldSerialize = function(successful) {
-	var a = [];
-	this.each(function() {
-		var n = this.name;
-		if (!n) {
-			return;
-		}
-		var v = $.fieldValue(this, successful);
-		if (v && v.constructor == Array) {
-			for (var i=0,max=v.length; i < max; i++) {
-				a.push({name: n, value: v[i]});
-			}
-		}
-		else if (v !== null && typeof v != 'undefined') {
-			a.push({name: this.name, value: v});
-		}
-	});
-	//hand off to jQuery.param for proper encoding
-	return $.param(a);
-};
-
-/**
- * Returns the value(s) of the element in the matched set.  For example, consider the following form:
- *
- *  <form><fieldset>
- *	  <input name="A" type="text" />
- *	  <input name="A" type="text" />
- *	  <input name="B" type="checkbox" value="B1" />
- *	  <input name="B" type="checkbox" value="B2"/>
- *	  <input name="C" type="radio" value="C1" />
- *	  <input name="C" type="radio" value="C2" />
- *  </fieldset></form>
- *
- *  var v = $(':text').fieldValue();
- *  // if no values are entered into the text inputs
- *  v == ['','']
- *  // if values entered into the text inputs are 'foo' and 'bar'
- *  v == ['foo','bar']
- *
- *  var v = $(':checkbox').fieldValue();
- *  // if neither checkbox is checked
- *  v === undefined
- *  // if both checkboxes are checked
- *  v == ['B1', 'B2']
- *
- *  var v = $(':radio').fieldValue();
- *  // if neither radio is checked
- *  v === undefined
- *  // if first radio is checked
- *  v == ['C1']
- *
- * The successful argument controls whether or not the field element must be 'successful'
- * (per http://www.w3.org/TR/html4/interact/forms.html#successful-controls).
- * The default value of the successful argument is true.  If this value is false the value(s)
- * for each element is returned.
- *
- * Note: This method *always* returns an array.  If no valid value can be determined the
- *	   array will be empty, otherwise it will contain one or more values.
- */
-$.fn.fieldValue = function(successful) {
-	for (var val=[], i=0, max=this.length; i < max; i++) {
-		var el = this[i];
-		var v = $.fieldValue(el, successful);
-		if (v === null || typeof v == 'undefined' || (v.constructor == Array && !v.length)) {
-			continue;
-		}
-		v.constructor == Array ? $.merge(val, v) : val.push(v);
-	}
-	return val;
-};
-
-/**
- * Returns the value of the field element.
- */
-$.fieldValue = function(el, successful) {
-	var n = el.name, t = el.type, tag = el.tagName.toLowerCase();
-	if (successful === undefined) {
-		successful = true;
-	}
-
-	if (successful && (!n || el.disabled || t == 'reset' || t == 'button' ||
-		(t == 'checkbox' || t == 'radio') && !el.checked ||
-		(t == 'submit' || t == 'image') && el.form && el.form.clk != el ||
-		tag == 'select' && el.selectedIndex == -1)) {
-			return null;
-	}
-
-	if (tag == 'select') {
-		var index = el.selectedIndex;
-		if (index < 0) {
-			return null;
-		}
-		var a = [], ops = el.options;
-		var one = (t == 'select-one');
-		var max = (one ? index+1 : ops.length);
-		for(var i=(one ? index : 0); i < max; i++) {
-			var op = ops[i];
-			if (op.selected) {
-				var v = op.value;
-				if (!v) { // extra pain for IE...
-					v = (op.attributes && op.attributes['value'] && !(op.attributes['value'].specified)) ? op.text : op.value;
-				}
-				if (one) {
-					return v;
-				}
-				a.push(v);
-			}
-		}
-		return a;
-	}
-	return $(el).val();
-};
-
-/**
- * Clears the form data.  Takes the following actions on the form's input fields:
- *  - input text fields will have their 'value' property set to the empty string
- *  - select elements will have their 'selectedIndex' property set to -1
- *  - checkbox and radio inputs will have their 'checked' property set to false
- *  - inputs of type submit, button, reset, and hidden will *not* be effected
- *  - button elements will *not* be effected
- */
-$.fn.clearForm = function() {
-	return this.each(function() {
-		$('input,select,textarea', this).clearFields();
-	});
-};
-
-/**
- * Clears the selected form elements.
- */
-$.fn.clearFields = $.fn.clearInputs = function() {
-	var re = /^(?:color|date|datetime|email|month|number|password|range|search|tel|text|time|url|week)$/i; // 'hidden' is not in this list
-	return this.each(function() {
-		var t = this.type, tag = this.tagName.toLowerCase();
-		if (re.test(t) || tag == 'textarea') {
-			this.value = '';
-		}
-		else if (t == 'checkbox' || t == 'radio') {
-			this.checked = false;
-		}
-		else if (tag == 'select') {
-			this.selectedIndex = -1;
-		}
-	});
-};
-
-/**
- * Resets the form data.  Causes all form elements to be reset to their original value.
- */
-$.fn.resetForm = function() {
-	return this.each(function() {
-		// guard against an input with the name of 'reset'
-		// note that IE reports the reset function as an 'object'
-		if (typeof this.reset == 'function' || (typeof this.reset == 'object' && !this.reset.nodeType)) {
-			this.reset();
-		}
-	});
-};
-
-/**
- * Enables or disables any matching elements.
- */
-$.fn.enable = function(b) {
-	if (b === undefined) {
-		b = true;
-	}
-	return this.each(function() {
-		this.disabled = !b;
-	});
-};
-
-/**
- * Checks/unchecks any matching checkboxes or radio buttons and
- * selects/deselects and matching option elements.
- */
-$.fn.selected = function(select) {
-	if (select === undefined) {
-		select = true;
-	}
-	return this.each(function() {
-		var t = this.type;
-		if (t == 'checkbox' || t == 'radio') {
-			this.checked = select;
-		}
-		else if (this.tagName.toLowerCase() == 'option') {
-			var $sel = $(this).parent('select');
-			if (select && $sel[0] && $sel[0].type == 'select-one') {
-				// deselect all other options
-				$sel.find('option').selected(false);
-			}
-			this.selected = select;
-		}
-	});
-};
-
-// expose debug var
-$.fn.ajaxSubmit.debug = false;
-
-// helper fn for console logging
-function log() {
-	if (!$.fn.ajaxSubmit.debug) 
-		return;
-	var msg = '[jquery.form] ' + Array.prototype.join.call(arguments,'');
-	if (window.console && window.console.log) {
-		window.console.log(msg);
-	}
-	else if (window.opera && window.opera.postError) {
-		window.opera.postError(msg);
-	}
-};
-
-})(jQuery);