X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=purchasing%2Fincludes%2Fdb%2Finvoice_db.inc;h=11fed129f8f7dccfcade4ac8a2f53f3bb6123445;hb=7618d9d62ee39a932f56565a4ce25d965bf53462;hp=3ffc35d3abc23a8ac628a5a5f2f9074bb51f1096;hpb=9c2cd1b857b4059fd9298fbb5dce96c65ff930aa;p=fa-stable.git

diff --git a/purchasing/includes/db/invoice_db.inc b/purchasing/includes/db/invoice_db.inc
index 3ffc35d3..11fed129 100644
--- a/purchasing/includes/db/invoice_db.inc
+++ b/purchasing/includes/db/invoice_db.inc
@@ -10,54 +10,64 @@
     See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
 ***********************************************************************/
 include_once($path_to_root . "/purchasing/includes/db/invoice_items_db.inc");
+include_once($path_to_root . "/admin/db/attachments_db.inc");
 
 //--------------------------------------------------------------------------------------------------
 
 function read_supplier_details_to_trans(&$supp_trans, $supplier_id)
 {
-	$sql = "SELECT supp.supp_name, terms.terms, terms.days_before_due,
-		terms.day_in_following_month, supp.tax_included,
+	$sql = "SELECT supp.supp_name, supp.dimension_id, supp.dimension2_id, supp.tax_included,
 		supp.tax_group_id, tax_group.name AS tax_group_name,
-		supp.credit_limit - Sum(IFNULL(IF(trans.type=".ST_SUPPCREDIT.", -1, 1) 
-			* (ov_amount + ov_gst + ov_discount),0)) as cur_credit
+		supp.credit_limit - Sum((ov_amount + ov_gst + ov_discount)) as cur_credit,
+		supp.curr_code,
+		terms.*
 		FROM ".TB_PREF."suppliers supp 
-			LEFT JOIN ".TB_PREF."supp_trans trans ON supp.supplier_id = trans.supplier_id, "
-			.TB_PREF."payment_terms terms, ".TB_PREF."tax_groups tax_group
-		WHERE supp.tax_group_id = tax_group.id
-		AND supp.payment_terms=terms.terms_indicator
-		AND supp.supplier_id = ".db_escape($supplier_id)." GROUP BY supp.supp_name";
+			LEFT JOIN ".TB_PREF."supp_trans trans ON supp.supplier_id = trans.supplier_id
+			LEFT JOIN ".TB_PREF."payment_terms terms ON supp.payment_terms=terms.id
+			LEFT JOIN ".TB_PREF."tax_groups tax_group ON supp.tax_group_id = tax_group.id
+		WHERE supp.supplier_id = ".db_escape($supplier_id);
 
 	$result = db_query($sql, "The supplier record selected: " . $supplier_id . " cannot be retrieved");
 
 	$myrow = db_fetch($result);
 
+    if ($supp_trans->tran_date == "")
+    {
+		$supp_trans->tran_date = Today();
+
+		if (!is_date_in_fiscalyear($supp_trans->tran_date))
+			$supp_trans->tran_date = end_fiscalyear();
+	}
+
+	$supp_trans->terms = array( 
+		'description' => $myrow['terms'],
+		'type' => $myrow['type'], 
+		'days' => $myrow['days'],
+		'early_discount' => $myrow['early_discount'],
+		'early_days' => $myrow['early_days'],
+	);
+
+	if ($supp_trans->supplier_id != $supplier_id)
+	    $supp_trans->due_date = get_payment_due_date($supp_trans->terms, $supp_trans->tran_date);
+
     $supp_trans->supplier_id = $supplier_id;
     $supp_trans->tax_included = $myrow['tax_included'];
     $supp_trans->supplier_name = $myrow['supp_name'];
-	$supp_trans->terms = array( 
-		'description' => $myrow['terms'],
-		'days_before_due' => $myrow['days_before_due'], 
-		'day_in_following_month' => $myrow['day_in_following_month'] );
-		
 	$supp_trans->credit = $myrow['cur_credit'];
 
 	$supp_trans->tax_description = $myrow['tax_group_name'];
 	$supp_trans->tax_group_id = $myrow['tax_group_id'];
-
-    if ($supp_trans->tran_date == "")
-    {
-		$supp_trans->tran_date = Today();
-		if (!is_date_in_fiscalyear($supp_trans->tran_date))
-			$supp_trans->tran_date = end_fiscalyear();
-	}
-    //if ($supp_trans->due_date=="") {
-    //	get_duedate_from_terms($supp_trans);
-    //}
-    get_duedate_from_terms($supp_trans);
+	$supp_trans->dimension = $myrow['dimension_id'];
+	$supp_trans->dimension2 = $myrow['dimension2_id'];
+	$supp_trans->currency = $myrow['curr_code'];
+ 
 }
 
