Marion Muszynski
|
48288ea952
|
fix query
|
2017-08-28 15:40:55 +02:00 |
|
Christophe Latour
|
1a3533b003
|
Merge branch 'develop' of gitlab.antadis.net:dev-antadis/bebeboutik into develop
|
2017-08-28 15:38:27 +02:00 |
|
Marion Muszynski
|
579306aecc
|
Merge branch 'ticket-13973-OrderInWaiting' into develop
|
2017-08-28 15:38:06 +02:00 |
|
Marion Muszynski
|
b221e2eaf5
|
order by carrier firstly
|
2017-08-28 15:37:48 +02:00 |
|
Marion Muszynski
|
a76dd668fe
|
addition of resetbopassword module
|
2017-08-28 14:30:30 +02:00 |
|
root
|
b9c24cbdbb
|
fixes and trad from prod
|
2017-08-28 11:00:40 +02:00 |
|
Marion Muszynski
|
21a91089fc
|
Merge branch 'ticket-14014-PRTMIS'
|
2017-08-28 10:04:37 +02:00 |
|
Marion Muszynski
|
1d12895602
|
fill prtmis field for mondial relay dpc
|
2017-08-28 10:04:09 +02:00 |
|
Marion Muszynski
|
e4d69066bc
|
Merge branch 'ticket-13974-MultiInvoiceWhenRefunding'
|
2017-08-25 15:50:26 +02:00 |
|
Marion Muszynski
|
9f2879d800
|
Merge branch 'ticket-13973-OrderInWaiting'
|
2017-08-25 15:08:10 +02:00 |
|
Marion Muszynski
|
66d31b9343
|
Merge branch 'add-carrierInOrderList'
|
2017-08-25 11:01:10 +02:00 |
|
Christophe Latour
|
4eef091227
|
Merge branch 'develop' of gitlab.antadis.net:dev-antadis/bebeboutik into develop
|
2017-08-25 10:55:12 +02:00 |
|
Marion Muszynski
|
af7b3bdd2e
|
Merge branch 'add-carrierInOrderList' into develop
|
2017-08-25 10:55:01 +02:00 |
|
Marion Muszynski
|
6caf8fbd99
|
fix
|
2017-08-25 10:54:46 +02:00 |
|
Christophe Latour
|
92a15a42cf
|
Merge branch 'develop' of gitlab.antadis.net:dev-antadis/bebeboutik into develop
|
2017-08-25 10:45:35 +02:00 |
|
Marion Muszynski
|
99a6cc80e3
|
Merge branch 'add-carrierInOrderList' into develop
|
2017-08-25 10:45:15 +02:00 |
|
Marion Muszynski
|
b46e35c500
|
indication of order carrier in order list
|
2017-08-25 10:44:59 +02:00 |
|
Christophe Latour
|
914f292631
|
Merge branch 'develop' of gitlab.antadis.net:dev-antadis/bebeboutik into develop
|
2017-08-24 16:10:51 +02:00 |
|
Marion Muszynski
|
a73f5cdf8c
|
Merge branch 'ticket-13974-MultiInvoiceWhenRefunding' into develop
|
2017-08-24 16:10:37 +02:00 |
|
Marion Muszynski
|
eaefb7f8e4
|
printing multi invoices when products from other sale are completely refunded
|
2017-08-24 16:10:22 +02:00 |
|
Christophe Latour
|
5d179855db
|
Merge branch 'develop' of gitlab.antadis.net:dev-antadis/bebeboutik into develop
|
2017-08-24 10:58:40 +02:00 |
|
Marion Muszynski
|
2d25c1470a
|
Merge branch 'ticket-13973-OrderInWaiting' into develop
|
2017-08-24 10:57:56 +02:00 |
|
Marion Muszynski
|
3ed2d5a51b
|
update pending orders
|
2017-08-24 10:57:38 +02:00 |
|
Marion Muszynski
|
8a6c7712b1
|
Merge branch 'ticket-13667-DnDPrivateSale'
|
2017-08-23 10:59:07 +02:00 |
|
Marion Muszynski
|
1713b36f29
|
fix
|
2017-08-23 10:58:54 +02:00 |
|
Marion Muszynski
|
862a14ce02
|
Merge branch 'ticket-13667-DnDPrivateSale'
|
2017-08-23 10:52:43 +02:00 |
|
Marion Muszynski
|
fc2caf3df4
|
fix async ajax for dnd
|
2017-08-23 10:52:28 +02:00 |
|
Marion Muszynski
|
976bd3a36f
|
Merge branch 'ticket-13798-ChangeAddressMR'
|
2017-08-23 09:56:56 +02:00 |
|
Christophe Latour
|
d06a7229e9
|
Merge branch 'develop' of gitlab.antadis.net:dev-antadis/bebeboutik into develop
|
2017-08-22 18:14:14 +02:00 |
|
Marion Muszynski
|
f4f0f61bca
|
Merge branch 'ticket-13798-ChangeAddressMR' into develop
|
2017-08-22 18:13:59 +02:00 |
|
Marion Muszynski
|
81189be0f5
|
small fixes
|
2017-08-22 18:13:48 +02:00 |
|
Christophe Latour
|
56a9023a48
|
Merge branch 'develop' of gitlab.antadis.net:dev-antadis/bebeboutik into develop
|
2017-08-22 17:47:39 +02:00 |
|
Marion Muszynski
|
1466d522d1
|
Merge branch 'ticket-13798-ChangeAddressMR' into develop
|
2017-08-22 17:47:29 +02:00 |
|
Marion Muszynski
|
20d20b4183
|
modification of mr relay by chosing position in order bo
|
2017-08-22 17:47:12 +02:00 |
|
Marion Muszynski
|
17d48fd74e
|
Merge branch 'ticket-14010-MRNotFound'
|
2017-08-22 16:21:22 +02:00 |
|
Marion Muszynski
|
f5a5600bba
|
formatting error message
|
2017-08-22 16:21:08 +02:00 |
|
Marion Muszynski
|
a7515c2a36
|
return an error when mr not found
|
2017-08-22 16:19:31 +02:00 |
|
Christophe Latour
|
245e26824f
|
Merge branch 'develop' of gitlab.antadis.net:dev-antadis/bebeboutik into develop
|
2017-08-22 14:54:24 +02:00 |
|
Marion Muszynski
|
355e392e6e
|
Merge branch 'ticket-13983-MailInTransitMR'
|
2017-08-22 14:54:15 +02:00 |
|
Marion Muszynski
|
95211c3b48
|
Merge branch 'ticket-13983-MailInTransitMR' into develop
|
2017-08-22 14:53:55 +02:00 |
|
Marion Muszynski
|
735739a317
|
send in transit mail for mr expe
|
2017-08-22 14:53:40 +02:00 |
|
Marion Muszynski
|
1a38af23c7
|
Merge branch 'ticket-13225-SpecificDelivery'
|
2017-08-22 13:08:33 +02:00 |
|
Marion Muszynski
|
b2aeb501e3
|
simple cot
|
2017-08-22 13:08:19 +02:00 |
|
Marion Muszynski
|
f2612bf9dd
|
Merge branch 'ticket-13225-SpecificDelivery'
|
2017-08-22 13:02:31 +02:00 |
|
Marion Muszynski
|
5afb4d3552
|
fix space
|
2017-08-22 13:02:18 +02:00 |
|
Marion Muszynski
|
acfb1da3ad
|
Merge branch 'ticket-13225-SpecificDelivery'
|
2017-08-22 12:58:46 +02:00 |
|
Marion Muszynski
|
38e6d5a7e9
|
add specific description in product tpl
|
2017-08-22 12:58:28 +02:00 |
|
Marion Muszynski
|
8c07e3b6a9
|
Merge branch 'ticket-13814-mailAlertUpdate'
|
2017-08-22 12:42:19 +02:00 |
|
Marion Muszynski
|
476c681b72
|
fix error of sentence
|
2017-08-22 12:42:08 +02:00 |
|
Marion Muszynski
|
8288d10a39
|
Merge branch 'ticket-13814-mailAlertUpdate'
|
2017-08-22 12:34:46 +02:00 |
|