Mercurial > bms / file diff

--- a/www/js/prod_edit.js	Thu Feb 28 15:40:14 2019 +0100
+++ b/www/js/prod_edit.js	Thu Feb 28 22:50:58 2019 +0100
@@ -1765,11 +1765,10 @@
 		}
 
 		/*
-		 * When the brew is in progress or done, block equipment select.
+		 * When the brew is in progress or done, block equipment select and delete.
 		 */
-		if (dataRecord.stage > 1)
+		if (dataRecord.stage > 1) {
 			$("#equipmentSelect").jqxDropDownList({ disabled: true });
-		if (dataRecord.stage > 0) {
 			$("#Delete").jqxButton({ disabled: true });
 		}
 
@@ -5307,8 +5306,9 @@
 	$("#Export").jqxButton({ template: "info", width: '80px', theme: theme });
 	$("#Export").click(function () {
 		saveRecord();
-		var url="prod_beerxml.php?record=" + my_record;
-		window.open(url);
+		var url="prod_export.php?record=" + my_record + "&return=" + my_return + "&select=" + my_select +
+			"&code=" + dataRecord.code + "&name=" + dataRecord.name;
+		window.location.href = url;
 	});
 
 	$("#Delete").jqxButton({ template: "danger", width: '80px', theme: theme });