Mirrors/dolibarr
1
0
Fork 0
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-02-20 13:46:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 19.0

Browse Source
This commit is contained in:
Laurent Destailleur 2024-08-01 13:31:51 +02:00
commit faac9602f8
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/modulebuilder/template/core/modules/mymodule/doc/doc_generic_myobject_odt.modules.php
View File

@ -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) {

5
htdocs/product/inventory/inventory.php
View File

@ -1108,9 +1108,7 @@ if ($resql) {
//PMP Real
print '<td class="right">';
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() {
}));
}
</script>
<?php
}