-//--------------------------------------------------------------------------------------------------
-
+//-------------------------------------------------------------------------------------------------
+//	Updates invoiced quantity in PO and GRN line, and act_price in PO
+//  Returns:
+// if chg_price is set:	 previous act_price, delivery date and unit_price from PO
+//
 function update_supp_received_items_for_invoice($id, $po_detail_item, $qty_invoiced, $chg_price=null)
 {
 	if ($chg_price != null)
@@ -65,17 +75,19 @@ function update_supp_received_items_for_invoice($id, $po_detail_item, $qty_invoi
 		$sql = "SELECT act_price, unit_price FROM ".TB_PREF."purch_order_details WHERE
 			po_detail_item = ".db_escape($po_detail_item);
 		$result = db_query($sql, "The old actual price of the purchase order line could not be retrieved");
-		$row = db_fetch_row($result);
-		$ret = $row[0];
+		$row = db_fetch($result);
+		$ret = $row['act_price'];
 
-		$unit_price = $row[1]; //Added by Rasmus
+		$unit_price = $row['unit_price']; //Added by Rasmus
 
-		$sql = "SELECT delivery_date FROM ".TB_PREF."grn_batch,".TB_PREF."grn_items WHERE
-			".TB_PREF."grn_batch.id = ".TB_PREF."grn_items.grn_batch_id AND "
-			.TB_PREF."grn_items.id=".db_escape($id);
+		$sql = "SELECT delivery_date 
+			FROM ".TB_PREF."grn_batch grn,"
+				.TB_PREF."grn_items line
+			WHERE
+				grn.id = line.grn_batch_id AND line.id=".db_escape($id);
 		$result = db_query($sql, "The old delivery date from the received record cout not be retrieved");
-		$row = db_fetch_row($result);
-		$date = $row[0];
+		$row = db_fetch($result);
+		$date = $row['delivery_date'];
 	}
 	else
 	{
@@ -114,309 +126,265 @@ function get_diff_in_home_currency($supplier, $old_date, $date, $amount1, $amoun
 }
 //----------------------------------------------------------------------------------------
 
-function add_supp_invoice($supp_trans, $invoice_no=0) // do not receive as ref because we change locally
+function add_supp_invoice(&$supp_trans)  //, $already_voided=false, $allocs=null)
 {
-	global $Refs;
+	global $Refs, $systypes_array;
 
-	//$company_currency = get_company_currency();
-	/*Start an sql transaction */
-	begin_transaction();
-	hook_db_prewrite($supp_trans, $supp_trans->trans_type);
-	$tax_total = 0;
-    $taxes = $supp_trans->get_taxes($supp_trans->tax_group_id);
+	$trans_no = $supp_trans->trans_no;
+	$trans_type = $supp_trans->trans_type;
+	$supplier = get_supplier($supp_trans->supplier_id);
+	$dec = user_price_dec();
 
-    foreach ($taxes as $n => $taxitem)
-    {
-		$taxes[$n]['Value'] =  round2($taxitem['Value'], user_price_dec());
-    	$tax_total += $taxes[$n]['Value'];
-    }
+	begin_transaction(__FUNCTION__, func_get_args());
+	hook_db_prewrite($supp_trans, $trans_type);
 
-	$invoice_items_total = $supp_trans->get_items_total();
-//	$invoice_items_total = $supp_trans->get_total_taxfree($supp_trans->tax_group_id);
+	if ($trans_no) {	// void old transaction
+//	 if (!$already_voided) {	// transaction is already voided in case of direct invoice edition, which is needed for proper inventory value handling
+		$allocs = get_payments_for($trans_no, $trans_type, $supp_trans->supplier_id); // save allocations
+		void_supp_invoice($trans_type, $trans_no, true);
+		add_audit_trail($trans_type, $trans_no, Today(), _("Voided."));
+		add_voided_entry($trans_type, $trans_no, Today(), _("Document reentered."));
+		$Refs->restore_last($trans_type, $trans_no);
+//	 }
+	} else
+		$allocs = get_po_prepayments($supp_trans);
 
-	if($supp_trans->tax_included==0) {
-		$item_added_tax = $tax_total;
-	} else {
-		$item_added_tax = 0;
-		
-	}
+	// register exchange rate when used first time on date
+	add_new_exchange_rate($supplier['curr_code'], $supp_trans->tran_date, $supp_trans->ex_rate);
 
-	$trans_type = $supp_trans->trans_type;
-	
-	if ($trans_type == ST_SUPPCREDIT)
-	{
-		// let's negate everything because it's a credit note
-		$invoice_items_total = -$invoice_items_total;
-		$tax_total = -$tax_total;
-		$supp_trans->ov_discount = -$supp_trans->ov_discount; // this isn't used at all...
-		$item_added_tax = -$item_added_tax;
-	}
+	// store basic transaction info
+	$invoice_id = write_supp_trans($trans_type, 0, $supp_trans->supplier_id, $supp_trans->tran_date, $supp_trans->due_date,
+		$supp_trans->reference, $supp_trans->supp_reference, 0, 0, 0, $supp_trans->ex_rate, $supp_trans->tax_included);
 
+	if ($trans_no)
+		move_trans_attachments($trans_type, $trans_no, $invoice_id);
+
+	$supp_trans->trans_no = $invoice_id;
     $date_ = $supp_trans->tran_date;
-	$ex_rate = get_exchange_rate_from_home_currency(get_supplier_currency($supp_trans->supplier_id), $date_);
 
-    /*First insert the invoice into the supp_trans table*/
-	$invoice_id = write_supp_trans($trans_type, 0, $supp_trans->supplier_id, $date_, $supp_trans->due_date,
-		$supp_trans->reference, $supp_trans->supp_reference,
-		$invoice_items_total, $item_added_tax, $supp_trans->ov_discount, "", 0, $supp_trans->tax_included);
+	if (!$supp_trans->ex_rate)
+		$supp_trans->ex_rate = get_exchange_rate_from_home_currency($supplier['curr_code'], $date_);
 
-	$total = 0;
-    /* Now the control account */
-    $supplier_accounts = get_supplier_accounts($supp_trans->supplier_id);
-    $total += add_gl_trans_supplier($trans_type, $invoice_id, $date_, $supplier_accounts["payable_account"], 0, 0,
-		-($invoice_items_total +  $item_added_tax + $supp_trans->ov_discount),
-		$supp_trans->supplier_id,
-		"The general ledger transaction for the control total could not be added");
+	// prepare cart for GL postings 
+	$gl_cart = new items_cart($trans_type, $invoice_id);
+	$gl_cart->tran_date = $date_;
+	$gl_cart->set_currency($supplier['curr_code'], $supp_trans->ex_rate);
 
-    foreach ($supp_trans->gl_codes as $entered_gl_code)
-    {
+    $clearing_act = get_company_pref('grn_clearing_act');
 
-	    /*GL Items are straight forward - just do the debit postings to the GL accounts specified -
-	    the credit is to creditors control act  done later for the total invoice value + tax*/
+	$supp_trans->split_line_values();	// generate amounts for GL postings
 
-		if ($trans_type == ST_SUPPCREDIT)
-			$entered_gl_code->amount = -$entered_gl_code->amount;
+	$tax_total = 0;
+	$net_total = 0;
+	foreach($supp_trans->grn_items as $item)
+	{
+		$item_gl = $item->gl_amounts;
 
-		$memo_ = $entered_gl_code->memo_;
-		$total += add_gl_trans_supplier($trans_type, $invoice_id, $date_, $entered_gl_code->gl_code,
-			$entered_gl_code->gl_dim, $entered_gl_code->gl_dim2, $entered_gl_code->amount, $supp_trans->supplier_id, "", 0, $memo_);
-
-		add_supp_invoice_gl_item($trans_type, $invoice_id, $entered_gl_code->gl_code,
-			$entered_gl_code->amount, $memo_);
-
-		// store tax details if the gl account is a tax account
-		if ($trans_type == ST_SUPPCREDIT)
-			$entered_gl_code->amount = -$entered_gl_code->amount;
-		add_gl_tax_details($entered_gl_code->gl_code, 
-			$trans_type, $invoice_id, $entered_gl_code->amount,
-			$ex_rate, $date_, $supp_trans->supp_reference, $supp_trans->tax_included);
-    }
-    
-    $clearing_act = get_company_pref('grn_clearing_act');
-    foreach ($supp_trans->grn_items as $line_no => $entered_grn)
-    {
+		$stock_gl_code = get_stock_gl_code($item->item_code);
+		$dimension = !empty($supp_trans->dimension) ? $supp_trans->dimension :
+			($supplier['dimension_id'] ? $supplier['dimension_id'] : $stock_gl_code['dimension_id']);
+		$dimension2 = !empty($supp_trans->dimension2) ? $supp_trans->dimension2 :
+			($supplier['dimension2_id'] ? $supplier['dimension2_id'] : $stock_gl_code['dimension2_id']);
 
-    	if ($trans_type == ST_SUPPCREDIT)
-    	{
-			$entered_grn->this_quantity_inv = -$entered_grn->this_quantity_inv;
-			set_grn_item_credited($entered_grn, $supp_trans->supplier_id, $invoice_id, $date_);
-    	}
-		$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);
-		
-    	if ($trans_type == ST_SUPPCREDIT)
+		$line_tax = 0;
+		foreach($item_gl as $index => $value)
 		{
-			$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);
+			 if (is_numeric($index)) // taxes
+			 {
+				if ($value['Deductible'])
+				{	// GL: VAT deductible
+					$gl_cart->add_gl_item($value['purchasing_gl_code'], 0, 0, $value['Deductible']+$value['Adjust']);
+					// GL: VAT adjustment due to vat factor
+					if ($value['Adjust'])
+						$gl_cart->add_gl_item(get_company_pref('tax_adjustments_act'), 0, 0, -$value['Adjust']);
+				}
+				if ($value['Payable']) // reverse charge/intracommunity aquisition
+				{
+	   				$gl_cart->add_gl_item($value['sales_gl_code'], 0, 0, -$value['Payable']);
+				}
+		   		// GL: AP account (vat part)
+				if ($value['Value'])
+				{
+					$gl_cart->add_gl_item($supplier["payable_account"], 0, 0, -$value['Value'] , '', '', $supp_trans->supplier_id);
+				}
+				if (($item->vat_category == VC_REVERSE) && $supplier['tax_area'] == TA_EU)
+					$vat_category = VC_OTHER;
+				else
+					$vat_category = $item->vat_category;
+
+				add_trans_tax_details($trans_type, $invoice_id, 
+					$value['tax_type_id'], $value['rate'], $supp_trans->tax_included, $value['Value'],
+					$item_gl['Net'], $supp_trans->ex_rate, $date_, $supp_trans->supp_reference, TR_INPUT, $supp_trans->tax_group_id, $vat_category);
+
+				$line_tax += $value['Payable'] ? $value['Payable'] : $value['Value'];
+			}
 		}
-    	else
-    	{
-    		// -------------- if price changed since po received. 16 Aug 2008 Joe Hunt
-			$iv_act = is_inventory_item($entered_grn->item_code) ? ($clearing_act ? $clearing_act : $stock_gl_code["inventory_account"]) : 
-				($supplier_accounts["purchase_account"] ? $supplier_accounts["purchase_account"] : $stock_gl_code["cogs_account"]);
-    		$old = update_supp_received_items_for_invoice($entered_grn->id, $entered_grn->po_detail_item,
-    			$entered_grn->this_quantity_inv, $entered_grn->chg_price);
-			// Since the standard cost is always calculated on basis of the po unit_price,
-			// this is also the price that should be the base of calculating the price diff.
-			// In cases where there is two different po invoices on the same delivery with different unit prices this will not work either
-
-			//$old_price = $old[0];
-			 
-			$old_price = $old[2];
-			// adjust for tax included.
-			$old_price = get_tax_free_price_for_item($entered_grn->item_code, $old_price,
-				$supp_trans->tax_group_id, $entered_grn->tax_included);			
-
-			/*
- 			If statement is removed. Should always check for deliveries nomatter if there has been a price change. 
-			*/
-			//if ($old_price != $line_taxfree) // price-change, so update
-			//{
-			//$diff = $line_taxfree - $old_price;
-			$old_date = sql2date($old[1]);
-			if (!is_inventory_item($entered_grn->item_code))
-				$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);
-			else
+
+		// GL: AP account (net)
+		$gl_cart->add_gl_item($supplier["payable_account"], 0, 0, -$item_gl['Net'], '', '', $supp_trans->supplier_id);
+
+		$tax_total += $item_gl['Tax'];
+		$net_total += $item_gl['Net'];
+
+		// cost line value
+		$taxfree_line =  $item_gl['Cost'];
+
+		if (!is_inventory_item($item->item_code))
+		{
+			$gl_cart->add_gl_item($supplier["purchase_account"] ? $supplier["purchase_account"] : $stock_gl_code["cogs_account"], $dimension, $dimension2, $taxfree_line);
+
+		} elseif ($trans_type != ST_SUPPCREDIT) {
+			$gl_cart->add_gl_item($stock_gl_code["inventory_account"], $dimension, $dimension2, $taxfree_line, _('Return to supplier'));
+			// we must use invoice value here to preserve proper inventory valuation,
+			// but if the purchase changed average cost, and any item was sold between invoice and credit,
+			// the average will not return to the previous one. To fix this additional cost update should be made here to compensate cogs difference on items sold.
+			update_average_material_cost(null, $item->item_code, $item_gl['Cost']/$item->this_quantity_inv, -$item->this_quantity_inv, $date_);
+		} else {
+
+			// calculate difference between clearing cost and actual cost
+			$diff = $item_gl['Cost'] - $item->std_cost_unit*$item->this_quantity_inv;
+
+			update_average_material_cost(null, $item->item_code,
+				$diff/$item->this_quantity_inv, $item->this_quantity_inv, null, true);
+
+			if ($clearing_act)
 			{
-				$currency = get_supplier_currency($supp_trans->supplier_id);
-				$ex_rate = get_exchange_rate_from_home_currency($currency, $old_date);
-				$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 * $old_price, $supp_trans->supplier_id, "", $ex_rate);
-				$diff = get_diff_in_home_currency($supp_trans->supplier_id, $old_date, $date_, $old_price, 
-					$line_taxfree);	
-			
-				// 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 )
+				if ($diff != 0) // if value on invoice differs from those posted on GRN receive, post the difference
 				{
-					$diff_amt = $diff * $entered_grn->this_quantity_inv;
-					$total += add_gl_trans($trans_type, $invoice_id, $date_,	$stock_gl_code["inventory_account"],
-						$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");
+
+					$gl_cart->add_gl_item($stock_gl_code["inventory_account"],			// cart is in supplier currency, so need to fix by ex_rate here
+						$dimension, $dimension2, $diff/$gl_cart->rate, _('GRN Provision')); // subject to rounding errors?
+
+					$gl_cart->add_gl_item($clearing_act,
+						$dimension, $dimension2, -$diff/$gl_cart->rate);
 
 					//Chaitanya
 					//If QOH is 0 or negative then update_average_material_cost will be skipped
 					//Thus difference in PO and Supp Invoice should be handled separately
-					
-					$qoh = get_qoh_on_date($entered_grn->item_code);
+					$qoh = get_qoh_on_date($item->item_code);
 					if ($qoh <= 0)
 					{
 						global $Refs;
-
-						//Chaitanya : Post a journal entry
+							//Chaitanya : Post a journal entry
 						$id = get_next_trans_no(ST_JOURNAL);
-						$ref = $Refs->get_next(ST_JOURNAL);
-						$stock_id = $entered_grn->item_code;
+						$ref = $Refs->get_next(ST_JOURNAL, null, $date_);
+						add_journal(ST_JOURNAL, $id, $diff, $date_, get_company_currency(), $ref);
+						$stock_id = $item->item_code;
 						$stock_gl_code = get_stock_gl_code($stock_id);
 						$memo = _("Supplier invoice adjustment for zero inventory of ").$stock_id." "._("Invoice")." ".$supp_trans->reference;
 						//Reverse the inventory effect if $qoh <=0
 						add_gl_trans_std_cost(ST_JOURNAL, $id, $date_, 
 							$stock_gl_code["inventory_account"],
-							$stock_gl_code['dimension_id'], $stock_gl_code['dimension2_id'],
-							$memo, -$entered_grn->this_quantity_inv * $diff);
+							$dimension, $dimension2,
+							$memo, -$diff);
 						//GL Posting to inventory adjustment account
 						add_gl_trans_std_cost(ST_JOURNAL, $id, $date_, 
 							$stock_gl_code["adjustment_account"],
-							$stock_gl_code['dimension_id'], $stock_gl_code['dimension2_id'],
-							$memo, $entered_grn->this_quantity_inv * $diff);
-						
-						add_audit_trail(ST_JOURNAL, $id, $date_);
+							$dimension, $dimension2,
+							$memo, $diff);
+							add_audit_trail(ST_JOURNAL, $id, $date_);
 						add_comments(ST_JOURNAL, $id, $date_, $memo);
-						$Refs->save(ST_JOURNAL, $id, $ref);						
-					}					
-					
-					/*$qoh = get_qoh_on_date($entered_grn->item_code);
-					if ($qoh <= 0)
-					{
-						$memo = "Diff. in cost: ".$diff;
-						//Reverse the inventory effect if $qoh <=0
-						add_gl_trans_supplier($trans_type, $invoice_id, $date_, 
-						$stock_gl_code["inventory_account"],
-						$stock_gl_code['dimension_id'], $stock_gl_code['dimension2_id'],
-						-$entered_grn->this_quantity_inv * $diff, $supp_trans->supplier_id, "", null, $memo);
-						//GL Posting to inventory adjustment account
-						add_gl_trans_supplier($trans_type, $invoice_id, $date_, 
-						$stock_gl_code["adjustment_account"],
-						$stock_gl_code['dimension_id'], $stock_gl_code['dimension2_id'],
-						$entered_grn->this_quantity_inv * $diff, $supp_trans->supplier_id, "", null, $memo);						
-					}*/				
-					
-					//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");				
+						$Refs->save(ST_JOURNAL, $id, $ref);
+					}
 				}
-			}	
-			// 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.
-			if ($deliveries[0] != 0) // have deliveries been done during the period?
-			{
-				$deliveries[1] /= $deliveries[0];
-				$amt = ($mat_cost - $deliveries[1]) * $deliveries[0]; // $amt in home currency
-				if ($amt != 0.0)
-				{
-					$_s = $entered_grn->item_code;
-					$_d = $deliveries[0];
-					$_od = $old_date;
-					$_cd = $mat_cost - $deliveries[1];
-					$memo = _("Cost difference adjustment for $_s. $_d items delivered since $_od. The cost difference is $_cd");
-					add_gl_trans($trans_type, $invoice_id, $date_,	$stock_gl_code["cogs_account"],
-						$stock_gl_code['dimension_id'], $stock_gl_code['dimension2_id'], $memo,
-						$amt, null, null, null,
-						"The general ledger transaction could not be added for the price variance of the inventory item");
-					add_gl_trans($trans_type, $invoice_id, $date_,	$iv_act,
-						0, 0, $memo, -$amt, null, null, null,
-						"The general ledger transaction could not be added for the price variance of the inventory item");
-				}		
-				update_stock_move_pid(ST_CUSTDELIVERY, $entered_grn->item_code, $old_date, $date_, 0, $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);
-			*/	
-		//}
+				$gl_cart->add_gl_item($clearing_act, $dimension, $dimension2, $taxfree_line);
+			}
+			else  // no postings on GRN, so post full cost here
+				$gl_cart->add_gl_item($stock_gl_code["inventory_account"], $dimension, $dimension2,	$taxfree_line);
+
 		}
