958 Commits

Author SHA1 Message Date
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
bee4986a9f Merge branch 'tiket-productTemplate' into develop 2016-05-20 15:02:56 +02:00
Marion Muszynski
f479a0f9a7 modif css 2016-05-20 15:02:22 +02:00
Marion Muszynski
da375df311 Merge branch 'tiket-productTemplate' into develop 2016-05-20 12:38:50 +02:00
Marion Muszynski
a356edf0df modif picto 2016-05-20 12:38:25 +02:00
Marion Muszynski
7a2caa66b6 Merge branch 'ticket-postcodeMobile' 2016-05-20 10:51:14 +02:00
Marion Muszynski
f59fe988c6 fix conflict 2016-05-20 10:50:27 +02:00
Marion Muszynski
b68de72f86 add postcode autocomplete for mobile 2016-05-20 10:48:35 +02:00
Marion Muszynski
26be7dc3b9 Merge branch 'ticket-autocompletePostcode' 2016-05-19 15:17:22 +02:00
Marion Muszynski
64cfa67dbf clean js console 2016-05-19 14:47:38 +02:00
Marion Muszynski
5c6f243d6b fix conflict 2016-05-19 13:17:54 +02:00
Marion Muszynski
eb441d8edf adding autocomplete postcode 2016-05-19 13:13:47 +02:00
Marion Muszynski
05ed10fcc1 Merge branch 'ticket-deplaceExtract' 2016-05-18 17:33:43 +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
0b4455e941 Merge branch 'ticket-deplaceExtract' 2016-05-18 16:26:48 +02:00
Marion Muszynski
12314f4f95 add cron to clean csv 2016-05-18 16:26:31 +02:00
Marion Muszynski
635b684f68 Merge branch 'ticket-deplaceExtract' 2016-05-18 16:17:53 +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
Marion Muszynski
483f197a53 Merge branch 'ticket-specialChar' 2016-05-18 12:15:07 +02:00
Marion Muszynski
a8e7c0c14a update special char replace in ws for label 2016-05-18 12:14:17 +02:00
Marion Muszynski
8a91954f1e Merge branch 'ticket-modifEan' 2016-05-18 11:20:03 +02:00
Marion Muszynski
03c743985c modif for prod 2016-05-18 11:19:27 +02:00
Marion Muszynski
a876e577e8 Merge branch 'ticket-modifEan' into develop 2016-05-18 11:18:04 +02:00
Marion Muszynski
13b20adb20 modif validate field OrderDetail 2016-05-18 11:17:41 +02:00
Marion Muszynski
0759d17ae2 Merge branch 'ticket-modifAddress' 2016-05-18 10:33:53 +02:00
Marion Muszynski
97ef053f1f update for prod 2016-05-18 10:33:23 +02:00
Marion Muszynski
e2fa90e008 Merge branch 'ticket-modifAddress' into develop 2016-05-18 10:30:54 +02:00
Marion Muszynski
796b0af17c modif for update socol address in BO order 2016-05-18 10:30:17 +02:00
Marion Muszynski
1b32124bb1 Merge branch 'ticket-modifAddress' into develop 2016-05-17 17:51:00 +02:00
Marion Muszynski
cbec52936b modif 2016-05-17 17:50:49 +02:00
Marion Muszynski
9c861cd39e Merge branch 'ticket-modifAddress' into develop 2016-05-17 17:49:17 +02:00
Marion Muszynski
0b077c192a modif 2016-05-17 17:48:55 +02:00
Marion Muszynski
3db1f64164 Merge branch 'ticket-modifAddress' into develop 2016-05-17 17:43:49 +02:00
Marion Muszynski
77a757859b modif ip for module cheque 2016-05-17 17:43:14 +02:00
Marion Muszynski
e57ae21c38 Merge branch 'ticket-modifCarrierTpl' 2016-05-17 16:36:46 +02:00
Marion Muszynski
2030584c84 modif img site mobile 2016-05-17 16:36:28 +02:00
Marion Muszynski
56c7c2717a Merge branch 'ticket-modifCarrierTpl' 2016-05-17 16:33:44 +02:00
Marion Muszynski
9eda48a6b4 modif img payment_2 2016-05-17 16:33:20 +02:00
Marion Muszynski
f29c5a2405 Merge branch 'ticket-modifCarrierTpl' 2016-05-17 16:05:51 +02:00
Marion Muszynski
adbe272c7b modif for prod 2016-05-17 16:05:20 +02:00
Marion Muszynski
1cb1c7398e fix conflict css 2016-05-17 15:57:59 +02:00
Marion Muszynski
b7f247729f modif tpl carrier et css 2016-05-17 15:56:27 +02:00