Marion Muszynski
|
d3e9c70bd8
|
Merge branch 'ticket-13532-ProductDisable' into develop
|
2017-06-20 10:09:22 +02:00 |
|
Marion Muszynski
|
1f971275a0
|
multiple disable/enable product
|
2017-06-20 10:09:07 +02:00 |
|
Marion Muszynski
|
d1e71015d5
|
Merge branch 'ticket-13532-ProductDisable' into develop
|
2017-06-19 17:48:53 +02:00 |
|
Marion Muszynski
|
15e76afb93
|
multi disable/enable product
|
2017-06-19 17:48:38 +02:00 |
|
Marion Muszynski
|
3b2bf29f7f
|
Merge branch 'ticket-13516-removeCategoryAddButton'
|
2017-06-19 12:21:28 +02:00 |
|
Marion Muszynski
|
5e88037ef6
|
Merge branch 'ticket-13516-removeCategoryAddButton' into develop
|
2017-06-19 12:18:42 +02:00 |
|
Marion Muszynski
|
fec2e5ba19
|
remove add buttom
|
2017-06-19 12:18:25 +02:00 |
|
Marion Muszynski
|
6d09c9ca30
|
Merge branch 'ticket-13324-pixelFB'
|
2017-06-19 11:06:27 +02:00 |
|
Marion Muszynski
|
77f3034f5f
|
Merge branch 'ticket-13324-pixelFB' into develop
|
2017-06-19 11:06:04 +02:00 |
|
Marion Muszynski
|
86ccf2ef15
|
check if customer already exists to prevent fb tracking resending for registration
|
2017-06-19 11:05:46 +02:00 |
|
Marion Muszynski
|
8d98b4f8e1
|
Merge branch 'ticket11985-invoiceMR' into develop
|
2017-06-16 17:51:35 +02:00 |
|
Marion Muszynski
|
dadf16f8fb
|
separate la poste invoices and mr invoices
|
2017-06-16 17:51:19 +02:00 |
|
Marion Muszynski
|
30fe998858
|
Merge branch 'ticket-11985-statLogMR'
|
2017-06-16 14:53:06 +02:00 |
|
Marion Muszynski
|
86f576af74
|
remove philea part
|
2017-06-16 14:52:50 +02:00 |
|
Marion Muszynski
|
dde433e46a
|
start of changement
|
2017-06-16 14:49:10 +02:00 |
|
Marion Muszynski
|
457f636f6e
|
Merge branch 'ticket-11985-statLogMR'
|
2017-06-16 14:21:20 +02:00 |
|
Marion Muszynski
|
2bee96172e
|
Merge branch 'ticket-11985-statLogMR' into develop
|
2017-06-16 14:20:55 +02:00 |
|
Marion Muszynski
|
45d7d61848
|
add philea and futur MR expe to logistic stats
|
2017-06-16 14:20:34 +02:00 |
|
Marion Muszynski
|
51df5aed18
|
Merge branch 'fix-antConfiguration'
|
2017-06-16 11:09:33 +02:00 |
|
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
|
3f775a0fec
|
Merge branch 'ticket-paypalError' into develop
|
2017-06-15 16:19:42 +02:00 |
|
Marion Muszynski
|
9e79b4dfc4
|
fix error when amount is 0
|
2017-06-15 16:19:26 +02:00 |
|
Marion Muszynski
|
06daeaf29e
|
Merge branch 'ticket-13024-UpdBDC' into develop
|
2017-06-14 17:03:46 +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
|
d11e800d34
|
Merge branch 'ticket-13473-IVAForEs' into develop
|
2017-06-14 11:57:41 +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
|
a4b3b52b27
|
Merge branch 'ticket-13473-IVAForEs' into develop
|
2017-06-14 10:58:42 +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
|
4fb9dc4864
|
Merge branch 'ticket-9103-UrlMetaCategory' into develop
|
2017-06-12 15:30:44 +02:00 |
|
Marion Muszynski
|
645926e5ed
|
fix image legend for es
|
2017-06-12 15:30:27 +02:00 |
|
Marion Muszynski
|
3137429e67
|
Merge branch 'ticket-9103-UrlMetaCategory' into develop
|
2017-06-12 14:42:13 +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 |
|