diff --git a/htdocs/loan/card.php b/htdocs/loan/card.php
index ca28b16261c..9e7b8f2565a 100644
--- a/htdocs/loan/card.php
+++ b/htdocs/loan/card.php
@@ -716,9 +716,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, $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 ''.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++;
@@ -728,14 +728,14 @@ if ($id > 0)
if ($object->paid == 0)
{
- print '| '.$langs->trans("AlreadyPaid").' : | '.price($totalpaid, 0, $langs, 0, 0, -1, $conf->currency).' |
';
- print '| '.$langs->trans("AmountExpected").' : | '.price($object->capital, 0, $outputlangs, 1, -1, -1, $conf->currency).' |
';
+ print '| '.$langs->trans("AlreadyPaid").' : | '.price($totalpaid, 0, $langs, 0, -1, -1, $conf->currency).' |
';
+ print '| '.$langs->trans("AmountExpected").' : | '.price($object->capital, 0, $outputlangs, 1, -1, -1, $conf->currency).' |
';
$staytopay = $object->capital - $totalpaid;
print '| '.$langs->trans("RemainderToPay").' : | ';
- print '';
- print price($staytopay, 0, $langs, 0, 0, -1, $conf->currency);
+ print ' | ';
+ print price($staytopay, 0, $langs, 0, -1, -1, $conf->currency);
print ' |
';
}
print "";
diff --git a/htdocs/loan/list.php b/htdocs/loan/list.php
index 3b1ccfd2724..912b95c643a 100644
--- a/htdocs/loan/list.php
+++ b/htdocs/loan/list.php
@@ -124,14 +124,14 @@ if (is_numeric($nbtotalofrecords) && ($limit > $nbtotalofrecords || empty($limit
else
{
if ($limit) $sql .= $db->plimit($limit + 1, $offset);
-
+
$resql = $db->query($sql);
if (!$resql)
{
dol_print_error($db);
exit;
}
-
+
$num = $db->num_rows($resql);
}
@@ -185,10 +185,10 @@ if ($resql)
print ' | ';
print ' | ';
print '';
- print '';
- print '';
+ print ' | ';
+ $searchpicto=$form->showFilterAndCheckAddButtons(0);
+ print $searchpicto;
print ' | ';
- print '';
// Fields title label
// --------------------------------------------------------------------
@@ -199,7 +199,9 @@ if ($resql)
print_liste_field_titre("DateStart", $_SERVER["PHP_SELF"], "l.datestart", "", $param, '', $sortfield, $sortorder, 'center ');
print_liste_field_titre("DateEnd", $_SERVER["PHP_SELF"], "l.dateend", "", $param, '', $sortfield, $sortorder, 'center ');
print_liste_field_titre("Status", $_SERVER["PHP_SELF"], "l.paid", "", $param, '', $sortfield, $sortorder, 'right ');
- print_liste_field_titre('');
+ print_liste_field_titre('', $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'maxwidthsearch ');
+ print "\n";
+
print "\n";
// Loop on record
@@ -210,7 +212,7 @@ if ($resql)
{
$obj = $db->fetch_object($resql);
if (empty($obj)) break; // Should not happen
-
+
$loan_static->id = $obj->rowid;
$loan_static->ref = $obj->rowid;
$loan_static->label = $obj->label;
@@ -252,12 +254,12 @@ if ($resql)
$parameters = array('arrayfields'=>$arrayfields, 'sql'=>$sql);
$reshook = $hookmanager->executeHooks('printFieldListFooter', $parameters, $object); // Note that $action and $object may have been modified by hook
print $hookmanager->resPrint;
-
+
print ''."\n";
print ''."\n";
-
+
print ''."\n";
-
+
$db->free($resql);
}
else