X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=purchasing%2Fincludes%2Fdb%2Finvoice_db.inc;h=0f7f9b53d01d7365c32166de61407e4ffc74573c;hb=9a98bb3bc7a94f1a8e47f8dab45a87c8b4212080;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..0f7f9b53 100644
--- a/purchasing/includes/db/invoice_db.inc
+++ b/purchasing/includes/db/invoice_db.inc
@@ -16,13 +16,14 @@ include_once($path_to_root . "/purchasing/includes/db/invoice_items_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,
+		terms.day_in_following_month, supp.tax_included, supp.tax_algorithm,
 		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
-		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
+		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";
@@ -31,33 +32,37 @@ function read_supplier_details_to_trans(&$supp_trans, $supplier_id)
 
 	$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();
+	}
+	if ($supp_trans->supplier_id != $supplier_id)
+	    get_duedate_from_terms($supp_trans);
+
     $supp_trans->supplier_id = $supplier_id;
     $supp_trans->tax_included = $myrow['tax_included'];
+    $supp_trans->tax_algorithm = $supp_trans->stored_algorithm = $myrow['tax_algorithm'];
     $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);
 }
 
-//--------------------------------------------------------------------------------------------------
-
+//-------------------------------------------------------------------------------------------------
+//	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)
@@ -114,16 +119,22 @@ 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) // do not receive as ref because we change locally
 {
 	global $Refs;
 
 	//$company_currency = get_company_currency();
+	$trans_no = $supp_trans->trans_no;
+	$trans_type = $supp_trans->trans_type;
 	/*Start an sql transaction */
 	begin_transaction();
-	hook_db_prewrite($supp_trans, $supp_trans->trans_type);
+	hook_db_prewrite($supp_trans, $trans_type);
 	$tax_total = 0;
     $taxes = $supp_trans->get_taxes($supp_trans->tax_group_id);
+	if ($trans_no) {
+		void_transaction($trans_type, $trans_no, Today(), _("Document reentered."));
+		$Refs->restore_last($trans_type, $trans_no);
+	}
 
     foreach ($taxes as $n => $taxitem)
     {
@@ -131,18 +142,15 @@ function add_supp_invoice($supp_trans, $invoice_no=0) // do not receive as ref b
     	$tax_total += $taxes[$n]['Value'];
     }
 
-	$invoice_items_total = $supp_trans->get_items_total();
+	$invoice_items_total = $supp_trans->get_items_total(); // get total with/without tax dep. on tax_included
 //	$invoice_items_total = $supp_trans->get_total_taxfree($supp_trans->tax_group_id);
 
 	if($supp_trans->tax_included==0) {
 		$item_added_tax = $tax_total;
 	} else {
 		$item_added_tax = 0;
-		
 	}
 
-	$trans_type = $supp_trans->trans_type;
-	
 	if ($trans_type == ST_SUPPCREDIT)
 	{
 		// let's negate everything because it's a credit note
@@ -158,7 +166,11 @@ function add_supp_invoice($supp_trans, $invoice_no=0) // do not receive as ref b
     /*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);
+		$invoice_items_total, $item_added_tax, $supp_trans->ov_discount, "", 0, $supp_trans->tax_included,
+		$supp_trans->tax_algorithm);
+
+
+	$supp_trans->trans_no = $invoice_id;
 
 	$total = 0;
     /* Now the control account */
@@ -191,7 +203,7 @@ function add_supp_invoice($supp_trans, $invoice_no=0) // do not receive as ref b
 			$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)
     {
@@ -204,7 +216,7 @@ 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);
-		
+
     	if ($trans_type == ST_SUPPCREDIT)
 		{
 			$iv_act = (is_inventory_item($entered_grn->item_code) ? $stock_gl_code["inventory_account"] : 
@@ -251,7 +263,7 @@ function add_supp_invoice($supp_trans, $invoice_no=0) // do not receive as ref b
 					$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); */
@@ -370,12 +382,15 @@ function add_supp_invoice($supp_trans, $invoice_no=0) // do not receive as ref b
 				$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");
+			if (isset($taxitem['purchasing_gl_code']))
+			{
+	    		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");
+	 		}
     	}
     }
 	
@@ -386,26 +401,26 @@ function add_supp_invoice($supp_trans, $invoice_no=0) // do not receive as ref b
 
 	$Refs->save($trans_type, $invoice_id, $supp_trans->reference);
 
-	if ($invoice_no != 0)
+	if ($supp_trans->src_docs)
 	{
-		$invoice_alloc_balance = get_supp_trans_allocation_balance(ST_SUPPINVOICE, $invoice_no);
+		$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);
+			$trans = get_supp_trans($supp_trans->src_docs, ST_SUPPINVOICE);
 			$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_SUPPINVOICE, $supp_trans->src_docs, $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,
+				add_supp_allocation($allocate_amount, ST_SUPPCREDIT, $invoice_id, ST_SUPPINVOICE, $supp_trans->src_docs,
 					$date_);
 				// Exchange Variations Joe Hunt 2008-09-20 ////////////////////////////////////////
 
-				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);
 
 				///////////////////////////////////////////////////////////////////////////
@@ -413,7 +428,6 @@ function add_supp_invoice($supp_trans, $invoice_no=0) // do not receive as ref b
 		}
 	}
 
-	$supp_trans->trans_no = $invoice_id;
 	hook_db_postwrite($supp_trans, $supp_trans->trans_type);
     commit_transaction();
 
@@ -445,9 +459,11 @@ function get_po_invoices_credits($po_number)
 
 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 ".TB_PREF."supp_trans.*, supp_name 
+		FROM ".TB_PREF."supp_trans,".TB_PREF."suppliers
 		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";
+
 	$result = db_query($sql, "Cannot retreive a supplier transaction");
 
 	if (db_num_rows($result) == 1)
@@ -465,6 +481,7 @@ 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->stored_algorithm = $supp_trans->tax_algorithm = $trans_row["tax_algorithm"];
 
 		$id = $trans_row["trans_no"];
 
@@ -479,7 +496,10 @@ 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
@@ -548,9 +568,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 +578,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)
@@ -652,17 +671,17 @@ function is_reference_already_there($supplier_id, $supp_reference, $trans_no=0)
 
 function remove_not_invoice_item($id)
 {
-    begin_transaction();
+	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."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"];
@@ -695,4 +714,23 @@ function remove_not_invoice_item($id)
 
     commit_transaction();
 }
-?>
+
+function find_src_invoices($cart)
+{
+	$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;
+}