From 50da3c2ed2d6cbe7c02cededc9b6cca94811953c Mon Sep 17 00:00:00 2001 From: Alexandre SPANGARO Date: Sun, 16 Dec 2018 06:14:33 +0100 Subject: [PATCH 1/3] Fix: Problem with loan integration in general ledger --- htdocs/accountancy/journal/bankjournal.php | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/htdocs/accountancy/journal/bankjournal.php b/htdocs/accountancy/journal/bankjournal.php index d40c5ea059b..679f1ae4bf9 100644 --- a/htdocs/accountancy/journal/bankjournal.php +++ b/htdocs/accountancy/journal/bankjournal.php @@ -373,7 +373,13 @@ if ($result) { $paymentloanstatic->fk_loan = $links[$key]['url_id']; $tabpay[$obj->rowid]["lib"] .= ' ' . $paymentloanstatic->getNomUrl(2); $tabpay[$obj->rowid]["paymentloanid"] = $paymentloanstatic->id; - //$tabtp[$obj->rowid][$account_pay_loan] += $obj->amount; + $paymentloanstatic->fetch($paymentloanstatic->id); + $account_loan_capital = (! empty($paymentloanstatic->account_capital) ? $paymentvariousstatic->account_capital : 'NotDefined'); // NotDefined is a reserved word + $account_loan_interest = (! empty($paymentloanstatic->account_interest) ? $paymentvariousstatic->account_interest : 'NotDefined'); // NotDefined is a reserved word + $account_loan_insurance = (! empty($paymentloanstatic->account_insurance) ? $paymentvariousstatic->account_insurance : 'NotDefined'); // NotDefined is a reserved word + $tabtp[$obj->rowid][$account_capital] += $obj->capital; + $tabtp[$obj->rowid][$account_interest] += $obj->interest; + $tabtp[$obj->rowid][$account_insurance] += $obj->insurance; } else if ($links[$key]['type'] == 'banktransfert') { $accountLinestatic->fetch($links[$key]['url_id']); $tabpay[$obj->rowid]["lib"] .= ' '.$langs->trans("BankTransfer").'- ' .$accountLinestatic ->getNomUrl(1); From 8148ea83614a8a15d8f60912acd0f1396f0f2d8c Mon Sep 17 00:00:00 2001 From: Alexandre SPANGARO Date: Sun, 16 Dec 2018 06:16:14 +0100 Subject: [PATCH 2/3] Revert "Fix: Problem with loan integration in general ledger" This reverts commit 50da3c2ed2d6cbe7c02cededc9b6cca94811953c. --- htdocs/accountancy/journal/bankjournal.php | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/htdocs/accountancy/journal/bankjournal.php b/htdocs/accountancy/journal/bankjournal.php index 679f1ae4bf9..d40c5ea059b 100644 --- a/htdocs/accountancy/journal/bankjournal.php +++ b/htdocs/accountancy/journal/bankjournal.php @@ -373,13 +373,7 @@ if ($result) { $paymentloanstatic->fk_loan = $links[$key]['url_id']; $tabpay[$obj->rowid]["lib"] .= ' ' . $paymentloanstatic->getNomUrl(2); $tabpay[$obj->rowid]["paymentloanid"] = $paymentloanstatic->id; - $paymentloanstatic->fetch($paymentloanstatic->id); - $account_loan_capital = (! empty($paymentloanstatic->account_capital) ? $paymentvariousstatic->account_capital : 'NotDefined'); // NotDefined is a reserved word - $account_loan_interest = (! empty($paymentloanstatic->account_interest) ? $paymentvariousstatic->account_interest : 'NotDefined'); // NotDefined is a reserved word - $account_loan_insurance = (! empty($paymentloanstatic->account_insurance) ? $paymentvariousstatic->account_insurance : 'NotDefined'); // NotDefined is a reserved word - $tabtp[$obj->rowid][$account_capital] += $obj->capital; - $tabtp[$obj->rowid][$account_interest] += $obj->interest; - $tabtp[$obj->rowid][$account_insurance] += $obj->insurance; + //$tabtp[$obj->rowid][$account_pay_loan] += $obj->amount; } else if ($links[$key]['type'] == 'banktransfert') { $accountLinestatic->fetch($links[$key]['url_id']); $tabpay[$obj->rowid]["lib"] .= ' '.$langs->trans("BankTransfer").'- ' .$accountLinestatic ->getNomUrl(1); From f728b28a67ba25b480f05ad7a214d80959828369 Mon Sep 17 00:00:00 2001 From: Alexandre SPANGARO Date: Mon, 17 Dec 2018 06:02:29 +0100 Subject: [PATCH 3/3] FIX: Missing information on Agiris Export --- htdocs/accountancy/class/accountancyexport.class.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/htdocs/accountancy/class/accountancyexport.class.php b/htdocs/accountancy/class/accountancyexport.class.php index 5d76a7155d6..6f9c0534d2f 100644 --- a/htdocs/accountancy/class/accountancyexport.class.php +++ b/htdocs/accountancy/class/accountancyexport.class.php @@ -572,8 +572,10 @@ class AccountancyExport if (empty($line->subledger_account)) { print length_accountg($line->numero_compte) . $separator; + print $line->label_compte . $separator; } else { print length_accounta($line->subledger_account) . $separator; + print $line->subledger_label . $separator; } print $line->doc_ref . $separator; @@ -581,6 +583,7 @@ class AccountancyExport print price($line->credit) . $separator; print price($line->montant) . $separator; print $line->sens . $separator; + print $line->lettering_code . $separator; print $line->code_journal; print $end_line; }