Francois Gaillard 77b2b4b6ca // Manual merge PS 1.5.6.0

2013-10-07 18:22:55 +02:00

..

index.php

// Welcome 2013

2013-01-04 11:19:03 +01:00

Order.php

[*] BO: wrong description on getIdOrderCarrier

2013-10-03 15:51:27 +02:00

OrderCarrier.php

// Welcome 2013

2013-01-04 11:19:03 +01:00

OrderCartRule.php

[*] Project : Orders should rely only on ps_order_cart_rule

2013-09-03 15:10:06 +02:00

OrderDetail.php

[-] BO: product supplier price should not be converted on product page #PSCFV-9420

2013-07-02 15:45:12 +02:00

OrderDiscount.php

// Welcome 2013

2013-01-04 11:19:03 +01:00

OrderHistory.php

[-] CORE : fixed bug #PSCFV-10175 - No virtuel download email send after accepted payment

2013-08-27 10:09:35 +02:00

OrderInvoice.php

[*] BO: Allow to breakdown the taxes when they are computed

2013-10-01 11:55:56 +02:00

OrderMessage.php

// Welcome 2013

2013-01-04 11:19:03 +01:00

OrderPayment.php

// Report from https://github.com/Lupul/PrestaShop/commit/ebf09792e95598c30d8ac2617c4eabdd571be475

2013-10-07 12:08:39 +02:00

OrderReturn.php

// Made order message checks more flexible #PSCFV-8123

2013-03-19 16:39:02 +01:00

OrderReturnState.php

// Welcome 2013

2013-01-04 11:19:03 +01:00

OrderSlip.php

[*] Project : Orders should rely only on ps_order_cart_rule

2013-09-03 15:10:06 +02:00

OrderState.php

// Welcome 2013

2013-01-04 11:19:03 +01:00