From 95650f60aeee1e957042041e942054e538789564 Mon Sep 17 00:00:00 2001
From: Damien LASSERRE <dlasserre@scores-decisions.com>
Date: Thu, 31 Mar 2011 15:25:21 +0000
Subject: [PATCH] Modification d'acces au information formatage des affichages
 Part 1

---
 .../Class/rapport/CompanyIdentitie.Class.php  |  91 +++++++++-----
 includes/giant/modulesGiants/Functions.php    |   3 +
 .../templates/rapport/AnnualAccounts.tpl.php  |  42 +++----
 .../templates/rapport/Associated.tpl.php      |  87 ++++++-------
 includes/giant/templates/rapport/Bank.tpl.php |  57 +++++----
 .../giant/templates/rapport/Branch.tpl.php    |  32 +++++
 .../giant/templates/rapport/Capital.tpl.php   |  41 +++++++
 .../rapport/CreditRecommendation.tpl.php      | 115 +++++++++++-------
 .../giant/templates/rapport/Employees.tpl.php |  49 +++-----
 .../rapport/FinancialSummary.tpl.php          |  74 ++++++-----
 .../giant/templates/rapport/LegalForm.tpl.php |  62 +++++++---
 .../templates/rapport/Operations.tpl.php      |  36 +++---
 .../giant/templates/rapport/Position.tpl.php  |  90 ++++++++------
 13 files changed, 472 insertions(+), 307 deletions(-)
 create mode 100644 includes/giant/templates/rapport/Branch.tpl.php
 create mode 100644 includes/giant/templates/rapport/Capital.tpl.php

diff --git a/includes/giant/modulesGiants/Class/rapport/CompanyIdentitie.Class.php b/includes/giant/modulesGiants/Class/rapport/CompanyIdentitie.Class.php
index d1834e80a..d949a162d 100644
--- a/includes/giant/modulesGiants/Class/rapport/CompanyIdentitie.Class.php
+++ b/includes/giant/modulesGiants/Class/rapport/CompanyIdentitie.Class.php
@@ -92,47 +92,65 @@ Class CompanyIdentitie
 			case 'Auditor':
 				self::_AuditorShow($params);
 			break;
+			case 'Branch':
+				self::_BranchShow($params);
+			break;
 		}
 	}
 	
+	public function _BranchShow($Branch) {
+		if(isset($Branch))
+			require_once ('../includes/giant/templates/rapport/Branch.tpl.php');
+	}
+	
 	public function _AuditorShow($Auditor) {
-		echo '<i>In developpement</i>';	
+		if(isset($Auditor))
+			echo '<i>In developpement</i>';	
 	}
 	
 	public function _LiabilityDeclarationShow($LiabilityDeclaration) {
-		echo '<i>In developpement</i>';	
+		if(isset($LiabilityDeclaration))
+			echo '<i>In developpement</i>';	
 	}
 	
 	public function _BankShow($Bank) {
-		require_once ('../includes/giant/templates/rapport/Bank.tpl.php');
+		if(isset($Bank))
+			require_once ('../includes/giant/templates/rapport/Bank.tpl.php');
 	}
 	
 	public function _EventShow($Even) {
-		require_once ('../includes/giant/templates/rapport/Event.tpl.php');
+		if(isset($Even))
+			require_once ('../includes/giant/templates/rapport/Event.tpl.php');
 	}
 	
 	public function _PositionShow($Position) {
-		require_once ('../includes/giant/templates/rapport/Position.tpl.php');
+		if(isset($Position))
+			require_once ('../includes/giant/templates/rapport/Position.tpl.php');
 	}
 
 	public function _EmployeesShow($Employees) {
-		require_once ('../includes/giant/templates/rapport/Employees.tpl.php');
+		if(isset($Employees))
+			require_once ('../includes/giant/templates/rapport/Employees.tpl.php');
 	}
 	
 	public function _CreditRecommendationShow($CreditRecommendation){
-		require_once ('../includes/giant/templates/rapport/CreditRecommendation.tpl.php');
+		if(isset($CreditRecommendation))
+			require_once ('../includes/giant/templates/rapport/CreditRecommendation.tpl.php');
 	}
 	
 	public function _AssociatedShow($Associated) {
-		require_once ('../includes/giant/templates/rapport/Associated.tpl.php');
+		if(isset($Associated))
+			require_once ('../includes/giant/templates/rapport/Associated.tpl.php');
 	}
 	
 	public function _FinancialSummaryShow($FinancialSummary) {
-		require_once ('../includes/giant/templates/rapport/FinancialSummary.tpl.php');
+		if(isset($FinancialSummary))
+			require_once ('../includes/giant/templates/rapport/FinancialSummary.tpl.php');
 	}
 	
 	public function _AnnualAccountsShow($AnnualAccounts) {
-		require_once ('../includes/giant/templates/rapport/AnnualAccounts.tpl.php');
+		if(isset($AnnualAccounts))
+			require_once ('../includes/giant/templates/rapport/AnnualAccounts.tpl.php');
 	}
 	
 	public function _PaymentBehaviourShow($PaymentBehaviour) {
@@ -140,69 +158,86 @@ Class CompanyIdentitie
 	}
 	
 	public function _PeerGroupShow($PeerGroup) {
-		echo '<i>En developpement...</i>';
+		if(isset($PeerGroup))
+			echo '<i>En developpement...</i>';
 	}
 	
 	public function _CapitalShow($Capital) {
-		echo $Capital->AuthorizedCapital->_ . ' €';
+		if(isset($Capital))
+			require_once ('../includes/giant/templates/rapport/Capital.tpl.php');
 	}
 	
 	public function _OperationsShow($Operations) {
-		require_once ('../includes/giant/templates/rapport/Operations.tpl.php');
+		if(isset($Operations))
+			require_once ('../includes/giant/templates/rapport/Operations.tpl.php');
 	}
 	
 	public function _LegalFormShow($LegalForm) {
-		require_once('../includes/giant/templates/rapport/LegalForm.tpl.php');
+		if(isset($LegalForm))
+			require_once('../includes/giant/templates/rapport/LegalForm.tpl.php');
 	}
 
 	public function _CompanyStatusShow($CompanyStatus) {
-		require_once('../includes/giant/templates/rapport/CompanyStatus.tpl.php');
+		if(isset($CompanyStatus))
+			require_once('../includes/giant/templates/rapport/CompanyStatus.tpl.php');
 	}
 	
 	public function _TelephoneNumberShow($TelephoneNumber) {
-		require_once('../includes/giant/templates/rapport/TelephoneNumber.tpl.php');
+		if(isset($TelephoneNumber))
+			require_once('../includes/giant/templates/rapport/TelephoneNumber.tpl.php');
 	}
 	
