Merged changes from main branch up to release 2.2.1

[fa-stable.git] / admin / company_preferences.php

diff --git a/admin/company_preferences.php b/admin/company_preferences.php
index 66a11281fa9cabb3711b2440bf36ec3961d2bd12..3ee19edbc7a493be95e19e3763c7ecd0d95cf7ef 100644 (file)
--- a/admin/company_preferences.php
+++ b/admin/company_preferences.php
@@ -13,7 +13,7 @@ $page_security = 'SA_SETUPCOMPANY';
 $path_to_root = "..";
 include($path_to_root . "/includes/session.inc");
 
-page(_("Company Setup"));
+page(_($help_context = "Company Setup"));
 
 include_once($path_to_root . "/includes/date_functions.inc");
 include_once($path_to_root . "/includes/ui.inc");
@@ -102,6 +102,8 @@ if (isset($_POST['update']) && $_POST['update'] != "")
        }
        if ($_POST['add_pct'] == "")
                $_POST['add_pct'] = -1;
+       if ($_POST['round_to'] <= 0)
+               $_POST['round_to'] = 1;
        if ($input_error != 1)
        {
                update_company_setup($_POST['coy_name'], $_POST['coy_no'],