X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=admin%2Ffiscalyears.php;h=3df3205fa84d96e457bee748395cc8006e75de6e;hb=3e2f1b46bb33c1720b4373f324f6126ca26d2ac7;hp=f3968458f1e0f2cf4bf2e28f89195522c9d05c9d;hpb=9f2ede887db250a31f9c64c24e2813d81dce0af2;p=fa-stable.git

diff --git a/admin/fiscalyears.php b/admin/fiscalyears.php
index f3968458..3df3205f 100644
--- a/admin/fiscalyears.php
+++ b/admin/fiscalyears.php
@@ -90,7 +90,7 @@ function close_year($year)
 	// retrieve total balances from balance sheet accounts
     $sql = "SELECT SUM(amount) FROM ".TB_PREF."gl_trans INNER JOIN ".TB_PREF."chart_master ON account=account_code
     	INNER JOIN ".TB_PREF."chart_types ON account_type=id INNER JOIN ".TB_PREF."chart_class ON class_id=cid 
-		WHERE balance_sheet=1 AND tran_date <= '$to'";
+		WHERE ctype>=".CL_ASSETS." AND ctype <=".CL_EQUITY." AND tran_date <= '$to'";
 	$result = db_query($sql, "The total balance could not be calculated");
 
 	$row = db_fetch_row($result);
@@ -204,7 +204,7 @@ function delete_this_fiscalyear($selected_id)
 	$ref = _("Open Balance");
 	$myrow = get_fiscalyear($selected_id);
 	$to = $myrow['end'];
-	$sql = "SELECT order_no FROM ".TB_PREF."sales_orders WHERE ord_date <= '$to'";
+	$sql = "SELECT order_no FROM ".TB_PREF."sales_orders WHERE ord_date <= '$to' AND type <> 1"; // don't take the templates
 	$result = db_query($sql, "Could not retrieve sales orders");
 	while ($row = db_fetch($result))
 	{
@@ -377,6 +377,9 @@ function display_fiscalyears()
 
 	$result = get_all_fiscalyears();
 	start_form();
+	display_note(_("Warning: During fiscal year removal all transactions 
+		are removed and converted into relevant balances. This process is irreversible!"), 
+		0, 0, "class='currentfg'");
 	start_table($table_style);
 
 	$th = array(_("Fiscal Year Begin"), _("Fiscal Year End"), _("Closed"), "", "");
@@ -406,9 +409,13 @@ function display_fiscalyears()
 		label_cell($to);
 		label_cell($closed_text);
 	 	edit_button_cell("Edit".$myrow['id'], _("Edit"));
-		if ($myrow["id"] != $company_year)
+		if ($myrow["id"] != $company_year) {
  			delete_button_cell("Delete".$myrow['id'], _("Delete"));
- 		else
+			submit_js_confirm("Delete".$myrow['id'],
+				sprintf(_("Are you sure you want to remove fiscal year
+				'%s'-'%s'? All transactions are removed and converted into relevant
+				balances. Do you want to continue ?"), $from, $to));
+		} else
 			label_cell('');
 		end_row();
 	}