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

diff --git a/admin/company_preferences.php b/admin/company_preferences.php
index 8f50a892..2a9e9b5f 100644
--- a/admin/company_preferences.php
+++ b/admin/company_preferences.php
@@ -1,5 +1,14 @@
 <?php
-
+/**********************************************************************
+    Copyright (C) FrontAccounting, LLC.
+	Released under the terms of the GNU Affero General Public License,
+	AGPL, as published by the Free Software Foundation, either version 
+	3 of the License, or (at your option) any later version.
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
+    See the License here <http://www.gnu.org/licenses/agpl-3.0.html>.
+***********************************************************************/
 $page_security =10;
 $path_to_root="..";
 include($path_to_root . "/includes/session.inc");
@@ -10,10 +19,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 +32,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 +61,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 +73,26 @@ 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'));
+		}
+	}
+	if (check_value('del_coy_logo'))
+	{
+		$user_comp = user_company();
+		$filename = $comp_path . "/$user_comp/images/".$_POST['coy_logo'];
+		if (file_exists($filename))
+		{
+			$result = unlink($filename);
+			if (!$result)
+			{
+				display_error(_('The existing image could not be removed'));
+				$input_error = 1;
+			}
+			else
+				$_POST['coy_logo'] = "";
 		}
-	 /* 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 +104,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 */
 
 //---------------------------------------------------------------------------------------------
@@ -116,27 +139,33 @@ $_POST['custom2_value']  = $myrow["custom2_value"];
 $_POST['custom3_value']  = $myrow["custom3_value"];
 $_POST['curr_default']  = $myrow["curr_default"];
 $_POST['f_year']  = $myrow["f_year"];
+$_POST['del_coy_logo']  = 0;
+
+start_outer_table($table_style2);
 
-start_table($table_style2);
+table_section(1);
 
 text_row_ex(_("Name (to appear on reports):"), 'coy_name', 42, 50);
+textarea_row(_("Address:"), 'postal_address', $_POST['postal_address'], 35, 5);
+
+text_row_ex(_("Phone Number:"), 'phone', 25, 55);
+text_row_ex(_("Fax Number:"), 'fax', 25);
+email_row_ex(_("Email Address:"), 'email', 25, 55);
+
 text_row_ex(_("Official Company Number:"), 'coy_no', 25);
-text_row_ex(_("Tax Authority Reference:"), 'gst_no', 25);
+text_row_ex(_("GSTNo:"), 'gst_no', 25);
 
 text_row_ex(_("Tax Periods:"), 'tax_prd', 10, 10, '', null, null, _('Months.'));
 text_row_ex(_("Tax Last Period:"), 'tax_last', 10, 10, '', null, null, _('Months back.'));
 
 currencies_list_row(_("Home Currency:"), 'curr_default', $_POST['curr_default']);
-fiscalyears_list_row(_("Fiscal Year:"), 'f_year', $_POST['f_year']);
 
-textarea_row(_("Address:"), 'postal_address', $_POST['postal_address'], 35, 5);
+table_section(2);
 
-text_row_ex(_("Telephone Number:"), 'phone', 25, 55);
-text_row_ex(_("Facsimile Number:"), 'fax', 25);
-text_row_ex(_("Email Address:"), 'email', 25, 55);
+fiscalyears_list_row(_("Fiscal Year:"), 'f_year', $_POST['f_year']);
 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'>");
+check_row(_("Delete Company Logo:"), 'del_coy_logo', $_POST['del_coy_logo']);
 text_row_ex(_("Domicile:"), 'domicile', 25, 55);
 
 number_list_row(_("Use Dimensions:"), 'use_dimension', null, 0, 2);
@@ -166,9 +195,10 @@ text_cells(null, 'custom3_name', $_POST['custom3_name'], 25, 25);
 text_cells(null, 'custom3_value', $_POST['custom3_value'], 30, 30);
 end_row();
 
-end_table(1);
+end_outer_table(1);
+
 hidden('coy_logo', $_POST['coy_logo']);
-submit_center('submit', _("Update"));
+submit_center('update', _("Update"), true, '', true);
 
 end_form(2);
 //-------------------------------------------------------------------------------------------------