X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=sales%2Fincludes%2Fdb%2Fsales_invoice_db.inc;h=1f79aa09db3780410457b0c71af0a167d1172298;hb=1c01c6f19f3a1410814abb63e4143d080373aaba;hp=90be614ef1425b867c21fac7cfb57bf49243145e;hpb=d9d661b1c7d0c7e8e92948ea9746b086a456f158;p=fa-stable.git

diff --git a/sales/includes/db/sales_invoice_db.inc b/sales/includes/db/sales_invoice_db.inc
index 90be614e..1f79aa09 100644
--- a/sales/includes/db/sales_invoice_db.inc
+++ b/sales/includes/db/sales_invoice_db.inc
@@ -56,7 +56,7 @@ function write_sales_invoice(&$invoice)
 	}
 
 	if($invoice->tax_included==0) {
-	    $items_added_tax = $ov_gst-$freight_tax;
+	    $items_added_tax = $ov_gst - $freight_tax;
 	    $freight_added_tax = $freight_tax;
 	} else {
 	    $items_added_tax = 0;
@@ -102,34 +102,31 @@ function write_sales_invoice(&$invoice)
 	// for prepayments use deferred income account if set
 	$sales_account = $invoice->is_prepaid() ? get_company_pref('deferred_income_act') : 0;
 
-	foreach ($invoice->line_items as $line_no => $invoice_line) {
-		$qty = $invoice_line->qty_dispatched;
-		$line_taxfree_price = get_tax_free_price_for_item($invoice_line->stock_id,
-			$invoice_line->price * $qty, 0, $invoice->tax_included,
-			$invoice->tax_group_array);
+	$invoice->split_line_values();
+	foreach ($invoice->line_items as $line_no => $line) {
+		$qty = $line->qty_dispatched;
+		$line_taxfree_price = $line->gl_amounts['Net'];
 
-		$line_tax = get_full_price_for_item($invoice_line->stock_id,
-			$invoice_line->price * $qty, 0, $invoice->tax_included,
-			$invoice->tax_group_array) - $line_taxfree_price;
+		$line_tax = $line->gl_amounts['Tax'];
 
-		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(), $qty ? $line_tax/$qty : 0, $invoice_line->discount_percent,
-			$invoice_line->standard_cost, $invoice_line->src_id,
-			$trans_no ? $invoice_line->id : 0);
+		write_customer_trans_detail_item(ST_SALESINVOICE, $invoice_no, $line->stock_id,
+			$line->item_description, $line->qty_dispatched,
+			$line->line_price(), $qty ? $line_tax/$qty : 0, $line->discount_percent,
+			$line->unit_cost, $line->src_id,
+			$trans_no ? $line->id : 0);
 
 		// Update delivery items for the quantity invoiced
-		if ($invoice_line->qty_old != $invoice_line->qty_dispatched)
+		if ($line->qty_old != $line->qty_dispatched)
 		{
 			if ($invoice->is_prepaid())
-				update_prepaid_so_line($invoice_line->src_id, $invoice_line->qty_dispatched-$invoice_line->qty_old);
+				update_prepaid_so_line($line->src_id, $line->qty_dispatched-$line->qty_old);
 			else
-				update_parent_line(ST_SALESINVOICE, $invoice_line->src_id, ($invoice_line->qty_dispatched-$invoice_line->qty_old));
+				update_parent_line(ST_SALESINVOICE, $line->src_id, ($line->qty_dispatched-$line->qty_old));
 		}
-		if ($invoice_line->qty_dispatched != 0) {
-			$stock_gl_code = get_stock_gl_code($invoice_line->stock_id);
+		if ($line->qty_dispatched != 0) {
+			$stock_gl_code = get_stock_gl_code($line->stock_id);
 
-			if ($invoice_line->line_price() != 0) {
+			if ($line->line_price() != 0) {
 				//Post sales transaction to GL credit sales
 
 				// If there is a Branch Sales Account, then override with this,
@@ -143,15 +140,13 @@ function write_sales_invoice(&$invoice)
 				$dim2 = ($invoice->dimension2_id != $customer['dimension2_id'] ? $invoice->dimension2_id : 
 					($customer['dimension2_id'] != 0 ? $customer["dimension2_id"] : $stock_gl_code["dimension2_id"]));
 				$total += add_gl_trans_customer(ST_SALESINVOICE, $invoice_no, $date_, $sales_account, $dim, $dim2,
-					-$line_taxfree_price*$prepaid_factor,
-					$invoice->customer_id, "The sales price GL posting could not be inserted");
+					-$line_taxfree_price*$prepaid_factor, $invoice->customer_id);
 
-				if ($invoice_line->discount_percent != 0) {
+				if ($line->discount_percent != 0) {
 
 					$total += add_gl_trans_customer(ST_SALESINVOICE, $invoice_no, $date_,
 						$branch_data["sales_discount_account"], $dim, $dim2,
-						($line_taxfree_price * $invoice_line->discount_percent)*$prepaid_factor,
-						$invoice->customer_id, "The sales discount GL posting could not be inserted");
+						($line_taxfree_price * $line->discount_percent)*$prepaid_factor, $invoice->customer_id);
 				} /*end of if discount !=0 */
 			}
 		} /*quantity dispatched is more than 0 */
@@ -159,15 +154,13 @@ function write_sales_invoice(&$invoice)
 
 	if (($items_total + $charge_shipping) != 0) {
 		$total += add_gl_trans_customer(ST_SALESINVOICE, $invoice_no, $date_, $branch_data["receivables_account"], 0, 0,
-			($items_total + $charge_shipping + $items_added_tax + $freight_added_tax)*$prepaid_factor,
-			$invoice->customer_id, "The total debtor GL posting could not be inserted");
+			($items_total + $charge_shipping + $items_added_tax + $freight_added_tax)*$prepaid_factor, $invoice->customer_id);
 	}
 	$to_allocate = ($items_total + $charge_shipping + $items_added_tax + $freight_added_tax);
 
 	if ($charge_shipping != 0) {
 		$total += add_gl_trans_customer(ST_SALESINVOICE, $invoice_no, $date_, $company_data["freight_act"], 0, 0,
-			-$invoice->get_tax_free_shipping()*$prepaid_factor, $invoice->customer_id,
-			"The freight GL posting could not be inserted");
+			-$invoice->get_tax_free_shipping()*$prepaid_factor, $invoice->customer_id);
 	}
 	// post all taxes
 	foreach ($taxes as $taxitem) {
@@ -175,11 +168,10 @@ function write_sales_invoice(&$invoice)
 			$ex_rate = get_exchange_rate_from_home_currency(get_customer_currency($invoice->customer_id), $date_);
 			add_trans_tax_details(ST_SALESINVOICE, $invoice_no, $taxitem['tax_type_id'],
 				$taxitem['rate'], $invoice->tax_included, $prepaid_factor*$taxitem['Value'],
-				 $taxitem['Net'], $ex_rate, $date_, $invoice->reference, TR_OUTPUT);
-			if (isset($taxitem['sales_gl_code']))
+				 $taxitem['Net'], $ex_rate, $date_, $invoice->reference, TR_OUTPUT, $invoice->tax_group_id);
+			if (isset($taxitem['sales_gl_code']) && !empty($taxitem['sales_gl_code']) && $taxitem['Value'] != 0)
 				$total += add_gl_trans_customer(ST_SALESINVOICE, $invoice_no, $date_, $taxitem['sales_gl_code'], 0, 0,
-					(-$taxitem['Value'])*$prepaid_factor, $invoice->customer_id,
-					"A tax GL posting could not be inserted");
+					(-$taxitem['Value'])*$prepaid_factor, $invoice->customer_id);
 		}
 	}
 
@@ -203,7 +195,7 @@ function write_sales_invoice(&$invoice)
 				$Refs->get_next(ST_CUSTPAYMENT, null, array('customer' => $invoice->customer_id,
 					'branch' => $invoice->Branch, 'date' => $date_)),
 				$amount-$discount, $discount,
-				_('Cash invoice').' '.$invoice_no);
+				$invoice->pos['pos_name'].' #'.$invoice_no);
 			add_cust_allocation($amount, ST_CUSTPAYMENT, $pmtno, ST_SALESINVOICE, $invoice_no, $invoice->customer_id, $date_);
 
 			update_debtor_trans_allocation(ST_SALESINVOICE, $invoice_no, $invoice->customer_id);
@@ -271,7 +263,6 @@ function void_sales_invoice($type, $type_no)
 	// do this last because other voidings can depend on it - especially voiding
 	// DO NOT MOVE THIS ABOVE VOIDING or we can end up with trans with alloc < 0
 	void_customer_trans($type, $type_no);
-
 	commit_transaction();
 }