X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=admin%2Ffiscalyears.php;h=a974e4a2d2a09bdc4fc5343879cf81b4ff537e74;hb=5bc87f4965ed7601c1580512b41f78762389f3c3;hp=cc5c002915604aca01d177faaacb0e9defa87a6f;hpb=5e645e8c7492625677178e8b52da9456299a7411;p=fa-stable.git

diff --git a/admin/fiscalyears.php b/admin/fiscalyears.php
index cc5c0029..a974e4a2 100644
--- a/admin/fiscalyears.php
+++ b/admin/fiscalyears.php
@@ -21,7 +21,7 @@ include_once($path_to_root . "/admin/db/maintenance_db.inc");
 $js = "";
 if ($use_date_picker)
 	$js .= get_js_date_picker();
-page(_("Fiscal Years"), false, false, "", $js);
+page(_($help_context = "Fiscal Years"), false, false, "", $js);
 
 simple_page_mode(true);
 //---------------------------------------------------------------------------------------------
@@ -86,7 +86,7 @@ function check_data()
 function close_year($year)
 {
 	$co = get_company_prefs();
-	if ($co['retained_earnings_act'] == '' || $co['profit_loss_year_act'] == '')
+	if (get_gl_account($co['retained_earnings_act']) == false || get_gl_account($co['profit_loss_year_act']) == false)
 	{
 		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;
@@ -108,7 +108,7 @@ function close_year($year)
 
 	if ($balance != 0.0)
 	{
-		$trans_type = systypes::journal_entry();
+		$trans_type = ST_JOURNAL;
 		$trans_id = get_next_trans_no($trans_type);
 
 		add_gl_trans($trans_type, $trans_id, $to, $co['retained_earnings_act'],
@@ -244,7 +244,7 @@ function delete_this_fiscalyear($selected_id)
 			db_query($sql, "Could not delete purchase order details");
 			$sql = "DELETE FROM ".TB_PREF."purch_orders WHERE order_no = {$row['order_no']}";
 			db_query($sql, "Could not delete purchase order");
-			delete_attachments_and_comments(systypes::po(), $row['order_no']);
+			delete_attachments_and_comments(ST_PURCHORDER, $row['order_no']);
 		}
 	}
 	$sql = "SELECT id FROM ".TB_PREF."grn_batch WHERE delivery_date <= '$to'";
@@ -262,14 +262,14 @@ function delete_this_fiscalyear($selected_id)
 	$result = db_query($sql, "Could not retrieve debtor trans");
 	while ($row = db_fetch($result))
 	{
-		if ($row['type'] == 10)
+		if ($row['type'] == ST_SALESINVOICE)
 		{
-			$deliveries = get_parent_trans(10,$row['trans_no']);
+			$deliveries = get_parent_trans(ST_SALESINVOICE,$row['trans_no']);
 			foreach ($deliveries as $delivery)
 			{
-				$sql = "DELETE FROM ".TB_PREF."debtor_trans_details WHERE debtor_trans_no = $delivery AND debtor_trans_type = 13";
+				$sql = "DELETE FROM ".TB_PREF."debtor_trans_details WHERE debtor_trans_no = $delivery AND debtor_trans_type = ".ST_CUSTDELIVERY;
 				db_query($sql, "Could not delete debtor trans details");
-				$sql = "DELETE FROM ".TB_PREF."debtor_trans WHERE trans_no = $delivery AND type = 13";
+				$sql = "DELETE FROM ".TB_PREF."debtor_trans WHERE trans_no = $delivery AND type = ".ST_CUSTDELIVERY;
 				db_query($sql, "Could not delete debtor trans");
 			}		
 		}	
@@ -423,9 +423,7 @@ function display_fiscalyears()
 		if ($myrow["id"] != $company_year) {
  			delete_button_cell("Delete".$myrow['id'], _("Delete"));
 			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));
+				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();