Update invoice info on line item change

config/Reports/invoices.xml

@@ -44,18 +44,6 @@
             view.scriptLinkClicked.connect(function(url) {
                 var info = createWindow("invoiceinfo");
                 info.setInvoiceID(url);
-                var invquery = new QSqlQuery();
-                invquery.exec("SELECT time, invoice, vendor FROM invoices WHERE id = " + url);
-                invquery.next();
-                var timefield = findChildObject(info, 'date');
-                timefield.text = invquery.value(0);
-                var vendorfield = findChildObject(info, 'vendor');
-                vendorfield.text = invquery.value(2);
-                var invoicefield = findChildObject(info, 'invoice');
-                invoicefield.text = invquery.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 = " + url + " AND record_type = 'PURCHASE' UNION SELECT record_type, NULL, description, NULL, NULL, NULL, NULL, cost FROM invoice_items WHERE invoice_id = " + url + " AND record_type = 'FEE' ORDER BY item_id");
-                invquery = invquery.invalidate();
             });
             function refresh() {
                 var dateRange = dateSelect.currentRange();

config/Windows/editfee.xml

@@ -35,6 +35,7 @@
 				query.bind(":oldcost", window.rowData[7]);
 				query.exec();
 				query = query.invalidate();
+				window.pWindow.refresh();
 				window.close();
 			});
 		]]>

config/Windows/editinvoiceitem.xml

@@ -96,7 +96,9 @@
                     query.exec();
                 }
                 if(qbupdated) {
-                    query.exec("SELECT 1 FROM lb_bag_conversion WHERE item = :id");
+                    query.prepare("SELECT 1 FROM lb_bag_conversion WHERE item = :id");
+					query.bind(":id", Number(window.rowData[1]));
+					query.exec();
                     if(query.next()) {
                         query.prepare("UPDATE lb_bag_conversion SET conversion = :conv WHERE item = :id");
                     } else {
@@ -107,6 +109,7 @@
                     query.exec();
                 }
                 query = query.invalidate();
+				window.pWindow.refresh();
                 window.close();
             });
         ]]>

config/Windows/invoiceinfo.xml

@@ -14,12 +14,27 @@
 	<program>
 		<![CDATA[
 			var window = this;
-                        var invoiceID = 0;
+            var invoiceID = 0;
 			var table = findChildObject(this, 'itemtable');
+			var timefield = findChildObject(this, 'date');
+			var vendorfield = findChildObject(this, 'vendor');
+			var invoicefield = findChildObject(this, 'invoice');
+			var w = window;
 			this.setInvoiceID = function(arg) {
-				window.invoiceID = arg;
-                                invoiceID = arg;
-				window.windowTitle = TTR("invoiceinfo", "Typica - Invoice Details ") + arg;
+				w.invoiceID = arg;
+                invoiceID = arg;
+				w.windowTitle = TTR("invoiceinfo", "Typica - Invoice Details ") + arg;
+                var query = new QSqlQuery();
+                query.exec("SELECT time, invoice, vendor FROM invoices WHERE id = " + arg);
+                query.next();
+                timefield.text = query.value(0);
+                vendorfield.text = query.value(2);
+                invoicefield.text = query.value(1);
+                table.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();
+			};
+			this.refresh = function() {
+				w.setInvoiceID(w.invoiceID);
 			};
 			button = findChildObject(this, 'edit');
 			button.clicked.connect(function() {
@@ -34,6 +49,7 @@
 				if(table.data(arg, 0) == 'PURCHASE') {
 					var itemWindow = createWindow("invoiceitemdetail");
 					itemWindow.rowData = [];
+					itemWindow.pWindow = w;
 					for(var i = 0; i < 8; i++) {
 						itemWindow.rowData[i] = table.data(arg, i);
 					}
@@ -42,10 +58,11 @@
 				else {
 					var feeWindow = createWindow("invoicefeedetail");
 					feeWindow.rowData = [];
+					feeWindow.pWindow = w;
 					for(var i = 0; i < 8; i++) {
 						feeWindow.rowData[i] = table.data(arg, i);
 					}
-                                        feeWindow.invoiceID = invoiceID;
+                    feeWindow.invoiceID = invoiceID;
 					feeWindow.dataSet();
 				}
 			});