-    	// ----------------------------------------------------------------------
-
-		add_supp_invoice_item($trans_type, $invoice_id, $entered_grn->item_code,
-			$entered_grn->item_description, 0, 	$entered_grn->chg_price, $line_tax,
-			$entered_grn->this_quantity_inv, $entered_grn->id, $entered_grn->po_detail_item, "");
-    } /* end of GRN postings */
-    /* Now the TAX account */
-    $taxes = $supp_trans->get_taxes($supp_trans->tax_group_id, 0, false); // 2009.08-18 Joe Hunt. We have already got the gl lines
-    foreach ($taxes as $taxitem)
+
+//        if (is_fa_item($item->item_code)) {
+//          add_actual_cost($item->order_price, $item->item_code);
+//        }
+
+    	if ($trans_type == ST_SUPPCREDIT)
+			set_grn_item_credited($item, $supp_trans->supplier_id, $invoice_id, $date_);
+		else {
+			add_or_update_purchase_data($supp_trans->supplier_id, $item->item_code, $item->chg_price); 
+
+			update_supp_received_items_for_invoice($item->id, $item->po_detail_item,
+				$item->this_quantity_inv, $item->chg_price);
+		}
+
+		$qty = ($trans_type==ST_SUPPCREDIT ? 1 : -1)*$item->this_quantity_inv;
+		add_supp_invoice_item($trans_type, $invoice_id, $item->item_code,
+			$item->item_description, 0, 	$item->chg_price, $line_tax/$qty, $qty, $item->id, $item->po_detail_item);
+    } // grn_items
+
+
+    /*GL Items are straight forward - just do the debit postings to the GL accounts specified -
+    the credit is to creditors control act */
+    foreach ($supp_trans->gl_codes as $entered_gl_code)
     {
-    	if ($taxitem['Net'] != 0)
-    	{
-
-    		if ($trans_type == ST_SUPPCREDIT)
-    		{
-    			$taxitem['Net'] = -$taxitem['Net'];
-    			$taxitem['Value'] = -$taxitem['Value'];
-    		}	
-			add_trans_tax_details($trans_type, $invoice_id, 
-				$taxitem['tax_type_id'], $taxitem['rate'], $supp_trans->tax_included, $taxitem['Value'],
-				$taxitem['Net'], $ex_rate, $date_, $supp_trans->supp_reference);
-
-    		if ($trans_type == ST_SUPPCREDIT)
-    			$taxitem['Value'] = -$taxitem['Value'];
-    		$total += add_gl_trans_supplier($trans_type, $invoice_id, $date_,
-    			$taxitem['purchasing_gl_code'], 0, 0, $taxitem['Value'],
-    			$supp_trans->supplier_id,
-    			"A general ledger transaction for the tax amount could not be added");
-    	}
+		$memo_ = $entered_gl_code->memo_;
+
+		$index = is_tax_account($entered_gl_code->gl_code);
+		if ($index !== false)
+		{
+			$gl_cart->add_gl_item($entered_gl_code->gl_code, $entered_gl_code->gl_dim, $entered_gl_code->gl_dim2, $entered_gl_code->amount);
+			// store tax details if the gl account is a tax account
+			add_gl_tax_details($entered_gl_code->gl_code, 
+				$trans_type, $invoice_id, $entered_gl_code->amount,
+				$supp_trans->ex_rate, $date_, $supp_trans->supp_reference, $supp_trans->tax_included, null, $supp_trans->tax_group_id);
+
+			$tax_total += $entered_gl_code->amount;
+		} else {
+			$gl_cart->add_gl_item($entered_gl_code->gl_code, $entered_gl_code->gl_dim, $entered_gl_code->gl_dim2, $entered_gl_code->amount);
+			$net_total += $entered_gl_code->amount;
+		}
+		$gl_cart->add_gl_item($supplier["payable_account"], 0, 0, -$entered_gl_code->amount, '', '', $supp_trans->supplier_id);
+
+		add_supp_invoice_gl_item($trans_type, $invoice_id, $entered_gl_code->gl_code, $entered_gl_code->amount, $memo_,
+			$entered_gl_code->gl_dim, $entered_gl_code->gl_dim2);
     }
