Merge from branche 2.4 : Prepare to release in staging

application/controllers/EvaluationController.php

@@ -14,7 +14,6 @@ class EvaluationController extends Zend_Controller_Action
 		require_once 'Scores/WsScores.php';
 		require_once 'Scores/SessionEntreprise.php';
 		require_once 'Scores/IdentiteEntreprise.php';
-		require_once 'Finance/RatiosData.php';
     }
 
     public function indexAction()
@@ -136,7 +135,7 @@ class EvaluationController extends Zend_Controller_Action
 
         //Formattage des données
         $typeBilan = 'N';
-        $ratiosData = new RatiosData($infos);
+        $ratiosData = new Scores_Finance_Ratios_Data($infos);
 
         $nbBilanN = $ratiosData->getNbBilan('N');
         $nbBilanC = $ratiosData->getNbBilan('C');
@@ -243,8 +242,6 @@ class EvaluationController extends Zend_Controller_Action
 				break;
 		}
 
-        $score['Indiscore'] = array($indiscore->Indiscore20, 'IndiScore');
-
         $this->view->assign('siret', $this->siret);
         $this->view->assign('id', $this->id);
         $this->view->assign('siren', $siren);
@@ -463,8 +460,7 @@ class EvaluationController extends Zend_Controller_Action
 	    		file_put_contents($outfile, $xml);
 
 	    		//Génération du pdf
-	    		require_once 'wkhtmltopdf/wkhtmltopdf.php';
+	    		$wkhtmltopdf = new Scores_Wkhtml_Pdf();
-	    		$wkhtmltopdf = new wkhtmltopdf();
 	    		$wkhtmltopdf->setOptions('footer-right', 'Page [page] sur [toPage]');
 	    		$wkhtmltopdf->setOptions('header-right', date('d/m/Y H:i:s'));
 	    		$wkhtmltopdf->setOptions('disable-external-links');

application/controllers/FichierController.php

@@ -455,4 +455,34 @@ class FichierController extends Zend_Controller_Action
 	    }
 	}
 
+	/**
+	 * Façade d'immeuble
+	 */
+	public function streetviewAction()
+	{
+		$file = $this->getRequest()->getParam('fichier');
+		$explode = explode('.', $file);
+		switch ($explode[1]) {
+			case 'png' : $content_type = 'image/png';  break;
+			case 'gif' : $content_type = 'image/gif';  break;
+			case 'jpeg':
+			case 'jpg' : $content_type = 'image/jpeg'; break;
+		}
+		$c = Zend_Registry::get('config');
+		$path = realpath($c->profil->path->data).'/google/streetview/';
+		if ( file_exists($path.$file) ) {
+			header('Content-Transfer-Encoding: none');
+			header('Content-type: ' . $content_type.'');
+			header('Content-Length: ' . filesize($path.$file));
+			header('Content-MD5: ' . base64_encode(md5_file($path.$file)));
+			header('Content-Disposition: filename="' . basename($path.$file) . '"');
+			header('Cache-Control: private, max-age=0, must-revalidate');
+			header('Pragma: public');
+			ini_set('zlib.output_compression', '0');
+			echo file_get_contents($path.$file);
+		} else {
+			echo file_get_contents(APPLICATION_PATH.'/../public/themes/default/images/1x1.png');
+		}
+	}
+
 }

application/controllers/FinanceController.php

@@ -9,9 +9,6 @@ class FinanceController extends Zend_Controller_Action
     	require_once 'common/dates.php';
     	require_once 'Scores/SessionEntreprise.php';
     	require_once 'Scores/WsScores.php';
-    	require_once 'Finance/Liasse.php';
-    	require_once 'Finance/RatiosData.php';
-    	require_once 'Finance/RatiosGraph.php';
 
     	$request    	= $this->getRequest();
         $this->siret	= $request->getParam('siret');
@@ -71,7 +68,7 @@ class FinanceController extends Zend_Controller_Action
 		}
 
 		//Formattage des données
-		$ratiosData = new RatiosData($infos);
+		$ratiosData = new Scores_Finance_Ratios_Data($infos);
 
 		$nbBilanN = $ratiosData->getNbBilan('N');
 		$nbBilanC = $ratiosData->getNbBilan('C');
@@ -92,7 +89,7 @@ class FinanceController extends Zend_Controller_Action
 			sort($annees);
 			if (count($annees)>1){
 				//Générer les différents graphiques d'évolutions
-				$ratiosGraph = new RatiosGraph($this->siret, $this->id);
+				$ratiosGraph = new Scores_Finance_Ratios_Graph($this->siret, $this->id);
 				$tabGraphEvol = array();
 				foreach($tabRatio as $idRatio => $infoRatio){
 					$dataGraphEvol = array();
@@ -220,7 +217,7 @@ class FinanceController extends Zend_Controller_Action
 			$infos = $this->getRequest()->getParam('infos');
 		}
 
-		$ratiosData = new RatiosData($infos);
+		$ratiosData = new Scores_Finance_Ratios_Data($infos);
 
 		$nbBilanN = $ratiosData->getNbBilan('N');
 		$nbBilanC = $ratiosData->getNbBilan('C');
@@ -234,7 +231,7 @@ class FinanceController extends Zend_Controller_Action
 			$infosAnnee = $ratiosData->getBilansInfo($typeBilan);
 			$annees = array_keys($infosAnnee);
 
-			$ratiosGraph = new RatiosGraph($this->siret, $this->id);
+			$ratiosGraph = new Scores_Finance_Ratios_Graph($this->siret, $this->id);
 
 	        $tabRatioActif   = array(
 		        'r59' => array( 'titre' => 'Actif Immobilisé Net', 'class' => 'subhead'),
@@ -555,7 +552,7 @@ class FinanceController extends Zend_Controller_Action
 	    	$tabRatio = array( $ratio => $tabRatio[$ratio] );
 	    }
 
-	    $ratiosData = new RatiosData($infos);
+	    $ratiosData = new Scores_Finance_Ratios_Data($infos);
 
 	    $nbBilanN = $ratiosData->getNbBilan('N');
 	    $nbBilanC = $ratiosData->getNbBilan('C');
@@ -567,7 +564,7 @@ class FinanceController extends Zend_Controller_Action
 	    if ($nbBilanN!=0 || $nbBilanC!=0)
 	    {
 		    //Génération Graphique evolution
-		    $ratiosGraph = new RatiosGraph($this->siret, $this->id);
+	    	$ratiosGraph = new Scores_Finance_Ratios_Graph($this->siret, $this->id);
 
 		    $infosAnnee = $ratiosData->getBilansInfo($typeBilan);
 		    $annees = array_keys($infosAnnee);
@@ -672,8 +669,7 @@ class FinanceController extends Zend_Controller_Action
 		$path = $c->profil->path->files . '/';
 		$file = 'liasse-'.substr($this->siret, 0, 9).'-'.$this->id.'-'.$type.$date.'.xls';
 
-		require_once 'Finance/LiasseXLS.php';
+		$liasse = new Scores_Finance_Liasse_XLS($model);
-		$liasse = new LiasseXLS($model);
 		$liasse->dataModel(substr($this->siret, 0, 9), $entreprise->getRaisonSociale(), $data);
 		$liasse->dataFile($file);
 
@@ -908,7 +904,7 @@ class FinanceController extends Zend_Controller_Action
 
     	        if ($infos === false) $this->_forward('soap', 'error');
 
-    	        $infoLiasse = new Liasse($infos, $unite);
+    	        $infoLiasse = new Scores_Finance_Liasse($infos, $unite);
         	    $this->view->assign('dateCloture', $infoLiasse->getInfo('dateCloture'));
     	        $this->view->assign('dateCloturePre', $infoLiasse->getInfo('dateCloturePre'));
     	        $this->view->assign('dureesMois', $infoLiasse->getInfo('dureeMois'));
@@ -1026,7 +1022,7 @@ class FinanceController extends Zend_Controller_Action
 		$infos = $ws->getRatios($siren, 'ratios');
 
 		//Formattage des données
-		$ratiosData = new RatiosData($infos);
+		$ratiosData = new Scores_Finance_Ratios_Data($infos);
 		$nbBilanN = $ratiosData->getNbBilan('N');
 		$nbBilanC = $ratiosData->getNbBilan('C');
 
@@ -1239,7 +1235,7 @@ class FinanceController extends Zend_Controller_Action
 			$labels[] = substr($date, 0, 4);
 		}
 
-		$graph = new RatiosGraph($this->siret, $this->id);
+		$graph = new Scores_Finance_Ratios_Graph($this->siret, $this->id);
 		$image = $graph->flux($labels, $data, $typeBilan);
 		if ( $image != false ){
 			$this->view->assign('graph', $image);

application/controllers/GiantController.php

@@ -48,7 +48,7 @@ class GiantController extends Zend_Controller_Action
 		$this->view->headLink()->appendStylesheet('/themes/default/styles/giant.css', 'all');
 		$this->view->headScript()->appendFile('/themes/default/scripts/giant.js', 'text/javascript');
 		$this->view->debug = false;
-		$this->config = new Zend_Config_Ini( '\Giant\giant.ini' );
+		$this->config = new Zend_Config_Ini( APPLICATION_PATH.'/../library/Giant/giant.ini'  );
 		$this->TestIndication = $this->config->test->TestIndication;
 	}
 
@@ -131,6 +131,7 @@ class GiantController extends Zend_Controller_Action
 		$giantConstroller	= new GiantControllerLib($this->getRequest()->getParam('CompanyId').'-'.$this->getRequest()->getParam('Type'));
 		$identiteController->ficheAction();
 		$fiche              = $identiteController->getObjet('fiche');
+		
 		foreach($creditrecommendationAction as $action => $val) {
 			if(isset($creditrecommendation->DataSet->Company->$val)) {
 				$creditrecommendation = $giantConstroller->$action($creditrecommendation);
@@ -142,6 +143,7 @@ class GiantController extends Zend_Controller_Action
 		$this->view->report       = $fiche;
 		$this->view->Type		  = $this->getRequest()->getParam('Type');
 		$this->view->dateFunction = new WDate();
+		$this->view->assign('exportObjet', $creditrecommendation);
 	}
 
 	public function compactAction()
@@ -165,7 +167,6 @@ class GiantController extends Zend_Controller_Action
 		$giantConstroller	= new GiantControllerLib($this->getRequest()->getParam('CompanyId').'-'.$this->getRequest()->getParam('Type'));
 		$identiteController->ficheAction();
 		$fiche              = $identiteController->getObjet('fiche');
-
 		foreach($compactAction as $action => $val) {
 			if(isset($compact->DataSet->Company->$val)) {
 				$compact = $giantConstroller->$action($compact);
@@ -177,6 +178,7 @@ class GiantController extends Zend_Controller_Action
 		$this->view->report       = $fiche;
 		$this->view->Type		  = $this->getRequest()->getParam('Type');
 		$this->view->dateFunction = new WDate();
+		$this->view->assign('exportObjet', $compact);
 	}
 
 	public function fullAction()
@@ -213,6 +215,7 @@ class GiantController extends Zend_Controller_Action
 		$this->view->report       = $fiche;
 		$this->view->Type = $this->getRequest()->getParam('Type');
 		$this->view->dateFunction = new WDate();
+		$this->view->assign('exportObjet', $full);
 	}
 
 	public function getForm()
@@ -431,7 +434,7 @@ class GiantController extends Zend_Controller_Action
 			print_r(array('no'));
 		}
 		else {
-			print_r($value->MonitoringOptions->MonitoringOption[0]->LanguageCodes->LanguageCode);
+			print_r(json_encode($value->MonitoringOptions->MonitoringOption[0]->LanguageCodes->LanguageCode));
 		}
 	}
 	public function reteventsAction()

application/controllers/IdentiteController.php

@@ -1169,7 +1169,7 @@ class IdentiteController extends Zend_Controller_Action
 		$lon = $request->getParam('lon', '');
 		$num = $request->getParam('heading', 0);
 
-		$streetview = new Scores_Streetview();
+		$streetview = new Scores_Google_Streetview();
 		if ( $lat != '' && $lon != '' ) {
 			$deg = $streetview->getNumDeg();
 			$nbImg = count($deg);
@@ -1187,7 +1187,8 @@ class IdentiteController extends Zend_Controller_Action
 			$heading = $deg[$num];
 			$streetview->setHeading($heading);
 			//$streetview->setLocationTxt($adresse);
-			$this->view->assign('url', $streetview->urlImg());
+			$url = $this->view->url(array('controller'=>'fichier', 'action'=>'streetview', 'fichier'=> $streetview->display()), null, true);
+			$this->view->assign('url', $url);
 		}
 		$this->view->assign('lat', $lat);
 		$this->view->assign('lon', $lon);

application/controllers/JuridiqueController.php

@@ -165,7 +165,7 @@ class JuridiqueController extends Zend_Controller_Action
     	            $this->renderScript('juridique/annonce.phtml');
     	        }
 
-    	        //Affichage pour la liste des annonces
+			//Affichage pour la liste des annonces
     	    } else {
 
     	        $nbReponses = $infos->nbReponses;

application/controllers/PiecesController.php

@@ -41,53 +41,54 @@ class PiecesController extends Zend_Controller_Action
 
     	$request = $this->getRequest();
 		$email = $request->getParam('email', '');
+		$reference = $request->getParam('reference');
 
-    	if(!empty($email)) {
+		if (empty($email)) {
+			$message="ERREUR : Veuillez saisir une adresse email valide pour la commande de pièces.";
+		} elseif (empty($reference)) {
+			$message="ERREUR : Veuillez saisir une référence pour la commande de pièces.";
+		} else {
+			$c = Zend_Registry::get('config');
+			$fp=fopen(realpath($c->profil->path->data).'/log/commande_asso.csv', 'a');
+			fwrite($fp, date('Y/m/d H:i:s').";$siren;".$email.';'.$login.';'.$user->getEmail().';'.$user->getIpAddress()."\n");
+			fclose($fp);
 
-    		$erreur = false;
+			$siren = substr($this->siret, 0, 9);
-    		$c = Zend_Registry::get('config');
-    		$fp=fopen(realpath($c->profil->path->data).'/log/commande_asso.csv', 'a');
-    		fwrite($fp, date('Y/m/d H:i:s').";$siren;".$email.';'.$login.';'.$user->getEmail().';'.$user->getIpAddress()."\n");
-    		fclose($fp);
 
-    		$siren = substr($this->siret, 0, 9);
+			$infoAsso = new stdClass();
+			$infoAsso->siren = $siren;
+			$infoAsso->waldec = '';
+			$infoAsso->idEntreprise = $this->id;
+			$infoAsso->raisonSociale = $this->entrep->getRaisonSociale();
 
-    		$infoAsso = new stdClass();
+			$infoDemande = new stdClass();
-    		$infoAsso->siren = $siren;
+			$infoDemande->reference = $request->getParam('reference');
-    		$infoAsso->waldec = '';
+			$infoDemande->email = $email;
-    		$infoAsso->idEntreprise = $this->id;
+			$infoDemande->tel = $request->getParam('tel');
-    		$infoAsso->raisonSociale = $this->entrep->getRaisonSociale();
+			$infoDemande->fax = '';
+			$infoDemande->nom = '';
+			$infoDemande->service = '';
+			$infoDemande->societe = '';
+			$infoDemande->adresse = '';
+			$infoDemande->cp = '';
+			$infoDemande->ville = '';
 
-    		$infoDemande = new stdClass();
+			$ws = new WsScores();
-    		$infoDemande->reference = $request->getParam('reference');
+			$reponse = $ws->setCmdAsso($infoAsso, $infoDemande); //@todo : vérfier les logs de facturation
-    		$infoDemande->email = $email;
+			Zend_Registry::get('firebug')->info($reponse);
-    		$infoDemande->tel = $request->getParam('tel');
+			$annee = substr($reponse->commande->dateCommande,0,4);
-    		$infoDemande->fax = '';
+			$mois = substr($reponse->commande->dateCommande,4,2);
-    		$infoDemande->nom = '';
+			$jour = substr($reponse->commande->dateCommande,6,2);
-    		$infoDemande->service = '';
+			$heure = substr($reponse->commande->dateCommande,8,2);
-    		$infoDemande->societe = '';
+			$minutes = substr($reponse->commande->dateCommande,10,2);
-    		$infoDemande->adresse = '';
+			$ref = $reponse->commande->refCmd;
-    		$infoDemande->cp = '';
+			if( isset($ref) && !empty($ref) ) {
-    		$infoDemande->ville = '';
+				$message = 'Votre demande à été prise en compte le '.$jour.'/'.$mois.'/'.$annee.' à '.$heure.' h '.$minutes.' sous la référence <b>'.$ref.'</b>.';
+			} else {
+				$message = 'Une erreur s\'est produite lors du passage de votre commande.';
+			}
+		}
 
-    		$ws = new WsScores();
-    		$reponse = $ws->setCmdAsso($infoAsso, $infoDemande); //@todo : vérfier les logs de facturation
-    		Zend_Registry::get('firebug')->info($reponse);
-    		$annee = substr($reponse->commande->dateCommande,0,4);
-    		$mois = substr($reponse->commande->dateCommande,4,2);
-    		$jour = substr($reponse->commande->dateCommande,6,2);
-    		$heure = substr($reponse->commande->dateCommande,8,2);
-    		$minutes = substr($reponse->commande->dateCommande,10,2);
-    		$ref = $reponse->commande->refCmd;
-    		if( isset($ref) && !empty($ref) )
-    		{
-    			$message = 'Votre demande à été prise en compte le '.$jour.'/'.$mois.'/'.$annee.' à '.$heure.' h '.$minutes.' sous la référence <b>'.$ref.'</b>.';
-    		} else {
-    			$message = 'Une erreur s\'est produite lors du passage de votre commande.';
-    		}
-    	} else {
-    		$message="ERREUR : Veuillez saisir une adresse email valide pour la commande de pièces.";
-    	}
     	$this->view->assign('message', $message);
     	$this->view->assign('siren', substr($this->siret, 0,9));
     	$this->view->assign('siret', $this->siret);

application/controllers/PrintController.php

@@ -1,9 +1,9 @@
 <?php
 class PrintController extends Zend_Controller_Action
 {
-		
+
 	public function init(){}
-	
+
 	/**
 	 * Renvoie les paramètres pour l'impression
 	 */
@@ -71,7 +71,10 @@ class PrintController extends Zend_Controller_Action
 				$params['id'] = $elements[3];
 				break;
 			case 'giant':
-            	$params['idRapport'] = $elements[2];
+            	$params['Pays'] = $elements[2];
+            	$params['Type'] = $elements[3];
+            	$params['CompanyId'] = $elements[4];
+            	$params['Language'] = $elements[5];
                 break;
 			case 'surveillance':
 				switch($action){
@@ -94,9 +97,9 @@ class PrintController extends Zend_Controller_Action
 			'params' 		=> $params
 		);
 	}
-	
+
 	public function indexAction(){}
-	
+
 	/**
 	 * Imprime la page en PDF
 	 * Par défaut, le contenu html a déjà été enregistré..
@@ -109,13 +112,13 @@ class PrintController extends Zend_Controller_Action
 	{
 		$request = $this->getRequest();
 		$fichier = $request->getParam('fichier');
-		
+
 		if (substr($fichier,-4)!='.pdf') {
 			echo 'Fichier incorrect';
 			exit;
 		}
 		$fichier = str_replace('.pdf', '', $fichier);
-		
+
 		$c = Zend_Registry::get('config');
 		$file = $c->profil->path->pages.'/'.$fichier.'.html';
 		if (!file_exists($file))
@@ -123,20 +126,19 @@ class PrintController extends Zend_Controller_Action
 			echo 'Fichier introuvable';
 			exit;
 		}
-
+
-		require_once 'wkhtmltopdf/wkhtmltopdf.php';
+		$pdf = new Scores_Wkhtml_Pdf();
-		$pdf = new wkhtmltopdf();
 		$pdf->setOptions('footer-right', 'Page [page] sur [toPage]');
 		$pdf->setOptions('header-right', date('d/m/Y H:i:s'));
 		$output_file = $pdf->exec($file);
-		
+
 		//Envoi au navigateur
 		if(!file_exists($output_file))
 		{
 			echo 'Impossible de générer le fichier PDF';
 			exit;
 		}
-		
+
 		$content_type = 'application/pdf';
 		$dest = 'I';
 		switch($dest)
@@ -172,7 +174,7 @@ class PrintController extends Zend_Controller_Action
 				break;
 		}
 	}
-	
+
 	/**
 	 * Imprime la page en activant le javascript d'impression
 	 * Il faut récupérer le controller et l'action du nom du fichier, ainsi que
@@ -184,12 +186,12 @@ class PrintController extends Zend_Controller_Action
 	{
 		$request = $this->getRequest();
 		$fichier = $request->getParam('fichier', '');
-		
+
 		if (substr($fichier,-5)!='.html') {
 			echo 'Fichier incorrect';
 			exit;
 		}
-		
+
 		$fichier = str_replace('.html', '', $fichier);
 		$elements = $this->pageParams($fichier);
 		if ($elements===false){
@@ -199,7 +201,7 @@ class PrintController extends Zend_Controller_Action
 		$this->view->assign('action', $elements['action']);
 		$this->view->assign('params', $elements['params']);
 	}
-	
+
 	/**
 	 * Envoi le fichier XML de l'objet sérialiser sur la sortie standard
 	 */
@@ -209,19 +211,19 @@ class PrintController extends Zend_Controller_Action
 		$this->_helper->viewRenderer->setNoRender(true);
 		$request = $this->getRequest();
 		$fichier = $request->getParam('fichier', '');
-		
+
 		if (substr($fichier,-4)!='.xml') {
 			echo 'Fichier incorrect.';
 			exit;
 		}
-		
+
 		$c = Zend_Registry::get('config');
 		$file = $c->profil->path->files.'/'.$fichier;
 		if (!file_exists($file)){
 			echo "Erreur lors de la génération du fichier.";
 			exit;
 		}
-		
+
 		header("Content-type: application/xml");
 		header("Content-Disposition: attachement; filename=\"$fichier\"");
 		flush();

application/controllers/RechercheController.php

@@ -52,7 +52,7 @@ class RechercheController extends Zend_Controller_Action
     	}
     	$this->view->assign('form', $form);
     }
-    
+
     /**
      * Affiche le formulaire de recherche WorldCheck
      */
@@ -374,7 +374,7 @@ class RechercheController extends Zend_Controller_Action
     		if ($nbField==0){
     			$this->_redirect('/recherche/'.$action);
     		}
-    		
+
     		//Worldcheck - Vérification si les champs demandés (NOM et TYPE) ont été saisie
     		if ($type=='wcheck')
     		{
@@ -384,7 +384,7 @@ class RechercheController extends Zend_Controller_Action
 	    				$this->_redirect('/recherche/worldcheck');
 	    				break;
 	    			}
-	    		}	    		
+	    		}
     		}
 
     		//Redirection
