[Noalyss-commit] [noalyss] 02/02: Improve Analytique ================== ANCBS : order by accounting + display group ANCGR : display accounting label

[Dany De Bontridder]

sparkyx pushed a commit to branch master
in repository noalyss.

commit de6ea77da2dca76629005991ea35878894c96bf2
Author: Dany De Bontridder <address@hidden>
Date:   Fri Mar 4 23:14:14 2016 +0100

    Improve Analytique
    ==================
    ANCBS : order by accounting + display group
    ANCGR : display accounting label
---
 include/class/class_anc_balance_simple.php |   25 ++++++++++++++++---------
 include/class/class_anc_group.php          |    8 +++++---
 include/lib/class_pdf.php                  |    4 ++--
 include/template/anc_balance_group.php     |    2 +-
 4 files changed, 24 insertions(+), 15 deletions(-)

diff --git a/include/class/class_anc_balance_simple.php 
b/include/class/class_anc_balance_simple.php
index 16ebfa3..10f826f 100644
--- a/include/class/class_anc_balance_simple.php
+++ b/include/class/class_anc_balance_simple.php
@@ -48,15 +48,18 @@ class Anc_Balance_Simple extends Anc_Print
 
         $sql="select m.po_id,sum(deb) as sum_deb,sum(cred) as sum_cred,";
         $sql.=" po_name||'  '||coalesce(po_description,'') as po_name";
+        $sql.=",ga_description ";
         $sql.=" from ";
         $sql.=" (select po_id,case when oa_debit='t' then oa_amount else 0 end 
as deb,";
         $sql.="case when oa_debit='f' then oa_amount else 0 end as cred ";
         $sql.=" from operation_analytique join poste_analytique using(po_id)";
         $sql.=(empty($filter) == false)?" where ".$filter:"";
         $sql.=" ) as m join poste_analytique using (po_id)";
-        $sql.=" where pa_id=".$this->pa_id;
-        $sql.=" group by po_id,po_name,po_description";
-        $sql.=" order by po_id";
+        $sql.=" left join groupe_analytique on ( 
poste_analytique.ga_id=groupe_analytique.ga_id)";
+        $sql.=" where poste_analytique.pa_id=".$this->pa_id;
+        $sql.=" group by po_id,po_name,po_description,ga_description";
+        $sql.=" order by po_name";
+
         $res=$this->db->exec_sql($sql);
 
         if ( Database::num_row($res) == 0 ) {
@@ -72,6 +75,7 @@ class Anc_Balance_Simple extends Anc_Print
             $a[$count]['sum_deb']=$row['sum_deb'];
             $a[$count]['sum_cred']=$row['sum_cred'];
             $a[$count]['po_name']=$row['po_name'];
+            $a[$count]['ga_description']=$row['ga_description'];
             $a[$count]['solde']=abs($row['sum_deb']-$row['sum_cred']);
             
$a[$count]['debit']=($row['sum_deb']>$row['sum_cred'])?"debit":"credit";
             $count++;
@@ -126,6 +130,7 @@ class Anc_Balance_Simple extends Anc_Print
         $r="<table class=\"result\">";
         $r.="<tr>";
         $r.="<th>Poste comptable Analytique</th>";
+        $r.="<th>Groupe</th>";
         $r.="<th>D&eacute;bit</th>";
         $r.="<th>Cr&eacute;dit</th>";
         $r.="<th>Solde</th>";
@@ -149,6 +154,7 @@ class Anc_Balance_Simple extends Anc_Print
             // the name and po_id
             //   $r.=sprintf("<td>%s</td>",$row['po_id']);
             $r.=sprintf("<td align=\"left\">%s</td>",h($row['po_name']));
+            $r.=sprintf("<td 
align=\"left\">%s</td>",h($row['ga_description']));
             $r.=td(nbm($row['sum_deb']),' class="num"');
             $r.=td(nbm($row['sum_cred']),' class="num"');
             $r.=td(nbm($row['solde']),' class="num"');
@@ -162,10 +168,11 @@ class Anc_Balance_Simple extends Anc_Print
         }
         $r.='<tr class="highlight">';
         $r.=td(_("Total"));
-        $r.=td(nbm($deb_side));
-        $r.=td(nbm($cred_side));
+        $r.=td(" ");
+        $r.=td(nbm($deb_side),'class="num"');
+        $r.=td(nbm($cred_side),'class="num"');
         $solde_side=abs(bcsub($deb_side,$cred_side));
-        $r.=td(nbm($solde_side));
+        $r.=td(nbm($solde_side),'class="num"');
         if ( $deb_side == $cred_side ) $r.=td("=");
         else if ( $deb_side > $cred_side ) $r.=td("D");
         else $r.=td("C");
