# HG changeset patch
# User Michiel Broek <mbroek@mbse.eu>
# Date 1551899724 -3600
# Node ID d49da6d0b451ebc55130be46684d92f5eca70f6e
# Parent  889cddd8445060777beddf9262c082be3f195a86
Fix for ugly fermentables in stock notation below 1 kg. Don't show days for in production list on the package day.

diff -r 889cddd84450 -r d49da6d0b451 www/js/inv_fermentables.js
--- a/www/js/inv_fermentables.js	Wed Mar 06 16:07:54 2019 +0100
+++ b/www/js/inv_fermentables.js	Wed Mar 06 20:15:24 2019 +0100
@@ -263,8 +263,8 @@
 			  cellsrenderer: function (index, datafield, value, defaultvalue, column, rowdata) {
 				var amount = "";
 				if (value > 0) {
-					if (value < 1)
-						amount = value * 1000+" gr";
+					if (value < 1.000)
+						amount = dataAdapter.formatNumber(value * 1000,"f0")+" gr";
 					else
 						amount = dataAdapter.formatNumber(value,"f1")+" kg";
 				}
diff -r 889cddd84450 -r d49da6d0b451 www/js/prod_inprod.js
--- a/www/js/prod_inprod.js	Wed Mar 06 16:07:54 2019 +0100
+++ b/www/js/prod_inprod.js	Wed Mar 06 20:15:24 2019 +0100
@@ -68,7 +68,7 @@
 				if (value == 2) {
 					fase = StageData[value].nl + " op " + rowdata.brew_date;
 				}
-				if (value >= 6 && value < 9) {
+				if (value == 7 || value == 8) {
 					var d = new Date();
 					var date2 = rowdata.package_date;
 					date2 = date2.split('-');