-	
-	/*Post a balance post if $total != 0 */
-	add_gl_balance($trans_type, $invoice_id, $date_, -$total, PT_SUPPLIER, $supp_trans->supplier_id);	
+
+	if ($trans_type == ST_SUPPCREDIT) {		// reverse postings if this is credit note
+		foreach($gl_cart->gl_items as &$line)
+			$line->amount = -$line->amount;
+		$net_total = -$net_total;
+		$tax_total = -$tax_total;
+	}
+	$gl_cart->reduce_gl();	// minimize GL lines
+
+	$gl_cart->write_gl(false); // don't check balances here: we are working on two (maybe unbalanced) carts
+
+	update_supp_trans_sums($trans_type, $invoice_id, round($net_total,2), round($tax_total,2));
 
 	add_comments($trans_type, $invoice_id, $date_, $supp_trans->Comments);
 
 	$Refs->save($trans_type, $invoice_id, $supp_trans->reference);
 
-	if ($invoice_no != 0)
+	if (count($supp_trans->src_docs) == 1)
 	{
-		$invoice_alloc_balance = get_supp_trans_allocation_balance(ST_SUPPINVOICE, $invoice_no);
+		$invoice_no = key($supp_trans->src_docs);
+		$invoice_alloc_balance = get_supp_trans_allocation_balance(ST_SUPPINVOICE, $supp_trans->src_docs);
 		if ($invoice_alloc_balance > 0) 
 		{ 	//the invoice is not already fully allocated 
 
-			$trans = get_supp_trans($invoice_no, ST_SUPPINVOICE);
-			$total = $trans['Total'];
+			$trans = get_supp_trans($invoice_id, ST_SUPPCREDIT);
+			$total = -$trans['Total'];
 
 			$allocate_amount = ($invoice_alloc_balance > $total) ? $total : $invoice_alloc_balance;
+
 			/*Now insert the allocation record if > 0 */
 			if ($allocate_amount != 0) 
 			{
-				update_supp_trans_allocation(ST_SUPPINVOICE, $invoice_no, $allocate_amount);
-				update_supp_trans_allocation(ST_SUPPCREDIT, $invoice_id, $allocate_amount); // ***
 				add_supp_allocation($allocate_amount, ST_SUPPCREDIT, $invoice_id, ST_SUPPINVOICE, $invoice_no,
-					$date_);
-				// Exchange Variations Joe Hunt 2008-09-20 ////////////////////////////////////////
+					$supp_trans->supplier_id, $date_);
+				update_supp_trans_allocation(ST_SUPPINVOICE, $invoice_no, $supp_trans->supplier_id);
+				update_supp_trans_allocation(ST_SUPPCREDIT, $invoice_id, $supp_trans->supplier_id);
 
-				exchange_variation(ST_SUPPCREDIT, $invoice_id, ST_SUPPINVOICE, $invoice_no, $date_,
+				exchange_variation(ST_SUPPCREDIT, $invoice_id, ST_SUPPINVOICE, $supp_trans->src_docs, $date_,
 					$allocate_amount, PT_SUPPLIER);
-
-				///////////////////////////////////////////////////////////////////////////
 			}
 		}
 	}
 
