X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=admin%2Fgl_setup.php;h=aeae18d98da92513b120b824aa709182de6f4a49;hb=0b1257cb14406901c17a5d537d606d973ca3115c;hp=68ea64802725ea8526960549e706fabcdd24bb4d;hpb=953b3605810699962454b624e19bd0779b17e7f7;p=fa-stable.git

diff --git a/admin/gl_setup.php b/admin/gl_setup.php
index 68ea6480..aeae18d9 100644
--- a/admin/gl_setup.php
+++ b/admin/gl_setup.php
@@ -45,6 +45,20 @@ function can_process()
 		set_focus('past_due_days');
 		return false;
 	}
+
+	$grn_act = get_company_pref('grn_clearing_act');
+	if ((get_post('grn_clearing_act') != $grn_act) && db_num_rows(get_grn_items(0, '', true)))
+	{
+		display_error(_("Before GRN Clearing Account can be changed all GRNs have to be invoiced"));
+		$_POST['grn_clearing_act'] = $grn_act;
+		set_focus('grn_clearing_account');
+		return false;
+	}
+	if (!is_account_balancesheet(get_post('retained_earnings_act')) || is_account_balancesheet(get_post('profit_loss_year_act')))
+	{
+		display_error(_("The Retained Earnings Account should be a Balance Account or the Profit and Loss Year Account should be an Expense Account (preferred the last one in the Expense Class)"));
+		return false;
+	}
 	return true;
 }
 
@@ -52,28 +66,16 @@ function can_process()
 
 if (isset($_POST['submit']) && can_process())
 {
-	update_company_gl_setup($_POST['retained_earnings_act'], $_POST['profit_loss_year_act'],
-		$_POST['debtors_act'], $_POST['pyt_discount_act'],
-		$_POST['creditors_act'], $_POST['freight_act'],
-		$_POST['exchange_diff_act'], $_POST['bank_charge_act'],
-		$_POST['default_sales_act'],
-		$_POST['default_sales_discount_act'],
-		$_POST['default_prompt_payment_act'],
-		$_POST['default_inventory_act'],
-		$_POST['default_cogs_act'],
-		$_POST['default_adj_act'],
-		$_POST['default_inv_sales_act'],
-		$_POST['default_assembly_act'],
-		check_value('allow_negative_stock'),
-		input_num('po_over_receive'),
-		input_num('po_over_charge'),
-		check_value('accumulate_shipping'),
-		$_POST['legal_text'],
-		$_POST['past_due_days'],
-		$_POST['default_credit_limit'],
-		$_POST['default_workorder_required'],
-		$_POST['default_dim_required'],
-		$_POST['default_delivery_required']);
+	update_company_prefs( get_post( array( 'retained_earnings_act', 'profit_loss_year_act',
+		'debtors_act', 'pyt_discount_act', 'creditors_act', 'freight_act',
+		'exchange_diff_act', 'bank_charge_act', 'default_sales_act', 'default_sales_discount_act',
+		'default_prompt_payment_act', 'default_inventory_act', 'default_cogs_act',
+		'default_adj_act', 'default_inv_sales_act', 'default_assembly_act', 'legal_text',
+		'past_due_days', 'default_workorder_required', 'default_dim_required',
+		'default_delivery_required', 'default_quote_valid_days', 'grn_clearing_act',
+		'allow_negative_stock'=> 0, 'accumulate_shipping'=> 0,
+		'po_over_receive' => 0.0, 'po_over_charge' => 0.0, 'default_credit_limit'=>0.0
+)));
 
 	display_notification(_("The general GL setup has been updated."));
 
@@ -83,11 +85,20 @@ if (isset($_POST['submit']) && can_process())
 
 start_form();
 
-//start_outer_table("class='tablestyle'");
-start_outer_table($table_style2, 5);
+start_outer_table(TABLESTYLE2);
 
 table_section(1);
 
+if (get_company_pref('grn_clearing_act') === null) { // available from 2.3.1, can be not defined on pre-2.4 installations
+	set_company_pref('grn_clearing_act', 'glsetup.purchase', 'varchar', 15, 0);
+	refresh_sys_prefs();
+}
+
+if (get_company_pref('default_quote_valid_days') === null) { // available from 2.3.23, can be not defined on pre-2.4 installations
+	set_company_pref('default_quote_valid_days', 'glsetup.sales', 'smallint', 6, 30);
+	refresh_sys_prefs();
+}
+
 $myrow = get_company_prefs();
 
 $_POST['retained_earnings_act']  = $myrow["retained_earnings_act"];
@@ -115,6 +126,8 @@ $_POST['po_over_receive'] = percent_format($myrow['po_over_receive']);
 $_POST['po_over_charge'] = percent_format($myrow['po_over_charge']);
 $_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['legal_text'] = $myrow['legal_text'];
 $_POST['accumulate_shipping'] = $myrow['accumulate_shipping'];
@@ -122,17 +135,13 @@ $_POST['accumulate_shipping'] = $myrow['accumulate_shipping'];
 $_POST['default_workorder_required'] = $myrow['default_workorder_required'];
 $_POST['default_dim_required'] = $myrow['default_dim_required'];
 $_POST['default_delivery_required'] = $myrow['default_delivery_required'];
+$_POST['default_quote_valid_days'] = $myrow['default_quote_valid_days'];
 
 //---------------
 
 
 table_section_title(_("General GL"));
 
-// Not used in FA2.0.
-//gl_all_accounts_list_row(_("Retained Earning Clearing Account:"), 'retained_earnings_act', $_POST['retained_earnings_act']);
-// Not used in FA2.0.
-//gl_all_accounts_list_row(_("Payroll Account:"), 'payroll_act', $_POST['payroll_act']);
-
 text_row(_("Past Due Days Interval:"), 'past_due_days', $_POST['past_due_days'], 6, 6, '', "", _("days"));
 
 gl_all_accounts_list_row(_("Retained Earnings:"), 'retained_earnings_act', $_POST['retained_earnings_act']);
@@ -168,6 +177,8 @@ gl_all_accounts_list_row(_("Sales Discount Account:"), 'default_sales_discount_a
 
 gl_all_accounts_list_row(_("Prompt Payment Discount Account:"), 'default_prompt_payment_act');
 
+text_row(_("Quote Valid Days:"), 'default_quote_valid_days', $_POST['default_quote_valid_days'], 6, 6, '', "", _("days"));
+
 text_row(_("Delivery Required By:"), 'default_delivery_required', $_POST['default_delivery_required'], 6, 6, '', "", _("days"));
 
 //----------------
@@ -191,6 +202,8 @@ gl_all_accounts_list_row(_("Payable Account:"), 'creditors_act', $_POST['credito
 
 gl_all_accounts_list_row(_("Purchase Discount Account:"), 'pyt_discount_act', $_POST['pyt_discount_act']);
 
+gl_all_accounts_list_row(_("GRN Clearing Account:"), 'grn_clearing_act', get_post('grn_clearing_act'), true, false, _("No postings on GRN"));
+
 table_section_title(_("Inventory"));
 
 check_row(_("Allow Negative Inventory:"), 'allow_negative_stock', null);