@@ -406,7 +406,7 @@ class RechercheController extends Zend_Controller_Action
     	//Worldcheck
     	} elseif ($type == 'wcheck' ) {
     		$this->_forward('index', 'worldcheck', null, $params);
-    	//Recherche	
+    	//Recherche
     	} else {
 
     		$user = new Scores_Utilisateur();

application/controllers/SaisieController.php

@@ -1638,6 +1638,7 @@ class SaisieController extends Zend_Controller_Action
     	        'dateCapital' => empty($params['dateCapital']) ? '' : $this->wDate->dateT('d/m/Y', 'Ymd', $params['dateCapital']),
     	        'nbActions' => empty($params['nbActions']) ? '' : $params['nbActions'],
     	    	'dateNbActions' => empty($params['dateNbActions']) ? '' : $this->wDate->dateT('d/m/Y', 'Ymd', $params['dateNbActions']),
+    	    	'isin' => empty($params['isin']) ? '' : trim($params['isin']),
     	        'idLoc1Type' => $params['idLoc1Type'],
     	        'idLoc1Num' =>  trim($params['idLoc1Num']),
     	        'idLoc2Type' => $params['idLoc2Type'],
@@ -1665,6 +1666,36 @@ class SaisieController extends Zend_Controller_Action
     	    }
 	    }
 	}
