Alexander Werner
|
95967c5f05
|
Fix in accountmodal
|
2017-03-27 21:14:17 +02:00 |
|
Alexander Werner
|
46f0c3a88b
|
Added get prize testcases and fixed prize calculation
|
2017-03-27 21:01:43 +02:00 |
|
|
|
9a84532042
|
Merge branch 'feature/#11_accounting_dialog' into develop
|
2017-03-12 19:23:59 +01:00 |
|
|
|
522411ea34
|
update accounting
|
2017-03-11 20:49:14 +01:00 |
|
|
|
ab6d1fa07e
|
add dialog to show accounting data
|
2017-03-11 20:39:11 +01:00 |
|
|
|
4669416a78
|
cleanup
|
2017-03-10 20:00:07 +01:00 |
|
|
|
dd1be9fe50
|
merge migrations
|
2017-03-10 19:54:35 +01:00 |
|
|
|
e3a34fe84a
|
fix error in calculation price
|
2017-03-10 19:54:15 +01:00 |
|
|
|
57cf9553a2
|
fix error
|
2017-03-10 19:48:58 +01:00 |
|
|
|
594fbe76c2
|
update django rest framework
|
2017-03-10 19:34:21 +01:00 |
|
|
|
29ef5ac541
|
Merge branch 'feature/#3_accounting_dialog' into develop
# Conflicts:
# billard/models.py
# billard/views.py
|
2017-03-09 20:52:34 +01:00 |
|
|
|
201c347fcc
|
Merge branch 'feature/#3_accounting_dialog' into develop
# Conflicts:
# billard/models.py
# billard/views.py
|
2017-03-09 20:52:12 +01:00 |
|
|
|
81f0da2b63
|
Merge branch 'feature/#4_celery' into develop
|
2017-03-09 20:33:02 +01:00 |
|
|
|
6c5c77b597
|
fix circular dependencie
|
2017-03-09 20:32:49 +01:00 |
|
Alexander Werner
|
3141944ff3
|
updated code for shared_tasks
|
2017-03-09 20:26:03 +01:00 |
|
|
|
24b9743ce8
|
fix details on accounting dialog
|
2017-03-09 20:12:25 +01:00 |
|
Alexander Werner
|
d2932d834a
|
updated code for shared_tasks
|
2017-03-09 20:08:35 +01:00 |
|
Alexander Werner
|
f6d7d858ed
|
Merge branch 'feature/#3_accounting_dialog' of git.einsle.de:carom/carom-server into feature/#3_accounting_dialog
|
2017-03-09 19:50:50 +01:00 |
|
Alexander Werner
|
a968e59cf1
|
fixed error if report_user not set
|
2017-03-09 19:50:39 +01:00 |
|
|
|
e81c5ca9ab
|
update django-extensions
|
2017-03-08 19:15:48 +01:00 |
|
Alexander Werner
|
bd48677953
|
updated modal code
|
2017-03-06 20:13:22 +01:00 |
|
Alexander Werner
|
61a5c3ee04
|
updated modal code
|
2017-03-06 20:11:07 +01:00 |
|
Alexander Werner
|
e7a25888a7
|
updated modal code
|
2017-03-06 20:05:53 +01:00 |
|
Alexander Werner
|
51a5d1659a
|
updated modal code
|
2017-03-06 19:48:59 +01:00 |
|
Alexander Werner
|
323ab5ae98
|
updated modal code
|
2017-03-06 19:44:36 +01:00 |
|
Alexander Werner
|
8e95ae4ff5
|
updated modal code
|
2017-03-06 19:31:35 +01:00 |
|
Alexander Werner
|
d2e56b99b8
|
updated modal code
|
2017-03-06 19:22:01 +01:00 |
|
Alexander Werner
|
716cb2d347
|
updated modal code
|
2017-03-06 19:04:47 +01:00 |
|
Alexander Werner
|
1a7cce0934
|
Merge branch 'feature/#3_accounting_dialog' of git.einsle.de:carom/carom-server into feature/#3_accounting_dialog
|
2017-03-06 19:03:39 +01:00 |
|
Alexander Werner
|
13fa332679
|
updated modal code
|
2017-03-06 19:03:09 +01:00 |
|
|
|
8367f002c3
|
move to explicit imports
|
2017-03-06 18:54:03 +01:00 |
|
Alexander Werner
|
63e9c348a0
|
updated modal code
|
2017-03-06 18:43:17 +01:00 |
|
|
|
f89306dfde
|
updating admin
|
2017-03-02 21:01:07 +01:00 |
|
|
|
943ff5ad21
|
update model
|
2017-03-02 20:59:10 +01:00 |
|
|
|
ea2ed0d6a1
|
Merge branch 'feature/#3_accounting_dialog' of ssh://git.einsle.de:5000/carom/carom-server into feature/#3_accounting_dialog
|
2017-03-02 20:54:57 +01:00 |
|
|
|
4df4a095cb
|
update calculating prize for accounting
|
2017-03-02 20:51:43 +01:00 |
|
Alexander Werner
|
3a2c21cbc2
|
Added modal view
|
2017-03-02 20:25:40 +01:00 |
|
|
|
778078e86d
|
update accounting model for bigger decimal
|
2017-03-02 16:11:11 +01:00 |
|
|
|
d4a68683fa
|
update accounting using location data uuid
|
2017-02-27 08:01:58 +01:00 |
|
|
|
0a36d3904e
|
extend accounting model
|
2017-02-27 07:58:06 +01:00 |
|
|
|
1323976521
|
fix error in model
|
2017-02-26 12:37:47 +01:00 |
|
|
|
2eb8802e83
|
show version info in menu not in footer
|
2017-02-26 12:28:38 +01:00 |
|
|
|
f9c483c8d3
|
fix error in view.py
|
2017-02-26 12:20:50 +01:00 |
|
|
|
e22a153201
|
fix processingo of ld objects
|
2017-02-26 12:03:18 +01:00 |
|
|
|
eab72df9ac
|
fix error calculating prize
|
2017-02-26 11:24:46 +01:00 |
|
|
|
ce9e54f21d
|
carom/carom-doc#6
Anzeige des Preises pro Tisch
|
2017-02-26 10:37:28 +01:00 |
|
|
|
9ed10884e2
|
carom/carom-doc#6
Anzeige des PReises pro Tisch
|
2017-02-26 10:32:38 +01:00 |
|
|
|
2e6cc938aa
|
add version info in footer
|
2017-02-25 20:30:08 +01:00 |
|
|
|
fa00563195
|
carom/carom-doc#8
Calculate prize using normal and happy hour prize
|
2017-02-25 20:02:48 +01:00 |
|
|
|
6d16a473bf
|
carom/carom-doc#8
Update location model for happy hour
|
2017-02-25 18:34:28 +01:00 |
|
