From 16b67af0805d40e4ba5ca5f121c0a0e3f45ebf84 Mon Sep 17 00:00:00 2001
From: Michael RICOIS <mricois@scores-decisions.com>
Date: Fri, 7 Feb 2014 14:07:18 +0000
Subject: [PATCH] =?UTF-8?q?issue=20#0001851=20:=20Correction=20affichage?=
 =?UTF-8?q?=20ann=C3=A9e=20N-1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/controllers/FinanceController.php         | 11 +++++++++--
 .../views/default/scripts/finance/liasse/2050.phtml   |  4 ++--
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/application/controllers/FinanceController.php b/application/controllers/FinanceController.php
index e154cd369..21748215b 100644
--- a/application/controllers/FinanceController.php
+++ b/application/controllers/FinanceController.php
@@ -924,8 +924,15 @@ class FinanceController extends Zend_Controller_Action
 
     	        $date = new Zend_Date($infoLiasse->getInfo('dateCloture'), 'yyyyMMdd');
     	        $this->view->assign('dateClotureD', $date->toString('dd/MM/yyyy'));
-    	        $date = new Zend_Date($infoLiasse->getInfo('dateCloturePre'), 'yyyyMMdd');
-    	        $this->view->assign('dateCloturePreD', $date->toString('dd/MM/yyyy'));
+
+    	        Zend_Registry::get('firebug')->info('test:'.$infoLiasse->getInfo('dateCloturePre'));
+    	        $dateCloturePre = $infoLiasse->getInfo('dateCloturePre');
+    	        if ( $dateCloturePre == '' ) {
+    	            $this->view->assign('dateCloturePreD', '-');
+    	        } else {
+    	            $date = new Zend_Date($dateCloturePre, 'yyyyMMdd');
+    	            $this->view->assign('dateCloturePreD', $date->toString('dd/MM/yyyy'));
+    	        }
 
     	        $this->view->assign('dureesMois', $infoLiasse->getInfo('dureeMois'));
     	        $this->view->assign('dureesMoisPre', $infoLiasse->getInfo('dureeMoisPre'));
diff --git a/application/views/default/scripts/finance/liasse/2050.phtml b/application/views/default/scripts/finance/liasse/2050.phtml
index 86ca0d97b..561e13a5d 100644
--- a/application/views/default/scripts/finance/liasse/2050.phtml
+++ b/application/views/default/scripts/finance/liasse/2050.phtml
@@ -12,8 +12,8 @@
 	</td>
 	<td colspan="2"><b>Brut</b></td>
 	<td colspan="2"><b>Amortissement, provisions</b></td>
-	<td><b><?php echo $this->dateCloture.'<br/>'.$this->dureesMois?> Mois</b></td>
-	<td><b><?php echo $this->dateCloturePre.'<br/>'.$this->dureesMoisPre;?> Mois</b></td>
+	<td><b><?=$this->dateCloture?></b><br/><?php if($this->dureesMois!='') {?><b><?=$this->dureesMois?> Mois</b><?php }?></td>
+	<td><b><?=$this->dateCloturePre?></b><br/><?php if($this->dureesMoisPre!='') {?><b><?=$this->dureesMoisPre?> Mois</b><?php }?></td>
 </tr>
 <tr>
 	<td rowspan="19">A<br/>C<br/>T<br/>I<br/>F<br/></td>