Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity

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

Browse Source 
Conflicts:
	htdocs/expedition/class/expedition.class.php
This commit is contained in:
Laurent Destailleur
2020-07-29 13:53:09 +02:00
parent eaef99b7af 930ae84dac
commit 8045cff888
7 changed files with 35 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
htdocs/core/lib/pdf.lib.php
View File

@@ -1859,7 +1859,6 @@ function pdf_getlineunit($object, $i, $outputlangs, $hidedetails = 0, $hookmanag
}
if (empty($reshook))
{
if ($object->lines[$i]->special_code == 3) return '';
if (empty($hidedetails) || $hidedetails > 1) $result .= $langs->transnoentitiesnoconv($object->lines[$i]->getLabelOfUnit('short'));
}
return $result;