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 |
|
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 |
|
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 |
|
Marion Muszynski
|
45a83412e6
|
Merge branch 'ticket-13814-mailAlertUpdate' into develop
|
2017-08-22 12:33:24 +02:00 |
|
Marion Muszynski
|
979e3b3733
|
fix grammar error
|
2017-08-22 12:33:13 +02:00 |
|
Marion Muszynski
|
5d065bae7a
|
Merge branch 'ticket-13814-mailAlertUpdate' into develop
|
2017-08-22 12:29:58 +02:00 |
|
Marion Muszynski
|
ff21d90390
|
change information in admin form
|
2017-08-22 12:29:40 +02:00 |
|
Marion Muszynski
|
c0c99bd7e9
|
Merge branch 'ticket-13814-mailAlertUpdate' into develop
|
2017-08-22 12:26:00 +02:00 |
|
Marion Muszynski
|
2a4c9d9716
|
fix update last sent date
|
2017-08-22 12:25:47 +02:00 |
|
Marion Muszynski
|
ae6ef9393c
|
Merge branch 'ticket-13814-mailAlertUpdate' into develop
|
2017-08-22 12:21:55 +02:00 |
|
Marion Muszynski
|
ae50abd4d5
|
fix
|
2017-08-22 12:21:39 +02:00 |
|
Marion Muszynski
|
b283b18d74
|
Merge branch 'ticket-13814-mailAlertUpdate' into develop
|
2017-08-22 11:57:31 +02:00 |
|
Marion Muszynski
|
c3e6114948
|
fix param
|
2017-08-22 11:57:21 +02:00 |
|
Marion Muszynski
|
4befac4029
|
Merge branch 'ticket-13814-mailAlertUpdate' into develop
|
2017-08-22 11:44:08 +02:00 |
|
Marion Muszynski
|
e6830465e0
|
fix
|
2017-08-22 11:43:58 +02:00 |
|
Marion Muszynski
|
2c541bfd6b
|
Merge branch 'ticket-13814-mailAlertUpdate' into develop
|
2017-08-22 11:35:59 +02:00 |
|
Marion Muszynski
|
fb748dbad6
|
add models
|
2017-08-22 11:35:39 +02:00 |
|
Marion Muszynski
|
15a82bf7f0
|
Merge branch 'ticket-13814-mailAlertUpdate' into develop
|
2017-08-22 11:31:13 +02:00 |
|
Marion Muszynski
|
a4853d9043
|
updating Mail alert module
|
2017-08-22 11:30:56 +02:00 |
|
root
|
a56d8c04e8
|
fix from prod
|
2017-08-22 09:59:32 +02:00 |
|
root
|
76dee4cf4c
|
fix from prod
|
2017-08-21 17:57:02 +02:00 |
|
Marion Muszynski
|
5308a026f6
|
Merge branch 'ticket-multicoliMr'
|
2017-08-21 15:05:34 +02:00 |
|
Marion Muszynski
|
8636efc018
|
fix reprint MR for multi parcel
|
2017-08-21 15:05:19 +02:00 |
|
Marion Muszynski
|
5573d5a98d
|
Merge branch 'ticket-13942-fixDeliveryDelay'
|
2017-08-21 12:26:57 +02:00 |
|
root
|
1efe0a509d
|
fix from prod
|
2017-08-21 12:20:02 +02:00 |
|
Marion Muszynski
|
aca897dd80
|
Merge branch 'ticket-13942-fixDeliveryDelay' into develop
|
2017-08-21 12:06:06 +02:00 |
|
Marion Muszynski
|
deebe9e910
|
fix sale delay
|
2017-08-21 12:05:51 +02:00 |
|
Marion Muszynski
|
f36246257c
|
fix conflict
|
2017-08-21 11:46:25 +02:00 |
|
Marion Muszynski
|
dcf639a2af
|
Merge branch 'ticket-13991-ModifCompanyNameMrPhilea'
|
2017-08-21 11:44:52 +02:00 |
|
Marion Muszynski
|
0e84b82114
|
remove company name for MR expe
|
2017-08-21 11:44:27 +02:00 |
|
Marion Muszynski
|
13576c64d8
|
fix conflicts
|
2017-08-21 11:04:16 +02:00 |
|
Marion Muszynski
|
379efc6600
|
Merge branch 'ticket-13564-giftOnShoppingCart' into develop
|
2017-08-21 11:00:52 +02:00 |
|
Marion Muszynski
|
e4c877bd71
|
precheck gift option in admin invoices
|
2017-08-21 11:00:31 +02:00 |
|
Marion Muszynski
|
851ff949be
|
Merge branch 'ticket-13225-SpecificDelivery'
|
2017-08-21 10:46:55 +02:00 |
|