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
|
979e3b3733
|
fix grammar error
|
2017-08-22 12:33:13 +02:00 |
|
Marion Muszynski
|
ff21d90390
|
change information in admin form
|
2017-08-22 12:29:40 +02:00 |
|
Marion Muszynski
|
2a4c9d9716
|
fix update last sent date
|
2017-08-22 12:25:47 +02:00 |
|
Marion Muszynski
|
ae50abd4d5
|
fix
|
2017-08-22 12:21:39 +02:00 |
|
Marion Muszynski
|
c3e6114948
|
fix param
|
2017-08-22 11:57:21 +02:00 |
|
Marion Muszynski
|
e6830465e0
|
fix
|
2017-08-22 11:43:58 +02:00 |
|
Marion Muszynski
|
fb748dbad6
|
add models
|
2017-08-22 11:35:39 +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
|
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
|
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 |
|
Marion Muszynski
|
34e0b3552b
|
Merge branch 'ticket-13984-MRshippingNumber'
|
2017-08-18 11:18:39 +02:00 |
|
Marion Muszynski
|
a1b13d71cc
|
add mr shipping number in order detail tpl
|
2017-08-18 11:18:06 +02:00 |
|
Marion Muszynski
|
4a02a00cbd
|
Merge branch 'ticket-returnprocess-final'
|
2017-08-17 16:12:04 +02:00 |
|
Marion Muszynski
|
1247fc2492
|
fix css
|
2017-08-17 16:09:33 +02:00 |
|
Marion Muszynski
|
47965cf5ed
|
fix go next
|
2017-08-17 16:03:52 +02:00 |
|
Marion Muszynski
|
4a5aa5c7c4
|
add discount and mr shipping numbers
|
2017-08-17 15:52:58 +02:00 |
|
Marion Muszynski
|
613ac55478
|
fix sentences
|
2017-08-17 15:26:06 +02:00 |
|
Marion Muszynski
|
abd8e88343
|
addition of new delivery delay and cleaning of sale combination
|
2017-08-17 11:22:54 +02:00 |
|
Marion Muszynski
|
61ae6d6fc1
|
Merge branch 'ticket-13745-modifMobileLogo'
|
2017-08-16 15:04:45 +02:00 |
|
Marion Muszynski
|
945db4ad17
|
change mobile logo according language
|
2017-08-16 15:03:23 +02:00 |
|
Marion Muszynski
|
889259d031
|
fix async bug for saving gift message of cart
|
2017-08-16 11:04:23 +02:00 |
|
Marion Muszynski
|
9f959444ce
|
Merge branch 'ticket-12743-SavSupplierPart2'
|
2017-07-28 12:37:22 +02:00 |
|
Marion Muszynski
|
e6a7ab447d
|
add name of product in demand in adminOrder
|
2017-07-28 12:36:49 +02:00 |
|
Marion Muszynski
|
1685846768
|
Merge branch 'ticket-12743-SavSupplierPart2'
|
2017-07-28 12:19:02 +02:00 |
|
Marion Muszynski
|
1412696156
|
addition of solution field for supplier demand
|
2017-07-28 12:16:24 +02:00 |
|
Marion Muszynski
|
1b1e303364
|
Merge branch 'ticket-13754-fixSalePosition'
|
2017-07-27 12:07:54 +02:00 |
|
Marion Muszynski
|
bd9ff4fe9e
|
fix position of sale with lock position
|
2017-07-27 12:07:35 +02:00 |
|
root
|
74b797960e
|
fix legend from prod
|
2017-07-26 15:34:17 +02:00 |
|
Marion Muszynski
|
c1b06a0b4c
|
Merge branch 'ticket-13323-AdwordsES'
|
2017-07-26 13:34:18 +02:00 |
|
Marion Muszynski
|
58b3c509b4
|
prevent multi tracking after registration
|
2017-07-26 13:21:18 +02:00 |
|