1552 Commits

Author SHA1 Message Date
Marion Muszynski
08a2023fb8 addition of new export 2016-12-08 10:34:49 +01:00
Marion Muszynski
662e11149f Merge branch 'ticket-11988-backgroundVPLogo' 2016-12-07 15:39:18 +01:00
Marion Muszynski
ee8cd5807a remove background of vp logo in product tpl 2016-12-07 15:39:03 +01:00
Marion Muszynski
7cb36d6b0d changement for pack gestion 2016-12-07 14:29:33 +01:00
Marion Muszynski
3b3dd2647c link changement 2016-12-07 10:40:01 +01:00
Marion Muszynski
0a9afab232 pack gestion at expedition reception 2016-12-07 10:36:03 +01:00
Marion Muszynski
1a60d5e59e Merge branch 'ticket-10657-PhileaLogBlocant' 2016-12-06 16:11:25 +01:00
Marion Muszynski
ef4a76b327 log with mail sending 2016-12-06 16:11:12 +01:00
Marion Muszynski
58776438d1 continuing 2016-12-06 15:45:47 +01:00
Marion Muszynski
8db1dda6fb Merge branch 'ticket-11957-removePersonalData' 2016-12-06 12:10:35 +01:00
Marion Muszynski
655a7515d7 remove other personal datas 2016-12-06 12:07:23 +01:00
Marion Muszynski
a509d4f0ab remove personal data in ga module 2016-12-06 11:53:34 +01:00
Marion Muszynski
22d5994ee4 remove console log 2016-12-06 11:48:56 +01:00
Marion Muszynski
82fdce66ce remove personal data from url before sending to GA 2016-12-06 11:22:25 +01:00
Marion Muszynski
5bd20c72d3 continuing 2016-12-06 10:07:54 +01:00
Marion Muszynski
12ae666cb9 addition of sale reduction in image title 2016-12-05 10:56:55 +01:00
Marion Muszynski
8df93121a8 continuing pack management 2016-12-05 10:13:27 +01:00
Marion Muszynski
1f8b74264a Merge branch 'ticket-11935-SuiviConversation' 2016-12-02 16:31:48 +01:00
Marion Muszynski
2b5fbe4bb7 fix link for es 2016-12-02 16:26:34 +01:00
Marion Muszynski
966d6fa2d2 if statement according the id_contact 2016-12-02 16:18:19 +01:00
Marion Muszynski
7ce5c6905c adjust link reply 2016-12-02 16:12:31 +01:00
Marion Muszynski
4b10e0f6e4 change reply link 2016-12-02 16:00:14 +01:00
Marion Muszynski
192cd79a6b continuing packs 2016-12-02 15:34:57 +01:00
Marion Muszynski
19158cc3f5 Merge branch 'ticket-11933-bugSaleCombination' 2016-12-02 12:07:06 +01:00
Marion Muszynski
6964d4fb69 fix 2016-12-02 12:06:52 +01:00
Marion Muszynski
54fbe60f8e Merge branch 'fix-updateStateWhenOrderManuallyValidation' 2016-12-02 10:49:16 +01:00
Marion Muszynski
3393afc1a9 fix to update current state when an order is manually validated 2016-12-02 10:37:09 +01:00
Marion Muszynski
ed6002b84b gift management 2016-12-02 10:15:51 +01:00
Marion Muszynski
2cc1997ce1 Merge branch 'fix-fatal-braderieCode' 2016-11-30 17:57:13 +01:00
Marion Muszynski
49801ef6e5 turn 500 code to 404 2016-11-30 17:57:00 +01:00
Marion Muszynski
b249fc5905 Merge branch 'ticket-11902-AddTagManager' 2016-11-30 14:48:05 +01:00
Marion Muszynski
d3564a0a5e addition of goggle tag manager code 2016-11-30 14:15:48 +01:00
Marion Muszynski
5da84d6aa3 Merge branch 'fix-fatal-ajax_product_list' 2016-11-30 12:58:42 +01:00
Marion Muszynski
98a00dc459 fix on deletion 2016-11-30 12:58:26 +01:00
Marion Muszynski
770c917cb5 Merge branch 'fix-fatal-ajax_product_list' 2016-11-30 12:55:07 +01:00
Marion Muszynski
284aeb5903 fix img 2016-11-30 12:53:19 +01:00
Marion Muszynski
2ac3271169 ajusting autocomplete ajax_product search 2016-11-30 12:40:27 +01:00
Marion Muszynski
a8045cfefa Merge branch 'ticket-10657-PhileaMulti' 2016-11-30 11:38:34 +01:00
Marion Muszynski
807bd6d30e add log mail 2016-11-30 11:38:16 +01:00
Marion Muszynski
5f30b92b59 send all the products of multi order in one time 2016-11-30 11:35:55 +01:00
Marion Muszynski
80e4f47026 Merge branch 'ticket-10657-PhileaFixStatusCMD' 2016-11-30 10:55:13 +01:00
Marion Muszynski
56ee44f425 fix selected orders according status 2016-11-30 10:55:00 +01:00
Marion Muszynski
a7ef41d688 Merge branch 'fix-fatal-braderie' 2016-11-29 16:25:28 +01:00
Marion Muszynski
8427307701 fix fatal toold for tools 2016-11-29 16:25:14 +01:00
Marion Muszynski
0dc8db8d58 addition of packs 2016-11-28 17:07:43 +01:00
Marion Muszynski
71532fef30 adjusting img 2016-11-28 15:24:27 +01:00
Marion Muszynski
e8df7cedba update to load es img with fr img 2016-11-28 14:34:52 +01:00
Marion Muszynski
47b4df918f modif xml for rss changement 2016-11-28 14:10:04 +01:00
Marion Muszynski
6cadb48ed7 Merge branch 'ticket-11784-QtyInShoppingCart' 2016-11-28 12:04:17 +01:00
Marion Muszynski
51e0ed8589 fix bug update product quantity in cart 2016-11-28 12:02:39 +01:00