diff --git a/include/class/fiche.class.php b/include/class/fiche.class.php index 4c73081c0..27ce929ad 100644 --- a/include/class/fiche.class.php +++ b/include/class/fiche.class.php @@ -765,10 +765,10 @@ class Fiche case 0: break; case 1: - $sql_let=' and j_id in (select j_id from letter_cred union select j_id from letter_deb)'; + $sql_let=' and j1.j_id in (select j_id from letter_cred union select j_id from letter_deb)'; break; case '2': - $sql_let=' and j_id not in (select j_id from letter_cred union select j_id from letter_deb) '; + $sql_let=' and j1.j_id not in (select j_id from letter_cred union select j_id from letter_deb) '; break; } @@ -816,7 +816,7 @@ class Fiche $res_saldo = $this->cn->exec_sql("select sum(deb_montant),sum(cred_montant) from (select case when j_debit='t' then j_montant else 0 end as deb_montant, case when j_debit='f' then j_montant else 0 end as cred_montant - from jrnx + from jrnx j1 join jrn_def on (jrn_def_id=j_jrn_def ) join jrn on (jr_grpt_id=j_grpt) join tmp_pcmn on (j_poste=pcm_val) diff --git a/include/lib/http_input.class.php b/include/lib/http_input.class.php index 5dd16a636..7628a678a 100644 --- a/include/lib/http_input.class.php +++ b/include/lib/http_input.class.php @@ -77,7 +77,7 @@ class HttpInput /** * \brief Check the type of the value * @param $p_name name of the variable - * @param $p_type type of the variable (number,string,text,date,array) + * @param $p_type (string) type of the variable (number,string,text,date,array,raw) * @throws Exception if the variable doesn't exist or type incorrect * @todo Add regex:pattern */