+	
+	public function checkisinAction()
+	{
+		$this->_helper->layout()->disableLayout();
+	    $isin = $this->getRequest()->getParam('isin', '');
+	    
+		$letters = array(
+				'A' => 10, 'B' => 11, 'C' => 12, 'D' => 13, 'E' => 14, 'F' => 15,
+				'G' => 16, 'H' => 17, 'I' => 18, 'J' => 19, 'K' => 20, 'L' => 21,
+				'M' => 22, 'N' => 23, 'O' => 24, 'P' => 25, 'Q' => 26, 'R' => 27,
+				'S' => 28, 'T' => 29, 'U' => 30, 'V' => 31, 'W' => 32, 'X' => 33,
+				'Y' => 34, 'Z' => 35);
+		
+		$digitIsin = strtr($isin, $letters);
+		$tmpIsin = str_split($digitIsin);
+		$checkDigit = end($tmpIsin);
+		unset($tmpIsin[count($tmpIsin)-1]);
+		$firstGroup = '';
+		$secondGroup = '';
+		$split = range(0, count($tmpIsin)-1, 2);
+		foreach ($split as $i)
+		{
+			$firstGroup .= $tmpIsin[$i]+$tmpIsin[$i]*(count($tmpIsin)%2);
+			$secondGroup .= $tmpIsin[$i+1]+$tmpIsin[$i+1]*((count($tmpIsin)+1)%2);
+		}
+		$firstGroupSum = array_sum(str_split($firstGroup));
+		$secondGroupSum = array_sum(str_split($secondGroup));
+		$cmp = (10 - ($firstGroupSum + $secondGroupSum)%10)%10 - $checkDigit;
+		if ($cmp != 0) $this->view->assign('error', true);
+	}
 
 	/**
 	 * Sauvegarde

application/views/default/scripts/debug/identite.phtml

@@ -1,16 +0,0 @@
-<?php $i = 0;?>
-<div id="inDebug">
-    <div id="debug" style="margin-bottom:2px;">
-    	<b><?php echo $this->resultat->RegisteredName;?></b>
-    </div>
-    <?php foreach($this->menu as $menu):?>
-    	<div <?php ($i > 0)?'style="margin-left:2px;"':null; ?> id="debug_menu"><center><?php echo $menu;?></center></div>
-    	<?php $i++;?>
-    <?php endforeach;?>
-    <div style="float:left" id="debug">
-    	<center><b>Objet</b></center>
-    	<div id="objet0" style="display:none"><?php echo htmlentities($this->requestXML);?></div>
-    	<div id="objet1" style="display:none"><pre><?php print_r($this->resultat);?></pre></div>
-    	<div id="objet2"><pre><?php print_r($this->resultat);?></pre></div>
-    </div>
-</div>

application/views/default/scripts/dirigeant/histo.phtml

@@ -30,9 +30,6 @@
 <div class="paragraph">
 
 <?php if (count($this->dirigeants) > 0) {?>
-<style>
-table.data td { border:1px solid #ccc; padding:5px; }
-</style>
 <table class="data">
     <?php foreach ($this->dirigeants as $dir) {?>
     <tr>

application/views/default/scripts/dirigeant/liste.phtml

@@ -42,9 +42,6 @@
 <h2>Liste des dirigeants actifs</h2>
 <div class="paragraph">
 <?php if ( count($this->dirigeants)>0 ) { ?>
-<style>
-table.data td { border:1px solid #ccc; padding:5px; }
-</style>
 <table class="data">
 <?php foreach ($this->dirigeants as $dir) {?>
     <tr>
@@ -64,7 +61,7 @@ table.data td { border:1px solid #ccc; padding:5px; }
     		'type' => 'dir',
     		'dirNom' => $dir->Nom,
     		'dirPrenom' => $dir->Prenom,
-    		'dirNaissJJ' => substr($dir->NaissDate,0,2),
+    		'dirDateNaissJJ' => substr($dir->NaissDate,0,2),
     		'dirDateNaissMM' => substr($dir->NaissDate,3,2),
     		'dirDateNaissAAAA' => substr($dir->NaissDate,6,4),
     		'dirCpVille' => $dir->NaissVille,

application/views/default/scripts/dirigeant/op.phtml

@@ -39,9 +39,6 @@
 <div class="paragraph">
 
 <?php if ( count($this->dirigeants)>0 ) {?>
-<style>
-table.data td { border:1px solid #ccc; padding:5px; }
-</style>
 <table class="data">
 <?php foreach ($this->dirigeants as $dir) {?>
 <tr>

application/views/default/scripts/evaluation/indiscore.phtml

@@ -229,7 +229,7 @@
     <?php if(!empty($this->indiscore->infoPaiement)):?>
     <?php echo html_entity_decode($this->indiscore->infoPaiement);?>
     <?php else :?>
-        Aucune information sur les paiements disponnible.
+        Aucune information sur les paiements disponible.
     <?php endif;?>
     </td>
     </tr>

application/views/default/scripts/finance/bilan.phtml

@@ -1,8 +1,8 @@
-<?php if (empty($this->AutrePage)):?>
+<?php if (empty($this->AutrePage)) {?>
 <div id="center">
-<?php endif;?>
+<?php }?>
 
-<?php if (empty($this->AutrePage)):?>
+<?php if (empty($this->AutrePage)) {?>
 <h1>ÉLÉMENTS FINANCIERS - BILANS</h1>
 <div class="paragraph">
    	<table class="identite">
@@ -28,7 +28,7 @@
 	    <?php if ($this->nbBilanC==0){?>
 	    	Réel normal ou Simplifié
 	    <?php } elseif ($this->nbBilanN==0){?>
-	    	Consolidé	
+	    	Consolidé
 	    <?php } else {?>
 	    <form>
 	    	<select name="typeBilan">
@@ -42,10 +42,10 @@
 	<?php }?>
     </table>
 </div>
-<?php endif; ?>
+<?php }?>
 
 
-<?php if($this->typeBilan == 'B' and $this->typeBilan == 'A'):?>
+<?php if($this->typeBilan == 'B' and $this->typeBilan == 'A') {?>
 
 <div class="paragraph">
     <table>
@@ -56,9 +56,9 @@
     </table>
 </div>
 
-<?php else: ?>
+<?php } else { ?>
 
-	<?php if ($this->nbBilanN==0 && $this->nbBilanN==0):?>
+	<?php if ($this->nbBilanN!=0 || $this->nbBilanC!=0) {?>
 
 	<div class="paragraph">
     <table>
@@ -68,24 +68,141 @@
 	</tr>
     </table>
 	</div>
-		
+
-	<?php else:?>
+	<?php } else {?>
 
 	<h2>Bilan actif - passif</h2>
-	<?=$this->partial('finance/bilan/actif.phtml')?>
+	<div class="paragraph">
-	<?=$this->partial('finance/bilan/passif.phtml')?>
+	<table class="bilans">
-	
+	<thead>
+	<tr>
+	<th>Actif</th>
+	<?php foreach($this->tabResultActif as $info) { ?>
+	<th class="date" >
+	<?=$info['dateCloture']?><br/><?=$info['duree']?>
+	</th>
+	<?php }?>
+	<?php $lastDateCloture = $info['dateCloture']; ?>
+	<th>% T.B.</th>
+	</tr>
+	</thead>
+	<tbody>
+	<?php foreach($this->tabRatioActif as $idRatio => $info) { ?>
+	<tr<?php if (!empty($info['class'])) echo ' class="'.$info['class'].'"'?>>
+		<td>
+		<?=$info['titre']?></td>
+		<?php foreach($this->tabResultActif as $value) { ?>
+		<td class="left"><?=$value['entrep'][$idRatio]?></td>
+		<?php }?>
+		<td><?=$value['total'][$idRatio]?></td>
+	<?php }?>
+	</tr>
+	</tbody>
+	</table>
+	</div>
+
+	<div class="paragraph">
+	<?=$this->action('bilangraph', 'finance', null, array(
+		'type' => 'actif',
+		'typeBilan' => $this->typeBilan,
+		'dateCloture' =>  $this->lastDateCloture,
+		'siret' => $this->siret,
+		'id' => $this->id,
+	))?>
+	</div>
+
+	<div class="paragraph">
+	<table class="bilans">
+	<thead>
+	<tr>
+	<th>Passif</th>
+	<?php foreach($this->tabResultPassif as $info) { ?>
+	<th class="date" >
+	<?=$info['dateCloture']?><br/><?=$info['duree']?>
+	</th>
+	<?php }?>
+	<th>% T.B.</th>
+	</tr>
+	</thead>
+	<tbody>
+	<?php foreach($this->tabRatioPassif as $idRatio => $info) { ?>
+	<tr<?php if (!empty($info['class'])) echo ' class="'.$info['class'].'"'?>>
+		<td>
+		<?=$info['titre']?></td>
+		<?php foreach($this->tabResultPassif as $value) { ?>
+		<td class="left"><?=$value['entrep'][$idRatio]?></td>
+		<?php }?>
+		<td><?=$value['total'][$idRatio]?></td>
+	<?php }?>
+	</tr>
+	</tbody>
+	</table>
+	</div>
+
+	<div class="paragraph">
+	<?=$this->action('bilangraph', 'finance', null, array(
+		'type' => 'passif',
+		'typeBilan' => $this>typeBilan,
+		'dateCloture' =>  $this->lastDateCloture,
+		'siret' => $this->siret,
+		'id' => $this->id,
+	))?>
+	</div>
+
 	<h2>Soldes Intermédiaire de Gestion</h2>
-	<?=$this->partial('finance/bilan/sig.phtml')?>
+	<?php
-	
+	$tabResult = $this->partial()->view->tabResultSig;
-	<?php endif;?>
+	$tabRatio = $this->partial()->view->tabRatioSig;
-	
+	?>
-<?php endif;?>
+	<div class="paragraph">
+	<table class="bilans">
+	<thead>
+	<tr>
+	<th colspan="2">SOLDES INTERMEDIAIRE DE GESTION</th>
+	<?php foreach($this->tabResultSig as $info) { ?>
+	<th class="date" >
+	<?=$info['dateCloture']?><br/><?=$info['duree']?>
+	</th>
+	<?php }?>
+	<th>% C.A.</th>
+	</tr>
+	</thead>
+	<tbody>
+	<?php foreach($this->tabRatioSig as $idRatio => $info) { ?>
+	<tr<?php if (!empty($info['class'])) echo ' class="'.$info['class'].'"'?>>
+		<?php if(empty($info['op'])){?>
+		<td colspan="2"><?=$info['titre']?></td>
+		<?php } else {?>
+		<td><?=$info['op']?></td><td><?=$info['titre']?></td>
+		<?php }?>
+		<?php foreach($this->tabResultSig as $value) { ?>
+		<td class="left"><?=$value['entrep'][$idRatio]?></td>
+		<?php }?>
+		<td><?=$value['total'][$idRatio]?></td>
+	<?php }?>
+	</tr>
+	</tbody>
+	</table>
+	</div>
 
-<?php if (empty($this->AutrePage)):?>
+	<div class="paragraph">
+	<?=$this->action('bilangraph', 'finance', null, array(
+		'type' => 'sig',
+		'typeBilan' => $this->typeBilan,
+		'dateCloture' =>  $this->lastDateCloture,
+		'siret' => $this->siret,
+		'id' => $this->id,
+	))?>
+	</div>
+
+	<?php }?>
+
+<?php }?>
+
+<?php if (empty($this->AutrePage)) {?>
 <?=$this->render('cgu.phtml', $this->cgu)?>
-<?php endif;?>
+<?php }?>
 
-<?php if (empty($this->AutrePage)):?>
+<?php if (empty($this->AutrePage)) {?>
 </div>
-<?php endif;?>
+<?php }?>

application/views/default/scripts/finance/bilan/actif.phtml

@@ -1,42 +0,0 @@
-<?php
-$tabResult = $this->partial()->view->tabResultActif;
-$tabRatio = $this->partial()->view->tabRatioActif;
-?>
-<div class="paragraph">
-<table class="bilans">
-<thead>
-<tr>
-<th>Actif</th>
-<?php foreach($tabResult as $info) { ?>
-<th class="date" >
-<?=$info['dateCloture']?><br/><?=$info['duree']?>
-</th>
-<?php }?>
-<?php $lastDateCloture = $info['dateCloture']; ?>
-<th>% T.B.</th>
-</tr>
-</thead>
-<tbody>
-<?php foreach($tabRatio as $idRatio => $info) { ?>
-<tr<?php if (!empty($info['class'])) echo ' class="'.$info['class'].'"'?>>
-	<td>
-	<?=$info['titre']?></td>
-	<?php foreach($tabResult as $value) { ?>
-	<td class="left"><?=$value['entrep'][$idRatio]?></td>
-	<?php }?>
-	<td><?=$value['total'][$idRatio]?></td>
-<?php }?>
-</tr>
-</tbody>
-</table>
-</div>
-
-<div class="paragraph">
-<?=$this->action('bilangraph', 'finance', null, array(
-	'type' => 'actif',
-	'typeBilan' => $this->partial()->view->typeBilan,
-	'dateCloture' =>  $this->partial()->view->lastDateCloture,
-	'siret' => $this->partial()->view->siret,
-	'id' => $this->partial()->view->id,
-))?>
-</div>

application/views/default/scripts/finance/bilan/passif.phtml

@@ -1,41 +0,0 @@
-<?php
-$tabResult = $this->partial()->view->tabResultPassif;
-$tabRatio = $this->partial()->view->tabRatioPassif;
-?>
-<div class="paragraph">
-<table class="bilans">
-<thead>
-<tr>
-<th>Passif</th>
-<?php foreach($tabResult as $info) { ?>
-<th class="date" >
-<?=$info['dateCloture']?><br/><?=$info['duree']?>
-</th>
-<?php }?>
-<th>% T.B.</th>
-</tr>
-</thead>
-<tbody>
-<?php foreach($tabRatio as $idRatio => $info) { ?>
-<tr<?php if (!empty($info['class'])) echo ' class="'.$info['class'].'"'?>>
-	<td>
-	<?=$info['titre']?></td>
-	<?php foreach($tabResult as $value) { ?>
-	<td class="left"><?=$value['entrep'][$idRatio]?></td>
-	<?php }?>
-	<td><?=$value['total'][$idRatio]?></td>
-<?php }?>
-</tr>
-</tbody>
-</table>
-</div>
-
-<div class="paragraph">
-<?=$this->action('bilangraph', 'finance', null, array(
-	'type' => 'passif',
-	'typeBilan' => $this->partial()->view->typeBilan,
-	'dateCloture' =>  $this->partial()->view->lastDateCloture,
-	'siret' => $this->partial()->view->siret,
-	'id' => $this->partial()->view->id,
-))?>
-</div>

application/views/default/scripts/finance/bilan/sig.phtml

@@ -1,44 +0,0 @@
-<?php
-$tabResult = $this->partial()->view->tabResultSig;
-$tabRatio = $this->partial()->view->tabRatioSig;
-?>
-<div class="paragraph">
-<table class="bilans">
-<thead>
-<tr>
-<th colspan="2">SOLDES INTERMEDIAIRE DE GESTION</th>
-<?php foreach($tabResult as $info) { ?>
-<th class="date" >
-<?=$info['dateCloture']?><br/><?=$info['duree']?>
-</th>
-<?php }?>
-<th>% C.A.</th>
-</tr>
-</thead>
-<tbody>
-<?php foreach($tabRatio as $idRatio => $info) { ?>
-<tr<?php if (!empty($info['class'])) echo ' class="'.$info['class'].'"'?>>
-	<?php if(empty($info['op'])){?>
-	<td colspan="2"><?=$info['titre']?></td>
-	<?php } else {?>
-	<td><?=$info['op']?></td><td><?=$info['titre']?></td>
-	<?php }?>
-	<?php foreach($tabResult as $value) { ?>
-	<td class="left"><?=$value['entrep'][$idRatio]?></td>
-	<?php }?>
-	<td><?=$value['total'][$idRatio]?></td>
-<?php }?>
-</tr>
-</tbody>
-</table>
-</div>
-
-<div class="paragraph">
-<?=$this->action('bilangraph', 'finance', null, array(
-	'type' => 'sig',
-	'typeBilan' => $this->partial()->view->typeBilan,
-	'dateCloture' =>  $this->partial()->view->lastDateCloture,
-	'siret' => $this->partial()->view->siret,
-	'id' => $this->partial()->view->id,
-))?>
-</div>

application/views/default/scripts/giant/full.phtml

@@ -10,7 +10,7 @@
 	</div>
 	<h2>3. Compte Annuels</h2>
 	<div id="break">
-		<?php echo $this->partial('giant/partials/rapports/ComptesAnnuels.phtml', null, array('report' => $this->report, 'Type' => $this->Type)); ?>
+		<?php echo $this->partial('giant/partials/rapports/ComptesAnnuels.phtml', null, array('report' => $this->report, 'Type' => $this->Type, 'dateFunction' => $this->dateFunction)); ?>
 	</div>
 	<h2>4. Position financiére</h2>
 	<div id="break">
@@ -18,7 +18,7 @@
 	</div>
 	<h2>5. Comportement de paiement</h2>
 	<div id="break">
-		<?php echo $this->partial('giant/partials/rapports/ComportementDePaiement.phtml', null, array('report' => $this->report, 'Type' => $this->Type)); ?>
+		<?php echo $this->partial('giant/partials/rapports/ComportementDePaiement.phtml', null, array('report' => $this->report, 'Type' => $this->Type, 'dateFunction' => $this->dateFunction)); ?>
 	</div>
 	<h2>6. Structure de l'entreprise</h2>
 	<div id="break">

application/views/default/scripts/giant/identite.phtml

@@ -1,11 +1,11 @@
 <div id="center">
-    <!--<span style="float:left;margin-left:6px;">
+    <span style="float:right;margin-right:16px;">
         <a style="color:#9C093A;cursor:help;" class="tooltip" title="<?php echo htmlentities($this->listeCommandes);?>">Total commande : <?php echo $this->total; ?> euros</a>
-    </span>!-->
+    </span>
-	<span style="color:#9C093A;margin-right:5px;float: right;">
+	<!-- <span style="color:#9C093A;margin-right:5px;float: right;">
 		<a style="cursor:help;" class="tooltip" title="<?php echo htmlentities($this->modification);?>">Dernières modifications au <?php echo date('d/m/Y'); ?></a>
-        </span>
+        </span> -->
-	<h1>Identite<img style="margin-top:4px;float:right" src="/themes/default/images/giant/expanded.gif" ></h1>
+	<h1>Identite</h1>
 	<div class="paragraph">
 		<div id="identite">
 			<table>
@@ -27,8 +27,8 @@
 				<tr id="info">
 					<td width="30px"></td>
 					<td valign="top" class="StyleInfoLib" width="250px">Adresse</td>
-					<td class="StyleInfoData" width="300px"><a href=""><?php echo $this->Adresse[0].' '.$this->Adresse[1];?><br />
+					<td class="StyleInfoData" width="300px"><?php echo $this->Adresse[0].' '.$this->Adresse[1];?><br />
-									<?php echo $this->Adresse[2].' '.$this->Adresse[3]?></a></td>
+									<?php echo $this->Adresse[2].' '.$this->Adresse[3]?></td>
 				</tr>
 				<tr id="info">
 					<td width="30px"></td>
@@ -39,21 +39,16 @@
 		</div>
 	</div>
         <?php if(!empty($this->listeRapport)):?>
-	<h1>Liste des rapports<img style="margin-top:4px;float:right" src="/themes/default/images/giant/expanded.gif" ></h1>
+	<h1>Liste des rapports</h1>
 	<div class="paragraph">
 		<div id="radio">
 		<table>
-			
 			<?php $i=1; foreach ($this->listeRapport->DataSetOptions->DataSetOption as $rapport):?>
 				<tr id="info">
 					<td class="StyleInfoLib" style="float:left;" >
-					
+						<?$t = $rapport->DataSetType->_;?>
-					<img style="cursor:help" title="<?php echo htmlentities($this->description->Full);?>" class="tooltip" src="/themes/default/images/giant/tag_blue.png" /><input type="radio" class="radio" id="radio<?php echo $i; ?>" value="<?php echo $rapport->DataSetType->_?>" name="radio" /><label class="radio_but" for="radio<?php echo $i; ?>">Rapport de Type <?php echo $rapport->DataSetType->_?></label>
+						<img style="cursor:help" title="<?php echo htmlentities($this->description->$t);?>" class="tooltip" src="/themes/default/images/giant/tag_blue.png" /><input type="radio" class="radio" id="radio<?php echo $i; ?>" value="<?php echo $rapport->DataSetType->_?>" name="radio" /><label class="radio_but" for="radio<?php echo $i; ?>">Rapport de Type <?php echo $rapport->DataSetType->_?></label>
-  						
 					</td>
-					
-					
-					
 					<td align="center" class="StyleInfoData lang_img <?=strtolower($rapport->DataSetType->_);?>">
 						<div class="lang_select">
 	                            <select class="lang_val">
@@ -66,9 +61,6 @@
 							<img class='lang'src="/themes/default/images/drapeaux/<?=$rapport->LanguageCodes->LanguageCode[0]?>.png" />
 						</div>	
 					</td>
-					
-					
-					
 					<td class="StyleInfoData lang_img <?=strtolower($rapport->DataSetType->_);?>">
 						<a id="r<?php echo $i?>" class="idpr id_cr" href="/giant/<?=strtolower($rapport->DataSetType->_)?>/Pays/test/<?=$this->TestIndication?>/<?=$this->Pays; ?>/Type/<?php echo $rapport->DataSetType->_?>/CompanyId/<?php echo $this->CompanyId;?>/Language/<?=$rapport->LanguageCodes->LanguageCode[0];?>" >Consulter le rapport en immédiat</a>
 						<div id="pr<?php echo $i?>" class="hide" style="display:none;z-index: 1;margin-left: -340px;">
@@ -81,7 +73,7 @@
 		</table>
 	</div></div>
         <?php endif; ?>
-        <?php if(!empty($this->listeRapport->InvestigationOptions)): ?>
+        <?php if(!empty($this->listeRapport->InvestigationOptions1)): ?>
 	<h1>Liste des investigations<img style="margin-top:4px;float:right" src="/themes/default/images/giant/expanded.gif" ></h1>
 	<div class="paragraph">
 		<table>

application/views/default/scripts/giant/partials/rapports/ComparaisonValeurs.phtml

@@ -14,8 +14,7 @@
 			<th>&nbsp;</th>
 			<?php if(isset($this->report->ComparaisonValeurs[key($this->report->ComparaisonValeurs)]['old'])):?>
 				<?php foreach($this->report->ComparaisonValeurs[key($this->report->ComparaisonValeurs)]['old'] as $date => $valeur):?>
-				<?php $dates = explode('/', $date);?>
+				<th align="right" class="date"><?php echo substr($date, 0,4);?></th>
-				<th align="right" class="date"><?php echo $dates[2];?></th>
 				<?php endforeach;?>
 			<?php endif;?>
 			
@@ -29,7 +28,7 @@
 		?>
 			<tr class="<?php echo ($val)? 'red':'green'; ?>">
 				<td class="head">
-					<a class="tooltip" title="<?php echo str_replace('_', ' ', $name);?>"><?php echo str_replace('_', ' ', $name);?></a>
+					<a class="tooltip" title="<?php echo str_replace('_', ' ', $ComparaisonValeurs['name']);?>"><?php echo str_replace('_', ' ', $ComparaisonValeurs['name']);?></a>
 				</td>
 				<td class="right"><?php echo round($ComparaisonValeurs['current']); ?></td>
 				<td class="right"><?php echo round($ComparaisonValeurs['entreprise']); ?></td>

application/views/default/scripts/giant/partials/rapports/ComportementDePaiement.phtml

@@ -7,8 +7,8 @@
 		<tr>
 			<th class="date">Jours</th>
 			<?php foreach(current($this->report->ComportementPaiement) as $dates => $valeurs):?>
-			<? if($dates==':30'){$dates='1:30';}else if($dates=='90:'){$dates='+90';}else if($dates=='151:'){$dates='+151';}?>
+			<? if($dates=='000030'){$dates='1000030';}else if($dates=='900000'){$dates='+90';}else if($dates=='1510000'){$dates='+151';}?>
-			<?$dates = str_replace(':', ' - ', $dates)?>
+			<?$dates = str_replace('0000', ' - ', $dates)?>
 				<th align="right" class="date"><?=$dates?></th>
 			<?php endforeach; ?>
 		</tr>
@@ -16,10 +16,11 @@
 	<tbody>
 		<tr>
 		<?php foreach($this->report->ComportementPaiement as $dates => $valeurs):?>
+		<?(strlen($dates)==12)?$len=6:$len=8;preg_match('/(\d{'.$len.'})(\d{'.$len.'})/', $dates,$matches);$s = $matches[1];$e = $matches[2];?>
 		<?php $date = explode(':', $dates);?>
 			<tr>
 				<td class="head">
-					<a class="tooltip" title="<?php echo $date[0];?> - <?php echo $date[1];?>"><?php echo $date[0];?> - <?php echo $date[1];?></a>
+					<a><?php echo $this->dateFunction->dateT('Ymd', 'd/m/Y', $s);?> - <?php echo $this->dateFunction->dateT('Ymd', 'd/m/Y', $e);?></a>
 				</td>
 				<?php $i=0;foreach($valeurs as $valeur): $i++; ?>
 				<td class="right"><?php echo $valeur;?> %</td>
@@ -71,8 +72,8 @@
 		<tr>
 				<th class="date">Jours</th>
 				<?php foreach(current($this->report->ByAmount) as $dates => $valeurs):?>
-				<? if($dates==':30'){$dates='1:30';}else if($dates=='90:'){$dates='+90';}else if($dates=='151:'){$dates='+151';}?>
+				<? if($dates=='000030'){$dates='1000030';}else if($dates=='900000'){$dates='+90';}else if($dates=='1510000'){$dates='+151';}?>
-				<?$dates = str_replace(':', ' - ', $dates)?>
+				<?$dates = str_replace('0000', ' - ', $dates)?>
 				<th align="right" class="date"><?=$dates?></th>
 				<?php endforeach; ?>
 		</tr>
@@ -80,7 +81,7 @@
 	<tbody>
 		<tr>
 		<?php foreach($this->report->ByAmount as $sommes => $valeurs):?>
-		<?php $somme = explode(':', $sommes);?>
+		<?php $somme = explode('1111', $sommes);?>
 			<tr>
 				<td class="head">
 					<a class="tooltip" title="<?php echo $date[0];?> - <?php echo $date[1];?>">entre : <?php echo (!empty($somme[0]))?$somme[0].'€':'0';?></b> et <b><?php echo (!empty($somme[1]))?$somme[1].'€':'plus';?></a>

application/views/default/scripts/giant/partials/rapports/ComptesAnnuels.phtml

@@ -8,7 +8,7 @@
 					<a class="tooltip tooltipFont">Date de clôture</a>
 				</td>
 				<?php foreach($this->report->AnnualAccounts as $AnnualAccounts):$i++?>
-				<td class="right"><?php echo (empty($AnnualAccounts->AccountsDate->_))?'NC':$AnnualAccounts->AccountsDate->_;?></td>
+				<td class="right"><?php echo (empty($AnnualAccounts->AccountsDate->_))?'NC':$this->dateFunction->dateT('Ymd', 'd/m/Y', $AnnualAccounts->AccountsDate->_);?></td>
 				<?php endforeach; ?>
 			</tr>
 			<tr >
@@ -39,9 +39,8 @@
 			<th align="center">
 			</th>
 			<?php $i=0; foreach($this->report->AnnualAccounts as $AnnualAccounts): $i++?>
-				<th align="right" class="date"><?php echo $AnnualAccounts->AccountsDate->_; ?></th>
+				<th align="right" class="date"><?php echo $this->dateFunction->dateT('Ymd', 'd/m/Y', $AnnualAccounts->AccountsDate->_); ?></th>
 			<?php endforeach; ?>
-			
 			<th>&nbsp;</th>
 		</tr>
 	</thead>
@@ -84,7 +83,7 @@
 			<th align="center">
 			</th>
 			<?php $i=0; foreach($this->report->AnnualAccounts as $AnnualAccounts): $i++?>
-				<th align="right" class="date"><?php echo $AnnualAccounts->AccountsDate->_; ?></th>
+				<th align="right" class="date"><?php echo $this->dateFunction->dateT('Ymd', 'd/m/Y', $AnnualAccounts->AccountsDate->_); ?></th>
 			<?php endforeach; ?>
 			
 			<th>&nbsp;</th>
@@ -129,7 +128,7 @@
 			<th align="center">
 			</th>
 			<?php $i=0; foreach($this->report->AnnualAccounts as $AnnualAccounts): $i++?>
-				<th align="right" class="date"><?php echo $AnnualAccounts->AccountsDate->_; ?></th>
+				<th align="right" class="date"><?php echo $this->dateFunction->dateT('Ymd', 'd/m/Y', $AnnualAccounts->AccountsDate->_); ?></th>
 			<?php endforeach; ?>
 			
 			<th>&nbsp;</th>
@@ -175,7 +174,7 @@
 			<th align="center">
 			</th>
 			<?php $i=0; foreach($this->report->AnnualAccounts as $AnnualAccounts): $i++?>
-				<th align="right" class="date"><?php echo $AnnualAccounts->AccountsDate->_; ?></th>
+				<th align="right" class="date"><?php echo $this->dateFunction->dateT('Ymd', 'd/m/Y', $AnnualAccounts->AccountsDate->_); ?></th>
 			<?php endforeach; ?>
 			
 			<th>&nbsp;</th>

application/views/default/scripts/giant/partials/rapports/Dirigeant.phtml

@@ -2,13 +2,12 @@
 	<a name="19"></a>
    <span class="title">Dirigeants</span><br /><br />
    <?php if(isset($this->report->Dirigeant)):?>
-		<table style="font-size:13px;margin-left: 19px;" width="97%" class="hoverTr">
+		<table style="font-size:13px;margin-left: 19px;" width="97%" class="hoverTr"><pre><?//print_r($this->report->Dirigeant);?></pre>
 				<?php foreach($this->report->Dirigeant as $Dirigeants):?>
-				
+					<?php foreach($Dirigeants as $date => $Dirigeant):?> 
-					<?php foreach($Dirigeants as $date => $Dirigeant):?>
-					<?php $date = explode(':', $date); ?>
 						<tr>
-							<td style="padding:2px;color:#2599E7"><b><?php echo ($date[0]!='//')?$date[0]:'NC';?></b></td>
+							<td style="padding:2px;color:#2599E7"><b><?php if(!empty($Dirigeant[0]->date[0]) || !empty($Dirigeant[0]->date[1])){echo(!empty($Dirigeant[0]->date[0]))?$this->dateFunction->dateT('Ymd', 'd/m/Y', $Dirigeant[0]->date[0]):'NC';echo' - ';
+																	 echo(!empty($Dirigeant[0]->date[1]))?$this->dateFunction->dateT('Ymd', 'd/m/Y', $Dirigeant[0]->date[1]):'NC';}else{echo 'NC';}?></b></td>
 						</tr>
 						<?php $i=0;?>
 						<?php foreach($Dirigeant as $dir):$i++;?>

application/views/default/scripts/giant/partials/rapports/Historiques.phtml

@@ -2,7 +2,7 @@
 	<a name="21"></a>
 	<?php if(isset($this->report->Event)):?>
 	<?php foreach($this->report->Event as $name => $Events):?>
-	<span class="title"><?php echo $name;?></span><br /><br />
+	<span class="title"><?php echo $this->report->EventNew[$name];?></span><br /><br />
 	<form method="POST">
 		<select name="Date" style="float:right" onchange="submit()">
 			<option value="all">Date</option>
@@ -17,12 +17,10 @@
 			<?php endforeach;?>
 		</select>
 	</form>
-	
-	
 	<table id="giant_synthese">
 	<thead>
 		<tr>
-			<th align="center" class="date">Date</th>
+			<th align="center" class="date" style='width: 142px;'>Date</th>
 			<th align="right" class="date">Description</th>
 		</tr>
 	</thead>

application/views/default/scripts/giant/partials/rapports/InformationEntreprise.phtml

@@ -1,128 +1,157 @@
 <div class="paragraph">
 	<?php if(isset($this->report)) :?>
+	<?preg_match('/(\d{2})(\d{2})(\d{4})/',  $this->report->IncorporationDate, $matches);$d = $matches[1];$m = $matches[2];$y = $matches[3];?>
 	<div>
 		<a name="1"></a>
-		<span class="title">Données officielles</span><br /><br />
+		<span class="title">Données officielles</span><br />
-		<ul style="font-size:13px;margin-left:3%;list-style: none">
+		<table id="giant_synthese">
-			<li><b>Nom d'entreprise </b> <span style="float:right"><?php echo $this->report->CompanyName?></span></li>
+		<tbody>
-			<hr style="border:1px dotted silver" />
+					<tr >
-			<li><b>Numéro de TVA </b> <span style="float:right"><?php echo $this->report->Vat?></span></li>
+						<td class="head" style='width: 169px;'>
-			<hr style="border:1px dotted silver" />
+							<a class="tooltip tooltipFont">Nom d'entreprise </a>
-			<li><b>Forme juridique actuelle </b> <span style="float:right"><?php echo $this->report->LegalForm.' / '.$this->report->UnifiedLegalForm;?></span></li>
+						</td>
-			<hr style="border:1px dotted silver" />
+						<td class="right"><?php echo $this->report->CompanyName?></td>
-			<li><b>Date de constitution </b> <span style="float:right"><?php echo ($this->report->IncorporationDate != '//')?$this->report->IncorporationDate:'NC'?></span></li>
+					</tr>
-			<hr style="border:1px dotted silver" />
+					<tr >
-			<li><b>Etat de l'entreprise </b> <span style="float:right"><?php echo $this->report->CompanyStatus?></span></li>
+						<td class="head" style='width: 169px;'>
-			<hr style="border:1px dotted silver" />
+							<a class="tooltip tooltipFont">Numéro de TVA</a>
-			<li><b>No. Siret </b> <span style="float:right"><?php echo $this->report->CompanyId?></span></li>
+						</td>
-			<hr style="border:1px dotted silver" />
+						<td class="right"><?php echo $this->report->Vat?></td>
-		</ul>
+					</tr>
+					<tr >
+						<td class="head" style='width: 169px;'>
+							<a class="tooltip tooltipFont">Forme juridique actuelle</a>
+						</td>
+						<td class="right"><?php echo $this->report->LegalForm.' / '.$this->report->UnifiedLegalForm;?></td>
+					</tr>
+					<tr >
+						<td class="head" style='width: 169px;'>
+							<a class="tooltip tooltipFont">Date de constitution</a>
+						</td>
+						<td class="right"><?php echo (!empty($this->report->IncorporationDate))?$d.'/'.$m.'/'.$y:'NC'?></td>
+					</tr>
+					<tr >
+						<td class="head" style='width: 169px;'>
+							<a class="tooltip tooltipFont">Etat de l'entreprise</a>
+						</td>
+						<td class="right"><?php echo $this->report->CompanyStatus?></td>
+					</tr>
+					<tr >
+						<td class="head" style='width: 169px;'>
+							<a class="tooltip tooltipFont">No. Siret</a>
+						</td>
+						<td class="right"><?php echo $this->report->CompanyId?></td>
+					</tr>
+		</tbody>
+		</table>
 	<br />
-	<a name="2"></a>
+	<a name="2"></a><br />
-	<span class="title">Données de contact</span><br /><br />
+	<span class="title">Données de contact</span><br />
-	<ul style="font-size:13px;margin-left:3%;list-style: none">
+	<table id="giant_synthese">
-		<li><b>Numéro de téléphone </b> <span style="float:right"><?php echo $this->report->TelephoneNumber?></span></li>
+		<tbody>
-		<hr style="border:1px dotted silver" />
+					<tr >
-		<li><b>Numéro de fax </b> <span style="float:right"><?php echo $this->report->Telefax?></span></li>
+						<td class="head" style='width: 169px;'>
-		<hr style="border:1px dotted silver" />
+							<a class="tooltip tooltipFont">Numéro de téléphone</a>
-		<li><b>Adresse Email </b> <span style="float:right"><?php echo $this->report->EmailAddress?></span></li>
+						</td>
-		<hr style="border:1px dotted silver" />
+						<td class="right"><?php echo $this->report->TelephoneNumber?></td>
-		<li><b>Site internet </b> <span style="float:right"><?php echo $this->report->WebAddress?></span></li>
+					</tr>
-		<hr style="border:1px dotted silver" />
+					<tr >
-		<li><b>Adresse </b> <span style="float:right"><?php echo $this->report->CompanyAddress?></span></li>
+						<td class="head" style='width: 169px;'>
-		<hr style="border:1px dotted silver" />
+							<a class="tooltip tooltipFont">Numéro de fax</a>
-	</ul>
+						</td>
+						<td class="right"><?php echo $this->report->Telefax?></td>
+					</tr>
+					<tr >
+						<td class="head" style='width: 169px;'>
+							<a class="tooltip tooltipFont">Adresse Email</a>
+						</td>
+						<td class="right"><?php echo ($this->report->EmailAddress!='<a href="mailto:"></a>')?$this->report->EmailAddress:'NC'?></td>
+					</tr>
+					<tr >
+						<td class="head" style='width: 169px;'>
+							<a class="tooltip tooltipFont">Site internet</a>
+						</td>
+						<td class="right"><?php echo ($this->report->WebAddress!='<a href="http://"></a>')?$this->report->WebAddress:'NC'?></td>
+					</tr>
+					<tr >
+						<td class="head" style='width: 169px;'>
+							<a class="tooltip tooltipFont">Adresse</a>
+						</td>
+						<td class="right"><?php echo $this->report->CompanyAddress?></td>
+					</tr>
+		</tbody>
+		</table>
 	</div>
 	<br />
-	<a name="3"></a>
+	<a name="3"></a><br />
 	<?php if(!empty($this->report->activity)):?>
-		<span class="title">Activités</span><br /><br />
+		<span class="title">Activités</span><br />
-		<table style="margin-left: 19px;" width="97%">
+	<table id="giant_synthese">
+	<thead>
+		<tr>
+			<th align="left" class="date">Code</th>
+			<th align="right" class="date">Activité</th>
+		</tr>
+	</thead>
+	<tbody>
+		<tr>
+	<?php foreach($this->report->activity as $code => $activity): ?>
 			<tr>
-				<td style="font-size:13px;"><b>Code</b></td>
+				<td class="head" style='width: 169px;'>
-				<td style="float:right;font-size:13px;padding-left:5px"><b>Activité</b></td>
+					<a><?php echo $code?></a>
-			</tr>
-			<tr>
-				<td colspan="2"><hr style="border:1px dotted silver" /></td>
-			</tr>
-			<?php foreach($this->report->activity as $code => $activity): ?>
-			<tr>
-				<td>
-					<ul style="font-size:13px;list-style: none">
-						<li><span ><?php echo $code?></span></li>
-					</ul>
-				</td>
-				<td style="padding-left:5px">
-					<ul style="font-size:13px;list-style: none;">
-						<?php if(strlen($activity) < 50): ?>
-						<li style="float:right"><span ><i><?php echo $activity?></i></span></li>
-						<?php else: ?>
-						<li style="float:right;cursor:help" class="tooltip" title="<?php echo $activity;?>" style="float:right">
-							<span ><i><?php echo substr($activity, 0, 50);?>...</i></span>
-						</li>
-						<?php endif; ?>
-					</ul>
 				</td>
+						<td class="right"><?php echo $activity?></td>
 			</tr>
-			<tr>
+	<?php endforeach; ?>
-				<td colspan="2"><hr style="border:1px dotted silver" /></td>
+	</tbody>
-			</tr>
+	</table>
-			<?php endforeach;?>
-		</table>
 	<?php endif;?>
 	<br />
 	<?php if(!empty($this->report->Employees)):?>
-	<a name="4"></a>
+	<a name="4"></a><br />
-	<span class="title">Personnel</span><br /><br />
+	<span class="title">Personnel</span><br />
-		<table style="font-size:13px;margin-left: 19px;" width="97%">
+		<table id="giant_synthese">
+		<thead>
 			<tr>
-				<td><b>Année</b></td>
+				<th align="left" class="date" style='width: 169px;'>Année</th>
-				<td><b>Total des travailleurs employés</b></td>
+				<th align="right" class="date">Total des travailleurs employés</th>
-				<td><b>Équivalent temps plein</b></td>
+				<th align="right" class="date">Équivalent temps plein</th>
 			</tr>
-			<?php foreach($this->report->Employees as $year => $employees): ?>
+		</thead>
+		<tbody>
 			<tr>
-				<td><?php if(strlen($year)==4)echo $year; else echo $this->dateFunction->dateT('Ymd', 'd/m/Y', $year);?></td>
+		<?php foreach($this->report->Employees as $year => $employees): ?>
-				<td><?php echo $employees['TotalStaffEmployed'];?> </td>
+				<tr class="<?php echo ($val)? 'red':'green'; ?>">
-				<td><?php echo $employees['FulltimeEquivalent'];?> </td>
+						<td class="left"><?php if(strlen($year)==4)echo $year; else echo $this->dateFunction->dateT('Ymd', 'd/m/Y', $year);?></td>
-			</tr>
+						<td class="right"><?php echo $employees['TotalStaffEmployed'];?></td>
-			<tr>
+						<td class="right"><?php echo $employees['FulltimeEquivalent'];?></td>
-				<td colspan="3"><hr style="border:1px dotted silver" /></td>
+				</tr>
-			</tr>
+		<?php endforeach; ?>
-			<?php endforeach;?>
+		</tbody>
 		</table>
    <?php endif;?>
 	<br />
 	<?php if(!empty($this->report->ProductName)):?>
-	<a name="5"></a>
+	<a name="5"></a><br />
-	<span class="title">Noms de produit</span><br /><br />
+	<span class="title">Noms de produit</span><br />
-		<table style="margin-left: 19px;" width="97%">
+		<table id="giant_synthese">
-			<tr>
+			<thead>
-				<td style="font-size:13px;"><b>Source</b></td>
+				<tr>
-				<td width="100%" style="font-size:13px;padding-left:5px"><b>Produit</b></td>
+					<th align="left" class="date">Source</th>
-			</tr>
+					<th align="right" class="date">Produit</th>
-			<tr>
+				</tr>
-				<td colspan="2"><hr style="border:1px dotted silver" /></td>
+			</thead>
-			</tr>
+			<tbody>
+				<tr>
 			<?php foreach($this->report->ProductName as $ProductName): ?>
-			<tr>
+					<tr class="<?php echo ($val)? 'red':'green'; ?>">
-				<td style="font-size:13px;"><?php echo (empty($ProductName->source)?'NC':$ProductName->source);?></td>
+						<td class="head" style='width: 169px;'>
-				<td style="padding-left:5px" width="100%">
+							<a><?php echo (empty($ProductName->source)?'NC':$ProductName->source);?></a>
-					<ul style="font-size:13px;list-style: none;">
+						</td>
-						<?php if(strlen($ProductName->_) < 50): ?>
+								<td class="right"><?php echo $ProductName->_?></td>
-						<li style="float:right"><span ><i><?php echo $ProductName->_?></i></span></li>
+					</tr>
-						<?php else: ?>
+			<?php endforeach; ?>
-						<li style="float:right;cursor:help" class="tooltip" title="<?php echo $ProductName->_;?>" style="float:right">
+			</tbody>
-							<span ><i><?php echo substr($ProductName->_, 0, 80);?>...</i></span>
-						</li>
-						<?php endif; ?>
-					</ul>
-				</td>
-			</tr>
-			<tr>
-				<td colspan="2"><hr style="border:1px dotted silver" /></td>
-			</tr>
-			<?php endforeach;?>
 		</table>
 	<?php endif;?>
 	<?php else: ?>

application/views/default/scripts/giant/partials/rapports/PositionFinanciere.phtml

@@ -1,5 +1,6 @@
 <div class="paragraph">
 <?php if(isset($this->report->FinancialSummary)):?>
+<? $dateFunction = new WDate();?>
 	<a name="11"></a>
 	<span class="title">Informations Capital</span><br />
 	<?php if(isset($this->report->PositionFinanciere)):?>
@@ -9,7 +10,7 @@
 			<th align="center">
 			</th>
 			<?php $i = 0; foreach($this->report->PositionFinanciereDate as $date => $val):$i++?>
-				<th align="right" class="date"><?php echo $date;?></th>
+				<th align="right" class="date"><?php echo $dateFunction->dateT('Ymd', 'd/m/Y', $date);?></th>
 			<?php endforeach; ?>
 		</tr>
 	</thead>

application/views/default/scripts/giant/search.phtml

@@ -6,7 +6,7 @@
         <p align="center"><b>
         <?php echo number_format($this->resultats->NumberOfHits, 0, ',', ' ')?>
         réponses avec les critères <a href="<?php echo $this->lienReferer;?>">"<?php echo $this->referer; ?>"</a>.
-         <?php echo $this->userMaxResult;?> résultats affichés.
+         <?php echo ($this->resultats->NumberOfHits>$this->userMaxResult)?$this->userMaxResult:$this->resultats->NumberOfHits?> résultats affichés.
          Page <?php echo $this->page + 1 .'/'. $this->resultats->NumberOfHits?>.</b>
         </p>
         <ol start="<?php echo ($this->userMaxResult * $this->page) + 1; ?>">

application/views/default/scripts/identite/evenements.phtml

@@ -29,9 +29,6 @@
 </div>
 
 <h2>&Eacute;v&eacute;nements INSEE</h2>
-<style>
-table.data td { border-bottom:1px solid #ccc; padding:5px; }
-</style>
 <div class="paragraph">
 <table class="data">
 <?php

application/views/default/scripts/identite/geo.phtml

@@ -2,6 +2,7 @@
 <div class="paragraph">
 <div id="infogeo" class="clearfix">
 	<div id="infogeo_txt">
+	<?php if ( $this->infos->GeoLat && $this->infos->GeoLon ):?>
     	<span id=geolocalisation>
     		<b>Information géographique :</b><br/>
     		Latitude  : <?=$this->decLat?> (<?=$this->infos->GeoLat?>)<br />
@@ -10,6 +11,7 @@
     	<a id="lien-google" href="<?=$this->mapsHref?>" target="_blank">
             Afficher l'adresse sur Google Map &copy;</a><br/>
         <br/>
+        <?endif;?>
         <b>Code commune / Rivoli :</b><br/>
             <?=$this->infos->Dept.' '.$this->infos->codeCommune.' / '.$this->infos->Rivoli; ?>
 			<?php

application/views/default/scripts/identite/lienfiche.phtml

@@ -27,7 +27,7 @@
 
 <?=$this->result->raisonSociale?>
 <?php if (intval($this->result->siren)!=0) {?>(<?=$this->result->siren?>)<?php }?>
-
+<?php if ($this->result->actif==0) {?>(inactif)<?php }?>
 <?php }?>
 </div>
 
@@ -38,6 +38,7 @@ Editer la fiche</a>
 <script>
 $('a.dialogFiche').on('click', function(e){
 	e.preventDefault();
+	$('div.qtip').hide();
 	$('#dialog').remove();
 	var href = $(this).attr('href');
 	if (href!='#') {

application/views/default/scripts/identite/liens.phtml

@@ -102,8 +102,6 @@
 
 <?php $liste = array('actionnaires', 'participations');?>
 <style>
-table {width:100%;}
-table.data td { border:1px solid #ccc; padding:5px; }
 a.lienNom{color:#535353;}
 a.lienNom:link{color:#535353;}
 a.lienNom:hover{color:#535353;}
@@ -174,6 +172,7 @@ Cette entreprise est une personne physique exerçant son activité en nom propre
     	<a class="lienNom" href="<?=$this->url(array('controller'=>'identite','action'=>'liens','lienref'=>$lien->idFiche), null, true)?>">
     	<?php }?>
     	<?=$lien->nom?>
+    	<?php if($lien->sigle) echo " (".$lien->sigle.")"; ?>
     	</a>
     	</td>
     	<td class="StyleInfoData" width="150">

application/views/default/scripts/juridique/annonces.phtml

@@ -109,8 +109,6 @@ a.lienType {
 	color: #FFFFFF;
 	font-weight:bold;
 }
-
-table.data td { border-bottom:1px solid #ccc; padding:5px; }
 </style>
 
 <div class="paragraph">

application/views/default/scripts/juridique/infosreg.phtml

@@ -50,9 +50,6 @@
 </tr>
 </table>
 <?php } else {?>
-<style>
-table.data td { border-bottom:1px solid #ccc; padding:5px; }
-</style>
 <table class="data">
 <?php foreach($this->annonces as $item){?>
 <tr>

application/views/default/scripts/juridique/marques.phtml

@@ -53,9 +53,6 @@
 <?php } else {?>
 
 <h2>Marque(s) déposée(s)</h2>
-<style>
-table.data td { border-bottom:1px solid #ccc; padding:5px; }
-</style>
 <div class="paragraph">
 <table class="data">
 <?php if (count($this->marques)==0) { ?>

application/views/default/scripts/saisie/checkisin.phtml

@@ -0,0 +1 @@
+<?=$this->error;?>

application/views/default/scripts/saisie/fiche.phtml

@@ -98,7 +98,7 @@ else
 <div class="paragraph">
 
 <label>Code ISIN</label>
-<input type="text" name="frmSaisie[isin]" size="15" maxlength="15" value="<?=trim($this->etab->Isin)?>" />
+<input type="text" name="frmSaisie[isin]" id='isin' size="15" maxlength="15" value="<?=trim($this->etab->Isin)?>" />
 <label>Activit&eacute; d&eacute;clar&eacute;e de l'entreprise</label>
 <textarea name="frmSaisie[activite]" rows="5" cols="40"><?=$this->etab->Activite?></textarea>
 
@@ -174,4 +174,13 @@ if(substr($this->etab->FJ,0,1)=='1' || in_array($this->etab->FJ, array(2310, 232
 
 </form>
 
-</div>
+</div>
+<script>
+$('input#isin').change(function(e){
+	$.post('/saisie/checkisin', {isin: $(this).val() }, function success(data) {
+		 $('input#isin').html(data);
+		 if (data){ $('input#isin').css("border-color", "red");} 
+		 else { $('input#isin').css("border-color", "");}
+	});
+});
+</script>

application/views/default/scripts/saisie/lien.phtml

@@ -272,6 +272,13 @@ $('input[name=PDetention]').on('blur', function(e){
     }
 });
 
+$('input[name=PDetention]').keypress(function(e){
+	e.preventDefault();
+	if (e.which==13) {
+		$('#dialog .ui-button:contains("Valider")').click();
+	}
+});
+
 $('#dialog').dialog({ buttons: [
     { text: "Valider", click: function() {
         if ($('input[name=PDetention]').val()>100){

application/views/default/scripts/saisie/lienetranger.phtml

@@ -68,6 +68,13 @@ div#etranger { display:none; }
 </div>
 </div>
 
+<div class="fieldgrp">
+<label>ISIN</label>
+<div class="field">
+<input type="text" name="isin" value="<?=$this->isin?>"/>
+</div>
+</div>
+
 <div class="fieldgrp">
 <label>Pays</label>
 <div class="field">
@@ -107,7 +114,7 @@ Selectionner un pays pour afficher les identifiants locaux
 <div class="fieldgrp">
 <label>Téléphone</label>
 <div class="field">
-<input type="text" name="tel" value="<?=$this->tel?>"/> <span id="indTel"></span>
+<div style="float-left;"></div><span id="indTel"></div><div></span><input type="text" name="tel" value="<?=$this->tel?>"/></div> 
 </div>
 </div>
 
@@ -233,10 +240,17 @@ $.datepicker.setDefaults( $.datepicker.regional["fr"] );
 $('input[name=dateCapital]').datepicker({ changeMonth: true, changeYear: true });
 $('input[name=dateNbActions]').datepicker({ changeMonth: true, changeYear: true });
 
+$('input[name=isin]').change(function(e){
+	$.post('/saisie/checkisin', {isin: $(this).val() }, function success(data) {
+		 if (data){$('input[name=isin]').css("border-color", "red");} 
+		 else {$('input[name=isin]').css("border-color", "");}
+	});
+});
+
 $('select[name=adresse_pays]').change(function(e){
 	var code = $(this).val();
     //Devise, indicatif téléphone
-    $('span#indTel').html('+'+countries[code]['indTel']);
+    $('span#indTel').text('+'+countries[code]['indTel']);
     $('select[name=deviseCapital]').val(countries[code]['devise']);
     $('select[name=bilDev]').val(countries[code]['devise']);
 	//Local Id
@@ -284,4 +298,9 @@ $('a#google').on('click', function(e){
 	var val = $('input[name=nom]').val();
 	window.open('https://www.google.fr/#q='+encodeURIComponent(val));
 });
+
+$(document).ready(function(){
+	var code = $('select[name=adresse_pays]').val();
+	$('span#indTel').text('+'+countries[code]['indTel']);
+});
 </script>

application/views/default/scripts/saisie/lienpp.phtml

@@ -34,6 +34,10 @@
 <label>Né(e) le</label>
 <div class="field">
 <input type="text" size="10" name="naissance_date" value="<?=$this->naissance_date?>"/>
+<script>
+$.datepicker.setDefaults( $.datepicker.regional["fr"] );
+$('input[name=naissance_date]').datepicker({ changeMonth: true, changeYear: true });
+</script>
 à <input type="text" name="naissance_lieu" value="<?=$this->naissance_lieu?>"/>
 <select name="naissance_dept_pays">
 <option>-</option>

application/views/default/scripts/worldcheck/matchcontent.phtml

@@ -36,7 +36,7 @@ if (strtolower($this->nameType)=='individual')
 			'dirDateNaissJJ' =>$day,
 			'dirDateNaissMM' =>$month,
 			'dirDateNaissAAAA' =>$year,
-			'dirCpVille' =>$content[0]->events->event[0]->address->region
+			'dirCpVille' =>''
 	);
 } else {
 	$param = array(
@@ -187,7 +187,7 @@ if ($associate->associatetype=='ASSOCIATE')
 			'dirDateNaissJJ' =>$day,
 			'dirDateNaissMM' =>$month,
 			'dirDateNaissAAAA' =>$year,
-			'dirCpVille' =>$associate->targetEntity->events->event[0]->address->region
+			'dirCpVille' =>''
 	);
 } else {
 	$dirType = 'ORGANISATION';

application/views/default/scripts/worldcheck/occurence.phtml

@@ -1,4 +1,4 @@
-<?=($this->occurrence===false) ? "WorldCheck<br/>Cliquez sur l&rsquo;icone WorldCheck" : "WorldCheck<br/>Occurrences: ".$this->occurrence;?>
+<?=($this->occurrence===false) ? "WorldCheck<br/>Cliquez sur le lien" : "WorldCheck<br/>Occurrences: ".$this->occurrence;?>
 <? $param = array(
 			'controller'=>'worldcheck',
 			'action'=>'index',

data/pages/themes/default/styles/giant.css

@@ -1,256 +1,423 @@
-.compteAnnuels .tdP{
+.compteAnnuels .tdP {
-	font-size:13px;
+	font-size: 13px;
 }
 
 .compteAnnuels table {
-	width:645px;
+	width: 645px;
 	margin-left: 19px;
-	font-size:13px;
+	font-size: 13px;
 }
 
 .compteAnnuels hr {
-	border:1px dotted silver
+	border: 1px dotted silver
 }
 
 .compteAnnuels #tdP {
-	font-size:13px;
+	font-size: 13px;
 }
 
-.compteAnnuels .title {
+.title {
-	font-size:16px;
+	font-size: 16px;
-	color:#00008C;
+	color: #2599E7;
-	font-weight:800;
+	font-weight: 800;
 }
+
+.minTitle {
+	background: none repeat scroll 0 0 #B9C9FE;
+	border: 1px solid #FFF;
+	color: #039;
+	font-size: 13px;
+	font-weight: 800;
+	padding: 4px;
+}
+
 .compteAnnuels .center {
-	text-align:center;
+	text-align: center;
 }
 
 .compteAnnuels .bilansTAB td {
-	font-size:11px; !important
+	font-size: 11px;
+	!
+	important
 }
 
 #AvisDeCredit {
 	margin-left: 19px;
-	width:97%;	
+	width: 97%;
 }
+
 #AvisDeCredit td {
-	font-size:13px;
+	font-size: 13px;
 }
 
 #AvisDeCredit .float {
-	float:right;
+	float: right;
 }
+
 #AvisDeCredit hr {
-	border:1px dotted silver;
+	border: 1px dotted silver;
 }
+
 #AvisDeCredit div {
-	padding:0.7em;	
+	padding: 0.7em;
 }
+
 #AvisDeCredit div span {
-	float: left; margin-right: 0.3em;
+	float: left;
+	margin-right: 0.3em;
 }
 
 #ComparisonValeurs span {
-	font-size:16px;
+	font-size: 16px;
-	color:#00008C;
+	color: #2599E7;
-	font-weight:800;
+	font-weight: 800;
 }
+
 #ComparisonValeurs .Variation {
-	width:85px;
+	width: 85px;
-	text-align:right;	
+	text-align: right;
 }
+
 #ComparaisonValeurs hr {
-	border:1px dotted silver;	
+	border: 1px dotted silver;
 }
+
 #ComparisonValeurs div {
-	padding:0.7em;
+	padding: 0.7em;
 }
 
 .alignCenter {
-	text-align:center;
+	text-align: center;
 }
 
-#ComparaisonValeurs .align {
+#ComparaisonValeurs .align {align ="right"
-	align="right"
+	
 }
 
-#sommaire
+#sommaire {
-{
+	margin: 5px;
-	margin:5px;
 }
 
-#sommaire fieldset
+#sommaire fieldset {
-{
 	padding: 10px;
-	border:1px dotted silver;
+	border: 1px dotted silver;
 	padding-bottom: 70px;
 }
 
-#sommaire fieldset legend
+#sommaire fieldset legend {
-{
+	font-size: 25px;
-	font-size:25px;
 	font-weight: bold;
-	color:#000099;
+	color: #000099;
 }
 
-#sommaire h3
+#sommaire h3 {
-{
+	font-size: 25px;
-	font-size:25px;
 	font-weight: bold;
 	text-align: right;
 	margin-right: 10px;
 }
 
-#sommaire li
+#sommaire li {
-{
+	font-size: 15px;
-	font-size:15px;
 	list-style: none;
 	font-weight: 800;
 	margin-top: 10px;
 }
 
-#sommaire li a
+#sommaire li a {
-{
+	color: #000099;
-	color:#000099;
 	cursor: pointer;
 }
 
-#sommaire li a:hover
+#sommaire li a:hover {
-{
+	color: #9C093A;
-	color:#9C093A;
 }
 
-#sommaire span a:hover
+#sommaire span a:hover {
-{
+	color: #000099;
-	color:#000099;
 }
 
-#sommaire span a
+#sommaire span a {
-{
+	color: #9C093A;
-	color:#9C093A;
 	cursor: pointer;
 }
 
-#comportementPaiement tr td
+#comportementPaiement tr td {
-{
+	padding: 5px;
-	padding:5px;
 }
-.colorTr
+
-{
+.colorTr {
 	background-color: #EDEEF7;
 }
 /** Giant rapport **/
