X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=sales%2Fincludes%2Fdb%2Fsales_invoice_db.inc;h=d37463c49c7d34f99bcbea12259f85fbcf4eaac2;hb=91bede4226ba8b45151f0501ac88eb946ed5f2a1;hp=2032bcf058d0a55e1f0ab9d97aa81b4e3ba923d5;hpb=3f3cfa578adbc2b71f4fd9c8d0f5536d26af43d8;p=fa-stable.git

diff --git a/sales/includes/db/sales_invoice_db.inc b/sales/includes/db/sales_invoice_db.inc
index 2032bcf0..d37463c4 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();
@@ -196,8 +198,8 @@ function write_sales_invoice(&$invoice)
 				_('Cash invoice').' '.$invoice_no);
 			add_cust_allocation($amount, ST_CUSTPAYMENT, $pmtno, ST_SALESINVOICE, $invoice_no);
 
-			update_debtor_trans_allocation(ST_SALESINVOICE, $invoice_no, $amount);
-			update_debtor_trans_allocation(ST_CUSTPAYMENT, $pmtno, $amount);
+			update_debtor_trans_allocation(ST_SALESINVOICE, $invoice_no);
+			update_debtor_trans_allocation(ST_CUSTPAYMENT, $pmtno);
 		}
 	}
 //_vd($allocs);
@@ -242,7 +244,7 @@ function void_sales_invoice($type, $type_no)
 		$deliveries = get_sales_parent_numbers($type, $type_no);
 
 		if ($deliveries !== 0) {
-			if (count($deliveries) == 1 && get_reference(ST_CUSTDELIVERY, $deliveries[0]) == "auto")
+			if ($type == ST_SALESINVOICE && count($deliveries) == 1 && get_reference(ST_CUSTDELIVERY, $deliveries[0]) == "auto")
 			{
 				void_sales_delivery(ST_CUSTDELIVERY, $deliveries[0], false);
 				$date_ = Today();
@@ -252,7 +254,7 @@ function void_sales_invoice($type, $type_no)
 			else
 			{
 				$srcdetails = get_sales_parent_lines($type, $type_no);
-					while ($row = db_fetch($srcdetails)) {
+				while ($row = db_fetch($srcdetails)) {
 					update_parent_line($type, $row['id'], -$row['quantity']);
 				}
 			}
@@ -261,6 +263,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);