X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Fincludes%2Fdb%2Fsales_invoice_db.inc;h=cd80b2cf939830a4d441f1cbb3711ddabf89d62d;hb=87e4961d8cb13efab395b6a5548164d6a748bf3d;hp=e9bb9fb7bd3b71d59688faa487a0bfec3a9d2c4c;hpb=446855c18c6f1dce78986695fc6015bc52d231b5;p=fa-stable.git

diff --git a/sales/includes/db/sales_invoice_db.inc b/sales/includes/db/sales_invoice_db.inc
index e9bb9fb7..cd80b2cf 100644
--- a/sales/includes/db/sales_invoice_db.inc
+++ b/sales/includes/db/sales_invoice_db.inc
@@ -32,6 +32,8 @@ function write_sales_invoice(&$invoice)
 
 	$customer = get_customer($invoice->customer_id);
 
+	add_new_exchange_rate($customer['curr_code'], $date_, $invoice->ex_rate);
+
 	// offer price values without freight costs
 	$items_total = $invoice->get_items_total_dispatch();
 	$freight_tax = $invoice->get_shipping_tax();
@@ -59,36 +61,37 @@ function write_sales_invoice(&$invoice)
 	if (is_array($sales_order))
 			$sales_order = $sales_order[0]; // assume all crucial SO data are same for every delivery
 
-	$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, $invoice->ship_via, 
-		$invoice->due_date, 0, 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) {
+         delete_comments(ST_SALESINVOICE, $trans_no);
+         void_gl_trans(ST_SALESINVOICE, $trans_no, true);
+         void_cust_allocations(ST_SALESINVOICE, $trans_no); // ?
+         void_trans_tax_details(ST_SALESINVOICE, $trans_no);
+    } 
+    $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, $invoice->ship_via, 
+	$invoice->due_date, 0, 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);
-	} else {
-		delete_comments(ST_SALESINVOICE, $invoice_no);
-		void_gl_trans(ST_SALESINVOICE, $invoice_no, true);
-		void_cust_allocations(ST_SALESINVOICE, $invoice_no); // ?
-		void_trans_tax_details(ST_SALESINVOICE, $invoice_no);
 	}
 	$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);
 
@@ -112,14 +115,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 */
 			}
@@ -195,19 +198,18 @@ function void_sales_invoice($type, $type_no)
 
 	// reverse all the changes in parent document(s)
 
-	$deliveries = get_sales_parent_numbers($type, $type_no);
+	$parents = get_sales_parent_numbers($type, $type_no);
 
-	if ($deliveries !== 0) {
-		if (count($deliveries) == 1 && get_reference(ST_CUSTDELIVERY, $deliveries[0]) == "auto")
+	if ($parents !== 0) {
+		if ($type == ST_SALESINVOICE && count($parents) == 1 && get_reference(ST_CUSTDELIVERY, $parents[0]) == "auto")
 		{
-			void_sales_delivery(ST_CUSTDELIVERY, $deliveries[0], false);
+			void_sales_delivery(ST_CUSTDELIVERY, $parents[0], false);
 			$date_ = Today();
-			add_audit_trail(ST_CUSTDELIVERY, $deliveries[0], $date_, _("Voided."));
-			add_voided_entry(ST_CUSTDELIVERY, $deliveries[0], $date_, "");
+			add_audit_trail(ST_CUSTDELIVERY, $parents[0], $date_, _("Voided."));
+			add_voided_entry(ST_CUSTDELIVERY, $parents[0], $date_, "");
 		}
 		else
 		{
-			
 			$srcdetails = get_sales_parent_lines($type, $type_no);
 			while ($row = db_fetch($srcdetails)) {
 				update_parent_line($type, $row['id'], -$row['quantity']);
@@ -217,6 +219,8 @@ function void_sales_invoice($type, $type_no)
 	// clear details after they've been reversed in the sales order
 	void_customer_trans_details($type, $type_no);
 
+	void_stock_move($type, $type_no); // in case of credit note with return
+
 	void_trans_tax_details($type, $type_no);
 
 	void_cust_allocations($type, $type_no);