[Noalyss-commit] [noalyss] 02/12: Task #1056 - Grand livre et plusieurs exercices comptables

[Dany De Bontridder]

sparkyx pushed a commit to branch master
in repository noalyss.

commit b16573acafa7f8fa4953c12cddebc1f263755423
Author: Dany De Bontridder <address@hidden>
Date:   Sat Nov 29 11:42:47 2014 +0100

    Task #1056 - Grand livre et plusieurs exercices comptables
---
 include/export_gl_csv.php |   29 +++++++++++++++++++++++++++--
 include/export_gl_pdf.php |    2 +-
 2 files changed, 28 insertions(+), 3 deletions(-)

diff --git a/include/export_gl_csv.php b/include/export_gl_csv.php
index ff3392f..faa3c34 100644
--- a/include/export_gl_csv.php
+++ b/include/export_gl_csv.php
@@ -129,7 +129,7 @@ foreach ($a_poste as $poste)
     $solde = 0.0;
     $solde_d = 0.0;
     $solde_c = 0.0;
-
+    $current_exercice="";
     foreach ($Poste->row as $detail)
     {
 
@@ -145,7 +145,32 @@ foreach ($a_poste as $poste)
                [8] => 17OD-01-1 [jr_internal] => 17OD-01-1
                [9] => ODS1 [jr_pj_number] => ODS1 ) 1
          */
+/*
+             * separation per exercice
+             */
+        if ( $current_exercice == "") $current_exercice=$detail['p_exercice'];
+
+        if ( $current_exercice != $detail['p_exercice']) {
+            echo ";";
+            echo '"'.$current_exercice.'";';
+            echo ";";
+            echo ";";
+            echo 'Total du compte '.$Poste->id.";";
+            echo ($solde_d  > 0 ? nb($solde_d)  : '').";";
+            echo ($solde_c  > 0 ? nb( $solde_c)  : '').";";
+            echo nb(abs($solde_c-$solde_d)).";";
+            echo ($solde_c > $solde_d ? 'C' : 'D').";";
+            printf("\n");
+            printf("\n");
+            /*
+            * reset total and current_exercice
+            */
+            $current_exercice=$detail['p_exercice'];
+            $solde = 0.0;
+            $solde_d = 0.0;
+            $solde_c = 0.0;
 
+        }
         if ($detail['cred_montant'] > 0)
         {
             $solde   -= $detail['cred_montant'];
@@ -172,7 +197,7 @@ foreach ($a_poste as $poste)
 
 
     echo ";";
-    echo ";";
+    echo '"'.$current_exercice.'";';
     echo ";";
     echo ";";
     echo 'Total du compte '.$Poste->id.";";
diff --git a/include/export_gl_pdf.php b/include/export_gl_pdf.php
index 1389bd1..dc43bce 100644
--- a/include/export_gl_pdf.php
+++ b/include/export_gl_pdf.php
@@ -210,7 +210,7 @@ foreach ($a_poste as $poste)
     $pdf->SetFont('DejaVuCond','B',8);
 
     $i = 0;
-    $pdf->Cell($width[$i], 6, '', 0, 0, $lor[$i]);
+    $pdf->Cell($width[$i], 6, $current_exercice, 0, 0, $lor[$i]);
     $i++;
     $pdf->Cell($width[$i], 6, '', 0, 0, $lor[$i]);
     $i++;