From 7a396ab842b7aa9947e35af6ecdca87938abc146 Mon Sep 17 00:00:00 2001 From: Janusz Dobrowolski Date: Sat, 6 Feb 2010 19:02:32 +0000 Subject: [PATCH] Removed last changes. --- sales/includes/db/sales_delivery_db.inc | 5 +---- sales/includes/db/sales_invoice_db.inc | 5 +---- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/sales/includes/db/sales_delivery_db.inc b/sales/includes/db/sales_delivery_db.inc index 9cb9e863..2cfda5e4 100644 --- a/sales/includes/db/sales_delivery_db.inc +++ b/sales/includes/db/sales_delivery_db.inc @@ -55,10 +55,7 @@ function write_sales_delivery(&$delivery,$bo_policy) } foreach ($delivery->line_items as $line_no => $delivery_line) { - if ($delivery_line->qty_dispatched == 0) { - unset($delivery->line_items[$line_no]); - continue; - } + $line_price = $delivery_line->line_price(); $line_taxfree_price = get_tax_free_price_for_item($delivery_line->stock_id, $delivery_line->price, 0, $delivery->tax_included, diff --git a/sales/includes/db/sales_invoice_db.inc b/sales/includes/db/sales_invoice_db.inc index a66fefe6..f0798af5 100644 --- a/sales/includes/db/sales_invoice_db.inc +++ b/sales/includes/db/sales_invoice_db.inc @@ -86,10 +86,7 @@ function write_sales_invoice(&$invoice) } $total = 0; foreach ($invoice->line_items as $line_no => $invoice_line) { - if ($invoice_line->qty_dispatched == 0) { - unset($invoice->line_items[$line_no]); - continue; - } + $line_taxfree_price = get_tax_free_price_for_item($invoice_line->stock_id, $invoice_line->price, 0, $invoice->tax_included, $invoice->tax_group_array); -- 2.30.2