1115 Commits

Author SHA1 Message Date
Marion Muszynski
5f28f49b51 modification reason,instruction and comment 2017-06-23 12:24:55 +02:00
Marion Muszynski
2b858963a3 add comment 2017-06-23 10:11:06 +02:00
Marion Muszynski
4572379dfc fix multi paiement and css 2017-06-22 16:53:29 +02:00
Marion Muszynski
9f25935902 Merge branch 'ticket-13389-3Dsecure' 2017-06-22 15:15:04 +02:00
Marion Muszynski
d3e5dc18d0 test 2017-06-21 16:47:43 +02:00
Marion Muszynski
a3dc8fa981 add 3Dsecure 2017-06-21 16:37:50 +02:00
Marion Muszynski
03c6b2c8bd modif 2017-06-21 15:54:34 +02:00
Marion Muszynski
805d225840 ergo changement and cleaning cron 2017-06-21 14:44:10 +02:00
Marion Muszynski
12e744b313 Merge branch 'ticket-9103-UrlMetaCategory' 2017-06-20 09:51:32 +02:00
Marion Muszynski
fec2e5ba19 remove add buttom 2017-06-19 12:18:25 +02:00
Marion Muszynski
86f576af74 remove philea part 2017-06-16 14:52:50 +02:00
Marion Muszynski
45d7d61848 add philea and futur MR expe to logistic stats 2017-06-16 14:20:34 +02:00
Marion Muszynski
b02d84d2f7 optimization query categories 2017-06-16 11:09:15 +02:00
Marion Muszynski
27b1222817 add mutiple invoice generation for one csv 2017-06-16 10:59:02 +02:00
Marion Muszynski
6bdea321da fix footer 2017-06-15 16:42:13 +02:00
Marion Muszynski
62e0b6a8f1 upgrade adminlog for bdc 2017-06-14 17:03:25 +02:00
Marion Muszynski
904f9865e7 fix price tax on product page add to cart box 2017-06-14 10:58:27 +02:00
Marion Muszynski
660c2c51be change discount conditions 2017-06-13 16:12:10 +02:00
Marion Muszynski
3a33250608 translate link rewrite category/product 2017-06-12 14:41:59 +02:00
Marion Muszynski
5f4f10355e Merge branch 'ticket-13222-PhileaStock' 2017-06-12 12:15:35 +02:00
Marion Muszynski
eba11aa018 fix script to expected stock and add report view to adminPhilea 2017-06-12 12:15:15 +02:00
Marion Muszynski
dd909798c3 Merge branch 'ticket-13222-PhileaStock' 2017-06-12 10:31:23 +02:00
Marion Muszynski
765f5195dd received CRR 2017-06-12 10:30:57 +02:00
Marion Muszynski
15edfc59ec fix inte 2017-06-09 10:43:57 +02:00
Marion Muszynski
234769d2bf fix refund query for paypal 2017-06-09 10:16:53 +02:00
Marion Muszynski
1c1acd47f6 fix refund array 2017-06-08 17:14:44 +02:00
Marion Muszynski
c33ade1b1c addition of refund description 2017-06-08 17:07:36 +02:00
Marion Muszynski
b954a729a4 addition of return comment 2017-06-08 16:05:19 +02:00
Marion Muszynski
35bcc57509 upload fr img for es when only fr sale bg is loaded 2017-06-08 11:51:34 +02:00
Marion Muszynski
0fc01207fc Merge branch 'ticket-13166-ReturnProcess' 2017-06-07 15:30:50 +02:00
Marion Muszynski
98ddbdd50f add possibility to resend all order products 2017-06-07 15:30:36 +02:00
Marion Muszynski
3f19e5c5cd Merge branch 'ticket-13166-ReturnProcess' 2017-06-07 15:07:34 +02:00
Marion Muszynski
bed6683539 fix and add shipping number list in order 2017-06-07 15:07:19 +02:00
Marion Muszynski
6b8b75c74d Merge branch 'ticket-13166-ReturnProcess' 2017-06-07 12:01:34 +02:00
Marion Muszynski
e5266e5bbf fix missing functions and color return product 2017-06-07 12:01:15 +02:00
Marion Muszynski
1646e22344 addition of script for expected stock 2017-06-07 10:21:15 +02:00
Marion Muszynski
b9e1f91c85 Merge branch 'ticket-13166-ReturnProcess' 2017-06-06 12:19:54 +02:00
Marion Muszynski
06054727e0 reverse order of returns 2017-06-06 12:19:05 +02:00
Marion Muszynski
c5f4008314 Merge branch 'ticket-13166-ReturnProcess' 2017-06-06 12:00:59 +02:00
Marion Muszynski
be7863e514 fix instructions and reasons 2017-06-06 11:57:55 +02:00
Marion Muszynski
043cfee852 fix cookie close bug on mobile 2017-06-02 15:19:06 +02:00
Marion Muszynski
3d6388f298 fixes 2017-06-02 11:20:27 +02:00
Marion Muszynski
efa31b77fa fix 2017-06-02 11:16:25 +02:00
Marion Muszynski
ec41497ea4 ended return after resending 2017-06-02 11:14:25 +02:00
Marion Muszynski
d97e11d79c change logo and fix colissimo choice in carrier step 2017-06-01 12:26:41 +02:00
Marion Muszynski
b615e9eadb addition of order return history 2017-05-31 16:58:27 +02:00
Marion Muszynski
66dea81ece addition of label generation to resend parcel 2017-05-29 16:17:54 +02:00
root
f2e1d87de9 fix payment paybox with new error code from prod 2017-05-24 12:04:47 +02:00
Marion Muszynski
36b9b16d8a fix when we want to export by date 2017-05-23 11:32:01 +02:00
Marion Muszynski
9625e2eb9e continuing 2017-05-18 13:02:35 +02:00