lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "Fix: Problem with loan integration in general ledger"

Browse Source 
This reverts commit 50da3c2ed2.
This commit is contained in:
Alexandre SPANGARO 2018-12-16 06:16:14 +01:00
parent df8aaf9c06
commit 8148ea8361
1 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
htdocs/accountancy/journal/bankjournal.php
View File

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