X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=admin%2Fcompany_preferences.php;h=b790d929d98d4c0d042c5226727d8955d29249f4;hb=d1de4b72e5fa6b5952c75b7c79479935bdd0d9d8;hp=77742403113fee2557b6cf5574efa7e0fc7a61d7;hpb=b5f67d3dffd993ad74f63a04ad33ed2ff4bd61a6;p=fa-stable.git

diff --git a/admin/company_preferences.php b/admin/company_preferences.php
index 77742403..b790d929 100644
--- a/admin/company_preferences.php
+++ b/admin/company_preferences.php
@@ -19,11 +19,13 @@ 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");
+include_once($path_to_root . "/reporting/includes/tcpdf.php");
 //-------------------------------------------------------------------------------------------------
 
 if (isset($_POST['update']) && $_POST['update'] != "")
 {
 	$input_error = 0;
+
 	if (!check_num('login_tout', 10))
 	{
 		display_error(_("Login timeout must be positive number not less than 10."));
@@ -54,6 +56,12 @@ if (isset($_POST['update']) && $_POST['update'] != "")
 		set_focus('round_to');
 		$input_error = 1;
 	}
+	if (!check_num('max_days_in_docs', 1))
+	{
+		display_error(_("Max day range in Documents must be a positive number."));
+		set_focus('max_days_in_docs');
+		$input_error = 1;
+	}
 	if ($_POST['add_pct'] != "" && !is_numeric($_POST['add_pct']))
 	{
 		display_error(_("Add Price from Std Cost field must be number."));
@@ -104,12 +112,20 @@ if (isset($_POST['update']) && $_POST['update'] != "")
 			}
 		}
 
-		if ($input_error != 1)
-		{
+		if ($input_error != 1) {
 			$result  =  move_uploaded_file($_FILES['pic']['tmp_name'], $filename);
 			$_POST['coy_logo'] = clean_file_name($_FILES['pic']['name']);
-			if(!$result) 
+			if(!$result) {
 				display_error(_('Error uploading logo file'));
+				$input_error = 1;
+			} else {
+				$msg = check_image_file($filename);
+				if ( $msg) {
+					display_error( $msg);
+					unlink($filename);
+					$input_error = 1;
+				}
+			}
 		}
 	}
 	if (check_value('del_coy_logo'))
@@ -137,7 +153,7 @@ if (isset($_POST['update']) && $_POST['update'] != "")
 				'postal_address','phone', 'fax', 'email', 'coy_logo', 'domicile',
 				'use_dimension', 'curr_default', 'f_year', 'shortname_name_in_list',
 				'no_item_list' => 0, 'no_customer_list' => 0, 'no_supplier_list' => 0, 
-				'base_sales', 'ref_no_auto_increase' => 0, 'dim_on_recurrent_invoice' => 0, 'long_description_invoice' => 0,
+				'base_sales', 'ref_no_auto_increase' => 0, 'dim_on_recurrent_invoice' => 0, 'long_description_invoice' => 0, 'max_days_in_docs' => 180, 'company_logo_on_views' => 0,
 				'time_zone' => 0, 'company_logo_report' => 0, 'barcodes_on_stock' => 0, 'print_dialog_direct' => 0, 
 				'add_pct', 'round_to', 'login_tout', 'auto_curr_reval', 'bcc_email', 'alternative_tax_include_on_docs', 
 				'suppress_tax_rates', 'use_manufacturing', 'use_fixed_assets'))
@@ -179,6 +195,12 @@ $_POST['no_supplier_list']  = $myrow["no_supplier_list"];
 $_POST['curr_default']  = $myrow["curr_default"];
 $_POST['f_year']  = $myrow["f_year"];
 $_POST['time_zone']  = $myrow["time_zone"];
+if (!isset($myrow["max_days_in_docs"]))
+{
+	set_company_pref("max_days_in_docs", "setup.company", "smallint", 5, '180');
+	$myrow["max_days_in_docs"] = get_company_pref("max_days_in_docs");
+}
+$_POST['max_days_in_docs']  = $myrow["max_days_in_docs"];
 if (!isset($myrow["company_logo_report"]))
 {
 	set_company_pref("company_logo_report", "setup.company", "tinyint", 1, '0');
@@ -215,6 +237,12 @@ if (!isset($myrow["long_description_invoice"]))
 	$myrow["long_description_invoice"] = get_company_pref("long_description_invoice");
 }
 $_POST['long_description_invoice']  = $myrow["long_description_invoice"];
+if (!isset($myrow["company_logo_on_views"]))
+{
+	set_company_pref("company_logo_on_views", "setup.company", "tinyint", 1, '0');
+	$myrow["company_logo_on_views"] = get_company_pref("company_logo_on_views");
+}
+$_POST['company_logo_on_views']  = $myrow["company_logo_on_views"];
 $_POST['version_id']  = $myrow["version_id"];
 $_POST['add_pct'] = $myrow['add_pct'];
 $_POST['login_tout'] = $myrow['login_tout'];
@@ -258,6 +286,7 @@ check_row(_("Use Barcodes on Stocks"), 'barcodes_on_stock', $_POST['barcodes_on_
 check_row(_("Auto Increase of Document References"), 'ref_no_auto_increase', $_POST['ref_no_auto_increase']);
 check_row(_("Use Dimensions on Recurrent Invoices"), 'dim_on_recurrent_invoice', $_POST['dim_on_recurrent_invoice']);
 check_row(_("Use Long Descriptions on Invoices"), 'long_description_invoice', $_POST['long_description_invoice']);
+check_row(_("Company Logo on Views"), 'company_logo_on_views', $_POST['company_logo_on_views']);
 label_row(_("Database Scheme Version"), $_POST['version_id']);
 
 table_section(2);
@@ -293,6 +322,7 @@ check_row(_("Search Item List"), 'no_item_list', null);
 check_row(_("Search Customer List"), 'no_customer_list', null);
 check_row(_("Search Supplier List"), 'no_supplier_list', null);
 text_row_ex(_("Login Timeout:"), 'login_tout', 10, 10, '', null, null, _('seconds'));
+text_row_ex(_("Max day range in documents"), 'max_days_in_docs', 10, 10, '', null, null, _('days.'));
 
 end_outer_table(1);