diff --git a/htdocs/modulebuilder/template/core/modules/mymodule/doc/doc_generic_myobject_odt.modules.php b/htdocs/modulebuilder/template/core/modules/mymodule/doc/doc_generic_myobject_odt.modules.php index 15f8ebf9f08..b6b9a986715 100644 --- a/htdocs/modulebuilder/template/core/modules/mymodule/doc/doc_generic_myobject_odt.modules.php +++ b/htdocs/modulebuilder/template/core/modules/mymodule/doc/doc_generic_myobject_odt.modules.php @@ -473,7 +473,7 @@ class doc_generic_myobject_odt extends ModelePDFMyObject $reshook = $hookmanager->executeHooks('beforeODTSave', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks // Write new file - if (getDolGlobalInt('MAIN_ODT_AS_PDF')) { + if (getDolGlobalString('MAIN_ODT_AS_PDF')) { try { $odfHandler->exportAsAttachedPDF($file); } catch (Exception $e) { diff --git a/htdocs/product/inventory/inventory.php b/htdocs/product/inventory/inventory.php index 99e01a02e48..76df6ee4ae2 100644 --- a/htdocs/product/inventory/inventory.php +++ b/htdocs/product/inventory/inventory.php @@ -1108,9 +1108,7 @@ if ($resql) { //PMP Real print ''; - - - if (!empty($obj->pmp_real)) { + if (!empty($obj->pmp_real) || (string) $obj->pmp_real === '0') { $pmp_real = $obj->pmp_real; } else { $pmp_real = $product_static->pmp; @@ -1335,6 +1333,7 @@ function updateTotalValuation() { })); } +