From: Janusz Dobrowolski <janusz@frontaccounting.eu>
Date: Wed, 30 Jan 2008 11:37:24 +0000 (+0000)
Subject: Format cleanup, small display fix in taxes/tax_type.php
X-Git-Tag: 2.3-final~1507
X-Git-Url: https://delta.frontaccounting.com/gitweb/?p=fa-stable.git;a=commitdiff_plain;h=bda174fa43e903aa40c5a56371e3c853645ded8c

Format cleanup, small display fix in taxes/tax_type.php
---

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index ac35d039..b208c054 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -19,6 +19,16 @@ Legend:
 ! -> Note
 $ -> Affected files
 
+30-Jan-2008 Janusz Dobrowolski
+ # Minor display fix in tax_types.php
+ $ /taxes/tax_types.php
+ ! Format cleanup on some files.
+ $ /gl/includes/gl_db.inc
+   /gl/includes/gl_ui.inc
+   /applications/application.php
+   frontaccounting.php
+   index.php
+   
 -------------------- 1.16 Stable Released ----------------------
 28-Jan-2008 Joe Hunt
  + Added a possibility to replace the normal listboxes for items, customer and/or suppliers with a search box.
diff --git a/applications/application.php b/applications/application.php
index efa11f23..69029bf2 100644
--- a/applications/application.php
+++ b/applications/application.php
@@ -1,118 +1,118 @@
-<?php
-
-	class menu_item 
-	{
-		var $label;
-		var $link;
-		
-		function menu_item($label, $link) 
-		{
-			$this->label = $label;
-			$this->link = $link;
-		}
-	}
-
-	class menu 
-	{
-		var $title;
-		var $items;
-		
-		function menu($title) 
-		{
-			$this->title = $title;
-			$this->items = array();
-		}
-		
-		function add_item($label, $link) 
-		{
-			$item = new menu_item($label,$link);
-			array_push($this->items,$item);
-			return $item;
-		}
-		
-	}
-
-	class app_function 
-	{
-		var $label;
-		var $link;
-		var $access;
-		
-		function app_function($label,$link,$access=1) 
-		{
-			$this->label = $label;
-			$this->link = $link;
-			$this->access = $access;
-		}
-	}
-
-	class module 
-	{
-		var $name;
-		var $icon;
-		var $lappfunctions;
-		var $rappfunctions;
-		
-		function module($name,$icon = null) 
-		{
-			$this->name = $name;
-			$this->icon = $icon;
-			$this->lappfunctions = array();
-			$this->rappfunctions = array();
-		}
-		
-		function add_lapp_function($label,$link="",$access=1) 
-		{
-			$appfunction = new app_function($label,$link,$access);
-			//array_push($this->lappfunctions,$appfunction);
-			$this->lappfunctions[] = $appfunction;
-			return $appfunction;
-		}
-
-		function add_rapp_function($label,$link="",$access=1) 
-		{
-			$appfunction = new app_function($label,$link,$access);
-			//array_push($this->rappfunctions,$appfunction);
-			$this->rappfunctions[] = $appfunction;
-			return $appfunction;
-		}
-		
-		
-	}
-
-	class application 
-	{
-		var $id;
-		var $name;
-		var $modules;
-		var $enabled;
-		
-		function application($id, $name, $enabled=true) 
-		{
-			$this->id = $id;
-			$this->name = $name;
-			$this->enables = $enabled;
-			$this->modules = array();
-		}
-		
-		function add_module($name, $icon = null) 
-		{
-			$module = new module($name,$icon);
-			//array_push($this->modules,$module);
-			$this->modules[] = $module;
-			return $module;
-		}
-		
-		function add_lapp_function($level, $label,$link="",$access=1) 
-		{
-			$this->modules[$level]->lappfunctions[] = new app_function($label, $link, $access);
-		}	
-			
-		function add_rapp_function($level, $label,$link="",$access=1) 
-		{
-			$this->modules[$level]->rappfunctions[] = new app_function($label, $link, $access);
-		}	
-	}
-
-
+<?php
+
+	class menu_item 
+	{
+		var $label;
+		var $link;
+		
+		function menu_item($label, $link) 
+		{
+			$this->label = $label;
+			$this->link = $link;
+		}
+	}
+
+	class menu 
+	{
+		var $title;
+		var $items;
+		
+		function menu($title) 
+		{
+			$this->title = $title;
+			$this->items = array();
+		}
+		
+		function add_item($label, $link) 
+		{
+			$item = new menu_item($label,$link);
+			array_push($this->items,$item);
+			return $item;
+		}
+		
+	}
+
+	class app_function 
+	{
+		var $label;
+		var $link;
+		var $access;
+		
+		function app_function($label,$link,$access=1) 
+		{
+			$this->label = $label;
+			$this->link = $link;
+			$this->access = $access;
+		}
+	}
+
+	class module 
+	{
+		var $name;
+		var $icon;
+		var $lappfunctions;
+		var $rappfunctions;
+		
+		function module($name,$icon = null) 
+		{
+			$this->name = $name;
+			$this->icon = $icon;
+			$this->lappfunctions = array();
+			$this->rappfunctions = array();
+		}
+		
+		function add_lapp_function($label,$link="",$access=1) 
+		{
+			$appfunction = new app_function($label,$link,$access);
+			//array_push($this->lappfunctions,$appfunction);
+			$this->lappfunctions[] = $appfunction;
+			return $appfunction;
+		}
+
+		function add_rapp_function($label,$link="",$access=1) 
+		{
+			$appfunction = new app_function($label,$link,$access);
+			//array_push($this->rappfunctions,$appfunction);
+			$this->rappfunctions[] = $appfunction;
+			return $appfunction;
+		}
+		
+		
+	}
+
+	class application 
+	{
+		var $id;
+		var $name;
+		var $modules;
+		var $enabled;
+		
+		function application($id, $name, $enabled=true) 
+		{
+			$this->id = $id;
+			$this->name = $name;
+			$this->enables = $enabled;
+			$this->modules = array();
+		}
+		
+		function add_module($name, $icon = null) 
+		{
+			$module = new module($name,$icon);
+			//array_push($this->modules,$module);
+			$this->modules[] = $module;
+			return $module;
+		}
+		
+		function add_lapp_function($level, $label,$link="",$access=1) 
+		{
+			$this->modules[$level]->lappfunctions[] = new app_function($label, $link, $access);
+		}	
+			
+		function add_rapp_function($level, $label,$link="",$access=1) 
+		{
+			$this->modules[$level]->rappfunctions[] = new app_function($label, $link, $access);
+		}	
+	}
+
+
 ?>
