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
|
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
|
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
|
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 |
|