Marion Muszynski
|
3be779d03b
|
Merge branch 'ticket-simplemulti_logistic'
|
2016-07-04 16:58:23 +02:00 |
|
Marion Muszynski
|
c7aa42f883
|
fix conflict
|
2016-07-01 11:20:49 +02:00 |
|
Srv Bebeboutik
|
c48e673922
|
fix prod
|
2016-06-30 11:31:11 +02:00 |
|
Marion Muszynski
|
699a06db48
|
fix conflict
|
2016-06-30 11:15:14 +02:00 |
|
Marion Muszynski
|
e7f0c678de
|
fix conflict
|
2016-06-29 15:53:34 +02:00 |
|
Marion Muszynski
|
760bd50c06
|
adding sentence according delivery delay
|
2016-06-29 15:52:03 +02:00 |
|
Marion Muszynski
|
69bf2773e6
|
Merge branch 'ticket-blockbestsellerProduct' into develop
|
2016-06-28 16:16:02 +02:00 |
|
Marion Muszynski
|
e6585427ee
|
fix
|
2016-06-28 16:15:41 +02:00 |
|
Marion Muszynski
|
2b726927cf
|
Merge branch 'ticket-blockbestsellerProduct' into develop
|
2016-06-28 16:07:49 +02:00 |
|
Marion Muszynski
|
10ad346ad5
|
modif idcombination
|
2016-06-28 16:07:29 +02:00 |
|
Marion Muszynski
|
18238f3c9d
|
Merge branch 'ticket-blockbestsellerProduct' into develop
|
2016-06-28 15:03:29 +02:00 |
|
Marion Muszynski
|
163cc3ac04
|
adding html bind
|
2016-06-28 15:03:07 +02:00 |
|
Marion Muszynski
|
757c557a07
|
fix conflict
|
2016-06-28 14:47:38 +02:00 |
|
Marion Muszynski
|
8a0b80e15e
|
pop error cart
|
2016-06-28 14:45:48 +02:00 |
|
Marion Muszynski
|
a72fdf8da2
|
Merge branch 'ticket-blockbestsellerProduct' into develop
|
2016-06-24 14:03:16 +02:00 |
|
Marion Muszynski
|
43646dd4bd
|
modif
|
2016-06-24 13:54:50 +02:00 |
|
Marion Muszynski
|
f57b04dbde
|
fix conflict
|
2016-06-24 12:43:26 +02:00 |
|
Marion Muszynski
|
985bf52e83
|
update to add product with attribute to cart from bestsellers
|
2016-06-24 12:41:46 +02:00 |
|
Marion Muszynski
|
22a8b5cac1
|
Merge branch 'ticket-8039' into develop
|
2016-06-22 17:23:56 +02:00 |
|
Marion Muszynski
|
7043f4b24a
|
other fix
|
2016-06-22 17:23:34 +02:00 |
|
Marion Muszynski
|
224267f45c
|
Merge branch 'ticket-8039' into develop
|
2016-06-22 17:08:37 +02:00 |
|
Marion Muszynski
|
a6c46f9077
|
petit fix before prod
|
2016-06-22 17:08:09 +02:00 |
|
Marion Muszynski
|
77b9c22014
|
fix conflicts
|
2016-06-22 15:03:36 +02:00 |
|
Marion Muszynski
|
f41acac7ad
|
Merge branch 'ticket-simplemulti_logistic' into develop
|
2016-06-22 11:27:13 +02:00 |
|
Marion Muszynski
|
ae50025d14
|
continuing updating
|
2016-06-22 11:26:51 +02:00 |
|
Marion Muszynski
|
56c4006da3
|
Merge branch 'ticket-simplemulti_logistic' into develop
|
2016-06-21 17:18:51 +02:00 |
|
Marion Muszynski
|
8ebec9fb3e
|
addind admin pending orders
|
2016-06-21 17:18:24 +02:00 |
|
Marion Muszynski
|
c442173cb8
|
add nex adminTab
|
2016-06-20 18:27:54 +02:00 |
|
Marion Muszynski
|
6dfa3c18b1
|
Merge branch 'ticket-simplemulti_logistic' into develop
|
2016-06-20 15:32:28 +02:00 |
|
Marion Muszynski
|
c29d8725ac
|
add status modify button
|
2016-06-20 15:32:06 +02:00 |
|
Marion Muszynski
|
6265c1b2af
|
begin update adminlogistic
|
2016-06-20 15:09:13 +02:00 |
|
Marion Muszynski
|
50010e70c3
|
Merge branch 'ticket-simplemulti_invoice' into develop
|
2016-06-20 12:57:23 +02:00 |
|
Marion Muszynski
|
ad30bb51a4
|
modif in Sale function for M2
|
2016-06-20 12:56:59 +02:00 |
|
Marion Muszynski
|
ff30aab5d5
|
Merge branch 'ticket-simplemulti_invoice' into develop
|
2016-06-20 12:49:51 +02:00 |
|
Marion Muszynski
|
3d4d7b16e2
|
update invoice
|
2016-06-20 12:49:32 +02:00 |
|
Marion Muszynski
|
1bfd79afb9
|
Merge branch 'ticket-simplemulti_bdc' into develop
|
2016-06-20 11:02:00 +02:00 |
|
Marion Muszynski
|
56163f32ab
|
update bdc log
|
2016-06-20 11:01:39 +02:00 |
|
Marion Muszynski
|
62009ba633
|
Merge branch 'ticket-8039' into develop
|
2016-06-10 16:50:05 +02:00 |
|
Marion Muszynski
|
7af6d9ccd7
|
adding bg for sale
|
2016-06-10 16:49:43 +02:00 |
|
Marion Muszynski
|
40ab87cd45
|
update request deb expe
|
2016-06-10 11:55:09 +02:00 |
|
Marion Muszynski
|
182a608e3b
|
little update in request
|
2016-06-10 10:22:26 +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
|
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
|
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
|
4148656a60
|
Merge branch 'ticket-8041' into develop
|
2016-06-07 17:43:19 +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 |
|
Marion Muszynski
|
5a7e53a116
|
fix conflicts
|
2016-06-07 14:45:26 +02:00 |
|
Marion Muszynski
|
fb26faeb8e
|
suite update braderie
|
2016-06-07 14:42:40 +02:00 |
|
Marion Muszynski
|
9212b8e84d
|
petit fix sur la braderie
|
2016-06-07 13:02:03 +02:00 |
|
Srv Bebeboutik
|
7025bce024
|
add phrase frais de port popup
|
2016-06-07 12:52:15 +02:00 |
|
Thibault UBUNTU
|
2cf5555949
|
Merge branch 'dylan_9894'
|
2016-06-07 12:16:21 +02:00 |
|
Dylan Travers
|
b4298189dc
|
ca me gonfle !!
|
2016-06-07 11:58:31 +02:00 |
|
Dylan Travers
|
a542baf9b0
|
Add extrafield and date_end to newsletter. Ticket N°9894
|
2016-06-07 11:48:20 +02:00 |
|
Srv Bebeboutik
|
49e26669a9
|
modif from prod
|
2016-06-07 11:22:35 +02:00 |
|
Dylan Travers
|
d099294e5f
|
Fix error alert message of ticket 9198
|
2016-06-07 10:20:29 +02:00 |
|
Dylan Travers
|
9b8795607a
|
Ajout de la phrase du ticket N°9891
|
2016-06-06 18:10:47 +02:00 |
|
Dylan Travers
|
54b10d9432
|
Ajout de la phrase demandée dans le ticket N°9891
|
2016-06-06 18:02:02 +02:00 |
|
Marion Muszynski
|
7065edffe4
|
fix conflict
|
2016-06-06 17:42:00 +02:00 |
|
Marion Muszynski
|
7ad38029da
|
adding filter
|
2016-06-06 17:27:09 +02:00 |
|
Srv Bebeboutik
|
bec4b56f27
|
modif from prod to get real numbers for export
|
2016-06-06 15:32:42 +02:00 |
|
Marion Muszynski
|
72545630a3
|
fix conflicts
|
2016-06-06 11:32:25 +02:00 |
|
Srv Bebeboutik
|
a4a5f4850d
|
petite modif from prod
|
2016-06-06 10:24:06 +02:00 |
|
Srv Bebeboutik
|
e26cefa86a
|
modif prod
|
2016-06-06 10:14:02 +02:00 |
|
Srv Bebeboutik
|
368307c6e2
|
modif from prod
|
2016-06-03 17:04:45 +02:00 |
|
Marion Muszynski
|
5ad50e700a
|
Merge branch 'ticket-fidelite' into develop
|
2016-06-03 16:34:55 +02:00 |
|
Marion Muszynski
|
2dc90dc0c6
|
update to get Cart loyalty credit value without considering discount in total cart
|
2016-06-03 16:34:30 +02:00 |
|
Srv Bebeboutik
|
b1a0a1b29e
|
small commit from prod
|
2016-06-03 11:18:35 +02:00 |
|
Marion Muszynski
|
c7dac58b08
|
Merge branch 'ticket-fidelite' into develop
|
2016-05-30 17:04:57 +02:00 |
|
Marion Muszynski
|
e92682d851
|
modif tpl loyalty program
|
2016-05-30 17:04:26 +02:00 |
|
Marion Muszynski
|
eb184fee4e
|
Merge branch 'ticket-fidelite' into develop
|
2016-05-30 16:31:03 +02:00 |
|
Marion Muszynski
|
02037dda1a
|
fix ratio
|
2016-05-30 16:30:32 +02:00 |
|
Marion Muszynski
|
2b14f9bd61
|
Merge branch 'ticket-dropshipping' into develop
|
2016-05-30 15:42:50 +02:00 |
|
Marion Muszynski
|
d63a2d7d5a
|
addind field to config if delivery of sale is enabled only in fr
|
2016-05-30 15:42:20 +02:00 |
|
Marion Muszynski
|
da020d7bc2
|
Merge branch 'ticket-phoneSocol' into develop
|
2016-05-30 10:50:22 +02:00 |
|
Marion Muszynski
|
7e74c8b58a
|
modif to take phone number if no mobile phone
|
2016-05-27 17:22:48 +02:00 |
|
Srv Bebeboutik
|
2f6c21e7fb
|
push de la prod
|
2016-05-27 16:59:18 +02:00 |
|
Marion Muszynski
|
cb02563fa9
|
Merge branch 'ticket-updateStats'
|
2016-05-27 15:01:42 +02:00 |
|
Marion Muszynski
|
722713d96c
|
test
|
2016-05-27 15:01:16 +02:00 |
|
Marion Muszynski
|
83e9e484ef
|
Merge branch 'ticket-updateStats'
|
2016-05-27 14:58:30 +02:00 |
|
Marion Muszynski
|
a8bdea5899
|
opti again
|
2016-05-27 14:58:08 +02:00 |
|
Marion Muszynski
|
a2084bd3cf
|
Merge branch 'ticket-updateStats'
|
2016-05-27 12:57:53 +02:00 |
|
Marion Muszynski
|
b59c00ffcd
|
adding another reason
|
2016-05-27 12:57:32 +02:00 |
|
Marion Muszynski
|
b135394369
|
Merge branch 'ticket-updateStats'
|
2016-05-27 12:42:39 +02:00 |
|
Marion Muszynski
|
40680b0020
|
opti export
|
2016-05-27 12:42:09 +02:00 |
|
Marion Muszynski
|
b3956b5592
|
Merge branch 'ticket-updateStats'
|
2016-05-27 12:36:23 +02:00 |
|
Marion Muszynski
|
d3b2f14bc9
|
continuing...
|
2016-05-27 12:35:51 +02:00 |
|
Marion Muszynski
|
5e3f9a31e7
|
Merge branch 'ticket-updateStats'
|
2016-05-27 11:27:53 +02:00 |
|
Marion Muszynski
|
2ce1f5fafe
|
continuing of otpi
|
2016-05-27 11:27:09 +02:00 |
|
Marion Muszynski
|
b63707f242
|
Merge branch 'ticket-updateStats'
|
2016-05-27 10:45:58 +02:00 |
|
Marion Muszynski
|
067eebea21
|
beginning of opti requete export
|
2016-05-27 10:45:22 +02:00 |
|
Marion Muszynski
|
750779f200
|
Merge branch 'ticket-updateStats'
|
2016-05-27 10:23:16 +02:00 |
|
Marion Muszynski
|
504aa9ba35
|
Merge branch 'ticket-updateStats' into develop
|
2016-05-27 10:19:39 +02:00 |
|
Marion Muszynski
|
3b8156458b
|
adding export remb
|
2016-05-27 10:19:09 +02:00 |
|
Marion Muszynski
|
f5737b2818
|
Merge branch 'ticket-updateBraderie' into develop
|
2016-05-26 17:52:41 +02:00 |
|
Marion Muszynski
|
ab70428dd4
|
update braderie
|
2016-05-26 17:50:44 +02:00 |
|
Marion Muszynski
|
e725fb321c
|
update ref braderie
|
2016-05-26 17:12:24 +02:00 |
|
Marion Muszynski
|
5105a4bb3e
|
Merge branch 'ticket-generateEAN2' into develop
|
2016-05-26 13:02:51 +02:00 |
|
Marion Muszynski
|
1fa19380d2
|
adding generate all ean for a specific sale
|
2016-05-26 13:01:58 +02:00 |
|
Marion Muszynski
|
84fe835cc1
|
suite export remb
|
2016-05-26 12:35:37 +02:00 |
|
Srv Bebeboutik
|
8994cabc49
|
modif prod webservice laposte
|
2016-05-26 10:19:16 +02:00 |
|
Marion Muszynski
|
6a127d37a2
|
Merge branch 'ticket-updateStats'
|
2016-05-25 16:06:41 +02:00 |
|
Marion Muszynski
|
cb3cca72c9
|
petit fix encore
|
2016-05-25 16:06:25 +02:00 |
|
Marion Muszynski
|
e46d30d574
|
Merge branch 'ticket-updateStats'
|
2016-05-25 16:05:25 +02:00 |
|
Marion Muszynski
|
1c0f7f8608
|
petit fix
|
2016-05-25 16:05:04 +02:00 |
|
Marion Muszynski
|
f95017718e
|
Merge branch 'ticket-updateStats'
|
2016-05-25 16:02:18 +02:00 |
|
Marion Muszynski
|
2f5c7ae81a
|
petit fix
|
2016-05-25 16:01:47 +02:00 |
|
Marion Muszynski
|
1c7e794677
|
Merge branch 'ticket-updateStats'
|
2016-05-25 16:00:43 +02:00 |
|
Marion Muszynski
|
7e2c886394
|
modif getReport
|
2016-05-25 15:59:27 +02:00 |
|
Marion Muszynski
|
860cb7b881
|
Merge branch 'ticket-updateStats'
|
2016-05-24 14:48:49 +02:00 |
|
Marion Muszynski
|
5cfbe18733
|
modif calendar
|
2016-05-24 14:48:22 +02:00 |
|
Marion Muszynski
|
16afc80a8c
|
Merge branch 'ticket-updateStats'
|
2016-05-23 18:05:43 +02:00 |
|
Marion Muszynski
|
1c9c8b7bd1
|
modif date max
|
2016-05-23 18:05:11 +02:00 |
|
Marion Muszynski
|
3c70e6206e
|
Merge branch 'ticket-updateStats'
|
2016-05-23 17:51:38 +02:00 |
|
Marion Muszynski
|
8aa6d416f7
|
opti requete sql
|
2016-05-23 17:51:11 +02:00 |
|
Marion Muszynski
|
e57dbe5cd8
|
Merge branch 'ticket-updateStats'
|
2016-05-23 17:36:20 +02:00 |
|
Marion Muszynski
|
dfe51ea898
|
modif calc date
|
2016-05-23 17:35:57 +02:00 |
|
Marion Muszynski
|
1a4b41ab92
|
Merge branch 'ticket-updateStats'
|
2016-05-23 14:54:10 +02:00 |
|
Marion Muszynski
|
e0b19d0ab1
|
add begin extract remb
|
2016-05-23 14:53:47 +02:00 |
|
Marion Muszynski
|
b8c3c3117d
|
Merge branch 'ticket-updateStats' into develop
|
2016-05-23 13:15:19 +02:00 |
|
Marion Muszynski
|
3a7a70c711
|
some modifs
|
2016-05-23 13:14:55 +02:00 |
|
Marion Muszynski
|
1eb95c2185
|
Merge branch 'ticket-fixSoflex' into develop
|
2016-05-20 17:46:08 +02:00 |
|
Marion Muszynski
|
f48aaf8cea
|
fix name in order
|
2016-05-20 17:45:26 +02:00 |
|
Marion Muszynski
|
71cf0ba1cc
|
modif requete
|
2016-05-20 17:39:57 +02:00 |
|
Marion Muszynski
|
fcdcc0ec8a
|
Merge branch 'ticket-updateStats' into develop
|
2016-05-20 17:13:34 +02:00 |
|
Marion Muszynski
|
a7b09a172b
|
add report stock
|
2016-05-20 17:13:05 +02:00 |
|
Marion Muszynski
|
370182ce2c
|
Merge branch 'ticket-updateStats' into develop
|
2016-05-20 15:45:40 +02:00 |
|
Marion Muszynski
|
d23535a4a7
|
other modif
|
2016-05-20 15:45:11 +02:00 |
|
Marion Muszynski
|
32492408f1
|
Merge branch 'ticket-updateStats' into develop
|
2016-05-20 15:43:15 +02:00 |
|
Marion Muszynski
|
3fcf5bbc5c
|
modif table stats logistic
|
2016-05-20 15:42:50 +02:00 |
|
Marion Muszynski
|
fe7063edc8
|
Merge branch 'ticket-deplaceExtract' into develop
|
2016-05-18 17:08:00 +02:00 |
|
Marion Muszynski
|
6e0dd8141c
|
modif to stay in category
|
2016-05-18 17:07:19 +02:00 |
|
Marion Muszynski
|
12314f4f95
|
add cron to clean csv
|
2016-05-18 16:26:31 +02:00 |
|
Marion Muszynski
|
37c9b988b1
|
Merge branch 'ticket-deplaceExtract' into develop
|
2016-05-18 16:14:58 +02:00 |
|
Marion Muszynski
|
15ccb40b9e
|
ajout export sale dans BDC
|
2016-05-18 16:14:24 +02:00 |
|