Marion Muszynski
|
ce9af872f7
|
Merge branch 'ticket-8251'
|
2016-06-10 14:39:59 +02:00 |
|
Marion Muszynski
|
3c7f40ba5c
|
Merge branch 'ticket-8251' into develop
|
2016-06-10 14:38:03 +02:00 |
|
Marion Muszynski
|
e3bc588287
|
update function expe48hbis
|
2016-06-10 14:37:34 +02:00 |
|
Marion Muszynski
|
b276ca2f68
|
Merge branch 'ticket-8251'
|
2016-06-10 12:24:33 +02:00 |
|
Marion Muszynski
|
1386f8460f
|
modif for prod
|
2016-06-10 12:19:45 +02:00 |
|
Marion Muszynski
|
bafeacf546
|
Merge branch 'ticket-9875'
|
2016-06-10 11:55:33 +02:00 |
|
Marion Muszynski
|
40ab87cd45
|
update request deb expe
|
2016-06-10 11:55:09 +02:00 |
|
Marion Muszynski
|
9b9e586d0f
|
Merge branch 'ticket-8251' into develop
|
2016-06-10 11:42:32 +02:00 |
|
Marion Muszynski
|
389356d129
|
suite update
|
2016-06-10 11:41:50 +02:00 |
|
Marion Muszynski
|
2d776eae51
|
Merge branch 'ticket-9875'
|
2016-06-10 10:22:49 +02:00 |
|
Marion Muszynski
|
182a608e3b
|
little update in request
|
2016-06-10 10:22:26 +02:00 |
|
Marion Muszynski
|
c48154134d
|
Merge branch 'ticket-6355' into develop
|
2016-06-09 12:44:16 +02:00 |
|
Marion Muszynski
|
b49366dde2
|
ajout du wholesale_price dans import decli
|
2016-06-09 12:43:52 +02:00 |
|
Marion Muszynski
|
62a5f4cc32
|
Merge branch 'tiket-productTemplate' into develop
|
2016-06-09 11:49:55 +02:00 |
|
Marion Muszynski
|
7945d0c0ad
|
modif for ecotax style
|
2016-06-09 11:49:33 +02:00 |
|
Marion Muszynski
|
dbe607dccc
|
modif invoices for multi expe48h
|
2016-06-09 10:31:52 +02:00 |
|
Marion Muszynski
|
2611a2e1ca
|
Merge branch 'ticket-10169'
|
2016-06-08 17:46:27 +02:00 |
|
Marion Muszynski
|
650473ff85
|
Merge branch 'ticket-10169' into develop
|
2016-06-08 17:44:41 +02:00 |
|
Marion Muszynski
|
1615e9a452
|
adding fields in sale exports
|
2016-06-08 17:44:21 +02:00 |
|
Marion Muszynski
|
cf10bd3be0
|
fix conflicts
|
2016-06-08 17:15:28 +02:00 |
|
Marion Muszynski
|
77023fdbcb
|
invoice for multi 48h
|
2016-06-08 16:56:43 +02:00 |
|
Marion Muszynski
|
ba706ec6c9
|
Merge branch 'ticket-fidelite'
|
2016-06-08 16:33:40 +02:00 |
|
Marion Muszynski
|
1b2020f041
|
Merge branch 'ticket-fidelite' into develop
|
2016-06-08 16:28:25 +02:00 |
|
Marion Muszynski
|
d47310bc0a
|
redirect for es version
|
2016-06-08 16:27:56 +02:00 |
|
Marion Muszynski
|
0fcd71ee7d
|
Merge branch 'tiket-productTemplate' into develop
|
2016-06-08 14:29:52 +02:00 |
|
Marion Muszynski
|
2b2ae3fa8a
|
modif zoomdiv
|
2016-06-08 14:29:19 +02:00 |
|
Marion Muszynski
|
ab21f10643
|
Merge branch 'ticket-fidelite'
|
2016-06-08 12:53:58 +02:00 |
|
Marion Muszynski
|
dc85f8eca6
|
modif trad
|
2016-06-08 12:53:38 +02:00 |
|
Marion Muszynski
|
60996f7bcf
|
Merge branch 'ticket-fidelite'
|
2016-06-08 12:26:28 +02:00 |
|
Marion Muszynski
|
eafb801028
|
Merge branch 'ticket-fidelite' into develop
|
2016-06-08 12:25:26 +02:00 |
|
Marion Muszynski
|
c0836540bc
|
delete some stuff about categories
|
2016-06-08 12:25:05 +02:00 |
|
Marion Muszynski
|
5c8e35adf2
|
Merge branch 'ticket-fidelite'
|
2016-06-08 12:16:37 +02:00 |
|
Marion Muszynski
|
f01b450dc3
|
Merge branch 'ticket-fidelite' into develop
|
2016-06-08 12:15:18 +02:00 |
|
Marion Muszynski
|
e7ce0ecb86
|
opti request suite
|
2016-06-08 12:14:54 +02:00 |
|
Marion Muszynski
|
775276a367
|
Merge branch 'ticket-fidelite' into develop
|
2016-06-08 12:02:38 +02:00 |
|
Marion Muszynski
|
e9300ff725
|
opti request 2
|
2016-06-08 12:02:16 +02:00 |
|
Marion Muszynski
|
8fc47d1d6e
|
Merge branch 'ticket-fidelite' into develop
|
2016-06-08 11:44:35 +02:00 |
|
Marion Muszynski
|
83c4acc83d
|
opti request
|
2016-06-08 11:44:13 +02:00 |
|
Marion Muszynski
|
30b39b5776
|
fix conflicts
|
2016-06-08 10:53:07 +02:00 |
|
Marion Muszynski
|
f92562ca53
|
Merge branch 'ticket-fidelite' into develop
|
2016-06-08 10:38:22 +02:00 |
|
Marion Muszynski
|
b9f7b26a59
|
modif css shopping cart
|
2016-06-08 10:37:37 +02:00 |
|
Marion Muszynski
|
6196489224
|
Merge branch 'ticket-8041'
|
2016-06-07 17:47:45 +02:00 |
|
Marion Muszynski
|
4148656a60
|
Merge branch 'ticket-8041' into develop
|
2016-06-07 17:43:19 +02:00 |
|
Marion Muszynski
|
563896bbcb
|
rename import done
|
2016-06-07 17:42:59 +02:00 |
|
Marion Muszynski
|
577249435f
|
Merge branch 'ticket-10122'
|
2016-06-07 17:00:06 +02:00 |
|
Marion Muszynski
|
a49e70ff08
|
Merge branch 'ticket-10122' into develop
|
2016-06-07 16:40:41 +02:00 |
|
Marion Muszynski
|
5f21c6d3b2
|
update braderie
|
2016-06-07 16:40:19 +02:00 |
|
Srv Bebeboutik
|
3ba607554c
|
modif end sale
|
2016-06-07 16:02:16 +02:00 |
|
Srv Bebeboutik
|
f96c85f584
|
trad
|
2016-06-07 16:01:57 +02:00 |
|
Marion Muszynski
|
1c2c54f808
|
fix conflict
|
2016-06-07 14:51:10 +02:00 |
|