Commit Graph

1823 Commits

Author SHA1 Message Date
Skia
cc2caf4ba1 Merge branch 'CR' into 'master'
Add CR 01.05

See merge request !43
2017-01-08 15:01:36 +01:00
guillaume-renaud
6f88d0cf8c Translations update 2017-01-08 11:46:25 +01:00
41b5be1fba Add CR 01.05 2017-01-07 17:39:47 +01:00
4a5d789d9f partners banner added 2017-01-07 17:39:21 +01:00
guillaume-renaud
539faccab2 Update shopping list history (ShoppingListItem creation) 2017-01-07 11:17:06 +01:00
Skia
d400995e9d Update setup command to ease development 2017-01-07 10:36:54 +01:00
Skia
70aaf0b1c6 Merge branch 'CR' into 'master'
add CR

See merge request !42
2017-01-05 19:55:20 +01:00
83938a69dd add CR 2017-01-05 19:44:11 +01:00
Skia
57bb072008 Merge branch 'Tresorerie' into 'master'
Add benefit on sellings view

See merge request !41
2017-01-05 18:05:32 +01:00
2c71c18d1b --amend 2017-01-05 18:02:02 +01:00
86e3c09bae Add benefit on sellings view 2017-01-05 15:48:06 +01:00
guillaume-renaud
62200827c2 Finish back up app Stock 2017-01-05 11:24:54 +01:00
guillaume-renaud
fa97929da8 Some classes defined twice -- correction 2017-01-05 11:24:26 +01:00
guillaume-renaud
8f88f7cb70 Take item from stock form addition 2017-01-05 11:16:25 +01:00
guillaume-renaud
2f721592f1 Update stock items quantity after shopping 2017-01-05 11:15:45 +01:00
guillaume-renaud
0660ea5e64 MAJ translations ; stock acces addition in user tool 2017-01-05 11:15:04 +01:00
guillaume-renaud
21c05cc779 Addition of the ShoppingList view to know the item to buy 2017-01-05 11:14:41 +01:00
guillaume-renaud
75af525945 Addition of the StockItem class
addition of Stock app, model, templates, urls

Addition of the stock parameter to the counter admin list

Fix translation files

Creation of the Stock list, edit, create views and creation StockItem create view

Stock application creation

Addition of the StockItem class

addition of Stock app, model, templates, urls

Addition of the stock parameter to the counter admin list

Fix translation files

Creation of the Stock list, edit, create views and creation StockItem create view

Initial StockItem create form value addition

general modifications

Stock admin gestion, items list views, create and edit items

remove stock_main.jinja

Stock application creation

Addition of the StockItem class

addition of Stock app, model, templates, urls

Addition of the stock parameter to the counter admin list

Fix translation files

Creation of the Stock list, edit, create views and creation StockItem create view

Addition of the StockItem class

addition of Stock app, model, templates, urls

Addition of the stock parameter to the counter admin list

Fix translation files

Creation of the Stock list, edit, create views and creation StockItem create view

Initial StockItem create form value addition

general modifications

Stock admin gestion, items list views, create and edit items

Shopping list structure view addition

correct missing endif

a

correct missing endif

Stock application creation

addition of Stock app, model, templates, urls

Addition of the stock parameter to the counter admin list

Fix translation files

Creation of the Stock list, edit, create views and creation StockItem create view

Stock application creation

addition of Stock app, model, templates, urls

Fix translation files

Creation of the Stock list, edit, create views and creation StockItem create view

Initial StockItem create form value addition

general modifications

Stock admin gestion, items list views, create and edit items

remove stock_main.jinja

Stock application creation

addition of Stock app, model, templates, urls

Addition of the stock parameter to the counter admin list

Fix translation files

Creation of the Stock list, edit, create views and creation StockItem create view

Fix translation files

Creation of the Stock list, edit, create views and creation StockItem create view

Initial StockItem create form value addition

general modifications

Shopping list structure view addition

correct missing endif
2017-01-05 11:07:34 +01:00
guillaume-renaud
c6310c5315 correct missing endif 2017-01-05 11:07:05 +01:00
guillaume-renaud
5b2f126eee Shopping list structure view addition 2017-01-05 11:06:55 +01:00
guillaume-renaud
9d8264bcbb remove stock_main.jinja 2017-01-05 11:04:58 +01:00
guillaume-renaud
6c54b246ca Stock admin gestion, items list views, create and edit items 2017-01-05 11:04:12 +01:00
guillaume-renaud
5cb75ec3eb general modifications 2017-01-05 11:02:21 +01:00
guillaume-renaud
587ad96326 Initial StockItem create form value addition 2017-01-05 11:00:09 +01:00
guillaume-renaud
887893fb2d Creation of the Stock list, edit, create views and creation StockItem create view 2017-01-05 11:00:08 +01:00
guillaume-renaud
ccb339b9bd Fix translation files 2017-01-05 11:00:08 +01:00
guillaume-renaud
29fb0af893 Addition of the stock parameter to the counter admin list 2017-01-05 11:00:08 +01:00
guillaume-renaud
33c7e7db9f addition of Stock app, model, templates, urls 2017-01-05 11:00:08 +01:00
guillaume-renaud
fdfd7e7388 Addition of the StockItem class 2017-01-05 11:00:08 +01:00
guillaume-renaud
402a14d69a Stock application creation 2017-01-05 11:00:08 +01:00
Skia
a90a553939 Some fixes on SAS upload form 2017-01-05 10:05:27 +01:00
Skia
72685618a6 Many right fix on counters 2017-01-04 19:39:37 +01:00
Skia
114272df2f Add simple club stats 2017-01-04 17:38:54 +01:00
Skia
c48449cd50 Add barman stats 2017-01-04 17:38:09 +01:00
Skia
dcd0c1fe75 Allow more than one bar if someone can connect to the counter 2017-01-04 16:14:17 +01:00
Skia
52a0913993 Tiny fix in the counter 2017-01-03 16:42:45 +01:00
Skia
b347b87433 Many typo fixes and some updates in the TW report 2017-01-02 16:46:46 +01:00
Skia
0a9eb2fd33 Fix club tests 2016-12-29 01:30:37 +01:00
Skia
fbb41c3cd5 Improve UX for accounting linked operation 2016-12-29 01:08:08 +01:00
Skia
17b4e24aaa Small club update 2016-12-29 00:42:26 +01:00
2f2d5292de Some permissions fixs and security for atomic vote 2016-12-26 23:30:13 +01:00
Skia
729659e358 Don't ignore */static 2016-12-26 01:59:54 +01:00
Skia
c6422fdd30 Add SYNTAX.md 2016-12-26 01:42:45 +01:00
Skia
1dd28672b0 Add Markdown test to populate 2016-12-26 01:36:07 +01:00
Skia
f77856852d Working file:// link 2016-12-26 01:34:44 +01:00
Skia
323b946e1f First dfile:// parsing, not working into links, need to investigate 2016-12-26 01:34:44 +01:00
Skia
15e52d1ae8 Reset election migrations 2016-12-26 00:56:22 +01:00
Skia
78e00c3bd4 Merge branch 'Elections' into 'master'
Election app

See merge request !27
2016-12-26 00:45:40 +01:00
3609952db5 Some translation fixs 2016-12-26 00:37:32 +01:00
Skia
bf4d0693c6 Reformat templates to fit with the rest of the Sith 2016-12-26 00:10:41 +01:00