diff --git a/htdocs/admin/system/filecheck.php b/htdocs/admin/system/filecheck.php
index a94a78a9794..4ed21144346 100644
--- a/htdocs/admin/system/filecheck.php
+++ b/htdocs/admin/system/filecheck.php
@@ -264,7 +264,7 @@ if (!$error && $xml)
$out .= "\n";
}
} else {
- $out .= '
| '.$langs->trans("None").' |
';
+ $out .= '| '.$langs->trans("None").' |
';
}
$out .= '';
$out .= '';
@@ -317,7 +317,7 @@ if (!$error && $xml)
$out .= ' | '."\n";
$out .= "\n";
} else {
- $out .= '| '.$langs->trans("None").' |
';
+ $out .= '| '.$langs->trans("None").' |
';
}
$out .= '';
$out .= '';
@@ -370,12 +370,11 @@ if (!$error && $xml)
$out .= ' | '."\n";
$out .= "\n";
} else {
- $out .= '| '.$langs->trans("None").' |
';
+ $out .= '| '.$langs->trans("None").' |
';
}
$out .= '';
$out .= '';
-
// Show warning
if (empty($tmpfilelist) && empty($tmpfilelist2) && empty($tmpfilelist3))
{
diff --git a/htdocs/bom/bom_card.php b/htdocs/bom/bom_card.php
index 38e8b601cf6..a7563c933d8 100644
--- a/htdocs/bom/bom_card.php
+++ b/htdocs/bom/bom_card.php
@@ -195,7 +195,7 @@ if (empty($reshook))
$error = 0;
// Set if we used free entry or predefined product
- $qty = price2num(GETPOST('qty', 'int'));
+ $qty = price2num(GETPOST('qty', 'alpha'));
$qty_frozen = GETPOST('qty_frozen', 'int');
$disable_stock_change = GETPOST('disable_stock_change', 'int');
$efficiency = price2num(GETPOST('efficiency', 'int'));
diff --git a/htdocs/core/tpl/commonfields_add.tpl.php b/htdocs/core/tpl/commonfields_add.tpl.php
index c7069b3d2aa..f21ff31f7a6 100644
--- a/htdocs/core/tpl/commonfields_add.tpl.php
+++ b/htdocs/core/tpl/commonfields_add.tpl.php
@@ -56,7 +56,10 @@ foreach ($object->fields as $key => $val)
if (!empty($val['picto'])) { print img_picto('', $val['picto']); }
if (in_array($val['type'], array('int', 'integer'))) $value = GETPOST($key, 'int');
elseif ($val['type'] == 'text' || $val['type'] == 'html') $value = GETPOST($key, 'restricthtml');
- else $value = GETPOST($key, 'alpha');
+ elseif ($val['type'] == 'date') $value = dol_mktime(12, 0, 0, GETPOST($key.'month', 'int'), GETPOST($key.'day', 'int'), GETPOST($key.'year', 'int'));
+ elseif ($val['type'] == 'datetime') $value = dol_mktime(GETPOST($key.'hour', 'int'), GETPOST($key.'min', 'int'), 0, GETPOST($key.'month', 'int'), GETPOST($key.'day', 'int'), GETPOST($key.'year', 'int'));
+ elseif ($val['type'] == 'boolean') $value = (GETPOST($key) == 'on' ? 1 : 0);
+ else $value = GETPOST($key, 'alphanohtml');
if ($val['noteditable']) print $object->showOutputField($val, $key, $value, '', '', '', 0);
else print $object->showInputField($val, $key, $value, '', '', '', 0);
print '';
diff --git a/htdocs/includes/odtphp/odf.php b/htdocs/includes/odtphp/odf.php
index 5012337daf8..88fa70c5646 100644
--- a/htdocs/includes/odtphp/odf.php
+++ b/htdocs/includes/odtphp/odf.php
@@ -820,6 +820,7 @@ IMG;
// Export to PDF using LibreOffice
if ($conf->global->MAIN_ODT_AS_PDF == 'libreoffice')
{
+ // Install prerequisites: apt install soffice libreoffice-common libreoffice-writer
// using windows libreoffice that must be in path
// using linux/mac libreoffice that must be in path
// Note PHP Config "fastcgi.impersonate=0" must set to 0 - Default is 1
@@ -856,7 +857,7 @@ IMG;
}
else
{
- // deprecated old method
+ // deprecated old method using odt2pdf.sh (native, jodconverter, ...)
$tmpname=preg_replace('/\.odt/i', '', $name);
if (!empty($conf->global->MAIN_DOL_SCRIPTS_ROOT))