issue #0001851 : Correction affichage année N-1

This commit is contained in:
Michael RICOIS 2014-02-07 14:07:18 +00:00
parent ebb10e0307
commit 16b67af080
2 changed files with 11 additions and 4 deletions

View File

@ -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'));

View File

@ -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>