diff --git a/include/jrn.php b/include/jrn.php index 5ed88d126..0f54f73c9 100644 --- a/include/jrn.php +++ b/include/jrn.php @@ -543,9 +543,13 @@ function GetJrnProperty($p_cn,$p_jrn) * - an array containing properties * */ -function GetJrnProp($p_dossier,$p_jrn) +function GetJrnProp($p_dossier,$p_jrn,$is_connected=0) { - $cn=DbConnect($p_dossier); + if ( $is_connected == 0 ) + $cn=DbConnect($p_dossier); + else + $cn=$p_dossier; + $Res=ExecSql($cn,"select jrn_Def_id,jrn_def_name,jrn_def_class_deb,jrn_def_class_cred,jrn_def_type, jrn_deb_max_line,jrn_cred_max_line,jrn_def_ech,jrn_def_ech_lib,jrn_def_code, jrn_def_fiche_deb,jrn_def_fiche_deb diff --git a/include/user_common.php b/include/user_common.php index dc0173aeb..d063c74d6 100644 --- a/include/user_common.php +++ b/include/user_common.php @@ -341,7 +341,9 @@ function ListJrn($p_cn,$p_jrn,$p_where="",$p_array=null) $r.="Op. Concernée"; $r.="Document"; $r.=""; - + // Get the jrn type + + $jrn_prop=($p_jrn == 0 )?0:$jrn_prop=GetJrnProp($p_cn,$p_jrn,1); for ($i=0; $i < $Max;$i++) { $row=pg_fetch_array($Res,$i); @@ -369,8 +371,16 @@ function ListJrn($p_cn,$p_jrn,$p_where="",$p_array=null) $r.=""; // Amount - $r.=""; - $r.=$row['jr_montant']; + // If the ledger is financial : + // the credit must be negative and written in red + $positive=0; + if ( $p_jrn !=0 && $jrn_prop['jrn_def_type'] == 'FIN' ) { + $positive = CountSql($p_cn,"select * from jrn inner join jrnx on jr_grpt_id=j_grpt ". + " where jr_id=".$row['jr_id']." and (j_poste like '55%' or j_poste like '57%' )". + " and j_debit='f'"); + } + $r.=""; + $r.=( $positive != 0 )?" - ".sprintf("%8.2f",$row['jr_montant'])."":sprintf("%8.2f",$row['jr_montant']); $r.=""; // Rapt @@ -691,4 +701,3 @@ function isValid ($p_cn,$p_grpt_id) { } -