\ No newline at end of file
diff --git a/frontaccounting.php b/frontaccounting.php
index 77163a54..409186c1 100644
--- a/frontaccounting.php
+++ b/frontaccounting.php
@@ -1,49 +1,69 @@
-<?php
-	include_once('applications/application.php');
-	include_once('applications/customers.php');
-	include_once('applications/suppliers.php');
-	include_once('applications/inventory.php');
-	include_once('applications/manufacturing.php');
-	include_once('applications/dimensions.php');
-	include_once('applications/generalledger.php');
-	include_once('applications/setup.php');
-	include_once('themes/default/renderer.php');
-	$path_to_root=".";
-	include_once($path_to_root . "/includes/session.inc");
+<?php
+	include_once('applications/application.php');
+	include_once('applications/customers.php');
+	include_once('applications/suppliers.php');
+	include_once('applications/inventory.php');
+	include_once('applications/manufacturing.php');
+	include_once('applications/dimensions.php');
+	include_once('applications/generalledger.php');
+	include_once('applications/setup.php');
+	include_once('themes/default/renderer.php');
+	$path_to_root=".";
+	include_once($path_to_root . "/includes/session.inc");
 
-	class front_accounting 
	{
		var $user;
-		var $settings;
-		var $applications;
-		var $selected_application;
-		// GUI
-		var $menu;
-		var $renderer;
-		function front_accounting() 
		{
			$this->renderer = new renderer();
		}
-		function add_application($app) 
		{
			$this->applications[$app->id] = &$app;
		}
-		function get_application($id) 
		{
			if (isset($this->applications[$id]))
-				return $this->applications[$id];
-			return null;
		}
-		function get_selected_application() 
		{
			if (isset($this->selected_application))
-				return $this->applications[$this->selected_application];
-			foreach ($this->applications as $application)
-				return $application;
-			return null;
		}
-		function display() 
		{
			$this->init();
-			$this->renderer->wa_header();
-			$this->renderer->menu_header($this->menu);
-			$this->renderer->display_applications($this);
-			$this->renderer->menu_footer($this->menu);
-			$this->renderer->wa_footer();
		}
-		function init() 
		{
-			$this->menu = new menu(_("Main  Menu"));
-			$this->menu->add_item(_("Main  Menu"), "index.php");
-			$this->menu->add_item(_("Logout"), "/account/access/logout.php");
-			$this->applications = array();
-			$this->add_application(new customers_app());
-			$this->add_application(new suppliers_app());
-			$this->add_application(new inventory_app());
-			$this->add_application(new manufacturing_app());
-			$this->add_application(new dimensions_app());
-			$this->add_application(new general_ledger_app());
-			$this->add_application(new setup_app());
		}
	}
