From 257fae95bda5961196642ec4e3f80878ea040180 Mon Sep 17 00:00:00 2001 From: Michael RICOIS Date: Wed, 19 Mar 2014 10:56:26 +0000 Subject: [PATCH] issue #0001847 : Correction etat du bilan (note 0003888) --- application/controllers/FinanceController.php | 3 +++ application/views/default/scripts/finance/liasseinfos.phtml | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/application/controllers/FinanceController.php b/application/controllers/FinanceController.php index e183a49f9..392b9b5bd 100644 --- a/application/controllers/FinanceController.php +++ b/application/controllers/FinanceController.php @@ -1389,14 +1389,17 @@ class FinanceController extends Zend_Controller_Action if ( $response === null ) { $this->view->assign('msg','Aucun bilan déposé.'); } else { + $date = new Zend_Date($response->DateCloture, 'yyyy-MM-dd'); $this->view->assign('DateCloture', $date->toString('dd/MM/yyyy')); $this->view->assign('DateClotureIso', $response->DateCloture); + if ( $response->SaisieDate!='' || $response->SaisieDate!='0000-00-00' ) { $this->view->assign('SaisieDateIso', $response->SaisieDate); $date = new Zend_Date($response->SaisieDate, 'yyyy-MM-dd'); $this->view->assign('SaisieDate', $date->toString('dd/MM/yyyy')); } + $this->view->assign('SaisieLabel', $response->SaisieLabel); } } diff --git a/application/views/default/scripts/finance/liasseinfos.phtml b/application/views/default/scripts/finance/liasseinfos.phtml index b912dccd2..24aaddaa3 100644 --- a/application/views/default/scripts/finance/liasseinfos.phtml +++ b/application/views/default/scripts/finance/liasseinfos.phtml @@ -2,7 +2,7 @@ DateClotureIso ) { ?> Le dernier millésime déposé au greffe est le DateCloture?>. -SaisieDateIso && $this->SaisieCode=='00' ) {?> +SaisieDateIso && $this->SaisieCode == 0 ) {?> Le bilan a été saisie le SaisieDate?>. Le bilan n'a pas été saisie par la source officielle (SaisieLabel?>).