X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=admin%2Fdb%2Ffiscalyears_db.inc;h=ec00e0677db1ae283ca0d66362db1eb6dfefbab0;hb=50606312fee0bb0dbe984e2c08af53b7dab229bd;hp=cbd4784ee9de60787cf55abce2cc6f65b24e9e6c;hpb=883307779f9ca5bac0533702a8702b0cccb4742f;p=fa-stable.git

diff --git a/admin/db/fiscalyears_db.inc b/admin/db/fiscalyears_db.inc
index cbd4784e..ec00e067 100644
--- a/admin/db/fiscalyears_db.inc
+++ b/admin/db/fiscalyears_db.inc
@@ -71,26 +71,36 @@ function delete_fiscalyear($id)
 	commit_transaction();
 }
 
-function is_date_in_fiscalyears($date)
+function is_date_in_fiscalyears($date, $closed=true)
 {
 	$date = date2sql($date);
 	$sql = "SELECT * FROM ".TB_PREF."fiscal_year WHERE '$date' >= begin AND '$date' <= end";
-
+	if (!$closed)
+		$sql .= " AND closed=0";
 	$result = db_query($sql, "could not get all fiscal years");
 	return db_fetch($result) !== false;
 }
 
-function is_bad_begin_date($date)
+function check_begin_end_date($date1, $date2)
 {
-	$bdate = date2sql($date);
-	$sql = "SELECT MAX(end) FROM ".TB_PREF."fiscal_year WHERE begin < '$bdate'";
+	$sql = "SELECT MAX(end), MIN(begin) FROM ".TB_PREF."fiscal_year";
+	$result = db_query($sql, "could not retrieve last fiscal years");
+	$row = db_fetch_row($result);
+	if ($row[0] === null)
+		return true;
+	$max = add_days(sql2date($row[0]), 1);
+	$min = add_days(sql2date($row[1]), -1);
+	return ($max === $date1 || $min === $date2);
+}
 
+function next_begin_date()
+{
+	$sql = "SELECT MAX(end) FROM ".TB_PREF."fiscal_year";
 	$result = db_query($sql, "could not retrieve last fiscal years");
 	$row = db_fetch_row($result);
 	if ($row[0] === null)
 		return false;
-	$max = add_days(sql2date($row[0]), 1);
-	return ($max !== $date);
+	return add_days(sql2date($row[0]), 1);
 }
 
 function check_years_before($date, $closed=false)
@@ -114,6 +124,12 @@ function close_year($year)
 		display_error(_("The Retained Earnings Account or the Profit and Loss Year Account has not been set in System and General GL Setup"));
 		return false;
 	}
+	if (!is_account_balancesheet($co['retained_earnings_act']) || is_account_balancesheet($co['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;
+	}
+
 	begin_transaction();
 
 	$myrow = get_fiscalyear($year);
@@ -150,22 +166,17 @@ function open_year($year)
 {
 	$myrow = get_fiscalyear($year);
 	$from = sql2date($myrow['begin']);
-
-	begin_transaction();
-	open_transactions($from);
-	commit_transaction();
 }
 
 //---------------------------------------------------------------------------------------------
 function delete_attachments_and_comments($type_no, $trans_no)
 {
-	global $comp_path;
 	
 	$sql = "SELECT * FROM ".TB_PREF."attachments WHERE type_no = $type_no AND trans_no = $trans_no";
 	$result = db_query($sql, "Could not retrieve attachments");
 	while ($row = db_fetch($result))
 	{
-		$dir =  $comp_path."/".user_company(). "/attachments";
+		$dir =  company_path(). "/attachments";
 		if (file_exists($dir."/".$row['unique_name']))
 			unlink($dir."/".$row['unique_name']);
 		$sql = "DELETE FROM ".TB_PREF."attachments WHERE  type_no = $type_no AND trans_no = $trans_no";
@@ -236,7 +247,7 @@ function delete_this_fiscalyear($selected_id)
 	{
 		if ($row['type'] == ST_SALESINVOICE)
 		{
-			$deliveries = get_parent_trans(ST_SALESINVOICE,$row['trans_no']);
+			$deliveries = get_sales_parent_numbers($row['type'], $row['trans_no']);
 			foreach ($deliveries as $delivery)
 			{
 				$sql = "DELETE FROM ".TB_PREF."debtor_trans_details WHERE debtor_trans_no = $delivery AND debtor_trans_type = ".ST_CUSTDELIVERY;
@@ -311,17 +322,25 @@ function delete_this_fiscalyear($selected_id)
 	$sql = "DELETE FROM ".TB_PREF."budget_trans WHERE tran_date <= '$to'";
 	db_query($sql, "Could not delete exchange rates");
 	
-	$sql = "SELECT account, SUM(amount) AS amount FROM ".TB_PREF."gl_trans WHERE tran_date <= '$to' GROUP by account";
+	$sql = "SELECT account, SUM(amount) AS amount, person_type_id, person_id FROM "
+		.TB_PREF."gl_trans WHERE tran_date <= '$to' GROUP by account, person_type_id, person_id";
 	$result = db_query($sql, "Could not retrieve gl trans");
+	$trans_no = get_next_trans_no(ST_JOURNAL);
+
+	$last_account='';
 	while ($row = db_fetch($result))
 	{
-		$sql = "DELETE FROM ".TB_PREF."gl_trans WHERE tran_date <= '$to' AND account = '{$row['account']}'";
-		db_query($sql, "Could not delete gl trans");
-		if (is_account_balancesheet($row['account']))
+		if ($last_account != $row['account']) // deletes all subledgers postings, so do it once for account
+		{
+			$sql = "DELETE FROM ".TB_PREF."gl_trans WHERE tran_date <= '$to' AND account = '{$row['account']}'";
+			db_query($sql, "Could not delete gl trans");
+			$last_account = $row['account'];
+		}
+		if (is_account_balancesheet($row['account']) && $row['amount'])
 		{
-			$trans_no = get_next_trans_no(ST_JOURNAL);
-			$sql = "INSERT INTO ".TB_PREF."gl_trans (type, type_no, tran_date, account, memo_, amount) VALUES
-				(".ST_JOURNAL.", $trans_no, '$to', '{$row['account']}', '$ref', {$row['amount']})";
+			$sql = "INSERT INTO ".TB_PREF."gl_trans (type, type_no, tran_date, account, memo_, amount, person_type_id, person_id) VALUES
+				(".ST_JOURNAL.", $trans_no, '$to', '{$row['account']}', '$ref', {$row['amount']}, "
+				.db_escape($row['person_type_id'], true).", ".db_escape($row['person_id'], true).")";
 			db_query($sql, "Could not insert gl trans");
 		}
 	}