+	class front_accounting 
+		{
+		var $user;
+		var $settings;
+		var $applications;
+		var $selected_application;
+		// GUI
+		var $menu;
+		var $renderer;
+		function front_accounting() 
+				{
+							$this->renderer = new renderer();
+				}
+		function add_application($app) 
+				{
+							$this->applications[$app->id] = &$app;
+				}
+		function get_application($id) 
+				{
+				 if (isset($this->applications[$id]))
+					return $this->applications[$id];
+				 return null;
+				}
+		function get_selected_application() 
+				{
+							if (isset($this->selected_application))
+				 return $this->applications[$this->selected_application];
+			foreach ($this->applications as $application)
+				return $application;
+			return null;
+					}
+		function display() 
+				{
+							$this->init();
+			$this->renderer->wa_header();
+			$this->renderer->menu_header($this->menu);
+			$this->renderer->display_applications($this);
+			$this->renderer->menu_footer($this->menu);
+			$this->renderer->wa_footer();
+				}
+		function init() 
+				{
+			$this->menu = new menu(_("Main  Menu"));
+			$this->menu->add_item(_("Main  Menu"), "index.php");
+			$this->menu->add_item(_("Logout"), "/account/access/logout.php");
+			$this->applications = array();
+			$this->add_application(new customers_app());
+			$this->add_application(new suppliers_app());
+			$this->add_application(new inventory_app());
+			$this->add_application(new manufacturing_app());
+			$this->add_application(new dimensions_app());
+			$this->add_application(new general_ledger_app());
+			$this->add_application(new setup_app());
+			}	
+}
 ?>
