From 0a4f9df1b20abbf6e95b19c1481dc34c4fc40cda Mon Sep 17 00:00:00 2001
From: Michael RICOIS <mricois@scores-decisions.com>
Date: Mon, 30 Sep 2013 09:51:29 +0000
Subject: [PATCH] Correction bug de la cle sur le tableau des bilans (pieces
 officielles)

---
 application/controllers/PiecesController.php         | 2 +-
 application/views/default/scripts/pieces/actes.phtml | 4 +++-
 library/Infogreffe/Infogreffe.php                    | 6 ++++--
 public/themes/default/styles/main.css                | 9 ++++-----
 4 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/application/controllers/PiecesController.php b/application/controllers/PiecesController.php
index 64dc812cb..57eb51fc1 100644
--- a/application/controllers/PiecesController.php
+++ b/application/controllers/PiecesController.php
@@ -376,7 +376,7 @@ class PiecesController extends Zend_Controller_Action
     			{
     				$infosBilan = array();
     				$infosBilan['date'] = $item['date_cloture'];
-    				$infosBilan['type'] = 'Comptes millésime '.$item['millesime'];
+    				$infosBilan['type'] = 'Comptes '.$item['type'].' millésime '.$item['millesime'];
     				$infosBilan['mode'] = $item['mode'];
     				$infos = array(
     					'date_cloture' => $item['date_cloture'],
diff --git a/application/views/default/scripts/pieces/actes.phtml b/application/views/default/scripts/pieces/actes.phtml
index e960b918c..9524bbf1c 100644
--- a/application/views/default/scripts/pieces/actes.phtml
+++ b/application/views/default/scripts/pieces/actes.phtml
@@ -29,11 +29,13 @@
   </tr>
   <?php }?>
 </table>
+</div>
 
 <div style="margin:5px;" class="ui-state-highlight ui-corner-all">
 <p><span style="float: left; margin-right: 0.3em;" class="ui-icon ui-icon-info"></span>
 Les éléments disponibles ci-dessous en téléchargement ou commande peuvent faire l'objet d'une facturation selon vos accords contractuels.
-</p></div>
+</p>
+</div>
 
 <h2>Actes & Status</h2>
 <div class="paragraph">
diff --git a/library/Infogreffe/Infogreffe.php b/library/Infogreffe/Infogreffe.php
index c2f626bb5..ae24d238b 100644
--- a/library/Infogreffe/Infogreffe.php
+++ b/library/Infogreffe/Infogreffe.php
@@ -547,13 +547,15 @@ class Infogreffe
 				$bilan['mode_diffusion'][] = $mode->getAttribute('type');
 			}
 
+			Zend_Registry::get('firebug')->info('Bilan : '.$bilan['date_cloture'].' '.$bilan['type_comptes']);
+
 			//Génération de l'index pour le tri
 			$date = $bilan['date_cloture_iso'];
 			if(!empty($date))
 			{
-				$datef = substr($date,0,4).substr($date,5,2).substr($date,8,2);
+				$key = substr($date,0,4).substr($date,5,2).substr($date,8,2).'-'.$bilan['num_depot'];
 				//Affectation liste générale avec un index permettant le tri
-				$bilans[$datef] = $bilan;
+				$bilans[$key] = $bilan;
 			}
 		}
 		krsort($bilans);
diff --git a/public/themes/default/styles/main.css b/public/themes/default/styles/main.css
index 37236b1eb..6560cb53b 100644
--- a/public/themes/default/styles/main.css
+++ b/public/themes/default/styles/main.css
@@ -657,12 +657,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 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 { background-color:#2b2b8b;color:white;font-weight:bold;}
+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 td.date {text-align:center;background-color:#2b2b8b;color:white;font-weight:bold;width:90px;}
 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