Merge branch 'master' of https://git.bukova.info/repos/git/prodejna

Conflicts:
	shop/shop.pro

shop/shop.pro

@@ -19,6 +19,7 @@ SOURCES += shop.cpp \
     temporaryreceiptsaveform.cpp \
     receiptsaveform.cpp \
     receiptloadform.cpp
+    data/voucheritem.cpp
 
 HEADERS += shop.h\
         shop_global.h \
@@ -28,6 +29,10 @@ HEADERS += shop.h\
     temporaryreceiptsaveform.h \
     receiptsaveform.h \
     receiptloadform.h
+    ishopitem.h \
+    data/voucheritem.h \
+    data/shop-data.h \
+    isellableservice.h
 
 unix {
     target.path = /usr/lib
@@ -47,12 +52,20 @@ else:unix: LIBS += -L$$OUT_PWD/../core/ -lcore
 INCLUDEPATH += $$PWD/../core
 DEPENDPATH += $$PWD/../core
 
+win32:CONFIG(release, debug|release): LIBS += -L$$OUT_PWD/../plugins/ -laddressbook
+else:win32:CONFIG(debug, debug|release): LIBS += -L$$OUT_PWD/../plugins/ -laddressbook
+else:unix: LIBS += -L$$OUT_PWD/../plugins/ -laddressbook
+
+INCLUDEPATH += $$PWD/../addressbook/data
+DEPENDPATH += $$PWD/../addressbook
+
 DESTDIR = ../plugins
 
 OTHER_FILES += shop.json
 
-#ODB_FILES = shop/data/....h
+ODB_FILES = shop/data/shop-data.h
 H_DIR = $$PWD/data/*.h
+ODB_OTHER_INCLUDES = -I $$PWD/../addressbook/data
 include(../odb.pri)
 
 win32:CONFIG(release, debug|release): LIBS += -L$$OUT_PWD/../qdecimal/lib/ -lqdecimal -ldecnumber