This commit is contained in:
aspangaro 2014-09-24 04:10:29 +02:00
parent a58025c601
commit 3d23319226
2 changed files with 46 additions and 59 deletions

View File

@ -72,8 +72,8 @@ if ($filtre) {
$sql.= $db->order($sortfield,$sortorder); $sql.= $db->order($sortfield,$sortorder);
$sql.= $db->plimit($limit+1,$offset); $sql.= $db->plimit($limit+1,$offset);
$resql=$db->query($sql); $resql=$db->query($sql);
if ($resql) if ($resql)
{ {
$num = $db->num_rows($resql); $num = $db->num_rows($resql);
@ -84,17 +84,6 @@ if ($resql)
print_fiche_titre($langs->trans("Loans")); print_fiche_titre($langs->trans("Loans"));
if (empty($mysoc->country_id) && empty($mysoc->country_code))
{
print '<div class="error">';
$langs->load("errors");
$countrynotdefined=$langs->trans("ErrorSetACountryFirst");
print $countrynotdefined;
print '</div>';
}
else
{
print '<form method="GET" action="'.$_SERVER["PHP_SELF"].'">'; print '<form method="GET" action="'.$_SERVER["PHP_SELF"].'">';
print "<table class=\"noborder\" width=\"100%\">"; print "<table class=\"noborder\" width=\"100%\">";
@ -127,7 +116,7 @@ if ($resql)
// Ref // Ref
print '<td width="60">'; print '<td width="60">';
$loan->id=$obj->id; $loan->id=$obj->id;
$loan->lib=$obj->id; $loan->label=$obj->id;
$loan->ref=$obj->id; $loan->ref=$obj->id;
print $loan->getNameUrl(1,'20'); print $loan->getNameUrl(1,'20');
print '</td>'; print '</td>';
@ -148,10 +137,8 @@ if ($resql)
} }
print '</table>'; print '</table>';
print '</form>'; print '</form>';
} }
}
else else
{ {
dol_print_error($db); dol_print_error($db);

View File

@ -120,7 +120,7 @@ if ($result)
print '<td class="liste_titre">&nbsp;</td>'; print '<td class="liste_titre">&nbsp;</td>';
print '</tr>'; print '</tr>';
print '<form action="list.php" method="GET">'; print '<form action="'.$_SERVER["PHP_SELF"].'" method="GET">';
print '<tr class="liste_titre">'; print '<tr class="liste_titre">';
print '<td class="liste_titre"><input type="text" class="flat" name="search_ligne" value="'. $search_line.'" size="6"></td>'; print '<td class="liste_titre"><input type="text" class="flat" name="search_ligne" value="'. $search_line.'" size="6"></td>';
print '<td class="liste_titre"><input type="text" class="flat" name="search_bon" value="'. $search_bon.'" size="8"></td>'; print '<td class="liste_titre"><input type="text" class="flat" name="search_bon" value="'. $search_bon.'" size="8"></td>';