Dispaly group no in Balance Sheet/Profit Loss Drilldown.

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 8d2b12c241a6b02b7f545ea43422837dbeeb77c7..c993daf1798d20db14d2e8fe0835bd526c38fece 100644 (file)
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -19,7 +19,12 @@ Legend:
 ! -> Note
 $ -> Affected files
 
 ! -> Note
 $ -> Affected files
 

-12-Dec-2010 Joe hunt
+13-Dec-2010 Joe Hunt
+! Dispaly group no in Balance Sheet/Profit Loss Drilldown.
+$ /gl/inquiry/balance_sheep.php
+  /gl/inquiry/profit_loss.php
+  
+12-Dec-2010 Joe Hunt

 # Removed Timezone warnings
 $ config.default.php
   /includes/date_functions.inc
 # Removed Timezone warnings
 $ config.default.php
   /includes/date_functions.inc

diff --git a/gl/inquiry/balance_sheet.php b/gl/inquiry/balance_sheet.php
index eafb4855c020dab506f1d5d45bb82b9b41faef1d..8bf527577a2dc663f61d753e252370bc92e4f2cf 100644 (file)
--- a/gl/inquiry/balance_sheet.php
+++ b/gl/inquiry/balance_sheet.php
@@ -109,7 +109,7 @@ function display_type ($type, $typename, $from, $to, $convert, $dimension, $dime
                {
                        $url = "<a href='$path_to_root/gl/inquiry/balance_sheet.php?TransFromDate=" 
                                . $from . "&TransToDate=" . $to . "&Dimension=" . $dimension . "&Dimension2=" . $dimension2 
                {
                        $url = "<a href='$path_to_root/gl/inquiry/balance_sheet.php?TransFromDate=" 
                                . $from . "&TransToDate=" . $to . "&Dimension=" . $dimension . "&Dimension2=" . $dimension2 

-                               . "&AccGrp=" . $type ."'>" . $typename ."</a>";
+                               . "&AccGrp=" . $type ."'>" . $type . " " . $typename ."</a>";

                                
                        alt_table_row_color($k);
                        label_cell($url);
                                
                        alt_table_row_color($k);
                        label_cell($url);


@@ -192,7 +192,7 @@ function display_balance_sheet()
                                {
                                        $url = "<a href='$path_to_root/gl/inquiry/balance_sheet.php?TransFromDate=" 
                                                . $from . "&TransToDate=" . $to . "&Dimension=" . $dimension . "&Dimension2=" . $dimension2 
                                {
                                        $url = "<a href='$path_to_root/gl/inquiry/balance_sheet.php?TransFromDate=" 
                                                . $from . "&TransToDate=" . $to . "&Dimension=" . $dimension . "&Dimension2=" . $dimension2 

-                                               . "&AccGrp=" . $accounttype['id'] ."'>" . $accounttype['name'] ."</a>"; 
+                                               . "&AccGrp=" . $accounttype['id'] ."'>" . $accounttype['id']." ".$accounttype['name'] ."</a>";  

                                        alt_table_row_color($k);
                                        label_cell($url);
                                        amount_cell($TypeTotal * $convert);
                                        alt_table_row_color($k);
                                        label_cell($url);
                                        amount_cell($TypeTotal * $convert);


@@ -250,7 +250,7 @@ function display_balance_sheet()
                $convert = get_class_type_convert($class["ctype"]); 
                
                //Print Class Name      
                $convert = get_class_type_convert($class["ctype"]); 
                
                //Print Class Name      

-               table_section_title(get_account_type_name($_POST["AccGrp"]));   
+               table_section_title($_POST["AccGrp"]. " " . get_account_type_name($_POST["AccGrp"]));   

                
                $classclose = display_type($accounttype["id"], $accounttype["name"], $from, $to, 
                        $convert, $dimension, $dimension2, $drilldown, $path_to_root);
                
                $classclose = display_type($accounttype["id"], $accounttype["name"], $from, $to, 
                        $convert, $dimension, $dimension2, $drilldown, $path_to_root);

diff --git a/gl/inquiry/profit_loss.php b/gl/inquiry/profit_loss.php
index 46b8f44bb98b31062f212e105597a0a04ff638b4..351fc3d738003fe07a29de95ae3b8d59986de8f2 100644 (file)
--- a/gl/inquiry/profit_loss.php
+++ b/gl/inquiry/profit_loss.php
@@ -127,7 +127,7 @@ function display_type ($type, $typename, $from, $to, $begin, $end, $compare, $co
                {       
                        $url = "<a href='$path_to_root/gl/inquiry/profit_loss.php?TransFromDate=" 
                                . $from . "&TransToDate=" . $to . "&Compare=" . $compare . "&Dimension=" . $dimension . "&Dimension2=" . $dimension2
                {       
                        $url = "<a href='$path_to_root/gl/inquiry/profit_loss.php?TransFromDate=" 
                                . $from . "&TransToDate=" . $to . "&Compare=" . $compare . "&Dimension=" . $dimension . "&Dimension2=" . $dimension2

-                               . "&AccGrp=" . $type ."'>" . $typename ."</a>";
+                               . "&AccGrp=" . $type ."'>" . $type . " " . $typename ."</a>";

                                
                        alt_table_row_color($k);
                        label_cell($url);
                                
                        alt_table_row_color($k);
                        label_cell($url);


@@ -266,7 +266,7 @@ function display_profit_and_loss()
                                {
                                        $url = "<a href='$path_to_root/gl/inquiry/profit_loss.php?TransFromDate=" 
                                                . $from . "&TransToDate=" . $to . "&Compare=" . $compare . "&Dimension=" . $dimension . "&Dimension2=" . $dimension2
                                {
                                        $url = "<a href='$path_to_root/gl/inquiry/profit_loss.php?TransFromDate=" 
                                                . $from . "&TransToDate=" . $to . "&Compare=" . $compare . "&Dimension=" . $dimension . "&Dimension2=" . $dimension2

-                                               . "&AccGrp=" . $accounttype['id'] ."'>" . $accounttype['name'] ."</a>";
+                                               . "&AccGrp=" . $accounttype['id'] ."'>" . $accounttype['id'] . " " . $accounttype['name'] ."</a>";

                                                
                                        alt_table_row_color($k);
                                        label_cell($url);
                                                
                                        alt_table_row_color($k);
                                        label_cell($url);


@@ -310,7 +310,7 @@ function display_profit_and_loss()
                $convert = get_class_type_convert($class["ctype"]); 
                
                //Print Class Name      
                $convert = get_class_type_convert($class["ctype"]); 
                
                //Print Class Name      

-               table_section_title(get_account_type_name($_POST["AccGrp"]),4); 
+               table_section_title($_POST["AccGrp"] . " " . get_account_type_name($_POST["AccGrp"]),4);        

                echo $tableheader;
                
                $classtotal = display_type($accounttype["id"], $accounttype["name"], $from, $to, $begin, $end, $compare, $convert, 
                echo $tableheader;
                
                $classtotal = display_type($accounttype["id"], $accounttype["name"], $from, $to, $begin, $end, $compare, $convert,