From: Joe Hunt <joe.hunt.consulting@gmail.com>
Date: Thu, 24 Apr 2008 07:10:36 +0000 (+0000)
Subject: Wrong include file path in /includes/ui/items_cart.inc changed /inventory/includes... 
X-Git-Tag: v2.4.2~19^2~2092
X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=commitdiff_plain;h=ab7ef36ac4dc1d5187c86345de6706c7481b959f;p=fa-stable.git

Wrong include file path in /includes/ui/items_cart.inc changed /inventory/includes/prefs/sysprefs.inc to  /includes/prefs/sysprefs.inc
---

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 3e6c33bb..2787166d 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -19,7 +19,14 @@ Legend:
 ! -> Note
 $ -> Affected files
 
-23-Apr-2008
+24-Apr-2008 Joe Hunt
+# Wrong include file path in /includes/ui/items_cart.inc changed /inventory/includes/prefs/sysprefs.inc to
+  /includes/prefs/sysprefs.inc
+$ /includes/ui/items_cart.inc  
+# Wrong include file in /reporting/includes/pdf_report.inc. Changed header2a.inc to header2.inc
+$ /reporting/includes/pdf_report.inc
+
+23-Apr-2008 Joe Hunt
 ! Removed the content of function header2 in pdf_report.inc to a separate file, header2.inc.
   It will make it easier to design your own document layouts.
 $ /reporting/includes/pdf_report.inc
diff --git a/includes/ui/items_cart.inc b/includes/ui/items_cart.inc
index fb4b71ab..da1917df 100644
--- a/includes/ui/items_cart.inc
+++ b/includes/ui/items_cart.inc
@@ -1,9 +1,9 @@
 <?php
 
-include_once($path_to_root . "/inventory/includes/prefs/sysprefs.inc");
+include_once($path_to_root . "/includes/prefs/sysprefs.inc");
 include_once($path_to_root . "/inventory/includes/inventory_db.inc");
 
-class items_cart 
+class items_cart
 {
 
 	var $line_items;
@@ -14,7 +14,7 @@ class items_cart
 	var	$order_id;
 
 	var $editing_item, $deleting_item;
-	
+
 	var $from_loc;
 	var $to_loc;
 	var $tran_date;
@@ -40,8 +40,8 @@ class items_cart
 				$standard_cost, $description);
 			$this->clear_editing_flags();
 			return true;
-		} 
-		else 
+		}
+		else
 		{
 			// shouldn't come here under normal circumstances
 			display_db_error("unexpected - adding an invalid item or null quantity", "", true);
@@ -73,14 +73,14 @@ class items_cart
 		}
 	}
 
