|
|
201c347fcc
|
Merge branch 'feature/#3_accounting_dialog' into develop
# Conflicts:
# billard/models.py
# billard/views.py
|
2017-03-09 20:52:12 +01:00 |
|
Alexander Werner
|
3141944ff3
|
updated code for shared_tasks
|
2017-03-09 20:26:03 +01:00 |
|
Alexander Werner
|
d2932d834a
|
updated code for shared_tasks
|
2017-03-09 20:08:35 +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 |
|
|
|
e22a153201
|
fix processingo of ld objects
|
2017-02-26 12:03:18 +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 |
|
|
|
61ff97a8b2
|
fix typo
|
2017-02-20 18:49:55 +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 |
|
|
|
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 |
|
|
|
e74fc9d626
|
send emails while errors
|
2017-02-11 11:31:27 +01:00 |
|
|
|
4276ee76be
|
fix select
|
2017-02-11 11:00:14 +01:00 |
|
|
|
a8b9e7e61e
|
modify accounting model
|
2017-02-11 10:23:03 +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 |
|
|
|
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 |
|
|
|
3c500baf99
|
fix accounting
|
2017-02-06 21:34:42 +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 |
|
Alexander Werner
|
567d6007fe
|
Added metadata to models
|
2017-02-06 19:19:28 +01:00 |
|
|
|
e63f8b7562
|
Calculate prize of rental
|
2017-02-05 17:07:42 +01:00 |
|
|
|
bede78cf84
|
fix toString
|
2017-02-04 12:39:28 +01:00 |
|
|
|
1a2eb98d20
|
fix accounting model
|
2017-02-04 11:31:48 +01:00 |
|
|
|
02bb974a92
|
update accounting model
|
2017-02-04 11:18:35 +01:00 |
|
|
|
db051986a2
|
update location model
|
2017-02-04 06:51:09 +01:00 |
|
|
|
e0c090dad9
|
fix access to accounting data
|
2017-02-02 20:43:32 +01:00 |
|
|
|
16243def6d
|
show accounting data from table
|
2017-02-01 20:25:33 +01:00 |
|
|
|
48a912f04b
|
update data model
|
2017-02-01 17:52:16 +01:00 |
|
|
|
616fd63bfc
|
update data model
|
2017-02-01 13:52:30 +01:00 |
|
|
|
aca77949b0
|
remove unused parameters
|
2017-01-09 18:40:36 +01:00 |
|
|
|
6610c3b48e
|
Extend LD Model
|
2017-01-09 15:37:25 +01:00 |
|
|
|
7bfaefa41f
|
fix location Data
|
2017-01-06 20:24:36 +01:00 |
|
|
|
aa722fdc9c
|
add locationdata to admin, fix location data model
|
2017-01-06 20:16:21 +01:00 |
|
|
|
ca721ed8b8
|
add location data object
|
2017-01-06 19:11:29 +01:00 |
|
|
|
e1c94100fb
|
update models
|
2017-01-06 18:53:26 +01:00 |
|