@@ -206,8 +213,8 @@ class Anc_Balance_Simple extends Anc_Print
         for ($i=0;$i<count($array);$i++)
         {
             $row=$array[$i];
-            $pdf->write_cell(20,6,$row['po_id'],0,0,'L');
-            $pdf->write_cell(90,6,$row['po_name'],0,0,'L');
+            $pdf->write_cell(50,6,$row['po_name'],0,0,'L');
+            $pdf->write_cell(50,6,$row['ga_description'],0,0,'L');
             $pdf->write_cell(20,6,sprintf('%s',nbm($row['sum_deb'])),0,0,'R');
             $pdf->write_cell(20,6,sprintf('%s',nbm($row['sum_cred'])),0,0,'R');
             $pdf->write_cell(20,6,sprintf('%s',nbm($row['solde'])),0,0,'R');
@@ -238,8 +245,8 @@ class Anc_Balance_Simple extends Anc_Print
             // the name and po_id
             $solde=($row['sum_cred']>$row['sum_deb'])?'C':'D';
             $solde=($row['sum_cred']==$row['sum_deb'])?'0':$solde;
-            $csv->add($row['po_id']);
             $csv->add($row['po_name']);
+            $csv->add($row['ga_description']);
             $csv->add($row['sum_deb'],"number");
             $csv->add($row['sum_cred'],"number");
             $csv->add($row['solde'],"number");
diff --git a/include/class/class_anc_group.php 
b/include/class/class_anc_group.php
index 1e4e568..9aa6384 100644
--- a/include/class/class_anc_group.php
+++ b/include/class/class_anc_group.php
@@ -163,6 +163,7 @@ class Anc_Group extends Anc_Print
 
       $sql="with m as (select po_id,
        po_name,
+        po_description,
        ga_id,
        case when  oa_debit = 't' then oa_amount
        else 0
@@ -174,9 +175,9 @@ class Anc_Group extends Anc_Print
        from operation_analytique
 join poste_analytique using (po_id)
 where pa_id=$1 $filter_date )
-select sum(amount_cred) as sum_cred, sum(amount_deb)as 
sum_deb,po_name,ga_id,ga_description
+select sum(amount_cred) as sum_cred, sum(amount_deb)as 
sum_deb,po_name,ga_id,ga_description,po_description
 from m left join groupe_analytique using (ga_id)
-group by ga_id,po_name,ga_description
+group by ga_id,po_name,ga_description,po_description
 order by ga_description,po_name";
       $ret=$this->db->get_array($sql,array($this->pa_id));
 
@@ -223,12 +224,13 @@ order by ga_description,po_name";
     $array=$this->get_result();
     $cvs=new Noalyss_Csv ('anc-balance-group-export');
     $cvs->send_header();
-    $cvs->write_header(array("groupe","activité","débit","credit","solde"));
+    
$cvs->write_header(array("groupe","activité","description","débit","credit","solde"));
     bcscale(2);
     for ($i=0;$i<count($array);$i++)
       {
         $cvs->add($array[$i]['ga_id']);
         $cvs->add($array[$i]['po_name']);
+        $cvs->add($array[$i]['po_description']);
         $cvs->add($array[$i]['sum_deb'],"number");
         $cvs->add($array[$i]['sum_cred'],"number");
         
$cvs->add(bcsub($array[$i]['sum_cred'],$array[$i]['sum_deb']),"number");
diff --git a/include/lib/class_pdf.php b/include/lib/class_pdf.php
index a423cf2..ed7cd22 100644
--- a/include/lib/class_pdf.php
+++ b/include/lib/class_pdf.php
@@ -401,8 +401,8 @@ class PDFBalance_simple extends PDF
 
         $this->Ln();
         $this->SetFont('DejaVu','',6);
-        $this->Cell(20,7,'id','B');
-        $this->Cell(90,7,'Poste Comptable','B');
+        
+        $this->Cell(110,7,'Poste Comptable','B');
         $this->Cell(20,7,'Débit','B',0,'L');
         $this->Cell(20,7,'Crédit','B',0,'L');
         $this->Cell(20,7,'Solde','B',0,'L');
diff --git a/include/template/anc_balance_group.php 
b/include/template/anc_balance_group.php
index 32d8a68..e05aea0 100644
--- a/include/template/anc_balance_group.php
+++ b/include/template/anc_balance_group.php
@@ -56,7 +56,7 @@ if ($idx %2 == 0)
   echo '<tr class="even">';
 else
   echo '<tr class="odd">';
-               echo td($array[$i]['po_name']);
+               echo td($array[$i]['po_name']." 
".h($array[$i]['po_description']));
 echo td(nbm($array[$i]['sum_deb']),' class="num"');
 echo td(nbm($array[$i]['sum_cred']),' class="num"');
 $solde=bcsub($array[$i]['sum_cred'],$array[$i]['sum_deb']);