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 |
|
Dylan Travers
|
c2d4fb13c9
|
Show only if product.quantity > 0
|
2016-07-08 15:37:30 +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 |
|
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
|
cc0b9ce4a3
|
Merge branch 'ticket-10363'
|
2016-07-05 15:15:01 +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
|
6e2d4dff6e
|
Merge branch 'ticket-simplemulti_invoice' into develop
|
2016-07-04 17:51:51 +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
|
2215524cc8
|
Merge branch 'adding-log-bo' into develop
|
2016-07-04 17:42:24 +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
|
125944c83f
|
Merge branch 'adding-log-bo' into develop
|
2016-07-04 17:34:16 +02:00 |
|
Marion Muszynski
|
8dbbf309bf
|
fix
|
2016-07-04 17:33:56 +02:00 |
|