X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=sales%2Fincludes%2Fdb%2Fsales_invoice_db.inc;h=3b540d55f2dea6d30a52abbef5a95e8f4d5632f8;hb=98a185d9959e4e273142042b354d42f77e013cdf;hp=c4e97e4c6dd84545f5585e26fda8105c00f997c3;hpb=ddadb47f2620ce6902ad4694ce6512568862ba05;p=fa-stable.git

diff --git a/sales/includes/db/sales_invoice_db.inc b/sales/includes/db/sales_invoice_db.inc
index c4e97e4c..3b540d55 100644
--- a/sales/includes/db/sales_invoice_db.inc
+++ b/sales/includes/db/sales_invoice_db.inc
@@ -35,10 +35,6 @@ function write_sales_invoice(&$invoice)
 	$items_total = $invoice->get_items_total_dispatch();
 	$freight_tax = $invoice->get_shipping_tax();
 
-	$delivery_no = $invoice->src_docs;
-	if (is_array($delivery_no))
-		$delivery_no = 0;
-
 	update_customer_trans_version(get_parent_type(ST_SALESINVOICE), $invoice->src_docs);
 
 	$ov_gst = 0;
@@ -71,13 +67,13 @@ function write_sales_invoice(&$invoice)
 	$invoice_no = write_customer_trans(ST_SALESINVOICE, $trans_no, $invoice->customer_id,
 		$invoice->Branch, $date_, $invoice->reference, $items_total, 0,
 		$items_added_tax, $invoice->freight_cost, $freight_added_tax,
-		$invoice->sales_type, $sales_order, $delivery_no,
-		$invoice->ship_via, $invoice->due_date, $alloc, 0, $invoice->dimension_id, $invoice->dimension2_id); 
+		$invoice->sales_type, $sales_order, $invoice->ship_via, 
+		$invoice->due_date, $alloc, 0, $invoice->dimension_id, 
+		$invoice->dimension2_id, $invoice->payment); 
 		// 2008-06-14 extra $alloc, 2008-11-12 added dimension_id Joe Hunt
 
 	if ($trans_no == 0) {
 		$invoice->trans_no = array($invoice_no=>0);
-		set_document_parent($invoice);
 	} else {
 		delete_comments(ST_SALESINVOICE, $invoice_no);
 		void_gl_trans(ST_SALESINVOICE, $invoice_no, true);
@@ -85,7 +81,7 @@ 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) {
 
 		$line_taxfree_price = get_tax_free_price_for_item($invoice_line->stock_id,
 			$invoice_line->price, 0, $invoice->tax_included,
@@ -98,7 +94,7 @@ function write_sales_invoice(&$invoice)
 		write_customer_trans_detail_item(ST_SALESINVOICE, $invoice_no, $invoice_line->stock_id,
 			$invoice_line->item_description, $invoice_line->qty_dispatched,
 			$invoice_line->line_price(), $line_tax,	$invoice_line->discount_percent,
-			$invoice_line->standard_cost,
+			$invoice_line->standard_cost, $invoice_line->src_id,
 			$trans_no ? $invoice_line->id : 0);
 
 		// Update delivery items for the quantity invoiced
@@ -201,15 +197,24 @@ function void_sales_invoice($type, $type_no)
 	void_gl_trans($type, $type_no, true);
 
 	// reverse all the changes in parent document(s)
-	$items_result = get_customer_trans_details($type, $type_no);
 
-	$deliveries = get_parent_trans($type, $type_no);
+	$deliveries = get_sales_parent_numbers($type, $type_no);
 
 	if ($deliveries !== 0) {
-		$srcdetails = get_customer_trans_details(get_parent_type($type), $deliveries);
-		while ($row = db_fetch($items_result)) {
-			$src_line = db_fetch($srcdetails);
-			update_parent_line($type, $src_line['id'], -$row['quantity']);
+		if (count($deliveries) == 1 && get_reference(ST_CUSTDELIVERY, $deliveries[0]) == "auto")
+		{
+			void_sales_delivery(ST_CUSTDELIVERY, $deliveries[0], false);
+			$date_ = Today();
+			add_audit_trail(ST_CUSTDELIVERY, $deliveries[0], $date_, _("Voided."));
+			add_voided_entry(ST_CUSTDELIVERY, $deliveries[0], $date_, "");
+		}
+		else
+		{
+			
+			$srcdetails = get_sales_parent_lines($type, $type_no);
+			while ($row = db_fetch($src_details)) {
+				update_parent_line($type, $row['id'], -$row['quantity']);
+			}
 		}
 	}
 	// clear details after they've been reversed in the sales order