-	$supp_trans->trans_no = $invoice_id;
+	reallocate_payments($invoice_id, ST_SUPPINVOICE, $date_, $net_total+$tax_total, $allocs, $supp_trans->supplier_id);
+
 	hook_db_postwrite($supp_trans, $supp_trans->trans_type);
     commit_transaction();
-
     return $invoice_id;
 }
 
@@ -426,28 +394,52 @@ function add_supp_invoice($supp_trans, $invoice_no=0) // do not receive as ref b
 
 function get_po_invoices_credits($po_number)
 {
-	$sql = "SELECT DISTINCT ".TB_PREF."supp_trans.trans_no, ".TB_PREF."supp_trans.type,
-		ov_amount+ov_discount+ov_gst AS Total,
-		".TB_PREF."supp_trans.tran_date
-		FROM ".TB_PREF."supp_trans, ".TB_PREF."supp_invoice_items, "
-		.TB_PREF."purch_order_details, ".TB_PREF."purch_orders
-		WHERE ".TB_PREF."supp_invoice_items.supp_trans_no = ".TB_PREF."supp_trans.trans_no
-		AND ".TB_PREF."supp_invoice_items.supp_trans_type = ".TB_PREF."supp_trans.type
-		AND ".TB_PREF."supp_invoice_items.po_detail_item_id = ".TB_PREF."purch_order_details.po_detail_item
-		AND ".TB_PREF."purch_orders.supplier_id = ".TB_PREF."supp_trans.supplier_id
-		AND ".TB_PREF."purch_orders.order_no = ".TB_PREF."purch_order_details.order_no
-		AND ".TB_PREF."purch_order_details.order_no = ".db_escape($po_number);
+	$sql = "SELECT DISTINCT trans.trans_no, trans.type,	ov_amount+ov_discount+ov_gst AS Total,
+				trans.tran_date
+			FROM ".TB_PREF."supp_trans trans,"
+				.TB_PREF."supp_invoice_items line,"
+				.TB_PREF."purch_order_details poline,"
+				.TB_PREF."purch_orders po
+		WHERE line.supp_trans_no = trans.trans_no
+			AND line.supp_trans_type = trans.type
+			AND line.po_detail_item_id = poline.po_detail_item
+			AND po.supplier_id = trans.supplier_id
+			AND po.order_no = poline.order_no
+			AND poline.order_no = ".db_escape($po_number);
 
 	return db_query($sql, "The invoices/credits for the po $po_number could not be retreived");
 }
 
