Marion Muszynski
|
4874515f50
|
Merge branch 'ticket-updatePendingOrder' into develop
|
2016-07-11 12:36:06 +02:00 |
|
Marion Muszynski
|
7faebc96f0
|
small js update in adminlogisticpending
|
2016-07-11 12:35:41 +02:00 |
|
Marion Muszynski
|
91fc9ee7dc
|
update order invoice
|
2016-07-08 16:03:19 +02:00 |
|
Srv Bebeboutik
|
4a93e29747
|
modif prod, remove log email sending to us
|
2016-07-08 15:52:31 +02:00 |
|
Marion Muszynski
|
e489a60c90
|
Merge branch 'ticket-simplemulti_invoice'
|
2016-07-08 10:52:17 +02:00 |
|
Marion Muszynski
|
d7f6930236
|
Merge branch 'ticket-simplemulti_bdc'
|
2016-07-08 10:47:49 +02:00 |
|
Marion Muszynski
|
b574168fbd
|
Merge branch 'ticket-saveCB' into develop
|
2016-07-06 17:44:24 +02:00 |
|
Marion Muszynski
|
c094b31fa5
|
modif retour pbx
|
2016-07-06 17:42:20 +02:00 |
|
Marion Muszynski
|
590acadfe6
|
Merge branch 'ticket-saveCB' into develop
|
2016-07-06 16:16:46 +02:00 |
|
Marion Muszynski
|
08b8f39607
|
adding param en paiement.php
|
2016-07-06 16:16:26 +02:00 |
|
Srv Bebeboutik
|
7701a95063
|
fix from prod
|
2016-07-06 16:07:22 +02:00 |
|
Marion Muszynski
|
0f05a15e94
|
Merge branch 'ticket-preheaderRSS'
|
2016-07-06 15:33:48 +02:00 |
|
Marion Muszynski
|
47e637644d
|
add U param in response paybox
|
2016-07-06 15:22:41 +02:00 |
|
Marion Muszynski
|
200ab432b5
|
fix conflicts
|
2016-07-06 12:38:35 +02:00 |
|
Marion Muszynski
|
7f6949043e
|
adding various description blocks in Admin product edit fast
|
2016-07-06 12:14:28 +02:00 |
|
Marion Muszynski
|
53f957ee12
|
Merge branch 'ticket-saveCB' into develop
|
2016-07-05 16:57:51 +02:00 |
|
Marion Muszynski
|
9954f14c25
|
modif test
|
2016-07-05 16:57:30 +02:00 |
|
Marion Muszynski
|
28af6d6754
|
Merge branch 'ticket-saveCB' into develop
|
2016-07-05 16:39:51 +02:00 |
|
Marion Muszynski
|
76db559d5d
|
modif
|
2016-07-05 16:39:25 +02:00 |
|
Marion Muszynski
|
6019923f31
|
Merge branch 'ticket-saveCB' into develop
|
2016-07-05 16:32:03 +02:00 |
|
Marion Muszynski
|
23c48db97a
|
modif
|
2016-07-05 16:31:37 +02:00 |
|
Marion Muszynski
|
eb287fb353
|
Merge branch 'ticket-saveCB' into develop
|
2016-07-05 16:11:49 +02:00 |
|
Marion Muszynski
|
93b819a577
|
test with CB trace
|
2016-07-05 16:07:39 +02:00 |
|
Marion Muszynski
|
0afcb1d071
|
Merge branch 'ticket-saveCB' into develop
|
2016-07-05 15:41:36 +02:00 |
|
Marion Muszynski
|
b4949f8792
|
test
|
2016-07-05 15:41:14 +02:00 |
|
Marion Muszynski
|
f0ed6152a2
|
Merge branch 'ticket-saveCB' into develop
|
2016-07-05 15:31:03 +02:00 |
|
Marion Muszynski
|
75e3ab7177
|
adding return params
|
2016-07-05 15:30:42 +02:00 |
|
Marion Muszynski
|
7c11020cdd
|
Merge branch 'ticket-10363' into develop
|
2016-07-05 15:11:52 +02:00 |
|
Marion Muszynski
|
e79421073d
|
adding pending orders to stock report
|
2016-07-05 15:11:33 +02:00 |
|
Marion Muszynski
|
e6859f7a85
|
Merge branch 'ticket-preheaderRSS' into develop
|
2016-07-04 18:20:24 +02:00 |
|
Marion Muszynski
|
95b176601a
|
adding preheader rss emarsys
|
2016-07-04 18:20:03 +02:00 |
|
Marion Muszynski
|
3be779d03b
|
Merge branch 'ticket-simplemulti_logistic'
|
2016-07-04 16:58:23 +02:00 |
|
Marion Muszynski
|
c7aa42f883
|
fix conflict
|
2016-07-01 11:20:49 +02:00 |
|
Srv Bebeboutik
|
c48e673922
|
fix prod
|
2016-06-30 11:31:11 +02:00 |
|
Marion Muszynski
|
699a06db48
|
fix conflict
|
2016-06-30 11:15:14 +02:00 |
|
Marion Muszynski
|
e7f0c678de
|
fix conflict
|
2016-06-29 15:53:34 +02:00 |
|
Marion Muszynski
|
760bd50c06
|
adding sentence according delivery delay
|
2016-06-29 15:52:03 +02:00 |
|
Marion Muszynski
|
69bf2773e6
|
Merge branch 'ticket-blockbestsellerProduct' into develop
|
2016-06-28 16:16:02 +02:00 |
|
Marion Muszynski
|
e6585427ee
|
fix
|
2016-06-28 16:15:41 +02:00 |
|
Marion Muszynski
|
2b726927cf
|
Merge branch 'ticket-blockbestsellerProduct' into develop
|
2016-06-28 16:07:49 +02:00 |
|
Marion Muszynski
|
10ad346ad5
|
modif idcombination
|
2016-06-28 16:07:29 +02:00 |
|
Marion Muszynski
|
18238f3c9d
|
Merge branch 'ticket-blockbestsellerProduct' into develop
|
2016-06-28 15:03:29 +02:00 |
|
Marion Muszynski
|
163cc3ac04
|
adding html bind
|
2016-06-28 15:03:07 +02:00 |
|
Marion Muszynski
|
757c557a07
|
fix conflict
|
2016-06-28 14:47:38 +02:00 |
|
Marion Muszynski
|
8a0b80e15e
|
pop error cart
|
2016-06-28 14:45:48 +02:00 |
|
Marion Muszynski
|
a72fdf8da2
|
Merge branch 'ticket-blockbestsellerProduct' into develop
|
2016-06-24 14:03:16 +02:00 |
|
Marion Muszynski
|
43646dd4bd
|
modif
|
2016-06-24 13:54:50 +02:00 |
|
Marion Muszynski
|
f57b04dbde
|
fix conflict
|
2016-06-24 12:43:26 +02:00 |
|
Marion Muszynski
|
985bf52e83
|
update to add product with attribute to cart from bestsellers
|
2016-06-24 12:41:46 +02:00 |
|
Marion Muszynski
|
22a8b5cac1
|
Merge branch 'ticket-8039' into develop
|
2016-06-22 17:23:56 +02:00 |
|