X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=admin%2Fcompany_preferences.php;h=34af247c9b601b43d540242fbeaac5d9c9bb471b;hb=4caf520181fb8539cb52079552b650aef81cb1cb;hp=74b7071bbe76a9b4e926bd1f045fa9809d6c1946;hpb=db29676e1f3088dec81360698ea90790c15f3aec;p=fa-stable.git diff --git a/admin/company_preferences.php b/admin/company_preferences.php index 74b7071b..34af247c 100644 --- a/admin/company_preferences.php +++ b/admin/company_preferences.php @@ -111,11 +111,12 @@ if (isset($_POST['update']) && $_POST['update'] != "") update_company_prefs( get_post( array('coy_name','coy_no','gst_no','tax_prd','tax_last', 'postal_address','phone', 'fax', 'email', 'coy_logo', 'domicile', - 'use_dimension', 'curr_default', 'f_year', + 'use_dimension', 'curr_default', 'f_year', 'shortname_name_in_list', 'no_item_list' => 0, 'no_customer_list' => 0, 'no_supplier_list' =>0, 'base_sales', - 'time_zone' => 0, 'add_pct', 'round_to', 'login_tout', 'auto_curr_reval', - 'bcc_email', 'alternative_tax_include_on_docs', 'suppress_tax_rates')) + 'time_zone' => 0, 'company_logo_report' => 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')) ); $_SESSION['wa_current_user']->timeout = $_POST['login_tout']; @@ -142,12 +143,24 @@ $_POST['coy_logo'] = $myrow["coy_logo"]; $_POST['domicile'] = $myrow["domicile"]; $_POST['use_dimension'] = $myrow["use_dimension"]; $_POST['base_sales'] = $myrow["base_sales"]; +if (!isset($myrow["shortname_name_in_list"])) +{ + set_company_pref("shortname_name_in_list", "setup.company", "tinyint", 1, '0'); + $myrow["shortname_name_in_list"] = get_company_pref("shortname_name_in_list"); +} +$_POST['shortname_name_in_list'] = $myrow["shortname_name_in_list"]; $_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"]; +if (!isset($myrow["company_logo_report"])) +{ + set_company_pref("company_logo_report", "setup.company", "tinyint", 1, '0'); + $myrow["company_logo_report"] = get_company_pref("company_logo_report"); +} +$_POST['company_logo_report'] = $myrow["company_logo_report"]; $_POST['version_id'] = $myrow["version_id"]; $_POST['add_pct'] = $myrow['add_pct']; $_POST['login_tout'] = $myrow['login_tout']; @@ -159,13 +172,16 @@ $_POST['del_coy_logo'] = 0; $_POST['bcc_email'] = $myrow["bcc_email"]; $_POST['alternative_tax_include_on_docs'] = $myrow["alternative_tax_include_on_docs"]; $_POST['suppress_tax_rates'] = $myrow["suppress_tax_rates"]; +$_POST['use_manufacturing'] = $myrow["use_manufacturing"]; +$_POST['use_fixed_assets'] = $myrow["use_fixed_assets"]; start_outer_table(TABLESTYLE2); table_section(1); +table_section_title(_("General settings")); text_row_ex(_("Name (to appear on reports):"), 'coy_name', 50, 50); -textarea_row(_("Address:"), 'postal_address', $_POST['postal_address'], 34, 6); +textarea_row(_("Address:"), 'postal_address', $_POST['postal_address'], 34, 5); text_row_ex(_("Domicile:"), 'domicile', 25, 55); text_row_ex(_("Phone Number:"), 'phone', 25, 55); @@ -176,36 +192,48 @@ email_row_ex(_("BCC Address for all outgoing mails:"), 'bcc_email', 50, 55); text_row_ex(_("Official Company Number:"), 'coy_no', 25); text_row_ex(_("GSTNo:"), 'gst_no', 25); +currencies_list_row(_("Home Currency:"), 'curr_default', $_POST['curr_default']); + +label_row(_("Company Logo:"), $_POST['coy_logo']); +file_row(_("New Company Logo (.jpg)") . ":", 'pic', 'pic'); +check_row(_("Delete Company Logo:"), 'del_coy_logo', $_POST['del_coy_logo']); +check_row(_("Automatic Revaluation Currency Accounts"), 'auto_curr_reval', $_POST['auto_curr_reval']); +check_row(_("Time Zone on Reports"), 'time_zone', $_POST['time_zone']); +check_row(_("Company Logo on Reports"), 'company_logo_report', $_POST['company_logo_report']); +label_row(_("Database Scheme Version"), $_POST['version_id']); + +table_section(2); + +table_section_title(_("General Ledger Settings")); 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.')); check_row(_("Put alternative Tax Include on Docs"), 'alternative_tax_include_on_docs', null); check_row(_("Suppress Tax Rates on Docs"), 'suppress_tax_rates', null); -table_section(2); - -label_row(_("Company Logo:"), $_POST['coy_logo']); -file_row(_("New Company Logo (.jpg)") . ":", 'pic', 'pic'); -check_row(_("Delete Company Logo:"), 'del_coy_logo', $_POST['del_coy_logo']); - -number_list_row(_("Use Dimensions:"), 'use_dimension', null, 0, 2); +table_section_title(_("Sales Pricing")); sales_types_list_row(_("Base for auto price calculations:"), 'base_sales', $_POST['base_sales'], false, _('No base price list') ); + 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']); +text_row_ex(_("Round calculated prices to nearest:"), 'round_to', 10, 10, '', null, null, $curr['hundreds_name']); label_row("", " "); + +table_section_title(_("Optional Modules")); +check_row(_("Manufacturing"), 'use_manufacturing', null); +check_row(_("Fixed Assets"), 'use_fixed_assets', null); +number_list_row(_("Use Dimensions:"), 'use_dimension', null, 0, 2); + +table_section_title(_("User Interface Options")); + +check_row(_("Short Name and Name in List"), 'shortname_name_in_list', $_POST['shortname_name_in_list']); 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); -label_row("", " "); -currencies_list_row(_("Home Currency:"), 'curr_default', $_POST['curr_default']); -check_row(_("Automatic Revaluation Currency Accounts"), 'auto_curr_reval', $_POST['auto_curr_reval']); -check_row(_("Time Zone on Reports"), 'time_zone', $_POST['time_zone']); text_row_ex(_("Login Timeout:"), 'login_tout', 10, 10, '', null, null, _('seconds')); -label_row(_("Version Id"), $_POST['version_id']); end_outer_table(1);