Commit Graph

606 Commits

Author SHA1 Message Date
a0319887c8 Merge branch 'sli' into 'master'
Deny date of birth, first and last name modification for non board or root user



See merge request !16
2016-10-13 23:24:12 +02:00
178a4af196 Add lazy way to make an user property editable once only 2016-10-13 22:58:26 +02:00
579c25d63a Deny date of birth, first and last name modification for non board or root user 2016-10-13 22:32:13 +02:00
5931351c0a Another tiny template improvement 2016-10-12 12:32:04 +02:00
0d8bebcd80 Tiny template update 2016-10-10 18:43:40 +02:00
13265e6a0d Allow more control on the dates for cash summaries sums 2016-10-10 18:29:13 +02:00
31d62532be Merge branch 'sli' into 'master'
Add account number and suscription on counter



See merge request !15
2016-10-09 16:08:48 +02:00
d285fbe04a Add account number and suscription on counter 2016-10-08 23:07:10 +02:00
c66d61ee85 Merge branch 'LoJ' into 'master'
Lo j : Addition of the user's club page

When a user check his profile, he can access a new tab "Clubs" to see his currents and olds Clubs

See merge request !14
2016-10-07 13:36:35 +02:00
5b50cc9598 Traduction's addition for user_clubs templates 2016-10-07 13:17:43 +02:00
760b33728b Addition of the user's club tab as table 2016-10-06 11:08:32 +02:00
1b63d58586 Addition of the user's club tab 2016-10-06 11:08:32 +02:00
0acc97fa90 Fix operation create view 2016-10-05 20:17:37 +02:00
63217b2ead Improve product display 2016-10-05 15:57:04 +02:00
7fdcb0c815 Finish labels in accounting 2016-10-05 15:54:11 +02:00
e169e4ff6f Update .gitlab-ci.yml, try to fix CI 2016-10-04 11:26:20 +02:00
64b4484620 Some templating 2016-10-04 00:41:08 +02:00
deeb2b5b6f Migrate and fix etickets 2016-10-04 00:32:07 +02:00
cd23fdf3ef Add missing eticket banner 2016-10-03 19:43:22 +02:00
d6138a7a0c Make the etickets 2016-10-03 19:30:05 +02:00
a12f9dd53e Fix club sellings 2016-10-03 13:55:20 +02:00
2ef5a4d37b Runtime error fix 2016-09-30 18:43:53 +02:00
ca3b7fda5a Improve invoice call template 2016-09-29 18:34:58 +02:00
51f342a7d3 Add invoices calls 2016-09-29 18:19:58 +02:00
ddceb82abf Display uncategorized products 2016-09-29 16:19:05 +02:00
52184c4012 Merge branch 'sli' into 'master'
Godfathers deletion



See merge request !11
2016-09-29 15:12:19 +02:00
2c6f17063a Can delete Godfathers 2016-09-29 15:06:39 +02:00
db07b54ed1 Allow the counter admin to edit cash registers summaries 2016-09-29 14:54:03 +02:00
c2276dab2b Remove useless mixin 2016-09-29 12:53:09 +02:00
a008f34288 Fix bug where slots appears when slot expired 2016-09-28 17:22:34 +02:00
2e7e78b8ce Add last ops view to the bars 2016-09-28 11:09:54 +02:00
fd482195f8 Merge branch 'sli' into 'master'
AutoCompleteSelectField on clubs



See merge request !10
2016-09-28 10:59:13 +02:00
8ef45bf03c Rename is_token to check_token 2016-09-28 10:53:27 +02:00
1c6df0909b Fixes double check on board member in club view 2016-09-28 10:46:06 +02:00
17b098ca2a Fixed lookup for loged barmen 2016-09-27 22:57:06 +02:00
17b483bd21 AutoCompleteSelectField on clubs 2016-09-27 21:05:57 +02:00
f152791d90 Merge branch 'sli' into 'master'
Only club members can view counter's stats

N'importe qui peut accéder aux tops 100, c'est pas très cool de voir ce que dépensent les autres…

See merge request !9
2016-09-27 20:12:57 +02:00
3c408551aa Remove nested exception for stats and added property on AnonymusUser 2016-09-27 16:56:30 +02:00
f7722ed564 Fixed permissions on stats 2016-09-27 16:44:12 +02:00
f22f2cbde6 Only club members can view counter's stats 2016-09-26 23:56:24 +02:00
303db0bc7d Translation and explicit string 2016-09-26 11:31:45 +02:00
a4ad7f0e85 Add token to counter to see pictures and to prevend misuses 2016-09-26 11:17:56 +02:00
37072e1640 Clean up some useless prints 2016-09-26 11:17:55 +02:00
7a2985b186 Add product top 10 2016-09-26 11:17:55 +02:00
24d744ee9c Merge branch 'krophil' into 'master'
Krophil

Few changes in css

See merge request !7
2016-09-26 09:25:13 +02:00
4749c45c97 Merge branch 'sli' into 'master'
Hided launderette slots and tokens for non authorized users and added is_office and is_launderette



See merge request !8
2016-09-26 09:23:35 +02:00
380f41445a Modify property names 2016-09-22 13:07:22 +02:00
e250acf82d Used settings for office and launderette 2016-09-22 13:00:00 +02:00
ffd4dac2e2 Allow club staff to delete their sellings 2016-09-22 12:52:15 +02:00
ae6a613f9a Add promo_17.png 2016-09-21 15:41:12 +02:00