From f7250f76d5f790b113d06f38831811c5d384cbc3 Mon Sep 17 00:00:00 2001 From: aFolletete Date: Mon, 5 Dec 2011 10:40:06 +0000 Subject: [PATCH] // fix bug on Order class git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10897 b9a71923-0436-4b27-9f14-aed3839534dd --- classes/order/Order.php | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/classes/order/Order.php b/classes/order/Order.php index 195845380..d4b4bc339 100644 --- a/classes/order/Order.php +++ b/classes/order/Order.php @@ -1059,8 +1059,8 @@ class OrderCore extends ObjectModel else $order_invoice->number = self::getLastInvoiceNumber() + 1; - $order_invoice->total_discount_tax_excl = $this->total_discount_tax_excl; - $order_invoice->total_discount_tax_incl = $this->total_discount_tax_incl; + $order_invoice->total_discount_tax_excl = $this->total_discounts_tax_excl; + $order_invoice->total_discount_tax_incl = $this->total_discounts_tax_incl; $order_invoice->total_paid_tax_excl = $this->total_paid_tax_excl; $order_invoice->total_paid_tax_incl = $this->total_paid_tax_incl; $order_invoice->total_products = $this->total_products; @@ -1085,8 +1085,9 @@ class OrderCore extends ObjectModel SET `id_order_invoice` = '.(int)$order_invoice->id.' WHERE `id_order` = '.(int)$order_invoice->id_order); - $this->invoice_date = $res['invoice_date']; - $this->invoice_number = $res['invoice_number']; + $this->invoice_date = $order_invoice->date_add; + $this->invoice_number = $order_invoice->number; + $this->update(); } }