Commit graph

335 commits

Author SHA1 Message Date
a870736d72 [Fix #3] Update basket sum after deleting an article 2018-10-08 08:52:39 +02:00
381dad1011 [Fix #1] calculate fee correctly whe export to csv 2018-08-16 13:09:46 +02:00
00f870b0c3 save csv with correct umlauts even on windows 2018-08-16 12:40:19 +02:00
1551204bdb typo 2018-08-15 14:07:15 +02:00
8319ed6837 [Windows] undefine DELETE macro if defined 2018-08-15 14:04:56 +02:00
9dd0e5fd28 fix libusb for win32 2018-08-15 13:55:48 +02:00
5e81e2d8b4 remove unused functions 2018-08-15 13:12:09 +02:00
0966483b05 extended print report 2018-08-15 11:25:45 +02:00
f0078647d4 use new pos printer settings 2018-08-15 10:51:57 +02:00
dc74c59287 Merge branch 'choose_printer' 2018-08-15 09:03:13 +02:00
4f838ecf88 code cleanup 2018-08-15 08:53:04 +02:00
edbeadc389 code cleanup 2018-08-15 08:51:39 +02:00
dccf260431 configuring pos printer now works 2018-08-15 08:50:46 +02:00
bfe1379e05 allow configuring pos printer 2018-08-15 08:03:44 +02:00
98ba6db5a3 support specifying pos printer 2018-08-15 08:02:28 +02:00
4cd0b42072 resize date column 2018-08-14 15:12:58 +02:00
b0423e5e6a show license information 2018-08-13 14:26:34 +02:00
0f96861584 fix report 2018-08-10 16:45:16 +02:00
c291cd3496 no need for load data from db here 2018-08-10 15:20:50 +02:00
e80deb3010 code cleanup 2018-08-10 15:16:02 +02:00
56931c2e27 drastically improve performance for loading sales 2018-08-10 15:15:29 +02:00
8f5797bbfb revert changes 2018-08-10 15:15:12 +02:00
e494762c3a small improvement 2018-08-10 14:24:57 +02:00
d1ac4f07c4 allow negative prices (for refunds) 2018-08-10 11:45:16 +02:00
0db23842ca warn about importing from excel file 2018-08-10 11:18:55 +02:00
756a59aa6b fix using pkg-config 2018-08-10 10:45:50 +02:00
e0e0f641e2 use pkg-config if not windows 2018-08-10 10:18:26 +02:00
0e889aefe9 hide special account 2018-08-10 08:32:53 +02:00
2c584519b9 show real number of articles sold in report 2018-08-10 08:11:35 +02:00
dac46935c7 rename filesystem namespace 2018-08-09 16:37:56 +02:00
a3d95101b3 link icon for windows 2018-08-09 14:14:25 +02:00
0a1d946397 use path to save json file (sellers) 2018-08-09 13:16:00 +02:00
0967a01994 use path to save json file (sales) 2018-08-09 13:11:23 +02:00
be1d731de3 use path to open json file (sales) 2018-08-09 13:02:33 +02:00
7227cdc8a3 use path to open json file (sales) 2018-08-09 13:00:51 +02:00
7d98033c4a use path to open json file (sellers) 2018-08-09 12:58:11 +02:00
a04e8ad837 open excel files with umlauts on win works now 2018-08-09 12:52:15 +02:00
27edf6b6ea code tweak 2018-08-09 08:41:35 +02:00
92d08a4798 using path instead of string 2018-08-09 08:36:45 +02:00
fe6b858f32 test 2018-08-09 08:31:38 +02:00
e8db619e63 test 2018-08-08 15:55:35 +02:00
3a2e8d05cb draback information added 2018-08-08 13:36:49 +02:00
801b4cba62 hide drawback container widget 2018-08-08 11:46:05 +02:00
e45143abc1 handle case that user changed source_no while there are items in basket 2018-08-08 10:37:34 +02:00
badd1595e1 allow to clear database 2018-08-08 10:22:38 +02:00
95a89e568c set font size 2018-08-08 09:30:48 +02:00
6b0f31a0c2 fix width 2018-08-08 09:25:37 +02:00
f260bc2b0c make font settings cross platform 2018-08-08 09:16:23 +02:00
2561b03583 opening manual on windows works 2018-08-08 08:19:19 +02:00
a196e49410 open manual 2018-08-07 20:39:15 +02:00
18c2163318 ... 2018-08-07 16:06:01 +02:00
8cd4b58b53 more on installer 2018-08-07 12:52:24 +02:00
d784a26872 forbid adding sellers if there are already sold articles 2018-08-07 11:02:19 +02:00
52c4f39e23 text of menu item labels improved 2018-08-07 10:53:34 +02:00
593ae8531c read/save window geometry (position + size) 2018-08-07 10:52:51 +02:00
cdc737a823 cut names if necessary 2018-08-07 09:30:06 +02:00
a7a83ba3b9 fully support special seller "Sonderkonto" 2018-08-07 09:27:15 +02:00
a3b832b087 print articles of special seller 2018-08-07 08:53:31 +02:00
d1c5d3a6f8 handle "Sonderkonto" in imports 2018-08-07 08:31:43 +02:00
410eb775aa hide "Sonderkonto" 2018-08-07 08:14:26 +02:00
50ec5b3015 insert or ignore is better here 2018-08-07 08:02:27 +02:00
3a40f586fa update db: insert special seller 2018-08-07 07:57:47 +02:00
205e5eaae3 dont be so verbose 2018-08-06 21:41:48 +02:00
bc35f95a06 more on seller receipt 2018-08-06 21:36:26 +02:00
1607f8946e use simple iso string 2018-08-06 21:31:40 +02:00
f45e295c75 printing of seller receipt works now 2018-08-06 21:24:10 +02:00
4a92832e19 printer bugfixes 2018-08-06 20:57:12 +02:00
88d7225e61 printing seller receipt started 2018-08-06 16:38:55 +02:00
6e6510ebcf printing sale receipt 2018-08-06 16:14:45 +02:00
23659078b4 ugly hackl to allow umlauts in pos text 2018-08-06 14:59:57 +02:00
b2c64d8631 win tweak 2018-08-06 13:52:58 +02:00
e8d839eccb more on printer 2018-08-06 13:39:12 +02:00
a34fd9aefd first steps in printing via libusb 2018-08-06 12:52:45 +02:00
77040e9f27 code cleanup 2018-08-06 10:00:22 +02:00
f71f257eb0 successfully claim printer interace 2018-08-06 09:59:06 +02:00
76d6c7c069 pos printer introduced 2018-08-05 21:51:30 +02:00
a84b22f867 code cleanup 2018-08-05 14:57:20 +02:00
3ba230d9b9 import export nearly finished 2018-08-05 14:52:34 +02:00
de91a804a0 Added linker flag for windows 2018-08-03 11:33:23 +02:00
0a91de4d86 importing sales started 2018-08-02 15:28:35 +02:00
c82378dfa9 export sales works now 2018-08-02 15:06:35 +02:00
dc54809146 code cleanup 2018-08-02 14:42:15 +02:00
67643c665f import sellers from excel works now 2018-08-02 14:39:32 +02:00
23708b0f1e fix library name 2018-08-02 13:49:53 +02:00
876c8468df find jsoncpp without pkgconfig 2018-08-02 13:48:56 +02:00
ebe7035298 find xlnt without pkgconfig 2018-08-02 13:43:54 +02:00
2d670f4e18 fix 2018-08-02 13:06:51 +02:00
36643cf737 format money even when locale is not supported 2018-08-02 13:06:37 +02:00
da4e223b16 code cleanup 2018-08-02 12:36:37 +02:00
61da9adce5 import / export sellers completed 2018-08-02 12:34:56 +02:00
045bc8dd20 export sellers as json file 2018-08-02 11:15:15 +02:00
b2d696ccb5 don't check fpr empty names 2018-08-02 09:49:42 +02:00
cf268a62b1 ... 2018-08-01 15:55:13 +02:00
e295c6a743 started with xls import 2018-08-01 15:36:41 +02:00
7d405234d4 fix bcrypt issue 2018-08-01 11:27:13 +02:00
2cc7a288fe choos uuid generator platform-specific 2018-08-01 10:13:26 +02:00
22ae5aedf2 missing include added 2018-08-01 09:44:55 +02:00
60e2a3b014 typo 2018-08-01 09:37:11 +02:00
4a41036aec now printing reports 2018-07-31 16:15:48 +02:00
a6c5366b63 fix dbpath for windows 2018-07-31 12:31:57 +02:00
b1570b3a99 code cleanup 2018-07-31 10:29:09 +02:00
46aab9a836 export report as csv file implemented 2018-07-31 10:28:07 +02:00
e13339a432 qt in german 2018-07-30 19:37:19 +02:00
454c7881ec small about dialog change 2018-07-30 19:29:16 +02:00
e69e601133 code refacturing 2018-07-30 19:26:10 +02:00
1d3125fbdc initial about added 2018-07-30 16:39:33 +02:00
432aed665a use fees from settings 2018-07-30 15:19:29 +02:00
a4ae6a586a minor tweaks 2018-07-30 15:06:26 +02:00
84f71ea056 lots of smaller improvements 2018-07-30 14:43:02 +02:00
c3b17fbb8b create article with correct cash point no 2018-07-30 13:49:23 +02:00
9e85e2892d settings implemented 2018-07-30 13:40:58 +02:00
06c99052df new report dialog 2018-07-30 09:50:54 +02:00
efb1f3ffbf about qt dialog added 2018-07-29 09:56:37 +02:00
68591c415e reconnect selection model 2018-07-28 17:38:45 +02:00
0a22faf856 cancel sales / items finished 2018-07-28 14:31:37 +02:00
9c56ec55a5 fix enabling foreign keys in sqlite 2018-07-28 14:16:02 +02:00
940688edd5 delete sales 2018-07-28 11:52:43 +02:00
9ab8ca7a4b remove article (incomplete) 2018-07-27 16:41:34 +02:00
99bc19f7a3 cancel sale button activated 2018-07-27 16:04:01 +02:00
a130fa33c2 use unique_ptr for model 2018-07-27 10:34:27 +02:00
fcf5f04539 code cleanup 2018-07-27 10:16:07 +02:00
fb8bcc71e2 delete model to prevent memory leak 2018-07-27 10:10:48 +02:00
2003530587 replace model correctly 2018-07-27 09:55:47 +02:00
17c65a50ea hopefully delete model correctly 2018-07-26 20:42:44 +02:00
9f30bad90b show message in status bar 2018-07-26 08:59:54 +02:00
9041d34357 fix cashing app 2018-07-26 08:55:03 +02:00
3ec2143f28 connecting basket model and sale model 2018-07-26 08:34:01 +02:00
f697487d6b code cleanup 2018-07-26 07:56:32 +02:00
69dd1afba5 Order sales by timestamp (descending) 2018-07-25 16:11:25 +02:00
e24b6c4e5f Initial implementation of salemodel 2018-07-25 16:04:45 +02:00
bc67018c1c store sales 2018-07-25 09:31:17 +02:00
1ce329b99b set locale in main() 2018-07-24 15:37:19 +02:00
669a708bce format money correctly 2018-07-24 07:50:51 +02:00
fa7938ca20 use C++ features to show price 2018-07-23 21:21:05 +02:00
96d0a03ba8 show article price as string 2018-07-23 14:25:18 +02:00
10d3a681b1 code cleanup 2018-07-23 14:18:54 +02:00
3efa289b5b show last sum 2018-07-23 14:18:24 +02:00
527241a0f3 cancel article / complete sale 2018-07-23 13:39:49 +02:00
3c318ffab9 code beautifying 2018-07-23 12:59:11 +02:00
42c5f35576 enable/disable delete button 2018-07-23 12:58:27 +02:00
609003fc06 enable/disable button 2018-07-23 12:49:19 +02:00
5de88ef7a9 make slots normal functions 2018-07-23 09:14:43 +02:00
b100fc8e51 store and load articles correctly 2018-07-23 08:57:35 +02:00
4143fc2e89 using paid button 2018-07-23 08:21:28 +02:00
0f786a04e1 message text improved 2018-07-23 08:21:05 +02:00
97d05c93dd check for 0,50 cent steps 2018-07-22 20:56:20 +02:00
ee8c059441 More on basket 2018-07-22 20:10:22 +02:00
d0f0d604ed make buttons disabled 2018-07-22 13:50:04 +02:00
150ce946d1 finish current sale 2018-07-21 21:18:22 +02:00
8b534e1229 fill basket 2018-07-21 19:24:56 +02:00