Commit Graph

794 Commits

Author SHA1 Message Date
Marion Muszynski
7945d0c0ad modif for ecotax style 2016-06-09 11:49:33 +02:00
Marion Muszynski
dbe607dccc modif invoices for multi expe48h 2016-06-09 10:31:52 +02:00
Marion Muszynski
2611a2e1ca Merge branch 'ticket-10169' 2016-06-08 17:46:27 +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
cf10bd3be0 fix conflicts 2016-06-08 17:15:28 +02:00
Marion Muszynski
77023fdbcb invoice for multi 48h 2016-06-08 16:56:43 +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
0fcd71ee7d Merge branch 'tiket-productTemplate' into develop 2016-06-08 14:29:52 +02:00
Marion Muszynski
2b2ae3fa8a modif zoomdiv 2016-06-08 14:29:19 +02:00
Marion Muszynski
ab21f10643 Merge branch 'ticket-fidelite' 2016-06-08 12:53:58 +02:00
Marion Muszynski
dc85f8eca6 modif trad 2016-06-08 12:53:38 +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
f92562ca53 Merge branch 'ticket-fidelite' into develop 2016-06-08 10:38:22 +02:00
Marion Muszynski
b9f7b26a59 modif css shopping cart 2016-06-08 10:37:37 +02:00
Marion Muszynski
6196489224 Merge branch 'ticket-8041' 2016-06-07 17:47:45 +02:00
Marion Muszynski
4148656a60 Merge branch 'ticket-8041' into develop 2016-06-07 17:43:19 +02:00
Marion Muszynski
563896bbcb rename import done 2016-06-07 17:42:59 +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
Srv Bebeboutik
f96c85f584 trad 2016-06-07 16:01:57 +02:00
Marion Muszynski
1c2c54f808 fix conflict 2016-06-07 14:51:10 +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
7dfe697cb7 Merge branch 'ticket-10122' 2016-06-07 13:02:29 +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
Srv Bebeboutik
0759a7b04f gitignore 2016-06-07 12:30:00 +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
49d2e67f39 fix 2016-06-07 10:55:19 +02:00
Dylan Travers
4fc9a8dd35 fix 2016-06-07 10:54:19 +02:00
Dylan Travers
d099294e5f Fix error alert message of ticket 9198 2016-06-07 10:20:29 +02:00
Dylan Travers
57584df3c0 Fix bug sentence. Ticket N° 9891 2016-06-07 09:51:09 +02:00