|
|
5477a26cbb
|
rebuild location index and detail view
|
2017-04-27 10:35:49 +02:00 |
|
|
|
9186ed2083
|
update initial migration add dependencie to session
|
2017-04-27 09:01:54 +02:00 |
|
|
|
dc09be5a43
|
move code to use generic views
|
2017-04-27 08:04:44 +02:00 |
|
|
|
b04e642daa
|
update views
|
2017-04-26 10:36:31 +02:00 |
|
|
|
867788cd59
|
update accounting model
|
2017-04-26 10:17:19 +02:00 |
|
|
|
55cf6101a8
|
update accounting model
|
2017-04-26 10:14:49 +02:00 |
|
|
|
6135c7c61a
|
add accounting user to admin view
|
2017-04-26 10:10:07 +02:00 |
|
|
|
52d515b05e
|
update requirements
|
2017-04-26 10:06:25 +02:00 |
|
|
|
c7efbffc8f
|
update version info
|
2017-04-12 13:35:18 +02:00 |
|
|
|
98f105296b
|
store reporter uuid while saving accounting
|
2017-04-10 20:59:16 +02:00 |
|
Alexander Werner
|
0a6704b191
|
updated accounting view permission
|
2017-04-10 20:30:27 +02:00 |
|
Alexander Werner
|
0f324b8a17
|
Update permissions and groups
|
2017-04-10 19:38:49 +02:00 |
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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
|
a968e59cf1
|
fixed error if report_user not set
|
2017-03-09 19:50:39 +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 |
|
|
|
9df1ed5b79
|
reformat js block
|
2017-02-25 18:06:27 +01:00 |
|
|
|
ab842b00ed
|
rebuild menue
|
2017-02-24 07:34:00 +01:00 |
|
|
|
e63120549c
|
carom/carom-doc#4
fixes page reload on ie11
|
2017-02-22 17:11:39 +01:00 |
|
|
|
11ff3b02fd
|
add migration
|
2017-02-22 10:23:57 +01:00 |
|
|
|
58252c830b
|
reformat ajax logic only refresh desk area
|
2017-02-21 08:10:00 +01:00 |
|
Alexander Werner
|
b100c15a82
|
Ajaxify views
|
2017-02-20 19:13:03 +01:00 |
|
|
|
61ff97a8b2
|
fix typo
|
2017-02-20 18:49:55 +01:00 |
|
|
|
ad46d883a0
|
show username
|
2017-02-17 19:08:43 +01:00 |
|
|
|
b46bd28ad6
|
modify ld processing
|
2017-02-17 18:56:40 +01:00 |
|
|
|
1ecb96f520
|
fix ld management
|
2017-02-17 18:49:19 +01:00 |
|
|
|
cff748ccbe
|
link to admin page
|
2017-02-17 18:38:47 +01:00 |
|
|
|
e16169c4ed
|
Only show Location-Selector if locations > 1
|
2017-02-17 18:30:28 +01:00 |
|
|
|
97489af723
|
fix error in ceck data
|
2017-02-11 20:10:24 +01:00 |
|
|
|
e84b2f54a9
|
reenable request processor
|
2017-02-11 18:59:42 +01:00 |
|
|
|
0b1c7675f0
|
check for duplicated desk_no
|
2017-02-11 18:36:32 +01:00 |
|
|
|
e74fc9d626
|
send emails while errors
|
2017-02-11 11:31:27 +01:00 |
|
|
|
4276ee76be
|
fix select
|
2017-02-11 11:00:14 +01:00 |
|
|
|
2f14ecce7e
|
clean up code
|
2017-02-11 10:53:46 +01:00 |
|
|
|
0f6805ea4e
|
clean up code
|
2017-02-11 10:36:38 +01:00 |
|
|
|
3a49658f21
|
modify accounting model
|
2017-02-11 10:34:30 +01:00 |
|
|
|
a8b9e7e61e
|
modify accounting model
|
2017-02-11 10:23:03 +01:00 |
|
|
|
9f6477e5f1
|
rename field
|
2017-02-10 21:23:14 +01:00 |
|
|
|
c8c25714f0
|
update tasks
|
2017-02-10 21:18:12 +01:00 |
|
|
|
263bff6540
|
rename table_no to desk_no
|
2017-02-10 20:49:38 +01:00 |
|
|
|
d516d830b6
|
usage of timezone
|
2017-02-10 20:35:19 +01:00 |
|
|
|
93028156b7
|
rename table_no to desk_no
|
2017-02-10 19:55:50 +01:00 |
|
|
|
55cdfc0509
|
update template using new desk model
|
2017-02-10 19:53:11 +01:00 |
|
|
|
7b76fdc62c
|
rebuild database structure, do single desk models
|
2017-02-10 18:37:36 +01:00 |
|
|
|
25808f4c5a
|
fix select accountings
|
2017-02-09 20:51:09 +01:00 |
|
|
|
8dac06a050
|
align text
|
2017-02-09 20:10:21 +01:00 |
|
|
|
3c500baf99
|
fix accounting
|
2017-02-06 21:34:42 +01:00 |
|
|
|
24a8099b83
|
fix queue management
|
2017-02-06 21:25:45 +01:00 |
|
|
|
528e4647f3
|
make migration
|
2017-02-06 20:32:37 +01:00 |
|
Alexander Werner
|
6c01986a89
|
error_msg -> textfield
|
2017-02-06 20:29:35 +01:00 |
|
Alexander Werner
|
46c9cdb2d5
|
Merge branch 'develop' of git.einsle.de:carom/carom-server into develop
Conflicts:
billard/models.py
|
2017-02-06 20:28:26 +01:00 |
|
Alexander Werner
|
d0e5b90946
|
fixed typo in models
|
2017-02-06 20:27:11 +01:00 |
|
|
|
e66d729b62
|
add tzinfo for calculating
|
2017-02-06 20:15:15 +01:00 |
|
|
|
dae777892b
|
add locationdata process logic
|
2017-02-06 20:15:15 +01:00 |
|
|
|
3a48ac9c6b
|
update celery call
|
2017-02-06 20:14:34 +01:00 |
|
|
|
288abf1ad0
|
add celery stuff
|
2017-02-06 20:13:08 +01:00 |
|
Alexander Werner
|
567d6007fe
|
Added metadata to models
|
2017-02-06 19:19:28 +01:00 |
|
|
|
aebcc9af76
|
cleanup
|
2017-02-05 19:20:48 +01:00 |
|
|
|
ab9569a2b6
|
fix docstring
|
2017-02-05 17:18:37 +01:00 |
|
