X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=purchasing%2Fincludes%2Fdb%2Finvoice_db.inc;h=308c2c25440ef5129b88262448d32ac910d024bd;hb=1944920ea7a791d476e6f67d19f70f18985a52ee;hp=16e25680ce5fa88d9efe97d9e21f611e169dda07;hpb=ddaf32837daa7ffa05298b63ac237b38eef3778a;p=fa-stable.git

diff --git a/purchasing/includes/db/invoice_db.inc b/purchasing/includes/db/invoice_db.inc
index 16e25680..308c2c25 100644
--- a/purchasing/includes/db/invoice_db.inc
+++ b/purchasing/includes/db/invoice_db.inc
@@ -201,9 +201,8 @@ function add_supp_invoice($supp_trans, $invoice_no=0) // do not receive as ref b
 		$line_taxfree = $entered_grn->taxfree_charge_price($supp_trans->tax_group_id);
 		$line_tax = $entered_grn->full_charge_price($supp_trans->tax_group_id) - $line_taxfree;
 		$stock_gl_code = get_stock_gl_code($entered_grn->item_code);
-		$iv_act = $supplier_accounts["purchase_account"] ? $supplier_accounts["purchase_account"] :
-			((is_inventory_item($entered_grn->item_code) ? $stock_gl_code["inventory_account"] 
-				: $stock_gl_code["cogs_account"]));
+		$iv_act = (is_inventory_item($entered_grn->item_code) ? $stock_gl_code["inventory_account"] : 
+			($supplier_accounts["purchase_account"] ? $supplier_accounts["purchase_account"] : $stock_gl_code["cogs_account"]));
 		$total += add_gl_trans_supplier($trans_type, $invoice_id, $date_, $iv_act,
 			$stock_gl_code['dimension_id'], $stock_gl_code['dimension2_id'],
 			$entered_grn->this_quantity_inv * $line_taxfree, $supp_trans->supplier_id);
@@ -230,29 +229,31 @@ function add_supp_invoice($supp_trans, $invoice_no=0) // do not receive as ref b
 			//{
 			//$diff = $entered_grn->chg_price - $old_price;
 			$old_date = sql2date($old[1]);
-			$diff = get_diff_in_home_currency($supp_trans->supplier_id, $old_date, $date_, $old_price, 
-				$entered_grn->chg_price);	
+			if (is_inventory_item($entered_grn->item_code))
+			{
+				$diff = get_diff_in_home_currency($supp_trans->supplier_id, $old_date, $date_, $old_price, 
+					$entered_grn->chg_price);	
 			
-			// always return due to change in currency.
-			/*$mat_cost = update_average_material_cost(null, $entered_grn->item_code,
-				$diff, $entered_grn->this_quantity_inv, $old_date, true); */
-			$mat_cost = update_average_material_cost(null, $entered_grn->item_code,
-				$diff, $entered_grn->this_quantity_inv, null, true);
+				// always return due to change in currency.
+				/*$mat_cost = update_average_material_cost(null, $entered_grn->item_code,
+					$diff, $entered_grn->this_quantity_inv, $old_date, true); */
+				$mat_cost = update_average_material_cost(null, $entered_grn->item_code,
+					$diff, $entered_grn->this_quantity_inv, null, true);
 				
-			//Add GL transaction for GRN Provision in case of difference
-			if (($diff * $entered_grn->this_quantity_inv) != 0 )
-			{
-				$diff_amt = $diff * $entered_grn->this_quantity_inv;
-				add_gl_trans($trans_type, $invoice_id, $date_,	$iv_act,
-					$stock_gl_code['dimension_id'], $stock_gl_code['dimension2_id'], 'GRN Provision',
-					$diff_amt, null, null, null,
-					"The general ledger transaction could not be added for the GRN of the inventory item");	
+				//Add GL transaction for GRN Provision in case of difference
+				if (($diff * $entered_grn->this_quantity_inv) != 0 )
+				{
+					$diff_amt = $diff * $entered_grn->this_quantity_inv;
+					add_gl_trans($trans_type, $invoice_id, $date_,	$iv_act,
+						$stock_gl_code['dimension_id'], $stock_gl_code['dimension2_id'], 'GRN Provision',
+						$diff_amt, null, null, null,
+						"The general ledger transaction could not be added for the GRN of the inventory item");	
 					
-				add_gl_trans($trans_type, $invoice_id, $date_,	$stock_gl_code["cogs_account"],
-					0, 0, 'GRN Provision', -$diff_amt, null, null, null,
-					"The general ledger transaction could not be added for the GRN of the inventory item");				
-			}
-			
+					add_gl_trans($trans_type, $invoice_id, $date_,	$stock_gl_code["cogs_account"],
+						0, 0, 'GRN Provision', -$diff_amt, null, null, null,
+						"The general ledger transaction could not be added for the GRN of the inventory item");				
+				}
+			}	
 			// added 2008-12-08 Joe Hunt. Update the purchase data table
 			add_or_update_purchase_data($supp_trans->supplier_id, $entered_grn->item_code, $entered_grn->chg_price); 
 			/*$deliveries = get_deliveries_between($entered_grn->item_code, $old_date, Today()); // extend the period, if invoice is before any deliveries.
@@ -277,7 +278,8 @@ function add_supp_invoice($supp_trans, $invoice_no=0) // do not receive as ref b
 				}		
 				update_stock_move_pid(ST_CUSTDELIVERY, $entered_grn->item_code, $old_date, $date_, 0, $mat_cost);
 			} */
-			update_stock_move_pid(ST_SUPPRECEIVE, $entered_grn->item_code, $old_date, $old_date, $supp_trans->supplier_id, $mat_cost);
+			if (is_inventory_item($entered_grn->item_code))
+				update_stock_move_pid(ST_SUPPRECEIVE, $entered_grn->item_code, $old_date, $old_date, $supp_trans->supplier_id, $mat_cost);
 		//}
 		}
     	// ----------------------------------------------------------------------