-	public function _CompanyIdShow($params) {
-		echo $params;
+	public function _CompanyIdShow($CompanyId) {
+		if(isset($CompanyId))
+			echo $CompanyId;
 	}
 	
 	public function _VatShow($Vat){
-		require_once('../includes/giant/templates/rapport/Vat.tpl.php');
+		if(isset($Vat))
+			require_once('../includes/giant/templates/rapport/Vat.tpl.php');
 	}
 	
 	public function _CompanyRegistryShow($CompanyRegistry) {
-		require_once('../includes/giant/templates/rapport/Registry.tpl.php');
+		if(isset($CompanyRegistry))
+			require_once('../includes/giant/templates/rapport/Registry.tpl.php');
 	}
 	
 	public function _CompanyNameShow($CompanyName) {
-		require_once('../includes/giant/templates/rapport/CompanyName.tpl.php');
+		if(isset($CompanyName))
+			require_once('../includes/giant/templates/rapport/CompanyName.tpl.php');
 	}
 	
 	public function _TradeNameShow($TradeName) {
-		require_once('../includes/giant/templates/rapport/TradeName.tpl.php');
+		if(isset($TradeName))
+			require_once('../includes/giant/templates/rapport/TradeName.tpl.php');
 	}
 	
 	public function _CompanyAddressShow($CompanyAddress) {
-		require_once('../includes/giant/templates/rapport/CompanyAddress.tpl.php');
+		if(isset($CompanyAddress))
+			require_once('../includes/giant/templates/rapport/CompanyAddress.tpl.php');
 	}
 	
 	public function _IncorporationDateShow($IncorporationDate) {
-		$date = _setDateWithGiant($IncorporationDate->format, $IncorporationDate->_);
-		echo $date[0].' / '.$date[1].' / '.$date[2];
+		if(isset($IncorporationDate)) {
+			$date = _setDateWithGiant($IncorporationDate->format, $IncorporationDate->_);
+			echo $date[0].' / '.$date[1].' / '.$date[2];
+		}
 		
 	}
 	
 	public function _WebAddressShow($WebAddress) {
-		echo '<a href="http://'.$WebAddress.'" target="_blank">'.$WebAddress.'</a>';
+		if(isset($WebAddress))
+			echo '<a href="http://'.$WebAddress.'" target="_blank">'.$WebAddress.'</a>';
 	}
 	
 	public function _EmailAddressShow($EmailAddress) {
-		echo '<a href="mailto:'.$EmailAddress.'">'.$EmailAddress.'</a>';
+		if(isset($EmailAddress))
+			echo '<a href="mailto:'.$EmailAddress.'">'.$EmailAddress.'</a>';
 	}
 	
 	public function _TelefaxShow($Telefax) {
-		echo $Telefax;
+		if(isset($Telefax))
+			echo $Telefax;
 	}
 }
 ?>
\ No newline at end of file
diff --git a/includes/giant/modulesGiants/Functions.php b/includes/giant/modulesGiants/Functions.php
index 493fd3328..5ae56ff88 100644
--- a/includes/giant/modulesGiants/Functions.php
+++ b/includes/giant/modulesGiants/Functions.php
@@ -47,6 +47,9 @@ function _getLient($champ)
 		case 'Associated':
 			return ('group.png');
 		break;
+		case 'Branch':
+			return ('attach.png');
+		break;
 	}
 	return (false);
 }
diff --git a/includes/giant/templates/rapport/AnnualAccounts.tpl.php b/includes/giant/templates/rapport/AnnualAccounts.tpl.php
index 594e869c9..825fa3230 100644
--- a/includes/giant/templates/rapport/AnnualAccounts.tpl.php
+++ b/includes/giant/templates/rapport/AnnualAccounts.tpl.php
@@ -1,30 +1,18 @@
-<script>
-function affCache(idpr)
-{
-	var pr = document.getElementById(idpr);
- 
-	if (pr.style.display == "") {
-		pr.style.display = "none";
-	} else {
-		pr.style.display = "";
-	}
-}
-</script>
-<div style="border:1px solid silver;background-color:#E0E1E6" align="center">
-Cliquez pour afficher la liste
-<div align="right" style="float:right">
-<img src="/pages/giant/media/icons/application_put.png" onclick="affCache('pr5');" style="cursor:pointer" />
-</div>
+<div id="divOpenData" style="" align="center">
+	Cliquez pour afficher la liste
+	<div align="right" style="float:right">
+		<img src="/pages/giant/media/icons/application_put.png" class="idpr" id="r5" style="cursor:pointer" />
+	</div>
 </div>
 <div id="pr5" style="display:none">
