Add MAIN_SEARCH_FORM_ON_HOME_AREAS to disable useless search forms

This commit is contained in:
Laurent Destailleur 2017-02-21 14:17:44 +01:00
parent 7ab600781d
commit 19e60f03b9
18 changed files with 403 additions and 359 deletions

View File

@ -125,6 +125,9 @@ if ($result)
//print '<tr><td width="30%" class="notopnoleft" valign="top">'; //print '<tr><td width="30%" class="notopnoleft" valign="top">';
print '<div class="fichecenter"><div class="fichethirdleft">'; print '<div class="fichecenter"><div class="fichethirdleft">';
if (! empty($conf->global->MAIN_SEARCH_FORM_ON_HOME_AREAS)) // This is useless due to the global search combo
{
// Search contact/address // Search contact/address
if (! empty($conf->adherent->enabled) && $user->rights->adherent->lire) if (! empty($conf->adherent->enabled) && $user->rights->adherent->lire)
{ {
@ -150,7 +153,7 @@ if (count($listofsearchfields))
print '</form>'; print '</form>';
print '<br>'; print '<br>';
} }
}
/* /*

View File

@ -77,6 +77,8 @@ print load_fiche_titre($langs->trans("CommercialArea"),'','title_commercial.png'
print '<div class="fichecenter"><div class="fichethirdleft">'; print '<div class="fichecenter"><div class="fichethirdleft">';
if (! empty($conf->global->MAIN_SEARCH_FORM_ON_HOME_AREAS)) // This is useless due to the global search combo
{
// Search proposal // Search proposal
if (! empty($conf->propal->enabled) && $user->rights->propal->lire) if (! empty($conf->propal->enabled) && $user->rights->propal->lire)
{ {
@ -127,7 +129,7 @@ if (count($listofsearchfields))
print '</form>'; print '</form>';
print '<br>'; print '<br>';
} }
}
/* /*

View File

@ -49,6 +49,8 @@ print load_fiche_titre($langs->trans("MailingArea"));
print '<div class="fichecenter"><div class="fichethirdleft">'; print '<div class="fichecenter"><div class="fichethirdleft">';
//if (! empty($conf->global->MAIN_SEARCH_FORM_ON_HOME_AREAS)) // This is useless due to the global search combo
//{
// Recherche emails // Recherche emails
$var=false; $var=false;
print '<form method="post" action="'.DOL_URL_ROOT.'/comm/mailing/list.php">'; print '<form method="post" action="'.DOL_URL_ROOT.'/comm/mailing/list.php">';
@ -62,6 +64,7 @@ print '<tr '.$bc[$var].'><td class="nowrap">';
print $langs->trans("Other").':</td><td><input type="text" class="flat inputsearch" name="sall"></td>'; print $langs->trans("Other").':</td><td><input type="text" class="flat inputsearch" name="sall"></td>';
print "</table></form><br>\n"; print "</table></form><br>\n";
//}
// Affiche stats de tous les modules de destinataires mailings // Affiche stats de tous les modules de destinataires mailings

View File

@ -59,9 +59,8 @@ print load_fiche_titre($langs->trans("ProspectionArea"));
print '<div class="fichecenter"><div class="fichethirdleft">'; print '<div class="fichecenter"><div class="fichethirdleft">';
/* if (! empty($conf->global->MAIN_SEARCH_FORM_ON_HOME_AREAS)) // This is useless due to the global search combo
* Search form {
*/
$var=false; $var=false;
print '<form method="post" action="'.DOL_URL_ROOT.'/comm/propal/list.php">'; print '<form method="post" action="'.DOL_URL_ROOT.'/comm/propal/list.php">';
print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">'; print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
@ -70,6 +69,7 @@ print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("Search").'</td><
print '<tr '.$bc[$var].'><td>'; print '<tr '.$bc[$var].'><td>';
print $langs->trans("Proposal").':</td><td><input type="text" class="flat" name="sall" size=18></td><td><input type="submit" value="'.$langs->trans("Search").'" class="button"></td></tr>'; print $langs->trans("Proposal").':</td><td><input type="text" class="flat" name="sall" size=18></td><td><input type="submit" value="'.$langs->trans("Search").'" class="button"></td></tr>';
print "</table></form><br>\n"; print "</table></form><br>\n";
}
/* /*

View File

@ -62,7 +62,8 @@ print load_fiche_titre($langs->trans("OrdersArea"));
//print '<tr><td valign="top" width="30%" class="notopnoleft">'; //print '<tr><td valign="top" width="30%" class="notopnoleft">';
print '<div class="fichecenter"><div class="fichethirdleft">'; print '<div class="fichecenter"><div class="fichethirdleft">';
if (! empty($conf->global->MAIN_SEARCH_FORM_ON_HOME_AREAS)) // This is useless due to the global search combo
{
// Search customer orders // Search customer orders
$var=false; $var=false;
print '<form method="post" action="'.DOL_URL_ROOT.'/commande/list.php">'; print '<form method="post" action="'.DOL_URL_ROOT.'/commande/list.php">';
@ -72,6 +73,7 @@ print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("Search").'</td><
print '<tr '.$bc[$var].'><td>'; print '<tr '.$bc[$var].'><td>';
print $langs->trans("CustomerOrder").':</td><td><input type="text" class="flat" name="sall" size=18></td><td><input type="submit" value="'.$langs->trans("Search").'" class="button"></td></tr>'; print $langs->trans("CustomerOrder").':</td><td><input type="text" class="flat" name="sall" size=18></td><td><input type="submit" value="'.$langs->trans("Search").'" class="button"></td></tr>';
print "</table></form><br>\n"; print "</table></form><br>\n";
}
/* /*

View File

@ -61,6 +61,8 @@ if ($user->societe_id > 0)
$socid = $user->societe_id; $socid = $user->societe_id;
} }
$max=3;
/* /*
* Actions * Actions
@ -88,9 +90,8 @@ print load_fiche_titre($langs->trans("AccountancyTreasuryArea"),'','title_accoun
print '<div class="fichecenter"><div class="fichethirdleft">'; print '<div class="fichecenter"><div class="fichethirdleft">';
$max=3; if (! empty($conf->global->MAIN_SEARCH_FORM_ON_HOME_AREAS)) // This is useless due to the global search combo
{
// Search customer invoices // Search customer invoices
if (! empty($conf->facture->enabled) && $user->rights->facture->lire) if (! empty($conf->facture->enabled) && $user->rights->facture->lire)
{ {
@ -126,6 +127,8 @@ if (count($listofsearchfields))
print '</form>'; print '</form>';
print '<br>'; print '<br>';
} }
}
/** /**
* Draft customers invoices * Draft customers invoices

View File

@ -72,6 +72,8 @@ print load_fiche_titre($langs->trans("ContractsArea"),'','title_commercial.png')
print '<div class="fichecenter"><div class="fichethirdleft">'; print '<div class="fichecenter"><div class="fichethirdleft">';
if (! empty($conf->global->MAIN_SEARCH_FORM_ON_HOME_AREAS)) // This is useless due to the global search combo
{
// Search contract // Search contract
if (! empty($conf->contrat->enabled)) if (! empty($conf->contrat->enabled))
{ {
@ -86,6 +88,8 @@ if (! empty($conf->contrat->enabled))
print "</table></form>\n"; print "</table></form>\n";
print "<br>"; print "<br>";
} }
}
/* /*
* Statistics * Statistics
@ -251,7 +255,7 @@ if (! empty($conf->contrat->enabled) && $user->rights->contrat->lire)
$i = 0; $i = 0;
//$tot_ttc = 0; //$tot_ttc = 0;
while ($i < $num && $i < 20) while ($i < $num)
{ {
$obj = $db->fetch_object($resql); $obj = $db->fetch_object($resql);
print '<tr '.$bc[$var].'><td class="nowrap">'; print '<tr '.$bc[$var].'><td class="nowrap">';

View File

@ -81,6 +81,8 @@ print load_fiche_titre($langs->trans("DonationsArea"));
print '<div class="fichecenter"><div class="fichethirdleft">'; print '<div class="fichecenter"><div class="fichethirdleft">';
if (! empty($conf->global->MAIN_SEARCH_FORM_ON_HOME_AREAS)) // This is useless due to the global search combo
{
if (! empty($conf->don->enabled) && $user->rights->don->lire) if (! empty($conf->don->enabled) && $user->rights->don->lire)
{ {
$listofsearchfields['search_donation']=array('text'=>'Donation'); $listofsearchfields['search_donation']=array('text'=>'Donation');
@ -105,6 +107,8 @@ if (count($listofsearchfields))
print '</form>'; print '</form>';
print '<br>'; print '<br>';
} }
}
print '<table class="noborder nohover" width="100%">'; print '<table class="noborder nohover" width="100%">';
print '<tr class="liste_titre">'; print '<tr class="liste_titre">';

View File

@ -47,7 +47,8 @@ print load_fiche_titre($langs->trans("SendingsArea"));
print '<div class="fichecenter"><div class="fichethirdleft">'; print '<div class="fichecenter"><div class="fichethirdleft">';
$var=false; if (! empty($conf->global->MAIN_SEARCH_FORM_ON_HOME_AREAS)) // This is useless due to the global search combo
{
print '<form method="post" action="list.php">'; print '<form method="post" action="list.php">';
print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">'; print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
print '<table class="noborder nohover" width="100%">'; print '<table class="noborder nohover" width="100%">';
@ -55,6 +56,7 @@ print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("Search").'</td><
print '<tr '.$bc[$var].'><td>'; print '<tr '.$bc[$var].'><td>';
print $langs->trans("Shipment").':</td><td><input type="text" class="flat" name="sall" size="18"></td><td><input type="submit" value="'.$langs->trans("Search").'" class="button"></td></tr>'; print $langs->trans("Shipment").':</td><td><input type="text" class="flat" name="sall" size="18"></td><td><input type="submit" value="'.$langs->trans("Search").'" class="button"></td></tr>';
print "</table></form><br>\n"; print "</table></form><br>\n";
}
/* /*
* Shipments to validate * Shipments to validate

View File

@ -59,7 +59,8 @@ print load_fiche_titre($langs->trans("InterventionsArea"));
print '<div class="fichecenter"><div class="fichethirdleft">'; print '<div class="fichecenter"><div class="fichethirdleft">';
if (! empty($conf->global->MAIN_SEARCH_FORM_ON_HOME_AREAS)) // This is useless due to the global search combo
{
// Search ficheinter // Search ficheinter
$var=false; $var=false;
print '<table class="noborder nohover" width="100%">'; print '<table class="noborder nohover" width="100%">';
@ -69,6 +70,7 @@ print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("Search").'</td><
print '<tr '.$bc[$var].'><td>'; print '<tr '.$bc[$var].'><td>';
print $langs->trans("Intervention").':</td><td><input type="text" class="flat" name="sall" size="18"></td><td><input type="submit" value="'.$langs->trans("Search").'" class="button"></td></tr>'; print $langs->trans("Intervention").':</td><td><input type="text" class="flat" name="sall" size="18"></td><td><input type="submit" value="'.$langs->trans("Search").'" class="button"></td></tr>';
print "</form></table><br>\n"; print "</form></table><br>\n";
}
/* /*

View File

@ -53,9 +53,8 @@ print load_fiche_titre($langs->trans("SuppliersOrdersArea"));
print '<div class="fichecenter"><div class="fichethirdleft">'; print '<div class="fichecenter"><div class="fichethirdleft">';
/* if (! empty($conf->global->MAIN_SEARCH_FORM_ON_HOME_AREAS)) // This is useless due to the global search combo
* Search form {
*/
$var=false; $var=false;
print '<form method="post" action="list.php">'; print '<form method="post" action="list.php">';
print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">'; print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
@ -64,6 +63,7 @@ print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("Search").'</td><
print '<tr '.$bc[$var].'><td>'; print '<tr '.$bc[$var].'><td>';
print $langs->trans("SupplierOrder").':</td><td><input type="text" class="flat" name="search_all" size="18"></td><td><input type="submit" value="'.$langs->trans("Search").'" class="button"></td></tr>'; print $langs->trans("SupplierOrder").':</td><td><input type="text" class="flat" name="search_all" size="18"></td><td><input type="submit" value="'.$langs->trans("Search").'" class="button"></td></tr>';
print "</table></form><br>\n"; print "</table></form><br>\n";
}
/* /*

View File

@ -77,7 +77,8 @@ print load_fiche_titre($langs->trans("HRMArea"),'', 'title_hrm.png');
print '<div class="fichecenter"><div class="fichethirdleft">'; print '<div class="fichecenter"><div class="fichethirdleft">';
if (! empty($conf->global->MAIN_SEARCH_FORM_ON_HOME_AREAS)) // This is useless due to the global search combo
{
if (! empty($conf->holiday->enabled) && $user->rights->holiday->read) if (! empty($conf->holiday->enabled) && $user->rights->holiday->read)
{ {
$langs->load("holiday"); $langs->load("holiday");
@ -112,6 +113,7 @@ if (count($listofsearchfields))
print '</form>'; print '</form>';
print '<br>'; print '<br>';
} }
}
if (! empty($conf->holiday->enabled)) if (! empty($conf->holiday->enabled))

View File

@ -77,10 +77,8 @@ print load_fiche_titre($transAreaType,$linkback,'title_products.png');
print '<div class="fichecenter"><div class="fichethirdleft">'; print '<div class="fichecenter"><div class="fichethirdleft">';
/* if (! empty($conf->global->MAIN_SEARCH_FORM_ON_HOME_AREAS)) // This is useless due to the global search combo
* Search Area of product/service {
*/
// Search contract // Search contract
if ((! empty($conf->product->enabled) || ! empty($conf->service->enabled)) && ($user->rights->produit->lire || $user->rights->service->lire)) if ((! empty($conf->product->enabled) || ! empty($conf->service->enabled)) && ($user->rights->produit->lire || $user->rights->service->lire))
{ {
@ -106,6 +104,8 @@ if (count($listofsearchfields))
print '</form>'; print '</form>';
print '<br>'; print '<br>';
} }
}
/* /*
* Number of products and/or services * Number of products and/or services

View File

@ -48,9 +48,8 @@ print load_fiche_titre($langs->trans("StocksArea"));
print '<div class="fichecenter"><div class="fichethirdleft">'; print '<div class="fichecenter"><div class="fichethirdleft">';
/* if (! empty($conf->global->MAIN_SEARCH_FORM_ON_HOME_AREAS)) // This is useless due to the global search combo
* Zone recherche entrepot {
*/
print '<form method="post" action="'.DOL_URL_ROOT.'/product/stock/list.php">'; print '<form method="post" action="'.DOL_URL_ROOT.'/product/stock/list.php">';
print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">'; print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
print '<table class="noborder nohover" width="100%">'; print '<table class="noborder nohover" width="100%">';
@ -59,6 +58,8 @@ print '<td colspan="3">'.$langs->trans("Search").'</td></tr>';
print "<tr ".$bc[false]."><td>"; print "<tr ".$bc[false]."><td>";
print $langs->trans("Warehouse").':</td><td><input class="flat" type="text" size="18" name="sall"></td><td rowspan="2"><input type="submit" value="'.$langs->trans("Search").'" class="button"></td></tr>'; print $langs->trans("Warehouse").':</td><td><input class="flat" type="text" size="18" name="sall"></td><td rowspan="2"><input type="submit" value="'.$langs->trans("Search").'" class="button"></td></tr>';
print "</table></form><br>"; print "</table></form><br>";
}
$sql = "SELECT e.label, e.rowid, e.statut"; $sql = "SELECT e.label, e.rowid, e.statut";
$sql.= " FROM ".MAIN_DB_PREFIX."entrepot as e"; $sql.= " FROM ".MAIN_DB_PREFIX."entrepot as e";

