diff --git a/html/style-color.css b/html/style-color.css index ee6c374a9..d0443de92 100644 --- a/html/style-color.css +++ b/html/style-color.css @@ -12,12 +12,18 @@ BODY { font-style: italic; } -table.result,table.document { +table.result,table.document ,table.resultfooter{ color:blue; border:1px solid blue ; width:100%; border-spacing: 0px; border-collapse:collapse; +} +table.resultfooter tfoot { + font-size:110%; + font-weight: bold; + + } table.result th, table.document th { font-weight:bold; diff --git a/include/ac_common.php b/include/ac_common.php index 601c27799..84608da94 100644 --- a/include/ac_common.php +++ b/include/ac_common.php @@ -523,6 +523,18 @@ function shrink_date ($p_date) { $date=str_replace('.','',$p_date); $str_date=substr($date,0,4).substr($date,6,2); return $str_date; +} + /** + *@brief format the date, when taken from the database the format + * is MM-DD-YYYY + *@param $p_date format YYYY-MM-DD + *@return date in the format DD.MM.YYYY + */ +function format_date ($p_date) { + $date=explode('-',$p_date); + if ( count($date) != 3) return $p_date; + $str_date=$date[2].'.'.$date[1].'.'.$date[0]; + return $str_date; } /** *@brief ereg is not supported from the version 5.3 and is marked as diff --git a/include/class_acc_account_ledger.php b/include/class_acc_account_ledger.php index 35db089be..706ca4550 100644 --- a/include/class_acc_account_ledger.php +++ b/include/class_acc_account_ledger.php @@ -281,7 +281,8 @@ function get_solde_detail($p_cond="") { $rep=""; echo '

'.$this->id." ".$this->name.'

'; - echo ""; + echo "
"; + echo ''; echo "". "". "". @@ -306,15 +307,18 @@ function get_solde_detail($p_cond="") { ""; } + echo ''; $solde_type=($tot_deb>$tot_cred)?"solde débiteur":"solde créditeur"; $diff=round(abs($tot_deb-$tot_cred),2); echo "". - "". - "". - "". - "". - "". + "". + "". + "". + "". + "". ""; + echo ''; + echo ''; echo "
Code interne Date
$solde_type$diff$tot_deb$tot_cred$solde_type$diff$tot_deb$tot_cred
"; diff --git a/include/class_anc_operation.php b/include/class_anc_operation.php index 38c9a6816..a1285224e 100644 --- a/include/class_anc_operation.php +++ b/include/class_anc_operation.php @@ -434,7 +434,7 @@ function display_form_plan($p_array,$p_null,$p_mode,$p_seq,$p_amount,$p_id='') { if ( $p_mode==1 ) { // editable $select->readonly=false; - if ( isset($hplan) ) + if ( isset($hplan) && isset($hplan[$p_seq][$count]) ) $select->selected=$hplan[$p_seq][$count]; } else { // view only diff --git a/include/class_fiche.php b/include/class_fiche.php index ff547bc98..15ba627ef 100644 --- a/include/class_fiche.php +++ b/include/class_fiche.php @@ -1054,7 +1054,8 @@ av_text1=>'name' $rep=""; echo '

'." ".$name.'

'; - echo ""; + echo "
"; + echo ''; echo "". "". "". @@ -1069,10 +1070,9 @@ av_text1=>'name' $op['jr_id'], dossier::id(), $op['jr_internal']); $let=''; if ( $op['letter'] !=-1) $let=$op['letter']; - echo "". "". - "". + "". "". "". "". @@ -1082,13 +1082,17 @@ av_text1=>'name' } $solde_type=($tot_deb>$tot_cred)?"solde débiteur":"solde créditeur"; $diff=round(abs($tot_deb-$tot_cred),2); + echo ''; + echo "". "". - "". + "". "". - "". - "". + "". + "". ""; + echo ''; + echo ''; echo "
"._('Code interne')." "._('Date')."
".$vw_operation."".$op['j_date_fmt']."".format_date($op['j_date_fmt'])."".h($op['description'])."".$op['deb_montant']."".$op['cred_montant']."
$solde_type$diff$diff$tot_deb$tot_cred$tot_deb$tot_cred
"; diff --git a/include/template/ledger_detail_misc.php b/include/template/ledger_detail_misc.php index 7a36a9167..d32607c1a 100644 --- a/include/template/ledger_detail_misc.php +++ b/include/template/ledger_detail_misc.php @@ -17,7 +17,7 @@ require_once ('class_anc_plan.php'); -det->jr_date);?> +det->jr_date));?>