Merge branch 'development' into release-1.6.1

config/Reports/auco.xml

@@ -65,7 +65,7 @@
                 output.writeStartElement("thead");
                 output.writeStartElement("tr");
                 output.writeStartElement("th");
-                output.writeAttribute("colspan", "3");
+                output.writeAttribute("colspan", "5");
                 output.writeCharacters("Regular Coffees");
                 output.writeEndElement();
                 output.writeEndElement();
@@ -73,6 +73,8 @@
                 output.writeTextElement("th", "Origin");
                 output.writeTextElement("th", "Avg. Rate");
                 output.writeTextElement("th", "Avg. Cost");
+				output.writeTextElement("th", "Last Cost");
+				output.writeTextElement("th", "Last Purchase Date");
                 output.writeEndElement();
                 output.writeEndElement();
                 output.writeStartElement("tbody");
@@ -81,29 +83,32 @@
 				if(unitBox.currentIndex == 0) {
 					conversion = 2.2;
 				}
-                switch(sortBox.currentIndex)
-                {
-                    case 0:
-						query.prepare("SELECT DISTINCT origin, (avg(rate)/:conversion)::numeric(10,2) AS rate, (SELECT avg(cost)*:conversion2 FROM purchase WHERE item IN (SELECT id FROM regular_coffees WHERE origin = coffee_history.origin))::numeric(10,2) AS cost FROM coffee_history WHERE id IN (SELECT id FROM regular_coffees) GROUP BY origin ORDER BY origin ASC");
-                        break;
-                    case 1:
-						query.prepare("SELECT DISTINCT origin, (avg(rate)/:conversion)::numeric(10,2) AS rate, (SELECT avg(cost)*:conversion2 FROM purchase WHERE item IN (SELECT id FROM regular_coffees WHERE origin = coffee_history.origin))::numeric(10,2) AS cost FROM coffee_history WHERE id IN (SELECT id FROM regular_coffees) GROUP BY origin ORDER BY origin DESC");
-                        break;
-                    case 2:
-						query.prepare("SELECT DISTINCT origin, (avg(rate)/:conversion)::numeric(10,2) AS rate, (SELECT avg(cost)*:conversion2 FROM purchase WHERE item IN (SELECT id FROM regular_coffees WHERE origin = coffee_history.origin))::numeric(10,2) AS cost FROM coffee_history WHERE id IN (SELECT id FROM regular_coffees) GROUP BY origin ORDER BY rate ASC");
-                        break;
-                    case 3:
-						query.prepare("SELECT DISTINCT origin, (avg(rate)/:conversion)::numeric(10,2) AS rate, (SELECT avg(cost)*:conversion2 FROM purchase WHERE item IN (SELECT id FROM regular_coffees WHERE origin = coffee_history.origin))::numeric(10,2) AS cost FROM coffee_history WHERE id IN (SELECT id FROM regular_coffees) GROUP BY origin ORDER BY rate DESC");
-                        break;
-                    case 4:
-						query.prepare("SELECT DISTINCT origin, (avg(rate)/:conversion)::numeric(10,2) AS rate, (SELECT avg(cost)*:conversion2 FROM purchase WHERE item IN (SELECT id FROM regular_coffees WHERE origin = coffee_history.origin))::numeric(10,2) AS cost FROM coffee_history WHERE id IN (SELECT id FROM regular_coffees) GROUP BY origin ORDER BY cost ASC");
-                        break;
-                    case 5:
-						query.prepare("SELECT DISTINCT origin, (avg(rate)/:conversion)::numeric(10,2) AS rate, (SELECT avg(cost)*:conversion2 FROM purchase WHERE item IN (SELECT id FROM regular_coffees WHERE origin = coffee_history.origin))::numeric(10,2) AS cost FROM coffee_history WHERE id IN (SELECT id FROM regular_coffees) GROUP BY origin ORDER BY cost DESC");
-                        break;
-                }
+				var orderClause;
+				switch(sortBox.currentIndex)
+				{
+					case 0:
+						orderClause = "origin ASC";
+						break;
+					case 1:
+						orderClause = "origin DESC";
+						break;
+					case 2:
+						orderClause = "rate ASC";
+						break;
+					case 3:
+						orderClause = "rate DESC";
+						break;
+					case 4:
+						orderClause = "cost ASC";
+						break;
+					case 5:
+						orderClause = "cost DESC";
+						break;
+				}
+				query.prepare("SELECT DISTINCT origin, (avg(rate)/:conversion)::numeric(10,2) AS rate, (SELECT avg(cost)*:conversion2 FROM purchase WHERE item IN (SELECT id FROM regular_coffees WHERE origin = coffee_history.origin))::numeric(10,2) AS cost, (SELECT avg(cost)*:conversion3 FROM purchase WHERE item IN (SELECT id FROM regular_coffees WHERE origin = coffee_history.origin) AND time = (SELECT max(time) FROM purchase WHERE item IN (SELECT id FROM regular_coffees WHERE origin = coffee_history.origin))), (SELECT max(time)::date FROM purchase WHERE item IN (SELECT id FROM regular_coffees WHERE origin = coffee_history.origin)) FROM coffee_history WHERE id IN (SELECT id FROM regular_coffees) GROUP BY origin ORDER BY " + orderClause);
 				query.bind(":conversion", conversion);
 				query.bind(":conversion2", conversion);
+				query.bind(":conversion3", conversion);
 				query.exec();
                 while(query.next())
                 {
@@ -111,37 +116,20 @@
                     output.writeTextElement("td", query.value(0));
                     output.writeTextElement("td", query.value(1));
                     output.writeTextElement("td", query.value(2));
+					output.writeTextElement("td", query.value(3));
+					output.writeTextElement("td", query.value(4));
                     output.writeEndElement();
                 }
                 output.writeStartElement("tr");
                 output.writeStartElement("th");
-                output.writeAttribute("colspan", "3");
+                output.writeAttribute("colspan", "5");
                 output.writeCharacters("Decaffeinated Coffees");
                 output.writeEndElement();
                 output.writeEndElement();
-                switch(sortBox.currentIndex)
-                {
-                    case 0:
-						query.prepare("SELECT DISTINCT origin, (avg(rate)/:conversion)::numeric(10,2) AS rate, (SELECT avg(cost)*:conversion2 FROM purchase WHERE item IN (SELECT id FROM decaf_coffees WHERE origin = coffee_history.origin))::numeric(10,2) AS cost FROM coffee_history WHERE id IN (SELECT id FROM decaf_coffees) GROUP BY origin ORDER BY origin ASC");
-                        break;
-                    case 1:
-						query.prepare("SELECT DISTINCT origin, (avg(rate)/:conversion)::numeric(10,2) AS rate, (SELECT avg(cost)*:conversion2 FROM purchase WHERE item IN (SELECT id FROM decaf_coffees WHERE origin = coffee_history.origin))::numeric(10,2) AS cost FROM coffee_history WHERE id IN (SELECT id FROM decaf_coffees) GROUP BY origin ORDER BY origin DESC");
-                        break;
-                    case 2:
-						query.prepare("SELECT DISTINCT origin, (avg(rate)/:conversion)::numeric(10,2) AS rate, (SELECT avg(cost)*:conversion2 FROM purchase WHERE item IN (SELECT id FROM decaf_coffees WHERE origin = coffee_history.origin))::numeric(10,2) AS cost FROM coffee_history WHERE id IN (SELECT id FROM decaf_coffees) GROUP BY origin ORDER BY rate ASC");
-                        break;
-                    case 3:
-						query.prepare("SELECT DISTINCT origin, (avg(rate)/:conversion)::numeric(10,2) AS rate, (SELECT avg(cost)*:conversion2 FROM purchase WHERE item IN (SELECT id FROM decaf_coffees WHERE origin = coffee_history.origin))::numeric(10,2) AS cost FROM coffee_history WHERE id IN (SELECT id FROM decaf_coffees) GROUP BY origin ORDER BY rate DESC");
-                        break;
-                    case 4:
-						query.prepare("SELECT DISTINCT origin, (avg(rate)/:conversion)::numeric(10,2) AS rate, (SELECT avg(cost)*:conversion2 FROM purchase WHERE item IN (SELECT id FROM decaf_coffees WHERE origin = coffee_history.origin))::numeric(10,2) AS cost FROM coffee_history WHERE id IN (SELECT id FROM decaf_coffees) GROUP BY origin ORDER BY cost ASC");
-                        break;
-                    case 5:
-						query.prepare("SELECT DISTINCT origin, (avg(rate)/:conversion)::numeric(10,2) AS rate, (SELECT avg(cost)*:conversion2 FROM purchase WHERE item IN (SELECT id FROM decaf_coffees WHERE origin = coffee_history.origin))::numeric(10,2) AS cost FROM coffee_history WHERE id IN (SELECT id FROM decaf_coffees) GROUP BY origin ORDER BY cost DESC");
-                        break;
-                }
+				query.prepare("SELECT DISTINCT origin, (avg(rate)/:conversion)::numeric(10,2) AS rate, (SELECT avg(cost)*:conversion2 FROM purchase WHERE item IN (SELECT id FROM decaf_coffees WHERE origin = coffee_history.origin))::numeric(10,2) AS cost, (SELECT avg(cost)*:conversion3 FROM purchase WHERE item IN (SELECT id FROM decaf_coffees WHERE origin = coffee_history.origin) AND time = (SELECT max(time) FROM purchase WHERE item IN (SELECT id FROM decaf_coffees WHERE origin = coffee_history.origin))), (SELECT max(time)::date FROM purchase WHERE item IN (SELECT id FROM decaf_coffees WHERE origin = coffee_history.origin)) FROM coffee_history WHERE id IN (SELECT id FROM decaf_coffees) GROUP BY origin ORDER BY " + orderClause);
 				query.bind(":conversion", conversion);
 				query.bind(":conversion2", conversion);
+				query.bind(":conversion3", conversion);
 				query.exec();
                 while(query.next())
                 {
@@ -149,8 +137,11 @@
                     output.writeTextElement("td", query.value(0));
                     output.writeTextElement("td", query.value(1));
                     output.writeTextElement("td", query.value(2));
+					output.writeTextElement("td", query.value(3));
+					output.writeTextElement("td", query.value(4));
                     output.writeEndElement();
                 }
+				query = query.invalidate();
                 output.writeEndElement();
                 output.writeEndElement();
                 output.writeEndElement();