View File

@ -74,6 +74,9 @@ else
print '<div class="fichecenter"><div class="fichethirdleft">'; print '<div class="fichecenter"><div class="fichethirdleft">';
if (! empty($conf->global->MAIN_SEARCH_FORM_ON_HOME_AREAS)) // This is useless due to the global search combo
{
// Search project // Search project
if (! empty($conf->projet->enabled) && $user->rights->projet->lire) if (! empty($conf->projet->enabled) && $user->rights->projet->lire)
{ {
@ -99,8 +102,8 @@ if (count($listofsearchfields))
print '</form>'; print '</form>';
print '<br>'; print '<br>';
} }
}
print '</div><div class="fichetwothirdright"><div class="ficheaddleft">';
/* Affichage de la liste des projets d'aujourd'hui */ /* Affichage de la liste des projets d'aujourd'hui */
print '<table class="noborder" width="100%">'; print '<table class="noborder" width="100%">';
@ -156,8 +159,11 @@ print "</tr>\n";
print "</table>"; print "</table>";
print '</div><div class="fichetwothirdright"><div class="ficheaddleft">';
/* Affichage de la liste des projets d'hier */ /* Affichage de la liste des projets d'hier */
print '<br><table class="noborder" width="100%">'; print '<table class="noborder" width="100%">';
print '<tr class="liste_titre">'; print '<tr class="liste_titre">';
print '<td>'.$langs->trans('ActivityOnProjectYesterday').'</td>'; print '<td>'.$langs->trans('ActivityOnProjectYesterday').'</td>';
print '<td align="right">'.$langs->trans("Time").'</td>'; print '<td align="right">'.$langs->trans("Time").'</td>';

