Prevent saving zero qty lines in database.

diff --git a/sales/includes/db/sales_delivery_db.inc b/sales/includes/db/sales_delivery_db.inc
index 0cded9cc349f19b1de54f93f0b0d34209aae52f0..9cb9e86395c390b854570bb7a328e0f0dce5221a 100644 (file)
--- a/sales/includes/db/sales_delivery_db.inc
+++ b/sales/includes/db/sales_delivery_db.inc
@@ -54,7 +54,11 @@ function write_sales_delivery(&$delivery,$bo_policy)
                delete_comments(ST_CUSTDELIVERY, $delivery_no);
        }
 
-       foreach ($delivery->line_items as $delivery_line) {
+       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,
@@ -66,10 +70,6 @@ function write_sales_delivery(&$delivery,$bo_policy)
                if ($trans_no != 0) // Inserted 2008-09-25 Joe Hunt
                        $delivery_line->standard_cost = get_standard_cost($delivery_line->stock_id);
 
-               // do not use standard cost if it's a non-inventory item, 2010-02-03 Joe Hunt
-               if (!is_inventory_item($delivery_line->stock_id))
-                       $delivery_line->standard_cost = 0;
-
                /* add delivery details for all lines */
                write_customer_trans_detail_item(ST_CUSTDELIVERY, $delivery_no, $delivery_line->stock_id,
                        $delivery_line->item_description, $delivery_line->qty_dispatched,
@@ -109,7 +109,6 @@ function write_sales_delivery(&$delivery,$bo_policy)
                                        "The cost of sales GL posting could not be inserted");
 
                                /*now the stock entry*/
-                               //$stock_gl_code = get_stock_gl_code($order_line->stock_id);
 
                                add_gl_trans_std_cost(ST_CUSTDELIVERY, $delivery_no, $delivery->document_date,
                                        $stock_gl_code["inventory_account"], 0, 0, "",

diff --git a/sales/includes/db/sales_invoice_db.inc b/sales/includes/db/sales_invoice_db.inc
index c4e97e4c6dd84545f5585e26fda8105c00f997c3..a66fefe6c31d3c8bfacbf77376aedddd26b01c84 100644 (file)
--- a/sales/includes/db/sales_invoice_db.inc
+++ b/sales/includes/db/sales_invoice_db.inc
@@ -85,8 +85,11 @@ function write_sales_invoice(&$invoice)
                void_trans_tax_details(ST_SALESINVOICE, $invoice_no);
        }
        $total = 0;
-       foreach ($invoice->line_items as $invoice_line) {
-
+       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);