Marion Muszynski
|
8184784f2e
|
Merge branch 'ticket-13323-AdwordsES' into develop
|
2017-07-26 13:21:38 +02:00 |
|
root
|
e75e1e61bb
|
fix from prod
|
2017-07-25 16:56:59 +02:00 |
|
root
|
9a723dcbc6
|
fix philea from prod
|
2017-07-25 16:54:35 +02:00 |
|
Marion Muszynski
|
a4b3b52b27
|
Merge branch 'ticket-13473-IVAForEs' into develop
|
2017-06-14 10:58:42 +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
|
765f5195dd
|
received CRR
|
2017-06-12 10:30:57 +02:00 |
|
Marion Muszynski
|
d313207099
|
Merge branch 'ticket-9103-saleBg' into develop
|
2017-06-08 11:51:50 +02:00 |
|
Marion Muszynski
|
1646e22344
|
addition of script for expected stock
|
2017-06-07 10:21:15 +02:00 |
|
Marion Muszynski
|
eeac92d0ef
|
fix conflicts
|
2017-02-07 16:35:59 +01:00 |
|
Marion Muszynski
|
5fa1fa042c
|
Merge branch 'evo-philea-Destock'
|
2017-02-06 10:19:22 +01:00 |
|
Marion Muszynski
|
f94a974cb1
|
updating categories search in step 3
|
2017-02-06 10:19:06 +01:00 |
|
Marion Muszynski
|
0817b85066
|
Merge branch 'evo-philea-Destock'
|
2017-02-06 09:45:09 +01:00 |
|
Marion Muszynski
|
682d0b48f8
|
fix conflicts
|
2017-01-11 15:55:31 +01:00 |
|
Marion Muszynski
|
4e1f497252
|
comment mr modif for philea
|
2017-01-11 10:54:50 +01:00 |
|
Marion Muszynski
|
306e61920d
|
Merge branch 'ticket-11985-MondialRelay' into develop
|
2017-01-02 12:26:11 +01:00 |
|
Marion Muszynski
|
9047143c5b
|
addition of new v of mondialrelay and start of chamgements to include mr in philea
|
2017-01-02 12:25:33 +01:00 |
|
Marion Muszynski
|
fee10ec7af
|
Merge branch 'evo-philea-Destock' into develop
|
2017-01-02 11:34:32 +01:00 |
|
Marion Muszynski
|
2e59945370
|
wizard to allow product association to the new sale
|
2017-01-02 11:34:16 +01:00 |
|
Marion Muszynski
|
d634722035
|
destock system like reloading a sale
|
2016-12-30 17:03:44 +01:00 |
|
Marion Muszynski
|
b0d7f2ddb3
|
changement date from for send_commande to philea
|
2016-12-26 14:58:42 +01:00 |
|
Marion Muszynski
|
4f3b7c2b15
|
Merge branch 'ticket-12122-ModifNewStatus' into develop
|
2016-12-23 14:00:01 +01:00 |
|
Marion Muszynski
|
edd3a55c0a
|
fix bug add sale in db
|
2016-12-23 10:57:27 +01:00 |
|
Marion Muszynski
|
b3b9d7313f
|
Merge branch 'ticket-12052-PreventDelivery' into develop
|
2016-12-15 12:02:48 +01:00 |
|
Marion Muszynski
|
c3ff8d4935
|
changement visuel
|
2016-12-14 16:04:08 +01:00 |
|
Marion Muszynski
|
7f724c2012
|
css changement and optimisation db philea_sent
|
2016-12-14 15:17:32 +01:00 |
|
Marion Muszynski
|
692cfc1d20
|
prevent multi same update of order state
|
2016-12-14 11:30:09 +01:00 |
|
Marion Muszynski
|
ff56848987
|
optimization
|
2016-12-13 14:52:58 +01:00 |
|
Marion Muszynski
|
eb837ac915
|
addidtion of simpleDate for helperFormBootstrap
|
2016-12-13 10:15:43 +01:00 |
|
Marion Muszynski
|
4aa99c4bfb
|
changements
|
2016-12-12 18:27:45 +01:00 |
|
Marion Muszynski
|
b5f2e365ad
|
fix conflicts
|
2016-12-12 16:09:07 +01:00 |
|
Marion Muszynski
|
38f6a0daba
|
fix
|
2016-12-08 15:48:08 +01:00 |
|
Marion Muszynski
|
f4e2256c65
|
fix conflicts
|
2016-12-08 15:46:19 +01:00 |
|
Marion Muszynski
|
3352dfb3e3
|
last changements for prod
|
2016-12-08 15:23:33 +01:00 |
|
Marion Muszynski
|
ce40fc52c7
|
fix conflict
|
2016-12-08 13:28:32 +01:00 |
|
Marion Muszynski
|
e807437a10
|
finition
|
2016-12-08 13:25:39 +01:00 |
|
Marion Muszynski
|
d4f4452c43
|
changement
|
2016-12-08 12:31:06 +01:00 |
|
Marion Muszynski
|
e55202c0d0
|
addition of help sentence
|
2016-12-08 11:54:04 +01:00 |
|
Marion Muszynski
|
0569cdea43
|
addition of data in export
|
2016-12-08 11:46:35 +01:00 |
|
Marion Muszynski
|
bf7666a730
|
restriction for testing
|
2016-12-08 11:29:31 +01:00 |
|
Marion Muszynski
|
b6e13fc8c8
|
adjusting extract
|
2016-12-08 11:28:05 +01:00 |
|
Marion Muszynski
|
08a2023fb8
|
addition of new export
|
2016-12-08 10:34:49 +01:00 |
|
Marion Muszynski
|
a4752145fa
|
fix conflicts
|
2016-12-07 14:36:59 +01:00 |
|
Marion Muszynski
|
7cb36d6b0d
|
changement for pack gestion
|
2016-12-07 14:29:33 +01:00 |
|
Marion Muszynski
|
0a9afab232
|
pack gestion at expedition reception
|
2016-12-07 10:36:03 +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
|
5bd20c72d3
|
continuing
|
2016-12-06 10:07:54 +01:00 |
|
Marion Muszynski
|
8df93121a8
|
continuing pack management
|
2016-12-05 10:13:27 +01:00 |
|
Marion Muszynski
|
192cd79a6b
|
continuing packs
|
2016-12-02 15:34:57 +01:00 |
|
Marion Muszynski
|
a3f697a0be
|
fix conflict
|
2016-11-30 12:42:16 +01:00 |
|