Commit Graph

13 Commits

Author SHA1 Message Date
Etienne Roudeix
ddd8c4f7a5 fix auth loop 2013-10-22 15:57:31 +02:00
Etienne Roudeix
b00f70fa24 permission management 2013-10-22 11:09:24 +02:00
Etienne Roudeix
f564db2a8b WIP : admin profiles 2013-10-21 11:44:33 +02:00
Manuel Raynaud
d6e26e428e Merge branch 'master' into frontend
Conflicts:
	core/lib/Thelia/Core/Template/Smarty/Plugins/Form.php
	templates/admin/default/tax-rule-edit.html
	templates/admin/default/taxes-rules.html
2013-10-18 16:41:39 +02:00
Etienne Roudeix
dc2de702e8 tax rule set default in back office 2013-10-17 15:31:09 +02:00
touffies
ca1587c6e7 Merge with Master 2013-10-15 11:05:05 +02:00
Etienne Roudeix
085c2fa75c taxes management 2013-10-14 17:28:31 +02:00
Etienne Roudeix
c84e451a12 tax rule creation 2013-10-11 13:51:30 +02:00
Etienne Roudeix
0f6951bc21 tax rule update and delation 2013-10-08 16:02:58 +02:00
Etienne Roudeix
942638281a tax edition 2013-10-07 17:18:38 +02:00
Etienne Roudeix
fe3aea4ab7 tax types 2013-10-07 11:57:43 +02:00
Etienne Roudeix
4a0403040c add tax files 2013-10-07 10:46:12 +02:00
mespeche
b0a357d222 Setting Taxes rules management default view 2013-09-24 13:12:52 +02:00