Recurring invoices result in no dimensions on gl_trans. Fixed by company flag option.
[fa-stable.git] / admin / company_preferences.php
index 186d06bf848f45e0d419a7595e61c383597a3f6c..8090d18e33ac7a8164be9082f2ea8d2d6f6f1268 100644 (file)
@@ -36,8 +36,40 @@ if (isset($_POST['update']) && $_POST['update'] != "")
                display_error(_("The company name must be entered."));
                set_focus('coy_name');
        }
+       if (!check_num('tax_prd', 1))
+       {
+               display_error(_("Tax Periods must be positive number."));
+               set_focus('tax_prd');
+               $input_error = 1;
+       }
+       if (!check_num('tax_last', 1))
+       {
+               display_error(_("Tax Last Periods must be positive number."));
+               set_focus('tax_last');
+               $input_error = 1;
+       }
+       if (!check_num('round_to', 1))
+       {
+               display_error(_("Round Calculated field must be a positive number."));
+               set_focus('round_to');
+               $input_error = 1;
+       }
+       if ($_POST['add_pct'] != "" && !is_numeric($_POST['add_pct']))
+       {
+               display_error(_("Add Price from Std Cost field must be number."));
+               set_focus('add_pct');
+               $input_error = 1;
+       }       
        if (isset($_FILES['pic']) && $_FILES['pic']['name'] != '')
        {
+    if ($_FILES['pic']['error'] == UPLOAD_ERR_INI_SIZE) {
+                       display_error(_('The file size is over the maximum allowed.'));
+                       $input_error = 1;
+    }
+    elseif ($_FILES['pic']['error'] > 0) {
+                       display_error(_('Error uploading logo file.'));
+                       $input_error = 1;
+    }
                $result = $_FILES['pic']['error'];
                $filename = company_path()."/images";
                if (!file_exists($filename))
@@ -103,18 +135,19 @@ 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', 
-                               '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'))
+                               '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,
+                               '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'))
                );
 
                $_SESSION['wa_current_user']->timeout = $_POST['login_tout'];
                display_notification_centered(_("Company setup has been updated."));
+               set_focus('coy_name');
+               $Ajax->activate('_page_body');
        }
-       set_focus('coy_name');
-       $Ajax->activate('_page_body');
 } /* end of if submit */
 
 start_form(true);
@@ -134,12 +167,48 @@ $_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"];
+if (!isset($myrow["ref_no_auto_increase"]))
+{
+       set_company_pref("ref_no_auto_increase", "setup.company", "tinyint", 1, '0');
+       $myrow["ref_no_auto_increase"] = get_company_pref("ref_no_auto_increase");
+}
+$_POST['ref_no_auto_increase']  = $myrow["ref_no_auto_increase"];
+if (!isset($myrow["barcodes_on_stock"]))
+{
+       set_company_pref("barcodes_on_stock", "setup.company", "tinyint", 1, '0');
+       $myrow["barcodes_on_stock"] = get_company_pref("barcodes_on_stock");
+}
+$_POST['barcodes_on_stock']  = $myrow["barcodes_on_stock"];
+if (!isset($myrow["print_dialog_direct"]))
+{
+       set_company_pref("print_dialog_direct", "setup.company", "tinyint", 1, '0');
+       $myrow["print_dialog_direct"] = get_company_pref("print_dialog_direct");
+}
+$_POST['print_dialog_direct']  = $myrow["print_dialog_direct"];
+if (!isset($myrow["dim_on_recurrent_invoice"]))
+{
+       set_company_pref("dim_on_recurrent_invoice", "setup.company", "tinyint", 1, '0');
+       $myrow["dim_on_recurrent_invoice"] = get_company_pref("dim_on_recurrent_invoice");
+}
+$_POST['dim_on_recurrent_invoice']  = $myrow["dim_on_recurrent_invoice"];
 $_POST['version_id']  = $myrow["version_id"];
 $_POST['add_pct'] = $myrow['add_pct'];
 $_POST['login_tout'] = $myrow['login_tout'];
@@ -151,13 +220,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);
@@ -168,36 +240,52 @@ 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(_("Time Zone on Reports"), 'time_zone', $_POST['time_zone']);
+check_row(_("Company Logo on Reports"), 'company_logo_report', $_POST['company_logo_report']);
+check_row(_("Use Barcodes on Stocks"), 'barcodes_on_stock', $_POST['barcodes_on_stock']);
+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']);
+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);
+check_row(_("Automatic Revaluation Currency Accounts"), 'auto_curr_reval', $_POST['auto_curr_reval']);
 
-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(_("Open Print Dialog Direct on Reports"), 'print_dialog_direct', null);
 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);