X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=admin%2Fcompany_preferences.php;h=6bcb0dbd41f81b2789557db48003c4fbbad9c347;hb=2383d33373d6ddec06906658a0ed6398077c1147;hp=d020398a8bd94937751d10ec5b36a8fe23c9d8f6;hpb=5cb1887da3fa5ee637568ca8bef14427ff69fb27;p=fa-stable.git diff --git a/admin/company_preferences.php b/admin/company_preferences.php index d020398a..6bcb0dbd 100644 --- a/admin/company_preferences.php +++ b/admin/company_preferences.php @@ -44,9 +44,10 @@ if (isset($_POST['update']) && $_POST['update'] != "") $filename .= "/".$_FILES['pic']['name']; //But check for the worst - if (strtoupper(substr(trim($_FILES['pic']['name']), strlen($_FILES['pic']['name']) - 3)) != 'JPG') + if (!in_array((substr(trim($_FILES['pic']['name']),-3)), + array('jpg','JPG','png','PNG'))) { - display_error(_('Only jpg files are supported - a file extension of .jpg is expected')); + display_error(_('Only jpg and png files are supported - a file extension of .jpg or .png is expected')); $input_error = 1; } elseif ( $_FILES['pic']['size'] > ($max_image_size * 1024)) @@ -95,12 +96,13 @@ if (isset($_POST['update']) && $_POST['update'] != "") } if ($input_error != 1) { - update_company_setup($_POST['coy_name'], $_POST['coy_no'], $_POST['gst_no'], $_POST['tax_prd'], $_POST['tax_last'], - $_POST['postal_address'], $_POST['phone'], $_POST['fax'], $_POST['email'], $_POST['coy_logo'], $_POST['domicile'], - $_POST['use_dimension'], $_POST['custom1_name'], $_POST['custom2_name'], $_POST['custom3_name'], - $_POST['custom1_value'], $_POST['custom2_value'], $_POST['custom3_value'], - $_POST['curr_default'], $_POST['f_year'], check_value('no_item_list'), check_value('no_customer_list'), - check_value('no_supplier_list'), $_POST['base_sales']); + update_company_setup($_POST['coy_name'], $_POST['coy_no'], + $_POST['gst_no'], $_POST['tax_prd'], $_POST['tax_last'], + $_POST['postal_address'], $_POST['phone'], $_POST['fax'], + $_POST['email'], $_POST['coy_logo'], $_POST['domicile'], + $_POST['use_dimension'], $_POST['curr_default'], $_POST['f_year'], + check_value('no_item_list'), check_value('no_customer_list'), + check_value('no_supplier_list'), $_POST['base_sales'], check_value('time_zone')); display_notification_centered(_("Company setup has been updated.")); } @@ -112,33 +114,30 @@ if (isset($_POST['update']) && $_POST['update'] != "") start_form(true); - -$myrow = get_company_prefs(); - -$_POST['coy_name'] = $myrow["coy_name"]; -$_POST['gst_no'] = $myrow["gst_no"]; -$_POST['tax_prd'] = $myrow["tax_prd"]; -$_POST['tax_last'] = $myrow["tax_last"]; -$_POST['coy_no'] = $myrow["coy_no"]; -$_POST['postal_address'] = $myrow["postal_address"]; -$_POST['phone'] = $myrow["phone"]; -$_POST['fax'] = $myrow["fax"]; -$_POST['email'] = $myrow["email"]; -$_POST['coy_logo'] = $myrow["coy_logo"]; -$_POST['domicile'] = $myrow["domicile"]; -$_POST['use_dimension'] = $myrow["use_dimension"]; -$_POST['base_sales'] = $myrow["base_sales"]; -$_POST['no_item_list'] = $myrow["no_item_list"]; -$_POST['no_customer_list'] = $myrow["no_customer_list"]; -$_POST['no_supplier_list'] = $myrow["no_supplier_list"]; -$_POST['custom1_name'] = $myrow["custom1_name"]; -$_POST['custom2_name'] = $myrow["custom2_name"]; -$_POST['custom3_name'] = $myrow["custom3_name"]; -$_POST['custom1_value'] = $myrow["custom1_value"]; -$_POST['custom2_value'] = $myrow["custom2_value"]; -$_POST['custom3_value'] = $myrow["custom3_value"]; -$_POST['curr_default'] = $myrow["curr_default"]; -$_POST['f_year'] = $myrow["f_year"]; +if (!isset($_POST['coy_name'])) { + $myrow = get_company_prefs(); + + $_POST['coy_name'] = $myrow["coy_name"]; + $_POST['gst_no'] = $myrow["gst_no"]; + $_POST['tax_prd'] = $myrow["tax_prd"]; + $_POST['tax_last'] = $myrow["tax_last"]; + $_POST['coy_no'] = $myrow["coy_no"]; + $_POST['postal_address'] = $myrow["postal_address"]; + $_POST['phone'] = $myrow["phone"]; + $_POST['fax'] = $myrow["fax"]; + $_POST['email'] = $myrow["email"]; + $_POST['coy_logo'] = $myrow["coy_logo"]; + $_POST['domicile'] = $myrow["domicile"]; + $_POST['use_dimension'] = $myrow["use_dimension"]; + $_POST['base_sales'] = $myrow["base_sales"]; + $_POST['no_item_list'] = $myrow["no_item_list"]; + $_POST['no_customer_list'] = $myrow["no_customer_list"]; + $_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"]; + $_POST['version_id'] = $myrow["version_id"]; +} $_POST['del_coy_logo'] = 0; start_outer_table($table_style2); @@ -146,7 +145,7 @@ start_outer_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); +textarea_row(_("Address:"), 'postal_address', $_POST['postal_address'], 35, 6); text_row_ex(_("Phone Number:"), 'phone', 25, 55); text_row_ex(_("Fax Number:"), 'fax', 25); @@ -155,14 +154,14 @@ email_row_ex(_("Email Address:"), 'email', 25, 55); text_row_ex(_("Official Company Number:"), 'coy_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']); table_section(2); -fiscalyears_list_row(_("Fiscal Year:"), 'f_year', $_POST['f_year']); +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.')); + label_row(_("Company Logo:"), $_POST['coy_logo']); label_row(_("New Company Logo (.jpg)") . ":", ""); check_row(_("Delete Company Logo:"), 'del_coy_logo', $_POST['del_coy_logo']); @@ -175,30 +174,14 @@ sales_types_list_row(_("Base for auto price calculations:"), 'base_sales', $_POS check_row(_("Search Item List"), 'no_item_list', $_POST['no_item_list']); check_row(_("Search Customer List"), 'no_customer_list', $_POST['no_customer_list']); check_row(_("Search Supplier List"), 'no_supplier_list', $_POST['no_supplier_list']); - -start_row(); -end_row(); -label_row(_("Custom Field Name"), _("Custom Field Value")); - -start_row(); -text_cells(null, 'custom1_name', $_POST['custom1_name'], 25, 25); -text_cells(null, 'custom1_value', $_POST['custom1_value'], 30, 30); -end_row(); - -start_row(); -text_cells(null, 'custom2_name', $_POST['custom2_name'], 25, 25); -text_cells(null, 'custom2_value', $_POST['custom2_value'], 30, 30); -end_row(); - -start_row(); -text_cells(null, 'custom3_name', $_POST['custom3_name'], 25, 25); -text_cells(null, 'custom3_value', $_POST['custom3_value'], 30, 30); -end_row(); +label_row("", " "); +check_row(_("Time Zone on Reports"), 'time_zone', $_POST['time_zone']); +label_row(_("Version Id"), $_POST['version_id']); end_outer_table(1); hidden('coy_logo', $_POST['coy_logo']); -submit_center('update', _("Update"), true, '', true); +submit_center('update', _("Update"), true, '', 'default'); end_form(2); //-------------------------------------------------------------------------------------------------