X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=gl%2Finquiry%2Fgl_trial_balance.php;h=53738843364d6462b6227b6ba5018933363bff8e;hb=d6d58fd1f29bbb2aa53649475d11a4a236437804;hp=0b08c69d14ef9737fd133c66545415013d33aabb;hpb=2868af36843011d5f96da63e0ddeea05039a7bf5;p=fa-stable.git

diff --git a/gl/inquiry/gl_trial_balance.php b/gl/inquiry/gl_trial_balance.php
index 0b08c69d..53738843 100644
--- a/gl/inquiry/gl_trial_balance.php
+++ b/gl/inquiry/gl_trial_balance.php
@@ -29,8 +29,6 @@ page(_($help_context = "Trial Balance"), false, false, "", $js);
 
 $k = 0;
 $pdeb = $pcre = $cdeb = $ccre = $tdeb = $tcre = $pbal = $cbal = $tbal = 0;
-$cls_pdeb = $cls_pcre = $cls_cdeb = $cls_ccre = $cls_tdeb = $cls_tcre = $cls_pbal = $cls_cbal = $cls_tbal = 0;
-$grp_pdeb = $grp_pcre = $grp_cdeb = $grp_ccre = $grp_tdeb = $grp_tcre = $grp_pbal = $grp_cbal = $grp_tbal = 0;
 
 //----------------------------------------------------------------------------------------------------
 // Ajax updates
@@ -77,8 +75,8 @@ function display_trial_balance($type, $typename)
 	//Get Accounts directly under this group/type
 	$accounts = get_gl_accounts(null, null, $type);		
 	
-	$pdeb = $pcre = $cdeb = $ccre = $tdeb = $tcre = $pbal = $cbal = $tbal = 0;
-	$begin = begin_fiscalyear();
+	$begin = get_fiscalyear_begin_for_date($_POST['TransFromDate']);
+	//$begin = begin_fiscalyear();
 	if (date1_greater_date2($begin, $_POST['TransFromDate']))
 		$begin = $_POST['TransFromDate'];
 	$begin = add_days($begin, -1);
@@ -89,7 +87,7 @@ function display_trial_balance($type, $typename)
 		if (!$printtitle)
 		{	
 			start_row("class='inquirybg' style='font-weight:bold'");
-			label_cell("Group - ".$type ." - ".$typename, "colspan=8");
+			label_cell(_("Group")." - ".$type ." - ".$typename, "colspan=8");
 			end_row();		
 			$printtitle = 1;		
 		}	
@@ -141,7 +139,7 @@ function display_trial_balance($type, $typename)
 		if (!$printtitle)
 		{
 			start_row("class='inquirybg' style='font-weight:bold'");
-			label_cell("Group - ".$type ." - ".$typename, "colspan=8");
+			label_cell(_("Group")." - ".$type ." - ".$typename, "colspan=8");
 			end_row();		
 			$printtitle = 1;		
 		}
@@ -192,7 +190,7 @@ $classresult = get_account_classes(false);
 while ($class = db_fetch($classresult))
 {
 	start_row("class='inquirybg' style='font-weight:bold'");
-	label_cell("Class - ".$class['cid'] ." - ".$class['class_name'], "colspan=8");
+	label_cell(_("Class")." - ".$class['cid'] ." - ".$class['class_name'], "colspan=8");
 	end_row();
 
 	//Get Account groups/types under this group/type with no parents
@@ -226,8 +224,8 @@ while ($class = db_fetch($classresult))
 	end_row();
 
 	end_table(1);
-	if (($pbal = round2($pbal, user_price_dec()))  != 0)
-		//display_warning(_("The Opening Balance is not in balance, probably due to a non closed Previous Fiscalyear."));
+	if (($pbal = round2($pbal, user_price_dec())) != 0 && $_POST['Dimension'] == 0 && $_POST['Dimension2'] == 0)
+		display_warning(_("The Opening Balance is not in balance, probably due to a non closed Previous Fiscalyear."));
 	div_end();
 
 //----------------------------------------------------------------------------------------------------