Merge branch 'master' into better_inventory

 Conflicts:
	README
	data/templates/products/entry.html
	docker/Dockerfile
	docker/init.sh
	src/database/database.vala
	src/database/db-interface.vala
	src/pdf-stock/Makefile
	src/pdf-stock/pdf-stock-interface.vala
	src/pdf-stock/pdf-stock.vala
	src/web/Makefile
	src/web/main.vala
	templates/menu.html
	templates/products/index.html

1 files changed, 20 insertions, 4 deletions

diff --git a/src/pdf-invoice/test.vala b/src/pdf-invoice/test.vala
index e55f3a3..5eb7f52 100644
--- a/src/pdf-invoice/test.vala
+++ b/src/pdf-invoice/test.vala
@@ -14,7 +14,13 @@
  */
 
 public static int main(string args[]) {
-	PDFInvoice invoice = Bus.get_proxy_sync(BusType.SYSTEM, "io.mainframe.shopsystem.InvoicePDF", "/io/mainframe/shopsystem/invoicepdf");
+	PDFInvoice invoice;
+
+	try {
+		invoice = Bus.get_proxy_sync(BusType.SYSTEM, "io.mainframe.shopsystem.InvoicePDF", "/io/mainframe/shopsystem/invoicepdf");
+	} catch(IOError e) {
+		error(_("IO Error: %s\n"), e.message);
+	}
 
 	InvoiceRecipient r = {
 		"Max",
@@ -43,10 +49,20 @@ public static int main(string args[]) {
 	invoice.invoice_entries = {e1};
 
 	/* generate pdf */
-	var pdfdata = invoice.generate();
+	try {
+		var pdfdata = invoice.generate();
 
-	/* write pdf into file */
-	FileUtils.set_contents("test.pdf", (string) pdfdata, pdfdata.length);
+		/* write pdf into file */
+		FileUtils.set_contents("test.pdf", (string) pdfdata, pdfdata.length);
+	} catch(DBusError e) {
+		error(_("DBus Error: %s\n"), e.message);
+	} catch(IOError e) {
+		error(_("IO Error: %s\n"), e.message);
+	} catch(InvoicePDFError e) {
+		error(_("Invoice PDF Error: %s\n"), e.message);
+	} catch(FileError e) {
+		error(_("File Error: %s\n"), e.message);
+	}
 
 	return 0;
 }