From: Joe Hunt <joe.hunt.consulting@gmail.com>
Date: Sun, 30 Jul 2017 10:57:08 +0000 (+0200)
Subject: 0003961: Undefined variables used during journal modify (tax included)
X-Git-Tag: v2.4.2~3
X-Git-Url: https://delta.frontaccounting.com/gitweb/?p=fa-stable.git;a=commitdiff_plain;h=d668de6006af464c34fa2cf864df4a0f398f3fa4

0003961: Undefined variables used during journal modify (tax included)
---

diff --git a/gl/gl_journal.php b/gl/gl_journal.php
index e057d098..34abbedf 100644
--- a/gl/gl_journal.php
+++ b/gl/gl_journal.php
@@ -140,8 +140,8 @@ function create_cart($type=0, $trans_no=0)
 		{
 			$tax_id = $detail['tax_type_id'];
 			$tax_info['net_amount'][$tax_id] = $detail['net_amount']; // we can two records for the same tax_id, but in this case net_amount is the same
-			$tax_info['tax_date'] = sql2date($detail['effective_date']);
-			$tax_info['tax_group'] = $detail['tax_group_id'];
+			$tax_info['tax_date'] = sql2date($detail['tran_date']);
+			//$tax_info['tax_group'] = $detail['tax_group_id'];
 
 		}
 		if (isset($tax_info['net_amount']))	// guess exempt sales/purchase if any tax has been found
@@ -316,7 +316,7 @@ if (isset($_POST['Process']))
 	{
 		// complete tax register data
 		$cart->tax_info['tax_date'] = $_POST['tax_date'];
-		$cart->tax_info['tax_group'] = $_POST['tax_group'];
+		//$cart->tax_info['tax_group'] = $_POST['tax_group'];
 		$taxes = get_all_tax_types();
 		while ($tax = db_fetch($taxes))
 		{
@@ -467,7 +467,7 @@ if (tab_closed('tabs', 'gl'))
 {
 	$cart = &$_SESSION['journal_items'];
 	$cart->tax_info['tax_date'] = $_POST['tax_date'];
-	$cart->tax_info['tax_group'] = $_POST['tax_group'];
+	//$cart->tax_info['tax_group'] = $_POST['tax_group'];
 	$taxes = get_all_tax_types();
 	while ($tax = db_fetch($taxes))
 	{
@@ -536,10 +536,12 @@ tabbed_content_start('tabs', array(
 
 		case 'tax':
 			update_tax_info();
+			br();
 			display_heading(_("Tax register record"));
+			br();
 			start_table(TABLESTYLE2, "width=40%");
 			date_row(_("VAT date:"), 'tax_date', '', "colspan='3'");
-			tax_groups_list_row(_("Tax group:"), 'tax_group');
+			//tax_groups_list_row(_("Tax group:"), 'tax_group');
 			end_table(1);
 
 			start_table(TABLESTYLE2, "width=60%");
diff --git a/purchasing/includes/db/grn_db.inc b/purchasing/includes/db/grn_db.inc
index 832787d0..49e4dcd2 100644
--- a/purchasing/includes/db/grn_db.inc
+++ b/purchasing/includes/db/grn_db.inc
@@ -140,9 +140,6 @@ function add_grn(&$po)
 
 			$po->line_items[$line_no]->grn_item_id = $grn_item;
 			/* Update location stock records - NB  a po cannot be entered for a service/kit parts done automatically */
-			//add_stock_move(ST_SUPPRECEIVE, $order_line->stock_id, $grn, $po->Location, $date_, "",
-			// 	$order_line->receive_qty, $order_line->standard_cost,		
-			// 	$po->supplier_id, 1, $order_line->taxfree_charge_value($po)/$order_line->receive_qty);
 			add_stock_move(ST_SUPPRECEIVE, $order_line->stock_id, $grn, $po->Location, $date_, "",
 			 	$order_line->receive_qty, $order_line->standard_cost, $order_line->taxfree_charge_value($po)/$order_line->receive_qty);