825 Commits

Author SHA1 Message Date
Marion Muszynski
4c8f727932 fix 2016-10-20 09:43:37 +02:00
Marion Muszynski
c0110a6618 modif css and fix alert missing quantity in orders 2016-09-30 13:06:24 +02:00
Marion Muszynski
d9fd7547d1 addition of preparation report 2016-09-29 18:08:23 +02:00
Marion Muszynski
4acbb1dcf6 fix recept_expe 2016-09-28 18:11:07 +02:00
Marion Muszynski
b36c40446d addition of CRE and CRP management 2016-09-28 16:56:19 +02:00
Marion Muszynski
16e16d6596 update CRE 2016-09-28 10:41:39 +02:00
Marion Muszynski
fa825f9cc7 modif css 2016-09-19 15:39:50 +02:00
Marion Muszynski
d9b117774d css fix 2016-09-19 15:33:43 +02:00
Marion Muszynski
a51cf6fb55 continuing to add some stuff 2016-09-19 11:58:14 +02:00
Marion Muszynski
e1f82aba03 small fix 2016-09-16 17:33:23 +02:00
Marion Muszynski
4e42740019 message modification 2016-09-16 17:17:41 +02:00
Marion Muszynski
56136b51ec addition of report management 2016-09-16 16:36:16 +02:00
Marion Muszynski
0980058b1d matching ART CDC 2016-09-15 16:29:54 +02:00
Marion Muszynski
50cc5511ac fix about phone number 2016-09-08 12:40:32 +02:00
Marion Muszynski
d839706175 modif code article 2016-09-07 17:42:06 +02:00
Marion Muszynski
a6fc45e479 adjust send_commande 2016-09-07 16:17:03 +02:00
Marion Muszynski
df7b6dbc05 small fix 2016-09-07 15:10:28 +02:00
Marion Muszynski
88b3c10898 fix 2016-09-07 15:03:58 +02:00
Marion Muszynski
0c118717af small addition 2016-09-07 12:03:31 +02:00
Marion Muszynski
f790336c29 big modif 2016-09-07 11:42:38 +02:00
Marion Muszynski
3caeacffae modif send_article according bbb account 2016-09-06 18:05:54 +02:00
Marion Muszynski
01c77b3901 modif send_commande according bbb settings 2016-09-06 16:48:13 +02:00
Marion Muszynski
36180ad403 add remote address and http host in send_article 2016-09-06 15:41:34 +02:00
Marion Muszynski
1df6036d99 addition of philea module and helper class for admin 2016-09-06 15:32:52 +02:00
Marion Muszynski
2d10e1b167 Merge branch 'ticket-9260' 2016-09-05 16:52:19 +02:00
Marion Muszynski
50e0bc4c79 modification to find the right category thumb in productController 2016-09-05 16:22:28 +02:00
Marion Muszynski
17eda01760 modif for children cat 2016-09-05 11:57:43 +02:00
Marion Muszynski
13e85738e6 Merge branch 'ticket-9260' 2016-09-05 10:37:24 +02:00
Marion Muszynski
3d685e10b4 fix addition 2016-09-05 10:24:21 +02:00
Marion Muszynski
84c83241a8 Merge branch 'fix-10796' 2016-09-02 11:29:50 +02:00
Rodney Figaro
d06391d181 fix bug when submitting a product form with no new image added (BO) 2016-09-02 10:49:34 +02:00
Marion Muszynski
b9ff92a5d2 Merge branch 'fix-ticket-10169' 2016-09-01 11:18:36 +02:00
Marion Muszynski
31bb7e145b fix form reprint 2016-09-01 11:17:43 +02:00
Marion Muszynski
8e309f060f Merge branch 'ticket-10169' 2016-08-31 16:26:35 +02:00
Marion Muszynski
ad26e64ad0 fix weight 2016-08-31 16:25:49 +02:00
Marion Muszynski
639b7111e6 Merge branch 'ticket-10169' 2016-08-31 15:58:44 +02:00
Marion Muszynski
5a8d3eb781 small fix 2016-08-31 15:35:09 +02:00
Marion Muszynski
b677946ca7 Merge branch 'ticket-10527' 2016-08-31 15:18:42 +02:00
Marion Muszynski
144733299c up reassurance sentence at first place 2016-08-31 15:17:21 +02:00
Marion Muszynski
bf0681a105 Merge branch 'fix-9890' 2016-08-31 15:05:20 +02:00
Marion Muszynski
6ff4e35f7b fix css 2016-08-31 15:03:11 +02:00
Marion Muszynski
143e2faa72 Merge branch 'ticket-10527' 2016-08-31 14:58:30 +02:00
Marion Muszynski
5c35c6431b fix 2016-08-31 14:56:59 +02:00
Marion Muszynski
abdbb008b5 adding reassurance sentences in payment step 2016-08-31 14:54:30 +02:00
Marion Muszynski
2dd1baef49 adding reassurance sentences for es 2016-08-31 13:32:59 +02:00
Marion Muszynski
0c7aefe613 fix to get sub cat thumb 2016-08-31 12:41:07 +02:00
Marion Muszynski
afde5b69a7 Merge branch 'ticket_9890' 2016-08-31 12:19:57 +02:00
Marion Muszynski
40c9fb6bff fix 2016-08-31 12:18:17 +02:00
root
857c4a6f78 Merge branch 'master' of gitlab.antadis.net:dev-antadis/bebeboutik 2016-08-31 11:56:52 +02:00
Marion Muszynski
11df31d8bd Merge branch 'ticket_9890' 2016-08-31 11:56:22 +02:00