Marion Muszynski
|
402ac44f49
|
slider blockbestsellers in product page
|
2016-05-04 15:31:28 +02:00 |
|
Marion Muszynski
|
2a10c6a2fe
|
fix conflict in css
|
2016-05-03 15:40:01 +02:00 |
|
Marion Muszynski
|
63db0cc73c
|
adding in blocuserinfo
|
2016-05-03 15:38:20 +02:00 |
|
Alexandre Simonet
|
cc86b7849d
|
add rss fluxcatalogue
|
2016-05-03 12:20:54 +02:00 |
|
Thibault UBUNTU
|
80206ad452
|
Merge branch 'paypal_billing' into develop
|
2016-05-03 12:09:10 +02:00 |
|
Thibault UBUNTU
|
25bf39f711
|
trad es
|
2016-05-03 12:08:55 +02:00 |
|
Thibault UBUNTU
|
e1b79f1d23
|
fix conflit
|
2016-05-02 15:31:24 +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
|
edfbde5fd3
|
Merge branch 'ticket-newExtract' into develop
|
2016-04-27 18:05:37 +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
|
73fb48d7b4
|
Merge branch 'ticket-newExtract' into develop
|
2016-04-27 12:08:45 +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
|
f19e86331a
|
Merge branch 'ticket-newExtract' into develop
|
2016-04-27 11:12:00 +02:00 |
|
Marion Muszynski
|
5f96303fe9
|
modif for multi generation of csv in same time
|
2016-04-27 11:11:23 +02:00 |
|
Marion Muszynski
|
f72b207fc0
|
Merge branch 'ticket-newExtract' into develop
|
2016-04-25 17:17:05 +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
|
6926224b43
|
Merge branch 'ticket-fidelite' into develop
|
2016-04-25 12:45:37 +02:00 |
|
Marion Muszynski
|
be4026ba1a
|
modif tpl
|
2016-04-25 12:45:13 +02:00 |
|
Marion Muszynski
|
99316efe95
|
Merge branch 'ticket-fidelite' into develop
|
2016-04-25 11:34:06 +02:00 |
|
Marion Muszynski
|
48ba0424d8
|
other modif
|
2016-04-25 11:31:26 +02:00 |
|
Marion Muszynski
|
7084a1055b
|
Merge branch 'ticket-fidelite' into develop
|
2016-04-25 11:14:07 +02:00 |
|
Marion Muszynski
|
957c7f1db6
|
modif hookOrderReturn
|
2016-04-25 11:13:36 +02:00 |
|
Marion Muszynski
|
b7dbcbd3b0
|
Merge branch 'ticket-updBraderie' into develop
|
2016-04-25 10:44:39 +02:00 |
|
Marion Muszynski
|
72a3792897
|
fix bug double adding
|
2016-04-25 10:43:24 +02:00 |
|
Marion Muszynski
|
1091ccea77
|
Merge branch 'ticket-fidelite' into develop
|
2016-04-22 18:01:02 +02:00 |
|
Marion Muszynski
|
4397a50151
|
correction concernant le return et cancel product
|
2016-04-22 18:00:36 +02:00 |
|
Marion Muszynski
|
2ef9fbd9ce
|
Merge branch 'ticket-fidelite' into develop
|
2016-04-22 17:01:40 +02:00 |
|
Marion Muszynski
|
b7ff14c0a7
|
correction for return
|
2016-04-22 17:00:45 +02:00 |
|
Marion Muszynski
|
82882a9b5b
|
Merge branch 'ticket-fidelite' into develop
|
2016-04-22 16:43:35 +02:00 |
|
Marion Muszynski
|
364fe5e367
|
corrections
|
2016-04-22 16:43:07 +02:00 |
|
Marion Muszynski
|
bb15d1e81b
|
Merge branch 'ticket-fidelite' into develop
|
2016-04-22 16:21:48 +02:00 |
|
Marion Muszynski
|
3d1fb8a10a
|
other update
|
2016-04-22 16:20:53 +02:00 |
|
Marion Muszynski
|
5764cda5b6
|
Merge branch 'ticket-fidelite' into develop
|
2016-04-22 15:24:40 +02:00 |
|
Marion Muszynski
|
3b855c3f4a
|
modif BO
|
2016-04-22 15:23:16 +02:00 |
|
Marion Muszynski
|
2db0ee384d
|
Merge branch 'ticket-fidelite' into develop
|
2016-04-22 15:17:50 +02:00 |
|
Marion Muszynski
|
7edf0ce6b7
|
update for return
|
2016-04-22 15:17:26 +02:00 |
|
Marion Muszynski
|
87829ac8c3
|
Merge branch 'ticket-fidelite' into develop
|
2016-04-22 15:07:52 +02:00 |
|
Marion Muszynski
|
f303bb4b2d
|
encore un int qui trainait
|
2016-04-22 15:07:18 +02:00 |
|
Marion Muszynski
|
4bc9303ff7
|
Merge branch 'ticket-fidelite' into develop
|
2016-04-22 12:58:01 +02:00 |
|
Marion Muszynski
|
f1f14667a4
|
modif BO loyalty
|
2016-04-22 12:57:31 +02:00 |
|
Marion Muszynski
|
c6cdcd748b
|
Merge branch 'ticket-fidelite' into develop
|
2016-04-21 18:37:44 +02:00 |
|
Marion Muszynski
|
b6e25b87cc
|
modifs
|
2016-04-21 18:37:11 +02:00 |
|
Marion Muszynski
|
b05ebd8a38
|
Merge branch 'ticket-fidelite' into develop
|
2016-04-21 18:06:50 +02:00 |
|
Marion Muszynski
|
e540e9e1cf
|
modifs
|
2016-04-21 18:06:22 +02:00 |
|
Marion Muszynski
|
c6559904ff
|
Merge branch 'ticket-fidelite' into develop
|
2016-04-21 17:57:17 +02:00 |
|
Marion Muszynski
|
36af8de7d8
|
correction int float second round
|
2016-04-21 17:56:54 +02:00 |
|
Marion Muszynski
|
e28d322bd1
|
Merge branch 'ticket-fidelite' into develop
|
2016-04-21 17:53:22 +02:00 |
|
Marion Muszynski
|
aaf2290d28
|
correction int float
|
2016-04-21 17:52:52 +02:00 |
|
Marion Muszynski
|
d3f7d66f95
|
fix conflict css
|
2016-04-21 17:44:16 +02:00 |
|
Marion Muszynski
|
35ee4a1c68
|
many update of module loyalty
|
2016-04-21 17:41:04 +02:00 |
|
Marion Muszynski
|
fa2d77b8b2
|
Merge branch 'ticket-fidelite' into develop
|
2016-04-21 12:39:56 +02:00 |
|
Marion Muszynski
|
a2e21669b0
|
correction bug newOrderHook
|
2016-04-21 12:39:07 +02:00 |
|
Marion Muszynski
|
d0644b680e
|
Merge branch 'ticket-fidelite' into develop
|
2016-04-21 12:15:31 +02:00 |
|
Marion Muszynski
|
e505c1e9db
|
other corrctions
|
2016-04-21 12:15:04 +02:00 |
|
Marion Muszynski
|
02bff329ca
|
Merge branch 'ticket-fidelite' into develop
|
2016-04-21 12:01:36 +02:00 |
|
Marion Muszynski
|
15f3b6fa20
|
modif tpl
|
2016-04-21 12:01:10 +02:00 |
|
Marion Muszynski
|
0d92bae9f9
|
Merge branch 'ticket-fidelite' into develop
|
2016-04-21 11:39:49 +02:00 |
|
Marion Muszynski
|
5d52bff134
|
corrections
|
2016-04-21 11:39:25 +02:00 |
|
Marion Muszynski
|
042d42d578
|
Merge branch 'ticket-fidelite' into develop
|
2016-04-21 11:32:06 +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
|
9f20e049de
|
Merge branch 'ticket-newExtracts' into develop
|
2016-04-20 15:59:31 +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
|
f2e0e80149
|
Merge branch 'ticket-landingpage' into develop
|
2016-04-20 12:35:50 +02:00 |
|
Marion Muszynski
|
4c4c069588
|
modif width button
|
2016-04-20 12:35:20 +02:00 |
|
Marion Muszynski
|
789b011f7f
|
Merge branch 'ticket-newExtracts' into develop
|
2016-04-20 11:59:27 +02:00 |
|
Marion Muszynski
|
ecf913626f
|
update extract names
|
2016-04-20 11:59:02 +02:00 |
|
Marion Muszynski
|
7ff21f8a76
|
Merge branch 'ticket-newExtracts' into develop
|
2016-04-20 11:38:26 +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
|
ffb8f1f3c2
|
Merge branch 'ticket-consumable' into develop
|
2016-04-18 16:14:40 +02:00 |
|
Marion Muszynski
|
cbbaf9c8e0
|
modif left_img.tpl
|
2016-04-18 16:14:19 +02:00 |
|
Marion Muszynski
|
e15f382530
|
Merge branch 'ticket-consumable' into develop
|
2016-04-18 16:03:42 +02:00 |
|
Marion Muszynski
|
1c0d70688c
|
modif categoryimg
|
2016-04-18 16:03:17 +02:00 |
|
Marion Muszynski
|
f288f1ce8d
|
Merge branch 'ticket-landingpage' into develop
|
2016-04-18 15:22:50 +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
|
ef01566b17
|
Merge branch 'ticket-extract' into develop
|
2016-04-15 12:39:14 +02:00 |
|
Marion Muszynski
|
f0e2a7481a
|
fix to order image by position
|
2016-04-15 12:38:31 +02:00 |
|
Marion Muszynski
|
c1e1f78057
|
Merge branch 'ticket-extract' into develop
|
2016-04-15 12:05:53 +02:00 |
|
Marion Muszynski
|
cdd8b21bfe
|
add nc8 id_country into export sales
|
2016-04-15 12:05:25 +02:00 |
|
Marion Muszynski
|
7496b8fb5d
|
Merge branch 'ticket-extract' into develop
|
2016-04-13 12:23:22 +02:00 |
|
Marion Muszynski
|
2d1d12c07e
|
update extract
|
2016-04-13 12:22:55 +02:00 |
|
Marion Muszynski
|
9a576cd82d
|
fix conflict braderie
|
2016-04-12 16:15:40 +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
|
23e5188aa1
|
Merge branch 'ticket-braderie' into develop
|
2016-04-11 12:14:04 +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
|
b0f2148453
|
Merge branch 'ticket-9791' into develop
|
2016-04-08 16:15:19 +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
|
261ef37fd4
|
Merge branch 'ticket-9791' into develop
|
2016-04-08 16:10:18 +02:00 |
|
Marion Muszynski
|
b0a0abaf03
|
add ref to bdc log
|
2016-04-08 16:09:49 +02:00 |
|
Marion Muszynski
|
6a8d70f027
|
Merge branch 'ticket-landingpage' into develop
|
2016-04-08 15:38:21 +02:00 |
|
Marion Muszynski
|
786c055787
|
add trad
|
2016-04-08 15:37:53 +02:00 |
|
Marion Muszynski
|
1a0cf55865
|
Merge branch 'ticket-landingpage' into develop
|
2016-04-08 15:32:30 +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
|
5a21734d4f
|
Merge branch 'ticket-9791' into develop
|
2016-04-08 11:27:27 +02:00 |
|
Marion Muszynski
|
447362a0d7
|
optimisation excel bdc
|
2016-04-08 11:26:48 +02:00 |
|
Marion Muszynski
|
f9962ab6d3
|
fix conflict adminProduct
|
2016-04-08 10:33:14 +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
|
967ad5d3c9
|
Merge branch 'ticket-9791' into develop
|
2016-04-07 11:47:30 +02:00 |
|
Marion Muszynski
|
a9ad96ad98
|
opti excel style to all bdc
|
2016-04-07 11:47:02 +02:00 |
|
Marion Muszynski
|
8b6a68e3ab
|
Merge branch 'ticket-9791' into develop
|
2016-04-07 10:53:57 +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
|
9d12fd401d
|
Merge branch 'ticket-9791' into develop
|
2016-04-06 17:32:58 +02:00 |
|
Marion Muszynski
|
5ce6d92b75
|
correction bug
|
2016-04-06 17:32:04 +02:00 |
|
Thibault UBUNTU
|
83675d8a08
|
Merge branch 'paypal_billing' into develop
|
2016-04-06 16:33:00 +02:00 |
|
Thibault UBUNTU
|
3e3d3a0e58
|
fix paypal order save
|
2016-04-06 16:32:50 +02:00 |
|
Thibault UBUNTU
|
3099ebe2ca
|
Merge branch 'develop' of gitlab.antadis.fr:dev-antadis/bebeboutik into develop
|
2016-04-06 15:52:31 +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
|
cc700bbebd
|
Merge branch 'ticket-9791' into develop
|
2016-04-06 13:21:41 +02:00 |
|
Marion Muszynski
|
bf619d7173
|
update trad in export bdc
|
2016-04-06 13:21:04 +02:00 |
|
Marion Muszynski
|
849edcdb12
|
fix conflict
|
2016-04-06 13:11:49 +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
|
06ce40ba23
|
Merge branch 'alexandre-braderie' into develop
|
2016-04-05 14:21:17 +02:00 |
|
Marion Muszynski
|
c9023ddb9a
|
fix ref problem
|
2016-04-05 14:20:50 +02:00 |
|
Marion Muszynski
|
e94b10553d
|
begin bdc logistique
|
2016-04-04 17:23:15 +02:00 |
|
Marion Muszynski
|
4a41ef84eb
|
Merge branch 'ticket-ean' into develop
|
2016-04-04 15:54:44 +02:00 |
|
Marion Muszynski
|
d658b0eab2
|
update message confirm for deletion ean
|
2016-04-04 15:54:18 +02:00 |
|
Marion Muszynski
|
0880f08f07
|
Merge branch 'ticket-ean' into develop
|
2016-04-04 15:21:02 +02:00 |
|
Marion Muszynski
|
7fbf095387
|
update for delete ean in sale
|
2016-04-04 15:20:32 +02:00 |
|
Marion Muszynski
|
e76af013f5
|
Merge branch 'alexandre-braderie' into develop
|
2016-04-04 14:18:42 +02:00 |
|
Marion Muszynski
|
aa10c07dd6
|
update categories pb
|
2016-04-04 14:18:12 +02:00 |
|
Marion Muszynski
|
e8a15b1e19
|
Merge branch 'alexandre-braderie' into develop
|
2016-04-04 13:35:04 +02:00 |
|
Marion Muszynski
|
11a07506c0
|
update product name
|
2016-04-04 13:34:26 +02:00 |
|
Thibault UBUNTU
|
8471702ff7
|
fix
|
2016-04-04 13:25:38 +02:00 |
|
Thibault UBUNTU
|
39f9ff27e5
|
skin page payment
|
2016-04-04 13:24:07 +02:00 |
|
Thibault GUILLAUME
|
5beaf8e77e
|
fix conflict
|
2016-04-04 11:49:45 +02:00 |
|