X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=admin%2Fgl_setup.php;h=3b0868160c51b43906857a37e408dc9c14425c4b;hb=7e6e0807990447d2977b970c3a0fd28dc9250194;hp=07f70b7b713ee188a2fde356eed680b530a1ad8d;hpb=a601f3740bb0ce5d13bf1c4cb616f70abb99baae;p=fa-stable.git

diff --git a/admin/gl_setup.php b/admin/gl_setup.php
index 07f70b7b..3b086816 100644
--- 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');
@@ -77,7 +112,7 @@ if (isset($_POST['submit']) && can_process())
 		'debtors_act', 'pyt_discount_act', 'creditors_act', 'freight_act', 'deferred_income_act',
 		'exchange_diff_act', 'bank_charge_act', 'default_sales_act', 'default_sales_discount_act',
 		'default_prompt_payment_act', 'default_inventory_act', 'default_cogs_act', 'depreciation_period',
-		'default_loss_on_asset_disposal_act', 'default_adj_act', 'default_inv_sales_act', 'default_assembly_act', 'legal_text',
+		'default_loss_on_asset_disposal_act', 'default_adj_act', 'default_inv_sales_act', 'default_wip_act', 'legal_text',
 		'past_due_days', 'default_workorder_required', 'default_dim_required', 'default_receival_required',
 		'default_delivery_required', 'default_quote_valid_days', 'grn_clearing_act', 'tax_algorithm',
 		'no_zero_lines_amount', 'show_po_item_codes', 'accounts_alpha', 'loc_notification', 'print_invoice_no',
@@ -119,7 +154,7 @@ $_POST['default_inventory_act'] = $myrow["default_inventory_act"];
 $_POST['default_cogs_act'] = $myrow["default_cogs_act"];
 $_POST['default_adj_act'] = $myrow["default_adj_act"];
 $_POST['default_inv_sales_act'] = $myrow['default_inv_sales_act'];
-$_POST['default_assembly_act'] = $myrow['default_assembly_act'];
+$_POST['default_wip_act'] = $myrow['default_wip_act'];
 
 $_POST['allow_negative_stock'] = $myrow['allow_negative_stock'];
 
@@ -129,7 +164,7 @@ $_POST['past_due_days'] = $myrow['past_due_days'];
 
 $_POST['grn_clearing_act'] = $myrow['grn_clearing_act'];
 
-$_POST['default_credit_limit'] = $myrow['default_credit_limit'];
+$_POST['default_credit_limit'] = price_format($myrow['default_credit_limit']);
 $_POST['legal_text'] = $myrow['legal_text'];
 $_POST['accumulate_shipping'] = $myrow['accumulate_shipping'];
 
@@ -177,7 +212,7 @@ text_row(_("Dimension Required By After:"), 'default_dim_required', $_POST['defa
 
 table_section_title(_("Customers and Sales"));
 
-text_row(_("Default Credit Limit:"), 'default_credit_limit', $_POST['default_credit_limit'], 12, 12);
+amount_row(_("Default Credit Limit:"), 'default_credit_limit', $_POST['default_credit_limit']);
 
 yesno_list_row(_("Invoice Identification:"), 'print_invoice_no', $_POST['print_invoice_no'], $name_yes=_("Number"), $name_no=_("Reference"));
 
@@ -251,7 +286,7 @@ gl_all_accounts_list_row(_("C.O.G.S. Account:"), 'default_cogs_act', $_POST['def
 
 gl_all_accounts_list_row(_("Inventory Adjustments Account:"), 'default_adj_act', $_POST['default_adj_act']);
 
-gl_all_accounts_list_row(_("Item Assembly Costs Account:"), 'default_assembly_act', $_POST['default_assembly_act']);
+gl_all_accounts_list_row(_("WIP Account:"), 'default_wip_act', $_POST['default_wip_act']);
 
 //----------------