+//----------------------------------------------------------------------------------------
+//
+// Retrieve tax ovverides from tax register.
+//
+function get_tax_overrides($trans_type, $trans_no)
+{
+	$tax_overrides = array();
+	$sql = "SELECT amount, tax_type_id as id, rate
+		FROM ".TB_PREF."trans_tax_details details
+		WHERE trans_type=".db_escape($trans_type)." AND trans_no=".db_escape($trans_no)
+		." AND amount>0"; // skip reposting of nondeductible VAT
+
+	$result = db_query($sql, 'Cannot retrieve tax overrides');
+	while($row = db_fetch($result))
+	{
+		$tax_overrides[$row['id']] = $row['amount'];
+	}
+
+	return $tax_overrides;
+}
 //----------------------------------------------------------------------------------------
 
 function read_supp_invoice($trans_no, $trans_type, &$supp_trans)
 {
-	$sql = "SELECT ".TB_PREF."supp_trans.*, supp_name FROM ".TB_PREF."supp_trans,".TB_PREF."suppliers
+	$sql = "SELECT trans.*, supp_name, dimension_id, dimension2_id, curr_code
+		FROM ".TB_PREF."supp_trans trans,"
+			.TB_PREF."suppliers sup
 		WHERE trans_no = ".db_escape($trans_no)." AND type = ".db_escape($trans_type)."
-		AND ".TB_PREF."suppliers.supplier_id=".TB_PREF."supp_trans.supplier_id";
+		AND sup.supplier_id=trans.supplier_id";
+
 	$result = db_query($sql, "Cannot retreive a supplier transaction");
 
 	if (db_num_rows($result) == 1)
@@ -465,6 +457,9 @@ function read_supp_invoice($trans_no, $trans_type, &$supp_trans)
 		$supp_trans->ov_discount = $trans_row["ov_discount"];
 		$supp_trans->ov_gst = $trans_row["ov_gst"];
 		$supp_trans->tax_included = $trans_row["tax_included"];
+		$supp_trans->dimension = $trans_row["dimension_id"];
+		$supp_trans->dimension2 = $trans_row["dimension2_id"];
+		$supp_trans->currency = $trans_row["curr_code"];
 
 		$id = $trans_row["trans_no"];
 
@@ -479,15 +474,20 @@ function read_supp_invoice($trans_no, $trans_type, &$supp_trans)
              	if ($details_row["gl_code"] == 0)
              	{
              		$supp_trans->add_grn_to_trans($details_row["grn_item_id"], $details_row["po_detail_item_id"], $details_row["stock_id"],
-           				$details_row["description"], 0, 0, $details_row["quantity"], 0, $details_row["FullUnitPrice"],
+           				$details_row["description"], 
+           				$details_row['qty_recd'],
+           				$details_row['quantity_inv']-$details_row["quantity"],
+           				$details_row["quantity"], 0, $details_row["FullUnitPrice"],
            				0, 0);
              	}
              	else
              	{
-             		$supp_trans->add_gl_codes_to_trans($details_row["gl_code"], get_gl_account_name($details_row["gl_code"]), 0, 0,
+             		$supp_trans->add_gl_codes_to_trans($details_row["gl_code"], get_gl_account_name($details_row["gl_code"]), 
+             			$details_row["dimension_id"], $details_row["dimension2_id"],
            				$details_row["FullUnitPrice"], $details_row["memo_"]);
              	}
             }
+			$supp_trans->tax_overrides = get_tax_overrides($trans_type, $trans_no);
         }
         else
         {
@@ -505,7 +505,9 @@ function read_supp_invoice($trans_no, $trans_type, &$supp_trans)
 
 function get_matching_invoice_item($stock_id, $po_item_id)
 {
-	$sql = "SELECT *, tran_date FROM ".TB_PREF."supp_invoice_items, ".TB_PREF."supp_trans
+	$sql = "SELECT *, tran_date
+		FROM ".TB_PREF."supp_invoice_items,"
+			.TB_PREF."supp_trans
 		WHERE supp_trans_type = ".ST_SUPPINVOICE." AND stock_id = "
 		.db_escape($stock_id)." AND po_detail_item_id = ".db_escape($po_item_id)."
 		AND supp_trans_no = trans_no";
@@ -515,7 +517,7 @@ function get_matching_invoice_item($stock_id, $po_item_id)
 
 function void_supp_invoice($type, $type_no)
 {
-	begin_transaction();
+	begin_transaction(__FUNCTION__, func_get_args());
 
 	hook_db_prevoid($type, $type_no);
 	$trans = get_supp_trans($type_no, $type);
@@ -548,9 +550,8 @@ function void_supp_invoice($type, $type_no)
 				$batch = get_grn_batch_from_item($details_row["grn_item_id"]);	
 				$grn = get_grn_batch($batch);
          		if ($type == ST_SUPPCREDIT) // credit note 2009-06-14 Joe Hunt Must restore the po and grn
-         		{	
+         		{	// We must get the corresponding invoice item to check for price chg.
 					$match = get_matching_invoice_item($details_row["stock_id"], $details_row["po_detail_item_id"]);
-					
 					//Chaitanya : Skipped costing block & handle in void_stock_move
 					// We must get the corresponding invoice item to check for price chg.
 					/*if ($match !== false)
@@ -559,7 +560,7 @@ function void_supp_invoice($type, $type_no)
 					else		
 						$mat_cost = update_average_material_cost($grn["supplier_id"], $details_row["stock_id"],  
 							$details_row["FullUnitPrice"], -$details_row["quantity"], $old_date, $old[1] !== $trans['tran_date']);*/
-							
+
 					$sql = "UPDATE ".TB_PREF."purch_order_details
         				SET quantity_ordered = quantity_ordered + ".-$details_row["quantity"].", ";
         			if ($match !== false)
@@ -590,33 +591,25 @@ function void_supp_invoice($type, $type_no)
 
 						//Chaitanya : Post a journal entry
 						$id = get_next_trans_no(ST_JOURNAL);
-						$ref = $Refs->get_next(ST_JOURNAL);
+						$ref = $Refs->get_next(ST_JOURNAL, null, $date_);
+						add_journal(ST_JOURNAL, $id, $details_row["quantity"] * $diff, $old_date, get_company_currency(), $ref);
 						$stock_id = $details_row["stock_id"];
 						$stock_gl_code = get_stock_gl_code($stock_id);
 						$memo = "Reversing Supplier invoice adjustment for zero inventory of ".$stock_id." Invoice: ".$trans['reference'];
 						//Reverse the inventory effect if $qoh <=0
 						add_gl_trans_std_cost(ST_JOURNAL, $id, $old_date, 
 							$stock_gl_code["inventory_account"],
-							$stock_gl_code['dimension_id'], $stock_gl_code['dimension2_id'],
-							$memo, $details_row["quantity"] * $diff);
+							$dim, $dim2, $memo, $details_row["quantity"] * $diff);
 						//GL Posting to inventory adjustment account
 						add_gl_trans_std_cost(ST_JOURNAL, $id, $old_date, 
 							$stock_gl_code["adjustment_account"],
-							$stock_gl_code['dimension_id'], $stock_gl_code['dimension2_id'],
-							$memo, -$details_row["quantity"] * $diff);
+							$dim, $dim2, $memo, -$details_row["quantity"] * $diff);
 						
 						add_audit_trail(ST_JOURNAL, $id, $old_date);
 						add_comments(ST_JOURNAL, $id, $old_date, $memo);
-						$Refs->save(ST_JOURNAL, $id, $ref);						
-					}	
-				}
-				/*$deliveries = get_deliveries_between($details_row["stock_id"], $old_date, $date_);
-				if ($deliveries[0] != 0) // have deliveries been done during the period?
-				{
-					update_stock_move_pid(ST_CUSTDELIVERY, $details_row["stock_id"], $old_date, $date_, 0, $mat_cost);
+						$Refs->save(ST_JOURNAL, $id, $ref);
+					}
 				}
-				update_stock_move_pid(ST_SUPPRECEIVE, $details_row["stock_id"], $old_date, $old_date, $grn['supplier_id'], $mat_cost);
-				*/
          	}
         }
 	}
