[Noalyss-commit] [noalyss] 04/08: Task #1267 - Lettrage : la colonne ref doit contenir le numéro de PJ #1267 : Lettrage : la colonne ref doit contenir le numéro de PJ

[Dany De Bontridder]

sparkyx pushed a commit to branch master
in repository noalyss.

commit b5b46d78a1c996f8527b07c1ea8d6aee2631df7d
Author: Dany De Bontridder <address@hidden>
Date:   Fri Feb 12 16:09:41 2016 +0100

    Task #1267 - Lettrage : la colonne ref doit contenir le numéro de PJ
    #1267 :  Lettrage : la colonne ref doit contenir le numéro de PJ
---
 include/class/class_lettering.php |    5 +++--
 include/template/letter_prop.php  |   10 +++++++++-
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/include/class/class_lettering.php 
b/include/class/class_lettering.php
index 1111977..8821bdf 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 b2136da..3422e89 100644
--- a/include/template/letter_prop.php
+++ b/include/template/letter_prop.php
@@ -28,6 +28,9 @@ $delta=0;
    <?php echo _('Ref')?>
 </th>
 <th>
+   <?php echo _('Internal')?>
+</th>    
+<th>
    <?php echo _('Description')?>
 </th>
 <th style="text-align:right">
@@ -68,6 +71,9 @@ if ($linked_limit != 0 && $i==$linked_limit)
    <?php echo _('Ref')?>
 </th>
 <th>
+   <?php echo _('Internal')?>
+</th> 
+<th>
    <?php echo _('Description')?>
 </th>
 <th style="text-align:right">
@@ -106,12 +112,14 @@ $letter=($this->content[$i]['letter']< 0)?" 
":strtoupper(base_convert($this->con
 <?php echo $letter?>
 </td>
 <td> <?php echo smaller_date($this->content[$i]['j_date_fmt'])?> </td>
+<td> <?php echo h($this->content[$i]['jr_pj_number']);?> </td>
 <?php
 $r=sprintf('<A class="detail" style="text-decoration:underline"  
HREF="javascript:viewOperation(\'%s\',\'%s\')" >%s</A>',
           $this->content[$i]['jr_id'], $gDossier,  
$this->content[$i]['jr_internal']);
 ?>
 <td> <?php echo $r?> </td>
-<td> <?php echo $this->content[$i]['jr_comment']?> </td>
+
+<td> <?php echo h($this->content[$i]['jr_comment'])?> </td>
  <?php if ($this->content[$i]['j_debit']=='t') : ?>
   <td style="text-align:right"> <?php echo 
nb($this->content[$i]['j_montant'])?> </td>
   <td></td>