-<?php
-foreach($AnnualAccounts as $champ => $row)
-{
-		$date = _setDateWithGiant($row->AccountsFileDate->format, $row->AccountsFileDate->_);
-		echo '<b>' . SelectTrueLabel($this->labelConfig, 'AnnualAccounts') . ' :</b> <a href="?page=AccountsFileDate">' 
-			. $date[0].' / '.$date[1].' / '.$date[2]. 
-			'</a><br />';
-}
-$_SESSION['AnnualAccounts'] = $AnnualAccounts;
-?>
+	<?php
+	foreach($AnnualAccounts as $champ => $row)
+	{
+			$date = _setDateWithGiant($row->AccountsFileDate->format, $row->AccountsFileDate->_);
+			echo '<b>' . SelectTrueLabel($this->labelConfig, 'AnnualAccounts') . ' :</b> <a href="?page=AccountsFileDate">' 
+				. $date[0].' / '.$date[1].' / '.$date[2]. 
+				'</a><br />';
+	}
+	$_SESSION['AnnualAccounts'] = $AnnualAccounts;
+	?>
 </div>
\ No newline at end of file
diff --git a/includes/giant/templates/rapport/Associated.tpl.php b/includes/giant/templates/rapport/Associated.tpl.php
index ba8950feb..6663990e4 100644
--- a/includes/giant/templates/rapport/Associated.tpl.php
+++ b/includes/giant/templates/rapport/Associated.tpl.php
@@ -1,52 +1,43 @@
-<script>
-function affCache(idpr)
-{
-	var pr = document.getElementById(idpr);
- 
-	if (pr.style.display == "") {
-		pr.style.display = "none";
-	} else {
-		pr.style.display = "";
-	}
-}
-</script>
-<div style="border:1px solid silver;background-color:#E0E1E6" align="center">
-Cliquez pour afficher la liste
-<div align="right" style="float:right">
-<img src="/pages/giant/media/icons/application_put.png" onclick="affCache('pr2');" style="cursor:pointer" />
+<div id="divOpenData" style="" align="center">
+	Cliquez pour afficher la liste
+	<div align="right" style="float:right">
+		<img src="/pages/giant/media/icons/application_put.png" class="idpr" id="r2" style="cursor:pointer" />
+	</div>
 </div>
-</div>
-<div id="pr2" style="display:none">
-<?php
-foreach($Associated as $valeur)
-{
-	if(isset($valeur->Company))
-	{
-		foreach($valeur->Company as $champ => $val)
-		{
-			if ($champ == 'CompanyName')
+<div id="pr2" style="display:none">	
+		<?php 
+			foreach($Associated as $valeur)
 			{
-				echo '<a href="?page=GiantIdentiteSociete&pays=NL&company='.$valeur->Company->CompanyId.'">'.$val->_.'</a><br />';
+				echo '<table width="100%" id="TableContentInformation">';
+					echo '<tr>';
+						echo '<td colspan="2">';
+							echo '<a target="_blank" href="/?page=GiantIdentiteSociete&pays='.$_GET['pays'].'&company='.$valeur->Company->CompanyId.'">'.
+							$valeur->Company->CompanyName->_;
+							echo '</a>';
+						echo '</td>';
+					echo '</tr>';
+					echo '<tr>';
+						echo '<td>'.SelectTrueLabel($this->labelConfig, 'RelationShip').'</td>';
+						echo '<td>'.$valeur->RelationShip.'</td>';
+					echo '</tr>';
+					echo '<tr>';
+						echo '<td>'.SelectTrueLabel($this->labelConfig, 'StartDate').'</td>';
+						echo '<td>'.$valeur->Period->StartDate->_.'</td>';
+					echo '</tr>';
+					echo '<tr>';
+						echo '<td>'.SelectTrueLabel($this->labelConfig, 'Shares').'</td>';
+						echo '<td>'.$valeur->Shares->Percentage.'</td>';
+					echo '</tr>';
+					echo '<tr>';
+						echo '<td>'.SelectTrueLabel($this->labelConfig, 'CompanyAddress').'</td>';
+						echo '<td class="GiantTooltip" title="'.
+							$valeur->Company->CompanyAddress->HouseNumber . ' '.
+							$valeur->Company->CompanyAddress->Street. ' <br />'.
+							$valeur->Company->CompanyAddress->PostCode. ' '.
+							$valeur->Company->CompanyAddress->City
+						.'">'.$valeur->Company->CompanyAddress->City.'</td>';
+					echo '</tr>';
+				echo '</table>';
 			}
-		}
-	}
-	
-	if (isset($valeur->Person))
-	{
-		foreach($valeur->Person as $champ => $val) {
-			if (!is_object($val))
-				echo '<b>'.$champ . '</b> : ' . $val . '<br />';
-		}
-	}
-	
-	if (isset($valeur->Shares))
-	{
-		foreach($valeur->Shares as $champ => $val) {
-			echo '<b>' . SelectTrueLabel($this->labelConfig, $champ).' :</b> '.$val . '% <br />';
-		}
-	}
-	if(!is_object($valeur))
-		echo '<b>' . SelectTrueLabel($this->labelConfig, 'RelationShip').' :</b> '.$valeur . '<br />';
-}
-?>
+		?>
 </div>
