From 475290a4b9050004282813203d34c085e55f7957 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=BCdiger=20Hahn?= <ruediger@hahnsworld.net>
Date: Tue, 7 May 2019 09:02:48 +0200
Subject: [PATCH 1/3] Show unit values if configured

Fix: Fetch unit values from db and display them if this has been configured
---
 htdocs/product/reassort.php | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/htdocs/product/reassort.php b/htdocs/product/reassort.php
index 442748ae935..0b62fdf97ba 100644
--- a/htdocs/product/reassort.php
+++ b/htdocs/product/reassort.php
@@ -118,9 +118,11 @@ $htmlother=new FormOther($db);
 $sql = 'SELECT p.rowid, p.ref, p.label, p.barcode, p.price, p.price_ttc, p.price_base_type, p.entity,';
 $sql.= ' p.fk_product_type, p.tms as datem,';
 $sql.= ' p.duration, p.tosell as statut, p.tobuy, p.seuil_stock_alerte, p.desiredstock,';
-$sql.= ' SUM(s.reel) as stock_physique';
+$sql.= ' SUM(s.reel) as stock_physique,';
+$sql.= ' u.short_label as unit_short';
 $sql.= ' FROM '.MAIN_DB_PREFIX.'product as p';
 $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'product_stock as s on p.rowid = s.fk_product';
+$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_units as u on p.fk_unit = u.rowid';
 // We'll need this table joined to the select in order to filter by categ
 if ($search_categ) $sql.= ", ".MAIN_DB_PREFIX."categorie_product as cp";
 $sql.= " WHERE p.entity IN (".getEntity('product').")";
@@ -318,6 +320,10 @@ if ($resql)
 	    }
 	}
 	if ($virtualdiffersfromphysical) print_liste_field_titre("VirtualStock", $_SERVER["PHP_SELF"], "", $param, "", '', $sortfield, $sortorder, 'right ');
+    // Units
+    if($conf->global->PRODUCT_USE_UNITS) {
+        print_liste_field_titre("Unit", $_SERVER["PHP_SELF"], "unit_short", $param, "", 'align="right"', $sortfield, $sortorder);
+    }
 	print_liste_field_titre('');
 	print_liste_field_titre("ProductStatusOnSell", $_SERVER["PHP_SELF"], "p.tosell", $param, "", '', $sortfield, $sortorder, 'right ');
 	print_liste_field_titre("ProductStatusOnBuy", $_SERVER["PHP_SELF"], "p.tobuy", $param, "", '', $sortfield, $sortorder, 'right ');
@@ -378,6 +384,10 @@ if ($resql)
 			print $product->stock_theorique;
 			print '</td>';
 		}
+        // Units
+        if ($conf->global->PRODUCT_USE_UNITS) {
+            print '<td class="left">' . $objp->unit_short . '</td>';
+        }
 		print '<td class="right"><a href="'.DOL_URL_ROOT.'/product/stock/movement_list.php?idproduct='.$product->id.'">'.$langs->trans("Movements").'</a></td>';
 		print '<td class="right nowrap">'.$product->LibStatut($objp->statut, 5, 0).'</td>';
         print '<td class="right nowrap">'.$product->LibStatut($objp->tobuy, 5, 1).'</td>';

From 953c9148ffb65b9bedd472486d57362a8181d7ed Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 8 May 2019 02:11:12 +0200
Subject: [PATCH 2/3] Update reassort.php

---
 htdocs/product/reassort.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/product/reassort.php b/htdocs/product/reassort.php
index 0b62fdf97ba..dcaf9438cbf 100644
--- a/htdocs/product/reassort.php
+++ b/htdocs/product/reassort.php
@@ -119,10 +119,10 @@ $sql = 'SELECT p.rowid, p.ref, p.label, p.barcode, p.price, p.price_ttc, p.price
 $sql.= ' p.fk_product_type, p.tms as datem,';
 $sql.= ' p.duration, p.tosell as statut, p.tobuy, p.seuil_stock_alerte, p.desiredstock,';
 $sql.= ' SUM(s.reel) as stock_physique,';
-$sql.= ' u.short_label as unit_short';
+if (! empty($conf->global->PRODUCT_USE_UNITS)) $sql.= ' u.short_label as unit_short';
 $sql.= ' FROM '.MAIN_DB_PREFIX.'product as p';
 $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'product_stock as s on p.rowid = s.fk_product';
-$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_units as u on p.fk_unit = u.rowid';
+if (! empty($conf->global->PRODUCT_USE_UNITS)) $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_units as u on p.fk_unit = u.rowid';
 // We'll need this table joined to the select in order to filter by categ
 if ($search_categ) $sql.= ", ".MAIN_DB_PREFIX."categorie_product as cp";
 $sql.= " WHERE p.entity IN (".getEntity('product').")";

From af2c15882162c33429dbae022c0914f6fe286672 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 8 May 2019 02:11:50 +0200
Subject: [PATCH 3/3] Update reassort.php

---
 htdocs/product/reassort.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/product/reassort.php b/htdocs/product/reassort.php
index dcaf9438cbf..72c36daa2a2 100644
--- a/htdocs/product/reassort.php
+++ b/htdocs/product/reassort.php
@@ -321,7 +321,7 @@ if ($resql)
 	}
 	if ($virtualdiffersfromphysical) print_liste_field_titre("VirtualStock", $_SERVER["PHP_SELF"], "", $param, "", '', $sortfield, $sortorder, 'right ');
     // Units
-    if($conf->global->PRODUCT_USE_UNITS) {
+    if (! empty($conf->global->PRODUCT_USE_UNITS)) {
         print_liste_field_titre("Unit", $_SERVER["PHP_SELF"], "unit_short", $param, "", 'align="right"', $sortfield, $sortorder);
     }
 	print_liste_field_titre('');
@@ -385,7 +385,7 @@ if ($resql)
 			print '</td>';
 		}
         // Units
-        if ($conf->global->PRODUCT_USE_UNITS) {
+        if (! empty($conf->global->PRODUCT_USE_UNITS)) {
             print '<td class="left">' . $objp->unit_short . '</td>';
         }
 		print '<td class="right"><a href="'.DOL_URL_ROOT.'/product/stock/movement_list.php?idproduct='.$product->id.'">'.$langs->trans("Movements").'</a></td>';