From e911b32b838ab93d40c226c2d21f543cffad8350 Mon Sep 17 00:00:00 2001
From: aspangaro <alexandre.spangaro@gmail.com>
Date: Sun, 5 Jun 2016 16:15:04 +0200
Subject: [PATCH] Fix: Loan - Totalpaid (Only the capital is deducted from the
 amount of loan to be paid off)

---
 htdocs/loan/card.php            | 10 ++++------
 htdocs/loan/payment/payment.php |  2 +-
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/htdocs/loan/card.php b/htdocs/loan/card.php
index 57d03556bd4..31de81d8b9b 100644
--- a/htdocs/loan/card.php
+++ b/htdocs/loan/card.php
@@ -116,9 +116,9 @@ if ($action == 'add' && $user->rights->loan->write)
 			$object->note_private 			= GETPOST('note_private');
 			$object->note_public 			= GETPOST('note_public');
 
-			$accountancy_account_capital	 = GETPOST('accountancy_account_capital');
-			$accountancy_account_insurance	 = GETPOST('accountancy_account_insurance');
-			$accountancy_account_interest	 = GETPOST('accountancy_account_interest');
+			$accountancy_account_capital	= GETPOST('accountancy_account_capital');
+			$accountancy_account_insurance	= GETPOST('accountancy_account_insurance');
+			$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_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_capital, 0, $langs, 0, 0, -1, $conf->currency)."</td>\n";
 				print "</tr>";
-                $total_insurance += $objp->amount_insurance;
-                $total_interest += $objp->amount_interest;
                 $total_capital += $objp->amount_capital;
 				$i++;
 			}
 
-			$totalpaid = $total_insurance + $total_interest + $total_capital;
+			$totalpaid = $total_capital;
 
 			if ($object->paid == 0)
 			{
diff --git a/htdocs/loan/payment/payment.php b/htdocs/loan/payment/payment.php
index 8c9f850ebcc..e735480e414 100644
--- a/htdocs/loan/payment/payment.php
+++ b/htdocs/loan/payment/payment.php
@@ -138,7 +138,7 @@ if ($action == 'add_payment')
         }
 	}
 
-	$_GET["action"]='create';
+	$action = 'create';
 }