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

Fix setup

Browse Source
This commit is contained in:
Laurent Destailleur 2020-12-15 11:18:29 +01:00
parent 31693eed21
commit 2ae1aac5a4
5 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3611,15 +3611,14 @@ class Form
* *
* @param string $selected Id pre-selectionne * @param string $selected Id pre-selectionne
* @param string $htmlname Nom de la zone select * @param string $htmlname Nom de la zone select
* @param string $addjscombo Add js combo
* @return string Code of HTML select to chose tax or not * @return string Code of HTML select to chose tax or not
*/ */
public function selectPriceBaseType($selected = '', $htmlname = 'price_base_type') public function selectPriceBaseType($selected = '', $htmlname = 'price_base_type', $addjscombo = 0)
{ {
global $langs; global $langs;
$return = ''; $return = '<select class="flat maxwidth100" id="select_'.$htmlname.'" name="'.$htmlname.'">';
$return .= '<select class="flat maxwidth75" id="select_'.$htmlname.'" name="'.$htmlname.'">';
$options = array( $options = array(
'HT'=>$langs->trans("HT"), 'HT'=>$langs->trans("HT"),
'TTC'=>$langs->trans("TTC") 'TTC'=>$langs->trans("TTC")
@ -3635,6 +3634,7 @@ class Form
$return .= '</option>'; $return .= '</option>';
} }
$return .= '</select>'; $return .= '</select>';
if ($addjscombo) $return .= ajax_combobox('select_'.$htmlname);
return $return; return $return;
} }

3
htdocs/langs/en_US/admin.lang
View File

@ -56,7 +56,8 @@ GUISetup=Display
SetupArea=Setup SetupArea=Setup
UploadNewTemplate=Upload new template(s) UploadNewTemplate=Upload new template(s)
FormToTestFileUploadForm=Form to test file upload (according to setup) FormToTestFileUploadForm=Form to test file upload (according to setup)
ModuleMustBeEnabled=Module <b>%s</b> must be enabled ModuleMustBeEnabled=The module/application <b>%s</b> must be enabled
ModuleIsEnabled=The module/application <b>%s</b> has been enabled
IfModuleEnabled=Note: yes is effective only if module <b>%s</b> is enabled IfModuleEnabled=Note: yes is effective only if module <b>%s</b> is enabled
RemoveLock=Remove/rename file <b>%s</b> if it exists, to allow usage of the Update/Install tool. RemoveLock=Remove/rename file <b>%s</b> if it exists, to allow usage of the Update/Install tool.
RestoreLock=Restore file <b>%s</b>, with read permission only, to disable any further use of the Update/Install tool. RestoreLock=Restore file <b>%s</b>, with read permission only, to disable any further use of the Update/Install tool.

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

@ -126,7 +126,6 @@ UseSpecificEditorURL = Use a specific editor URL
UseSpecificFamily = Use a specific family UseSpecificFamily = Use a specific family
UseSpecificAuthor = Use a specific author UseSpecificAuthor = Use a specific author
UseSpecificVersion = Use a specific initial version UseSpecificVersion = Use a specific initial version
ModuleMustBeEnabled=The module/application must be enabled first
IncludeRefGeneration=The reference of object must be generated automatically IncludeRefGeneration=The reference of object must be generated automatically
IncludeRefGenerationHelp=Check this if you want to include code to manage the generation automatically of the reference IncludeRefGenerationHelp=Check this if you want to include code to manage the generation automatically of the reference
IncludeDocGeneration=I want to generate some documents from the object IncludeDocGeneration=I want to generate some documents from the object

2
htdocs/modulebuilder/index.php
View File

@ -2385,7 +2385,7 @@ if ($module == 'initmodule')
print ' &nbsp; '; print ' &nbsp; ';
if (empty($conf->global->$const_name)) // If module is not activated if (empty($conf->global->$const_name)) // If module is not activated
{ {
print '<a href="#" target="apiexplorer" title="'.$langs->trans("ModuleMustBeEnabled").'"><strike>'.$langs->trans("GoToApiExplorer").'</strike></a>'; print '<a href="#" target="apiexplorer" title="'.$langs->trans("ModuleMustBeEnabled", $module).'"><strike>'.$langs->trans("GoToApiExplorer").'</strike></a>';
} else { } else {
print '<a href="'.DOL_URL_ROOT.'/api/index.php/explorer/" target="apiexplorer">'.$langs->trans("GoToApiExplorer").'</a>'; print '<a href="'.DOL_URL_ROOT.'/api/index.php/explorer/" target="apiexplorer">'.$langs->trans("GoToApiExplorer").'</a>';
} }

2
htdocs/product/admin/product.php
View File

@ -594,7 +594,7 @@ if (!empty($conf->global->PRODUIT_MULTIPRICES) || !empty($conf->global->PRODUIT_
// Default product price base type // Default product price base type
print '<tr class="oddeven">'; print '<tr class="oddeven">';
print '<td>'.$langs->trans("DefaultPriceType").'</td>'; print '<td>'.$langs->trans("DefaultPriceType").'</td>';
print '<td width="60" class="right">'; print '<td class="right">';
print $form->selectPriceBaseType($conf->global->PRODUCT_PRICE_BASE_TYPE, "price_base_type"); print $form->selectPriceBaseType($conf->global->PRODUCT_PRICE_BASE_TYPE, "price_base_type");
print '</td>'; print '</td>';
print '</tr>'; print '</tr>';