[Noalyss-commit] [noalyss] 09/11: Task #1761: Faire apparaître le moyen de paiement

[Dany De Bontridder]

sparkyx pushed a commit to branch master
in repository noalyss.

commit 77583ef5d7a73062940dc5ddc7730ce006b9c028
Author: Dany De Bontridder <address@hidden>
Date:   Sat Oct 26 00:10:49 2019 +0200

    Task #1761: Faire apparaître le moyen de paiement
---
 include/class/acc_ledger_history_purchase.class.php | 2 ++
 include/class/acc_ledger_history_sale.class.php     | 3 ++-
 include/class/print_ledger_simple.class.php         | 2 +-
 include/export/export_ledger_csv.php                | 3 +++
 4 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/include/class/acc_ledger_history_purchase.class.php 
b/include/class/acc_ledger_history_purchase.class.php
index 51f75b8..8782bfb 100644
--- a/include/class/acc_ledger_history_purchase.class.php
+++ b/include/class/acc_ledger_history_purchase.class.php
@@ -275,6 +275,7 @@ class Acc_Ledger_History_Purchase extends Acc_Ledger_History
         }
         $title[]=_("TVAC/TTC");
         $title[]=_("Date paiement");
+        $title[]=_("Code paiement");
         $title[]=_("Méthode paiement");
         $title[]=_("Montant paiement");
         $title[]=_("n° opération");
@@ -330,6 +331,7 @@ class Acc_Ledger_History_Purchase extends Acc_Ledger_History
                     $row=Database::fetch_array($ret_reconcile, $e);
                     $export->add($row['jr_date']);
                     $export->add($row['qcode_bank']);
+                    $export->add($row['qcode_name']);
                     $export->add($row['jr_montant'],"number");
                     $export->add($row['jr_internal']);
                 }
diff --git a/include/class/acc_ledger_history_sale.class.php 
b/include/class/acc_ledger_history_sale.class.php
index fbc6ca7..22a0dc6 100644
--- a/include/class/acc_ledger_history_sale.class.php
+++ b/include/class/acc_ledger_history_sale.class.php
@@ -261,7 +261,7 @@ class Acc_Ledger_History_Sale extends Acc_Ledger_History
         }
         $title[]=_("TVAC/TTC");
         $title[]=_("Date paiement");
-        $title[]=_("Méthode paiement");
+        $title[]=_("Code paiement");
         $title[]=_("Montant paiement");
         $title[]=_("n° opération");
 
@@ -313,6 +313,7 @@ class Acc_Ledger_History_Sale extends Acc_Ledger_History
                     $row=Database::fetch_array($ret_reconcile, $e);
                     $export->add($row['jr_date']);
                     $export->add($row['qcode_bank']);
+                    $export->add($row['qcode_name']);
                     $export->add($row['jr_montant'],"number");
                     $export->add($row['jr_internal']);
 
diff --git a/include/class/print_ledger_simple.class.php 
b/include/class/print_ledger_simple.class.php
index 1b94509..7e06558 100644
--- a/include/class/print_ledger_simple.class.php
+++ b/include/class/print_ledger_simple.class.php
@@ -279,7 +279,7 @@ class Print_Ledger_Simple extends PDF
                 $sep="";
                 for ($e=0;$e<$max;$e++) {
                     $row=Database::fetch_array($ret_reconcile, $e);
-                    $msg=( $row['qcode_bank'] != 
"")?"[".$row['qcode_bank']."]":$row['jr_internal'];
+                    $msg=( $row['qcode_bank'] != 
"")?"[".$row['qcode_bank']."]".$row['qcode_name']:$row['jr_internal'];
                     $str_payment=$row['jr_date'].$msg.$sep;
                     $sep=' , ';
                 }
diff --git a/include/export/export_ledger_csv.php 
b/include/export/export_ledger_csv.php
index 82a467a..507055a 100644
--- a/include/export/export_ledger_csv.php
+++ b/include/export/export_ledger_csv.php
@@ -141,6 +141,7 @@ if ( $get_option=="E")
         $a_heading[]=_("Date paiement");
         $a_heading[]=_("Montant paiement");
         $a_heading[]=_("Methode paiement");
+        $a_heading[]=_("Libellé");
         $a_heading[]=_("Opération paiement");
         
         // Prepare the query for reconcile date
@@ -176,6 +177,7 @@ if ( $get_option=="E")
                 $export->add($row['jr_date']);
                 $export->add($row['jr_montant'],"number");
                 $export->add($row['qcode_bank']);
+                $export->add($row['qcode_name']);
                 $export->add($row['jr_internal']);
             }
             $export->write();
@@ -264,6 +266,7 @@ if ($get_option=="L" && 
($jrn_type=='ODS'||$jrn_type=='FIN'||$jrn_type=='GL') )
             {
                 $row=Database::fetch_array($ret_reconcile, $e);
                 $export->add($row['qcode_bank']);
+                $export->add($row['qcode_name']);
                 $export->add($row['jr_date']);
                 $export->add($row['jr_internal']);
                 $export->add($row['jr_pj_number']);