-#ComparisonValeurs table
+.red {
-{
+	font-size: 11px;
-	font-size:13px;
+	background-color: #FFE8E8;
-	margin-left: 19px;
-}
-.red
-{
-	font-size:11px;
-	background-color:#FFE8E8;
 }
 
-.green
+.green {
-{
+	font-size: 11px;
-	font-size:11px;
+	background-color: #E8FFE8;
-	background-color:#E8FFE8;
 }
 
-#ComparisonValeurs table tr:hover
+#ComparisonValeurs table tr:hover {
-{
 	background-color: #E0E4F8;
 }
 
-.hoverTr tr:hover
+.hoverTr tr:hover {
-{
+	background-color: #E0E4F8;
-    background-color: #E0E4F8;
+	cursor: default;
-    cursor: default;
 }
 
-.FR{background-image: url('/themes/default/images/giant/cartes/fr.png');background-repeat: no-repeat;background-position: top right;}
+.FR {
-.NL{ background-image: url('/themes/default/images/giant/cartes/nl.JPG');background-repeat: no-repeat;background-position: top right;}
+	background-image: url('/themes/default/images/giant/cartes/fr.png');
-.BE{ background-image: url('/themes/default/images/giant/cartes/be.JPG');background-repeat: no-repeat;background-position: top right;}
+	background-repeat: no-repeat;
-.UK{ background-image: url('/themes/default/images/giant/cartes/uk.JPG');background-repeat: no-repeat;background-position: top right;}
+	background-position: top right;
-.ES{ background-image: url('/themes/default/images/giant/cartes/es.JPG');background-repeat: no-repeat;background-position: top right;}
+}
 
-#carte
+.NL {
-{
+	background-image: url('/themes/default/images/giant/cartes/nl.JPG');
-	width:660px;
+	background-repeat: no-repeat;
+	background-position: top right;
+}
+
+.BE {
+	background-image: url('/themes/default/images/giant/cartes/be.JPG');
+	background-repeat: no-repeat;
+	background-position: top right;
+}
+
+.UK {
+	background-image: url('/themes/default/images/giant/cartes/uk.JPG');
+	background-repeat: no-repeat;
+	background-position: top right;
+}
+
+.ES {
+	background-image: url('/themes/default/images/giant/cartes/es.JPG');
+	background-repeat: no-repeat;
+	background-position: top right;
+}
+
+#carte {
+	width: 660px;
 	background-position: right top;
 	background-repeat: no-repeat;
 	background-color: #fcfdfe;
 }
 /** Giant Search **/
-#info td
+#info td {
-{
+	padding: 2px;
-    padding:2px;
 }
 
-.giant-search
+.giant-search {
-{
+	font-family: Arial, Helvetica, sans-serif;
-	font-family: Arial,Helvetica,sans-serif;
 	color: #535353;
 }
 
-.giant-search #Paginator
+.giant-search #Paginator {
-{
+	color: black;
-	color:black;
 }
 
-.giant-search ol
+.giant-search ol {
-{
+	text-align: left;
-	text-align:left;
+	margin: 10px;
-	margin:10px;
+	padding: 0 20px;
-	padding:0 20px;
 }
 
-.giant-search #Paginator table
+.giant-search #Paginator table {
-{
+	width: 130px;
-	width:130px;
 }
 
-.giant-search #contact
+.giant-search #contact {
-{
+	padding-left: 5px;
-	padding-left:5px;
-}
-#inDebug
-{
-	float:left;
-}
-#debug
-{
-	background-color:#FFFFCC;
-	padding:10px;
-	border:1px solid silver;
-	width:590px;
-	overflow:auto;
 }
 
-#debug_menu
+#inDebug {
-{
+	float: left;
-	float:left;
-	background-color:#FFFFCC;
-	border:1px solid silver;
-	width:150px;
-	height:25px;
-	margin-bottom:2px;
-	padding-top:9px;
 }
 
-#debug_menu:hover
+#debug {
-{
+	background-color: #FFFFCC;
-	background-color:#FFFF99;
+	padding: 10px;
-	cursor:pointer;
+	border: 1px solid silver;
+	width: 590px;
+	overflow: auto;
 }
 
-.hide 
+#debug_menu {
-{
+	float: left;
+	background-color: #FFFFCC;
+	border: 1px solid silver;
+	width: 150px;
+	height: 25px;
+	margin-bottom: 2px;
+	padding-top: 9px;
+}
+
+#debug_menu:hover {
+	background-color: #FFFF99;
+	cursor: pointer;
+}
+
+.hide {
 	background-color: silver;
-    height: 455px;
+	height: 455px;
-    position: absolute;
+	position: absolute;
-    top:2%;
+	top: 2%;
-	left:35%;
+	width: 691px;
-    width: 691px;
+	opacity: 0.3;
-	opacity:0.3;
+}
+
+.hide_monitor {
+	background-color: #C0C0C0;
+	height: 497px;
+	position: absolute;
+	top: 0%;
+	width: 714px;
+	margin-left: -14px;
+	opacity: 0.3;
+}
+
+.radio_but {
+	width: 295px;
+}
+
+.lang_img {
+	display: none;
+	float: right;
+	margin-left: 3px;
+}
+
+.lang_select {
+	float: right;
+	margin-left: 3px;
+}
+
+.brsr {
+	border-style: solid;
+	border-width: 1px;
+	border-color: red;
+}
+
+.all_select {
+	width: 140px;
+}
+
+.acord {
+	width: 671px;
+	margin: 0 auto;
+}
+
+.gen_div {
+	width: 600px;
+	margin-left: 41px;
+}
+
+.left_div {
+	float: left;
+	width: 300px;
+	padding-bottom: 15px;
+}
+
+.right_div {
+	float: left;
+	width: 300px;
+	padding-bottom: 15px;
+}
+
+.radius {
+	-moz-border-radius: 4px;
+	-webkit-border-radius: 4px;
+	-khtml-border-radius: 4px;
+	-o-border-radius: 4px;
+	-ms-border-radius: 4px;
+	-icab-border-radius: 4px;
+	border-radius: 4px;
+}
+
+.monitor_but {
+	width: 448px;
+}
+
+.monitor_but a {
+	margin: 7px;
+	float: left;
+}
+
+.monitor_resp {
+	height: 16px;
+	clear: both;
+	margin: 5px;
+	padding: 5px;
+	background: #eee;
+	width: 601px;
+}
+
+.dialog-form {
+	display: none;
+}
+
+.mon_type {
+	width: 140px;
+}
+
+.testSearch a:hover {
+	text-decoration: underline;
+}
+
+.testSearch a {
+	color: #008000;
+	font-style: italic;
+}
+
+.line {
+	background: none repeat scroll 0 0 #E8EDFF;
+	border: 1px solid #FFF;
+	padding: 4px;
+}
+
+.tooltipFont {
+	color: black;
+	font-size: 12px;
+}
+
+
+#giant_synthese .head {
+	font-weight: bold;
+}
+
+#giant_synthese th {
+	background: none repeat scroll 0 0 #B9C9FE;
+	border: 1px solid #FFFFFF;
+	color: #003399;
+	font-size: 13px;
+	padding: 4px;
+}
+
+#giant_synthese td.right {
+	text-align: right;
+}
+
+#giant_synthese {
+	border-collapse: collapse;
+	clear: both;
+	font-size: 12px;
+	margin: 10px 0px 0;
+	padding: 2px;
+	text-align: left;
+	width: 100%;
+	font-family: arial, sans-serif;
+	font-size: 11px;
+}
+
+#giant_synthese td {
+	background: none repeat scroll 0 0 #E8EDFF;
+	border: 1px solid #FFFFFF;
+	color: #666699;
+	padding: 4px;
+}
+
+#giant_synthese tr:hover td {
+	background: none repeat scroll 0 0 #D0DAFD;
 }

data/pages/themes/default/styles/main.css

@@ -1,4 +1,4 @@
-/*! normalize.css v2.0.1 */
+/*! normalize.css v2.1.2 */
 
 /* ==========================================================================
    HTML5 display definitions
@@ -63,8 +63,8 @@ audio:not([controls]) {
 
 html {
     font-family: sans-serif; /* 1 */
-    -webkit-text-size-adjust: 100%; /* 2 */
     -ms-text-size-adjust: 100%; /* 2 */
