diff options
author | Holger Cremer <HolgerCremer@gmail.com> | 2018-08-27 19:38:11 +0200 |
---|---|---|
committer | Holger Cremer <HolgerCremer@gmail.com> | 2018-08-27 19:38:11 +0200 |
commit | 8f2ba2050ee78d0e4a47f1277c6bc4422d06170c (patch) | |
tree | c008d2878905e03df7a8bf8bd3330762cc2d8f43 /TODO.md | |
parent | bb55e121576a5b5d225bfc68c5062f386cc32db9 (diff) | |
parent | 3fc3ea6c6df237dbdf48d14703118b747bf5d647 (diff) | |
download | serial-barcode-scanner-8f2ba2050ee78d0e4a47f1277c6bc4422d06170c.tar.bz2 |
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
Diffstat (limited to 'TODO.md')
-rw-r--r-- | TODO.md | 11 |
1 files changed, 1 insertions, 10 deletions
@@ -1,8 +1,3 @@ -### Build System - * update Makefiles to use config.mk - * create VAPI file for config.h - * support "make install" - #### CORE * disallow buying for disabled users * support user discounts @@ -10,16 +5,12 @@ * drop to user rights in all daemons if started as root user - [old code](https://github.com/ktt-ol/serial-barcode-scanner/commit/504cefec4a93a9b52fa9d25d6f353a4676485c43) -### frontend - * add auto-logout - #### USERLIST-PDF * write new vala process, which generates a user list pdf using libcairobarcode #### PRODUCTLIST-PDF * write new vala process, which generates a product list pdf using libcairobarcode - - Version 1: EAN, Barcode, Name, Amount, Buying-Price - - Version 2: EAN, Barcode, Name, Member-Price, Guest-Price + - Version 1: EAN, Barcode, Name, Amount #### MAIL * add PGP support in mail script |