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

Fix: the new option AGENDA_USE_EVENT_TYPE_DEFAULT was not visible.

Browse Source 
Solved this by completing tooltip info.
This commit is contained in:
Laurent Destailleur 2016-01-07 11:01:37 +01:00
parent 9200a4b69d
commit 4e2d4a6651
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/comm/action/card.php
View File

@ -651,7 +651,7 @@ if ($action == 'create')
{ {
print '<tr><td width="30%"><span class="fieldrequired">'.$langs->trans("Type").'</span></b></td><td>'; print '<tr><td width="30%"><span class="fieldrequired">'.$langs->trans("Type").'</span></b></td><td>';
$default=(empty($conf->global->AGENDA_USE_EVENT_TYPE_DEFAULT)?'':$conf->global->AGENDA_USE_EVENT_TYPE_DEFAULT); $default=(empty($conf->global->AGENDA_USE_EVENT_TYPE_DEFAULT)?'':$conf->global->AGENDA_USE_EVENT_TYPE_DEFAULT);
$formactions->select_type_actions(GETPOST("actioncode")?GETPOST("actioncode"):($object->type_code?$object->type_code:$default), "actioncode","systemauto"); $formactions->select_type_actions(GETPOST("actioncode")?GETPOST("actioncode"):($object->type_code?$object->type_code:$default), "actioncode", "systemauto", 0, -1);
print '</td></tr>'; print '</td></tr>';
} }

9
htdocs/core/class/html.formactions.class.php
View File

@ -243,10 +243,10 @@ class FormActions
* Output html select list of type of event * Output html select list of type of event
* *
* @param string $selected Type pre-selected (can be 'manual', 'auto' or 'AC_xxx') * @param string $selected Type pre-selected (can be 'manual', 'auto' or 'AC_xxx')
* @param string $htmlname Nom champ formulaire * @param string $htmlname Name of select field
* @param string $excludetype A type to exclude ('systemauto', 'system', '') * @param string $excludetype A type to exclude ('systemauto', 'system', '')
* @param string $onlyautoornot 1=Group all type AC_XXX into 1 line AC_MANUAL. 0=Keep details of type * @param string $onlyautoornot 1=Group all type AC_XXX into 1 line AC_MANUAL. 0=Keep details of type
* @param int $hideinfohelp 1=Do not show info help * @param int $hideinfohelp 1=Do not show info help, 0=Show, -1=Show+Add info to tell how to set default value
* @param int $multiselect 1=Allow multiselect of action type * @param int $multiselect 1=Allow multiselect of action type
* @return void * @return void
*/ */
@ -280,7 +280,10 @@ class FormActions
print $form->selectarray($htmlname, $arraylist, $selected); print $form->selectarray($htmlname, $arraylist, $selected);
} }
if ($user->admin && empty($onlyautoornot) && empty($hideinfohelp)) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1); if ($user->admin && empty($onlyautoornot) && $hideinfohelp <= 0)
{
print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup").($hideinfohelp == -1 ? ". ".$langs->trans("YouCanSetDefaultValueInModuleSetup") : ''),1);
}
} }
} }

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

@ -610,6 +610,7 @@ TotalMan=Total
NeverReceived=Never received NeverReceived=Never received
Canceled=Canceled Canceled=Canceled
YouCanChangeValuesForThisListFromDictionarySetup=You can change values for this list from menu setup - dictionary YouCanChangeValuesForThisListFromDictionarySetup=You can change values for this list from menu setup - dictionary
YouCanSetDefaultValueInModuleSetup=You can set the default value used when creating a new record into module setup
Color=Color Color=Color
Documents=Linked files Documents=Linked files
DocumentsNb=Linked files (%s) DocumentsNb=Linked files (%s)