Commit Graph

380 Commits

Author SHA1 Message Date
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