From 5459e4b821df1f24e256c56bc311fb98470cf5c2 Mon Sep 17 00:00:00 2001
From: ptibogxiv <support@ptibogxiv.net>
Date: Tue, 11 Feb 2020 20:11:37 +0100
Subject: [PATCH 1/4] Fix netmeasure update and display

nb: netmeasure is for real weight, volume or piece;

 i'll try to introduce in v12 price by unit using this value ( needed for some business ie fruits, vegetables....)
---
 htdocs/product/card.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/product/card.php b/htdocs/product/card.php
index 6d36495d5fc..f62979f96d3 100644
--- a/htdocs/product/card.php
+++ b/htdocs/product/card.php
@@ -17,7 +17,7 @@
  * Copyright (C) 2016		Meziane Sof		     <virtualsof@yahoo.fr>
  * Copyright (C) 2017		Josep Lluís Amador	 <joseplluis@lliuretic.cat>
  * Copyright (C) 2019       Frédéric France      <frederic.france@netlogic.fr>
- * Copyright (C) 2019       Thibault FOUCART     <support@ptibogxiv.net>
+ * Copyright (C) 2019-2020  Thibault FOUCART     <support@ptibogxiv.net>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -1513,7 +1513,7 @@ else
                 	// Net Measure
 	                print '<tr><td>'.$langs->trans("NetMeasure").'</td><td colspan="3">';
 	                print '<input name="net_measure" size="5" value="'.$object->net_measure.'"> ';
-	                print $formproduct->selectMeasuringUnits($object->net_measure_units, '', 0, 0, 0);
+	                print $formproduct->selectMeasuringUnits("net_measure_units", "", $object->net_measure_units, 0, 0);
 	                print '</td></tr>';
                 }
             }
@@ -1955,7 +1955,7 @@ else
                 	print '<tr><td class="titlefield">'.$langs->trans("NetMeasure").'</td><td colspan="2">';
                 	if ($object->net_measure != '')
                 	{
-                		print $object->net_measure." ".measuringUnitString(0, "weight", $object->net_measure_units);
+                		print $object->net_measure." ".measuringUnitString($object->net_measure_units, "", "");
                 	}
                 	else
                 	{

From 558ccdd8b9ee4edfb1f524cfa81f56ee56f8fc10 Mon Sep 17 00:00:00 2001
From: ptibogxiv <support@ptibogxiv.net>
Date: Tue, 11 Feb 2020 20:20:34 +0100
Subject: [PATCH 2/4] Update card.php

---
 htdocs/product/card.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/product/card.php b/htdocs/product/card.php
index f62979f96d3..9d126ca96d9 100644
--- a/htdocs/product/card.php
+++ b/htdocs/product/card.php
@@ -1955,7 +1955,7 @@ else
                 	print '<tr><td class="titlefield">'.$langs->trans("NetMeasure").'</td><td colspan="2">';
                 	if ($object->net_measure != '')
                 	{
-                		print $object->net_measure." ".measuringUnitString($object->net_measure_units, "", "");
+                		print $object->net_measure." ".measuringUnitString($object->net_measure_units);
                 	}
                 	else
                 	{

From f17c7f4cb3ca1914282a619e0758c765327304e0 Mon Sep 17 00:00:00 2001
From: ptibogxiv <support@ptibogxiv.net>
Date: Tue, 11 Feb 2020 20:21:53 +0100
Subject: [PATCH 3/4] fix for unit with rowid (netmeasure)

---
 htdocs/core/lib/product.lib.php | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/htdocs/core/lib/product.lib.php b/htdocs/core/lib/product.lib.php
index 9cf28ff20ee..f58af3500c0 100644
--- 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,

From bd0666bf539708efe5860028d8900035c6829a04 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 12 Feb 2020 18:35:15 +0100
Subject: [PATCH 4/4] Update product.lib.php

---
 htdocs/core/lib/product.lib.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/core/lib/product.lib.php b/htdocs/core/lib/product.lib.php
index f58af3500c0..54555eb018c 100644
--- a/htdocs/core/lib/product.lib.php
+++ b/htdocs/core/lib/product.lib.php
@@ -504,7 +504,7 @@ function measuring_units_string($scale = '', $measuring_style = '', $unit = 0, $
  *	Return translation label of a unit key
  *
  *	@param	int		$unit                ID of unit (rowid in llx_c_units table)
- *	@param  string	$measuring_style     Style of unit: weight, volume,...
+ *	@param  string	$measuring_style     Style of unit: 'weight', 'volume', ..., '' = 'net_measure' for option PRODUCT_ADD_NET_MEASURE
  *  @param	string  $scale				 Scale of unit: '0', '-3', '6', ...
  *  @param	int		$use_short_label	 1=Use short label ('g' instead of 'gram'). Short labels are not translated.
  *	@return	string	   			         Unit string