lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

NEW The quick search box on left menu can also search into expense

Browse Source 
reports.
This commit is contained in:
Laurent Destailleur 2015-11-02 13:14:46 +01:00
parent 250be086b7
commit c119859696
6 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/core/ajax/selectsearchbox.php
View File

@ -107,6 +107,10 @@ if (! empty($conf->contrat->enabled) && empty($conf->global->MAIN_SEARCHFORM_CON
{
$arrayresult['searchintocontract']=array('text'=>img_picto('','object_contract').' '.$langs->trans("SearchIntoContracts", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/contrat/list.php?sall='.urlencode($search_boxvalue));
}
if (! empty($conf->expensereport->enabled) && empty($conf->global->MAIN_SEARCHFORM_EXPENSEREPORT_DISABLED) && $user->rights->expensereport->lire)
{
$arrayresult['searchintoexpensereport']=array('text'=>img_picto('','object_trip').' '.$langs->trans("SearchIntoExpenseReports", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/expensereport/list.php?sall='.urlencode($search_boxvalue));
}
/* Do we really need this. We already have a select for users, and we should be able to filter into user list on employee flag

1
htdocs/core/class/html.form.class.php
View File

@ -4562,6 +4562,7 @@ class Form
},*/
cache: true
},
dropdownCssClass: "css-'.$htmlname.'",
placeholder: "'.dol_escape_js($placeholder).'",
escapeMarkup: function (markup) { return markup; }, // let our custom formatter work
minimumInputLength: '.$minimumInputLength.',

1
htdocs/langs/en_US/main.lang
View File

@ -766,3 +766,4 @@ SearchIntoCustomerProposals=Customer proposals
SearchIntoSupplierProposals=Supplier proposals
SearchIntoInterventions=Interventions
SearchIntoContracts=Contracts
SearchIntoExpenseReports=Expense reports

1
htdocs/projet/activity/perweek.php
View File

@ -34,6 +34,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
$langs->load('projects');
$langs->load('users');
$action=GETPOST('action');
$mode=GETPOST("mode");

6
htdocs/theme/eldy/style.css.php
View File

@ -3533,6 +3533,12 @@ a span.select2-chosen
{
background: #FFFFFF;
}
.select2-results {
max-height: 400px;
}
.css-searchselectcombo ul.select2-results {
max-height: none;
}
.select2-container-multi.select2-container-disabled .select2-choices {
background-color: #FFFFFF;
background-image: none;

6
htdocs/theme/md/style.css.php
View File

@ -3385,6 +3385,12 @@ a span.select2-chosen
{
background: #FFFFFF;
}
.select2-results {
max-height: 400px;
}
.css-searchselectcombo ul.select2-results {
max-height: none;
}
.select2-container-multi.select2-container-disabled .select2-choices {
background-color: #FFFFFF;
background-image: none;