@@ -650,49 +643,22 @@ function is_reference_already_there($supplier_id, $supp_reference, $trans_no=0)
 	return $myrow[0] > 0;
 }
 
-function remove_not_invoice_item($id)
+function find_src_invoices($cart)
 {
-    begin_transaction();
-
-    $myrow = get_grn_item_detail($id);
-
-    $grn = get_grn_batch($myrow['grn_batch_id']);
-    
-    $supp = get_supplier($grn["supplier_id"]);
-
-    $sql = "UPDATE ".TB_PREF."purch_order_details
-        SET quantity_received = qty_invoiced, quantity_ordered = qty_invoiced WHERE po_detail_item = ".$myrow["po_detail_item"];
-    db_query($sql, "The quantity invoiced of the purchase order line could not be updated");
-
-    $sql = "UPDATE ".TB_PREF."grn_items
-        SET qty_recd = quantity_inv WHERE id = ".$myrow["id"];
-    db_query($sql, "The quantity invoiced off the items received record could not be updated");
-
-    update_average_material_cost($grn["supplier_id"], $myrow["item_code"],
-        $myrow["unit_price"], -$myrow["QtyOstdg"], Today());
-        
-    $price = $myrow['unit_price'];
-    if ($supp['tax_included'])
-        $price = get_tax_free_price_for_item($myrow['item_code'], $myrow['unit_price'], $supp['tax_group_id'], $supp['tax_included']);        
-
-    add_stock_move(ST_SUPPRECEIVE, $myrow["item_code"], $myrow['grn_batch_id'], $grn['loc_code'], sql2date($grn["delivery_date"]), "",
-        -$myrow["QtyOstdg"], $myrow['std_cost_unit'], $grn["supplier_id"], 1, $price);
-        
-    $clearing_act = get_company_pref('grn_clearing_act');
-    if ($clearing_act) {    // otherwise GRN clearing account is not used
-        if (is_inventory_item($myrow['item_code']))
-        {
-            $total = 0;
-            $stock_gl_code = get_stock_gl_code($myrow['item_code']);
-            $date = sql2date($grn["delivery_date"]);
-            $total += add_gl_trans_supplier(ST_SUPPRECEIVE, $myrow['grn_batch_id'], $date, $stock_gl_code["inventory_account"],
-                $stock_gl_code['dimension_id'], $stock_gl_code['dimension2_id'],
-                -$myrow['QtyOstdg'] * $price, $grn["supplier_id"], "", 0, _("GRN Removal"));
-            $total += add_gl_trans_supplier(ST_SUPPRECEIVE, $myrow['grn_batch_id'], $date, $clearing_act,
-                0, 0, -$total, null, "", 0, _("GRN Removal"));
-        }    
-    }
-
-    commit_transaction();
+	$invoices = $po_ids = array();
+	foreach($cart->grn_items as $item)
+		$po_ids[] = "'$item->po_detail_item'";	// credit item lines
+
+	if (count($po_ids)) {
+		$sql = "SELECT DISTINCT trans.trans_no, trans.reference, trans.supp_reference
+			FROM ".TB_PREF."supp_invoice_items items
+			LEFT JOIN ".TB_PREF."supp_trans trans ON trans.trans_no=items.supp_trans_no AND trans.`type`=items.supp_trans_type
+			WHERE items.po_detail_item_id IN (" . implode(',', $po_ids). ")"." AND items.supp_trans_type=20";
+		$result = db_query($sql, "cannot find source invoice details");
+		while ($rec = db_fetch($result))
+		{
+			$invoices[$rec['trans_no']] = $rec['supp_reference']; // array($rec['reference'], $rec['supp_reference']);
+		}
+	}
+	return $invoices;
 }
-?>