X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Fincludes%2Fdb%2Fsales_credit_db.inc;h=cdf86abfdccaa4ebaed845476777f990c618cb0f;hb=d92fb975635e81ed5bc61e0d27318511d36bf0be;hp=ce1cb17f14ae5fd9097cc7ab5476eaf530a4fa37;hpb=49fa30e88e27b311edaca3ae3789d62e4629eb39;p=fa-stable.git

diff --git a/sales/includes/db/sales_credit_db.inc b/sales/includes/db/sales_credit_db.inc
index ce1cb17f..cdf86abf 100644
--- a/sales/includes/db/sales_credit_db.inc
+++ b/sales/includes/db/sales_credit_db.inc
@@ -17,8 +17,13 @@ function write_credit_note(&$credit_note, $write_off_acc)
 {
 	global $Refs;
 
-	$credit_invoice = 	is_array($credit_note->src_docs) ?
-		 reset(array_keys($credit_note->src_docs)) : $credit_note->src_docs;
+	if (is_array($credit_note->src_docs))
+	{
+		$docs = array_keys($credit_note->src_docs);
+		$credit_invoice = reset($docs);
+	}
+	else
+		$credit_invoice = $credit_note->src_docs;
 
 	$credit_date = $credit_note->document_date;
 	$tax_group_id = $credit_note->tax_group_id;
@@ -36,6 +41,8 @@ function write_credit_note(&$credit_note, $write_off_acc)
 	$company_data = get_company_prefs();
 	$branch_data = get_branch_accounts($credit_note->Branch);
 
+	add_new_exchange_rate(get_customer_currency($credit_note->customer_id), $credit_date, $credit_note->ex_rate);
+
 	$credit_note_total = $credit_note->get_items_total_dispatch();
 	$freight_tax = $credit_note->get_shipping_tax();
 
@@ -74,7 +81,7 @@ function write_credit_note(&$credit_note, $write_off_acc)
 		$credit_note->freight_cost, $freight_added_tax,
 		$credit_note->sales_type, $credit_note->order_no, $credit_note->ship_via,
 		null, $alloc, 0, $credit_note->dimension_id, $credit_note->dimension2_id,
-		$credit_note->payment); 
+		$credit_note->payment, $credit_note->tax_included); 
 		// 2008-06-14 extra $alloc, 2008-11-12 dimension_id Joe Hunt
 
 	if ($trans_no==0) {
@@ -175,6 +182,9 @@ function add_credit_movements_item(&$credit_note, &$credit_line,
 	$credit_type, $price, $credited_invoice=0)
 {
 
+    //Chaitanya : Stamp current cost in stock moves $credit_line does not fetch cost
+    $curr_std_cost = get_standard_cost($credit_line->stock_id);
+
 	if ($credit_type == "Return") {
 
 		$reference = "Return ";
@@ -188,20 +198,20 @@ function add_credit_movements_item(&$credit_note, &$credit_line,
 		if ($credited_invoice)
 			$reference .= "Ex Inv: " . $credited_invoice;
 
-	add_stock_move_customer(ST_CUSTCREDIT,  $credit_line->stock_id,
-		key($credit_note->trans_no), $credit_note->Location,
-		$credit_note->document_date, $reference, -$credit_line->qty_dispatched,
-		$credit_line->standard_cost,  0, $price,
-		$credit_line->discount_percent);
-
-		}
-	add_stock_move_customer(ST_CUSTCREDIT,  $credit_line->stock_id,
-		key($credit_note->trans_no), $credit_note->Location,
-		$credit_note->document_date, $reference, $credit_line->qty_dispatched,
-		$credit_line->standard_cost,  0, $price,
-		$credit_line->discount_percent);
+   	 	add_stock_move_customer(ST_CUSTCREDIT,  $credit_line->stock_id,
+        	key($credit_note->trans_no), $credit_note->Location,
+        	$credit_note->document_date, $reference, -$credit_line->qty_dispatched,
+        	$curr_std_cost,  0, $price,
+        	$credit_line->discount_percent);
 
 	}
+    add_stock_move_customer(ST_CUSTCREDIT,  $credit_line->stock_id,
+        key($credit_note->trans_no), $credit_note->Location,
+        $credit_note->document_date, $reference, $credit_line->qty_dispatched,
+        $curr_std_cost,  0, $price,
+        $credit_line->discount_percent);
+
+}
 
 //----------------------------------------------------------------------------------------
 
@@ -277,4 +287,3 @@ function add_gl_trans_credit_costs($order, $order_line, $credit_no, $date_,
 	return $total;
 }
 
-?>
\ No newline at end of file