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

Merge pull request #15669 from frederic34/template

Browse Source 
typo ortho
This commit is contained in:
Laurent Destailleur 2020-12-07 22:35:45 +01:00 committed by GitHub
commit d9ba821411
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/admin/mails_templates.php
View File

@ -1074,7 +1074,7 @@ function fieldList($fieldlist, $obj = '', $tabname = '', $context = '')
print '<td class="center">'; print '<td class="center">';
if ($context == 'edit' && !empty($obj->{$fieldlist[$field]}) && !in_array($obj->{$fieldlist[$field]}, array_keys($elementList))) if ($context == 'edit' && !empty($obj->{$fieldlist[$field]}) && !in_array($obj->{$fieldlist[$field]}, array_keys($elementList)))
{ {
// Current tempalte type is an unknown type, so we must keep it as it is. // Current template type is an unknown type, so we must keep it as it is.
print '<input type="hidden" name="type_template" value="'.$obj->{$fieldlist[$field]}.'">'; print '<input type="hidden" name="type_template" value="'.$obj->{$fieldlist[$field]}.'">';
print $obj->{$fieldlist[$field]}; print $obj->{$fieldlist[$field]};
} else { } else {

2
htdocs/compta/facture/card.php
View File

@ -3551,7 +3551,7 @@ if ($action == 'create')
print '</td></tr>'; print '</td></tr>';
} }
// Lines from source (TODO Show them also when creating invoice from tempalte invoice) // Lines from source (TODO Show them also when creating invoice from template invoice)
if (!empty($origin) && !empty($originid) && is_object($objectsrc)) if (!empty($origin) && !empty($originid) && is_object($objectsrc))
{ {
// TODO for compatibility // TODO for compatibility

2
htdocs/core/lib/website2.lib.php
View File

@ -442,7 +442,7 @@ function dolSaveReadme($file, $content)
/** /**
* Show list of themes. Show all thumbs of themes/skins * Show list of themes. Show all thumbs of themes/skins
* *
* @param Website $website Object website to load the tempalte into * @param Website $website Object website to load the template into
* @return void * @return void
*/ */
function showWebsiteTemplates(Website $website) function showWebsiteTemplates(Website $website)

4
htdocs/modulebuilder/template/admin/myobject_extrafields.php
View File

@ -21,7 +21,7 @@
*/ */
/** /**
* \file htdocs/modulebuilder/tempalte/admin/myobject_extrafields.php * \file htdocs/modulebuilder/template/admin/myobject_extrafields.php
* \ingroup mymodule * \ingroup mymodule
* \brief Page to setup extra fields of myobject * \brief Page to setup extra fields of myobject
*/ */
@ -31,7 +31,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/bom.lib.php';
require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
// Load translation files required by the page // Load translation files required by the page
$langs->loadLangs(array('mrp@mrp', 'admin')); $langs->loadLangs(array('mymodule@mymodule', 'admin'));
$extrafields = new ExtraFields($db); $extrafields = new ExtraFields($db);
$form = new Form($db); $form = new Form($db);