\ No newline at end of file
diff --git a/gl/includes/gl_db.inc b/gl/includes/gl_db.inc
index 8e894234..16d8d101 100644
--- a/gl/includes/gl_db.inc
+++ b/gl/includes/gl_db.inc
@@ -1,20 +1,20 @@
-<?php
-
-include_once($path_to_root . "/includes/banking.inc");
-
-include_once($path_to_root . "/gl/includes/db/gl_db_trans.inc");
-include_once($path_to_root . "/gl/includes/db/gl_db_bank_trans.inc");
-include_once($path_to_root . "/gl/includes/db/gl_db_banking.inc");
-include_once($path_to_root . "/gl/includes/db/gl_db_bank_accounts.inc");
-include_once($path_to_root . "/gl/includes/db/gl_db_currencies.inc");
-include_once($path_to_root . "/gl/includes/db/gl_db_rates.inc");
-include_once($path_to_root . "/gl/includes/db/gl_db_accounts.inc");
-include_once($path_to_root . "/gl/includes/db/gl_db_account_types.inc");
-include_once($path_to_root . "/gl/includes/db/gl_db_bank_trans_types.inc");
-
-//--------------------------------------------------------------------------------
-
-
-						
-
+<?php
+
+include_once($path_to_root . "/includes/banking.inc");
+
+include_once($path_to_root . "/gl/includes/db/gl_db_trans.inc");
+include_once($path_to_root . "/gl/includes/db/gl_db_bank_trans.inc");
+include_once($path_to_root . "/gl/includes/db/gl_db_banking.inc");
+include_once($path_to_root . "/gl/includes/db/gl_db_bank_accounts.inc");
+include_once($path_to_root . "/gl/includes/db/gl_db_currencies.inc");
+include_once($path_to_root . "/gl/includes/db/gl_db_rates.inc");
+include_once($path_to_root . "/gl/includes/db/gl_db_accounts.inc");
+include_once($path_to_root . "/gl/includes/db/gl_db_account_types.inc");
+include_once($path_to_root . "/gl/includes/db/gl_db_bank_trans_types.inc");
+
+//--------------------------------------------------------------------------------
+
+
+						
+
 ?>
\ No newline at end of file
diff --git a/gl/includes/gl_ui.inc b/gl/includes/gl_ui.inc
index 55f2102d..998b3adb 100644
--- a/gl/includes/gl_ui.inc
+++ b/gl/includes/gl_ui.inc
@@ -1,5 +1,5 @@
-<?php
-
-include_once($path_to_root . "/includes/ui.inc");
-
+<?php
+
+include_once($path_to_root . "/includes/ui.inc");
+
 ?>
\ No newline at end of file
diff --git a/index.php b/index.php
index c158424b..99843199 100644
--- a/index.php
+++ b/index.php
@@ -1,11 +1,13 @@
-<?php
-	$path_to_root=".";

	$page_security = 1;
-	include_once("frontaccounting.php");
-	include_once("includes/session.inc");
-	if (!isset($_SESSION["App"]))
-		$_SESSION["App"] = new front_accounting();
-	$app = &$_SESSION["App"];
-	if (isset($_GET['application']))
-		$app->selected_application = $_GET['application'];
-	$app->display();
+<?php
+	$path_to_root=".";
+	
+	$page_security = 1;
+	include_once("frontaccounting.php");
+	include_once("includes/session.inc");
+	if (!isset($_SESSION["App"]))
+		$_SESSION["App"] = new front_accounting();
+	$app = &$_SESSION["App"];
+	if (isset($_GET['application']))
+		$app->selected_application = $_GET['application'];
+	$app->display();
 ?>
\ No newline at end of file
diff --git a/taxes/tax_types.php b/taxes/tax_types.php
index 101144d2..d5b5e60b 100644
--- a/taxes/tax_types.php
+++ b/taxes/tax_types.php
@@ -111,8 +111,8 @@ while ($myrow = db_fetch($result))
 
 	label_cell($myrow["name"]);
 	label_cell(number_format2($myrow["rate"],user_percent_dec()), "align=right");
-	label_cell($myrow["sales_gl_code"] . "&nbsp" . $myrow["SalesAccountName"]);
-	label_cell($myrow["purchasing_gl_code"] . "&nbsp" . $myrow["PurchasingAccountName"]);
+	label_cell($myrow["sales_gl_code"] . "&nbsp;" . $myrow["SalesAccountName"]);
+	label_cell($myrow["purchasing_gl_code"] . "&nbsp;" . $myrow["PurchasingAccountName"]);
 	label_cell($out);
 
 	edit_link_cell("selected_id=".$myrow["id"]);