[Noalyss-commit] [noalyss] 01/01: Bug 994 : add receipt number to analytic Task #994 - Impression du Grand'livre en Comptabilité analytique

[Dany De Bontridder]

sparkyx pushed a commit to branch master
in repository noalyss.

commit 682607e3d1b691a26eb6b08f3c12b2bc1b2e2a26
Author: Dany De Bontridder <address@hidden>
Date:   Sat May 24 01:10:52 2014 +0200

    Bug 994 : add receipt number to analytic
    Task #994 - Impression du Grand'livre en Comptabilité analytique
---
 include/class_anc_grandlivre.php |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/include/class_anc_grandlivre.php b/include/class_anc_grandlivre.php
index d984761..28ff9bc 100644
--- a/include/class_anc_grandlivre.php
+++ b/include/class_anc_grandlivre.php
@@ -73,7 +73,8 @@ class Anc_GrandLivre extends Anc_Print
        jr_comment,
        j_poste,
        jrnx.f_id,
-       ( select ad_value from fiche_Detail where f_id=jrnx.f_id and ad_id=23) 
as qcode
+       ( select ad_value from fiche_Detail where f_id=jrnx.f_id and ad_id=23) 
as qcode,
+        jr_pj_number
        from operation_analytique as B join poste_analytique using(po_id)
        left join jrnx using (j_id)
        left join jrn on  (j_grpt=jr_grpt_id)
@@ -100,6 +101,7 @@ class Anc_GrandLivre extends Anc_Print
        j_poste,
        ( select ad_value from fiche_Detail where f_id=jrnx.f_id and ad_id=23) 
as qcode,
        jr_comment,
+        jr_pj_number,
        jr_internal,
        case when oa_debit='t' then 'D' else 'C' end,
        oa_amount
@@ -157,6 +159,7 @@ class Anc_GrandLivre extends Anc_Print
                '<th>'._('Poste').'</th>'.
                '<th>'._('Quick_code').'</th>'.
                '<th>'._('libelle').'</th>'.
+                '<th>'._('Pièce').'</th>'.
                '<th>'._('Num.interne').'</th>'.
                '<th style="text-align:right">'._('Debit').'</th>'.
                '<th style="text-align:right">'._('Credit').'</th>'.
@@ -182,6 +185,7 @@ class Anc_GrandLivre extends Anc_Print
              td($card_detail).
              //              '<td>'.h($row['oa_description']).'</td>'.
              td($row['jr_comment']).
+              td($row['jr_pj_number']).
              '<td>'.$detail.'</td>'.
              '<td class="num">'.nbm($amount_deb).'</td>'.
              '<td class="num">'.nbm($amount_cred)
@@ -259,6 +263,7 @@ class Anc_GrandLivre extends Anc_Print
         $aheader[]=array("title"=>'Poste','type'=>'string');
         $aheader[]=array("title"=>'Quick_Code','type'=>'string');
         $aheader[]=array("title"=>'libelle','type'=>'string');
+        $aheader[]=array("title"=>'Pièce','type'=>'string');
         $aheader[]=array("title"=>'Num.interne','type'=>'string');
         $aheader[]=array("title"=>'Debit','type'=>'string');
         $aheader[]=array("title"=>'Credit','type'=>'num');