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

Fix: Loan - Totalpaid (Only the capital is deducted from the amount of loan to be paid off)

Browse Source
This commit is contained in:
aspangaro 2016-06-05 16:15:04 +02:00
parent bfb212f61a
commit e911b32b83
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
htdocs/loan/card.php
View File

@ -116,9 +116,9 @@ if ($action == 'add' && $user->rights->loan->write)
$object->note_private = GETPOST('note_private'); $object->note_private = GETPOST('note_private');
$object->note_public = GETPOST('note_public'); $object->note_public = GETPOST('note_public');
$accountancy_account_capital = GETPOST('accountancy_account_capital'); $accountancy_account_capital = GETPOST('accountancy_account_capital');
$accountancy_account_insurance = GETPOST('accountancy_account_insurance'); $accountancy_account_insurance = GETPOST('accountancy_account_insurance');
$accountancy_account_interest = GETPOST('accountancy_account_interest'); $accountancy_account_interest = GETPOST('accountancy_account_interest');
if ($accountancy_account_capital <= 0) { $object->account_capital = ''; } else { $object->account_capital = $accountancy_account_capital; } if ($accountancy_account_capital <= 0) { $object->account_capital = ''; } else { $object->account_capital = $accountancy_account_capital; }
if ($accountancy_account_insurance <= 0) { $object->account_insurance = ''; } else { $object->account_insurance = $accountancy_account_insurance; } if ($accountancy_account_insurance <= 0) { $object->account_insurance = ''; } else { $object->account_insurance = $accountancy_account_insurance; }
@ -507,13 +507,11 @@ if ($id > 0)
print '<td align="right">'.price($objp->amount_interest, 0, $langs, 0, 0, -1, $conf->currency)."</td>\n"; print '<td align="right">'.price($objp->amount_interest, 0, $langs, 0, 0, -1, $conf->currency)."</td>\n";
print '<td align="right">'.price($objp->amount_capital, 0, $langs, 0, 0, -1, $conf->currency)."</td>\n"; print '<td align="right">'.price($objp->amount_capital, 0, $langs, 0, 0, -1, $conf->currency)."</td>\n";
print "</tr>"; print "</tr>";
$total_insurance += $objp->amount_insurance;
$total_interest += $objp->amount_interest;
$total_capital += $objp->amount_capital; $total_capital += $objp->amount_capital;
$i++; $i++;
} }
$totalpaid = $total_insurance + $total_interest + $total_capital; $totalpaid = $total_capital;
if ($object->paid == 0) if ($object->paid == 0)
{ {

2
htdocs/loan/payment/payment.php
View File

@ -138,7 +138,7 @@ if ($action == 'add_payment')
} }
} }
$_GET["action"]='create'; $action = 'create';
} }