-	function count_items() 
+	function count_items()
 	{
 		return count($this->line_items);
 	}
 
 	function check_qoh($location, $date_, $reverse=false)
 	{
-		foreach ($this->line_items as $line_item) 
+		foreach ($this->line_items as $line_item)
 		{
 			$item_ret = $line_item->check_qoh($location, $date_, $reverse);
 			if ($item_ret != null)
@@ -92,16 +92,16 @@ class items_cart
 
 	function add_gl_item($code_id, $dimension_id, $dimension2_id, $amount, $reference, $description=null)
 	{
-		if (isset($code_id) && $code_id != "" && isset($amount) && isset($dimension_id)  && 
+		if (isset($code_id) && $code_id != "" && isset($amount) && isset($dimension_id)  &&
 			isset($dimension2_id))
 		{
-			$this->gl_items[$this->gl_item_count] = new gl_item($this->gl_item_count, 
+			$this->gl_items[$this->gl_item_count] = new gl_item($this->gl_item_count,
 				$code_id, $dimension_id, $dimension2_id, $amount, $reference, $description);
 			$this->gl_item_count++;
 			$this->clear_editing_flags();
 			return true;
-		} 
-		else 
+		}
+		else
 		{
 			// shouldn't come here under normal circumstances
 			display_db_error("unexpected - adding an invalid item or null quantity", "", true);
@@ -132,12 +132,12 @@ class items_cart
 		}
 	}
 
-	function count_gl_items() 
+	function count_gl_items()
 	{
 		return count($this->gl_items);
 	}
 
-	function gl_items_total() 
+	function gl_items_total()
 	{
 		$total = 0;
 		foreach ($this->gl_items as $gl_item)
@@ -145,10 +145,10 @@ class items_cart
 		return $total;
 	}
 
-	function gl_items_total_debit() 
+	function gl_items_total_debit()
 	{
 		$total = 0;
-		foreach ($this->gl_items as $gl_item) 
+		foreach ($this->gl_items as $gl_item)
 		{
 			if ($gl_item->amount > 0)
 				$total += $gl_item->amount;
@@ -156,10 +156,10 @@ class items_cart
 		return $total;
 	}
 
-	function gl_items_total_credit() 
+	function gl_items_total_credit()
 	{
 		$total = 0;
-		foreach ($this->gl_items as $gl_item) 
+		foreach ($this->gl_items as $gl_item)
 		{
 			if ($gl_item->amount < 0)
 				$total += $gl_item->amount;
@@ -169,7 +169,7 @@ class items_cart
 
 	// ------------ common functions
 
-	function clear_items() 
+	function clear_items()
 	{
     	unset($this->line_items);
 		$this->line_items = array();
@@ -181,27 +181,27 @@ class items_cart
 		$this->clear_editing_flags();
 	}
 
-	function clear_editing_flags() 
+	function clear_editing_flags()
 	{
 		$this->editing_item = $this->deleting_item = 0;
 	}
 
-	function get_editing_item() 
+	function get_editing_item()
 	{
 		return $this->editing_item;
 	}
 
-	function get_deleting_item() 
+	function get_deleting_item()
 	{
 		return $this->deleting_item;
 	}
 
-	function is_editing_item($index) 
+	function is_editing_item($index)
 	{
 		return ($this->editing_item > 0) && ($this->editing_item == $index);
 	}
 
-	function is_deleting_item($index) 
+	function is_deleting_item($index)
 	{
 		return ($this->deleting_item > 0) && ($this->deleting_item == $index);
 	}
@@ -210,7 +210,7 @@ class items_cart
 
 //--------------------------------------------------------------------------------------------
 
-class line_item 
+class line_item
 {
 	var $stock_id;
 	var $item_description;
@@ -261,7 +261,7 @@ class line_item
 					return null;
 
 				$qoh = get_qoh_on_date($this->stock_id, $location, $date_);
-        		if ($quantity + $qoh < 0) 
+        		if ($quantity + $qoh < 0)
         		{
         			return $this;
         		}
@@ -274,7 +274,7 @@ class line_item
 
 //---------------------------------------------------------------------------------------
 
-class gl_item 
+class gl_item
 {
 
 	var $index;
@@ -285,7 +285,7 @@ class gl_item
 	var $reference;
 	var $description;
 
-	function gl_item($index, $code_id, $dimension_id, $dimension2_id, $amount, $reference, 
+	function gl_item($index, $code_id, $dimension_id, $dimension2_id, $amount, $reference,
 		$description=null)
 	{
 		//echo "adding $index, $code_id, $dimension_id, $amount, $reference<br>";
diff --git a/reporting/includes/pdf_report.inc b/reporting/includes/pdf_report.inc
index a774ad4d..ffd0fe6b 100644
--- a/reporting/includes/pdf_report.inc
+++ b/reporting/includes/pdf_report.inc
@@ -274,7 +274,7 @@ class FrontReport extends Cpdf
 			include($path_to_root . "reporting/includes/doctext.inc");
 		}
 
-		include($path_to_root . "reporting/includes/header2a.inc");
+		include($path_to_root . "reporting/includes/header2.inc");
 
 		$this->row = $temp;
 	}