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

FIX Better compatible fix for the trouble of weight / size units

Browse Source 
Conflicts:
	htdocs/core/class/html.form.class.php
	htdocs/product/card.php
This commit is contained in:
Laurent Destailleur
2019-10-22 18:36:36 +02:00
parent 6079a4d159
commit c4be61c55c
16 changed files with 80 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/core/lib/functions.lib.php
View File

@@ -4569,7 +4569,7 @@ function showDimensionInBestUnit($dimension, $unit, $type, $outputlangs, $round
$unit = $forceunitoutput;
}*/
$ret=price($dimension, 0, $outputlangs, 0, 0, $round).' '.measuring_units_string(0, $type, $unit);
$ret=price($dimension, 0, $outputlangs, 0, 0, $round).' '.measuringUnitString(0, $type, $unit);
return $ret;
}