Marion Muszynski
|
c8befd1ede
|
total modification of loyalty module
|
2016-04-21 11:14:33 +02:00 |
|
Marion Muszynski
|
fd5bccadd7
|
begin loyalty
|
2016-04-20 15:33:56 +02:00 |
|
Marion Muszynski
|
219b6dabb3
|
Merge branch 'ticket-consumable'
|
2016-04-18 16:17:30 +02:00 |
|
Marion Muszynski
|
ca6587052b
|
change id consumable for prod
|
2016-04-18 16:17:04 +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
|
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
|
e56cf154f7
|
Merge branch 'ticket-consumable'
|
2016-04-15 11:44:09 +02:00 |
|
Marion Muszynski
|
d0a702380f
|
update css
|
2016-04-15 11:43:42 +02:00 |
|
Marion Muszynski
|
5521eeba23
|
Merge branch 'ticket-consumable'
|
2016-04-15 11:37:26 +02:00 |
|
Marion Muszynski
|
0073cb8dde
|
fix css
|
2016-04-15 11:37:01 +02:00 |
|
Marion Muszynski
|
ab9546027d
|
Merge branch 'ticket-consumable'
|
2016-04-15 11:33:28 +02:00 |
|
Marion Muszynski
|
f7f7a15339
|
update css site mobile
|
2016-04-15 11:33:00 +02:00 |
|
Marion Muszynski
|
8dcdd78eb1
|
Merge branch 'ticket-consumable'
|
2016-04-15 11:28:24 +02:00 |
|
Marion Muszynski
|
7f2cf9cd16
|
add tpl and css for site mobile
|
2016-04-15 11:26:00 +02:00 |
|
Marion Muszynski
|
e8f56f54d5
|
Merge branch 'ticket-triSearch'
|
2016-04-15 10:09:34 +02:00 |
|
Marion Muszynski
|
d4722a7e81
|
order in search product
|
2016-04-14 13:06:06 +02:00 |
|
Marion Muszynski
|
2d1d12c07e
|
update extract
|
2016-04-13 12:22:55 +02:00 |
|
Marion Muszynski
|
6c6b3472e5
|
Merge branch 'ticket-braderie'
|
2016-04-13 10:45:18 +02:00 |
|
Marion Muszynski
|
d326f1bb59
|
update adminProducts order
|
2016-04-13 10:39:29 +02:00 |
|
Marion Muszynski
|
616055dce2
|
Merge branch 'ticket-braderie'
|
2016-04-12 17:40:11 +02:00 |
|
Marion Muszynski
|
7a131e2bef
|
correction ordre AdminProduct
|
2016-04-12 17:39:47 +02:00 |
|
Marion Muszynski
|
dd6970444f
|
Merge branch 'ticket-braderie'
|
2016-04-12 16:17:41 +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
|
09299f983e
|
add id_sale and id_cat to define for consumable
|
2016-04-12 15:07:24 +02:00 |
|
Marion Muszynski
|
b7fd07aec7
|
Merge branch 'ticket-braderie'
|
2016-04-11 12:17:33 +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
|
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
|
49e9ffa2fd
|
Merge branch 'rack-labelgenerate'
|
2016-04-08 10:36:20 +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 |
|
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 |
|