+    -webkit-text-size-adjust: 100%; /* 2 */
 }
 
 /**
@@ -101,12 +101,13 @@ a:hover {
    ========================================================================== */
 
 /**
- * Address variable `h1` font size within `section` and `article` contexts in
+ * Address variable `h1` font-size and margin within `section` and `article`
- * Firefox 4+, Safari 5, and Chrome.
+ * contexts in Firefox 4+, Safari 5, and Chrome.
  */
 
 h1 {
     font-size: 2em;
+    margin: 0.67em 0;
 }
 
 /**
@@ -134,6 +135,16 @@ dfn {
     font-style: italic;
 }
 
+/**
+ * Address differences between Firefox and other browsers.
+ */
+
+hr {
+    -moz-box-sizing: content-box;
+    box-sizing: content-box;
+    height: 0;
+}
+
 /**
  * Address styling not present in IE 8/9.
  */
@@ -160,9 +171,7 @@ samp {
  */
 
 pre {
-    white-space: pre;
     white-space: pre-wrap;
-    word-wrap: break-word;
 }
 
 /**
@@ -282,6 +291,18 @@ input {
     line-height: normal;
 }
 
+/**
+ * Address inconsistent `text-transform` inheritance for `button` and `select`.
+ * All other form control elements do not inherit `text-transform` values.
+ * Correct `button` style inheritance in Chrome, Safari 5+, and IE 8+.
+ * Correct `select` style inheritance in Firefox 4+ and Opera.
+ */
+
+button,
+select {
+    text-transform: none;
+}
+
 /**
  * 1. Avoid the WebKit bug in Android 4.0.* where (2) destroys native `audio`
  *    and `video` controls.
@@ -377,22 +398,24 @@ table {
 /* Main
 ----------------------------------*/
 body{font-family: Verdana, Arial, sans-serif;font-size: 11px;text-align: center; /* pour corriger le bug de centrage IE */ }
-#global {width:900px; margin:0 auto; text-align:left;}
+#global {text-align:left;}
 #content {padding:0;margin:0;}
 #center {background-color:#fff;padding:5px 0;}
-div.paragraph {margin:5px;padding:5px;}
 #footer {clear:both;text-align:center;margin-top:15px;}
 #footer p {font:0.9em Arial, Helvetica, sans-serif; }
+#center h1 {clear:both;margin:5px;padding:5px; background:#606060; color:#ffffff;font:600 1.4em Arial, Verdana, Sans-serif; letter-spacing:1px; line-height:1.2em;}
+#center h2 {clear:both; margin:5px; padding:5px; background:#00008c; color:#ffffff; font:bold 1.2em Arial, Verdana, Sans-serif; }
+div.paragraph {margin:5px;padding:5px;}
 .clearfix:after {content: ".";display: block;height: 0;clear: both;visibility: hidden;zoom:1;}
 a:link {color: #9c093a; text-decoration:none;}
 a:visited {color: #0000CC; text-decoration:none;}
 a:hover {color: #000066; text-decoration:none;}
-#center h1 {clear:both;margin:5px;padding:5px; background:#606060; color:#ffffff;font:600 1.4em Arial, Verdana, Sans-serif; line-height:1.2em;}
+.StyleInfoLib {font-family: Arial, Helvetica, sans-serif;font-size:  11px;font-weight: bold;color:#535353; vertical-align:top;}
-#center h2 {clear:both; margin:5px; padding:5px; background:#00008c; color:#ffffff; font:bold 1.2em Arial, Verdana, Sans-serif; }
-.StyleInfoLib {font-family: Arial, Helvetica, sans-serif;font-size:  11px;font-weight: bold;color:#535353;}
 .StyleInfoData {font-family: Arial, Helvetica, sans-serif;font-size: 11px;color:#535353;}
 .StyleInfoDataActif {font-family: Arial, Helvetica, sans-serif;font-size: 11px;}
 table.identite {border-collapse:separate;border-spacing:4px;}
+table.data {width:100%;}
+table.data td {border:1px solid #ccc; padding:5px;}
 .confidentiel {border-top:1px solid; padding-top:5px; font-style:italic; font-size:9px;}
 .ui-dialog {text-align:left;}
 .ui-widget {font-size: 1em;}
@@ -403,6 +426,7 @@ div.ui-state-highlight a {text-decoration: underline;}
 .noborder {border:0;}
 img { vertical-align:middle; }
 
+
 /* Menu
 ----------------------------------*/
 div#menu {display:none;}
@@ -434,7 +458,7 @@ div#menu div.icones {text-align:center;margin-top:5px;}
 #recherche-info{text-align:center;}
 #recherche-page{text-align:center;}
 #recherche-page img{vertical-align:middle;}
-form.recherche{padding:20px 0; text-align:left;}
+form.recherche{padding:0; text-align:left;}
 form.recherche label {clear:both;float:left;width:250px;line-height:20px;font-weight:bold;text-align:right;padding-right:5px;}
 form.recherche div.field {float:left;}
 form.recherche div.row {clear:both;padding:5px 0;}
@@ -490,6 +514,7 @@ a.AncienSiege { background-color: #4D90FE; border: 1px solid #3079ED; color: #FF
 #ratio {clear: both;font-family: "Lucida Sans Unicode","Lucida Grande",Sans-Serif;font-size: 12px;margin: 10px 0 0;text-align: left;width: 100%;}
 #LiasseTable {border-collapse: collapse;color:#606060;margin:5px 0 10px 0;}
 #LiasseTable td {font-size:11px;font-family: arial,sans-serif;border:1px solid silver;padding:2px;}
+#LiasseTable td.amount-value {min-width:70px;}
 #liasseForm th {color:#606060;font-weight:bold;}
 #liasseForm {margin-left:30px;}
 #liasseForm td {color:#606060;}
@@ -518,10 +543,9 @@ ul.tabs li a.active {background-color:#ffffff;color:#282e32;border:1px solid #46
 
 /* Géolocalisation
 ----------------------------------*/
-#infogeo_txt {float:left;width:250px;padding:10px 0;}
+#infogeo_txt {float:left;width:320px;padding:10px 0;}
-#infogeo_photo {float:left;margin:0;padding:0;width:340px;}
+#infogeo_photo {float:left;margin:0;padding:0;width:320px;}
-#legende-photo {display:none;width:278px;margin:5px 0 10px 0;padding:10px;border:1px solid #0000ff;color:#0000ff;}
+#legende-photo {margin:5px 0; padding:10px;border:1px solid #0000ff;color:#0000ff;}
-#pp-cb-thumb {display:none;}
 #pp-cb-thumb div.left {float:left;position:relative;width:256px;height:128px;overflow:hidden;}
 #pp-cb-thumb div.right {float:left;position:relative;width:44px;height:128px;overflow:hidden;}
 #pp-cb-thumb div.left img{position:relative;left:-256px;top:-140px;}
@@ -636,12 +660,11 @@ input[type="checkbox"] { margin:0 5px 0 5px; border:0; }
 .submit {text-align:center;}
 .noborder {border:none;}
 #message {margin:10px 0 10px 30px;}
-table.greffe {width:95%; margin:5px 10px;border-collapse:collapse;}
+table.greffe {width:100%;border-collapse:collapse;}
-table.greffe th {border:1px solid #000000;padding:8px 4px 8px 4px;background-color:#eeeeee;text-align: center; }
+table.greffe th {border:1px solid #000000;padding:8px 4px 8px 4px;background-color:#eeeeee;text-align:center; }
-table.greffe .date { text-align: center; }
+table.greffe td.date {text-align:center;background-color:#2b2b8b;color:white;font-weight:bold;width:90px;}
-table.greffe td.date { background-color:#2b2b8b;color:white;font-weight:bold;}
 table.greffe td { border:1px solid #000000;padding:8px 4px 8px 4px;}
-table.greffe td.decision { width:50%; }
+table.greffe td.decision {}
 table.greffe td.type {text-align:center;}
 
 /* Kbis

data/pages/themes/default/styles/user.css

@@ -1,4 +1,4 @@
-#dialog { display:none; }
+#dialog-password { display:none; }
 #utilisateur { width:100%; border-collapse:collapse; margin:0;}
 #utilisateur tr.titre td { background-color: #D9EEF1; font-weight:bold; }
 #utilisateur tr.border td { border:1px dashed #939393; padding:5px; margin:0;}

library/Evaluation/DomDocument2.lib.php

@@ -1,12 +0,0 @@
-<?php 
-class DomDocument2 extends DOMDocument {
-
-	function getValueFromTag($tagName) {
-		$items = $this->getElementsByTagName($tagName);
-		foreach ($items as $item) {
-    		return $item->nodeValue;
-		}
-	}
-
-}
-?>

library/Finance/Finance.lib.php

@@ -1,242 +0,0 @@
-<?php
-require_once 'common/dates.php';
-require_once 'Finance/OtherFunctions.lib.php';
-require_once 'Finance/RatiosGraph.lib.php';
-require_once 'Scores/WsScores.php';
-
-
-Class FinanceLib
-{
-    private $dateFunction;
-    private $siret;
-    private $idSC;
-    private $graphique;
-    
-    public function __construct($siret, $idSC) {
-        $this->dateFunction = new WDate();
-        $c = Zend_Registry::get('config');
-        $this->graphique = new Graphique($c->profil->path->pages . '/imgcache/');
-        $this->siret = $siret;
-        $this->idSC = $idSC;
-    }
-    
-    /**
-     */
-    public function getRatiosValeur($date, $id, $type, $ratios)
-    {
-        $ratio = self::getRatios($ratios, 'entreprise');
-        foreach($ratio[$date][$type] as $element) {
-            if ($element->id == $id)
-                return ($element->val);
-        }
-    }
-    
-    public function getRatios($ratios, $RatioType)
-    {
-        $retour = array();
-
-        foreach($ratios->BilansInfos->item as $item) {
-            if ($RatioType == 'entreprise') {
-               $retour[$item->dateCloture][$item->typeBilan] = $item->RatiosEntrep->item;
-            } else if($RatioType == 'secteur') {
-               echo "";
-            }
-        }
-        return ($retour);
-    }
-    
-    public function rsynthese($synthese, $idsReference, &$tabAnnee, &$final)
-    {
-        $OtherFunction = new OtherFunction();
-        
-        foreach ($synthese->BilansInfos->item as $item) {
-                $annee = substr($item->dateCloture, 0, 4);
-                if( $annee >= substr($synthese->BilansInfos->item[0]->dateCloture, 0, 4)-2) {
-                    $tabAnnee[$this->dateFunction->dateT('Ymd', 'd/m/Y', $item->dateCloture)] = $item->duree;
-                    foreach ($item->RatiosEntrep->item as $RatiosEntrep) {
-                        foreach($idsReference as $id => $elements) {
-                            if ($RatiosEntrep->id == $id) {
-                               $final[$id.':'.$elements['titre']][$item->dateCloture] =
-                                   array('Valeur' => $RatiosEntrep->val/1000,
-                                         'percent' => $OtherFunction->getReference($RatiosEntrep->val, $elements['total'], $annee, $synthese), 'id' => $id);
-                               ksort($final[$id.':'.$elements['titre']]);
-                            }
-                        }
-                    }
-                }
-            }
-            ksort($tabAnnee);
-    }
-    
-    public function synthese($synthese, $bilanReference, $typeBilan, $RatiosGraph)
-    {
-        $OtherFunction = new OtherFunction();
-        $RatiosGraph   = new RatiosGraph($this->siret, $this->idSC);
-        
-        foreach ($synthese->BilansInfos->item as $item) {
-	        if ($item->typeBilan == $typeBilan) {
-                foreach ($item->RatiosEntrep->item as $RatiosEntrep) {
-                    foreach ($bilanReference as $id => $params) {
-                        if ($RatiosEntrep->id == $id) {
-                            $bilan[$id]['name'] = $params['name'];
-                            $bilan[$id]['unite'] = $params['unite'];
-                            $bilan[$id]['commentaires'] = $params['commentaires'];
-                            if (count($bilan[$id]['item']) <= 2) {
-                                if (is_numeric($RatiosEntrep->val))
-                                    $valeur = number_format(($RatiosEntrep->val / $params['operateur']), 0, '', ' ');
-                                $bilan[$id]['item'][$item->dateCloture]['ValEntrep'] = $valeur;}
-                                $this->graphique->GraphiqueLineXY($RatiosGraph->GraphiqueSyntheseLine($id, $synthese,
-                                    $item->typeBilan, $OtherFunction->maskNameImg('synthese', $this->siret, array($id,$item->typeBilan))), true); } } }
-                foreach ($item->RatiosEntrepEvol->item as $RatiosEntrepEvol) {
-                    foreach ($bilanReference as $id => $params) {
-                        if ($RatiosEntrepEvol->id == $params['evolution']) {
-                            if (array_key_exists($item->dateCloture, $bilan[$id]['item'])) {
-                                $bilan[$id]['item'][$item->dateCloture]['duree'] = $item->duree;
-                                $bilan[$id]['item'][$item->dateCloture]['ValEntrepEvol'] = $RatiosEntrepEvol->val; } } } }
-	        }
-    	}
-    	foreach ($bilan as $id => $val)
-            ksort($bilan[$id]['item']);
-        return ($bilan);
-    }
-    
-    public function constructElementForBilan($bilan, $tableauDeReference, &$type, &$date, &$duree, $typebilan)
-	{
-    	foreach($bilan->BilansInfos->item as $element) {
-    	    if($element->typeBilan == $typebilan)
-    	    {
-        	    if($duree == EOF)
-        	        $duree = $element->duree;
-        	    if (@count($date) < 5) {
-        	        if(!in_array($element->dateCloture, $date))
-        	            $date[] = $element->dateCloture;
-        	    }
-                foreach($element->RatiosEntrep->item as $item) {
-                    foreach($tableauDeReference as $id => $valeur) {
-        	             if ($item->id == $id) {
-                             if (count($type[$id]['item']) < 5) {
-                                 if ($item->val > 0) {
-                                     $type[$id]['item'][$element->dateCloture] = $item->val / 1000;
-                                 }
-                                 else
-                                     $type[$id]['item'][$element->dateCloture] = 'NS';
-                             }
-        	             }
-                    }
-                }
-    	    }
-    	}
-	    foreach ($type as $id => $valeur) {
-	        $type[$id]['item'] = array_reverse($valeur['item']);
-	    }
-    	$date = array_reverse($date);
-	}
-	
-    public function specialSIG($id, $element, $partial, $count)
-    {
-        $OtherFunction = new OtherFunction();
-        
-        if($element != 'NS') {
-            if ($id == 'r101')
-                return $OtherFunction->Tb($element, $element) - $OtherFunction->Tb($partial['r122']['item'][$count], $partial['r101']['item'][$count]);
-            else if ($id == 'r122')
-                return $OtherFunction->Tb($element, $partial['r101']['item'][$count]) - $OtherFunction->Tb($partial['r130']['item'][$count], $partial['r101']['item'][$count]);
-            else if ($id == 'r130')
-                return $OtherFunction->Tb($element, $partial['r101']['item'][$count]) - $OtherFunction->Tb($partial['r140']['item'][$count], $partial['r101']['item'][$count]);
-            else if ($id == 'r140')
-                return $OtherFunction->Tb($element, $partial['r101']['item'][$count]) - $OtherFunction->Tb($partial['r150']['item'][$count], $partial['r101']['item'][$count]);
-            else if ($id == 'r150')
-                return $OtherFunction->Tb($element, $partial['r101']['item'][$count]) - $OtherFunction->Tb($partial['r170']['item'][$count], $partial['r101']['item'][$count]);
-            else if ($id == 'r170')
-                return $OtherFunction->Tb($element, $partial['r101']['item'][$count]) - $OtherFunction->Tb($partial['r199']['item'][$count], $partial['r101']['item'][$count]);
-            else if ($id == 'r199')
-                return $OtherFunction->Tb($element, $partial['r101']['item'][$count]);
-        } else
-            return (null);
-    }
-    
-    public function LineBilan(&$tableauBilanGraphique, $helper, $id, $Graphdate, $partial, $reference, $name, $url, $siren, $sig = false)
-    {
-        $i            = 0;
-        $this->column = 0;
-        $GraphLine    = array();
-        $OtherFunction   = new OtherFunction();
-        $RatiosGraph   = new RatiosGraph($this->siret, $this->idSC);
-
-        /** Ont enregistre les données (premié temps) **/
-        foreach($partial[$id]['item'] as $element) {
-            if($element != 'NS'){ $GraphLine[] = $number = $element; }else{$number = 0; $GraphLine[] = 0;};
-            if($sig) {
-			    $result = self::specialSIG($id, $element, $partial, $i);
-		        if(is_numeric($result))
-		            $gr[] = ($result < 0)?0:$result;
-			}
-			else
-			    if($OtherFunction->createlementForGraphique($id))$gr[] = $number;
-        }
-        ($gr != 0)?$tableauBilanGraphique = $gr:$tableauBilanGraphique = false;
-
-        /** Ont affiche les données (deuxiéme temps) **/
-        $html .= '<tr '.(($OtherFunction->ifIsHead($id))?'class="subhead"':'class="bilanDatas"').'>';
-    		$html .= '<td>'.$name.'</td>';
-    		foreach($partial[$id]['item'] as $element) {
-    			$html .= '<td align="right">' . (($element != 'NS') ? number_format($element, 0, '', ' ') . ' K€':$element).'</td>';
-    		}
-            $html .= '<td align="right">'.$OtherFunction->Tb(end($partial[$id]['item']), end($partial[$reference]['item'])).'</td>';
-    	    $image = $RatiosGraph->GraphiqueLineBilan($GraphLine, $RatiosGraph->maskNameImg('bilan', $this->siret, array($id)), $Graphdate);
-    	    $html .= '<td>';
-    	    $datas = implode('|', $GraphLine);
-    	    $dates = implode('|', $Graphdate);
-    			$html .= '<a name="Actif Immobilisé Net" class="rTip" rel="'.$url.'" href="'.$helper->url(
-    																					   'onelinebilan','finance', null,
-    			                                                                           array('data'=> $datas,
-    			                                                                           		 'name' => urlencode($name),
-    			                                                                                 'dates' => $dates,
-    			                                                                                 'image' => $image,
-    			                                                                                 'siret' => $this->siret,
-    			                                                                                 'id' => $this->idSC)).'">
-                    		 <img src="/themes/default/images/finance/char_bar.png" />
-        				 </a>';
-    	    $html .= '</td>';
-	    $html .= '</tr>';
-	    return ($html);
-    }
-    
-    public function compareValeur($valeurEnt, $valeurSec, $compare, $valeur = false)
-	{
-	    $ecart = 1/100;
-	    
-	    if( $valeurSec=='NS' || $valeurEnt == 'NS' || $valeurSec==NULL || $valeurEnt==NULL) {
-	        return ('-');
-	    } else if ($compare == '>') {
-	        if (($valeurEnt + $ecart) > $valeurSec) {
-	           if($valeur)
-	               $return = 'bon';
-	           else $return = '<img src="/themes/default/images/finance/ratios_bon.png" />';
-	        } elseif(($valeurSec - ($valeurSec * $ecart)) < $valeurEnt && ($valeurSec + ($valeurSec * $ecart)) > $valeurEnt) {
-	            if($valeur)
-	               $return = 'neutre';
-	            else $return = '-';
-	        } else {
-	            if($valeur)
-	               $return = 'mauvais';
-	           else $return = '<img src="/themes/default/images/finance/ratios_mauvais.png" />';
-	        }
-	    } else if ($compare == '<') {
-	        if ($valeurEnt < $valeurSec) {
-	            if($valeur)
-	               $return = 'bon';
-	           else $return = '<img src="/themes/default/images/finance/ratios_bon.png" />';
-	        } elseif( ($valeurSec - ($valeurSec * $ecart)) < $valeurEnt && ($valeurSec + ($valeurSec * $ecart)) > $valeurEnt) {
-	            if($valeur)
-	               $return = 'neutre';
-	            else $return = '-';
-	        } else {
-	            if($valeur)
-	               $return = 'mauvais';
-	           else $return = '<img src="/themes/default/images/finance/ratios_mauvais.png" />';
-	        }
-	    }
-	    return ($return);
-	}
-}

library/Finance/LiasseList.php

@@ -1,12 +0,0 @@
-<?php
-class LiasseList
-{
-	
-	public function __construct()
-	{
-				
-	}
-
-	
-	
-}

library/Finance/OtherFunctions.lib.php

@@ -1,236 +0,0 @@
-<?php
-class OtherFunction
-{  
-    public function maskNameImg($action, $siret, $others = EOF)
-    {
-        $name = $action.'-'.$siret;
-        if($others != EOF) {
-            foreach($others as $other) {
-                $name .= '-'.$other;
-            }
-        }
-        $name .= '.png';
-        return ($name);
-    }
-    
-    public function array_key_existValeur($array, $key, $valeur)
-    {
-        foreach ($array as $arrayValeur) {
-            foreach($arrayValeur as $arrayKey => $val) {
-                if($arrayKey == $key)
-                    if($val == $valeur)
-                        return (true);
-            }
-        }
-        return (false);
-    }
-    
-    public function getReference($valeur, $reference, $annee, $synthese)
-    {
-        foreach ($synthese->BilansInfos->item as $item) {
-            if(substr($item->dateCloture, 0, 4) == $annee) {
-                foreach ($item->RatiosEntrep->item as $RatiosEntrep) {
-                    if ($RatiosEntrep->id == $reference) {
-                        return (round(($valeur/$RatiosEntrep->val)*100,2));
-                    }
-                }
-            }
-        }
-    }
-    
-    public function setSyntheseReference()
-    {
-        $bilanReference = array('r5'   => array('evolution' => 'r6'  , 'unite' => 'EUR',   'operateur' => 1000, 'name' => 'CHIFFRE D\'AFFAIRES',
-    	                            'commentaires' => 'Montant total des ventes hors taxe tant sur le territoire français que hors de France.'),
-    	    						'r7'   => array('evolution' => 'r8'  , 'unite' => 'EUR',   'operateur' => 1000, 'name' => 'RESULTAT COURANT AVANT IMPOTS',
-    	                            'commentaires' =>  'Bénéfice ou perte constaté avant affectation des produits ou charges exceptionnelles, déduction des impôts et participation au bénéfice. Il est égal aux :
-                                                        produits d\'exploitation (notamment les sommes reçues qui relèvent de l\'activité de l\'entreprise, soit les ventes de biens, prestations de services etc..)
-                                                        + quotes-parts de résultats sur opérations faites en commun(par exemple, résultat des opérations faites par l\'intermédiaire d\'une société en participation)
-                                                        + produits financiers (intérêts courus, gains de change, revenus tirés des comptes en banque)
-                                                        - charges d\'exploitation
-                                                        - quotes-parts de charges sur opérations en commun
-                                                        - charges financières.)'),
-    	                            'r10'  => array('evolution' => 'r11' , 'unite' => 'EUR',   'operateur' => 1000, 'name' => 'RESULTAT NET',
-    	                            'commentaires' => 'Le résultat net comptable correspond au bénéfice ou perte de la période, mesuré par la différence entre les produits et les charges (au sens comptable) de l\'exercice. Il s\'agit du résultat courant, corrigé du résultat exceptionnel, déduction faite de l\'impôt sur le résultat et de l\'éventuelle participation des salariés. Il mesure les ressources nettes restant à l\'entreprise à l\'issue de l\'exercice.'),
-    	                            'r18'  => array('evolution' => 'r19' , 'unite' => 'EUR',   'operateur' => 1000, 'name' => 'FONDS PROPRES',
-    	                            'commentaires' => 'La situation nette ou Fonds propres ou bien encore, capitaux propres représentent l\'argent apporté par les actionnaires à la constitution de la société ou ultérieurement, ou laissés à la disposition de la société en tant que bénéfices non distribués sous forme de dividendes. Ils courent le risque total de l\'entreprise : si celle-ci va mal, ils ne seront pas rémunérés (aucun dividende ne sera versé) ; si elle dépose son bilan, les porteurs de capitaux propres ne seront remboursés qu\'après que les créanciers l\'aient été intégralement. Si elle va très bien au contraire, tous les profits leur reviennent.'),
-    	                            'r22'  => array('evolution' => 'r23' , 'unite' => 'EUR',   'operateur' => 1000, 'name' => 'TOTAL BILAN',
-    	                            'commentaires' => 'Le total du bilan est la somme de tous les actifs ainsi que des passifs, il caractérise la taille de l\'entreprise.
-                                                        Selon le décret n° 2008-1354 du 18 décembre 2008, les critères désormais retenus pour les besoins de l\'analyse statistique et économique sont les suivants :
-                                                        La catégorie des micro entreprises est constituée des entreprises qui :
-                                                            * d\'une part occupent moins de 10 personnes ;
-                                                            * d\'autre part ont un chiffre d\'affaires annuel ou un total de bilan n\'excédant pas 2 millions d\'euros.
-                                                        La catégorie des petites et moyennes entreprises (PME) est constituée des entreprises qui :
-                                                            * d\'une part occupent moins de 250 personnes ;
-                                                            * d\'autre part ont un chiffre d\'affaires annuel n\'excédant pas 50 millions d\'euros ou un total de bilan n\'excédant pas 43 millions d\'euros.
-                                                        La catégorie des entreprises de taille intermédiaire (ETI) est constituée des entreprises qui n\'appartiennent pas à la catégorie des petites et moyennes entreprises, et qui :
-                                                            * d\'une part occupent moins de 5 000 personnes ;
-                                                            * d\'autre part ont un chiffre d\'affaires annuel n\'excédant pas 1 500 millions d\'euros ou un total de bilan n\'excédant pas 2 000 millions d\'euros.
-                                                        La catégorie des grandes entreprises (GE) est constituée des entreprises qui ne sont pas classées dans les catégories précédentes.'),
-    	                            'r231' => array('evolution' => 'r235', 'unite' => 'EUR',   'operateur' => 1000, 'name' => 'FONDS DE ROULEMENT',
-    	                            'commentaires' => 'Le fonds de roulement représente la différence entre l\'actif à court terme et le passif à court terme (dont l\'échéance est de moins de douze mois). Un fonds de roulement positif indique qu\'une entreprise a suffisamment d\'actifs liquides pour régler ses dettes et engagements à court terme (12 mois). Dans certains cas particuliers, le FDR peut être négatif et l\'entreprise viable : GSA ou autre Hypermarchés par exemple. Cette situation devenant risquée en cas de baisse du CA.'),
-    	                            'r232' => array('evolution' => 'r236', 'unite' => 'EUR',   'operateur' => 1000, 'name' => 'BESOIN EN FONDS DE ROULEMENT',
-    	                            'commentaires' => 'Pour les comptables, le BFR correspond aux actifs d\'exploitation (hors immobilisations et actifs financiers) diminués du montant des dettes d\'exploitation (cad  aux fonds indéfiniment mobilisés). Ainsi, une entreprise dont le BFR s\'élève à 15 % de son chiffre d\'affaires requiert un besoin permanent de trésorerie représentant 15 % de son activité uniquement pour assurer la pérennité de son cycle d\'exploitation. Plus le niveau de BFR est faible (ou bien plus sa rotation est forte), plus le dégagement de liquidités est important dès lors que les marges sont positives.'),
-    	                            'r249' => array('evolution' => 'r254', 'unite' => 'EUR',   'operateur' => 1000, 'name' => 'TRESORERIE',
-    	                            'commentaires' => 'Trésorerie nette (FR-BFR)'),
-    	                            'r24'  => array('evolution' => 'r24' , 'unite' => 'Pers.', 'operateur' => 1,    'name' => 'EFFECTIF',
-    	                            'commentaires' =>  'La définition exacte de l\'effectif peut varier selon les sources :
-                                                        DADS : effectif salarié instantané au 30 juin ;
-                                                        SIRENE : effectif salarié au 31 décembre n (ou au 1er janvier n+1) ; cet effectif fait l\'objet d\'une mise à jour « de masse » au premier semestre à partir des données DADS, l\'effectif d\'une entreprise est alors la somme des effectifs de ses établissements au 31 décembre;
-                                                        SUSE-FICUS : moyenne annuelle de l\'effectif salarié.
-                                                        Dans un bilan c\'est la moyenne de l\'effectif de l\'exercice.')
-    	    );
-    	    return ($bilanReference);
-    }
-    
-    public function referenceBilan($reference)
-	{
-	    switch ($reference)
-	    {
-	        case 'actif':
-    	       $reference  = array('r59' => 'Actif Immobilisé Net','r51' => 'Incorporelles',
-        	                             'r52' => 'Corporelles', 'r53' => 'Financières',
-        	                             'r69' => 'Actif Circulant Net', 'r60' => 'Stock et encours',
-        	                             'r61' => 'Créances Clients', 'r62' => 'Autres Créances',
-                          		  	     'r63' => 'Trésorerie Active', 'r22' => 'TOTAL ACTIF'
-                );
-            break;
-	        case 'passif':
-        	    $reference = array('r79' => 'Ressources Propres', 	 'r70' => 'Fonds Propres',
-                                         'r71' => 'Provisions Risques',  'r72' => 'Comptes Courants',
-                                         'r90' => 'Ressources Externes', 'r83' => 'Dettes Financières',
-                                         'r84' => 'Dettes Fournisseurs', 'r85' => 'Dettes Fiscales',
-                                         'r86' => 'Autres Dettes', 	  	 'r87' => 'Trésorerie Passive',
-                                         'r22' => 'TOTAL PASSIF'
-        	    );
-        	break;
-	        case 'sig':
-        	    $reference    = array('r101' => 'CHIFFRE D\'AFFAIRES HORS TAXE', 	 					  'r102' => '-Achat de marchandises, de matières premières',
-        	    						 'r110' => 'MARGE COMMERCIALE', 				 					  'r111' => '+Production vendue',
-                                         'r112' => '+Production immobilisée et stockée',
-                                         'r120' => 'PRODUCTION DE L\'EXERCICE',
-                                         'r121' => 'Variation de stock de marchandises et matières premières',
-                                         'r122' => 'MARGE BRUTE',
-                                         'r123' => '-Autres charges externes',
-                                         'r130' => 'VALEUR AJOUTÉE', 										  'r132' => 'Charges de personnel',
-        								 'r133' => '-Impôts, taxes & versements assimilés',					  'r131' => '+Subventions d\'exploitation',
-                                         'r140' => 'EXCÉDENT BRUT D\'EXPLOITATION (EBE)', 					  'r141' => '+Autres produits d\'exploitation',
-                                         'r142' => '-Autres charges d\'exploitation', 						  'r143' => '+Reprise sur dotations & transferts de charges',
-                                         'r144' => '+70% Loyer de crédit bail', 							  'r145' => '-Dotations d\'exploitation & provisions d\'exploitation',
-                                         'r150' => 'RÉSULTAT D\'EXPLOITATION', 								  'r151' => '+Produits financiers',
-                                         'r152' => '+30% Loyer de crédit bail', 							  'r153' => '+Charges financières',
-                                         'r170' => 'RÉSULTAT COURANT AVANT IMPOTS', 						  'r171' => '+Produits exceptionnels',
-                                         'r172' => '-Charges exceptionnelles', 								  'r181' => '-Impôts sur les bénéfices',
-                                         'r182' => '-Participation salariale',
-                                         'r199' => 'RÉSULTAT NET'
-        	    );
-        	break;
-	    }
-	    return ($reference);
-	}
-	
-    /*public function formatElementForGraphiqueBilan($bilan)
-	{
-	    $tb = array();
-	    
-	    foreach ($bilan as $id => $item) {
-	        foreach($bilan[$id]['item'] as $element) {
-	            $tb[] = round($element*100/$bilan[$id]['item'][key($bilan['r22']['item'])],2);
-	        }
-	    }
-	    return ($tb);
-	}*/
-	
-    public function Tb($element, $reference)
-    {
-        if($element != 'NS') {
-            if ($element != 0 and $reference != 0) {
-                return (round(($element * 100) / $reference, 2));
-            } else {
-                return($element);
-            }
-        }
-        return (false);
-    }
-    
-    public function ifIsHead($id)
-    {
-        $head = array('r59', 'r69', 'r22','r79', 'r90', 'r101',
-        			  'r110', 'r120', 'r122', 'r130', 'r140',
-        			  'r150', 'r170', 'r199'
-        );
-        
-        if (in_array($id, $head))
-            return (true);
-        return (false);
-    }
-    
-    public function createlementForGraphique($id)
-    {
-        $element = array('r51', 'r52', 'r53', 'r60', 'r61', 'r62', 'r63',
-                         'r70', 'r71', 'r72', 'r83', 'r84', 'r85', 'r86', 'r87',
-                         '');
-        
-        if (in_array($id, $element))
-            return (true);
-        return (false);
-    }
-    
-    public function formatElementGraphiquebilan($tb)
-    {
-        $valeur = array();
-        $case   = 0;
-        
-        for ($i =0; $i < count($tb); $i++) {
-            foreach ($tb as $tableau) {
-                while($case < count($tableau)) {
-                    $valeur[$i][] = $tableau[$case];
-                    break;
-                }
-            }
-            $case++;
-        }
-        return ($valeur);
-    }
-    
-    public function parseUnite($unite, $valeur)
-	{
-	    switch ($unite)
-	    {
-	        case 'EUR':
-	            return (number_format((round($valeur)/1000), 0, '', ' '));
-	        case '%' :
-	        	return (round($valeur));
-	        case 'Jours':
-	            return ($valeur);
-	        default:
-	            return ($valeur);
-	    }
-	}
-	
-    public function getSwitchFormRatios($ratio, $type, $date = false)
-	{
-	    $change = false;
-	    
-	    if(!$date) {
-    	    foreach($ratio->BilansInfos->item as $valeur) {
-        	        if ($valeur->typeBilan == $type)
-        	            return ($valeur);
-    	    }
-	    } else {
-	        foreach($ratio->BilansInfos->item as $valeur) {
-    	        if ($valeur->typeBilan == $type and $valeur->dateCloture == $date)
-    	            return ($valeur);
-    	        else
-    	            $change = true;
-	        }
-	    }
-	    if($change) {
-	        foreach($ratio->BilansInfos->item as $valeur) {
-        	        if ($valeur->typeBilan == $type)
-        	            return ($valeur);
-    	    }
-	    }
-	}
-        
-}

library/Finance/RatiosGraph.lib.php

@@ -1,313 +0,0 @@
-<?php
-require_once 'Vendors/ChartDirector/phpchartdir.php';
-require_once 'Vendors/ChartDirector/FinanceChart.php';
-
-Class RatiosGraph
-{
-    private $siret;
-    private $SCid;
-    private $graphique;
-    private $imageCachePath;
-    
-    public function __construct($siret, $SCid)
-    {
-        $this->siret = $siret;
-        $this->SCid = $SCid;
-        $c = Zend_Registry::get('config');
-        $this->imageCachePath = $c->profil->path->pages . '/imgcache/';
-        $this->graphique = new Graphique($this->imageCachePath);
-    }
-    
-    public function maskNameImg($action, $siret, $others = EOF)
-    {
-
-        $name = $action.'-'.$siret;
-        if($others != EOF) {
-            foreach($others as $other) {
-                $name .= '-'.$other;
-            }
-        }
-        $name .= '.png';
-        return ($name);
-    }
-    
-    public function getValFromKey($stdClass, $key)
-	{
-	    foreach($stdClass as $element) {
-	        if ($element->id == $key)
-	            return ($element->val/1000);
-	    }
-	}
-	
-    public function trieType($data, $idType)
-	{
-	    $type = array();
-	    
-	    foreach($data as $item)
-	    {
-	        if($item->typeBilan == 'N')
-	           $type['N'][] = $item;
-	        else if($item->typeBilan == 'C')
-	            $type['C'][] = $item;
-	    }
-	    return ($type[$idType]);
-	}
-	
-    public function createAbscisseSynthese($synthese, $id, &$labelX, $type)
-	{
-	    $dataX1 = array();
-	    
-        foreach ($synthese->BilansInfos->item as $item) {
-            if ($item->typeBilan == $type) {
-                $labelX[] = substr($item->dateCloture, 0, 4);
-                foreach ($item->RatiosEntrep->item as $RatiosEntrep) {
-                    if ($RatiosEntrep->id == $id) {
-                        if (is_numeric($RatiosEntrep->val))
-                            $dataX1[] = ($RatiosEntrep->val / 1000);
-                    }
-                }
-            }
-        }
-        $labelX = array_reverse($labelX);
-        $dataX1 = array_reverse($dataX1);
-        return ($dataX1);
-	}
-	
-    public function GraphiqueSyntheseLine($id, $synthese, $type, $name)
-	{
-	    $labelX                = array();
-	    $parametres            = new stdClass();
-	    $parametres->nom       = $name;
-	    $parametres->datas     = array(self::createAbscisseSynthese($synthese,$id, $labelX, $type));
-	    $parametres->TitlesY   = array(array("Keuros"));
-	    $parametres->TitlesX   = array(array("Années"));
-	    $parametres->LineLayer = array("Entreprise");
-	    $parametres->labelsY   = array();
-	    $parametres->labelsX   = $labelX;
-	    
-	    return ($parametres);
-	}
-	
-    public function GraphiqueSyntheseAnalyse($data, $type, $siret)
-	{
-	    
-	    //Définition des valeurs pour le graph
-		$dataBFR     = array();
-		$dataFR      = array();
-		$dataCA      = array();
-		$BFR         = array();
-		$i           = 0;
-		$nbAnnees    = 0;
-	    $data        = self::trieType($data, $type);
-	        
-	    //Tri des données par date et par ordre croissant
-		foreach ($data as $key => $row) { $date[$key]  = $row->dateCloture; }
-		    array_multisort($date, SORT_ASC, $data);
-        if(count($data)>5)
-		    $data        = array_slice($data, count($data)-5, null, true);
-		
-		//Parcourir les années
-		foreach($data as $item) {
-			$anneeFin = substr($item->dateCloture,0,4);
-			$moisFin  = substr($item->dateCloture,4,2);
-			$jourFin  = substr($item->dateCloture,6,2);
-			//Calcul de la date de début
-			$dateDebut  = date("Ymd", mktime(0, 0, 0, $moisFin-$item->duree, $jourFin, $anneeFin));
-			$anneeDebut = substr($dateDebut,0,4);
-			$moisDebut  = substr($dateDebut,4,2);
-			$jourDebut  = substr($dateDebut,6,2);
-			//Affectation des abscisses
-			$dataBFR['x'][$i]   = $dataFR['x'][$i] = $dataCA['x'][$i] = $dataEBE['x'][$i] = chartTime((int)$anneeDebut, (int)$moisDebut, (int)$jourDebut);
-			$dataBFR['x'][$i+1] = $dataFR['x'][$i+1] = $dataCA['x'][$i+1] = $dataEBE['x'][$i+1] = chartTime((int)$anneeFin, (int)$moisFin, (int)$jourFin);
-			//Affectation des ordonnées
-			$dataBFR['y'][$i] = $dataBFR['y'][$i+1] = self::getValFromKey($item->RatiosEntrep->item, 'r236');
-			$dataFR['y'][$i]  = $dataFR['y'][$i+1] = self::getValFromKey($item->RatiosEntrep->item, 'r235');
-			$dataCA['y'][$i]  = $dataCA['y'][$i+1] = self::getValFromKey($item->RatiosEntrep->item, 'r6');
-			$dataEBE['y'][$i] = $dataEBE['y'][$i+1] = self::getValFromKey($item->RatiosEntrep->item, 'r146');
-    		$i+=2;
-		}
-		
-		$parametres                    = new stdClass();
-		$parametres->nom               = self::maskNameImg('synthese', $this->siret, array('graphiqueSynthses', $type));
-		$parametres->width             = 660;
-		$parametres->height            = 350;
-		$parametres->bgColor           = 0xcccccc;
-		$parametres->edgeColor         = 0x000000;
-		$parametres->raisedEffect      = 1;
-		$parametres->addTitle          = array("Synthèse *", "timesbi.ttf", 15, 0x000000);
-		$parametres->addText           = array(array(60, 320, "* Elements financier rapportés à 12 mois"));
-		$parametres->setPlotArea       = array(100, 80, 500, 200, 0xffffff, -1, -1, 0xcccccc, 0xcccccc);
-		$parametres->TitlesY           = array(array("KEUROS","timesbi.ttf", 10));
-		$parametres->TitlesX           = array(array("<*block,valign=absmiddle*>Années<*/*>"));
-		$parametres->yAxisWidth        = 2;
-		$parametres->xAxisWidth        = 2;
-		$parametres->legendeParams     = array(55, 30, false, "times.ttf", 9);
-		$parametres->addStepLineLayer  = array('layer1' => array($dataFR['y'], 0x0000ff, "FONDS DE ROULEMENT", $dataFR['x']),
-		                                       'layer0'  => array($dataBFR['y'], 0xff0000, "BESOIN EN FONDS DE ROULEMENT", $dataBFR['x']),
-		                                       'layer2'  => array($dataCA['y'], 0x00ff00, "CHIFFRE D'AFFAIRES", $dataCA['x']),
-		                    				   'layer3'  => array($dataEBE['y'], 0x000000, "EXCEDENT BRUT D'EXPLOITATION", $dataEBE['x'])
-		);
-		$parametres->dashLineColor     = 'layer3';
-		$parametres->addInterLineLayer = array('layer0:layer1' => array(0xff0000, Transparent),
-		                                 	   'layer0:layer1' => array(Transparent, 0x8044ff44)
-		);
-		return ($parametres);
-	}
-	
-    public function selectTitleGraphique($type)
-	{
-	    switch($type) {
-	        case 'actif' :
-	            return ('Composition de l\'actif au : ');
-	        case 'passif':
-	            return ('Composition du passif au : ');
-	        case 'sig'   :
-	            return ('Sole Intermédiaire de Gestion au : ');
-	    }
-	}
-	
-    public function GraphiqueBilan($type, $data, $i, $filename, $date, $count, $labels)
-    {
-        $parametres               = new stdClass();
-        $parametres->nom          = self::maskNameImg('bilan', $this->siret, array($i, 'graph', $type));
-        $parametres->title->texte = self::selectTitleGraphique($type).' '.$date;
-        $parametres->datas        = $data;
-        $parametres->labels       = $labels;
-        $parametres->makeSession  = 'chart_'.$type.$i;
-        $retour                   = $this->graphique->GraphiquePieChart($parametres, true);
-        
-        $parametres->retour->file = $parametres->nom;
-        $parametres->retour->chartID = $retour->chartId;
-        $parametres->retour->imageMap = $retour->imageMap;
-        $parametres->retour->i = $type.$i;
-        $parametres->retour->hide = $i;
-        ($i == $count)?$parametres->retour->hide = false : $parametres->retour->hide = true;
-        return ($parametres->retour);
-    }
-    
-    public function GraphiqueLineBilan($data, $name, $date)
-    {
-        $parametres            = new stdClass();
-	    $parametres->nom       = $name;
-	    $parametres->datas     = array($data);
-	    $parametres->TitlesY   = array(array("Keuros"));
-	    $parametres->TitlesX   = array(array("Années"));
-	    $parametres->LineLayer = array("Entreprise");
-	    $parametres->labelsY   = array();
-	    $parametres->labelsX   = $date;
-	    
-	    $this->graphique->GraphiqueLineXY($parametres, true);
-	    return($parametres->nom);
-    }
-    
-    public function initTableau($tableau)
-	{
-	    $i = 0;
-	    
-	    foreach($tableau as $date => $valeur){
-	        $tableau[$i] = $valeur;
-	        unset($tableau[$date]);
-	        $i++;
-	    }
-	    return ($tableau);
-	}
-    
-    public function countTypeBilan($ratios, $typeBilan)
-	{
-	    $type = 0;
-
-        foreach($ratios->BilansInfos->item as $item) {
-    	        if($item->typeBilan == $typeBilan)
-    	            $type++;
-        }
-	    return ($type);
-	}
-    
-    protected function setUnite($valeur, $unite)
-	{
-	    switch ($unite) {
-	        case 'EUR':
-	            return ($valeur = $valeur / 1000);
-	    default:
-	            return ($valeur);
-	    }
-	}
-	
-    public function createAbscisse($type, $unite, $ratio, $id, $typeBilan = 'N', &$labelX = null, $nbResult = 5)
-	{
-	    $i = 0;
-	    
-	    $dataX = array();
-	    if ($type == 'RatiosEntrep') {
-    	    foreach ($ratio->BilansInfos->item as $element) {
-    	        if($element->typeBilan == $typeBilan) {
-        	        if ($i >= self::countTypeBilan($ratio, $typeBilan))
-        	            break;
-        	        if (is_array($labelX))
-        	            $labelX[] = substr($element->dateCloture, 0, 4);
-                    foreach ($element->RatiosEntrep->item as $ratioEntre) {
-                        if ($ratioEntre->id == $id) {
-                            $dataX[substr($element->dateCloture, 0, 4)] = self::setUnite($ratioEntre->val, $unite);$i++;} } } } }
-	    if ($type == 'RatiosSecteur') {
-	        foreach ($ratio->RatiosSecteur->item as $element) {
-	            if($i >= self::countTypeBilan($ratio, $typeBilan))
-	                break;
-	            foreach($element->liste->item as $item) {
-	                if ($item->id == $id) {
-	                    $dataX[$element->annee] = self::setUnite($item->val, $unite);$i++; } } } }
-	    if (is_array($labelX)) sort($labelX);
-	    ksort($dataX);
-	    $dataX = self::initTableau($dataX);
-	    return ($dataX);
-	}
-    
-    public function createGraphique($ratio, $id, $unite, $type)
-	{
-	    $Annees                               = array();
-	    $parametres                           = new stdClass();
-	    $parametres->nom                      = self::maskNameImg('ratios', substr($this->siret, 0, 9), array($id,$type));
-	    $parametres->datas                    = array(self::createAbscisse('RatiosEntrep', $unite, $ratio, $id, $type, $Annees),
-	                                               self::createAbscisse('RatiosSecteur', $unite, $ratio, $id, $type));
-	    $parametres->TitlesY                  = array(array($unite));
-	    $parametres->TitlesX                  = array(array("Années"));
-	    $parametres->colorLegende->Secteur    = 0x008C00;
-	    $parametres->colorLegende->Entreprise = 0x0000ff;
-	    $parametres->LineLayer                = array("Entreprise", "Secteur");
-	    $parametres->labelsY                  = array();
-	    $parametres->labelsX                  = $Annees;
-	    
-	    return ($this->graphique->GraphiqueLineXY($parametres, true));
-	}
-	
-    public function bourseGraphique($filename)
-	{
-	    $file      = $filename.'.png';
-        $noOfDays  = 30;
-        $extraDays = 30;
-        $rantable  = new RanTable(9, 6, $noOfDays + $extraDays);
-        $rantable->setDateCol(0, chartTime(2002, 9, 4), 86400, true);
-        $rantable->setHLOCCols(1, 100, -5, 5);
-        $rantable->setCol(5, 50000000, 250000000);
-        
-        $timeStamps = $rantable->getCol(0); // Les date
-        $highData   = $rantable->getCol(1); // les données les plus hautes
-        $lowData    = $rantable->getCol(2);  // Les données les plus basses
-        $openData   = $rantable->getCol(3); // Les donnée d'ouverture
-        $closeData  = $rantable->getCol(4); // Les donnée de fermeture
-        $volData    = $rantable->getCol(5); // Volume de data
-        
-        $parametres = new stdClass();
-        $parametres->nom = $file;
-        $parametres->makeSession = "chart1";
-        $parametres->timeStamps  = $timeStamps;
-        $parametres->highData    = $highData;
-        $parametres->lowData     = $lowData;
-        $parametres->openData    = $openData;
-        $parametres->closeData   = $closeData;
-        $parametres->volData     = $volData;
-        $parametres->extraDays   = $extraDays;
-        
-        $retour                  = $this->graphique->GraphiqueFinance($parametres, true);
-        return ('<img src="/fichier/imgcache/'.$file.'?'.$retour->chartID.'" border="1" usemap="#map1"><map name="map1">'.$retour->imageMap.'</map>');
-	}
-}

library/Finance/synthese.lib.php

@@ -1,233 +0,0 @@
-<?php
-Class FormatDatas
-{
-        /**
-     * Ont peut y rajouter des labelles pour completer la synthese.
-     * 
-     * Respecter l'ordre ( ordre d'affichage ).
-     * @var 
-     */
-    protected $tabRatio = array(
-        'r5'     => array('title' => 'CHIFFRE D\'AFFAIRES', 		  'div' => 1000, 'unit' => ' K€',    'evolution' => 'r6'  ),
-        'r7'     => array('title' => 'RESULTAT COURANT AVANT IMPOTS', 'div' => 1000, 'unit' => ' K€',    'evolution' => 'r8'  ),
-        'r10'    => array('title' => 'RESULTAT NET', 				  'div' => 1000, 'unit' => ' K€',    'evolution' => 'r11' ),
-	    'r18'    => array('title' => 'FONDS PROPRES', 				  'div' => 1000, 'unit' => ' K€',    'evolution' => 'r19' ),
-	    'r22'    => array('title' => 'TOTAL BILAN', 				  'div' => 1000, 'unit' => ' K€',    'evolution' => 'r23' ),
-	    'r231'	 => array('title' => 'FONDS DE ROULEMENT', 			  'div' => 1000, 'unit' => ' K€',    'evolution' => 'r235'),
-	    'r232'	 => array('title' => 'BESOIN EN FONDS DE ROULEMENT',  'div' => 1000, 'unit' => ' K€',    'evolution' => 'r236'),
-	    'r249'	 => array('title' => 'TRESORERIE', 					  'div' => 1000, 'unit' => ' K€',    'evolution' => 'r254'),
-	    'r24'	 => array('title' => 'EFFECTIF', 					  'div' => 1,    'unit' => ' Pers.', 'evolution' => 'r24' )
-    );
-    protected $datas = array();
-    protected $structure = array();
-    
-    private   $resultats;
-    private   $evolutionsArray;
-    
-    /**
-     * Merci de passer l'objet a ce niveau : BilansInfos->item
-     * 
-     * @param unknown_type $resultats
-     */
-    public function __construct($resultats, $evolutions)
-    {
-        $this->resultats = $resultats;
-        $this->evolutionsArray = $evolutions;
-    }
-
-    /**
-     * A utiliser avec précaution !
-     * 
-     * format : 'id' => array(title => '', div => '', unit => '', evolution => '')
-     * @param Array $element
-     */
-    public function addInRatioTab($id, $element)
-    {
-       $tab = array($id => $element);
-       $copy = $this->tabRatio;
-       
-       $this->tabRatio = array_merge($copy, $tab);
-    }
-    
-    public function constructStructure()
-    {
-        self::constructBaseLibele();
-        foreach ($this->datas as $libele => $title) {
-           foreach ($this->resultats as $item)
-            foreach ($item as $row) {
-                foreach($row as $champ => $valeur) {
-                    if ($champ == 'dateCloture'){
-                        $date = $valeur;
-                        self::constructBaseDate($libele, $valeur);
-                    }
-                    if ($champ == 'typeBilan')
-                    {
-                        self::constructBaseType($libele, $date, $valeur);
-                    }
-                }
-            }
-        }
-        print_r($this->datas);
-    }
-    
-    /**
-     * Construction du premier etage Libeler
-     */
-    private function constructBaseLibele()
-    {
-        foreach ($this->tabRatio as $libel => $valeur) {
-            $this->datas[$valeur['title']] = array();
-        }
-    }
-
-    /**
-     * Construction du deuxieme etage Dates
-     * 
-     * @param $libeler precedent $libele
-     * @param date courente $date
-     */
-    private function constructBaseDate($libel, $date)
-    {
-        if(!array_key_exists($date, $this->datas)) {
-            $this->datas[$libel][$date] = array();
-        }
-    }
-
-    /**
-     * Construction du troisieme etage Type
-     * 
-     * @param libele precedent $libele
-     * @param date precedente $date
-     * @param type en cours $type
-     */
-    private function constructBaseType($libele, $date, $type)
-    {
-        foreach ($this->resultats as $row) {
-                foreach($row as $champ => $valeur) {
-                    if ($champ == 'dateCloture') {
-                        if ($valeur == $date) {
-                            $this->datas[$libele][$valeur][$type] = array();
-                        }
-                    }
-                }
-       }
-    }
-
-    /**
-     * Construction du quatrieme etage Items
-     * 
-     * @param libele precedent $libele
-     * @param date precedente $date
-     * @param type precedent $type
-     * @param item precedent $item
-     * @param id de l'item dans le tabRatio $id
-     * @param id evolution dans tabRatio $idEvol
-     */
-    private function constructBaseItem($libele, $date, $type, $item, $id, $idEvol)
-    {
-        if ($item->id == $id) {
-            $var = new stdClass();
-            $var->val = $item->val;
-            foreach ($this->evolutionsArray as $evol) {
-                if ($evol->id == $idEvol)
-                    $var->evolution = $item->val;
-            }
-            $this->datas[$libele][$date][$type] = $var;
-        }
-    }
-}
-
-Class Synthese
-{
-    /**
-     * Type du bilan N, C, A, S, B
-     * 
-     * N : Normal
-     * C : Consolidé
-     * A : Assurance
-     * B : Banque
-     * S : Simplifié
-     * 
-     * Ont garde une priorité sur les bilan de type S donc les type N deviennent type S !
-     * Donc il n'y a pas de type N dans la vue.
-     * 
-     * @var unknown_type
-     */
-    protected $typeBilan = array(
-        'N', 'C', 'A', 'B'
-    );
-    
-    /**
-     * Les données correctement formaté par FormatData
-     * 
-     * @var unknown_type
-     */
-    protected $datas;
-    
-    /**
-     * Les parametres courrant de l'objet
-     * 
-     * @var unknown_type
-     */
-    protected $currentTypeBilan;
-    protected $currentDate;
-
-    public function __construct($resultats, $evolutions) {
-        $this->data = new FormatDatas($resultats, $evolutions);
-        $this->data->constructStructure();
-    }
-    
-    /**
-     * Permet de retourner des elements du tableau
-     * peut egalement savoir si l'element existe dans le tableau
-     * 
-     * @param unknown_type $id
-     * @param unknown_type (existe, title, div, unit, evolution)
-     */
-    public function getElementInSynthese($id, $action)
-    {
-        foreach ($this->tabRatio as $name => $element) {
-            if ($name == $id) {
-                switch ($action){
-                    case 'exist':
-                        return (true);
-                    case 'title':
-                        return($element['title']);
-                    case 'div':
-                        return ($element['div']);
-                    case 'unit':
-                        return ($element['unit']);
-                    case 'evolution':
-                        return ($element['evolution']);
-                    default:
-                        return ($element);
-                }
-            }
-        }
-        return (false);
-    }
-
-    /**
-     * Permet de switcher entre les bilans
-     * 
-     * @param unknown_type $type
-     */
-    protected function selectTypeBilan($type)
-    {
-        foreach($this->typeBilan as $typeBilan) {
-            if ($typeBilan == $type)
-                $this->currentTypeBilan = $type;
-        }
-    }
-
-    /**
-     * Permet de selectionnez d'autre dates.
-     * 
-     * @param unknown_type $date
-     */
-    protected function selectDateBilan($date)
-    {
-        $this->currentDate = $date;
-    }
-
-}

library/Giant/Controllers.lib.php

@@ -5,6 +5,7 @@
 */
 require_once 'Vendors/ChartDirector/phpchartdir.php';
 require_once ('Giant/WSgiant.php');
+require_once ('Scores/WsScores.php');
 require_once ('Scores/Cache.php');
 require_once ('Partials.php');
 
@@ -35,7 +36,8 @@ Class GiantControllerLib
 		$Commande    = new Commandes();
 		$Rapport     = new Rapports($Pays, $TestIndication);
 		$CommandeP   = new stdClass();
-
+		$setLog 	 = new WsScores();
+		
 		switch ($Utilisateur->getIdClient()) {
 			case '0':
 				$price = $this->configVal->price->test;
@@ -59,7 +61,9 @@ Class GiantControllerLib
 						$Language);
 			}
 		}
-
+		//setLog in WS
+		$setLog->setLog('giant'.$Type, $CompanyId);
+		//////////////
 		$report_id = $Rapport->getRapportExistId($CompanyId, $Language);
 		if (!empty($report_id)) {
 			$CommandeP->login      = $Utilisateur->getLogin();
@@ -259,7 +263,7 @@ Class GiantControllerLib
 Class GiantRechercheController extends GiantFunction
 {
 	protected $listAutorized = array(
-			'FR' => '006', 'BE' => '001', 'ES' => '001',
+			'FR' => '006', 'BE' => '001', 'ES' => '005',
 			'GB' => '002', 'NL' => '003'
 	);
 	protected $Provider;

library/Giant/Functions.lib.php

@@ -20,11 +20,11 @@ Class GiantFunction
 
 	public function setDate($date, $format)
 	{
-		$date = new WDate();
+		$wdate = new WDate();
 		switch($format) {
 			case 'YYYYMMDD':
 				$formatIn = 'Ymd';
-				$date = $date->dateT($formatIn, 'd/m/Y', $date);
+				$date = $wdate->dateT($formatIn, 'd/m/Y', $date);
 				return ($date);
 			case 'YYYY':
 				return ($date);

library/Giant/Partials.php

@@ -201,16 +201,17 @@ class ComparaisonValeurs
 				case 'FlexibleComparisonItems':
 
 						foreach($PeerGroup->FlexibleComparisonItems->ComparisonItemsGroup as $ComparisonItemsGroup) {
-							foreach($ComparisonItemsGroup->FlexibleComparisonItem as $FlexibleComparisonItem) {
+							foreach($ComparisonItemsGroup->FlexibleComparisonItem as $key=>$FlexibleComparisonItem) {
 								$name = str_replace(' ', '_', str_replace('\'', '', $FlexibleComparisonItem->ItemName->_));
-								if(!isset($this->report->DataSet->Company->ComparaisonValeurs[$name]['date'])) {
+								$this->report->DataSet->Company->ComparaisonValeurs[$key]['name'] = $name;
-									$this->report->DataSet->Company->ComparaisonValeurs[$name]['date'] = $date->dateT('Ymd', 'd/m/Y', $ComparisonItemsGroup->Period->EndDate->_);}
+								if(!isset($this->report->DataSet->Company->ComparaisonValeurs[$key]['date'])) {
-								if(!isset($this->report->DataSet->Company->ComparaisonValeurs[$name]['current'])){
+									$this->report->DataSet->Company->ComparaisonValeurs[$key]['date'] = $date->dateT('Ymd', 'd/m/Y', $ComparisonItemsGroup->Period->EndDate->_);}
-									$this->report->DataSet->Company->ComparaisonValeurs[$name]['current'] = $FlexibleComparisonItem->SubjectValue;}
+								if(!isset($this->report->DataSet->Company->ComparaisonValeurs[$key]['current'])){
-								if(!isset($this->report->DataSet->Company->ComparaisonValeurs[$name]['entreprise'])){
+									$this->report->DataSet->Company->ComparaisonValeurs[$key]['current'] = $FlexibleComparisonItem->SubjectValue;}
-									$this->report->DataSet->Company->ComparaisonValeurs[$name]['entreprise'] = $FlexibleComparisonItem->AverageValue;}
+								if(!isset($this->report->DataSet->Company->ComparaisonValeurs[$key]['entreprise'])){
-								if($date->dateT('Ymd', 'd/m/Y', $ComparisonItemsGroup->Period->EndDate->_) != $this->report->DataSet->Company->ComparaisonValeurs[$name]['date']){
+									$this->report->DataSet->Company->ComparaisonValeurs[$key]['entreprise'] = $FlexibleComparisonItem->AverageValue;}
-									$this->report->DataSet->Company->ComparaisonValeurs[$name]['old'][$date->dateT('Ymd', 'd/m/Y', $ComparisonItemsGroup->Period->EndDate->_)][] = $FlexibleComparisonItem;}}}
+								if($date->dateT('Ymd', 'd/m/Y', $ComparisonItemsGroup->Period->EndDate->_) != $this->report->DataSet->Company->ComparaisonValeurs[$key]['date']){
+									$this->report->DataSet->Company->ComparaisonValeurs[$key]['old'][$ComparisonItemsGroup->Period->EndDate->_][] = $FlexibleComparisonItem;}}}
 					break;
 				case 'AmountAdvisedComparison':
 					foreach($PeerGroup->AmountAdvisedComparison as $AmountAdvisedComparison) {
@@ -277,8 +278,9 @@ class ComportementPaiement
 				if(isset($PaymentBehaviour->AnalysisByPeriod->Category)) {
 					foreach($PaymentBehaviour->AnalysisByPeriod->Category as $period) {
 						foreach($period->DueDateExceeds as $DueDateExceeds) {
+							$per = $period->Period->StartDate->_.$period->Period->EndDate->_;
 							$this->report->DataSet->Company->
-								   ComportementPaiement[$date->dateT('Ymd', 'd/m/Y', $period->Period->StartDate->_).':'.$date->dateT('Ymd', 'd/m/Y', $period->Period->EndDate->_)][$DueDateExceeds->NrOfDaysExceeds->LowerLimit->_.':'.$DueDateExceeds->NrOfDaysExceeds->UpperLimit->_] =
+								   ComportementPaiement[$per][$DueDateExceeds->NrOfDaysExceeds->LowerLimit->_.'0000'.$DueDateExceeds->NrOfDaysExceeds->UpperLimit->_] =
 									$DueDateExceeds->Percentage;
 						}
 					}
@@ -287,8 +289,8 @@ class ComportementPaiement
 					foreach($PaymentBehaviour->AnalysisByAmount->Category as $Amount) {
 						foreach($Amount->DueDateExceeds as $AmountExceeds) {
 							$index = ((isset($Amount->AmountCategory->LowerLimit->_))?$Amount->AmountCategory->LowerLimit->_:'0').
-									':'.(isset($Amount->AmountCategory->HigherLimit->_)?$Amount->AmountCategory->HigherLimit->_:'0');
+									'1111'.(isset($Amount->AmountCategory->HigherLimit->_)?$Amount->AmountCategory->HigherLimit->_:'0');
-							$this->report->DataSet->Company->ByAmount[$index][$AmountExceeds->NrOfDaysExceeds->LowerLimit->_.':'.$AmountExceeds->NrOfDaysExceeds->UpperLimit->_] = $AmountExceeds->Percentage;
+							$this->report->DataSet->Company->ByAmount[$index][$AmountExceeds->NrOfDaysExceeds->LowerLimit->_.'0000'.$AmountExceeds->NrOfDaysExceeds->UpperLimit->_] = $AmountExceeds->Percentage;
 						}
 					}
 				}
@@ -586,13 +588,14 @@ class ComptesAnnuels
 
     public function formatDate($report)
     {
-    	$date = new WDate();
+    	//$date = new WDate();
-    	$function = new GiantFunction();
+    	//$function = new GiantFunction();
         for ($i = 0; $i < count($this->report->DataSet->Company->AnnualAccounts); $i++) {
             if(isset($this->report->DataSet->Company->AnnualAccounts[$i]->AccountsDate->_)) {
-                $this->report->DataSet->Company->AnnualAccounts[$i]->AccountsDate->_ = $date->dateT(
+            	$this->report->DataSet->Company->AnnualAccounts[$i]->AccountsDate->_=(int)$this->report->DataSet->Company->AnnualAccounts[$i]->AccountsDate->_;
+                /*$this->report->DataSet->Company->AnnualAccounts[$i]->AccountsDate->_ = $date->dateT(
                     $function->getFormatDate($this->report->DataSet->Company->AnnualAccounts[$i]->AccountsDate->format), 'd/m/Y',
-                    $this->report->DataSet->Company->AnnualAccounts[$i]->AccountsDate->_);
+                    $this->report->DataSet->Company->AnnualAccounts[$i]->AccountsDate->_);*/
             }
         }
     }
@@ -617,7 +620,8 @@ class Dirigeant {
 	{
 		$date = new WDate();
 		foreach($this->report->DataSet->Company->Position as $Position) {
-			$this->report->DataSet->Company->Dirigeant[$Position->PositionTitle->code][$date->dateT('Ymd', 'd/m/Y', $Position->Period->StartDate->_).':'.$date->dateT('Ymd', 'd/m/Y',$Position->Period->EndDate->_)][] = $Position->Person;
+			$Position->Person->date = array($Position->Period->StartDate->_,$Position->Period->EndDate->_);
+			$this->report->DataSet->Company->Dirigeant[$Position->PositionTitle->code][(int)$Position->Period->StartDate->_][] = $Position->Person;
 		}
 	}
 
@@ -641,7 +645,9 @@ class Historiques
 	public function generateStructure()
 	{
 		$myEvent = array();
+		$new =array();
 		$function = new GiantFunction();
+		$i=0;
 		foreach($this->report->DataSet->Company->Event as $events) {
 			$std = new stdClass();
 			$std->EventCode = $events->EventCode;
@@ -649,9 +655,18 @@ class Historiques
 			$std->FreeText = $events->FreeText->_;
 			$std->Date = $function->setDate($events->Date->_, $events->Date->format);
 			$std->Format = $events->Date->format;
-			$myEvent[$events->Source->_][$events->Date->_][] = $std;
+			$std->name = $events->Source->_;
+			$tmp = array_search($events->Source->_, $new);
+			if (!$tmp){
+				$i++;
+				$new[$i] = $events->Source->_;
+				$myEvent[$i][$events->Date->_][] = $std;
+			} else {
+				$myEvent[$tmp][$events->Date->_][] = $std;
+			}
 			unset ($std);
 		}
+		$this->report->DataSet->Company->EventNew = $new;
 		$this->report->DataSet->Company->Event = $myEvent;
 		foreach($this->report->DataSet->Company->Event as $name => $event) {
 				ksort($this->report->DataSet->Company->Event[$name]);
@@ -687,7 +702,7 @@ class InformationGenerale
             $this->report->CompanyAddress    = $this->report->CompanyAddress[0]->HouseNumber.' '.$this->report->CompanyAddress[0]->Street.' - '.$this->report->CompanyAddress[0]->PostCode.' '.$this->report->CompanyAddress[0]->City;
             $this->report->TelephoneNumber   = $this->report->TelephoneNumber[0]->_;
             $this->report->Telefax           = $this->report->Telefax[0];
-            $this->report->IncorporationDate = $function->setDate($this->report->IncorporationDate->_, $this->report->IncorporationDate->format);
+            $this->report->IncorporationDate = str_replace('/', '', $function->setDate($this->report->IncorporationDate->_, $this->report->IncorporationDate->format));
             $this->report->UnifiedLegalForm  = $this->report->LegalForm[0]->UnifiedLegalForm;
             $this->report->LegalForm         = $this->report->LegalForm[0]->CountryLegalForm->_;
             $this->report->WebAddress        = '<a href="http://'.$this->report->WebAddress.'">'.$this->report->WebAddress.'</a>';
@@ -791,13 +806,15 @@ class PositionFinanciere
 
     public function generateStructure()
     {
-    	$dateFunction = new WDate();
-    	
         foreach($this->report->DataSet->Company->FinancialSummary as $FinancialSummary) {
             foreach($FinancialSummary as $name => $valeur) {
                 if($name != 'SummaryDate' and $name != 'AccountStatus' and $name != 'Unit') {
 					(($FinancialSummary->Unit == 1)?$unit=1000:$unit=1);
-					$date = (strlen($FinancialSummary->SummaryDate->_) == 8 )?$dateFunction->dateT('Ymd', 'd/m/Y', $FinancialSummary->SummaryDate->_):$FinancialSummary->SummaryDate->_;
+					$date = $FinancialSummary->SummaryDate->_;
+					if(strlen($FinancialSummary->SummaryDate->_) != 8){
+						list($date, $month, $year) = explode("/", $FinancialSummary->SummaryDate->_);
+						$date =  $date.$month.$year;
+					}
                     $return[$name][$date] = number_format ($valeur->_/$unit, 0, '', ' ').(($unit==1000)?' K€':' €');
 					$this->labelDate[$date] = true;
 				}

library/Giant/giant.ini

@@ -28,9 +28,9 @@ snd = "7"
 other = "10"
 
 [cache]
-lifetime = "86403"
+lifetime = "2628000"
 
 [test]
 ;1 = test mode
 ;0 = production
-TestIndication = '1'
+TestIndication = '0'

library/Scores/Finance/Liasse.php

@@ -1,5 +1,5 @@
 <?php
-class Liasse
+class Scores_Finance_Liasse
 {
 
 	protected $postes = array();

library/Scores/Finance/Liasse/XLS.php

@@ -1,5 +1,5 @@
 <?php
-class LiasseXLS
+class Scores_Finance_Liasse_XLS
 {
 	protected $path;
 	protected $mode;
@@ -10,7 +10,7 @@ class LiasseXLS
 	);
 	protected $assoc = array();
 	protected $values = array();
-	
+
 	/**
 	 *
 	 * Enter description here ...
@@ -32,7 +32,7 @@ class LiasseXLS
 		}
 		$this->mode = $mode;
 	}
-	
+
 	public function dataModel($siren, $raisonSociale, $values)
 	{
 		switch($this->modele)
@@ -80,7 +80,7 @@ class LiasseXLS
 		}
 
 		//Association
-		$dataAssoc = parse_ini_file(realpath(dirname(__FILE__)).'/liassexls/'.$this->modele.'.ini', true);
+		$dataAssoc = parse_ini_file(realpath(dirname(__FILE__)).'/models/'.$this->modele.'.ini', true);
 		$assoc = array();
 		foreach($dataAssoc as $sheet => $dataCell)
 		{
@@ -92,11 +92,11 @@ class LiasseXLS
 		$this->assoc = $assoc;
 		$this->values = $values;
 	}
-	
+
 	public function dataFile($file)
 	{
 		require_once 'Vendors/phpexcel/PHPExcel.php';
-		$objPHPexcel = PHPExcel_IOFactory::load(realpath(dirname(__FILE__)).'/liassexls/'.$this->modele.'.xls');
+		$objPHPexcel = PHPExcel_IOFactory::load(realpath(dirname(__FILE__)).'/models/'.$this->modele.'.xls');
 		foreach( $this->assoc as $key => $position )
 		{
 			$sheet = $position[0];
@@ -119,8 +119,8 @@ class LiasseXLS
 		$objWriter = PHPExcel_IOFactory::createWriter($objPHPexcel, $this->mode);
 		$objWriter->save($this->path.'/'.$file);
 	}
-	
+
-	
+
-	
+
 }
 ?>

library/Scores/Finance/Ratios/Data.php

@@ -1,5 +1,5 @@
 <?php
-class RatiosData
+class Scores_Finance_Ratios_Data
 {
     protected $ratiosInfos;
     protected $bilansInfo;

library/Scores/Finance/Ratios/Graph.php

@@ -1,11 +1,11 @@
 <?php
-class RatiosGraph
+class Scores_Finance_Ratios_Graph
 {
 	protected $path;
-	
+
 	protected $siret = null;
 	protected $id = 0;
-	
+
 	public function __construct($siret, $id = 0)
 	{
 		require_once 'Vendors/ChartDirector/phpchartdir.php';
@@ -15,7 +15,7 @@ class RatiosGraph
 		$this->siret = $siret;
 		$this->id = $id;
 	}
-	
+
 	/**
 	* Enregistre le graphique bilan passif sous forme d'image.
 	* @param array $data
@@ -101,7 +101,7 @@ class RatiosGraph
 			$c->setStartAngle(135);
 			$c->setData($data, $labels);
 			$c->set3D(20);
-	
+
 			if($c->makeChart($this->path.$file) === TRUE){
 				$return = $file;
 			}else{
@@ -110,7 +110,7 @@ class RatiosGraph
 		}
 		return $return;
 	}
-	
+
 	/**
 	* Enregistre le graphique bilan actif sous forme d'image.
 	* @param array $data
@@ -157,8 +157,8 @@ class RatiosGraph
 		}
 		return $return;
 	}
-	
+
-	
+
 	public function ratiosgraph($ratio, $data)
 	{
 		$file = 'ratiosgraph-'.$this->siret.'-'.$this->id.'-'.$ratio.'.png';
@@ -203,7 +203,7 @@ class RatiosGraph
 		}
 		return $return;
 	}
-	
+
 	public function syntheseGraphEvol($data, $ratio, $unite)
 	{
 		$file = 'syntheseEvol-'.$this->siret.'-'.$this->id.'-'.$ratio.'.png';
@@ -247,12 +247,12 @@ class RatiosGraph
 		}
 		return $return;
 	}
-	
+
 	public function syntheseGraphLineCompare($data, $typeBilan)
 	{
 		$file = 'synthese-linecompare-'.$this->siret.'-'.$this->id.'-'.$typeBilan.'.png';
 		$cache = new Cache();
-		
+
 		if( $cache->exist($this->path.$file) ){
 			$return = $this->path.$file;
 		} else {
@@ -261,7 +261,7 @@ class RatiosGraph
 				$date[$key]  = $row['date'];
 			}
 			array_multisort($date, SORT_ASC, $data);
-		
+
 			//Définition des valeurs pour le graph
 			$dataBFR = array();
 			$dataFR = array();
@@ -287,7 +287,7 @@ class RatiosGraph
 				$dataEBE['y'][$i] = $dataEBE['y'][$i+1] = $item['r146'];
 				$i+=2;
 			}
-		
+
 			$c = new XYChart(665, 350, 0xcccccc, 0x000000, 1);
 			$c->addTitle("Synthèse *", "timesbi.ttf", 15, 0x000000);
 			$c->addText(60, 320, "* Elements financier rapportés à 12 mois" );
@@ -296,38 +296,38 @@ class RatiosGraph
 			$c->xAxis->setTitle( "<*block,valign=absmiddle*>Années<*/*>");
 			$c->xAxis->setWidth(2);
 			$c->yAxis->setWidth(2);
-		
+
 			// Add a legend box at (55, 32) (top of the chart) with horizontal layout. Use 9 pts
 			// Arial Bold font. Set the background and border color to Transparent.
 			$legendObj = $c->addLegend(55, 30, false, "times.ttf", 9);
 			$legendObj->setBackground(Transparent);
-		
+
 			// Add a blue (0000ff) step line layer to the chart and set the line width to 2 pixels
 			$layer1 = $c->addStepLineLayer($dataFR['y'], 0x0000ff, "FONDS DE ROULEMENT");
 			$layer1->setXData($dataFR['x']);
 			$layer1->setLineWidth(2);
-		
+
 			// Add a red (ff0000) step line layer to the chart and set the line width to 2 pixels
 			$layer0 = $c->addStepLineLayer($dataBFR['y'], 0xff0000, "BESOIN EN FONDS DE ROULEMENT");
 			$layer0->setXData($dataBFR['x']);
 			$layer0->setLineWidth(2);
-		
+
 			// Add a green (00ff00) step line layer to the chart and set the line width to 2 pixels
 			$layer2 = $c->addStepLineLayer($dataCA['y'], 0x00ff00, "CHIFFRE D'AFFAIRES");
 			$layer2->setXData($dataCA['x']);
 			$layer2->setLineWidth(2);
-		
+
 			// Add a black (000000) step line layer style dash to the chart and set the line width to 2 pixels
 			$layer3 = $c->addStepLineLayer($dataEBE['y'], $c->dashLineColor(0x000000, DashLine), "EXCEDENT BRUT D'EXPLOITATION");
 			$layer3->setXData($dataEBE['x']);
 			$layer3->setLineWidth(2);
-		
+
 			# If the FR line gets above the BFR line, color to area between the lines red (ff0000)
 			$c->addInterLineLayer($layer0->getLine(0), $layer1->getLine(0), 0xff0000, Transparent);
-		
+
 			# If the FR line gets below the lower BFR line, color to area between the lines light green (8099ff99)
 			$c->addInterLineLayer($layer0->getLine(0), $layer1->getLine(0), Transparent, 0x8044ff44);
-		
+
 			if($c->makeChart($this->path.$file) === TRUE){
 				$return = $this->path.$file;
 			}else{
@@ -336,7 +336,7 @@ class RatiosGraph
 		}
 		return $return;
 	}
-	
+
 	/**
 	 * Génére l'histogramme flux de trésorerie
 	 * @param array $labels
@@ -349,14 +349,14 @@ class RatiosGraph
 		$couleur = array(0xff8080, 0x80ff80, 0x8080ff);
 		$file = 'flux-'.$this->siret.'-'.$this->id.'-'.$typeBilan.'.png';
 		$cache = new Cache();
-			
+
 		if( $cache->exist($this->path.$file) ){
 			$return = $this->path.$file;
 		} else {
 			if (count($data)<=1) {
 				$return = 0;
 			} else {
-	
+
 				$c = new XYChart(600, 300);
 				$c->setPlotArea(100, 70, 300, 200);
 				$legendObj = $c->addLegend(100, 20, false, "times.ttf", 9);
@@ -380,5 +380,5 @@ class RatiosGraph
 		}
 		return $return;
 	}
-	
+
 }

library/Scores/Google/Streetview.php

@@ -0,0 +1,185 @@
+<?php
+/**
+ * https://developers.google.com/maps/documentation/streetview/
+ * Image de 640x640 max
+ * Heading 0 à 360
+ * 0, 45, 90, 135, 180, 225, 270, 315
+ * Récup de chaque image enregistré SIRET-DEG
+ */
+class Scores_Google_Streetview
+{
+	/**
+	 * Service URL
+	 * @var string
+	 */
+	protected $url = 'http://maps.googleapis.com/maps/api/streetview?';
+
+	/**
+	 * Max size 640x640
+	 * @var string
+	 */
+	protected $size = '640x640';
+
+	/**
+	 * GPS ou Adresse
+	 * @var strign
+	 */
+	protected $location = null;
+
+	/**
+	 * Defaut 90, Max 120, represents zoom, with smaller numbers indicating a higher level of zoom
+	 * @var unknown
+	 */
+	protected $fov = 90;
+
+	/**
+	 * (default is 0) Specifies the up or down angle of the camera relative to the Street View vehicle
+	 * @var unknown
+	 */
+	protected $pitch = 0;
+
+	/**
+	 * (optional) identifies your application for quota purposes
+	 * @var string
+	 */
+	protected $key = null;
+
+	/**
+	 * always false
+	 * @var string
+	 */
+	protected $sensor = 'false';
+
+	/**
+	 * Indicates the compass heading of the camera (0 to 360)
+	 */
+	protected $heading = 0;
+
+	/**
+	 * Number of image by the circle (360°)
+	 * @var int
+	 */
+	protected $nbImage = 8;
+
+	/**
+	 * File extension
+	 * @var string
+	 */
+	protected $extension = 'jpg';
+
+	/**
+	 * Path where files are stored
+	 */
+	protected $path = '';
+
+	/**
+	 *
+	 */
+	public function __construct()
+	{
+		$this->size = '320x320';
+
+		$c = Zend_Registry::get('config');
+		$ths->path = realpath($c->profil->path->data).'/google/streetview';
+
+	}
+
+	/**
+	 *
+	 * @param unknown $lattitude
+	 * @param unknown $longitude
+	 */
+	public function setLocationGeo($lattitude, $longitude)
+	{
+		$this->location = $lattitude.','.$longitude;
+	}
+
+	/**
+	 *
+	 * @param unknown $adresse
+	 */
+	public function setLocationTxt($adresse){}
+
+	/**
+	 *
+	 * @param unknown $num
+	 */
+	public function setHeading($num)
+	{
+		$this->heading = $num;
+	}
+
+	/**
+	 *
+	 * @return multitype:number
+	 */
+	public function getNumDeg()
+	{
+		$mark = array();
+		$deg = 360/$this->nbImage;
+		$i=$calc=0;
+		while ($calc<360) {
+			$mark[$i] = $calc;
+			$calc+=$deg;
+			$i++;
+		}
+		return $mark;
+	}
+
+	/**
+	 *
+	 * @return string
+	 */
+	public function urlImg()
+	{
+		$url = '';
+
+		$params = array( 'size', 'location', 'fov', 'pitch', 'sensor', 'heading' );
+		foreach ($params as $param) {
+			if ( $this->{$param} !== null ) {
+				$url.= '&'.$param.'='. $this->{$param};
+			}
+		}
+
+		return $this->url . substr($url,1);
+	}
+
+	/**
+	 *
+	 */
+	public function getImg()
+	{
+		require_once 'common/curl.php';
+		$page = getUrl($this->url, '', '', '', false);
+
+		if ( !in_array($page['code'], array(400, 408, 403)) ) {
+			$body = $page['body'];
+			file_put_contents($this->pathImg(), $body);
+		}
+	}
+
+	/**
+	 *
+	 * @return string
+	 */
+	public function pathImg()
+	{
+		$filename = $this->siret.'-'.$this->heading . '.' . $this->extension;
+		return $this->path . DIRECTORY_SEPARATOR . $filename;
+	}
+
+	/**
+	 *
+	 * @return string
+	 */
+	public function display()
+	{
+		$file = $this->pathImg();
+		if ( !file_exists($file) ) {
+			$this->getImg();
+		}
+
+		return basename($file);
+	}
+
+}

library/Scores/Mobile/Detect.php

@@ -1,23 +1,23 @@
 <?php
-class DetectMobile 
+class Scores_Mobile_Detect
 {
 	public function isMobile()
 	{
 		if (isset($_SERVER['HTTP_X_WAP_PROFILE']) || isset($_SERVER['HTTP_PROFILE']))
 			return true;
-		
+
 		if (isset ($_SERVER['HTTP_USER_AGENT']))
 		{
 			if (strpos ($_SERVER['HTTP_USER_AGENT'], 'Mobile') !== false)
 				return true;
-		
+
 			if (strpos ($_SERVER['HTTP_USER_AGENT'], 'Opera Mini') !== false)
 				return true;
 		}
 
 		if (preg_match('#Android|BlackBerry|Cellphone|iPhone|iPod|hiptop|HTC|MIDP-2\.|MMEF20|MOT-V|NetFront|Newt|Nintendo Wii|Nintendo DS|Nitro|Nokia|Opera Mobi|Palm|PlayStation Portable|PSP|portalmmm|SonyEricsson|Symbian|UP.Browser|UP.Link|webOS|Windows CE|WinWAP|YahooSeeker/M1A1-R2D2|LGE VX|Maemo|phone)#', $_SERVER['HTTP_USER_AGENT']))
 			return true;
-		
+
-		return false;	
+		return false;
 	}
 }

library/Scores/PagePrint.php

@@ -30,9 +30,9 @@ class PagePrint
 		'evaluation-valorisation' => 'siret,id',
 		'pieces-bilans' => 'siret,id',
 		'pieces-actes' => 'siret,id',
-        'giant-full' => 'Pays,Type,CompanyId',
+        'giant-full' => 'Pays,Type,CompanyId,Language',
-		'giant-compact' => 'Pays,Type,CompanyId',
+		'giant-compact' => 'Pays,Type,CompanyId,Language',
-		'giant-creditrecommendation' => 'Pays,Type,CompanyId',
+		'giant-creditrecommendation' => 'Pays,Type,CompanyId,Language',
 		'surveillance-fichier' => 'nomFic,filtre',
 		'worldcheck-matchcontent' => 'matchIdentifier',
 	);
@@ -63,9 +63,9 @@ class PagePrint
 		'evaluation-valorisation' => 'siret,id',
 		'pieces-bilans' => 'siret,id',
 		'pieces-actes' => 'siret,id',
-		'giant-full' => 'Pays,Type,CompanyId',
+		'giant-full' => 'Pays,Type,CompanyId,Language',
-		'giant-compact' => 'Pays,Type,CompanyId',
+		'giant-compact' => 'Pays,Type,CompanyId,Language',
-		'giant-creditrecommendation' => 'Pays,Type,CompanyId',
+		'giant-creditrecommendation' => 'Pays,Type,CompanyId,Language',
 		'worldcheck-matchcontent' => 'matchIdentifier',
 	);
 
@@ -91,6 +91,9 @@ class PagePrint
 		'evaluation-indiscore2' => 'siret,id',
 		'evaluation-indiscore3' => 'siret,id',
 		'evaluation-valorisation' => 'siret,id',
+		'giant-full' => 'Pays,Type,CompanyId,Language',
+		'giant-compact' => 'Pays,Type,CompanyId,Language',
+		'giant-creditrecommendation' => 'Pays,Type,CompanyId,Language',
 		'worldcheck-matchcontent' => 'matchIdentifier',
 	);
 

library/Scores/Streetview.php

@@ -1,98 +0,0 @@
-<?php
-/**
- * Image de 640x640 max
- * Heading 0 à 360
- * 0, 45, 90, 135, 180, 225, 270, 315
- * Récup de chaque image enregistré SIRET-DEG
- */
-class Scores_Streetview 
-{
-		
-	protected $url = 'http://maps.googleapis.com/maps/api/streetview?';
-	
-	//Max size 640x640
-	protected $size = '640x640';
-	
-	//GPS ou Adresse
-	protected $location = null;
-	
-	//Defaut 90, Max 120, represents zoom, with smaller numbers indicating a higher level of zoom
-	protected $fov = 90;
-	
-	//(default is 0) Specifies the up or down angle of the camera relative to the Street View vehicle
-	protected $pitch = 0;
-	
-	//(optional) identifies your application for quota purposes
-	protected $key = null;
-	
-	protected $sensor = 'false';
-	
-	// Indicates the compass heading of the camera (0 to 360)
-	protected $heading = 0;	
-	
-	protected $nbImage = 8;
-	
-	protected $extension = 'jpg';
-	
-	public function __construct()
-	{
-		$this->size = '320x320';		
-	}
-	
-	public function setLocationGeo($lattitude, $longitude)
-	{
-		$this->location = $lattitude.','.$longitude;		
-	}
-	
-	public function setLocationTxt($adresse){}
-	
-	public function setHeading($num)
-	{	
-		$this->heading = $num;	
-	}
-	
-	public function getNumDeg()
-	{
-		$mark = array();
-		$deg = 360/$this->nbImage;
-		$i=$calc=0;
-		while ($calc<360) {
-			$mark[$i] = $calc;
-			$calc+=$deg;
-			$i++;
-		}
-		return $mark;
-	}	
-	
-	public function urlImg()
-	{
-		$url = '';
-				
-		$params = array( 'size', 'location', 'fov', 'pitch', 'sensor', 'heading' );
-		foreach ($params as $param) {
-			if ( $this->{$param} !== null ) {
-				$url.= '&'.$param.'='. $this->{$param};
-			}
-		}
-		
-		return $this->url . substr($url,1);
-	}
-	
-	public function getImg()
-	{
-		require_once 'common/curl.php';
-		$page = getUrl($this->url, '', '', '', false);
-				
-		if ( !in_array($page['code'], array(400, 408, 403)) ) {
-			$filename = $this->siret.'-'.$this->heading . '.' . $this->extension;
-			$body = $page['body'];
-			file_put_contents($this->path . DIRECTORY_SEPARATOR . $filename, $body);
-		}		
-	}	
-
-	public function pathImg()
-	{
-		$filename = $this->siret.'-'.$this->heading . '.' . $this->extension;
-		return $this->path . DIRECTORY_SEPARATOR . $filename;
-	}	
-}

library/Scores/Wkhtml/Pdf.php

@@ -1,5 +1,5 @@
 <?php
-class wkhtmltopdf
+class Scores_Wkhtml_Pdf
 {
 	protected $wkhtml;
 

public/themes/default/scripts/giant.js

@@ -15,7 +15,7 @@ $(document).ready(  function()
 	       $(this).load(href);
 	      },
 	      buttons: {'Fermer': function() { $(this).dialog('close'); }},
-	      close: function() { $('#dial').remove(); }};
+	      close: function() {  location.reload(); }};
 	     $('<div id="dial"></div>').dialog(dlgOpts);
 	     return false;
 	    });
@@ -23,10 +23,14 @@ $(document).ready(  function()
 	    	$('select[name=LanguageCode]').fadeOut();
 	    	$("select[name=Pays] option:selected").each(function () {
 	    		var values = $(this).attr('value');
-	    		//alert(values);
 	    		$.post('/giant/getpays',{Pays: values}, function(data) {
-	    			alert(data);
+	    			data = (jQuery.parseJSON(data));
-	    			//alert($('select[name=LanguageCode]').html());
+	    			$('select[name=LanguageCode]').find('option').remove();
+	    			$.each(data, function(key, value) { 
+	    			     $('select[name=LanguageCode]')	    			     	    
+	    			          .append($('<option>', { value : value })
+	    			          .text(value)); 
+	    			});
 	               });
 	    	});
 	    	$('select[name=LanguageCode]').fadeIn(500);

public/themes/default/scripts/surveillance.js

@@ -14,7 +14,7 @@ $(document).ready(function(){
 				$(this).html('Chargement...');
 				$(this).load(href);
 				$('#dialogsurv').keypress(function(e){
-					if (e.keyCode == 13){
+					if (e.which==13){
 						e.preventDefault();
 						survSubmit();
 					}

public/themes/default/styles/main.css

@@ -401,19 +401,21 @@ body{ background-color: #bebebe;font-family: Verdana, Arial, sans-serif;font-siz
 #global {width:900px; margin:0 auto; text-align:left;}
 #content {float:right;clear:both;width:680px;padding:0;margin:0;padding-top:20px;}
 #center {background-color:#fff;padding:5px 0;}
-div.paragraph {margin:5px;padding:5px;}
 #footer {clear:both;text-align:center;margin-top:15px;}
 #footer p {font:0.9em Arial, Helvetica, sans-serif; }
+#center h1 {clear:both;margin:5px;padding:5px; background:#606060; color:#ffffff;font:600 1.4em Arial, Verdana, Sans-serif; letter-spacing:1px; line-height:1.2em;}
+#center h2 {clear:both; margin:5px; padding:5px; background:#00008c; color:#ffffff; font:bold 1.2em Arial, Verdana, Sans-serif; }
+div.paragraph {margin:5px;padding:5px;}
 .clearfix:after {content: ".";display: block;height: 0;clear: both;visibility: hidden;zoom:1;}
 a:link {color: #9c093a; text-decoration:none;}
 a:visited {color: #0000CC; text-decoration:none;}
 a:hover {color: #000066; text-decoration:none;}
-#center h1 {clear:both;margin:5px;padding:5px; background:#606060; color:#ffffff;font:600 1.4em Arial, Verdana, Sans-serif; letter-spacing:1px; line-height:1.2em;}
-#center h2 {clear:both; margin:5px; padding:5px; background:#00008c; color:#ffffff; font:bold 1.2em Arial, Verdana, Sans-serif; }
 .StyleInfoLib {font-family: Arial, Helvetica, sans-serif;font-size:  11px;font-weight: bold;color:#535353; vertical-align:top;}
 .StyleInfoData {font-family: Arial, Helvetica, sans-serif;font-size: 11px;color:#535353;}
 .StyleInfoDataActif {font-family: Arial, Helvetica, sans-serif;font-size: 11px;}
 table.identite {border-collapse:separate;border-spacing:4px;}
+table.data {width:100%;}
+table.data td {border:1px solid #ccc; padding:5px;}
 .confidentiel {border-top:1px solid; padding-top:5px; font-style:italic; font-size:9px;}
 .ui-dialog {text-align:left;}
 .ui-widget {font-size: 1em;}
@@ -424,6 +426,7 @@ div.ui-state-highlight a {text-decoration: underline;}
 .noborder {border:0;}
 img { vertical-align:middle; }
 
+
 /* Menu
 ----------------------------------*/
 div#menu {position: absolute;width:200px;}