diff --git a/includes/giant/templates/rapport/Bank.tpl.php b/includes/giant/templates/rapport/Bank.tpl.php
index f90d1e615..56df37f07 100644
--- a/includes/giant/templates/rapport/Bank.tpl.php
+++ b/includes/giant/templates/rapport/Bank.tpl.php
@@ -1,27 +1,36 @@
-<script>
-function affCache(idpr)
-{
-	var pr = document.getElementById(idpr);
- 
-	if (pr.style.display == "") {
-		pr.style.display = "none";
-	} else {
-		pr.style.display = "";
-	}
-}
-</script>
-<div style="border:1px solid silver;background-color:#E0E1E6" align="center">
-Cliquez pour afficher la liste
-<div align="right" style="float:right">
-<img src="/pages/giant/media/icons/application_put.png" onclick="affCache('pr6');" style="cursor:pointer" />
-</div>
+<div id="divOpenData" style="" align="center">
+	Cliquez pour afficher la liste
+	<div align="right" style="float:right">
+		<img src="/pages/giant/media/icons/application_put.png" class="idpr" id="r6" style="cursor:pointer" />
+	</div>
 </div>
 <div id="pr6" style="display:none">
-<?
-foreach($Bank as $champ => $valeur)
-{
-	echo '<b>'.SelectTrueLabel($this->labelConfig, 'BankName').'</b> : '.$valeur->BankName .' ';
-	echo '<i>'.$valeur->BankAddress->City.'</i><br />';
-}
-?>
+		
+		<?php 
+		foreach($Bank as $valeur)
+		{
+			echo '<table width="100%" id="TableContentInformation">';
+			echo '<tr>';
+				echo '<td><b>' . SelectTrueLabel($this->labelConfig, 'BankName').'</b></td>';
+				echo '<td>'.$valeur->BankName.'</td>';
+			echo '</tr>';
+			if (isset($valeur->BankAddress))
+			{
+				echo '<tr>';
+					echo '<td><b>'.SelectTrueLabel($this->labelConfig, 'BankAddress').'</b></td>';
+					foreach ($valeur->BankAddress as $adress)
+						echo '<td>'.$adress.'</td>';
+				echo '</tr>';
+			}
+			echo '<tr>';
+				echo '<td><b>' . SelectTrueLabel($this->labelConfig, 'AccountType').'</b></td>';
+				echo '<td><b>' . SelectTrueLabel($this->labelConfig, 'AccountNumber').'</b></td>';
+			echo '</tr>';
+			echo '<tr>';
+			foreach($valeur->BankAccount as $compte)
+				echo '<td>'.$compte.'</td>';
+			echo '</tr>';
+			echo '</table>';
+		}
+		?>
 </div>
\ No newline at end of file
diff --git a/includes/giant/templates/rapport/Branch.tpl.php b/includes/giant/templates/rapport/Branch.tpl.php
new file mode 100644
index 000000000..e3756bb9e
--- /dev/null
+++ b/includes/giant/templates/rapport/Branch.tpl.php
@@ -0,0 +1,32 @@
+<div id="divOpenData" style="" align="center">
+	Cliquez pour afficher la liste
+	<div align="right" style="float:right">
+		<img src="/pages/giant/media/icons/application_put.png" class="idpr" id="r10" style="cursor:pointer" />
+	</div>
+</div>
+<div id="pr10" style="display:none">
+<?php 
+$adress = '<table>'.
+			'<tr>'.
+				'<td colspan="2" align="center"><span style="color:#9C093A">'.$Branch->BranchName->_.'</span></td>'.
+			'</tr>'.
+			'<tr>'.
+				'<td><b>'.SelectTrueLabel($this->labelConfig, 'Adresse').' :</b></td>'.
+				'<td>' . $Branch->BranchAddress->HouseNumber .' '.$Branch->BranchAddress->Street.'</td>'.
+			'</tr>'.
+			'<tr>'.
+				'<td><b>'.SelectTrueLabel($this->labelConfig, 'Cp/City').' :</b></td>'.
+				'<td>' . $Branch->BranchAddress->PostCode .' '.$Branch->BranchAddress->City.'</td>'.
+			'</tr>';
+?>
+	<table width="100%" id="TableContentInformation">
+		<tr>
+			<td><b><?php echo SelectTrueLabel($this->labelConfig, 'BranchName')?></b></td>
+			<td class="GiantTooltip" title="<?php echo htmlentities($adress)?>"><?php echo $Branch->BranchName->_?></td>
+		</tr>
+		<tr>
+			<td><b><?php echo SelectTrueLabel($this->labelConfig, 'FoundingDate')?></b></td>
+			<td><?php echo $Branch->FoundingDate->_?></td>
+		</tr>
+	</table>
+</div>
\ No newline at end of file
diff --git a/includes/giant/templates/rapport/Capital.tpl.php b/includes/giant/templates/rapport/Capital.tpl.php
new file mode 100644
index 000000000..87d665bb9
--- /dev/null
+++ b/includes/giant/templates/rapport/Capital.tpl.php
@@ -0,0 +1,41 @@
+<div id="divOpenData" style="" align="center">
+	Cliquez pour afficher la liste
+	<div align="right" style="float:right">
+		<img src="/pages/giant/media/icons/application_put.png" class="idpr" id="r11" style="cursor:pointer" />
+	</div>
+</div>
+<div id="pr11" style="display:none">
+	<?php
+	$array = '<b>Date : ' . $Capital->CapitalChange->Date->_.'</b>';
+	foreach($Capital->CapitalChange->Value as $info)
+	{
+		$array .=
+				'<table>'. 
+					'<tr>'.
+						'<td>'.SelectTrueLabel($this->labelConfig, 'AuthorizedCapital').'</td>'.
+						'<td>'.$info->Company->ShareCapital->AuthorizedCapital->_.' '.$info->Company->ShareCapital->AuthorizedCapital->currency.'</td>'.
+					'</tr>'.
+					'<tr>'.
+						'<td>'.SelectTrueLabel($this->labelConfig, 'IssuedCapital').'</td>'.
+						'<td>'.$info->Company->ShareCapital->IssuedCapital->_.' '.$info->Company->ShareCapital->IssuedCapital->currency.'</td>'.
+					'</tr>'.
+					'<tr>'.
+						'<td><hr /></td>'.
+					'</tr>'.
+				'</table>'
+		;
+	}?>
+	<table width="100%" id="TableContentInformation">
+		<tr>
+			<td><?php echo SelectTrueLabel($this->labelConfig, 'AuthorizedCapital')?></td>
+			<td><?php echo $Capital->AuthorizedCapital->_?></td>
+		</tr>
+		<tr>
+			<td><?php echo SelectTrueLabel($this->labelConfig, 'IssuedCapital')?></td>
+			<td><?php echo $Capital->IssuedCapital->_?></td>
+		</tr>
+		<tr>
+			<td align="center" colspan="2" class="GiantTooltip" title="<?php echo htmlentities($array);?>">Historique</td>
+		</tr>
+	</table>	
+</div>
\ No newline at end of file
diff --git a/includes/giant/templates/rapport/CreditRecommendation.tpl.php b/includes/giant/templates/rapport/CreditRecommendation.tpl.php
index 5e4283b44..5d348885b 100644
--- a/includes/giant/templates/rapport/CreditRecommendation.tpl.php
+++ b/includes/giant/templates/rapport/CreditRecommendation.tpl.php
@@ -1,51 +1,84 @@
-<script>
-function affCache(idpr)
-{
-	var pr = document.getElementById(idpr);
- 
-	if (pr.style.display == "") {
-		pr.style.display = "none";
-	} else {
-		pr.style.display = "";
-	}
-}
-</script>
-<div style="border:1px solid silver;background-color:#E0E1E6" align="center">
-Cliquez pour afficher la liste
-<div align="right" style="float:right">
-<img src="/pages/giant/media/icons/application_put.png" onclick="affCache('pr3');" style="cursor:pointer" />
-</div>
+<div id="divOpenData" style="" align="center">
+	Cliquez pour afficher la liste
+	<div align="right" style="float:right">
+		<img src="/pages/giant/media/icons/application_put.png" class="idpr" id="r3" style="cursor:pointer" />
+	</div>
 </div>
 <div id="pr3" style="display:none">
