fix for unit with rowid (netmeasure)

Dolibarr · Feb 11, 2020 · f17c7f4 · f17c7f4
1 parent 558ccdd
commit f17c7f4
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/htdocs/core/lib/product.lib.php b/htdocs/core/lib/product.lib.php
@@ -520,7 +520,14 @@ function measuringUnitString($unit, $measuring_style = '', $scale = '', $use_sho
 		require_once DOL_DOCUMENT_ROOT.'/core/class/cunits.class.php';
 		$measuringUnits= new CUnits($db);
 
-		if ($scale !== '')
+		if ($measuring_style == '' && $scale == '')
+		{
+			$arrayforfilter = array(
+				't.rowid' => $unit,
+				't.active' => 1
+			);
+		}
+		elseif ($scale !== '')
 		{
 			$arrayforfilter = array(
 				't.scale' => $scale,