802 Commits

Author SHA1 Message Date
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
Marion Muszynski
a8e7c0c14a update special char replace in ws for label 2016-05-18 12:14:17 +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
1cb1c7398e fix conflict css 2016-05-17 15:57:59 +02:00
Marion Muszynski
30410a5fc8 supp des fdp fix pour vente consommable 2016-05-17 14:31:41 +02:00