Rewritten sales shipping cost taxation, improved shipping cost handling in sales...

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

diff --git a/admin/gl_setup.php b/admin/gl_setup.php
index 9539ba3d31513ba23dc6f2d9c0062fc4d50ae5e0..2b6de2178ec2a46afb3317e791dc7826d6446baa 100644 (file)
--- a/admin/gl_setup.php
+++ b/admin/gl_setup.php
@@ -29,7 +29,42 @@ include_once($path_to_root . "/admin/db/company_db.inc");
 
 function can_process()
 {
-       if (!check_num('po_over_receive', 0, 100))
+    if (!check_num('past_due_days', 0, 100))
+    {
+        display_error(_("The past due days interval allowance must be between 0 and 100."));
+        set_focus('past_due_days');
+        return false;
+    }
+
+    if (!check_num('default_quote_valid_days', 0))
+    {
+        display_error(_("Quote Valid Days is not valid number."));
+        set_focus('default_quote_valid_days');
+        return false;
+    }
+
+    if (!check_num('default_delivery_required', 0))
+    {
+        display_error(_("Delivery Required By is not valid number."));
+        set_focus('default_delivery_required');
+        return false;
+    }
+
+    if (!check_num('default_receival_required', 0))
+    {
+        display_error(_("Receival Required By is not valid number."));
+        set_focus('default_receival_required');
+        return false;
+    }
+
+    if (!check_num('default_workorder_required', 0))
+    {
+        display_error(_("Work Order Required By After is not valid number."));
+        set_focus('default_workorder_required');
+        return false;
+    }  
+
+    if (!check_num('po_over_receive', 0, 100))
        {
                display_error(_("The delivery over-receive allowance must be between 0 and 100."));
                set_focus('po_over_receive');
@@ -187,7 +222,7 @@ check_row(_("Print Item Image on Quote:"), 'print_item_images_on_quote', null);
 
 textarea_row(_("Legal Text on Invoice:"), 'legal_text', $_POST['legal_text'], 32, 4);
 
-gl_all_accounts_list_row(_("Shipping Charged Account:"), 'freight_act', $_POST['freight_act']);
+gl_all_accounts_list_row(_("Shipping Charged Account (default):"), 'freight_act', $_POST['freight_act']);
 
 gl_all_accounts_list_row(_("Deferred Income Account:"), 'deferred_income_act', $_POST['deferred_income_act'], true, false,
        _("Not used"), false, false, false);