From d0b2068ab105b1dd5a7306f3ec7d1f38cef196c5 Mon Sep 17 00:00:00 2001
From: aspangaro <alexandre.spangaro@gmail.com>
Date: Sun, 24 Apr 2016 14:41:14 +0200
Subject: [PATCH] FIX: Accountancy - Upgrade Cegid Bank export
---
htdocs/accountancy/journal/bankjournal.php | 73 +++++++++++++++-------
1 file changed, 52 insertions(+), 21 deletions(-)
diff --git a/htdocs/accountancy/journal/bankjournal.php b/htdocs/accountancy/journal/bankjournal.php
index c5bff85faf5..c990465bacf 100644
--- a/htdocs/accountancy/journal/bankjournal.php
+++ b/htdocs/accountancy/journal/bankjournal.php
@@ -418,12 +418,27 @@ if ($action == 'export_csv') {
foreach ( $tabpay as $key => $val ) {
$date = dol_print_date($db->jdate($val["date"]), '%d%m%Y');
+ $reflabel = $val["ref"];
+ if ($reflabel == '(SupplierInvoicePayment)') {
+ $reflabel = $langs->trans('Supplier');
+ }
+ if ($reflabel == '(CustomerInvoicePayment)') {
+ $reflabel = $langs->trans('Customer');
+ }
+ if ($reflabel == '(SocialContributionPayment)') {
+ $reflabel = $langs->trans('SocialContribution');
+ }
+ if ($reflabel == '(DonationPayment)') {
+ $reflabel = $langs->trans('Donation');
+ }
+ if ($reflabel == '(SubscriptionPayment)') {
+ $reflabel = $langs->trans('Donation');
+ }
+
$companystatic->id = $tabcompany[$key]['id'];
$companystatic->name = $tabcompany[$key]['name'];
$companystatic->client = $tabcompany[$key]['code_client'];
- $date = dol_print_date($db->jdate($val["date"]), '%d%m%Y');
-
// Bank
foreach ( $tabbq[$key] as $k => $mt ) {
print $date . $sep;
@@ -432,8 +447,12 @@ if ($action == 'export_csv') {
print $sep;
print ($mt < 0 ? 'C' : 'D') . $sep;
print ($mt <= 0 ? price(- $mt) : $mt) . $sep;
- print $val["type_payment"] . $sep;
- print utf8_decode($val["ref"]) . $sep;
+ if ($companystatic->name == '') {
+ print $langs->trans('Bank')." - ". utf8_decode($val["ref"]) . $sep;
+ } else {
+ print $langs->trans("Bank") .' - '.utf8_decode($companystatic->name) . $sep;
+ }
+ print utf8_decode($reflabel) . $sep;
print "\n";
}
@@ -443,33 +462,45 @@ if ($action == 'export_csv') {
if ($mt) {
print $date . $sep;
print $journal . $sep;
- if ($val["lib"] == '(SupplierInvoicePayment)') {
+ if ($tabtype[$key] == 'payment') {
+ print length_accountg($conf->global->ACCOUNTING_ACCOUNT_CUSTOMER) . $sep;
+ print length_accounta(html_entity_decode($k)) . $sep;
+ } else if ($tabtype[$key] == 'payment_supplier') {
print length_accountg($conf->global->ACCOUNTING_ACCOUNT_SUPPLIER) . $sep;
+ print length_accounta(html_entity_decode($k)) . $sep;
} else {
- print length_accountg($conf->global->ACCOUNTING_ACCOUNT_CUSTOMER) . $sep;
+ print length_accountg(html_entity_decode($k)) . $sep;
+ print $sep;
}
- print length_accounta(html_entity_decode($k)) . $sep;
print ($mt < 0 ? 'D' : 'C') . $sep;
print ($mt <= 0 ? price(- $mt) : $mt) . $sep;
- print $val["type_payment"] . $sep;
- print utf8_decode($val["ref"]) . $sep;
+ if ($companystatic->name == '') {
+ print $langs->trans('ThirdParty')." - ". utf8_decode($val["ref"]) . $sep;
+ } else {
+ print $langs->trans('ThirdParty')." - ". utf8_decode($companystatic->name) . $sep;
+ }
+ print utf8_decode($reflabel) . $sep;
print "\n";
}
}
} else {
foreach ( $tabbq[$key] as $k => $mt ) {
- print $date . $sep;
- print $journal . $sep;
- print length_accountg($conf->global->ACCOUNTING_ACCOUNT_SUSPENSE) . $sep;
- print $sep;
- print ($mt < 0 ? 'D' : 'C') . $sep;
- print ($mt <= 0 ? price(- $mt) : $mt) . $sep;
- print $val["type_payment"] . $sep;
- print utf8_decode($val["ref"]) . $sep;
- print "\n";
+ print $date . $sep;
+ print $journal . $sep;
+ print length_accountg($conf->global->ACCOUNTING_ACCOUNT_SUSPENSE) . $sep;
+ print $sep;
+ print ($mt < 0 ? 'D' : 'C') . $sep;
+ print ($mt <= 0 ? price(- $mt) : $mt) . $sep;
+ if ($companystatic->name == '') {
+ print $langs->trans('ThirdParty')." - ". utf8_decode($val["ref"]) . $sep;
+ } else {
+ print $langs->trans('ThirdParty')." - ". utf8_decode($companystatic->name) . $sep;
}
+ print utf8_decode($reflabel) . $sep;
+ print "\n";
}
}
+ }
} else {
// Model Classic Export
foreach ( $tabpay as $key => $val ) {
@@ -480,6 +511,7 @@ if ($action == 'export_csv') {
// Bank
foreach ( $tabbq[$key] as $k => $mt ) {
+ print '"' . $journal . '"' . $sep;
print '"' . $date . '"' . $sep;
print '"' . $val["type_payment"] . '"' . $sep;
print '"' . length_accountg(html_entity_decode($k)) . '"' . $sep;
@@ -488,7 +520,6 @@ if ($action == 'export_csv') {
} else {
print '"' . $langs->trans("Bank") . ' - ' . utf8_decode($companystatic->name) . '"' . $sep;
}
- // print '"' . $langs->trans("Bank") . '"' . $sep;
print '"' . ($mt >= 0 ? price($mt) : '') . '"' . $sep;
print '"' . ($mt < 0 ? price(- $mt) : '') . '"';
print "\n";
@@ -498,10 +529,10 @@ if ($action == 'export_csv') {
if (is_array($tabtp[$key])) {
foreach ( $tabtp[$key] as $k => $mt ) {
if ($mt) {
+ print '"' . $journal . '"' . $sep;
print '"' . $date . '"' . $sep;
print '"' . $val["type_payment"] . '"' . $sep;
print '"' . length_accounta(html_entity_decode($k)) . '"' . $sep;
- // print '"' . $companystatic->name . '"' . $sep;
if ($companystatic->name == '') {
print '"' . $langs->trans('ThirdParty') . " - " . utf8_decode($val["ref"]) . '"' . $sep;
} else {
@@ -514,10 +545,10 @@ if ($action == 'export_csv') {
}
} else {
foreach ( $tabbq[$key] as $k => $mt ) {
+ print '"' . $journal . '"' . $sep;
print '"' . $date . '"' . $sep;
print '"' . $val["ref"] . '"' . $sep;
print '"' . length_accountg($conf->global->ACCOUNTING_ACCOUNT_SUSPENSE) . '"' . $sep;
- // print '"' . $langs->trans("Bank") . '"' . $sep;
if ($companystatic->name == '') {
print '"' . $langs->trans("Bank") . ' - ' . utf8_decode($val["ref"]) . '"' . $sep;
} else {
--
GitLab