From f5995cadefae9f5d99eba75ecb4765f8c99314b4 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 13 Jul 2017 14:16:26 +0200
Subject: [PATCH] Fix detection of payment for credit note
---
htdocs/accountancy/journal/bankjournal.php | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/htdocs/accountancy/journal/bankjournal.php b/htdocs/accountancy/journal/bankjournal.php
index 056f3644770..c740459b34c 100644
--- a/htdocs/accountancy/journal/bankjournal.php
+++ b/htdocs/accountancy/journal/bankjournal.php
@@ -175,9 +175,9 @@ if ($result) {
// Set accountancy code (for bank and thirdparty)
$compta_bank = $obj->account_number;
- if ($obj->label == '(SupplierInvoicePayment)')
+ if ($obj->label == '(SupplierInvoicePayment)' || $obj->label == '(SupplierInvoicePaymentBack)')
$compta_soc = (! empty($obj->code_compta_fournisseur) ? $obj->code_compta_fournisseur : $account_supplier);
- if ($obj->label == '(CustomerInvoicePayment)')
+ if ($obj->label == '(CustomerInvoicePayment)' || $obj->label == '(CustomerInvoicePaymentBack)')
$compta_soc = (! empty($obj->code_compta) ? $obj->code_compta : $account_customer);
$tabcompany[$obj->rowid] = array (
@@ -625,10 +625,10 @@ if ($action == 'exportcsv') {
$date = dol_print_date($db->jdate($val["date"]), 'day');
$reflabel = $val["ref"];
- if ($reflabel == '(SupplierInvoicePayment)') {
+ if ($reflabel == '(SupplierInvoicePayment)' || $reflabel == '(SupplierInvoicePaymentBack)') {
$reflabel = $langs->trans('Supplier');
}
- if ($reflabel == '(CustomerInvoicePayment)') {
+ if ($reflabel == '(CustomerInvoicePayment)' || $reflabel == '(CustomerInvoicePaymentBack)') {
$reflabel = $langs->trans('Customer');
}
if ($reflabel == '(SocialContributionPayment)') {
@@ -796,10 +796,10 @@ if (empty($action) || $action == 'view') {
$date = dol_print_date($db->jdate($val["date"]), 'day');
$reflabel = $val["ref"];
- if ($reflabel == '(SupplierInvoicePayment)') {
+ if ($reflabel == '(SupplierInvoicePayment)' || $reflabel == '(SupplierInvoicePaymentBack)') {
$reflabel = $langs->trans('Supplier');
}
- if ($reflabel == '(CustomerInvoicePayment)') {
+ if ($reflabel == '(CustomerInvoicePayment)' || $reflabel == '(CustomerInvoicePaymentBack)') {
$reflabel = $langs->trans('Customer');
}
if ($reflabel == '(SocialContributionPayment)') {
--
GitLab