From 427faed75dd63a40dbe3234fc65fbb83cef12f0b Mon Sep 17 00:00:00 2001 From: Dany De Bontridder Date: Wed, 28 Apr 2010 21:38:55 +0000 Subject: [PATCH] Lettering ========= Small bugs + replace modifyOperation by viewOperation --- include/impress_gl_comptes.inc.php | 2 +- include/template/letter_all.php | 6 +++--- include/template/letter_prop.php | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/include/impress_gl_comptes.inc.php b/include/impress_gl_comptes.inc.php index ddc7cac9f..3adb09428 100644 --- a/include/impress_gl_comptes.inc.php +++ b/include/impress_gl_comptes.inc.php @@ -58,7 +58,7 @@ $date_from=new IDate('from_periode'); $date_to=new IDate('to_periode'); $year=$User->get_exercice(); $date_from->value=(isset($_REQUEST['from_periode']))?$_REQUEST['from_periode']:$first_day; -$date_to->value=(isset($_REQUEST['to_periode']))?$_REQUEST['to_periode']:$last_day['p_end']; +$date_to->value=(isset($_REQUEST['to_periode']))?$_REQUEST['to_periode']:$last_day; echo td(_('Depuis').$date_from->input()); echo td(_('Jusque ').$date_to->input()); // diff --git a/include/template/letter_all.php b/include/template/letter_all.php index d8fe411b6..195b5b182 100644 --- a/include/template/letter_all.php +++ b/include/template/letter_all.php @@ -54,8 +54,8 @@ $js="this.gDossier=".dossier::id(). content[$i]['j_date_fmt']?> %s', - $this->content[$i]['jr_id'], $l_sessid,$gDossier, $this->content[$i]['jr_def_id'],'S', $this->content[$i]['jr_internal']); +$r=sprintf('%s', + $this->content[$i]['jr_id'], $l_sessid,$gDossier, $this->content[$i]['jr_internal']); ?> content[$i]['jr_comment'])?> @@ -74,7 +74,7 @@ $r=sprintf(' ".$operation->get_internal()." [ $l_amount € ]"; + echo " ".$operation->get_internal()." [ $l_amount € ]"; }//for }// if ( $a != null ) { // compute amount diff --git a/include/template/letter_prop.php b/include/template/letter_prop.php index 2711b07e6..9b57d748f 100644 --- a/include/template/letter_prop.php +++ b/include/template/letter_prop.php @@ -65,8 +65,8 @@ $letter=($this->content[$i]['letter']==-1)?" ":$this->content[$i]['letter']; content[$i]['j_date_fmt']?> %s', - $this->content[$i]['jr_id'], $l_sessid,$gDossier, $this->content[$i]['jr_def_id'],'S', $this->content[$i]['jr_internal']); +$r=sprintf('%s', + $this->content[$i]['jr_id'], $l_sessid,$gDossier, $this->content[$i]['jr_internal']); ?> content[$i]['jr_comment']?> @@ -85,7 +85,7 @@ $r=sprintf(' ".$operation->get_internal()." [ $l_amount € ]"; + echo " ".$operation->get_internal()." [ $l_amount € ]"; }//for }// if ( $a != null ) {