Marion Muszynski
|
98b264471c
|
Merge branch 'ticket-blockOrderSummary' into develop
|
2016-07-13 15:10:48 +02:00 |
|
Marion Muszynski
|
67314cbf25
|
hide bestsellers at payment step
|
2016-07-13 15:09:33 +02:00 |
|
Marion Muszynski
|
fca1dc3fc5
|
Merge branch 'ticket-invoiceOrderBy' into develop
|
2016-07-13 10:31:03 +02:00 |
|
Marion Muszynski
|
a271b56774
|
getproducts with tri
|
2016-07-13 10:30:36 +02:00 |
|
Marion Muszynski
|
4b46c90929
|
Merge branch 'ticket-10444' into develop
|
2016-07-12 17:59:41 +02:00 |
|
Marion Muszynski
|
4acaacaaa8
|
other modif
|
2016-07-12 17:59:18 +02:00 |
|
Marion Muszynski
|
a8136e01e3
|
Merge branch 'ticket-10444' into develop
|
2016-07-12 17:36:04 +02:00 |
|
Marion Muszynski
|
c0117d7819
|
good modif
|
2016-07-12 17:35:38 +02:00 |
|
Marion Muszynski
|
d2065341b2
|
Merge branch 'ticket-10444' into develop
|
2016-07-12 16:59:40 +02:00 |
|
Marion Muszynski
|
fd51d7f449
|
small update
|
2016-07-12 16:59:11 +02:00 |
|
Marion Muszynski
|
6ecf465e1e
|
Merge branch 'ticket-10444' into develop
|
2016-07-12 16:23:42 +02:00 |
|
Marion Muszynski
|
5303ef1b06
|
update BDC sale state
|
2016-07-12 16:23:23 +02:00 |
|
Marion Muszynski
|
489b94cff5
|
suite block order summary
|
2016-07-12 14:50:52 +02:00 |
|
Marion Muszynski
|
b03c5cf0b9
|
add logo
|
2016-07-11 17:43:10 +02:00 |
|
Marion Muszynski
|
f754060f1d
|
Merge branch 'ticket-invoiceOrderBy' into develop
|
2016-07-11 17:06:35 +02:00 |
|
Marion Muszynski
|
df1e423c9c
|
modif order way
|
2016-07-11 17:06:11 +02:00 |
|
Marion Muszynski
|
a7ce4edbb2
|
Merge branch 'ticket-invoiceOrderBy' into develop
|
2016-07-11 16:15:28 +02:00 |
|
Marion Muszynski
|
ebd46063eb
|
small mod
|
2016-07-11 16:15:04 +02:00 |
|
Marion Muszynski
|
9284fe3daa
|
Merge branch 'ticket-invoiceOrderBy' into develop
|
2016-07-11 16:13:49 +02:00 |
|
Marion Muszynski
|
fce857f676
|
update order way M2
|
2016-07-11 16:13:21 +02:00 |
|
Marion Muszynski
|
d4739925e0
|
Merge branch 'ticket-invoiceOrderBy' into develop
|
2016-07-11 14:44:45 +02:00 |
|
Marion Muszynski
|
d1c984cb76
|
update sort invoice
|
2016-07-11 14:44:19 +02:00 |
|
Marion Muszynski
|
8ed0046163
|
Merge branch 'ticket-updatePendingOrder'
|
2016-07-11 12:37:58 +02:00 |
|
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
|
d2ec1e1de8
|
adding module blockordersummary
|
2016-07-08 17:51:48 +02:00 |
|
Marion Muszynski
|
bdcd83c40c
|
Merge branch 'ticket-invoiceOrderBy'
|
2016-07-08 16:03:53 +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
|
7366285f76
|
Merge branch 'ticket-editFast'
|
2016-07-06 15:23:26 +02:00 |
|
Marion Muszynski
|
47e637644d
|
add U param in response paybox
|
2016-07-06 15:22:41 +02:00 |
|
Marion Muszynski
|
115ef349c6
|
fix conflict where I deleted my modif !
|
2016-07-06 12:43:18 +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
|
86810cdb1e
|
Merge branch 'ticket-10377'
|
2016-07-06 11:20:42 +02:00 |
|
Marion Muszynski
|
281e562edf
|
Merge branch 'ticket-10377' into develop
|
2016-07-06 11:18:41 +02:00 |
|
Marion Muszynski
|
0ee8479f3c
|
remove grey border on shipping menu of product tpl
|
2016-07-06 11:18:06 +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 |
|