X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Fincludes%2Fdb%2Fsales_invoice_db.inc;h=ecaf4466f9bb5f6d1b42c195d56cad1bcac13613;hb=9a98bb3bc7a94f1a8e47f8dab45a87c8b4212080;hp=95d5e396c9d2ad9a96cd42d503269c9cc373461c;hpb=49fa30e88e27b311edaca3ae3789d62e4629eb39;p=fa-stable.git

diff --git a/sales/includes/db/sales_invoice_db.inc b/sales/includes/db/sales_invoice_db.inc
index 95d5e396..ecaf4466 100644
--- a/sales/includes/db/sales_invoice_db.inc
+++ b/sales/includes/db/sales_invoice_db.inc
@@ -53,12 +53,6 @@ function write_sales_invoice(&$invoice)
 	    $items_added_tax = 0;
 	    $freight_added_tax = 0;
 	}
-	// 2006-06-14. If the Customer Branch AR Account is set to a Bank Account,
-	// the transaction will be settled at once.
-	if (is_bank_account($branch_data['receivables_account']))
-		$alloc = $items_total + $items_added_tax + $invoice->freight_cost + $freight_added_tax;
-	else
-		$alloc = 0;
 
 	/* Insert/update the debtor_trans */
 	$sales_order = $invoice->order_no;
@@ -69,8 +63,8 @@ function write_sales_invoice(&$invoice)
 		$invoice->Branch, $date_, $invoice->reference, $items_total, 0,
 		$items_added_tax, $invoice->freight_cost, $freight_added_tax,
 		$invoice->sales_type, $sales_order, $invoice->ship_via, 
-		$invoice->due_date, $alloc, 0, $invoice->dimension_id, 
-		$invoice->dimension2_id, $invoice->payment); 
+		$invoice->due_date, 0, 0, $invoice->dimension_id, 
+		$invoice->dimension2_id, $invoice->payment, $invoice->tax_included); 
 		// 2008-06-14 extra $alloc, 2008-11-12 added dimension_id Joe Hunt
 
 	if ($trans_no == 0) {
@@ -83,18 +77,18 @@ function write_sales_invoice(&$invoice)
 	}
 	$total = 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, 0, $invoice->tax_included,
+			$invoice_line->price * $qty, 0, $invoice->tax_included,
 			$invoice->tax_group_array);
 
 		$line_tax = get_full_price_for_item($invoice_line->stock_id,
-			$invoice_line->price, 0, $invoice->tax_included,
+			$invoice_line->price * $qty, 0, $invoice->tax_included,
 			$invoice->tax_group_array) - $line_taxfree_price;
 
 		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->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);
 
@@ -118,14 +112,14 @@ 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 * $invoice_line->qty_dispatched),
+					-$line_taxfree_price ,
 					$invoice->customer_id, "The sales price GL posting could not be inserted");
 
 				if ($invoice_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->qty_dispatched * $invoice_line->discount_percent),
+						($line_taxfree_price * $invoice_line->discount_percent),
 						$invoice->customer_id, "The sales discount GL posting could not be inserted");
 				} /*end of if discount !=0 */
 			}
@@ -152,9 +146,10 @@ function write_sales_invoice(&$invoice)
 				$taxitem['rate'], $invoice->tax_included, $taxitem['Value'],
 				 $taxitem['Net'], $ex_rate, $date_, $invoice->reference);
 
-			$total += add_gl_trans_customer(ST_SALESINVOICE, $invoice_no, $date_, $taxitem['sales_gl_code'], 0, 0,
-				(-$taxitem['Value']), $invoice->customer_id,
-				"A tax GL posting could not be inserted");
+			if (isset($taxitem['sales_gl_code']))
+				$total += add_gl_trans_customer(ST_SALESINVOICE, $invoice_no, $date_, $taxitem['sales_gl_code'], 0, 0,
+					(-$taxitem['Value']), $invoice->customer_id,
+					"A tax GL posting could not be inserted");
 		}
 	}
 
@@ -165,7 +160,7 @@ function write_sales_invoice(&$invoice)
 
 	if ($trans_no == 0) {
 		$Refs->save(ST_SALESINVOICE, $invoice_no, $invoice->reference);
-		if ($invoice->payment_terms['cash_sale']) {
+		if ($invoice->payment_terms['cash_sale'] && $invoice->pos['pos_account']) {
 			$amount = $items_total + $items_added_tax + $invoice->freight_cost 
 				+ $freight_added_tax;
 
@@ -174,7 +169,7 @@ function write_sales_invoice(&$invoice)
 			// and change line below.
 			$discount = 0; // $invoice->cash_discount*$amount;
 			$pmtno = write_customer_payment(0, $invoice->customer_id, 
-				$invoice->Branch, $invoice->cash_account, $date_,
+				$invoice->Branch, $invoice->pos['pos_account'], $date_,
 				$Refs->get_next(ST_CUSTPAYMENT), $amount-$discount, $discount,
 				_('Cash invoice').' '.$invoice_no);
 			add_cust_allocation($amount, ST_CUSTPAYMENT, $pmtno, ST_SALESINVOICE, $invoice_no);
@@ -215,7 +210,7 @@ function void_sales_invoice($type, $type_no)
 		{
 			
 			$srcdetails = get_sales_parent_lines($type, $type_no);
-			while ($row = db_fetch($src_details)) {
+			while ($row = db_fetch($srcdetails)) {
 				update_parent_line($type, $row['id'], -$row['quantity']);
 			}
 		}