X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=admin%2Fgl_setup.php;h=49710317aa64cd2eb9ae95c0b4a071939a0050bd;hb=fedd801edd1244b499b7f052c6b4298137563a57;hp=ddd2b8e2640d72a07df22852d00f39983d107976;hpb=f7b0f0130571e3473baead5cffe25666170fe70f;p=fa-stable.git

diff --git a/admin/gl_setup.php b/admin/gl_setup.php
index ddd2b8e2..49710317 100644
--- a/admin/gl_setup.php
+++ b/admin/gl_setup.php
@@ -45,6 +45,15 @@ 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;
+	}
 	return true;
 }
 
@@ -58,7 +67,7 @@ if (isset($_POST['submit']) && can_process())
 		'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_delivery_required', 'grn_clearing_act', 'tax_algorithm',
 		'allow_negative_stock'=> 0, 'accumulate_shipping'=> 0,
 		'po_over_receive' => 0.0, 'po_over_charge' => 0.0, 'default_credit_limit'=>0.0
 )));
@@ -71,8 +80,7 @@ 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);
 
@@ -87,6 +95,7 @@ $_POST['pyt_discount_act']  = $myrow["pyt_discount_act"];
 
 $_POST['exchange_diff_act'] = $myrow["exchange_diff_act"];
 $_POST['bank_charge_act'] = $myrow["bank_charge_act"];
+$_POST['tax_algorithm'] = $myrow["tax_algorithm"];
 $_POST['default_sales_act'] = $myrow["default_sales_act"];
 $_POST['default_sales_discount_act']  = $myrow["default_sales_discount_act"];
 $_POST['default_prompt_payment_act']  = $myrow["default_prompt_payment_act"];
@@ -103,6 +112,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'];
@@ -126,6 +137,8 @@ gl_all_accounts_list_row(_("Exchange Variances Account:"), 'exchange_diff_act',
 
 gl_all_accounts_list_row(_("Bank Charges Account:"), 'bank_charge_act', $_POST['bank_charge_act']);
 
+tax_algorithm_list_row(_("Tax Algorithm:"), 'tax_algorithm', $_POST['tax_algorithm']);
+
 //---------------
 
 table_section_title(_("Customers and Sales"));
@@ -174,9 +187,12 @@ 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);
+label_row(null, _("Warning:  This may cause a delay in GL postings"), "", "class='stockmankofg' colspan=2"); 
 
 table_section_title(_("Items Defaults"));
 gl_all_accounts_list_row(_("Sales Account:"), 'default_inv_sales_act', $_POST['default_inv_sales_act']);