config/Reports/chart.xml

@@ -144,7 +144,6 @@
                 output.writeAttribute("y2", "450");
                 output.writeAttribute("style", "stroke:rgb(0,0,0);stroke-width:1;");
                 output.writeEndElement();
-                var query = new QSqlQuery();
                 var q = "SELECT "+curEndDate+"::date - "+curStartDate+"::date";
                 query.exec(q);
                 query.next();
@@ -425,6 +424,7 @@
                         i = days - 1;
                     }
                 }
+				query = query.invalidate();
                 output.writeStartElement("rect");
                 output.writeAttribute("fill", "rgb(0,0,0)");
                 output.writeAttribute("x", "45");

config/Reports/cogr.xml

@@ -46,7 +46,8 @@
 						recipes.push(query.value(0));
 						recipeQuantities.push(query.value(1));
 					} else {
-						print("Error 1");
+						recipes.push("{-1}");
+						recipeQuantities.push("{-1}");
 					}
 				}
 				query.prepare("SELECT min(unroasted_total_quantity / roasted_quantity), max(unroasted_total_quantity / roasted_quantity), avg(unroasted_total_quantity / roasted_quantity) FROM roasting_log WHERE roasted_id = :ri AND unroasted_id = :gi AND unroasted_total_quantity > 0 AND roasted_quantity > 0 AND approval = true");
