diff --git a/htdocs/langs/en_US/loan.lang b/htdocs/langs/en_US/loan.lang
index 3c54bde8c35..534dee08867 100644
--- a/htdocs/langs/en_US/loan.lang
+++ b/htdocs/langs/en_US/loan.lang
@@ -10,6 +10,7 @@ LoanCapital=Capital
Insurance=Insurance
Interest=Interest
Nbterms=Number of terms
+Term=Term
LoanAccountancyCapitalCode=Accounting account capital
LoanAccountancyInsuranceCode=Accounting account insurance
LoanAccountancyInterestCode=Accounting account interest
@@ -22,12 +23,9 @@ AddLoan=Create loan
FinancialCommitment=Financial commitment
InterestAmount=Interest
CapitalRemain=Capital remain
-DueDate=Date
# Admin
ConfigLoan=Configuration of the module loan
LOAN_ACCOUNTING_ACCOUNT_CAPITAL=Accounting account capital by default
LOAN_ACCOUNTING_ACCOUNT_INTEREST=Accounting account interest by default
LOAN_ACCOUNTING_ACCOUNT_INSURANCE=Accounting account insurance by default
-FinancialCommitment=Financial commitment
CreateCalcSchedule=Edit financial commitment
-InterestAmount=Interest amount
diff --git a/htdocs/loan/card.php b/htdocs/loan/card.php
index 62b294f7108..12cb0bfefd4 100644
--- a/htdocs/loan/card.php
+++ b/htdocs/loan/card.php
@@ -697,8 +697,8 @@ if ($id > 0)
print '| '.$langs->trans("Type").' | ';
print ''.$langs->trans("Insurance").' | ';
print ''.$langs->trans("Interest").' | ';
- print ''.$langs->trans("LoanCapital").' | ';
- print '';
+ print ''.$langs->trans("LoanCapital").' | ';
+ print '';
while ($i < $num)
{
@@ -708,9 +708,9 @@ if ($id > 0)
print ''.img_object($langs->trans("Payment"),"payment").' '.$objp->rowid.' | ';
print ''.dol_print_date($db->jdate($objp->dp),'day')." | \n";
print "".$objp->paiement_type.' '.$objp->num_payment." | \n";
- print ''.price($objp->amount_insurance, 0, $langs, 0, 0, -1, $conf->currency)." | \n";
- print ''.price($objp->amount_interest, 0, $langs, 0, 0, -1, $conf->currency)." | \n";
- print ''.price($objp->amount_capital, 0, $langs, 0, 0, -1, $conf->currency)." | \n";
+ print ''.price($objp->amount_insurance, 0, $outputlangs, 1, -1, -1, $conf->currency)." | \n";
+ print ''.price($objp->amount_interest, 0, $outputlangs, 1, -1, -1, $conf->currency)." | \n";
+ print ''.price($objp->amount_capital, 0, $outputlangs, 1, -1, -1, $conf->currency)." | \n";
print "";
$total_capital += $objp->amount_capital;
$i++;
diff --git a/htdocs/loan/class/loan.class.php b/htdocs/loan/class/loan.class.php
index 02832c0ecf5..7843694585f 100644
--- a/htdocs/loan/class/loan.class.php
+++ b/htdocs/loan/class/loan.class.php
@@ -344,7 +344,7 @@ class Loan extends CommonObject
$this->error=$this->db->lasterror();
return -1;
}
- }
+ }
/**
* Return label of loan status (unpaid, paid)
diff --git a/htdocs/loan/createschedule.php b/htdocs/loan/createschedule.php
index 921402c240a..0983fb15a05 100644
--- a/htdocs/loan/createschedule.php
+++ b/htdocs/loan/createschedule.php
@@ -148,7 +148,7 @@ print '';
print '';
print '';
-Print '| '.$langs->trans("DueDate").' | ';
+Print ''.$langs->trans("Term").' | ';
Print ''.$langs->trans("Date").' | ';
Print ''.$langs->trans("Amount").' | ';
Print ''.$langs->trans("InterestAmount").' | ';
diff --git a/htdocs/loan/index.php b/htdocs/loan/index.php
index bf5b6590c33..c48e9b50ac1 100644
--- a/htdocs/loan/index.php
+++ b/htdocs/loan/index.php
@@ -19,9 +19,9 @@
*/
/**
- * \file htdocs/loan/index.php
- * \ingroup loan
- * \brief Page to list all loans
+ * \file htdocs/loan/index.php
+ * \ingroup loan
+ * \brief Page to list all loans
*/
require '../main.inc.php';
@@ -54,7 +54,7 @@ $optioncss = GETPOST('optioncss','alpha');
// Purge search criteria
if (GETPOST('button_removefilter_x','alpha') || GETPOST('button_removefilter','alpha')) // Both test are required to be compatible with all browsers
{
- $search_ref="";
+ $search_ref="";
$search_label="";
$search_amount="";
}
@@ -68,7 +68,7 @@ $loan_static = new Loan($db);
llxHeader();
-$sql = "SELECT l.rowid, l.label, l.capital, l.datestart, l.dateend,";
+$sql = "SELECT l.rowid, l.label, l.capital, l.datestart, l.dateend, l.paid,";
$sql.= " SUM(pl.amount_capital) as alreadypayed";
$sql.= " FROM ".MAIN_DB_PREFIX."loan as l LEFT JOIN ".MAIN_DB_PREFIX."payment_loan AS pl";
$sql.= " ON l.rowid = pl.fk_loan";
@@ -77,8 +77,8 @@ if ($search_amount) $sql.= natural_search("l.capital", $search_amount, 1);
if ($search_ref) $sql.= " AND l.rowid = ".$db->escape($search_ref);
if ($search_label) $sql.= natural_search("l.label", $search_label);
if ($filtre) {
- $filtre=str_replace(":","=",$filtre);
- $sql .= " AND ".$filtre;
+ $filtre=str_replace(":","=",$filtre);
+ $sql .= " AND ".$filtre;
}
$sql.= " GROUP BY l.rowid, l.label, l.capital, l.datestart, l.dateend";
$sql.= $db->order($sortfield,$sortorder);
@@ -86,13 +86,13 @@ $sql.= $db->order($sortfield,$sortorder);
$nbtotalofrecords = '';
if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
{
- $result = $db->query($sql);
- $nbtotalofrecords = $db->num_rows($result);
- if (($page * $limit) > $nbtotalofrecords) // if total resultset is smaller then paging size (filtering), goto and load page 0
- {
- $page = 0;
- $offset = 0;
- }
+ $result = $db->query($sql);
+ $nbtotalofrecords = $db->num_rows($result);
+ if (($page * $limit) > $nbtotalofrecords) // if total resultset is smaller then paging size (filtering), goto and load page 0
+ {
+ $page = 0;
+ $offset = 0;
+ }
}
$sql.= $db->plimit($limit+1, $offset);
@@ -105,35 +105,35 @@ if ($resql)
$i = 0;
$var=true;
- $param='';
- if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.urlencode($contextpage);
- if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.urlencode($limit);
- if ($search_ref) $param.="&search_ref=".urlencode($search_ref);
- if ($search_label) $param.="&search_label=".urlencode($search_user);
- if ($search_amount) $param.="&search_amount=".urlencode($search_amount_ht);
- if ($optioncss != '') $param.='&optioncss='.urlencode($optioncss);
+ $param='';
+ if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.urlencode($contextpage);
+ if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.urlencode($limit);
+ if ($search_ref) $param.="&search_ref=".urlencode($search_ref);
+ if ($search_label) $param.="&search_label=".urlencode($search_user);
+ if ($search_amount) $param.="&search_amount=".urlencode($search_amount_ht);
+ if ($optioncss != '') $param.='&optioncss='.urlencode($optioncss);
- $newcardbutton='';
- if ($user->rights->loan->write)
- {
- $newcardbutton=''.$langs->trans('NewLoan');
- $newcardbutton.= '';
- $newcardbutton.= '';
- }
+ $newcardbutton='';
+ if ($user->rights->loan->write)
+ {
+ $newcardbutton=''.$langs->trans('NewLoan');
+ $newcardbutton.= '';
+ $newcardbutton.= '';
+ }
- print '\n";
+ $db->free($resql);
}
else
{
- dol_print_error($db);
+ dol_print_error($db);
}
llxFooter();
diff --git a/htdocs/loan/payment/card.php b/htdocs/loan/payment/card.php
index f7b687caed9..2f6fbe8f202 100644
--- a/htdocs/loan/payment/card.php
+++ b/htdocs/loan/payment/card.php
@@ -16,9 +16,9 @@
*/
/**
- * \file htdocs/loan/payment/card.php
- * \ingroup loan
- * \brief Payment's card of loan
+ * \file htdocs/loan/payment/card.php
+ * \ingroup loan
+ * \brief Payment's card of loan
*/
require '../../main.inc.php';
@@ -56,14 +56,14 @@ if ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->loan->del
$result = $payment->delete($user);
if ($result > 0)
{
- $db->commit();
- header("Location: ".DOL_URL_ROOT."/loan/index.php");
- exit;
+ $db->commit();
+ header("Location: ".DOL_URL_ROOT."/loan/index.php");
+ exit;
}
else
{
setEventMessages($payment->error, $payment->errors, 'errors');
- $db->rollback();
+ $db->rollback();
}
}
@@ -170,18 +170,18 @@ print '
| '.$langs->trans('NotePublic').' | '.nl2br($payment->note_pu
// Bank account
if (! empty($conf->banque->enabled))
{
- if ($payment->bank_account)
- {
- $bankline=new AccountLine($db);
- $bankline->fetch($payment->bank_line);
+ if ($payment->bank_account)
+ {
+ $bankline=new AccountLine($db);
+ $bankline->fetch($payment->bank_line);
- print ' |
';
- print '| '.$langs->trans('BankTransactionLine').' | ';
+ print '
';
+ print '| '.$langs->trans('BankTransactionLine').' | ';
print '';
print $bankline->getNomUrl(1,0,'showall');
- print ' | ';
- print '
';
- }
+ print '';
+ print '';
+ }
}
print '';
@@ -210,7 +210,7 @@ if ($resql)
print '';
print '| '.$langs->trans('Loan').' | ';
print ''.$langs->trans('Label').' | ';
- print ''.$langs->trans('ExpectedToPay').' | ';
+ // print ''.$langs->trans('ExpectedToPay').' | ';
print ''.$langs->trans('Status').' | ';
print ''.$langs->trans('PayedByThisPayment').' | ';
print "
\n";
@@ -230,11 +230,13 @@ if ($resql)
// Label
print ''.$objp->label.' | ';
// Expected to pay
- print ''.price($objp->capital).' | ';
+ // print ''.price($objp->capital).' | ';
// Status
print ''.$loan->getLibStatut(4,$objp->amount_capital).' | ';
// Amount payed
- print ''.price($objp->amount_capital).' | ';
+ $amount_payed = $objp->amount_capital + $objp->amount_insurance + $objp->amount_interest;
+
+ print ''.price($amount_payed).' | ';
print "\n";
if ($objp->paid == 1) // If at least one invoice is paid, disable delete
{