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

Debug v14

Browse Source
This commit is contained in:
Laurent Destailleur 2021-06-20 04:10:25 +02:00
parent ce818d4f44
commit 1a6647e690
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
htdocs/core/class/html.formfile.class.php
View File

@ -356,7 +356,7 @@ class FormFile
* Return a string to show the box with list of available documents for object. * Return a string to show the box with list of available documents for object.
* This also set the property $this->numoffiles * This also set the property $this->numoffiles
* *
* @param string $modulepart Module the files are related to ('propal', 'facture', 'facture_fourn', 'mymodule', 'mymodule:nameofsubmodule', 'mymodule_temp', ...) * @param string $modulepart Module the files are related to ('propal', 'facture', 'facture_fourn', 'mymodule', 'mymodule:myobject', 'mymodule_temp', ...)
* @param string $modulesubdir Existing (so sanitized) sub-directory to scan (Example: '0/1/10', 'FA/DD/MM/YY/9999'). Use '' if file is not into subdir of module. * @param string $modulesubdir Existing (so sanitized) sub-directory to scan (Example: '0/1/10', 'FA/DD/MM/YY/9999'). Use '' if file is not into subdir of module.
* @param string $filedir Directory to scan * @param string $filedir Directory to scan
* @param string $urlsource Url of origin page (for return) * @param string $urlsource Url of origin page (for return)
@ -678,7 +678,7 @@ class FormFile
$res = include_once $file; $res = include_once $file;
} }
$class = 'ModelePDF'.$submodulepart; $class = 'ModelePDF'.ucfirst($submodulepart);
if (class_exists($class)) { if (class_exists($class)) {
$modellist = call_user_func($class.'::liste_modeles', $this->db); $modellist = call_user_func($class.'::liste_modeles', $this->db);
@ -740,7 +740,7 @@ class FormFile
if (($allowgenifempty || (is_array($modellist) && count($modellist) > 0)) && !empty($conf->global->MAIN_MULTILANGS) && !$forcenomultilang && (!empty($modellist) || $showempty)) { if (($allowgenifempty || (is_array($modellist) && count($modellist) > 0)) && !empty($conf->global->MAIN_MULTILANGS) && !$forcenomultilang && (!empty($modellist) || $showempty)) {
include_once DOL_DOCUMENT_ROOT.'/core/class/html.formadmin.class.php'; include_once DOL_DOCUMENT_ROOT.'/core/class/html.formadmin.class.php';
$formadmin = new FormAdmin($this->db); $formadmin = new FormAdmin($this->db);
$defaultlang = $codelang ? $codelang : $langs->getDefaultLang(); $defaultlang = ($codelang && $codelang != 'auto') ? $codelang : $langs->getDefaultLang();
$morecss = 'maxwidth150'; $morecss = 'maxwidth150';
if ($conf->browser->layout == 'phone') { if ($conf->browser->layout == 'phone') {
$morecss = 'maxwidth100'; $morecss = 'maxwidth100';

2
htdocs/core/modules/mrp/modules_mo.php
View File

@ -52,7 +52,7 @@ abstract class ModelePDFMo extends CommonDocGenerator
// phpcs:enable // phpcs:enable
global $conf; global $conf;
$type = 'mo'; $type = 'mrp';
$list = array(); $list = array();
include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'; include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';