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

Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop

Browse Source
This commit is contained in:
Laurent Destailleur 2018-03-09 23:00:04 +01:00
commit 4895587f02
6 changed files with 50 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/admin/expensereport.php
View File

@ -195,7 +195,7 @@ else if ($action == 'setoptions')
$dirmodels=array_merge(array('/'),(array) $conf->modules_parts['models']); $dirmodels=array_merge(array('/'),(array) $conf->modules_parts['models']);
llxHeader(); llxHeader('',$langs->trans("ExpenseReportsSetup"));
$form=new Form($db); $form=new Form($db);

2
htdocs/admin/expensereport_extrafields.php
View File

@ -67,7 +67,7 @@ require DOL_DOCUMENT_ROOT.'/core/actions_extrafields.inc.php';
$textobject=$langs->transnoentitiesnoconv("expensereports"); $textobject=$langs->transnoentitiesnoconv("expensereports");
llxHeader('',$langs->trans("expensereportsSetup")); llxHeader('',$langs->trans("ExpenseReportsSetup"));
$linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php?restore_lastsearch_values=1">'.$langs->trans("BackToModuleList").'</a>'; $linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php?restore_lastsearch_values=1">'.$langs->trans("BackToModuleList").'</a>';
print load_fiche_titre($langs->trans("ExpenseReportsSetup"),$linkback,'title_setup'); print load_fiche_titre($langs->trans("ExpenseReportsSetup"),$linkback,'title_setup');

2
htdocs/admin/expensereport_ik.php
View File

@ -89,7 +89,7 @@ $rangesbycateg = ExpenseReportIk::getAllRanges();
* View * View
*/ */
llxHeader(); llxHeader('',$langs->trans("ExpenseReportsSetup"));
$form=new Form($db); $form=new Form($db);

2
htdocs/admin/expensereport_rules.php
View File

@ -145,7 +145,7 @@ $tab_rules_type = array('EX_DAY' => $langs->trans('Day'), 'EX_MON' => $langs->tr
* View * View
*/ */
llxHeader(); llxHeader('',$langs->trans("ExpenseReportsSetup"));
$form=new Form($db); $form=new Form($db);

2
htdocs/core/class/commonobject.class.php
View File

@ -5991,7 +5991,7 @@ abstract class CommonObject
jQuery(document).ready(function() { jQuery(document).ready(function() {
function showOptions(child_list, parent_list) function showOptions(child_list, parent_list)
{ {
var val = $("select[name=\"options_"+parent_list+"\"]").val(); var val = $("select[name="+parent_list+"]").val();
var parentVal = parent_list + ":" + val; var parentVal = parent_list + ":" + val;
if(val > 0) { if(val > 0) {
$("select[name=\""+child_list+"\"] option[parent]").hide(); $("select[name=\""+child_list+"\"] option[parent]").hide();

2
htdocs/core/tpl/extrafields_view.tpl.php
View File

@ -151,7 +151,7 @@ if (empty($reshook) && ! empty($extrafields->attributes[$object->table_element][
jQuery(document).ready(function() { jQuery(document).ready(function() {
function showOptions(child_list, parent_list) function showOptions(child_list, parent_list)
{ {
var val = $("select[name=\"options_"+parent_list+"\"]").val(); var val = $("select[name="+parent_list+"]").val();
var parentVal = parent_list + ":" + val; var parentVal = parent_list + ":" + val;
if(val > 0) { if(val > 0) {
$("select[name=\""+child_list+"\"] option[parent]").hide(); $("select[name=\""+child_list+"\"] option[parent]").hide();