diff --git a/include/impress_inc.php b/include/impress_inc.php index 1291ee41f..2a6fefb6b 100644 --- a/include/impress_inc.php +++ b/include/impress_inc.php @@ -430,7 +430,7 @@ function GetDataJrnPdf($p_cn,$p_array,$p_limit,$p_offset) "jr_grpt_id=j_grpt ". " left join tmp_pcmn on pcm_val=j_poste ". " where j_jrn_def=".$p_array['p_id']. - " and ".$cond." order by j_id,j_date::date,j_grpt,j_debit desc". + " and ".$cond." order by j_date::date asc,jr_internal,j_debit desc". " limit ".$p_limit." offset ".$p_offset); }else { // Journaux centralisés diff --git a/include/user_action_ach.php b/include/user_action_ach.php index d906a06fd..e20857bfa 100644 --- a/include/user_action_ach.php +++ b/include/user_action_ach.php @@ -133,9 +133,9 @@ if ( $action == 'voir_jrn' ) { if ( $action == 'voir_jrn_non_paye' ) { // Show list of unpaid sell // Date - date of payment - Customer - amount - $sql=SQL_LIST_UNPAID_INVOICE_DATE_LIMIT." and jr_def_id=$g_jrn" ; + $sql=SQL_LIST_UNPAID_INVOICE_DATE_LIMIT." and jr_def_id=$g_jrn " ; $list=ListJrn($cn,$g_jrn,$sql); - $sql=SQL_LIST_UNPAID_INVOICE." and jr_def_id=$g_jrn" ; + $sql=SQL_LIST_UNPAID_INVOICE." and jr_def_id=$g_jrn " ; $list2=ListJrn($cn,$g_jrn,$sql); echo '
'; echo '

Echeance dépassée

';