-<?php
-function _getInformation($CreditRecommendation, $config)
-{
-	foreach($CreditRecommendation as $objs => $valeur)
-	{
-		if (is_object($valeur))
+	<table  id="TableContentInformation" width="100%">
+		<?php 
+		$i = 0;
+		foreach($CreditRecommendation as $champ => $valeur)
 		{
-			foreach($valeur as $champs => $val)
-			{
-				if (!is_object($val))
+			echo '<tr>';
+				if ($champ == 'Description')
+					echo '<td align="center" colspan="3">' . $valeur->_ .'</td>';
+			echo '</tr>';
+		}
+		
+		foreach($CreditRecommendation as $champ => $valeur)
+		{
+			echo '<tr>';
+				if ($champ == 'AmountAdvised')
 				{
-					if ($champs != 'operator')
+					echo '<td colspan="2"><b>'.SelectTrueLabel($this->labelConfig, $champ).'</b></td>';
+					echo '<td align="right">' . $valeur->_ .'</td>';
+				}
+			echo '</tr>';
+			if (is_object($valeur))
+			{
+				foreach($valeur as $chmp => $val)
+				{
+					if ($chmp == 'ProviderRiskClass')
 					{
-						if ($champs == '_')
-							echo '<br /><b>'.SelectTrueLabel($config, 'EncourConseille') . '</b> : '.$val . ' ';
-						else
-							echo '<br /><b>'.SelectTrueLabel($config, $champs) . '</b> : '.$val . ' ';
+						echo '<tr>';
+							echo '<td valign="top">';
+								echo '<table width="100%">';
+									echo '<tr>';
+										echo '<td><b>';
+											echo SelectTrueLabel($this->labelConfig, 'RatingName');
+										echo '</b></td>';
+										echo '<td><b>';
+											echo SelectTrueLabel($this->labelConfig, 'RatingValue');
+										echo '</b></td>';
+									echo '<tr>';
+									foreach($val as $ProviderRisks => $info)
+									{
+										$i++;
+										echo '<tr>';
+											echo '<td class="GiantTooltip" title="'.$info->Description->_.'">'.$info->RatingName->_. '</td>';
+											echo '<td>'.$info->RatingValue.'</td>';
+										echo '</tr>';
+									}
+								echo '</table>';
+							echo '</td>';
+					} else if ($chmp == 'CommonRiskClass')
+					{
+							echo '<td colspan="'.$i.'" valign="top">';
+								echo '<table width="100%">';
+									echo '<tr>';
+										echo '<td><b>';
+											echo SelectTrueLabel($this->labelConfig, 'RatingName');
+										echo '</b></td>';
+										echo '<td><b>';
+											echo SelectTrueLabel($this->labelConfig, 'RatingValue');
+										echo '</b></td>';
+									echo '</tr>';
+									echo '<tr>';
+										echo '<td class="GiantTooltip" title="'.$val->RatingName->_.'">';
+											echo $val->RatingName->_;
+										echo '</td>';
+										echo '<td>';
+											echo $val->RatingValue;
+										echo '</td>';
+									echo '</tr>';
+								echo '</table>';
+							echo '</td>';
+						echo '</tr>';
 					}
 				}
-				else
-					_getInformation($val, $config);
 			}
-		} else {
-			if ($objs == 'RatingValue')
-				echo '<br /><b>'.SelectTrueLabel($config, 'note') . '</b> : '. $valeur . '/20';
 		}
-	}
-}
-
-_getInformation($CreditRecommendation, $this->labelConfig);
-?>
+		?>
+	</table>
 </div>
\ No newline at end of file
diff --git a/includes/giant/templates/rapport/Employees.tpl.php b/includes/giant/templates/rapport/Employees.tpl.php
index 48f5faf4e..45a8f61ea 100644
--- a/includes/giant/templates/rapport/Employees.tpl.php
+++ b/includes/giant/templates/rapport/Employees.tpl.php
@@ -1,36 +1,23 @@
-<script>
-function affCache(idpr)
-{
-	var pr = document.getElementById(idpr);
- 
-	if (pr.style.display == "") {
-		pr.style.display = "none";
-	} else {
-		pr.style.display = "";
-	}
-}
-</script>
-<div style="border:1px solid silver;background-color:#E0E1E6" align="center">
-Cliquez pour afficher la liste
-<div align="right" style="float:right">
-<img src="/pages/giant/media/icons/application_put.png" onclick="affCache('pr7');" style="cursor:pointer" />
-</div>
+<div id="divOpenData" style="" align="center">
+	Cliquez pour afficher la liste
+	<div align="right" style="float:right">
+		<img src="/pages/giant/media/icons/application_put.png" class="idpr" id="r7" style="cursor:pointer" />
+	</div>
 </div>
 <div id="pr7" style="display:none">
-<?php
-foreach($Employees as $valeur)
-{
-	if(isset($valeur->Period))
-	{
-		foreach($valeur->Period as $val)
-		{
-			foreach($val as $champ => $val)
+	<table width="100%" id="TableContentInformation">
+		<tr>
+			<td><b><?php echo SelectTrueLabel($this->labelConfig, 'StartDate');?></b></td>
+			<td><b><?php echo SelectTrueLabel($this->labelConfig, 'TotalStaffEmployed');?></b></td>
+		</tr>
+		<?php 
+			foreach($Employees as $champ => $valeur)
 			{
-				if ($champ == '_')
-					echo '<b>'.$val.'</b> : '.$valeur->TotalStaffEmployed.' Employees <br />';
+				echo '<tr>';
+					echo '<td>'.$valeur->Period->StartDate->_.'</td>';
+					echo '<td>'.$valeur->TotalStaffEmployed.' <i>'.SelectTrueLabel($this->labelConfig, 'Employeds').'</i></td>';
+				echo '</tr>';
 			}
-		}
-	}
-}
-?>
+		?>
+	</table>
 </div>
\ No newline at end of file
diff --git a/includes/giant/templates/rapport/FinancialSummary.tpl.php b/includes/giant/templates/rapport/FinancialSummary.tpl.php
index 45dc4d953..29ee43631 100644
--- a/includes/giant/templates/rapport/FinancialSummary.tpl.php
+++ b/includes/giant/templates/rapport/FinancialSummary.tpl.php
@@ -1,42 +1,40 @@
-<script>
-function affCache(idpr)
-{
-	var pr = document.getElementById(idpr);
- 
-	if (pr.style.display == "") {
-		pr.style.display = "none";
-	} else {
-		pr.style.display = "";
-	}
-}
-</script>
-<div style="border:1px solid silver;background-color:#E0E1E6" align="center">
-Cliquez pour afficher la liste
-<div align="right" style="float:right">
-<img src="/pages/giant/media/icons/application_put.png" onclick="affCache('pr4');" style="cursor:pointer" />
-</div>
+<div id="divOpenData" style="" align="center">
+	Cliquez pour afficher la liste
+	<div align="right" style="float:right">
+		<img src="/pages/giant/media/icons/application_put.png" class="idpr" id="r4" style="cursor:pointer" />
+	</div>
 </div>
 <div id="pr4" style="display:none">
-<?php
-$array = array();
-$i = 0;
-foreach($FinancialSummary as $champ => $valeur)
-{
-	if (!is_object($valeur))
-		echo '<b>'.SelectTrueLabel($this->labelConfig, $champ) . ' :</b> ' . $valeur . '<br />';
-	else {
-		foreach($valeur as $chmp => $val)
-		{
-			$array[$i]= $val;
-			$i++;
+	<table width="100%" id="TableContentInformation">	
+		<?php
+		$champFinancialSummary = array(
+			SelectTrueLabel($this->labelConfig, 'Revenue'),
+			SelectTrueLabel($this->labelConfig, 'TotalEquity'),
+			SelectTrueLabel($this->labelConfig, 'ProfitLoss'),
+			SelectTrueLabel($this->labelConfig, 'WorkingCapital'),
+			SelectTrueLabel($this->labelConfig, 'AuthorizedCapital'),
+			SelectTrueLabel($this->labelConfig, 'IssuedCapital'),
+			SelectTrueLabel($this->labelConfig, 'PaidUpCapital'));
+		
+		foreach(array($FinancialSummary) as $valeur) {
+			echo '<tr><td colspan="2" align="center"><b>'.substr($valeur->SummaryDate->_, 0, 4).'</b></td></tr>';
 		}
-	}
-}
-echo '<b>' .SelectTrueLabel($this->labelConfig, 'SummaryDate ') .': </b>'. $array[0] . '<br />';
-echo '<b>'.SelectTrueLabel($this->labelConfig, 'TotalEquity ') . ': </b>'.$array[3] . ' '. $array[4] .' <br />';
-echo '<b>'.SelectTrueLabel($this->labelConfig, 'WorkingCapital ') . ': </b>'.$array[6] . ' '.$array[7] .' <br />';
-echo '<b>'.SelectTrueLabel($this->labelConfig, 'AuthorizedCapital ') . ': </b>'.$array[9] . ' '. $array[10] .' <br />';
-echo '<b>'.SelectTrueLabel($this->labelConfig, 'IssuedCapital ') . ': </b>'.$array[12] . ' '. $array[13] .' <br />';
-echo '<b>'.SelectTrueLabel($this->labelConfig, 'PaidUpCapital ') . ': </b>'.$array[15] . ' '. $array[16] .' <br />';
-?>
+		foreach ($champFinancialSummary as $champ)
+		{
+			echo '<tr>';
+			echo '<td>' . $champ . '</td>';
+			foreach(array($FinancialSummary) as $valeur)
+			{
+				if (isset($valeur->$champ))
+				{
+					if (is_numeric($print = $valeur->$champ->_))
+						echo '<td align="right">' . $print * $valeur->Unit .' <b>'. $valeur->$champ->currency .'</b></td>';
+					else
+						echo '<td align="right">' . $print . '</td>';
+				}
+			}
+			echo '</tr>';
+		}
+		?>
+	</table>
 </div>
\ No newline at end of file
diff --git a/includes/giant/templates/rapport/LegalForm.tpl.php b/includes/giant/templates/rapport/LegalForm.tpl.php
index a1c48f639..f04cd60f2 100644
--- a/includes/giant/templates/rapport/LegalForm.tpl.php
+++ b/includes/giant/templates/rapport/LegalForm.tpl.php
@@ -1,24 +1,46 @@
-<table>
-<?php
-
-foreach($LegalForm as $champ => $val) {
-	if(!is_object($val)) {?>
+<div id="divOpenData" style="" align="center">
+	Cliquez pour afficher la liste
+	<div align="right" style="float:right">
+		<img src="/pages/giant/media/icons/application_put.png" class="idpr" id="r8" style="cursor:pointer" />
+	</div>
+</div>
+<div id="pr8" style="display:none">
+	<table width="100%" id="TableContentInformation">	
 		<tr>
-			<td><b><?php echo SelectTrueLabel($this->labelConfig, $champ);?> :</b> <?php echo $val;?></td>
+			<td><b><?php echo SelectTrueLabel($this->labelConfig, 'CountryLegalForm')?></b></td>
+			<td><?php echo $LegalForm->CountryLegalForm->_;?></td>
 		</tr>
-<?php } else {?>
 		<tr>
-			<td valign="top"><b><?php echo SelectTrueLabel($this->labelConfig, $champ);?></b>
-			<?php foreach ($val as $chmp => $row) {?>
-			<?php if(($chmp != 'code') and ($chmp != 'lang')) { $i = 1;?>
-				<table style="margin-left:10px">
-					<tr>
-						<td><?php echo $i++ .'- '.$row;?></td>
-					</tr>
-				</table>
-			<?php } }
-			}?>
-			</td>
+			<td><b><?php echo SelectTrueLabel($this->labelConfig, 'UnifiedLegalForm')?></b></td>
+			<td><?php echo $LegalForm->UnifiedLegalForm;?></td>
 		</tr>
-<?php }?>
-</table>
\ No newline at end of file
+		<tr>
+			<td><b><?php echo SelectTrueLabel($this->labelConfig, 'FoundedAsLegalForm')?></b></td>
+			<td><?php echo $LegalForm->FoundedAsLegalForm->_;?></td>
+		</tr>
+		<tr>
+			<td><b><?php echo SelectTrueLabel($this->labelConfig, 'Country')?></b></td>
+			<td><?php echo $LegalForm->Country;?></td>
+		</tr>
+	</table>
+	<?php /*foreach($LegalForm as $champ => $val) {
+		if(!is_object($val)) {?>
+			<tr>
+				<td><b><?php echo SelectTrueLabel($this->labelConfig, $champ);?> :</b> <?php echo $val;?></td>
+			</tr>
+		<?php } else {?>
+			<tr>
+				<td valign="top"><b><?php echo SelectTrueLabel($this->labelConfig, $champ);?></b>
+				<?php foreach ($val as $chmp => $row) {?>
+				<?php if(($chmp != 'code') and ($chmp != 'lang')) { $i = 1;?>
+					<table style="margin-left:10px">
+						<tr>
+							<td><?php echo $i++ .'- '.$row;?></td>
+						</tr>
+					</table>
+				<?php } }
+				}?>
+				</td>
+			</tr>
+	<?php }*/?>
+</div>
\ No newline at end of file
diff --git a/includes/giant/templates/rapport/Operations.tpl.php b/includes/giant/templates/rapport/Operations.tpl.php
index a595f5bbb..9ad24fa0a 100644
--- a/includes/giant/templates/rapport/Operations.tpl.php
+++ b/includes/giant/templates/rapport/Operations.tpl.php
@@ -1,17 +1,23 @@
-<table>
-<?php 
-foreach($Operations as $champ => $valeur) {?>
-<tr>
-<?php
-	if(!is_object($valeur))
-		echo '<td><b>'.SelectTrueLabel($this->labelConfig, $champ) .' : </b>' . $valeur.'</td>';
-	else
-	{
-		foreach($valeur as $chmp => $row)
+<div id="divOpenData" style="" align="center">
+	Cliquez pour afficher la liste
+	<div align="right" style="float:right">
+		<img src="/pages/giant/media/icons/application_put.png" class="idpr" id="r9" style="cursor:pointer" />
+	</div>
+</div>
+<div id="pr9" style="display:none">
+	<table width="100%" id="TableContentInformation">
+		<tr>
+			<td align="center"><b><?php echo SelectTrueLabel($this->labelConfig, 'ProductName');?></b></td>
+		</tr>
+		<?php 
+		foreach($Operations->ProductName as $opts)
 		{
-			echo '<td><b>'.SelectTrueLabel($this->labelConfig, $chmp) .' : </b>' . SelectTrueLabel($this->naceCodeList['Section_NaceCode'], $row).'</td>';
+			echo '<tr>';
+				echo '<td>';
+					echo $opts->_;
+				echo '</td>';
+			echo '</tr>';
 		}
-	} ?>
-</tr>
-<?php } ?>
-</table>
\ No newline at end of file
+		?>
+	</table>
+</div>
\ No newline at end of file
diff --git a/includes/giant/templates/rapport/Position.tpl.php b/includes/giant/templates/rapport/Position.tpl.php
index b294cbf59..3ccb16696 100644
--- a/includes/giant/templates/rapport/Position.tpl.php
+++ b/includes/giant/templates/rapport/Position.tpl.php
@@ -1,37 +1,57 @@
-<script>
-function affCache(idpr)
-{
-	var pr = document.getElementById(idpr);
- 
-	if (pr.style.display == "") {
-		pr.style.display = "none";
-	} else {
-		pr.style.display = "";
-	}
-}
-</script>
-<div style="border:1px solid silver;background-color:#E0E1E6" align="center">
-Cliquez pour afficher la liste
-<div align="right" style="float:right">
-<img src="/pages/giant/media/icons/application_put.png" onclick="affCache('pr1');" style="cursor:pointer" />
-</div>
+<div id="divOpenData" style="" align="center">
+	Cliquez pour afficher la liste
+	<div align="right" style="float:right">
+		<img src="/pages/giant/media/icons/application_put.png" class="idpr" id="r1" style="cursor:pointer" />
+	</div>
 </div>
 <div id="pr1" style="display:none">
-<?php
-	foreach (getArray($Position) as $t) {
-        if (isset($t->Person) == false) {
-            continue;
-        }
-        if (isset($t->Period->StartDate) == true) {
-            echo '<b>'.pdate($t->Period->StartDate);
-        }
-        echo ' - ';
-        if (isset($t->Period->EndDate) == true) {
-           echo pdate($t->Period->EndDate) .' : ';
-        }
-        echo '</b>'.$t->PositionTitle->_.' '.$t->Person->LastName . '<br />';
-        if (isset($t->Person->FirstName) == true) {
-           echo ' '.$t->Person->FirstName;
-        }
-    }
-?></div>
\ No newline at end of file
+	<?php 
+		foreach($Position as $champ => $obj)
+		{
+			$i = 0;
+			if (isset($obj->OtherPositions))
+			{
+				foreach($obj->OtherPositions as $other)
+				{
+					$OtherCompany .= 
+						'<table>'.
+							'<tr>'.
+								'<td colspan="2">'.
+									'<a target="_blank" href="/?page=GiantIdentiteSociete&pays='.$other->Company->Country.'&company='.$other->Company->CompanyId.'">'.
+									$other->Company->CompanyName->_.
+									'</a>'.
+								'</td>'.
+							'</tr>'.
+							'<tr>'.
+								'<td>'.SelectTrueLabel($this->labelConfig, 'StartDate').'</td>'.
+								'<td>'.$other->Period->StartDate->_.'</td>'.
+							'</tr>'.
+						'</table>';
+				}
+			}
+			echo '<table width="100%" id="TableContentInformation">';
+				echo '<tr>';
+					echo '<td colspan="2" align="center" class="GiantTooltip" title="'.htmlentities($OtherCompany).'">
+							<b>'.SelectTrueLabel($this->labelConfig, 'Name : ').'</b>'.$obj->Person->LastName;
+					echo '</td>';
+				echo '</tr>';
+				echo '<tr>';
+					echo '<td><b>'.SelectTrueLabel($this->labelConfig, 'StartDate').'</b></td>';
+					echo '<td>'.$obj->Period->StartDate->_.'</td>';
+				echo '<tr>';
+				echo '<tr>';
+					echo '<td><b>'.SelectTrueLabel($this->labelConfig,'PositionTitle').'</b></td>';
+					echo '<td>'.$obj->PositionTitle->_.'</td>';
+				echo '<tr>';
+				echo '<tr>';
+					echo '<td><b>'.SelectTrueLabel($this->labelConfig,'Type').'</b></td>';
+					echo '<td>'.$obj->Type.'</td>';
+				echo '<tr>';
+				echo '<tr>';
+					echo '<td><b>'.SelectTrueLabel($this->labelConfig,'Gender').'</b></td>';
+					echo '<td>'.$obj->Person->Gender.'</td>';
+				echo '<tr>';
+			echo '</table>';
+		}
+	?>
+</div> 
\ No newline at end of file