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, 35 insertions, 0 deletions

diff --git a/data/templates/users/invoice.html b/data/templates/users/invoice.html
new file mode 100644
index 0000000..36ea627
--- /dev/null
+++ b/data/templates/users/invoice.html
@@ -0,0 +1,35 @@
+<h2>Invoice</h2>
+
+<div class="navbar navbar-default">
+	<ul class="navbar-nav nav" role="navigation">
+		<a class="navbar-brand" href="#">Choose Invoice Period:</a>
+		<li class="dropdown">
+			<a id="year" class="dropdown-toggle" data-toggle="dropdown" href="#">{{{SELECTEDYEAR}}} <span class="caret"></span></a>
+			<ul class="dropdown-menu" role="menu" aria-labelledby="year" >
+				{{{YEARS}}}
+			</ul>
+		</li>
+		<li class="dropdown">
+			<a id="month" class="dropdown-toggle" data-toggle="dropdown" href="#">{{{SELECTEDMONTH}}} <span class="caret"></span></a>
+			<ul class="dropdown-menu" role="menu" aria-labelledby="month" >
+				{{{MONTHS}}}
+			</ul>
+		</li>
+		<li class="dropdown">
+			<a id="day" class="dropdown-toggle" data-toggle="dropdown" href="#">{{{SELECTEDDAY}}} <span class="caret"></span></a>
+			<ul class="dropdown-menu two-columns" role="menu" aria-labelledby="day" >
+				{{{DAYS}}}
+			</ul>
+		</li>
+	</ul>
+</div>
+
+<table class="table table-bordered table-striped">
+	<thead>
+	<tr><th>Date</th><th>Time</th><th>Product</th><th>Price</th></tr>
+	</thead>
+	<tbody>
+	{{{DATA}}}
+	<tr><th colspan="3">Sum</th><td>{{{SUM}}}</td></tr>
+	</tbody>
+</table>