X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=admin%2Fcompany_preferences.php;h=6804b549b5dab24e0004c553edd11dcf7fe4bcf6;hb=b1c79afd0a78ec37ff813f1305e9e0804be78ef3;hp=8f50a89281154008c5caa10431b07dddda6e27ad;hpb=be377198601dc01ba28d9f1c10ffdb961d5b7e2c;p=fa-stable.git

diff --git a/admin/company_preferences.php b/admin/company_preferences.php
index 8f50a892..6804b549 100644
--- a/admin/company_preferences.php
+++ b/admin/company_preferences.php
@@ -10,10 +10,9 @@ include_once($path_to_root . "/includes/date_functions.inc");
 include_once($path_to_root . "/includes/ui.inc");
 
 include_once($path_to_root . "/admin/db/company_db.inc");
-
 //-------------------------------------------------------------------------------------------------
 
-if (isset($_POST['submit']) && $_POST['submit'] != "")
+if (isset($_POST['update']) && $_POST['update'] != "")
 {
 
 	$input_error = 0;
@@ -24,9 +23,9 @@ if (isset($_POST['submit']) && $_POST['submit'] != "")
 		display_error(_("The company name must be entered."));
 		set_focus('coy_name');
 	}
-	$user_comp = user_company();
 	if (isset($_FILES['pic']) && $_FILES['pic']['name'] != '')
 	{
+		$user_comp = user_company();
 		$result = $_FILES['pic']['error'];
 		$filename = $comp_path . "/$user_comp/images";
 		if (!file_exists($filename))
@@ -53,7 +52,6 @@ if (isset($_POST['submit']) && $_POST['submit'] != "")
 		}
 		elseif (file_exists($filename))
 		{
-			display_notification(_('Attempting to overwrite an existing item image'));
 			$result = unlink($filename);
 			if (!$result)
 			{
@@ -66,11 +64,10 @@ if (isset($_POST['submit']) && $_POST['submit'] != "")
 		{
 			$result  =  move_uploaded_file($_FILES['pic']['tmp_name'], $filename);
 			$_POST['coy_logo'] = $_FILES['pic']['name'];
-			$message = ($result)?_('File url') ."<a href='$filename'>$filename</a>" : "Somthing is wrong with uploading a file.";
+			if(!$result) 
+				display_error(_('Error uploading logo file'));
 		}
-	 /* EOF Add Image upload for New Item  - by Ori */
 	}
-
 	if ($input_error != 1)
 	{
 		update_company_setup($_POST['coy_name'], $_POST['coy_no'], $_POST['gst_no'], $_POST['tax_prd'], $_POST['tax_last'],
@@ -82,7 +79,8 @@ if (isset($_POST['submit']) && $_POST['submit'] != "")
 
 		display_notification_centered(_("Company setup has been updated."));
 	}
-
+	set_focus('coy_name');
+	$Ajax->activate('_page_body');
 } /* end of if submit */
 
 //---------------------------------------------------------------------------------------------
@@ -135,7 +133,7 @@ text_row_ex(_("Telephone Number:"), 'phone', 25, 55);
 text_row_ex(_("Facsimile Number:"), 'fax', 25);
 text_row_ex(_("Email Address:"), 'email', 25, 55);
 label_row(_("Company Logo:"), $_POST['coy_logo']);
-label_row(_("New")." "._("Company Logo (.jpg)") . ":", "<input type='file' id='pic' name='pic'>");
+label_row(_("New Company Logo (.jpg)") . ":", "<input type='file' id='pic' name='pic'>");
 
 text_row_ex(_("Domicile:"), 'domicile', 25, 55);
 
@@ -168,7 +166,7 @@ end_row();
 
 end_table(1);
 hidden('coy_logo', $_POST['coy_logo']);
-submit_center('submit', _("Update"));
+submit_center('update', _("Update"), true, '', true);
 
 end_form(2);
 //-------------------------------------------------------------------------------------------------