diff --git a/include/class/class_lettering.php b/include/class/class_lettering.php index 11119779d..8821bdfb3 100644 --- a/include/class/class_lettering.php +++ b/include/class/class_lettering.php @@ -266,7 +266,7 @@ class Lettering function get_linked($p_jlid) { $sql="select j_id,j_date,to_char(j_date,'DD.MM.YYYY') as j_date_fmt, - j_montant,j_debit,jr_comment,jr_internal,jr_id,jr_def_id, + j_montant,j_debit,jr_comment,jr_internal,jr_id,jr_def_id,jr_pj_number, coalesce(comptaproc.get_letter_jnt(j_id),-1) as letter from jrnx join jrn on (j_grpt = jr_grpt_id) where @@ -446,7 +446,8 @@ class Lettering_Account extends Lettering $sql=" select j_id,j_date,to_char(j_date,'DD.MM.YYYY') as j_date_fmt, j_montant,j_debit,jr_comment,jr_internal,jr_id,jr_def_id, - coalesce(comptaproc.get_letter_jnt(j_id),-1) as letter + coalesce(comptaproc.get_letter_jnt(j_id),-1) as letter, + jr_pj_number from jrnx join jrn on (j_grpt = jr_grpt_id) where j_poste = $1 and j_date >= to_date($2,'DD.MM.YYYY') and j_date <= to_date ($3,'DD.MM.YYYY') and $this->sql_ledger diff --git a/include/template/letter_prop.php b/include/template/letter_prop.php index b2136da42..3422e8963 100644 --- a/include/template/letter_prop.php +++ b/include/template/letter_prop.php @@ -27,6 +27,9 @@ $delta=0; + + + @@ -67,6 +70,9 @@ if ($linked_limit != 0 && $i==$linked_limit) + + + @@ -106,12 +112,14 @@ $letter=($this->content[$i]['letter']< 0)?" ":strtoupper(base_convert($this->con content[$i]['j_date_fmt'])?> + content[$i]['jr_pj_number']);?> %s', $this->content[$i]['jr_id'], $gDossier, $this->content[$i]['jr_internal']); ?> - content[$i]['jr_comment']?> + + content[$i]['jr_comment'])?> content[$i]['j_debit']=='t') : ?> content[$i]['j_montant'])?>