From 44cee932862eaa4213f80e9a0a09b2abc18849e4 Mon Sep 17 00:00:00 2001
From: Joe Hunt <joe.hunt.consulting@gmail.com>
Date: Tue, 20 Apr 2010 22:06:49 +0000
Subject: [PATCH] Bug in systypes selector (no type update) and better layout
 in company preferences

---
 CHANGELOG.txt                 |  4 ++++
 admin/attachments.php         | 26 +++++++++++---------------
 admin/company_preferences.php |  1 +
 3 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 2c8d5239..c041b3bf 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -19,6 +19,10 @@ Legend:
 ! -> Note
 $ -> Affected files
 
+21-Apr-2010 Joe Hunt
+# Bug in systypes selector (no type update)
+$ /admin/attachments.php
+
 20-Apr-2010 Joe Hunt
 + Added option for Manual Revaluation of Currency Accounts
 $ /admin/company_preferences.php
diff --git a/admin/attachments.php b/admin/attachments.php
index 34ae4c46..92008742 100644
--- a/admin/attachments.php
+++ b/admin/attachments.php
@@ -22,7 +22,7 @@ include_once($path_to_root . "/admin/db/attachments_db.inc");
 if (isset($_GET['vw']))
 	$view_id = $_GET['vw'];
 else
-$view_id = find_submit('view');
+	$view_id = find_submit('view');
 if ($view_id != -1)
 {
 	$row = get_attachment($view_id);
@@ -144,15 +144,18 @@ if ($Mode == 'RESET')
 
 function viewing_controls()
 {
-    start_form();
-
+	global $selected_id;
+	
     start_table(TABLESTYLE_NOBORDER);
 
-	systypes_list_row(_("Type:"), 'filterType', null, true);
+	start_row();
+	systypes_list_cells(_("Type:"), 'filterType', null, true);
+	if (list_updated('filterType'))
+		$selected_id = -1;;
 
+	end_row();
     end_table(1);
 
-	end_form();
 }
 
 function display_rows($type)
@@ -160,8 +163,6 @@ function display_rows($type)
 	$rows = get_attached_documents($type);
 	$th = array(_("#"), _("Description"), _("Filename"), _("Size"), _("Filetype"), _("Date Uploaded"), "", "", "", "");
 	
-	div_start('transactions');
-	start_form();
 	start_table(TABLESTYLE);
 	table_header($th);
 	$k = 0;
@@ -182,19 +183,16 @@ function display_rows($type)
     	end_row();
 	}	
 	end_table(1);
-	hidden('filterType', $type);
-	end_form();
-	div_end();
 }
 
 //----------------------------------------------------------------------------------------
 
+start_form(true);
+
 viewing_controls();
 
-if (isset($_POST['filterType']))
-	display_rows($_POST['filterType']);
+display_rows($_POST['filterType']);
 
-start_form(true);
 
 start_table(TABLESTYLE2);
 
@@ -217,8 +215,6 @@ text_row_ex(_("Description").':', 'description', 40);
 file_row(_("Attached File") . ":", 'filename', 'filename');
 
 end_table(1);
-if (isset($_POST['filterType']))
-	hidden('filterType', $_POST['filterType']);
 
 submit_add_or_update_center($selected_id == -1, '', 'both');
 
diff --git a/admin/company_preferences.php b/admin/company_preferences.php
index 4270bb8f..899c039a 100644
--- a/admin/company_preferences.php
+++ b/admin/company_preferences.php
@@ -186,6 +186,7 @@ sales_types_list_row(_("Base for auto price calculations:"), 'base_sales', $_POS
 text_row_ex(_("Add Price from Std Cost:"), 'add_pct', 10, 10, '', null, null, "%");
 $curr = get_currency($_POST['curr_default']);
 text_row_ex(_("Round to nearest:"), 'round_to', 10, 10, '', null, null, $curr['hundreds_name']);
+label_row("", "&nbsp;");
 
 check_row(_("Search Item List"), 'no_item_list', null);
 check_row(_("Search Customer List"), 'no_customer_list', null);
-- 
2.30.2