321 Commits

Author SHA1 Message Date
Alexandre Simonet
cc86b7849d add rss fluxcatalogue 2016-05-03 12:20:54 +02:00
Thibault UBUNTU
25bf39f711 trad es 2016-05-03 12:08:55 +02:00
Thibault UBUNTU
f15662e826 paypal suite 2016-05-02 15:30:12 +02:00
Marion Muszynski
e82357544c Merge branch 'ticket-newExtract' 2016-04-27 18:07:18 +02:00
Marion Muszynski
397a73d037 modif product price for DEB exp 2016-04-27 18:04:42 +02:00
Marion Muszynski
caa68a4c2f Merge branch 'ticket-newExtract' 2016-04-27 12:10:03 +02:00
Marion Muszynski
9e2c4c5c39 adding origin product to DEB exp 2016-04-27 12:08:22 +02:00
Marion Muszynski
ae1687a105 Merge branch 'master' of gitlab.antadis.fr:dev-antadis/bebeboutik 2016-04-27 11:35:03 +02:00
Srv Bebeboutik
6a1fd27e32 optimize stat 2016-04-27 11:31:43 +02:00
Marion Muszynski
5f96303fe9 modif for multi generation of csv in same time 2016-04-27 11:11:23 +02:00
Marion Muszynski
54bbfd5248 modif extract 2016-04-25 17:16:29 +02:00
Marion Muszynski
dde198080d modif extract custom 2016-04-25 16:50:51 +02:00
Marion Muszynski
be4026ba1a modif tpl 2016-04-25 12:45:13 +02:00
Marion Muszynski
48ba0424d8 other modif 2016-04-25 11:31:26 +02:00
Marion Muszynski
957c7f1db6 modif hookOrderReturn 2016-04-25 11:13:36 +02:00
Marion Muszynski
72a3792897 fix bug double adding 2016-04-25 10:43:24 +02:00
Marion Muszynski
4397a50151 correction concernant le return et cancel product 2016-04-22 18:00:36 +02:00
Marion Muszynski
b7ff14c0a7 correction for return 2016-04-22 17:00:45 +02:00
Marion Muszynski
364fe5e367 corrections 2016-04-22 16:43:07 +02:00
Marion Muszynski
3d1fb8a10a other update 2016-04-22 16:20:53 +02:00
Marion Muszynski
3b855c3f4a modif BO 2016-04-22 15:23:16 +02:00
Marion Muszynski
7edf0ce6b7 update for return 2016-04-22 15:17:26 +02:00
Marion Muszynski
f303bb4b2d encore un int qui trainait 2016-04-22 15:07:18 +02:00
Marion Muszynski
f1f14667a4 modif BO loyalty 2016-04-22 12:57:31 +02:00
Marion Muszynski
b6e25b87cc modifs 2016-04-21 18:37:11 +02:00
Marion Muszynski
e540e9e1cf modifs 2016-04-21 18:06:22 +02:00
Marion Muszynski
36af8de7d8 correction int float second round 2016-04-21 17:56:54 +02:00
Marion Muszynski
aaf2290d28 correction int float 2016-04-21 17:52:52 +02:00
Marion Muszynski
35ee4a1c68 many update of module loyalty 2016-04-21 17:41:04 +02:00
Marion Muszynski
a2e21669b0 correction bug newOrderHook 2016-04-21 12:39:07 +02:00
Marion Muszynski
e505c1e9db other corrctions 2016-04-21 12:15:04 +02:00
Marion Muszynski
15f3b6fa20 modif tpl 2016-04-21 12:01:10 +02:00
Marion Muszynski
5d52bff134 corrections 2016-04-21 11:39:25 +02:00
Marion Muszynski
ba0e8d29bc modif tpl loyalty 2016-04-21 11:31:36 +02:00
Marion Muszynski
c8befd1ede total modification of loyalty module 2016-04-21 11:14:33 +02:00
Marion Muszynski
811ba9b3a9 Merge branch 'ticket-newExtracts' 2016-04-20 16:40:37 +02:00
Marion Muszynski
4b80f9f7a6 correction 2016-04-20 16:40:12 +02:00
Marion Muszynski
ef33e2cbc7 Merge branch 'ticket-newExtracts' 2016-04-20 16:05:20 +02:00
Marion Muszynski
753b17fcba petite rectification quantity_sold 2016-04-20 15:58:47 +02:00
Marion Muszynski
21f1ada2d1 Merge branch 'ticket-landingpage' 2016-04-20 15:35:16 +02:00
Marion Muszynski
fd5bccadd7 begin loyalty 2016-04-20 15:33:56 +02:00
Marion Muszynski
4c4c069588 modif width button 2016-04-20 12:35:20 +02:00
Marion Muszynski
ecf913626f update extract names 2016-04-20 11:59:02 +02:00
Marion Muszynski
c63769824e add 2 new extracts for deb 2016-04-20 11:37:50 +02:00
Marion Muszynski
219b6dabb3 Merge branch 'ticket-consumable' 2016-04-18 16:17:30 +02:00
Marion Muszynski
cbbaf9c8e0 modif left_img.tpl 2016-04-18 16:14:19 +02:00
Marion Muszynski
1c0d70688c modif categoryimg 2016-04-18 16:03:17 +02:00
Marion Muszynski
d7b7e7abc6 modif connect button in landing page 2016-04-18 15:22:00 +02:00
Marion Muszynski
e2cc8ff3fd Merge branch 'ticket-extract' 2016-04-15 16:48:37 +02:00
Marion Muszynski
f0e2a7481a fix to order image by position 2016-04-15 12:38:31 +02:00