590 Commits

Author SHA1 Message Date
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
Marion Muszynski
cdd8b21bfe add nc8 id_country into export sales 2016-04-15 12:05:25 +02:00
Marion Muszynski
2d1d12c07e update extract 2016-04-13 12:22:55 +02:00
Marion Muszynski
43a24d1c7a update braderie and rack 2016-04-12 16:11:08 +02:00
Marion Muszynski
0b0ebcb26f fix conflict consommables 2016-04-12 15:17:45 +02:00
Marion Muszynski
19baa665a4 update braderie 2016-04-11 12:13:41 +02:00
Marion Muszynski
b287dc89de begin ticket export ventes 2016-04-11 11:31:57 +02:00
Marion Muszynski
559042b904 Merge branch 'ticket-9791' 2016-04-08 16:16:13 +02:00
Marion Muszynski
2c371bb94d update width bdc 2016-04-08 16:14:46 +02:00
Marion Muszynski
999faa694c Merge branch 'ticket-9791' 2016-04-08 16:12:15 +02:00
Marion Muszynski
b0a0abaf03 add ref to bdc log 2016-04-08 16:09:49 +02:00
Marion Muszynski
786c055787 add trad 2016-04-08 15:37:53 +02:00
Marion Muszynski
1d26459616 update landing page for connect button 2016-04-08 15:31:40 +02:00
Marion Muszynski
ace3f99035 Merge branch 'ticket-9791' 2016-04-08 11:30:43 +02:00
Marion Muszynski
447362a0d7 optimisation excel bdc 2016-04-08 11:26:48 +02:00
Marion Muszynski
fe03a17200 add generate rack in labelgenerate 2016-04-08 10:27:46 +02:00
Marion Muszynski
8c7dc01d73 suite opti bdc 2016-04-08 10:11:11 +02:00
Marion Muszynski
a9ad96ad98 opti excel style to all bdc 2016-04-07 11:47:02 +02:00
Marion Muszynski
613c58245f optimization excel style bdc 2016-04-07 10:53:27 +02:00
Marion Muszynski
d02a74938b opti bdc 2016-04-06 18:16:18 +02:00
Marion Muszynski
2c7864cd89 Merge branch 'ticket-9791' 2016-04-06 17:34:01 +02:00
Marion Muszynski
5ce6d92b75 correction bug 2016-04-06 17:32:04 +02:00
Thibault UBUNTU
3e3d3a0e58 fix paypal order save 2016-04-06 16:32:50 +02:00
Thibault UBUNTU
552b46347e v0.1 paypal billing 2016-04-06 15:52:14 +02:00
Marion Muszynski
60cf70493a Merge branch 'ticket-9791' 2016-04-06 15:08:35 +02:00
Marion Muszynski
91efe4469e fix conflict adminProduct 2016-04-06 14:46:47 +02:00
Marion Muszynski
bf619d7173 update trad in export bdc 2016-04-06 13:21:04 +02:00
Marion Muszynski
42704a03c7 creation bdc logistique 2016-04-06 13:09:54 +02:00
Marion Muszynski
c35bcc893a avancées dans le bdc log 2016-04-05 18:15:35 +02:00
Marion Muszynski
c6887b7b84 suite ticket 9791 2016-04-05 16:14:32 +02:00
Marion Muszynski
12d18ea080 Merge branch 'ticket-9643' 2016-04-05 14:43:37 +02:00
Marion Muszynski
c9023ddb9a fix ref problem 2016-04-05 14:20:50 +02:00