admingit/altocompta
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Task #1761: Faire apparaître le moyen de paiement

Browse source
This commit is contained in:
Dany De Bontridder 2019-10-26 00:10:49 +02:00
parent 6d6b56de78
commit 77583ef5d7
4 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
include/class/acc_ledger_history_purchase.class.php
View file

@ -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']);
}

3
include/class/acc_ledger_history_sale.class.php
View file

@ -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']);

2
include/class/print_ledger_simple.class.php
View file

@ -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=' , ';
}

3
include/export/export_ledger_csv.php
View file

@ -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']);