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

This commit is contained in:
Laurent Destailleur (aka Eldy) 2025-02-06 16:26:21 +01:00
commit b6ab2b11d3
2 changed files with 3 additions and 2 deletions

View file

@ -398,6 +398,7 @@ class doc_generic_asset_odt extends ModelePDFAsset
}
}
// Replace tags of lines
/*
$foundtagforlines = 1;
try {
$listlines = $odfHandler->setSegment('lines');
@ -431,7 +432,7 @@ class doc_generic_asset_odt extends ModelePDFAsset
dol_syslog($this->error, LOG_WARNING);
return -1;
}
}
}*/
// Replace labels translated
$tmparray = $outputlangs->get_translations_for_substitutions();

View file

@ -177,7 +177,7 @@ if (isset($extrafields->attributes[$elementtype]['type']) && is_array($extrafiel
print '<td class="center tdoverflowmax100" title="'.dol_escape_htmltag($extrafields->attributes[$elementtype]['csslist'][$key]).'">'.dol_escape_htmltag($extrafields->attributes[$elementtype]['csslist'][$key])."</td>\n";
// Multicompany
if (isModEnabled('multicompany')) {
print '<td class="center">';
print '<td class="center tdoverflowmax100">';
if (empty($extrafields->attributes[$elementtype]['entityid'][$key])) {
print $langs->trans("All");
} else {