Marion Muszynski
|
0b5cb21977
|
small fix
|
2016-07-18 11:53:37 +02:00 |
|
Marion Muszynski
|
fb51c877c4
|
suite save paybox info
|
2016-07-18 11:45:18 +02:00 |
|
Marion Muszynski
|
5ae34ea5ab
|
fix
|
2016-07-15 17:56:41 +02:00 |
|
Marion Muszynski
|
5dbd39aadd
|
first commit to save paybox cards
|
2016-07-15 17:49:13 +02:00 |
|
Marion Muszynski
|
2b9fd29308
|
Merge branch 'ticket-invoiceOrderBy'
|
2016-07-13 10:59:09 +02:00 |
|
Marion Muszynski
|
a271b56774
|
getproducts with tri
|
2016-07-13 10:30:36 +02:00 |
|
Marion Muszynski
|
f05ceff33d
|
Merge branch 'ticket-10444'
|
2016-07-12 18:02:30 +02:00 |
|
Marion Muszynski
|
4acaacaaa8
|
other modif
|
2016-07-12 17:59:18 +02:00 |
|
Marion Muszynski
|
c0117d7819
|
good modif
|
2016-07-12 17:35:38 +02:00 |
|
Marion Muszynski
|
fd51d7f449
|
small update
|
2016-07-12 16:59:11 +02:00 |
|
Marion Muszynski
|
5303ef1b06
|
update BDC sale state
|
2016-07-12 16:23:23 +02:00 |
|
Marion Muszynski
|
df1e423c9c
|
modif order way
|
2016-07-11 17:06:11 +02:00 |
|
Marion Muszynski
|
ebd46063eb
|
small mod
|
2016-07-11 16:15:04 +02:00 |
|
Marion Muszynski
|
fce857f676
|
update order way M2
|
2016-07-11 16:13:21 +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
|
7faebc96f0
|
small js update in adminlogisticpending
|
2016-07-11 12:35:41 +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 |
|
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
|
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
|
0ee8479f3c
|
remove grey border on shipping menu of product tpl
|
2016-07-06 11:18:06 +02:00 |
|
Marion Muszynski
|
cc0b9ce4a3
|
Merge branch 'ticket-10363'
|
2016-07-05 15:15:01 +02:00 |
|
Marion Muszynski
|
e79421073d
|
adding pending orders to stock report
|
2016-07-05 15:11:33 +02:00 |
|
Marion Muszynski
|
95b176601a
|
adding preheader rss emarsys
|
2016-07-04 18:20:03 +02:00 |
|
Marion Muszynski
|
9391dd015a
|
adding column in admin invoice for same brand in multi sale
|
2016-07-04 17:51:26 +02:00 |
|
Marion Muszynski
|
45bf5e67b9
|
Merge branch 'adding-log-bo'
|
2016-07-04 17:43:25 +02:00 |
|
Marion Muszynski
|
4de026d0db
|
add id_employee
|
2016-07-04 17:42:02 +02:00 |
|
Marion Muszynski
|
2d5f691dcf
|
Merge branch 'adding-log-bo'
|
2016-07-04 17:36:29 +02:00 |
|
Marion Muszynski
|
8dbbf309bf
|
fix
|
2016-07-04 17:33:56 +02:00 |
|
Marion Muszynski
|
276cc9a2b6
|
sending email when order delivery address is modified in BO
|
2016-07-04 17:30:04 +02:00 |
|
Marion Muszynski
|
3be779d03b
|
Merge branch 'ticket-simplemulti_logistic'
|
2016-07-04 16:58:23 +02:00 |
|
Marion Muszynski
|
ff715abd60
|
Merge branch 'modif-css'
|
2016-07-01 16:44:13 +02:00 |
|
Marion Muszynski
|
47335062aa
|
Merge branch 'ticket-ecotax'
|
2016-07-01 12:27:13 +02:00 |
|
Marion Muszynski
|
6a87ea0460
|
modif add button
|
2016-07-01 11:29:00 +02:00 |
|
Marion Muszynski
|
e40768c734
|
modif img reduction on product list
|
2016-07-01 11:18:52 +02:00 |
|
Marion Muszynski
|
50698ab701
|
Merge branch 'ticket-6355'
|
2016-06-30 13:06:37 +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
|
f99cacd293
|
small update for mobile site
|
2016-06-30 10:47:46 +02:00 |
|
Marion Muszynski
|
760bd50c06
|
adding sentence according delivery delay
|
2016-06-29 15:52:03 +02:00 |
|
Marion Muszynski
|
20896d3bbf
|
adding popup error for mobile
|
2016-06-29 09:59:03 +02:00 |
|
Marion Muszynski
|
afebcee8af
|
Merge branch 'ticket-blockbestsellerProduct'
|
2016-06-28 16:17:23 +02:00 |
|
Marion Muszynski
|
e6585427ee
|
fix
|
2016-06-28 16:15:41 +02:00 |
|