Commit Graph

792 Commits

Author SHA1 Message Date
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
a013207444 Merge branch 'tiket-productTemplate' into develop 2016-05-26 16:39:10 +02:00
Marion Muszynski
16d8afa0a8 addind fields to product import 2016-05-26 16:38:36 +02:00
Marion Muszynski
1af459d215 Merge branch 'tiket-productTemplate' into develop 2016-05-26 14:36:00 +02:00
Marion Muszynski
122cea0bc5 modif img product 2016-05-26 14:35:35 +02:00
Marion Muszynski
9d6ae848f3 Merge branch 'ticket-generateEAN2' 2016-05-26 14:17:26 +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
34d0ca49e0 Merge branch 'ticket-fixSoflex' 2016-05-20 17:46:57 +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
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