2246 Commits

Author SHA1 Message Date
Marion Muszynski
b02d84d2f7 optimization query categories 2017-06-16 11:09:15 +02:00
Marion Muszynski
945fdf6649 Merge branch 'ticket-ManyOrderPdf' 2017-06-16 10:59:19 +02:00
Marion Muszynski
27b1222817 add mutiple invoice generation for one csv 2017-06-16 10:59:02 +02:00
Marion Muszynski
59e7118dc7 Merge branch 'ticket-13024-UpdBDC' 2017-06-15 16:42:28 +02:00
Marion Muszynski
6bdea321da fix footer 2017-06-15 16:42:13 +02:00
Marion Muszynski
e75b5c16ba Merge branch 'ticket-13024-UpdBDC' 2017-06-15 16:20:37 +02:00
Marion Muszynski
62e0b6a8f1 upgrade adminlog for bdc 2017-06-14 17:03:25 +02:00
Marion Muszynski
42951e75b3 Merge branch 'ticket-13473-IVAForEs' 2017-06-14 11:58:09 +02:00
Marion Muszynski
96b66b0eae fix translation 2017-06-14 11:57:18 +02:00
Marion Muszynski
6db1dae04f Merge branch 'ticket-13473-IVAForEs' 2017-06-14 11:03:29 +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
fa50a0093b Merge branch 'ticket-13493-changementDiscount' 2017-06-13 16:12:23 +02:00
Marion Muszynski
660c2c51be change discount conditions 2017-06-13 16:12:10 +02:00
Marion Muszynski
645926e5ed fix image legend for es 2017-06-12 15:30:27 +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
965e3047d7 Merge branch 'ticket-13166-ReturnProcess_2' 2017-06-09 10:44:23 +02:00
Marion Muszynski
15edfc59ec fix inte 2017-06-09 10:43:57 +02:00
Marion Muszynski
466960618f Merge branch 'ticket-13166-ReturnProcess_2' 2017-06-09 10:17:08 +02:00
Marion Muszynski
234769d2bf fix refund query for paypal 2017-06-09 10:16:53 +02:00
Marion Muszynski
344d5938a5 Merge branch 'ticket-13166-ReturnProcess_2' 2017-06-08 17:14:55 +02:00
Marion Muszynski
1c1acd47f6 fix refund array 2017-06-08 17:14:44 +02:00
Marion Muszynski
3224184343 Merge branch 'ticket-13166-ReturnProcess_2' 2017-06-08 17:07:53 +02:00
Marion Muszynski
c33ade1b1c addition of refund description 2017-06-08 17:07:36 +02:00
Marion Muszynski
0ddbca1945 Merge branch 'ticket-13166-ReturnProcess_2' 2017-06-08 16:05:39 +02:00
Marion Muszynski
b954a729a4 addition of return comment 2017-06-08 16:05:19 +02:00
Marion Muszynski
f1f9bfef4b Merge branch 'ticket-9103-TradCategoryscroll' 2017-06-08 15:41:39 +02:00
Marion Muszynski
58aafd79c1 fix trad mobile 2017-06-08 15:41:22 +02:00
Marion Muszynski
a1accd6814 Merge branch 'ticket-9103-TradCategoryscroll' 2017-06-08 13:10:01 +02:00
Marion Muszynski
7d1934296b fix translation module categoryscroll 2017-06-08 13:06:19 +02:00
Marion Muszynski
6d4cf5d1bd fill and translate meta auto 2017-06-08 12:23:30 +02:00
Marion Muszynski
732dde9165 Merge branch 'ticket-9103-saleBg' 2017-06-08 11:52:49 +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
8f83232c06 Merge branch 'ticket-13222-PhileaStock' 2017-06-07 10:21:36 +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
6707cbb33e Merge branch 'fix-cookieMobile' 2017-06-02 15:19:21 +02:00
Marion Muszynski
043cfee852 fix cookie close bug on mobile 2017-06-02 15:19:06 +02:00