diff --git a/htdocs/comm/clients.php b/htdocs/comm/clients.php
index 4ad4c3c1307b7d2c283c5d62796469b701a318ed..d38bbd5b736e0961bf6433f3b52e6342f125ab04 100644
--- a/htdocs/comm/clients.php
+++ b/htdocs/comm/clients.php
@@ -105,16 +105,18 @@ if ($result)
print_liste_field_titre($langs->trans("Town"),"clients.php","s.ville",$addu,"","",$sortfield);
print_liste_field_titre($langs->trans("CustomerCode"),"clients.php","s.code_client",$addu,"","",$sortfield);
print_liste_field_titre($langs->trans("DateCreation"),"clients.php","datec",$addu,"","",$sortfield);
- print "<td> </td></tr>\n";
+ print '<td class="liste_titre"> </td>';
+ print "</tr>\n";
print '<form method="get" action="clients.php">';
print '<tr class="liste_titre">';
- print '<td valign="right">';
+ print '<td class="liste_titre" valign="right">';
print '<input type="text" class="flat" name="search_nom" value="'.stripslashes($_GET["search_nom"]).'">';
- print '</td><td valign="right"> ';
- print '</td><td valign="right">';
+ print '</td><td class="liste_titre" valign="right"> ';
+ print '</td><td class="liste_titre" valign="right">';
print '<input type="text" class="flat" name="search_code" value="'.$_GET["search_code"].'" size="8">';
- print '</td><td> </td><td align="center"><input class="button" type="submit" value="'.$langs->trans("Search").'">';
+ print '</td><td class="liste_titre"> </td>';
+ print '<td class="liste_titre" align="center"><input class="liste_titre" type="image" src="'.DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/search.png" alt="'.$langs->trans("Search").'">';
print "</td>";
print "</tr>\n";
diff --git a/htdocs/comm/contact.php b/htdocs/comm/contact.php
index fead1460fa68710a8bb33a0bfeeacc8687747c44..1dbb901cd35fd95adc74ca0177da3155004b0287 100644
--- a/htdocs/comm/contact.php
+++ b/htdocs/comm/contact.php
@@ -1,7 +1,7 @@
<?php
/* Copyright (C) 2001-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2003 �ric Seigne <erics@rycks.com>
- * Copyright (C) 2004 Laurent Destailleur <eldy@users.sourceforge.net>
+ * Copyright (C) 2004-2005 Laurent Destailleur <eldy@users.sourceforge.net>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -23,10 +23,10 @@
*/
/**
- \file htdocs/comm/contact.php
- \ingroup commercial
- \brief Liste des contacts
- \version $Revision$
+ \file htdocs/comm/contact.php
+ \ingroup commercial
+ \brief Liste des contacts
+ \version $Revision$
*/
require("./pre.inc.php");
@@ -83,10 +83,8 @@ if ($type == "f")
}
/*
- *
* Mode liste
*
- *
*/
$sql = "SELECT s.idp, s.nom, st.libelle as stcomm";
@@ -146,22 +144,22 @@ if ($result)
print_barre_liste($langs->trans("ListOfContacts").($label?" (".$label.")":""),$page, "contact.php", "&type=$type",$sortfield,$sortorder,"",$num);
- print '<table class="noborder" width="100%">';
+ print '<table class="liste" width="100%">';
print '<tr class="liste_titre">';
print_liste_field_titre($langs->trans("Lastname"),"contact.php","p.name", $begin,"&type=$type","",$sortfield);
print_liste_field_titre($langs->trans("Firstname"),"contact.php","p.firstname", $begin,"&type=$type","",$sortfield);
print_liste_field_titre($langs->trans("Company"),"contact.php","s.nom", $begin,"&type=$type","",$sortfield);
- print '<td>'.$langs->trans("Email").'</td>';
- print '<td>'.$langs->trans("Phone").'</td>';
+ print '<td class="liste_titre">'.$langs->trans("Email").'</td>';
+ print '<td class="liste_titre">'.$langs->trans("Phone").'</td>';
print "</tr>\n";
print '<form action="contact.php?type='.$_GET["type"].'" method="GET">';
print '<tr class="liste_titre">';
- print '<td><input class="flat" name="search_nom" size="12" value="'.$_GET["search_nom"].'"></td>';
- print '<td><input class="flat" name="search_prenom" size="12" value="'.$_GET["search_prenom"].'"></td>';
- print '<td><input class="flat" name="search_societe" size="12" value="'.$_GET["search_societe"].'"></td>';
- print '<td> </td>';
- print '<td><input type="submit" class="button" value='.$langs->trans("Search").'></td>';
+ print '<td class="liste_titre"><input class="flat" name="search_nom" size="12" value="'.$_GET["search_nom"].'"></td>';
+ print '<td class="liste_titre"><input class="flat" name="search_prenom" size="12" value="'.$_GET["search_prenom"].'"></td>';
+ print '<td class="liste_titre"><input class="flat" name="search_societe" size="12" value="'.$_GET["search_societe"].'"></td>';
+ print '<td class="liste_titre"> </td>';
+ print '<td class="liste_titre" align="right"><input type="image" class="liste_titre" src="'.DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/search.png" alt='.$langs->trans("Search").'></td>';
print "</tr>\n";
print '</form>';
diff --git a/htdocs/comm/prospect/prospects.php b/htdocs/comm/prospect/prospects.php
index c56bf3d9f02cf2764fc20f045b54bed9de04c839..42fe61d2a95ffda2fdb6979c91a8c248f0b05f05 100644
--- a/htdocs/comm/prospect/prospects.php
+++ b/htdocs/comm/prospect/prospects.php
@@ -127,26 +127,26 @@ if ($result)
$i = 0;
- print '<table class="noborder" width="100%">';
+ print '<table class="liste" width="100%">';
print '<tr class="liste_titre">';
print_liste_field_titre($langs->trans("Company"),"prospects.php","s.nom","","","valign=\"center\"",$sortfield);
print_liste_field_titre($langs->trans("Town"),"prospects.php","s.ville","","","",$sortfield);
print_liste_field_titre($langs->trans("State"),"prospects.php","s.fk_departement","","","align=\"center\"",$sortfield);
print_liste_field_titre($langs->trans("DateCreation"),"prospects.php","s.datec","","","align=\"center\"",$sortfield);
print_liste_field_titre($langs->trans("Status"),"prospects.php","s.fk_stcomm","","","align=\"center\"",$sortfield);
- print '<td colspan="4"> </td>';
+ print '<td class="liste_titre" colspan="4"> </td>';
print "</tr>\n";
print '<form method="get" action="prospects.php">';
print '<tr class="liste_titre">';
- print '<td valign="right">';
+ print '<td class="liste_titre" valign="right">';
print '<input type="text" class="flat" name="search_nom" value="'.$_GET["search_nom"].'">';
- print '</td><td>';
-
+ print '</td><td class="liste_titre">';
print '<input type="text" class="flat" name="search_ville" value="'.$_GET["search_ville"].'">';
- print "</td>";
- print "<td>";
- print '<input type="submit" class="button" value="'.$langs->trans("Search").'"></td><td colspan="3"> </td>';
+ print '</td>';
+ print '<td class="liste_titre" colspan="7" align="right">';
+ print '<input type="image" class="liste_titre" src="'.DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/search.png" alt="'.$langs->trans("Search").'">';
+ print '</td>';
print "</tr>\n";
@@ -159,7 +159,7 @@ if ($result)
$var=!$var;
print "<tr $bc[$var]>";
- print '<td width="35%"><a href="'.DOL_URL_ROOT.'/comm/prospect/fiche.php?id='.$obj->idp.'">';
+ print '<td><a href="'.DOL_URL_ROOT.'/comm/prospect/fiche.php?id='.$obj->idp.'">';
print img_object($langs->trans("ShowProspect"),"company");
print '</a> <a href="'.DOL_URL_ROOT.'/comm/prospect/fiche.php?id='.$obj->idp.'">'.$obj->nom.'</a></td>';
print "<td>".$obj->ville." </td>";
@@ -174,7 +174,7 @@ if ($result)
print "</td>";
$sts = array(-1,0,1,2,3);
- print '<td>';
+ print '<td align="right">';
foreach ($sts as $key => $value)
{
if ($value <> $obj->fk_stcomm)
diff --git a/htdocs/compta/bank/account.php b/htdocs/compta/bank/account.php
index 1dd7acb68d9c051bb8ef7cbb5530b412abd74982..77f65be05eac0f6229dc89aaf6efb9828bfe4643 100644
--- a/htdocs/compta/bank/account.php
+++ b/htdocs/compta/bank/account.php
@@ -215,7 +215,7 @@ if ($account > 0)
print '<td><input type="text" class="flat" name="req_desc" value="'.$_POST["req_desc"].'" size="40"></td>';
print '<td align="right"><input type="text" class="flat" name="req_debit" value="'.$_POST["req_debit"].'" size="6"></td>';
print '<td align="right"><input type="text" class="flat" name="req_credit" value="'.$_POST["req_credit"].'" size="6"></td>';
- print '<td align="center"><input type="submit" class="button" value="'.$langs->trans("Search").'"></td>';
+ print '<td align="center"><input type="image" class="liste_titre" src="'.DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/search.png" alt="'.$langs->trans("Search").'"></td>';
print '<td align="center">';
if ($user->rights->banque->modifier)
{
diff --git a/htdocs/compta/bank/search.php b/htdocs/compta/bank/search.php
index f67d36e44fa17f65458e637f080302300eb93774..70ad8c868383b73b4fe1acb67ce50c13fcd0e62a 100644
--- a/htdocs/compta/bank/search.php
+++ b/htdocs/compta/bank/search.php
@@ -35,42 +35,47 @@ $user->getrights('banque');
if (!$user->rights->banque->lire)
accessforbidden();
+$description=$_POST["description"];
+$debit=$_POST["debit"];
+$credit=$_POST["credit"];
+$type=$_POST["type"];
+$account=$_POST["account"];
+
llxHeader();
-if ($vline) {
- $viewline = $vline;
-} else {
- $viewline = 50;
-}
+if ($vline) $viewline = $vline;
+else $viewline = 50;
-print_titre("Recherche �criture bancaire");
+
+print_titre($langs->trans("SearchBankMovement"));
print '<br>';
-print '<table class="noborder" width="100%">';
-print "<tr class=\"liste_titre\">";
-print '<td>Date</td><td>'.$langs->trans("Description").'</td>';
-print '<td align="right">'.$langs->trans("Debit").'</td>';
-print '<td align="right">'.$langs->trans("Credit").'</td>';
-print "<td align=\"center\">".$langs->trans("Type")."</td>";
-print '<td align="left">'.$langs->trans("Account").'</td>';
+print '<table class="liste" width="100%">';
+print '<tr class="liste_titre">';
+print '<td class="liste_titre">'.$langs->trans("Date").'</td>';
+print '<td class="liste_titre">'.$langs->trans("Description").'</td>';
+print '<td class="liste_titre" align="right">'.$langs->trans("Debit").'</td>';
+print '<td class="liste_titre" align="right">'.$langs->trans("Credit").'</td>';
+print '<td class="liste_titre" align="center">'.$langs->trans("Type").'</td>';
+print '<td class="liste_titre" align="left">'.$langs->trans("Account").'</td>';
print "</tr>\n";
?>
<form method="post" action="search.php">
<tr class="liste_titre">
-<td> </td>
-<td>
+<td class="liste_titre"> </td>
+<td class="liste_titre">
<input type="text" class="flat" name="description" size="40" value=<?php echo $description ?>>
</td>
-<td align="right">
+<td class="liste_titre" align="right">
<input type="text" class="flat" name="debit" size="6" value=<?php echo $debit ?>>
</td>
-<td align="right">
+<td class="liste_titre" align="right">
<input type="text" class="flat" name="credit" size="6" value=<?php echo $credit ?>>
</td>
-<td align="center">
-<select name="type">
+<td class="liste_titre" align="center">
+<select class="flat" name="type">
<option value="%">Toutes</option>
<option value="CHQ">CHQ</option>
<option value="CB">CB</option>
@@ -78,41 +83,49 @@ print "</tr>\n";
<option value="PRE">PRE</option>
</select>
</td>
-<td align="left">
-<input type="submit" class="button" name="submit" value="<?php echo $langs->trans("Search") ?>">
-</td>
-</tr>
-
<?php
+print '<td class="liste_titre" align="right">';
+print '<input type="hidden" name="action" value="search">';
+print '<input type="image" class="liste_titre" name="submit" src="'.DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/search.png" alt="'.$langs->trans("Search").'">';
+print '</td>';
+print '</tr>';
+
// Compte le nombre total d'�critures
$sql = "SELECT count(*) FROM ".MAIN_DB_PREFIX."bank";
if ($account) { $sql .= " WHERE b.fk_account=$account"; }
-if ( $db->query($sql) )
+
+$resql=$db->query($sql);
+if ($resql)
{
- $nbline = $db->result (0, 0);
- $db->free();
+ $nbline = $db->result (0, 0);
+ $db->free($resql);
}
-
+else {
+ dolibarr_print_error($db);
+}
+
// Defini la liste des cat�gories dans $options
$sql = "SELECT rowid, label FROM ".MAIN_DB_PREFIX."bank_categ;";
$result = $db->query($sql);
if ($result) {
- $var=True;
- $num = $db->num_rows();
- $i = 0;
+ $var=True;
+ $num = $db->num_rows($result);
+ $i = 0;
$options = "<option value=\"0\" selected></option>";
while ($i < $num) {
- $obj = $db->fetch_object($result);
- $options .= "<option value=\"$obj->rowid\">$obj->label</option>\n"; $i++;
+ $obj = $db->fetch_object($result);
+ $options .= "<option value=\"$obj->rowid\">$obj->label</option>\n"; $i++;
}
- $db->free();
+ $db->free($result);
+}
+else {
+ dolibarr_print_error($db);
}
$sql = "SELECT b.rowid,".$db->pdate("b.dateo")." as do, b.amount, b.label, b.rappro, b.num_releve, b.num_chq, b.fk_account, b.fk_type, ba.label as labelaccount";
$sql .= " FROM ".MAIN_DB_PREFIX."bank as b, ".MAIN_DB_PREFIX."bank_account as ba";
$sql .= " WHERE b.fk_account=ba.rowid";
-
$sql .= " AND fk_type like '" . $type . "'";
$si=0;
@@ -139,11 +152,10 @@ for ($i = 1 ; $i <= $si; $i++) {
$sql .= " ORDER BY b.dateo ASC";
$result = $db->query($sql);
-
if ($result)
{
$var=True;
- $num = $db->num_rows();
+ $num = $db->num_rows($result);
$i = 0;
while ($i < $num) {
@@ -174,7 +186,7 @@ if ($result)
$i++;
}
- $db->free();
+ $db->free($result);
}
else
{
@@ -184,7 +196,7 @@ else
print "</table>";
// Si acc�s issu d'une recherche et rien de trouv�
-if ($_POST["submit"] && ! $num) {
+if ($_POST["action"] == "search" && ! $num) {
print "Aucune �criture bancaire r�pondant aux crit�res n'a �t� trouv�e.";
}
diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php
index e3d409282b4cc307c32d36df351da1a895b556c8..1c51f67d34b81bf8ef3ab09ca811f6b276d84a74 100644
--- a/htdocs/compta/facture.php
+++ b/htdocs/compta/facture.php
@@ -1636,7 +1636,7 @@ else
print_barre_liste($langs->trans("BillsCustomers")." ".($socidp?" $soc->nom":""),$page,"facture.php","&socidp=$socidp",$sortfield,$sortorder,'',$num);
$i = 0;
- print '<table class="noborder" width="100%">';
+ print '<table class="liste" width="100%">';
print '<tr class="liste_titre">';
print_liste_field_titre($langs->trans("Ref"),$_SERVER["PHP_SELF"],"f.facnumber","","&socidp=$socidp","",$sortfield);
print_liste_field_titre($langs->trans("Date"),$_SERVER["PHP_SELF"],"f.datef","","&socidp=$socidp",'align="center"',$sortfield);
@@ -1650,17 +1650,17 @@ else
// Lignes des champs de filtre
print '<form method="get" action="facture.php">';
print '<tr class="liste_titre">';
- print '<td valign="right">';
+ print '<td class="liste_titre" valign="right">';
print '<input class="flat" size="10" type="text" name="search_ref" value="'.$_GET["search_ref"].'">';
- print '</td><td> </td>';
- print '<td align="left">';
+ print '</td><td class="liste_titre"> </td>';
+ print '<td class="liste_titre" align="left">';
print '<input class="flat" type="text" name="search_societe" value="'.$_GET["search_societe"].'">';
- print '</td><td align="right">';
+ print '</td><td class="liste_titre" align="right">';
print '<input class="flat" type="text" size="10" name="search_montant_ht" value="'.$_GET["search_montant_ht"].'">';
- print '</td><td align="right">';
+ print '</td><td class="liste_titre" align="right">';
print '<input class="flat" type="text" size="10" name="search_montant_ttc" value="'.$_GET["search_montant_ttc"].'">';
- print '</td><td colspan="2" align="center">';
- print '<input type="submit" class="button" name="button_search" value="'.$langs->trans("Search").'">';
+ print '</td><td class="liste_titre" colspan="2" align="right">';
+ print '<input type="image" class="liste_titre" name="button_search" src="'.DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/search.png" alt="'.$langs->trans("Search").'">';
print '</td>';
print "</tr>\n";
print '</form>';
diff --git a/htdocs/compta/resultat/clientfourn.php b/htdocs/compta/resultat/clientfourn.php
index 72d87c0bf6597157a44fdbe5c86b960edab1343f..a80310e741af675d5150e3c517f2c925de47a17c 100644
--- a/htdocs/compta/resultat/clientfourn.php
+++ b/htdocs/compta/resultat/clientfourn.php
@@ -147,7 +147,7 @@ if ($modecompta != 'CREANCES-DETTES') {
$var=!$var;
print "<tr $bc[$var]><td> </td>";
- print "<td>".$langs->trans("Bills")." ".$langs->trans("Other")."\n";
+ print "<td>".$langs->trans("Bills")." ".$langs->trans("Other")." (anciens paiements li�s � aucune facture)\n";
if ($modecompta == 'CREANCES-DETTES') print "<td align=\"right\">".price($objp->amount_ht)."</td>\n";
print "<td align=\"right\">".price($objp->amount_ttc)."</td>\n";
@@ -158,17 +158,20 @@ if ($modecompta != 'CREANCES-DETTES') {
$i++;
}
}
- else {
- $var=!$var;
- print "<tr $bc[$var]><td> </td>";
- print '<td colspan="3">'.$langs->trans("None").'</td>';
- print '</tr>';
- }
$db->free($result);
} else {
dolibarr_print_error($db);
}
}
+
+if ($total_ttc == 0)
+{
+ $var=!$var;
+ print "<tr $bc[$var]><td> </td>";
+ print '<td colspan="3">'.$langs->trans("None").'</td>';
+ print '</tr>';
+}
+
print '<tr class="liste_total">';
if ($modecompta == 'CREANCES-DETTES') print '<td colspan="3" align="right">'.price($total_ht).'</td>';
print '<td colspan="3" align="right">'.price($total_ttc).'</td>';
diff --git a/htdocs/contact/index.php b/htdocs/contact/index.php
index c83560557c9463b09f43655af01d4b88cf1acee9..6ca392b5f2ed39cb36bcf2ac4074f676c1a5337a 100644
--- a/htdocs/contact/index.php
+++ b/htdocs/contact/index.php
@@ -152,7 +152,7 @@ if ($result)
print_barre_liste($titre ,$page, "index.php", '&begin='.$_GET["begin"].'&view='.$_GET["view"].'&userid='.$_GET["userid"], $sortfield, $sortorder,'',$num);
- print '<table class="noborder" width="100%">';
+ print '<table class="liste" width="100%">';
if ($contactname)
{
@@ -164,18 +164,18 @@ if ($result)
print_liste_field_titre($langs->trans("Lastname"),"index.php","p.name", $begin, "&type=$type&view=$view&search_nom=$search_nom&search_prenom=$search_prenom&search_societe=$search_societe&search_email=$search_email", "", $sortfield);
print_liste_field_titre($langs->trans("Firstname"),"index.php","p.firstname", $begin, "&type=$type&view=$view&search_nom=$search_nom&search_prenom=$search_prenom&search_societe=$search_societe&search_email=$search_email", "", $sortfield);
print_liste_field_titre($langs->trans("Company"),"index.php","s.nom", $begin, "&type=$type&view=$view&search_nom=$search_nom&search_prenom=$search_prenom&search_societe=$search_societe&search_email=$search_email", "", $sortfield);
- print '<td>'.$langs->trans("Phone").'</td>';
+ print '<td class="liste_titre">'.$langs->trans("Phone").'</td>';
if ($_GET["view"] == 'phone')
{
- print '<td>'.$langs->trans("Mobile").'</td>';
- print '<td>'.$langs->trans("Fax").'</td>';
+ print '<td class="liste_titre">'.$langs->trans("Mobile").'</td>';
+ print '<td class="liste_titre">'.$langs->trans("Fax").'</td>';
}
else
{
print_liste_field_titre($langs->trans("EMail"),"index.php","p.email", $begin, "&type=$type&view=$view&search_nom=$search_nom&search_prenom=$search_prenom&search_societe=$search_societe&search_email=$search_email", "", $sortfield);
}
- print '<td> </td>';
+ print '<td class="liste_titre"> </td>';
print "</tr>\n";
// Ligne des champs de filtres
@@ -184,38 +184,38 @@ if ($result)
print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
print '<tr class="liste_titre">';
- print '<td>';
+ print '<td class="liste_titre">';
print '<input class="flat" type="text" name="search_nom" size="12" value="'.$search_nom.'">';
print '</td>';
- print '<td>';
+ print '<td class="liste_titre">';
print '<input class="flat" type="text" name="search_prenom" size="10" value="'.$search_prenom.'">';
print '</td>';
- print '<td>';
+ print '<td class="liste_titre">';
print '<input class="flat" type="text" name="search_societe" size="14" value="'.$search_societe.'">';
print '</td>';
- print '<td>';
+ print '<td class="liste_titre">';
print ' ';
print '</td>';
if ($_GET["view"] == 'phone')
{
- print '<td>';
+ print '<td class="liste_titre">';
print ' ';
print '</td>';
- print '<td>';
+ print '<td class="liste_titre">';
print ' ';
print '</td>';
}
else
{
- print '<td>';
+ print '<td class="liste_titre">';
print '<input class="flat" type="text" name="search_email" size="12" value="'.$search_email.'">';
print '</td>';
}
- print '<td>';
- print '<input type="submit" class="button" name="button_search" value="'.$langs->trans("Search").'">';
- print ' <input type="submit" class="button" name="button_removefilter" value="'.$langs->trans("RemoveFilter").'">';
+ print '<td class="liste_titre" align="right">';
+ print '<input type="image" class="liste_titre" src="'.DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/search.png" name="button_search" alt="'.$langs->trans("Search").'">';
+ print ' <input type="image" class="liste_titre" src="'.DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/searchclear.png" name="button_removefilter" alt="'.$langs->trans("RemoveFilter").'">';
print '</td>';
print '</tr>';
print '</form>';
diff --git a/htdocs/fourn/contact.php b/htdocs/fourn/contact.php
index e3f05d9f1a9c9f16145a23ccfc10f82592ad3031..bdd50d6cbaaded1d83b9a9c9fb14a3d6d6674455 100644
--- a/htdocs/fourn/contact.php
+++ b/htdocs/fourn/contact.php
@@ -89,12 +89,13 @@ if ($result) {
print_barre_liste($langs->trans("ListOfContacts")." (".$langs->trans("Suppliers").")",$page, "contact.php", "",$sortfield,$sortorder,"",$num);
- print '<table class="noborder" width="100%">';
- print "<tr class=\"liste_titre\">";
+ print '<table class="liste" width="100%">';
+ print '<tr class="liste_titre">';
print_liste_field_titre($langs->trans("Lastname"),"contact.php","lower(p.name)", $begin, "", "", $sortfield);
print_liste_field_titre($langs->trans("Firstname"),"contact.php","lower(p.firstname)", $begin, "", "", $sortfield);
print_liste_field_titre($langs->trans("Company"),"contact.php","lower(s.nom)", $begin, "", "", $sortfield);
- print '<td>'.$langs->trans("Email").'</td><td>'.$langs->trans("Phone").'</td>';
+ print '<td class="liste_titre">'.$langs->trans("Email").'</td>';
+ print '<td class="liste_titre">'.$langs->trans("Phone").'</td>';
print "</tr>\n";
$var=True;
$i = 0;
diff --git a/htdocs/fourn/facture/index.php b/htdocs/fourn/facture/index.php
index f7be089c41b0e362389568d16cf515d6cbe8a168..4e7e81e469d939d9dae181c58a46120a63eb33c1 100644
--- a/htdocs/fourn/facture/index.php
+++ b/htdocs/fourn/facture/index.php
@@ -152,7 +152,7 @@ if ($result)
print_barre_liste($langs->trans("BillsSuppliers").($socid?" $soc->nom":""),$page,"index.php","&socidp=$socidp",$sortfield,$sortorder,'',$num);
- print '<table class="noborder" width="100%">';
+ print '<table class="liste" width="100%">';
print '<tr class="liste_titre">';
print_liste_field_titre($langs->trans("Ref"),"index.php","facnumber","&socid=$socid","","",$sortfield);
print_liste_field_titre($langs->trans("Date"),"index.php","fac.datef","&socid=$socid","","",$sortfield);
@@ -166,20 +166,20 @@ if ($result)
// Lignes des champs de filtre
print '<form method="get" action="index.php">';
print '<tr class="liste_titre">';
- print '<td valign="right">';
+ print '<td class="liste_titre" valign="right">';
print '<input class="flat" size="10" type="text" name="search_ref" value="'.$_GET["search_ref"].'">';
- print '</td><td> </td>';
- print '<td align="left">';
+ print '</td><td class="liste_titre"> </td>';
+ print '<td class="liste_titre" align="left">';
print '<input class="flat" type="text" name="search_libelle" value="'.$_GET["search_libelle"].'">';
print '</td>';
- print '<td align="left">';
+ print '<td class="liste_titre" align="left">';
print '<input class="flat" type="text" name="search_societe" value="'.$_GET["search_societe"].'">';
- print '</td><td align="right">';
+ print '</td><td class="liste_titre" align="right">';
print '<input class="flat" type="text" size="10" name="search_montant_ht" value="'.$_GET["search_montant_ht"].'">';
- print '</td><td align="right">';
+ print '</td><td class="liste_titre" align="right">';
print '<input class="flat" type="text" size="10" name="search_montant_ttc" value="'.$_GET["search_montant_ttc"].'">';
- print '</td><td colspan="2" align="center">';
- print '<input type="submit" class="button" name="button_search" value="'.$langs->trans("Search").'">';
+ print '</td><td class="liste_titre" colspan="2" align="center">';
+ print '<input type="image" class="liste_titre" name="button_search" src="'.DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/search.png" alt="'.$langs->trans("Search").'">';
print '</td>';
print "</tr>\n";
print '</form>';
diff --git a/htdocs/fourn/index.php b/htdocs/fourn/index.php
index 64ae3d7d2196c57bdad8bd5c0b0b6de828479642..234844da1af6e40cce8a6d7c486b3ad7368db0a1 100644
--- a/htdocs/fourn/index.php
+++ b/htdocs/fourn/index.php
@@ -57,15 +57,8 @@ if ($page == -1) { $page = 0 ; }
$offset = $conf->liste_limit * $page ;
$pageprev = $page - 1;
$pagenext = $page + 1;
-
-if ($sortorder == "")
-{
- $sortorder="ASC";
-}
-if ($sortfield == "")
-{
- $sortfield="nom";
-}
+if (! $sortorder) $sortorder="ASC";
+if (! $sortfield) $sortfield="nom";
/*
@@ -105,19 +98,19 @@ if ($result)
print_barre_liste($langs->trans("ListOfSuppliers"), $page, "index.php", "", $sortfield, $sortorder, '', $num);
- print '<table class="noborder" width="100%">';
+ print '<table class="liste" width="100%">';
print '<tr class="liste_titre">';
print_liste_field_titre($langs->trans("Company"),"index.php","s.nom","","",'valign="center"',$sortfield);
- print '<td>'.$langs->trans("Town").'</td>';
- print '<td> </td>';
+ print '<td class="liste_titre">'.$langs->trans("Town").'</td>';
+ print '<td class="liste_titre"> </td>';
print "</tr>\n";
print '<tr class="liste_titre">';
print '<form action="index.php" method="GET">';
- print '<td><input type="text" class="flat" name="search_nom" value="'.$_GET["search_nom"].'"></td>';
- print '<td><input type="text" class="flat" name="search_ville" value="'.$_GET["search_ville"].'"></td>';
- print '<td><input class="button" type="submit" value="'.$langs->trans("Search").'"></td>';
+ print '<td class="liste_titre"><input type="text" class="flat" name="search_nom" value="'.$_GET["search_nom"].'"></td>';
+ print '<td class="liste_titre"><input type="text" class="flat" name="search_ville" value="'.$_GET["search_ville"].'"></td>';
+ print '<td class="liste_titre" align="right"><input class="liste_titre" type="image" src="'.DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/search.png" alt="'.$langs->trans("Search").'"></td>';
print '</form>';
print '</tr>';
diff --git a/htdocs/langs/en_US/banks.lang b/htdocs/langs/en_US/banks.lang
index 7a1dc399dc2888750ee679940e276c10f3506e8c..ddb553d1c9b51871d3bbcf281a0121f303088f6c 100644
--- a/htdocs/langs/en_US/banks.lang
+++ b/htdocs/langs/en_US/banks.lang
@@ -27,3 +27,4 @@ StandingOrderProcessed=Processed
NewAccount=New account
NewFinancialAccount=New financial account
AccountSetup=Account setup
+SearchBankMovement=search bank movement
\ No newline at end of file
diff --git a/htdocs/langs/fr_FR/banks.lang b/htdocs/langs/fr_FR/banks.lang
index 22fea5585f495495f52605f504ba82090f4f8e62..24a938c0f3ff64a2a732e3bd1891f5634393c6ae 100644
--- a/htdocs/langs/fr_FR/banks.lang
+++ b/htdocs/langs/fr_FR/banks.lang
@@ -27,3 +27,4 @@ StandingOrderProcessed=Trait
NewAccount=Nouveau compte
NewFinancialAccount=Nouveau compte financier
AccountSetup=Configuration des comptes
+SearchBankMovement=Recherche �criture bancaire
diff --git a/htdocs/societe.php b/htdocs/societe.php
index a640e51ebe22043ecea1599fbb1174b1579b402b..9fceab686b4e0f1f00548f20c1f625818793e956 100644
--- a/htdocs/societe.php
+++ b/htdocs/societe.php
@@ -102,7 +102,10 @@ if ($mode == 'search')
$socid = $user->societe_id;
}
}
-if ($_POST["button_removefilter"] == $langs->trans("RemoveFilter")) {
+
+// As-t-on cliqu� sur purge des cri�tres de recherche
+if (isset($_POST["button_removefilter_x"]))
+{
$socname="";
$search_nom="";
$search_ville="";
@@ -161,29 +164,29 @@ if ($result)
print_barre_liste($title, $page, "societe.php",$params,$sortfield,$sortorder,'',$num);
// Lignes des titres
- print '<table class="noborder" width="100%">';
+ print '<table class="liste" width="100%">';
print '<tr class="liste_titre">';
print_liste_field_titre($langs->trans("Company"),"societe.php","s.nom", $params,"&search_nom=$search_nom&search_ville=$search_ville","",$sortfield);
print_liste_field_titre($langs->trans("Town"),"societe.php","s.ville",$params,"&search_nom=$search_nom&search_ville=$search_ville",'',$sortfield);
print_liste_field_titre($langs->trans("SIREN"),"societe.php","s.siren",$params,"&search_nom=$search_nom&search_ville=$search_ville",'',$sortfield);
- print '<td colspan="2" align="center"> </td>';
+ print '<td class="liste_titre" colspan="2" align="center"> </td>';
print "</tr>\n";
// Lignes des champs de filtre
- print '<form method="post" action="societe.php">';
+ print '<form method="post" action="societe.php" name="formfilter">';
print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
print '<tr class="liste_titre">';
- print '<td valign="right">';
+ print '<td class="liste_titre" valign="right">';
print '<input class="flat" type="text" name="search_nom" value="'.stripslashes($search_nom).'">';
- print '</td><td valign="right">';
+ print '</td><td class="liste_titre" valign="right">';
print '<input class="flat" type="text" name="search_ville" value="'.stripslashes($search_ville).'">';
- print '</td><td valign="right">';
+ print '</td><td class="liste_titre" valign="right">';
print '<input class="flat" size="10" type="text" name="search_siren" value="'.$_POST["search_siren"].'">';
-
- print '</td><td colspan="2" align="center">';
- print '<input type="submit" class="button" name="button_search" value="'.$langs->trans("Search").'">';
- print ' <input type="submit" class="button" name="button_removefilter" value="'.$langs->trans("RemoveFilter").'">';
+ print '</td><td class="liste_titre" colspan="2" align="right">';
+ print '<input type="image" class="liste_titre" name="button_search" src="'.DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/search.png" alt="'.$langs->trans("Search").'">';
+ print ' ';
+ print '<input type="image" class="liste_titre" name="button_removefilter" src="'.DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/searchclear.png" alt="'.$langs->trans("RemoveFilter").'">';
print '</td>';
print "</tr>\n";
print '</form>';