View File

@ -98,6 +98,9 @@ else dol_print_error($db);
print '<div class="fichecenter"><div class="fichethirdleft">'; print '<div class="fichecenter"><div class="fichethirdleft">';
if (! empty($conf->global->MAIN_SEARCH_FORM_ON_HOME_AREAS)) // This is useless due to the global search combo
{
// Search project // Search project
if (! empty($conf->projet->enabled) && $user->rights->projet->lire) if (! empty($conf->projet->enabled) && $user->rights->projet->lire)
{ {
@ -123,6 +126,7 @@ if (count($listofsearchfields))
print '</form>'; print '</form>';
print '<br>'; print '<br>';
} }
}
/* /*

View File

@ -57,7 +57,8 @@ print load_fiche_titre($transAreaType,$linkback,'title_companies.png');
print '<div class="fichecenter"><div class="fichethirdleft">'; print '<div class="fichecenter"><div class="fichethirdleft">';
if (! empty($conf->global->MAIN_SEARCH_FORM_ON_HOME_AREAS)) // This is useless due to the global search combo
{
// Search thirdparty // Search thirdparty
if (! empty($conf->societe->enabled) && $user->rights->societe->lire) if (! empty($conf->societe->enabled) && $user->rights->societe->lire)
{ {
@ -88,6 +89,7 @@ if (count($listofsearchfields))
print '</form>'; print '</form>';
print '<br>'; print '<br>';
} }
}
/* /*

View File

@ -60,6 +60,9 @@ print '<div class="fichecenter"><div class="fichethirdleft">';
/* /*
* Search form * Search form
*/ */
if (! empty($conf->global->MAIN_SEARCH_FORM_ON_HOME_AREAS)) // This is useless due to the global search combo
{
$var=false; $var=false;
print '<form method="post" action="'.DOL_URL_ROOT.'/supplier_proposal/list.php">'; print '<form method="post" action="'.DOL_URL_ROOT.'/supplier_proposal/list.php">';
print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">'; print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
@ -69,6 +72,7 @@ print '<tr '.$bc[$var].'><td>';
print $langs->trans("SupplierProposal").':</td><td><input type="text" class="flat" name="sall" size="18"></td><td><input type="submit" value="'.$langs->trans("Search").'" class="button"></td></tr>'; print $langs->trans("SupplierProposal").':</td><td><input type="text" class="flat" name="sall" size="18"></td><td><input type="submit" value="'.$langs->trans("Search").'" class="button"></td></tr>';
print '</tr>'; print '</tr>';
print "</table></form><br>\n"; print "</table></form><br>\n";
}
/* /*