diff --git a/include/anc_group.inc.php b/include/anc_group.inc.php index 99bf3e006..de9f715df 100644 --- a/include/anc_group.inc.php +++ b/include/anc_group.inc.php @@ -55,7 +55,7 @@ if ( isset($_POST['add'])) } $array=$r->myList(); -echo '
'; +echo '
'; echo '
'; echo dossier::hidden(); echo ''; diff --git a/include/anc_imp.inc.php b/include/anc_imp.inc.php index 2b2e841cd..28ee5ca95 100644 --- a/include/anc_imp.inc.php +++ b/include/anc_imp.inc.php @@ -38,9 +38,13 @@ $menu=array(array("?p_action=ca_imp&sub=listing&$str_dossier",_("Listing"),_("Li array("?p_action=ca_imp&sub=bc2&$str_dossier",_("Balance croisée"),_("Balance croisée de 2 plans analytiques"),"bc2") ); $sub=(isset($_GET['sub']))?$_GET['sub']:'no'; -echo '
'; + +echo '
'; echo ShowItem($menu,"H","mtitle","mtitle",$sub); echo '
'; + +echo '
'; + $hidden=new IHidden(); $str_hidden=$hidden->input("p_action","ca_imp"); $str_hidden.=$hidden->input("sub",$sub); @@ -67,6 +71,7 @@ if ( $sub=='listing') echo $list->display_html(); echo '
'; } + echo '
'; } //------------------------------------------------------------------------------ diff --git a/include/anc_od.inc.php b/include/anc_od.inc.php index 65f77688f..459a658e6 100644 --- a/include/anc_od.inc.php +++ b/include/anc_od.inc.php @@ -48,7 +48,7 @@ if ( ! $m ) // show the left menu //---------------------------------------------------------------------- echo ' -
+
diff --git a/include/class_anc_balance_double.php b/include/class_anc_balance_double.php index 9c4677a3b..e5a1ee3c5 100644 --- a/include/class_anc_balance_double.php +++ b/include/class_anc_balance_double.php @@ -88,7 +88,7 @@ class Anc_Balance_Double extends Anc_Print // new $r.="
"; - $r.=""; + $r.="
"; $r.=""; $r.=""; $r.=""; @@ -105,19 +105,19 @@ class Anc_Balance_Double extends Anc_Print $tot_cred+=$row['a_c']; $r.=sprintf("",h($row['b_po_name'])); - $r.=sprintf("",$row['a_d']); - $r.=sprintf("",$row['a_c']); - $r.=sprintf("",$row['a_solde']); + $r.=td(nbm($row['a_d'])); + $r.=td(nbm($row['a_c'])); + $r.=td(nbm($row['a_solde'])); $r.=sprintf("",$row['a_debit']); $r.=""; } if ( $tot_deb != 0 || $tot_cred !=0 ) { $r.=""; - $r.=""; + $r.=""; $s=abs($tot_deb-$tot_cred); $d=($tot_deb>$tot_cred)?'debit':'credit'; - $r.=""; + $r.=""; $r.=""; } @@ -129,8 +129,8 @@ class Anc_Balance_Double extends Anc_Print $r.=''; $r.=''; $r.=''; - $r.=''; - $r.=''; + $r.=''; + $r.=''; $r.=''; $r.=''; } diff --git a/include/class_anc_balance_simple.php b/include/class_anc_balance_simple.php index bb9daa4be..b629f49bd 100644 --- a/include/class_anc_balance_simple.php +++ b/include/class_anc_balance_simple.php @@ -121,7 +121,7 @@ class Anc_Balance_Simple extends Anc_Print */ function display_html() { - $r="
Poste comptable AnalytiquePoste comptable Analytique%s%12.2f%12.2f%12.2f%s
Total $tot_deb $tot_credTotal ".nbm($tot_deb)." ".nbm($tot_cred)."$s$d".nbm($s)."$d
'.$row['poste'].''.$row['desc'].''.$row['debit'].''.$row['credit'].''.nbm($row['debit']).''.nbm($row['credit']).''.$row['dc'].'
"; + $r="
"; $r.=""; $r.=""; $r.=""; @@ -145,9 +145,9 @@ class Anc_Balance_Simple extends Anc_Print // the name and po_id // $r.=sprintf("",$row['po_id']); $r.=sprintf("",h($row['po_name'])); - $r.=sprintf("",$row['sum_deb']); - $r.=sprintf("",$row['sum_cred']); - $r.=sprintf("",$row['solde']); + $r.=td(nbm($row['sum_deb'])); + $r.=td(nbm($row['sum_cred'])); + $r.=td(nbm($row['solde'])); $deb=($row['sum_deb'] > $row['sum_cred'])?"D":"C"; $deb=($row['solde'] == 0 )?'':$deb; $r.=sprintf("",$deb); diff --git a/include/class_anc_listing.php b/include/class_anc_listing.php index 174d9a67b..e24a79b21 100644 --- a/include/class_anc_listing.php +++ b/include/class_anc_listing.php @@ -77,7 +77,7 @@ class Anc_Listing extends Anc_Print $r.= _("aucune donnée"); return $r; } - $r.= '
Poste comptable AnalytiqueDébit%s%s%12.2f%12.2f%12.2f%s
'; + $r.= '
'; $r.= ''. ''. ''. @@ -92,7 +92,7 @@ class Anc_Listing extends Anc_Print ''. ''. ''. - ''. + ''. ''; $r.= ''; } diff --git a/include/periode.inc.php b/include/periode.inc.php index 388335bce..02667eb81 100644 --- a/include/periode.inc.php +++ b/include/periode.inc.php @@ -44,9 +44,15 @@ if ( $action=="change_per") echo ''; echo dossier::hidden(); echo ' '; - echo ''; - echo ''; - echo ''; + + $istart=new IDate('p_date_start'); + $iend=new IDate('p_date_end'); + $iexercice=new INum('p_exercice'); + $iexercice->size=5; + echo td($istart->input()); + echo td($iend->input()); + echo td($iexercice->input()); + echo ''; echo "
'._('Date').''._('Nom').''.$row['oa_date'].''.h($row['po_name']).''.h($row['oa_description']).''.$row['oa_amount'].''.nbm($row['oa_amount']).''.(($row['oa_debit']=='f')?'CREDIT':'DEBIT').'
'; echo '
"; @@ -62,7 +68,8 @@ if ( isset ($_POST["conf_chg_per"] ) ) if (isDate($p_date_start) == null || isDate($p_date_end) == null || strlen (trim($p_exercice)) == 0 || - (string) $p_exercice != (string)(int) $p_exercice) + (string) $p_exercice != (string)(int) $p_exercice || + $p_exercice < 2000 || $p_exercice > 2099 ) { alert(_('Valeurs invalides')); }