@@ -54,49 +55,66 @@
 				var maxes = new Array();
 				var means = new Array();
 				for(var i = 0; i < roastedItems.length; i++) {
-					query.bind(":ri", Number(roastedItems[i]));
-					query.bind(":gi", recipes[i]);
-					query.exec();
-					if(query.next()) {
-						mins.push(query.value(0));
-						maxes.push(query.value(1));
-						means.push(query.value(2));
+					if(recipes[i] == "{-1}") {
+						mins.push("undefined");
+						maxes.push("undefined");
+						means.push("undefined");
 					} else {
-						print("Error 2");
+						query.bind(":ri", Number(roastedItems[i]));
+						query.bind(":gi", recipes[i]);
+						query.exec();
+						if(query.next()) {
+							mins.push(query.value(0));
+							maxes.push(query.value(1));
+							means.push(query.value(2));
+						} else {
+							print("Error 2");
+						}
 					}
 				}
 				var proportionalCosts = new Array();
 				query.prepare("SELECT cost * :proportion FROM purchase WHERE item = :id");
 				for(var i = 0; i < roastedItems.length; i++) {
-					greens = sqlToArray(recipes[i]);
-					weights = sqlToArray(recipeQuantities[i]);
-					proportions = new Array();
-					quantitySum = weights.reduce(function(p, c) {
-						return p + c;
-					});
-					for(var j = 0; j < weights.length; j++) {
-						proportions.push(weights[j]/quantitySum);
-					}
-					partialSum = 0;
-					for(var j = 0; j < greens.length; j++) {
-						query.bind(":proportion", proportions[j]);
-						query.bind(":id", greens[j]);
-						query.exec();
-						if(query.next()) {
-							partialSum += query.value(0);
-						} else {
-							print("Error 3");
+					if(recipes[i] == "{-1}") {
+						proportionalCosts.push("undefined");
+					} else {
+						greens = sqlToArray(recipes[i]);
+						weights = sqlToArray(recipeQuantities[i]);
+						proportions = new Array();
+						quantitySum = weights.reduce(function(p, c) {
+							return p + c;
+						});
+						for(var j = 0; j < weights.length; j++) {
+							proportions.push(weights[j]/quantitySum);
 						}
+						partialSum = 0;
+						for(var j = 0; j < greens.length; j++) {
+							query.bind(":proportion", proportions[j]);
+							query.bind(":id", greens[j]);
+							query.exec();
+							if(query.next()) {
+								partialSum += query.value(0);
+							} else {
+								print("Error 3");
+							}
+						}
+						proportionalCosts.push(partialSum);
 					}
-					proportionalCosts.push(partialSum);
 				}
+				query = query.invalidate();
 				var minCosts = new Array();
 				var maxCosts = new Array();
 				var meanCosts = new Array();
 				for(var i = 0; i < roastedItems.length; i++) {
-					minCosts.push(proportionalCosts[i] * mins[i]);
-					maxCosts.push(proportionalCosts[i] * maxes[i]);
-					meanCosts.push(proportionalCosts[i] * means[i]);
+					if(recipes[i] == "{-1}") {
+						minCosts.push("undefined");
+						maxCosts.push("undefined");
+						meanCosts.push("undefined");
+					} else {
+						minCosts.push(proportionalCosts[i] * mins[i]);
+						maxCosts.push(proportionalCosts[i] * maxes[i]);
+						meanCosts.push(proportionalCosts[i] * means[i]);
+					}
 				}
 				output.writeStartElement("table");
 				output.writeAttribute("rules", "groups");

config/Reports/dailyproductiondetail.xml

@@ -135,10 +135,10 @@
 					output.writeEndElement();
 					var unroastedList = sqlToArray(query.value(4));
 					output.writeStartElement("td");
+					var greensQuery = new QSqlQuery();
+					greensQuery.prepare("SELECT name, reference FROM coffees WHERE id = :id");
 					for(var i = 0;  i < unroastedList.length; i++)
-					{
-						var greensQuery = new QSqlQuery();
-						greensQuery.prepare("SELECT name, reference FROM coffees WHERE id = :id");
+					{	
 						greensQuery.bind(":id", Number(unroastedList[i]));
 						greensQuery.exec();
 						if(i != 0)
@@ -148,6 +148,7 @@
 						greensQuery.next();
 						output.writeCDATA(greensQuery.value(0) + " (" + unroastedList[i] + ")" + (greensQuery.value(1) == "" ? "" : " ref: " + greensQuery.value(1)));
 					}
+					greensQuery = greensQuery.invalidate();
 					output.writeEndElement();
 					switch(unitBox.currentIndex)
 					{
@@ -311,73 +312,91 @@
 				output.writeEndElement();
 				output.writeEndElement();
 				output.writeStartElement("tbody");
-				q = "SELECT DISTINCT item, (SELECT name FROM items WHERE id = item) AS name, (SELECT out FROM coffee_history WHERE id = item) FROM all_transactions WHERE time > '" + dateString + "' AND time < '" + dateString + "'::date + integer '1' ORDER BY name ASC";
+				q = "SELECT DISTINCT item, (SELECT name FROM items WHERE id = item) AS name, (SELECT out FROM coffee_history WHERE id = item) FROM all_transactions WHERE time >= '" + dateString + "' AND time < '" + dateString + "'::date + integer '1' ORDER BY name ASC";
 				query.exec(q)
 				var subQuery = new QSqlQuery();
 				var qq;
 				while(query.next())
 				{
-					output.writeStartElement("tr");
-					output.writeTextElement("td", query.value(1));
-					qq = "SELECT balance FROM item_history(" + query.value(0) + ") WHERE time = (SELECT max(time) FROM all_transactions WHERE time < '" + dateString + "' AND item = " + query.value(0) + ") OR time = (SELECT max(time) FROM all_transactions WHERE time < '" + dateString + "'::date + integer '1' AND item = " + query.value(0) + ") ORDER BY time ASC";
+					var validRow = true;
+					var td1 = query.value(1);
+					var td2 = 0;
+					var td3 = 0;
+					var td4 = 0;
+					var td5 = query.value(2);
+					qq = "SELECT balance FROM item_history(" + query.value(0) + ") WHERE time = (SELECT max(time) FROM all_transactions WHERE time <= '" + dateString + "' AND item = " + query.value(0) + ") OR time = (SELECT max(time) FROM all_transactions WHERE time < '" + dateString + "'::date + integer '1' AND item = " + query.value(0) + ") ORDER BY time ASC";
 					subQuery.exec(qq);
-					var startValue = 0;
-					var endValue = 0;
+					var startValue = "0.0";
+					var endValue = "0.0";
 					if(subQuery.next())
 					{
 						switch(unitBox.currentIndex)
 						{
 							case 0:
-								output.writeTextElement("td", (subQuery.value(0)/2.2).toFixed(subQuery.value(0).split('.').length > 1 ? subQuery.value(0).split('.')[1].length : 0));
+								td2 = (subQuery.value(0)/2.2).toFixed(subQuery.value(0).split('.').length > 1 ? subQuery.value(0).split('.')[1].length : 0);
 								break;
 							case 1:
-								output.writeTextElement("td", subQuery.value(0));
+								td2 = subQuery.value(0);
 								break;
 						}
 						startValue = subQuery.value(0);
 					}
 					else
 					{
-						output.writeEmptyElement("td");
+						/* This should never happen. */
+						validRow = false;
 					}
 					if(subQuery.next())
 					{
 						switch(unitBox.currentIndex)
 						{
 							case 0:
-								output.writeTextElement("td", (subQuery.value(0)/2.2).toFixed(subQuery.value(0).split('.').length > 1 ? subQuery.value(0).split('.')[1].length : 0));
+								td3 = (subQuery.value(0)/2.2).toFixed(subQuery.value(0).split('.').length > 1 ? subQuery.value(0).split('.')[1].length : 0);
 								break;
 							case 1:
-								output.writeTextElement("td", subQuery.value(0));
+								td3 = subQuery.value(0);
 								break;
 						}
 						endValue = subQuery.value(0);
 					}
 					else
 					{
-						output.writeEmptyElement("td");
+						/* If only one transaction exists for the current query
+						   this is a purchase transaction. Until something is
+						   done with the coffee, it should not appear in this
+						   section of the report. */
+						endValue = startValue;
+						validRow = false;
 					}
 					var startPrec = startValue.split('.').length > 1 ? startValue.split('.')[1].length : 0;
 					var endPrec = endValue.split('.').length > 1 ? endValue.split('.')[1].length : 0;
 					switch(unitBox.currentIndex)
 					{
 						case 0:
-							output.writeTextElement("td", (Number(endValue/2.2) - Number(startValue/2.2)).toFixed(Math.max(startPrec, endPrec)));
+							td4 = (Number(endValue/2.2) - Number(startValue/2.2)).toFixed(Math.max(startPrec, endPrec));
 							break;
 						case 1:
-							output.writeTextElement("td", (Number(endValue) - Number(startValue)).toFixed(Math.max(startPrec, endPrec)));
+							td4 = (Number(endValue) - Number(startValue)).toFixed(Math.max(startPrec, endPrec));
 							break;
-					}					
-					output.writeTextElement("td", query.value(2));
-					output.writeEndElement();
+					}
+					if(validRow) {
+						output.writeStartElement("tr");
+						output.writeTextElement("td", td1);
+						output.writeTextElement("td", td2);
+						output.writeTextElement("td", td3);
+						output.writeTextElement("td", td4);
+						output.writeTextElement("td", td5);
+						output.writeEndElement();
+					}
 				}
+				query = query.invalidate();
+				subQuery = subQuery.invalidate();
 				output.writeEndElement();
 				output.writeStartElement("tfoot");
 				
 				output.writeEndElement();
 				output.writeEndElement();//End of inventory table
 				
-				
 				output.writeEndElement();
 				output.writeEndElement();
 				output.writeEndDocument();

config/Reports/fypurchase.xml

@@ -24,6 +24,7 @@
 			query.exec("SELECT EXTRACT(YEAR FROM time) FROM purchase WHERE time = (SELECT min(time) FROM purchase)");
 			query.next();
 			startDateField.setDate(query.value(0), 1, 1);
+			query = query.invalidate();
 			/* Set ending year to the current year. */
 			var endDateField = findChildObject(this, 'enddate');
 			endDateField.setDate(endDateField.year(), 12, 31);
@@ -79,6 +80,7 @@
 				var sacktotal = 0;
 				var unittotal = 0;
 				var costtotal = 0;
+				var query = new QSqlQuery();
 				for(var i = startDateField.year(); i <= endDateField.year(); i++)
 				{
 					output.writeStartElement("tr");
@@ -89,7 +91,10 @@
 					query.exec();
 					query.next();
 					output.writeStartElement("th");
+					output.writeStartElement("a");
+					output.writeAttribute("href", "typica://script/y" + i);
 					output.writeCharacters(i);
+					output.writeEndElement(); //a
 					output.writeEndElement(); //th
 					output.writeTextElement("td", query.value(0));
 					output.writeTextElement("td", query.value(1));
@@ -99,6 +104,7 @@
 					costtotal += Number(query.value(2));
 					output.writeEndElement(); //tr
 				}
+				query = query.invalidate();
 				output.writeEndElement(); //tbody
 				output.writeStartElement("tfoot");
 				output.writeTextElement("th", "Totals:");
@@ -121,6 +127,59 @@
 			endDateField.dateChanged.connect(function() {
 				refresh();
 			});
+			/* Expand year data */
+			var expandedYears = new Array();
+			var expandYear = function(url) {
+				if(expandedYears.indexOf(url) == -1) {
+					expandedYears.push(url);
+					var element = new WebElement(view.findFirstElement("#" + url));
+					var year = url.slice(1,url.length);
+					var details = '<tr><td /><td colspan="3"><table><tr><th>Id</th><th>Invoice</th><th>Vendor</th><th>Cost</th></tr>';
+					q = "SELECT id, invoice, vendor, (SELECT sum(cost) FROM invoice_items WHERE invoice_id = id) FROM invoices WHERE time >= '" + year + "-01-01' AND time <= '" + year + "-12-31'";
+					var query = new QSqlQuery();
+					query.exec(q);
+					while(query.next())
+					{
+						details += '<tr><td><a href="typica://script/i' + query.value(0) + '">' + query.value(0) + '</a></td>';
+						details += '<td>' + query.value(1) + '</td>';
+						details += '<td>' + query.value(2) + '</td>';
+						details += '<td>' + Number(query.value(3)).toFixed(2) + '</td></tr>';
+					}
+					query = query.invalidate();
+					details += '</table></td></tr>'
+					element.appendOutside(details);
+				}
+			};
+			/* Open invoices */
+			var openInvoice = function(url) {
+				var arg = url.slice(1, url.length);
+				var info = createWindow("invoiceinfo");
+				info.setInvoiceID(arg);
+				var query = new QSqlQuery();
+				query.exec("SELECT time, invoice, vendor FROM invoices WHERE id = " + arg);
+				query.next();
+				var timefield = findChildObject(info, 'date');
+				timefield.text = query.value(0);
+				var vendorfield = findChildObject(info, 'vendor');
+				vendorfield.text = query.value(2);
+				var invoicefield = findChildObject(info, 'invoice');
+				invoicefield.text = query.value(1);
+				var itemtable = findChildObject(info, 'itemtable');
+				itemtable.setQuery("SELECT record_type, item_id, description, (SELECT reference FROM items WHERE id = item_id) AS reference, (SELECT cost FROM purchase WHERE item = item_id) AS unit_cost, (SELECT quantity FROM purchase WHERE item = item_id) AS quantity, ((SELECT quantity FROM purchase WHERE item = item_id)/(SELECT conversion FROM lb_bag_conversion WHERE item = item_id))::numeric(12,2) AS sacks, cost FROM invoice_items WHERE invoice_id = " + arg + " AND record_type = 'PURCHASE' UNION SELECT record_type, NULL, description, NULL, NULL, NULL, NULL, cost FROM invoice_items WHERE invoice_id = " + arg + " AND record_type = 'FEE' ORDER BY item_id");
+				query = query.invalidate();
+			};
+			/* Dispatch script link clicks */
+			view.scriptLinkClicked.connect(function(url) {
+				var linkType = url[0];
+				switch(linkType) {
+					case 'y':
+						expandYear(url);
+						break
+					case 'i':
+						openInvoice(url);
+						break;
+				}
+			});
 		]]>
 	</program>
 </window>

config/Reports/invchange.xml

@@ -0,0 +1,204 @@
+<window id="invchange">
+	<reporttitle>Inventory:->Inventory Change Summary</reporttitle>
+	<layout type="vertical">
+		<layout type="horizontal">
+			<label>Start Date:</label>
+			<calendar id="startdate" />
+			<label>End Date:</label>
+			<calendar id="enddate" />
+			<label>Weight Unit:</label>
+			<sqldrop id="unit" />
+			<stretch />
+		</layout>
+		<webview id="report" />
+	</layout>
+	<menu name="File">
+		<item id="print" shortcut="Ctrl+P">Print</item>
+	</menu>
+	<program>
+		<![CDATA[
+			this.windowTitle = "Typica - Inventory Change Summary";
+			var startDateField = findChildObject(this, 'startdate');
+			startDateField.setDate(startDateField.year(), 1, 1);
+			var endDateField = findChildObject(this, 'enddate');
+			var unitBox = findChildObject(this, 'unit');
+			unitBox.addItem("Kg");
+			unitBox.addItem("Lb");
+			unitBox.currentIndex = QSettings.value("script/report_unit", 1);
+			unitBox['currentIndexChanged(int)'].connect(function() {
+				QSettings.setValue("script/report_unit", unitBox.currentIndex);
+				refresh();
+			});
+			var view = findChildObject(this, 'report');
+			var printMenu = findChildObject(this, 'print');
+			printMenu.triggered.connect(function() {
+				view.print();
+			});
+			function refresh() {
+				var buffer = new QBuffer;
+				buffer.open(3);
+				var output = new XmlWriter(buffer);
+				output.writeStartDocument("1.0");
+				output.writeDTD('<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1 plus MathML 2.0 plus SVG 1.1//EN" "http://www.w3.org/2002/04/xhtml-math-svg.dtd">');
+				output.writeStartElement("html");
+				output.writeAttribute("xmlns", "http://www.w3.org/1999/xhtml");
+				output.writeStartElement("head");
+				output.writeTextElement("title", "Inventory Change Summary");
+				output.writeEndElement();
+				output.writeStartElement("body");
+				var startDate = "" + startDateField.year() + "-" + startDateField.month() + "-" + startDateField.day();
+				var endDate = "" + endDateField.year() + "-" + endDateField.month() + "-" + endDateField.day();
+				output.writeTextElement("h1", "Inventory Change Summary: " + startDate + " – " + endDate);
+				var conversion = 1;
+				if(unitBox.currentIndex == 0) {
+					conversion = 2.2;
+				}
+				var unitText = "Lb";
+				if(unitBox.currentIndex == 0) {
+					unitText = "Kg";
+				}
+				var query = new QSqlQuery();
+					var q = "WITH q AS (SELECT id, name, reference, COALESCE((SELECT balance FROM item_history(id) WHERE time = (SELECT max(time) FROM item_history(id) WHERE time < :sd1)), 0)/:c1 AS starting_balance, COALESCE((SELECT sum(quantity) FROM purchase WHERE item = id AND time >= :sd2 AND time < :ed1 ::date + interval '1 day'), 0)/:c2 AS purchase, COALESCE((SELECT sum(quantity) FROM use WHERE item = id AND time >= :sd3 AND time < :ed2 ::date + interval '1 day'), 0)/:c3 AS use, COALESCE((SELECT sum(quantity) FROM sale WHERE item = id AND time >= :sd4 AND time < :ed3 ::date + interval '1 day'), 0)/:c4 AS sale, (SElECT balance FROM item_history(id) WHERE time = (SELECT max(time) FROM item_history(id) WHERE time < :ed4 ::date + interval '1 day'))/:c5 AS quantity, (SELECT sum(cost * quantity) / sum(quantity) FROM purchase WHERE item = id)*:c6 AS unit_cost FROM coffees WHERE id IN (SELECT item FROM purchase WHERE time >= :sd6 AND time < :ed5 ::date + interval '1 day') OR id IN (SELECT id FROM items WHERE (SELECT balance FROM item_history(id) WHERE time = (SELECT max(time) FROM item_history(id) WHERE time < :ed6 ::date + interval '1 day')) > 0) OR id IN (SELECT DISTINCT item FROM all_transactions WHERE time > :sd7 AND time < :ed7 ::date + interval '1 day')) SELECT *, (starting_balance + purchase - use - sale - quantity)/:c7 AS adjustment, starting_balance * unit_cost * :c8 AS starting_cost, purchase * unit_cost * :c9 AS purchase_cost, use * unit_cost * :c10 AS use_cost, sale * unit_cost * :c11 AS sale_cost, quantity * unit_cost * :c12 AS quantity_cost, (starting_balance + purchase - use - sale - quantity) * unit_cost * :c13 AS adjustment_cost FROM q ORDER BY name";
+				query.prepare(q);
+				query.bind(":sd1", startDate);
+				query.bind(":sd2", startDate);
+				query.bind(":sd3", startDate);
+				query.bind(":sd4", startDate);
+				query.bind(":sd6", startDate);
+				query.bind(":sd7", startDate);
+				query.bind(":ed1", endDate);
+				query.bind(":ed2", endDate);
+				query.bind(":ed3", endDate);
+				query.bind(":ed4", endDate);
+				query.bind(":ed5", endDate);
+				query.bind(":ed6", endDate);
+				query.bind(":ed7", endDate);
+				query.bind(":c1", conversion);
+				query.bind(":c2", conversion);
+				query.bind(":c3", conversion);
+				query.bind(":c4", conversion);
+				query.bind(":c5", conversion);
+				query.bind(":c6", conversion);
+				query.bind(":c7", conversion);
+				query.bind(":c8", conversion);
+				query.bind(":c9", conversion);
+				query.bind(":c10", conversion);
+				query.bind(":c11", conversion);
+				query.bind(":c12", conversion);
+				query.bind(":c13", conversion);
+				query.exec();
+				output.writeStartElement("table");
+				output.writeAttribute("rules", "groups");
+				output.writeAttribute("cellpadding", "3px");
+				output.writeStartElement("thead");
+				output.writeStartElement("tr");
+				output.writeTextElement("th", "ID"); // 0
+				output.writeTextElement("th", "Coffee"); // 1
+				output.writeTextElement("th", "Reference"); // 2
+				output.writeTextElement("th", "Starting (" + unitText + ")"); // 3
+				output.writeTextElement("th", "Cost"); // 10
+				output.writeTextElement("th", "Purchase (" + unitText + ")"); // 4
+				output.writeTextElement("th", "Cost"); // 11
+				output.writeTextElement("th", "Use (" + unitText + ")"); // 5
+				output.writeTextElement("th", "Cost"); // 12
+				output.writeTextElement("th", "Sale (" + unitText + ")"); // 6
+				output.writeTextElement("th", "Cost"); // 13
+				output.writeTextElement("th", "Adjustment (" + unitText + ")"); // 9
+				output.writeTextElement("th", "Cost"); // 15
+				output.writeTextElement("th", "Ending (" + unitText + ")"); // 7
+				output.writeTextElement("th", "Cost"); // 14
+				output.writeEndElement();
+				output.writeEndElement();
+				output.writeStartElement("tbody");
+				var sum3 = 0;
+				var sum10 = 0;
+				var sum4 = 0;
+				var sum11 = 0;
+				var sum5 = 0;
+				var sum12 = 0;
+				var sum6 = 0;
+				var sum13 = 0;
+				var sum9 = 0;
+				var sum15 = 0;
+				var sum7 = 0;
+				var sum14 = 0;;
+				while(query.next())
+				{
+					output.writeStartElement("tr");
+					output.writeStartElement("td");
+					output.writeStartElement("a");
+					output.writeAttribute("href", "typica://script/" + query.value(0));
+					output.writeTextElement("span", query.value(0)); //ID
+					output.writeEndElement();
+					output.writeEndElement();
+					output.writeTextElement("td", query.value(1)); //Coffee
+					output.writeTextElement("td", query.value(2)); //Reference
+					output.writeTextElement("td", parseFloat(query.value(3)).toFixed(2)); //Starting Wt
+					output.writeTextElement("td", parseFloat(query.value(10)).toFixed(2)); //Starting Cost
+					output.writeTextElement("td", parseFloat(query.value(4)).toFixed(2)); //Purchase Wt
+					output.writeTextElement("td", parseFloat(query.value(11)).toFixed(2)); //Purchase Cost
+					output.writeTextElement("td", parseFloat(query.value(5)).toFixed(2)); //Use Wt
+					output.writeTextElement("td", parseFloat(query.value(12)).toFixed(2)); //Use Cost
+					output.writeTextElement("td", parseFloat(query.value(6)).toFixed(2)); //Sale Wt
+					output.writeTextElement("td", parseFloat(query.value(13)).toFixed(2)); //Sale Cost
+					output.writeTextElement("td", parseFloat(query.value(9)).toFixed(2)); //Adjustment Wt
+					output.writeTextElement("td", parseFloat(query.value(15)).toFixed(2)); //Adjustment Cost
+					output.writeTextElement("td", parseFloat(query.value(7)).toFixed(2)); //Ending Wt
+					output.writeTextElement("td", parseFloat(query.value(14)).toFixed(2)); //Ending Cost
+					output.writeEndElement();
+					sum3 += parseFloat(query.value(3));
+					sum10 += parseFloat(query.value(10));
+					sum4 += parseFloat(query.value(4));
+					sum11 += parseFloat(query.value(11));
+					sum5 += parseFloat(query.value(5));
+					sum12 += parseFloat(query.value(12));
+					sum6 += parseFloat(query.value(6));
+					sum13 += parseFloat(query.value(13));
+					sum9 += parseFloat(query.value(9));
+					sum15 += parseFloat(query.value(15));
+					sum7 += parseFloat(query.value(7));
+					sum14 += parseFloat(query.value(14));
+				}
+				output.writeEndElement(); // tbody
+				output.writeStartElement("tfoot");
+				output.writeStartElement("tr");
+				output.writeTextElement("td", "");
+				output.writeTextElement("td", "");
+				output.writeTextElement("th", "Total:");
+				output.writeTextElement("td", sum3.toFixed(2));
+				output.writeTextElement("td", sum10.toFixed(2));
+				output.writeTextElement("td", sum4.toFixed(2));
+				output.writeTextElement("td", sum11.toFixed(2));
+				output.writeTextElement("td", sum5.toFixed(2));
+				output.writeTextElement("td", sum12.toFixed(2));
+				output.writeTextElement("td", sum6.toFixed(2));
+				output.writeTextElement("td", sum13.toFixed(2));
+				output.writeTextElement("td", sum9.toFixed(2));
+				output.writeTextElement("td", sum15.toFixed(2));
+				output.writeTextElement("td", sum7.toFixed(2));
+				output.writeTextElement("td", sum14.toFixed(2));
+				output.writeEndElement(); // tr
+				output.writeEndElement(); // tfoot
+				output.writeEndElement();
+				output.writeEndElement();
+				output.writeEndElement();
+				output.writeEndDocument();
+				view.setContent(buffer);
+				buffer.close();
+				query = query.invalidate();
+			}
+			refresh();
+			startDateField.dateChanged.connect(function() {
+				refresh();
+			});
+			endDateField.dateChanged.connect(function() {
+				refresh();
+			});
+			view.scriptLinkClicked.connect(function(url) {
+				var itemReport = createReport("itemtransactions.xml");
+				var sIB = findChildObject(itemReport, 'item');
+				sIB.currentIndex = sIB.findData(url);
+			});
+		]]>
+	</program>
+</window>

config/Reports/inventory.xml

@@ -174,7 +174,8 @@
                 output.writeTextElement("td", query.value(1));
                 output.writeTextElement("td", "");
                 output.writeTextElement("td", "");
-                output.writeEndElement();
+                query = query.invalidate();
+				output.writeEndElement();
                 output.writeEndElement();
                 output.writeEndElement();
                 output.writeEndElement();

config/Reports/itemtransactions.xml

@@ -0,0 +1,199 @@
+<window id="item_transactions">
+	<reporttitle>Inventory:->Item Transactions</reporttitle>
+	<layout type="vertical">
+		<layout type="horizontal">
+			<label>Item:</label>
+			<sqldrop id="item" data="0" display="1" showdata="true">
+				<null />
+				<query>SELECT id, name FROM items WHERE category = 'Coffee: Unroasted' ORDER BY name</query>
+			</sqldrop>
+			<label>Weight Unit:</label>
+			<sqldrop id="unit" />
+			<stretch />
+		</layout>
+		<webview id="report" />
+	</layout>
+	<menu name="File">
+		<item id="print" shortcut="Ctrl+P">Print</item>
+	</menu>
+	<program>
+		<![CDATA[
+			this.windowTitle = "Typica - Item Transactions";
+			var itemBox = findChildObject(this, 'item');
+			var unitBox = findChildObject(this, 'unit');
+			unitBox.addItem("Kg");
+			unitBox.addItem("Lb");
+			unitBox.currentIndex = QSettings.value("script/report_unit", 1);
+			unitBox['currentIndexChanged(int)'].connect(function() {
+				QSettings.setValue("script/report_unit", unitBox.currentIndex);
+				refresh();
+			});
+			var view = findChildObject(this, 'report');
+			var printMenu = findChildObject(this, 'print');
+			printMenu.triggered.connect(function() {
+				view.print();
+			});
+			itemBox['currentIndexChanged(int)'].connect(function() {
+				refresh();
+			});
+			function refresh() {
+				var buffer = new QBuffer;
+				buffer.open(3);
+				var output = new XmlWriter(buffer);
+				output.writeStartDocument("1.0");
+				output.writeDTD('<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1 plus MathML 2.0 plus SVG 1.1//EN" "http://www.w3.org/2002/04/xhtml-math-svg.dtd">');
+				output.writeStartElement("html");
+				output.writeAttribute("xmlns", "http://www.w3.org/1999/xhtml");
+				output.writeStartElement("head");
+				output.writeTextElement("title", "Item Transactions");
+				output.writeStartElement("style");
+				output.writeAttribute("type", "text/css");
+				output.writeCDATA("tr.PURCHASE {background-color: #77FF77}");
+				output.writeCDATA("tr.USE {background-color: #FFFFFF}");
+				output.writeCDATA("tr.INVENTORY {background-color: #7777FF}");
+				output.writeCDATA("tr.SALE {background-color: #FF77FF}");
+				output.writeCDATA("tr.LOSS {background-color: #FF7777}");
+				output.writeCDATA("tr.MAKE {background-color: #FFFF77}");
+				output.writeEndElement(); // style
+				
+				output.writeEndElement();
+				output.writeStartElement("body");
+				output.writeTextElement("h1", "Item Transactions:");
+				output.writeStartElement("table");
+				output.writeStartElement("tr");
+				output.writeStartElement("td");
+				output.writeTextElement("strong", "Item: ")
+				output.writeTextElement("span", itemBox.currentText);
+				output.writeEndElement(); // td
+				var query = new QSqlQuery();
+				query.prepare("SELECT reference, category FROM items WHERE id = :item");
+				query.bind(":item", itemBox.currentData());
+				query.exec();
+				if(query.next()) {
+					output.writeStartElement("td");
+					output.writeTextElement("strong", "Reference: ");
+					output.writeTextElement("span", query.value(0));
+					output.writeEndElement(); // td
+					output.writeStartElement("td");
+					output.writeTextElement("strong", "Category: ");
+					output.writeTextElement("span", query.value(1));
+					output.writeEndElement(); //td
+					output.writeEndElement(); //tr
+					query.prepare("SELECT origin, region, producer, grade, milling, drying FROM coffees WHERE id = :item");
+					query.bind(":item", itemBox.currentData());
+					query.exec();
+					if(query.next()) {
+						output.writeStartElement("tr");
+						output.writeStartElement("td");
+						output.writeTextElement("strong", "Origin: ");
+						output.writeTextElement("span", query.value(0));
+						output.writeEndElement(); // td
+						output.writeStartElement("td");
+						output.writeTextElement("strong", "Region: ");
+						output.writeTextElement("span", query.value(1));
+						output.writeEndElement(); // td
+						output.writeStartElement("td");
+						output.writeTextElement("strong", "Producer: ");
+						output.writeTextElement("span", query.value(2));
+						output.writeEndElement(); // td
+						output.writeEndElement(); // tr
+						output.writeStartElement("tr");
+						output.writeStartElement("td");
+						output.writeTextElement("strong", "Grade: ");
+						output.writeTextElement("span", query.value(3));
+						output.writeEndElement(); // td
+						output.writeStartElement("td");
+						output.writeTextElement("strong", "Milling: ");
+						output.writeTextElement("span", query.value(4));
+						output.writeEndElement(); // td
+						output.writeStartElement("td");
+						output.writeTextElement("strong", "Drying: ");
+						output.writeTextElement("span", query.value(5));
+						output.writeEndElement(); // td
+						output.writeEndElement(); // tr
+						query.prepare("SELECT decaf_method FROM decaf_coffees WHERE id = :item");
+						query.bind(":item", itemBox.currentData());
+						query.exec();
+						if(query.next()) {
+							output.writeStartElement("tr");
+							output.writeStartElement("td");
+							output.writeAttribute("colspan", "3");
+							output.writeTextElement("strong", "Decaffeination Method: ");
+							output.writeTextElement("span", query.value(0));
+							output.writeEndElement(); // td
+							output.writeEndElement(); // tr
+						}
+					}
+					output.writeEndElement() // table
+					
+					query.prepare("SELECT time::date, type, quantity / :c1, balance / :c2 FROM item_history(:item)");
+					switch(unitBox.currentIndex)
+					{
+						case 0:
+							query.bind(":c1", 2.2);
+							query.bind(":c2", 2.2);
+							break;
+						case 1:
+							query.bind(":c1", 1);
+							query.bind(":c2", 1);
+							break;
+					}
+					query.bind(":item", itemBox.currentData());
+					query.exec();
+					output.writeStartElement("table");
+					output.writeStartElement("tr");
+					output.writeTextElement("th", "Date");
+					output.writeTextElement("th", "Type");
+					output.writeTextElement("th", "Quantity");
+					output.writeTextElement("th", "Balance");
+					output.writeEndElement(); // tr
+					var prev_balance = "0";
+					var prev_prec = 0;
+					var cur_prec = 0;
+					while(query.next()) {
+						output.writeStartElement("tr");
+						output.writeAttribute("class", query.value(1));
+						output.writeTextElement("td", query.value(0));
+						output.writeTextElement("td", query.value(1));
+						if(query.value(1) == "INVENTORY") {
+							var split = prev_balance.split('.');
+							if(split.length > 1) {
+								prev_prec = split[1].length;
+							} else {
+								prev_prec = 0;
+							}
+							split = query.value(2).split('.');
+							if(split.length > 1) {
+								cur_prec = split[1].length;
+							} else {
+								cur_prec = 0;
+							}
+							var prec = prev_prec > cur_prec ? prev_prec : cur_prec;
+							output.writeTextElement("td", (Number(query.value(2)) - Number(prev_balance)).toFixed(prec));
+						} else {
+							output.writeTextElement("td", query.value(2));
+						}
+						output.writeTextElement("td", query.value(3));
+						prev_balance = query.value(3);
+						output.writeEndElement(); // tr
+					}
+					output.writeEndElement(); // table
+					/* Put the rest of the report here. No sense running queries if
+					   the item doesn't exist. */
+				} else {
+					/* Close tags if item data not found. */
+					output.writeEndElement(); // tr
+					output.writeEndElement(); // table
+				}
+				
+				output.writeEndElement(); // body
+				output.writeEndElement(); // html
+				output.writeEndDocument();
+				view.setContent(buffer);
+				buffer.close();
+				query = query.invalidate();
+			}
+			refresh();
+		]]>
+	</program>
+</window>

config/Reports/rwacp.xml

@@ -114,7 +114,8 @@
 				query.exec();
 				query.next();
                 output.writeTextElement("td", query.value(0));
-                output.writeEndElement();
+                query = query.invalidate();
+				output.writeEndElement();
                 output.writeEndElement();
                 output.writeEndElement();
                 output.writeEndElement();

config/Windows/batchdetailsnew.xml

@@ -295,6 +295,7 @@
 				rq = rq + 'string($t/annotation), "~")';
 				colQuery.setQuery(rq);
 				var annotationData = colQuery.exec();
+				colQuery = colQuery.invalidate();
 				buffer2.close();
 				output.writeStartElement("tbody");
 				var annotationRecords = annotationData.split("~");

config/Windows/navigation.xml

@@ -210,8 +210,6 @@ type="push" />
 			query.exec("CREATE VIEW short_log AS SELECT roasting_log.\"time\", (SELECT items.name FROM items WHERE (items.id = roasting_log.roasted_id)) AS name, roasting_log.unroasted_total_quantity, roasting_log.roasted_quantity, ((((roasting_log.unroasted_total_quantity - roasting_log.roasted_quantity) / roasting_log.unroasted_total_quantity) * (100)::numeric))::numeric(12,2) AS weight_loss, roasting_log.duration FROM roasting_log ORDER BY roasting_log.\"time\"");
 			query.exec("CREATE FUNCTION add_inventory() RETURNS trigger AS $$ BEGIN UPDATE items SET quantity = quantity + NEW.quantity WHERE id = NEW.item; RETURN NEW; END; $$ LANGUAGE plpgsql");
 			query.exec("CREATE FUNCTION bags_in_stock(bigint) RETURNS numeric AS $_$SELECT quantity / (SELECT conversion FROM lb_bag_conversion WHERE item = id) FROM items WHERE id = $1;$_$ LANGUAGE sql IMMUTABLE STRICT");
-			query.exec("CREATE FUNCTION calculate_inventory_balance() RETURNS trigger AS $$ DECLARE old_quantity numeric; BEGIN old_quantity := (SELECT balance FROM working WHERE time = (SELECT max(time) FROM working)); IF old_quantity IS NULL THEN old_quantity := 0; END IF; IF NEW.type = 'PURCHASE' OR NEW.type = 'MAKE' THEN NEW.balance := old_quantity + NEW.quantity; ELSE IF NEW.type = 'INVENTORY' THEN NEW.balance := NEW.quantity; ELSE IF NEW.type = 'USE' OR NEW.type = 'SALE' OR NEW.type = 'LOSS' THEN NEW.balance := old_quantity - NEW.quantity; END IF; END IF; END IF; RETURN NEW; END; $$ LANGUAGE plpgsql");
-			query.exec("CREATE FUNCTION item_history(bigint) RETURNS SETOF item_transaction_with_balance AS $_$ DECLARE r item_transaction_with_balance; BEGIN CREATE TEMPORARY TABLE working(time timestamp without time zone, item bigint, quantity numeric, cost numeric, vendor text, reason text, customer text, type text, balance numeric) ON COMMIT DROP; CREATE TRIGGER quantity_update BEFORE INSERT ON working FOR EACH ROW EXECUTE PROCEDURE calculate_inventory_balance(); INSERT INTO working SELECT time, item, quantity, cost, vendor, reason, customer, type, NULL AS balance FROM all_transactions WHERE item = $1 ORDER BY time ASC; FOR r IN SELECT time, item, quantity, cost, vendor, reason, customer, type, balance FROM working LOOP RETURN NEXT r; END LOOP; DROP TABLE working; RETURN; END; $_$ LANGUAGE plpgsql");
 			query.exec("CREATE FUNCTION log_make() RETURNS trigger AS $$ BEGIN IF NEW.roasted_quantity IS NOT NULL THEN INSERT INTO make VALUES(NEW.time, NEW.roasted_id, NEW.roasted_quantity); END IF; RETURN NEW; END; $$ LANGUAGE plpgsql");
 			query.exec("CREATE FUNCTION log_make_update() RETURNS trigger AS $$ BEGIN IF NEW.roasted_quantity <> OLD.roasted_quantity AND NEW.roasted_quantity IS NOT NULL THEN INSERT INTO make VALUES(NEW.time, NEW.roasted_id, NEW.roasted_quantity); END IF; RETURN NEW; END; $$ LANGUAGE plpgsql");
 			query.exec("CREATE FUNCTION log_use() RETURNS trigger AS $$ DECLARE i integer := array_lower(NEW.unroasted_id, 1); u integer := array_upper(NEW.unroasted_id, 1); BEGIN WHILE i <= u LOOP INSERT INTO use VALUES(NEW.time, NEW.unroasted_id[i], NEW.unroasted_quantity[i]); i := i + 1; END LOOP; RETURN NEW; END; $$ LANGUAGE plpgsql");
@@ -252,7 +250,36 @@ type="push" />
 			query.exec("INSERT INTO TypicaFeatures VALUES('sample-roasting', TRUE, 1)");
 			query = query.invalidate();
 		};
-
+		
+		/* Some changes to the database are required to log who performed what tasks.
+		   This adds logging for all transaction types and also for the roasting log.*/
+		var DBUpdateMultiUser = function() {
+			var query = new QSqlQuery;
+			query.exec("ALTER TABLE transactions ADD COLUMN person text DEFAULT NULL");
+			query.exec("ALTER TABLE roasting_log ADD COLUMN person text DEFAULT NULL");
+			query.exec("CREATE OR REPLACE FUNCTION log_session_user() RETURNS trigger AS $$ BEGIN NEW.person := session_user; RETURN NEW; END; $$ LANGUAGE plpgsql");
+			query.exec("CREATE TRIGGER log_person BEFORE INSERT ON inventory FOR EACH ROW EXECUTE PROCEDURE log_session_user()");
+			query.exec("CREATE TRIGGER log_person BEFORE INSERT ON loss FOR EACH ROW EXECUTE PROCEDURE log_session_user()");
+			query.exec("CREATE TRIGGER log_person BEFORE INSERT ON make FOR EACH ROW EXECUTE PROCEDURE log_session_user()");
+			query.exec("CREATE TRIGGER log_person BEFORE INSERT ON purchase FOR EACH ROW EXECUTE PROCEDURE log_session_user()");
+			query.exec("CREATE TRIGGER log_person BEFORE INSERT ON sale FOR EACH ROW EXECUTE PROCEDURE log_session_user()");
+			query.exec("CREATE TRIGGER log_person BEFORE INSERT ON use FOR EACH ROW EXECUTE PROCEDURE log_session_user()");
+			query.exec("CREATE TRIGGER log_person BEFORE INSERT ON roasting_log FOR EACH ROW EXECUTE PROCEDURE log_session_user()");
+			query.exec("UPDATE TypicaFeatures SET version = 2 WHERE feature = 'base-features'");
+			query = query.invalidate();
+		};
+		
+		/* Bug fix and optimization for item_history */
+		var DBUpdateHistory = function() {
+			var query = new QSqlQuery;
+			query.exec("CREATE TYPE transaction_type AS (type text, quantity numeric)");
+			query.exec("CREATE FUNCTION update_balance(numeric, transaction_type) RETURNS numeric AS $$ BEGIN CASE $2.type WHEN 'PURCHASE', 'MAKE' THEN RETURN $1 + $2.quantity; WHEN 'INVENTORY' THEN RETURN $2.quantity; WHEN 'USE', 'SALE', 'LOSS' THEN RETURN $1 - $2.quantity; END CASE; END; $$ LANGUAGE plpgsql STRICT");
+			query.exec("CREATE AGGREGATE transaction_balance (BASETYPE = transaction_type, SFUNC = update_balance, STYPE = numeric, INITCOND = '0')");
+			query.exec("CREATE OR REPLACE FUNCTION item_history(bigint) RETURNS SETOF item_transaction_with_balance AS $$ SELECT time, item, quantity, cost, vendor, reason, customer, type, transaction_balance((type, quantity)::transaction_type) OVER (PARTITION BY item ORDER BY time ASC) AS balance FROM all_transactions WHERE item = $1; $$ LANGUAGE SQL");
+			query.exec("DROP FUNCTION calculate_inventory_balance()");
+			query = query.invalidate();
+		};
+		
 		query = new QSqlQuery();
 		/* A table keeps track of database versioning information. This table is created
 		   if required. */
@@ -267,6 +294,11 @@ type="push" />
 			{
 				DBCreateBase();
 			}
+			if(query.value(2) < 2)
+			{
+				DBUpdateMultiUser();
+				DBUpdateHistory();
+			}
 		}
 		else
 		{

config/Windows/newbatch.xml

@@ -21,7 +21,7 @@
         </layout>
         <label>Green Coffee:</label>
         <sqltablearray columns="2" id="greens">
-            <column name="Coffee" delegate="sql" showdata="true" null="false" data="0" display="1">SELECT id, name FROM coffees WHERE quantity &lt;&gt; 0 ORDER BY name</column>
+            <column name="Coffee" delegate="sql" showdata="true" null="true" nulltext="Delete" nulldata="delete" data="0" display="1">SELECT id, name FROM coffees WHERE quantity &lt;&gt; 0 ORDER BY name</column>
             <column name="Weight" />
         </sqltablearray>
         <layout type="horizontal">
@@ -119,6 +119,20 @@
 				}
 			}
 			model.dataChanged.connect(function() {
+				var deleteRow = -1;
+				/* The combo box delegate updates user data before display data
+				   and this code is executed before the model update is fully
+				   complete. Rather than rely on this behavior continuing, we
+				   check that the display value has also been updated and defer
+				   row removal until both updates are complete.
+				*/
+				while((deleteRow = table.findData("delete", 0)) > -1) {
+					if(table.data(deleteRow, 0, 0) == "Delete") {
+						table.removeRow(table.findData("delete", 0));
+					} else {
+						break;
+					}
+				}
 				green.text = table.columnSum(1, 0);
 				table.resizeColumnToContents(0);
                 if(parseFloat(green.text) > 0)
@@ -160,6 +174,7 @@
             var profilebutton = findChildObject(this, 'load');
             profilebutton.setEnabled(false);
             roasted['currentIndexChanged(int)'].connect(function() {
+				table.clear();
                 var query = new QSqlQuery();
                 var q = "SELECT EXISTS(SELECT 1 FROM item_files WHERE item = ";
                 q = q + roasted.currentData();

src/typica.w

@@ -2256,6 +2256,7 @@ QScriptValue constructXQuery(QScriptContext *context, QScriptEngine *engine);
 QScriptValue XQuery_bind(QScriptContext *context, QScriptEngine *engine);
 QScriptValue XQuery_exec(QScriptContext *context, QScriptEngine *engine);
 QScriptValue XQuery_setQuery(QScriptContext *context, QScriptEngine *engine);
+QScriptValue XQuery_invalidate(QScriptContext *context, QScriptEngine *engine);
 void setXQueryProperties(QScriptValue value, QScriptEngine *engine);
 
 @ The constructor must be registered with the host environment. This is done a
@@ -2266,7 +2267,7 @@ constructor = engine->newFunction(constructXQuery);
 engine->globalObject().setProperty("XQuery", constructor);
 
 @ The constructor just needs to make sure the functions we want to make
-available are applied.
+available are applied. A method is also provided to free the |QXmlQuery|.
 
 @<Functions for scripting@>=
 QScriptValue constructXQuery(QScriptContext *, QScriptEngine *engine)
@@ -2276,11 +2277,19 @@ QScriptValue constructXQuery(QScriptContext *, QScriptEngine *engine)
 	return object;
 }
 
+QScriptValue XQuery_invalidate(QScriptContext *context, QScriptEngine *)
+{
+	QXmlQuery *self = getself<QXmlQuery *>(context);
+	delete self;
+	return QScriptValue();
+}
+
 void setXQueryProperties(QScriptValue value, QScriptEngine *engine)
 {
 	value.setProperty("bind", engine->newFunction(XQuery_bind));
 	value.setProperty("exec", engine->newFunction(XQuery_exec));
 	value.setProperty("setQuery", engine->newFunction(XQuery_setQuery));
+	value.setProperty("invalidate", engine->newFunction(XQuery_invalidate));
 }
 
 @ The |bind()| property can be used to specify a |QIODevice| to be referenced by
@@ -3369,7 +3378,7 @@ class SqlQueryConnection : public QSqlQuery@/
 	public:@/
 		SqlQueryConnection(const QString &query = QString());
 		~SqlQueryConnection();
-		QSqlQuery* operator->();
+		QSqlQuery* operator->() const;
 	private:@/
 		QString connection;
 		QSqlQuery *q;
@@ -3409,7 +3418,7 @@ SqlQueryConnection::~SqlQueryConnection()
 object.
 
 @<SqlQueryConnection implementation@>=
-QSqlQuery* SqlQueryConnection::operator->()
+QSqlQuery* SqlQueryConnection::operator->() const
 {
 	return q;
 }
@@ -3448,8 +3457,9 @@ value.
 @<Functions for scripting@>=
 QScriptValue constructQSqlQuery(QScriptContext *, QScriptEngine *engine)
 {
+	SqlQueryConnection *obj = new SqlQueryConnection();
 	QScriptValue object =
-	     engine->toScriptValue<void *>(new SqlQueryConnection());
+	     engine->toScriptValue<void *>(obj);
 	setQSqlQueryProperties(object, engine);
 	return object;
 }
@@ -3478,40 +3488,40 @@ void setQSqlQueryProperties(QScriptValue value, QScriptEngine *engine)
 @<Functions for scripting@>=
 QScriptValue QSqlQuery_exec(QScriptContext *context, QScriptEngine *engine)
 {
-	SqlQueryConnection *query = getself<SqlQueryConnection *>(context);
+	QSqlQuery *q = getself<SqlQueryConnection *>(context)->operator->();
 	QScriptValue retval;
 	if(context->argumentCount() == 1)
 	{
 		retval = QScriptValue(engine,
-		                      query->exec(argument<QString>(0, context)));
+		                      q->exec(argument<QString>(0, context)));
 	}
 	else
 	{
-		retval = QScriptValue(engine, query->exec());
+		retval = QScriptValue(engine, q->exec());
 	}
-	if(query->lastError().isValid())
+	if(q->lastError().isValid())
 	{
-		qDebug() << query->lastQuery();
-		qDebug() << query->lastError().text();
+		qDebug() << q->lastQuery();
+		qDebug() << q->lastError().text();
 	}
 	return retval;
 }
 
 QScriptValue QSqlQuery_executedQuery(QScriptContext *context, QScriptEngine *)
 {
-	SqlQueryConnection *query = getself<SqlQueryConnection *>(context);
+	QSqlQuery *query = getself<SqlQueryConnection *>(context)->operator->();
 	return QScriptValue(query->lastQuery());
 }
 
 QScriptValue QSqlQuery_next(QScriptContext *context, QScriptEngine *engine)
 {
-	SqlQueryConnection *query = getself<SqlQueryConnection *>(context);
+	QSqlQuery *query = getself<SqlQueryConnection *>(context)->operator->();
 	return QScriptValue(engine, query->next());
 }
 
 QScriptValue QSqlQuery_value(QScriptContext *context, QScriptEngine *engine)
 {
-	SqlQueryConnection *query = getself<SqlQueryConnection *>(context);
+	QSqlQuery *query = getself<SqlQueryConnection *>(context)->operator->();
 	return QScriptValue(engine,
 	                    query->value(argument<int>(0, context)).toString());
 }
@@ -3522,13 +3532,13 @@ data available in a named file, or data from any open |QIODevice|.
 @<Functions for scripting@>=
 QScriptValue QSqlQuery_prepare(QScriptContext *context, QScriptEngine *engine)
 {
-	SqlQueryConnection *query = getself<SqlQueryConnection *>(context);
+	QSqlQuery *query = getself<SqlQueryConnection *>(context)->operator->();
 	return QScriptValue(engine, query->prepare(argument<QString>(0, context)));
 }
 
 QScriptValue QSqlQuery_bind(QScriptContext *context, QScriptEngine *)
 {
-	SqlQueryConnection *query = getself<SqlQueryConnection *>(context);
+	QSqlQuery *query = getself<SqlQueryConnection *>(context)->operator->();
 	query->bindValue(argument<QString>(0, context),
 	                 argument<QVariant>(1, context));
 	return QScriptValue();
@@ -3537,7 +3547,7 @@ QScriptValue QSqlQuery_bind(QScriptContext *context, QScriptEngine *)
 QScriptValue QSqlQuery_bindFileData(QScriptContext *context,
                                     QScriptEngine *)
 {
-	SqlQueryConnection *query = getself<SqlQueryConnection *>(context);
+	QSqlQuery *query = getself<SqlQueryConnection *>(context)->operator->();
 	QString placeholder = argument<QString>(0, context);
 	QString filename = argument<QString>(1, context);
 	QFile file(filename);
@@ -3554,7 +3564,7 @@ QScriptValue QSqlQuery_bindFileData(QScriptContext *context,
 QScriptValue QSqlQuery_bindDeviceData(QScriptContext *context,
                                       QScriptEngine *)
 {
-	SqlQueryConnection *query = getself<SqlQueryConnection *>(context);
+	QSqlQuery *query = getself<SqlQueryConnection *>(context)->operator->();
 	QString placeholder = argument<QString>(0, context);
 	QIODevice *device = argument<QIODevice *>(1, context);
 	device->reset();
@@ -3680,13 +3690,14 @@ host environment. The function is now depreciated and should not be used.
 @<Functions for scripting@>=
 QScriptValue annotationFromRecord(QScriptContext *context, QScriptEngine *)
 {
-	SqlQueryConnection query;
+	SqlQueryConnection h;
+	QSqlQuery *query = h.operator->();
 	QString q = "SELECT file FROM files WHERE id = :file";
-	query.prepare(q);
-	query.bindValue(":file", argument<int>(0, context));
-	query.exec();
-	query.next();
-	QByteArray array = query.value(0).toByteArray();
+	query->prepare(q);
+	query->bindValue(":file", argument<int>(0, context));
+	query->exec();
+	query->next();
+	QByteArray array = query->value(0).toByteArray();
 	QBuffer buffer(&array);
 	buffer.open(QIODevice::ReadOnly);
 	QXmlQuery xquery;
@@ -3866,12 +3877,16 @@ any {\tt <program>} elements that are immediate children of the
 {\tt <window>} element into a window displayed on screen, the script in the
 {\tt <program>} elements must call a function to display a specified window.
 
+Report windows can be produced by scripts in a similar, but slightly different
+manner.
+
 \danger This design works, but it'@q'@>s not particularly good design. It was written
 under severe time constraints and should be redesigned or at least cleaned up
 and reorganized.\endanger
 
 @<Function prototypes for scripting@>=
 QScriptValue createWindow(QScriptContext *context, QScriptEngine *engine);
+QScriptValue createReport(QScriptContext *context, QScriptEngine *engine);
 void addLayoutToWidget(QDomElement element, QStack<QWidget*> *widgetStack,
                        QStack<QLayout*> *layoutStack);
 void addLayoutToLayout(QDomElement element, QStack<QWidget *> *widgetStack,
@@ -3931,12 +3946,14 @@ void addCalendarToLayout(QDomElement element, QStack<QWidget *> *widgetStack,
 void addSpinBoxToLayout(QDomElement element, QStack<QWidget *> *widgetStack,
                         QStack<QLayout *> *layoutStack);
 
-@ The function for creating the window must be made available to the scripting
+@ The functions for creating windows must be made available to the scripting
 engine.
 
 @<Set up the scripting engine@>=
 engine->globalObject().setProperty("createWindow",
                                    engine->newFunction(createWindow));
+engine->globalObject().setProperty("createReport",
+                                   engine->newFunction(createReport));
 
 @ This function must examine the configuration document in search of the
 appropriate window element, parse the contents of that element, and create a
@@ -3956,6 +3973,32 @@ QScriptValue createWindow(QScriptContext *context, QScriptEngine *engine)@/
 	return object;
 }
 
+@ Report files are not part of the configuration document and must be created
+differently. While there is a special menu type that handles all of this
+without involving the host environment, scripted generation and manipulation of
+report windows requires another function. This function will only work after a
+window with a reports menu has been created.
+
+@<Functions for scripting@>=
+QScriptValue createReport(QScriptContext *context, QScriptEngine *engine)
+{
+	QString targetID = argument<QString>(0, context);
+	QFile file(QString("reports:%1").arg(targetID));
+	QScriptValue object;
+	if(file.open(QIODevice::ReadOnly))
+	{
+		QDomDocument document;
+		document.setContent(&file, true);
+		QDomElement element = document.documentElement();
+		if(!element.isNull())
+		{
+			@<Display the window@>@;
+		}
+		file.close();
+	}
+	return object;
+}
+
 @ First we must locate the {\tt <window>} element. The most sensible way to do
 this would require that each {\tt <window>} element has an ID attribute and
 search the DOM tree for that ID. Unfortunately, as of this writing,
@@ -5103,6 +5146,14 @@ of presenting a human readable list of choices.
 @<Assign column delegate from SQL@>=
 SqlComboBoxDelegate *delegate = new SqlComboBoxDelegate;
 SqlComboBox *widget = new SqlComboBox();
+if(currentElement.hasAttribute("nulltext"))
+{
+	widget->setNullText(currentElement.attribute("nulltext"));
+}
+if(currentElement.hasAttribute("nulldata"))
+{
+	widget->setNullData(QVariant(currentElement.attribute("nulldata")));
+}
 if(currentElement.hasAttribute("null"))
 {
 	if(currentElement.attribute("null") == "true")
@@ -5556,6 +5607,9 @@ QScriptValue SaltTable_model(QScriptContext *context, QScriptEngine *engine);
 QScriptValue SaltTable_quotedColumnArray(QScriptContext *context,
                                          QScriptEngine *engine);
 QScriptValue SaltTable_setData(QScriptContext *context, QScriptEngine *engine);
+QScriptValue SaltTable_clear(QScriptContext *context, QScriptEngine *engine);
+QScriptValue SaltTable_removeRow(QScriptContext *context, QScriptEngine *engine);
+QScriptValue SaltTable_findData(QScriptContext *context, QScriptEngine *engine);
 
 @ There are times when it is useful to obtain the sum of values in a column of
 a SaltTable object. For example, when a column represents the weight of the
@@ -5686,6 +5740,46 @@ QScriptValue SaltTable_data(QScriptContext *context, QScriptEngine *engine)
 	return retval;
 }
 
+@ There are times when it is useful to clear the content of a table. This is
+used, for example, in the green coffees table after changing the roasted coffee
+item to eliminate excess rows in the case where the previously selected item
+was a pre-roast blend.
+
+@<Functions for scripting@>=
+QScriptValue SaltTable_clear(QScriptContext *context, QScriptEngine *)
+{
+	QTableView *self = getself<QTableView *>(context);
+	SaltModel *model = qobject_cast<SaltModel *>(self->model());
+	model->clear();
+	return QScriptValue();
+}
+
+@ It is sometimes useful to remove a row from a table. This is done in the new
+batch window when the coffee for a row is set to a NULL item.
+
+@<Functions for scripting@>=
+QScriptValue SaltTable_removeRow(QScriptContext *context, QScriptEngine *engine)
+{
+	QTableView *self = getself<QTableView *>(context);
+	SaltModel *model = qobject_cast<SaltModel *>(self->model());
+	int row = argument<int>(0, context);
+	return engine->newVariant(model->removeRow(row));
+}
+
+@ To remove the correct row, it is sometimes useful to query the table for
+special values. This is done with the |findData()| method on the underlying
+model.
+
+@<Functions for scripting@>=
+QScriptValue SaltTable_findData(QScriptContext *context, QScriptEngine *engine)
+{
+	QTableView *self = getself<QTableView *>(context);
+	SaltModel *model = qobject_cast<SaltModel *>(self->model());
+	QVariant value = argument<QVariant>(0, context);
+	int column = argument<int>(1, context);
+	return engine->newVariant(model->findData(value, column));
+}
+
 @ These functions need to be added as properties of the table when it is passed
 to the host environment.
 
@@ -5705,6 +5799,9 @@ void setSaltTableProperties(QScriptValue value, QScriptEngine *engine)
 	value.setProperty("data", engine->newFunction(SaltTable_data));
 	value.setProperty("model", engine->newFunction(SaltTable_model));
 	value.setProperty("setData", engine->newFunction(SaltTable_setData));
+	value.setProperty("clear", engine->newFunction(SaltTable_clear));
+	value.setProperty("removeRow", engine->newFunction(SaltTable_removeRow));
+	value.setProperty("findData", engine->newFunction(SaltTable_findData));
 }
 
 @ The |SqlComboBox| is another class that is not constructed from scripts but is
@@ -5719,6 +5816,7 @@ QScriptValue QComboBox_currentData(QScriptContext *context,
 QScriptValue QComboBox_addItem(QScriptContext *context, QScriptEngine *engine);
 QScriptValue QComboBox_setModel(QScriptContext *context, QScriptEngine *engine);
 QScriptValue QComboBox_findText(QScriptContext *context, QScriptEngine *engine);
+QScriptValue QComboBox_findData(QScriptContext *context, QScriptEngine *engine);
 
 @ These functions should seem familiar by now.
 
@@ -5736,6 +5834,7 @@ void setQComboBoxProperties(QScriptValue value, QScriptEngine *engine)
 	value.setProperty("addItem", engine->newFunction(QComboBox_addItem));
 	value.setProperty("setModel", engine->newFunction(QComboBox_setModel));
 	value.setProperty("findText", engine->newFunction(QComboBox_findText));
+	value.setProperty("findData", engine->newFunction(QComboBox_findData));
 }
 
 QScriptValue QComboBox_currentData(QScriptContext *context,
@@ -5766,6 +5865,12 @@ QScriptValue QComboBox_findText(QScriptContext *context, QScriptEngine *engine)
 	return QScriptValue(engine, self->findText(argument<QString>(0, context)));
 }
 
+QScriptValue QComboBox_findData(QScriptContext *context, QScriptEngine *engine)
+{
+	QComboBox *self = getself<QComboBox *>(context);
+	return QScriptValue(engine, self->findData(argument<QVariant>(0, context)));
+}
+
 @i abouttypica.w
 
 @** A representation of temperature measurements.
@@ -11802,12 +11907,13 @@ database aware widgets.
 QSqlDatabase Application::database()
 {
 	QString connectionName;
-	QSqlDatabase connection = QSqlDatabase::database();
+	QSqlDatabase connection =
+		QSqlDatabase::database(QLatin1String(QSqlDatabase::defaultConnection), false);
 	do
 	{
 		connectionName = QUuid::createUuid().toString();
 	} while (QSqlDatabase::connectionNames().contains(connectionName));
-	return QSqlDatabase::cloneDatabase(connection, connectionName);
+	return QSqlDatabase::cloneDatabase(connection, QString(connectionName));
 }
 
 @** Table editor for ordered arrays with SQL relations.
@@ -11884,6 +11990,10 @@ class SaltModel : public QAbstractItemModel@/
 		QModelIndex parent(const QModelIndex &index) const;
 		QString arrayLiteral(int column, int role) const;
 		QString quotedArrayLiteral(int column, int role) const;
+		void clear();
+		bool removeRows(int row, int count,
+		                const QModelIndex &parent = QModelIndex());
+		int findData(const QVariant &value, int column, int role = Qt::UserRole);
 };
 
 @ The only unique methods in this class are the |arrayLiteral| and
@@ -12154,6 +12264,74 @@ QModelIndex SaltModel::index(int row, int column,
 	return QModelIndex();
 }
 
+@ There are some times when it is useful to clear the model data. Note that
+column header data is retained and the table will contain a single empty row
+after this method is called.
+
+@<SaltModel Implementation@>=
+void SaltModel::clear()
+{
+	beginResetModel();
+	modelData.clear();
+	@<Expand the SaltModel@>@;
+	endResetModel();
+}
+
+@ Another commonly useful operation is the ability to remove rows from the
+model. The new batch window uses this feature to eliminate rows in which the
+coffee is set to NULL. Note that if all rows of the model are removed, a new
+empty row will be created.
+
+@<SaltModel Implementation@>=
+bool SaltModel::removeRows(int row, int count,
+                           const QModelIndex &parent)
+{
+	if(parent == QModelIndex())
+	{
+		if(row >= 0 && count > 0 && (row + count - 1) < modelData.size())
+		{
+			beginRemoveRows(parent, row, row + count - 1);
+			for(int i = 0; i < count; i++)
+			{
+				modelData.removeAt(row);
+			}
+			endRemoveRows();
+			if(modelData.size() == 0)
+			{
+				beginInsertRows(parent, 0, 0);
+				@<Expand the SaltModel@>@;
+				endInsertRows();
+			}
+			return true;
+		}
+	}
+	return false;
+}
+
+@ To find the row number for removal operations it is useful to search for
+special values on a given role. The |findData()| method returns the first row
+in which the given value matches for a particular column and a particular role
+or |-1| if no such match exists.
+
+@<SaltModel Implementation@>=
+int SaltModel::findData(const QVariant &value, int column, int role)
+{
+	for(int i = 0; i < modelData.size(); i++)
+	{
+		if(modelData.at(i).size() > column)
+		{
+			if(modelData.at(i).at(column).contains(role))
+			{
+				if(modelData.at(i).at(column).value(role) == value)
+				{
+					return i;
+				}
+			}
+		}
+	}
+	return -1;
+}
+
 @* A Delegate for SQL Relations.
 
 \noindent The first column of the table view being described is responsible for
@@ -12179,6 +12357,8 @@ class SqlComboBox : public QComboBox@/
 	int dataColumn;
 	int displayColumn;
 	bool dataColumnShown;
+	QString specialNullText;
+	QVariant specialNullData;
 	public:@/
 		SqlComboBox();
 		~SqlComboBox();
@@ -12188,7 +12368,9 @@ class SqlComboBox : public QComboBox@/
 		void addSqlOptions(QString query);
 		void setDataColumn(int column);
 		void setDisplayColumn(int column);
-		void showData(bool show);@t\2@>@/
+		void showData(bool show);
+		void setNullText(QString nullText);
+		void setNullData(QVariant nullData);@t\2@>@/
 }@t\kern-3pt@>;
 
 @ In order to make this class work a little more nicely as an item delegate,
@@ -12221,12 +12403,25 @@ void SqlComboBox::showData(bool show)
 @ Next, there is a need to know if the NULL value may legally be selected. Where
 this is the case, we generally want this to be inserted first. As the
 |QComboBox| supports storing both display and user data, much of the code is a
-thin wrapper around calls to the base class.
+thin wrapper around calls to the base class. The text and data for the NULL
+value can be set arbitrarily, which can be useful in certain cases. Note that
+any customization of the NULL text or data must be set before a call to
+|addNullOption()|.
 
 @<SqlComboBox Implementation@>=
 void SqlComboBox::addNullOption()
 {
-	addItem(tr("Unknown"), QVariant(QVariant::String));
+	addItem(specialNullText, specialNullData);
+}
+
+void SqlComboBox::setNullText(QString nullText)
+{
+	specialNullText = nullText;
+}
+
+void SqlComboBox::setNullData(QVariant nullData)
+{
+	specialNullData = nullData;
 }
 
 @ Typically, the SQL query used to populate this widget will request two columns
@@ -12253,7 +12448,8 @@ the combo box with the results.
 @<SqlComboBox Implementation@>=
 void SqlComboBox::addSqlOptions(QString query)
 {
-	SqlQueryConnection *dbquery = new SqlQueryConnection;
+	SqlQueryConnection h;
+	QSqlQuery *dbquery = h.operator->();
 	if(!dbquery->exec(query))
 	{
 		QSqlError error = dbquery->lastError();
@@ -12273,7 +12469,6 @@ void SqlComboBox::addSqlOptions(QString query)
 		}
 		addItem(displayValue, dataValue);
 	}
-	delete dbquery;
 }
 
 @ The constructor initializes some private member data. A size policy is also
@@ -12288,7 +12483,8 @@ The destructor is trivial.
 
 @<SqlComboBox Implementation@>=
 SqlComboBox::SqlComboBox() :
-	dataColumn(0), displayColumn(0), dataColumnShown(false)
+	dataColumn(0), displayColumn(0), dataColumnShown(false),
+	specialNullText(tr("Unknown")), specialNullData(QVariant::String)
 {
 	view()->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Minimum);
 }
@@ -12562,6 +12758,7 @@ void SqlConnectionSetup::testConnection()
 		settings.setValue("database/dbname", dbname->text());
 		settings.setValue("database/user", user->text());
 		settings.setValue("database/password", password->text());
+		database.close();
 		accept();
 	}
 	else
@@ -12597,6 +12794,10 @@ if(!database.open())
 {
 	settings.setValue("database/exists", "false");
 }
+else
+{
+	database.close();
+}
 
 @** Viewing a record of batches.
 
@@ -12721,8 +12922,6 @@ void SqlQueryView::openRow(const QModelIndex &index)
 
 @ The other functions are wrappers around model methods.
 
-\danger |setQuery()| leaks database connections.
-
 @<SqlQueryView implementation@>=
 void SqlQueryView::setQuery(const QString &query)
 {
@@ -12730,6 +12929,7 @@ void SqlQueryView::setQuery(const QString &query)
 	database.open();
 	QSqlQuery q(query, database);
 	((QSqlQueryModel*)model())->setQuery(q);
+	database.close();
 }
 
 bool SqlQueryView::setHeaderData(int section, Qt::Orientation@, orientation,
@@ -12841,10 +13041,18 @@ presently distributed with Typica, the approach taken to implementing this menu
 type is highly inefficient. There are many optimizations available if this
 becomes problematic.\endanger
 
+When a report menu is generated, the directory used for this is added as a
+search path for the |"reports"| prefix. This is used by the |createReport()|
+script method and is intended to allow access to reports from outside of the
+Report menu.
+
 @<Populate reports menu@>=
 QSettings settings;
-QDir directory(QString("%1/%2").arg(settings.value("config").toString()).
-                                arg(element.attribute("src")));
+QString reportDirectory = QString("%1/%2").arg(settings.value("config").
+                                               toString()).
+                                           arg(element.attribute("src"));
+QDir::addSearchPath("reports", reportDirectory);
+QDir directory(reportDirectory);
 directory.setFilter(QDir::Files);
 directory.setSorting(QDir::Name);
 QStringList nameFilter;
@@ -13191,36 +13399,37 @@ placeholders that have not yet had values bound to them), there will be no
 change to the table and the next child element, if any, will be processed.
 
 @<Add SQL query results to report table@>=
-SqlQueryConnection query;
-query.prepare(currentElement.text());
+SqlQueryConnection h;
+QSqlQuery *query = h.operator->();
+query->prepare(currentElement.text());
 foreach(QString key, bindings.uniqueKeys())
 {
 	if(currentElement.text().contains(key))
 	{
-		query.bindValue(key, bindings.value(key));
+		query->bindValue(key, bindings.value(key));
 	}
 }
-query.exec();
-if(!query.next())
+query->exec();
+if(!query->next())
 {
 	continue;
 }
-if(query.record().count() > columns)
+if(query->record().count() > columns)
 {
-	table->appendColumns(query.record().count() - columns);
+	table->appendColumns(query->record().count() - columns);
 }
 do
 {
 	table->appendRows(1);
 	rows++;
 	currentRow++;
-	for(int j = 0; j < query.record().count(); j++)
+	for(int j = 0; j < query->record().count(); j++)
 	{
 		QTextTableCell cell = table->cellAt(currentRow, j);
 		cursor = cell.firstCursorPosition();
-		cursor.insertText(query.value(j).toString());
+		cursor.insertText(query->value(j).toString());
 	}
-} while(query.next());
+} while(query->next());
 
 @ It is sometimes desirable to add fixed data such as column headers to a table.
 This is done with the {\tt <row>} element.