From: Joe Hunt <joe.hunt.consulting@gmail.com>
Date: Wed, 26 Aug 2009 06:59:52 +0000 (+0000)
Subject: Release 2.1.5
X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=commitdiff_plain;h=76498d23a22c51c5e8d1a45faaf400a110c06e13;p=textcart.git

Release 2.1.5
Code cleanup
---

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 4e0d4b3..f037280 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -19,6 +19,15 @@ Legend:
 ! -> Note
 $ -> Affected files
 
+------------------------------- Release 2.1.5 ----------------------------------
+26-Aug-2009 Joe Hung
+! Release 2.1.5
+$ config.php
+# If no dimensions in system, then there were 2 destination selectors in report Balance Sheet
+$ /reporting/reports_main.php
+! Code cleanup
+$ /taxes/tax_calc.inc
+
 24-Aug-2009 Joe Hunt
 # A Purchasing Price of 12.34 with a conversion factor of 100,0000 caused a false internal rounding error of 12.00.
 ! The Purchasing Price, price can now have up to 6 decimals (fractions of hundredth's) and are presented correctly.
diff --git a/config.php b/config.php
index 6fb1c5e..d0e23cb 100644
--- a/config.php
+++ b/config.php
@@ -56,7 +56,7 @@ if (!isset($path_to_root) || isset($_GET['path_to_root']) || isset($_POST['path_
 	// Main Title
 	$app_title = "FrontAccounting";
 	// application version
-	$version 		= "2.1.4";
+	$version 		= "2.1.5";
 
 	// Build for development purposes
 	$build_version 	= date("d.m.Y", filemtime("$path_to_root/CHANGELOG.txt"));
diff --git a/reporting/reports_main.php b/reporting/reports_main.php
index d2b525c..4de6ef7 100644
--- a/reporting/reports_main.php
+++ b/reporting/reports_main.php
@@ -302,7 +302,6 @@ else
 			new ReportParam(_('End Date'),'DATEENDM'),
 			new ReportParam(_('Graphics'),'GRAPHIC'),
 			new ReportParam(_('Comments'),'TEXTBOX'),
-			new ReportParam(_('Destination'),'DESTINATION'),
 			new ReportParam(_('Destination'),'DESTINATION')));
 	$reports->addReport(_('General Ledger'),707,_('&Profit and Loss Statement'),
 	array(	new ReportParam(_('Start Date'),'DATEBEGINM'),
diff --git a/taxes/tax_calc.inc b/taxes/tax_calc.inc
index 088be56..1209d62 100644
--- a/taxes/tax_calc.inc
+++ b/taxes/tax_calc.inc
@@ -15,32 +15,6 @@ include_once($path_to_root . "/taxes/db/item_tax_types_db.inc");
 
 //---------------------------------------------------------------------------------
 
-// returns the tax cost for a given item
-/*
-function get_tax_value_for_item($stock_id, $price, $tax_group)
-{
-	// if price is zero, then can't be taxed
-	if ($price == 0)
-		return 0;
-		
-	$ret_tax_array = get_tax_group_items_as_array($tax_group);			
-		
-	$tax_array = get_taxes_for_item($stock_id, $ret_tax_array);
-	if ($tax_array == null)
-		return 0;
-	
-	$tax_multiplier = 0;	
-
-	// loop for all items
-	foreach ($tax_array as $taxitem) {
-		$tax_multiplier += $taxitem["rate"];
-	}
-	
-	return $price * ($tax_multiplier / 100);	
-}
-*/
-//---------------------------------------------------------------------------------
-
 // returns the price of a given item minus any included taxes
 // for item $stock_id with line price $price,
 // with applicable tax rates $tax_group_array or group id $tax_group
@@ -232,60 +206,7 @@ function get_tax_for_items($items, $prices, $shipping_cost, $tax_group, $tax_inc
 
 	return $ret_tax_array;
 }
-//
-//	Get all taxes for given tax_type_id. This can be used when 
-//	no tax group exemptions are active (local sales).
-//	To be used in quick entries.
-//
-// Redundant 18.08.2009 Joe Hunt (Tax Groups instead).
-/*
-function get_taxes_for_item_tax($tax_type_id)
-{
-	$item_tax_type = get_item_tax_type($tax_type_id);
-	
-	// if the item is exempt from all taxes then return 0
-	if ($item_tax_type["exempt"])
-		return null;
-		
-	// get the exemptions for this item tax type
-	$item_tax_type_exemptions_db = get_item_tax_type_exemptions($tax_type_id);
-	
-	// read them all into an array to minimize db querying
-	$item_tax_type_exemptions = array();
-	while ($item_tax_type_exemp = db_fetch($item_tax_type_exemptions_db))
-	{
-		$item_tax_type_exemptions[] = $item_tax_type_exemp["tax_type_id"];
-	}
-	
-	$ret_tax_array = array();
 
-	$tax_rates = get_all_tax_types_simple();
-	// if any of the taxes are in the exemptions, then skip
-	while($tax_rate = db_fetch($tax_rates)) 
-	{ 
-		
-		$skip = false;			
-		
-		// if it's in the exemptions, skip
-		foreach ($item_tax_type_exemptions as $exemption) 
-		{
-			if (($tax_rate['id'] == $exemption)) 
-			{
-    			$skip = true;
-    			break;
-			}
-		}
-		
-		if (!$skip) 
-		{
-			$index = $tax_rate['id'];
-			$ret_tax_array[$index] = $tax_rate;
-		}
-	}
-	
-	return $ret_tax_array;
-}
-*/
 function is_tax_account($account_code)
 {
 	$sql= "SELECT id FROM ".TB_PREF."tax_types WHERE