diff --git a/htdocs/loan/class/loan.class.php b/htdocs/loan/class/loan.class.php
index 586b6b59036..f655b3adcb2 100644
--- a/htdocs/loan/class/loan.class.php
+++ b/htdocs/loan/class/loan.class.php
@@ -556,7 +556,7 @@ class Loan extends CommonObject
$table = 'payment_loan';
$field = 'fk_loan';
- $sql = 'SELECT sum(amount) as amount';
+ $sql = 'SELECT sum(amount_capital) as amount';
$sql .= ' FROM '.MAIN_DB_PREFIX.$table;
$sql .= ' WHERE '.$field.' = '.$this->id;
diff --git a/htdocs/projet/element.php b/htdocs/projet/element.php
index 9be63cad242..9b49f2814a9 100644
--- a/htdocs/projet/element.php
+++ b/htdocs/projet/element.php
@@ -829,11 +829,13 @@ foreach ($listofreferent as $key => $value)
// Amount HT
//if (empty($value['disableamount']) && ! in_array($tablename, array('projet_task'))) print '
'.$langs->trans("AmountHT").' | ';
//elseif (empty($value['disableamount']) && in_array($tablename, array('projet_task'))) print ''.$langs->trans("Amount").' | ';
- if (empty($value['disableamount'])) print ''.$langs->trans("AmountHT").' | ';
+ if ($key == 'loan') print ''.$langs->trans("LoanCapital").' | ';
+ elseif (empty($value['disableamount'])) print ''.$langs->trans("AmountHT").' | ';
else print ' | ';
// Amount TTC
//if (empty($value['disableamount']) && ! in_array($tablename, array('projet_task'))) print ''.$langs->trans("AmountTTC").' | ';
- if (empty($value['disableamount'])) print ''.$langs->trans("AmountTTC").' | ';
+ if ($key == 'loan') print ''.$langs->trans("RemainderToPay").' | ';
+ elseif (empty($value['disableamount'])) print ''.$langs->trans("AmountTTC").' | ';
else print ' | ';
// Status
if (in_array($tablename, array('projet_task'))) print ''.$langs->trans("ProgressDeclared").' | ';
@@ -928,6 +930,10 @@ foreach ($listofreferent as $key => $value)
print $element->getNomUrl(1, 'withproject', 'time');
print ' - '.dol_trunc($element->label, 48);
}
+ elseif ($key == 'loan'){
+ print $element->getNomUrl(1);
+ print ' - '.dol_trunc($element->label, 48);
+ }
else print $element->getNomUrl(1);
$element_doc = $element->element;
@@ -977,6 +983,10 @@ foreach ($listofreferent as $key => $value)
if (empty($date)) $date = $element->datev;
}
}
+ elseif ($key == 'loan'){
+ $date = $element->datestart;
+ }
+
print '';
if ($tablename == 'actioncomm')
{
@@ -1050,6 +1060,7 @@ foreach ($listofreferent as $key => $value)
$othermessage = $form->textwithpicto($langs->trans("NotAvailable"), $langs->trans("ModuleSalaryToDefineHourlyRateMustBeEnabled"));
}
}
+ elseif ($key == 'loan') $total_ht_by_line = $element->capital;
else
{
$total_ht_by_line = $element->total_ht;
@@ -1097,6 +1108,7 @@ foreach ($listofreferent as $key => $value)
$othermessage = $form->textwithpicto($langs->trans("NotAvailable"), $langs->trans("ModuleSalaryToDefineHourlyRateMustBeEnabled"));
}
}
+ elseif ($key == 'loan') $total_ttc_by_line = $element->capital - $element->getSumPayment();
else
{
$total_ttc_by_line = $element->total_ttc;
@@ -1204,7 +1216,8 @@ foreach ($listofreferent as $key => $value)
print ' | ';
if (empty($value['disableamount']))
{
- if ($tablename != 'projet_task' || !empty($conf->salaries->enabled)) print ''.$langs->trans("TotalHT").' : '.price($total_ht);
+ if ($key == 'loan') print $langs->trans("Total").' '.$langs->trans("LoanCapital").' : '.price($total_ttc);
+ elseif ($tablename != 'projet_task' || !empty($conf->salaries->enabled)) print ''.$langs->trans("TotalHT").' : '.price($total_ht);
}
print ' | ';
//if (empty($value['disableamount']) && ! in_array($tablename, array('projet_task'))) print ''.$langs->trans("TotalTTC").' : '.price($total_ttc).' | ';
@@ -1212,7 +1225,8 @@ foreach ($listofreferent as $key => $value)
print '';
if (empty($value['disableamount']))
{
- if ($tablename != 'projet_task' || !empty($conf->salaries->enabled)) print $langs->trans("TotalTTC").' : '.price($total_ttc);
+ if ($key == 'loan') print $langs->trans("Total").' '.$langs->trans("RemainderToPay").' : '.price($total_ttc);
+ elseif ($tablename != 'projet_task' || !empty($conf->salaries->enabled)) print $langs->trans("TotalTTC").' : '.price($total_ttc);
}
print ' | ';
print ' | ';