Better Trial Balance Inquiry and minor bug in date_functions.inc

diff --git a/gl/inquiry/gl_trial_balance.php b/gl/inquiry/gl_trial_balance.php
index c0a3e56ab1c15108466eb271e9c8250a5bf252eb..90bc1f2b4ca260aea29d2f1924725a03df12f4df 100644 (file)
--- a/gl/inquiry/gl_trial_balance.php
+++ b/gl/inquiry/gl_trial_balance.php
@@ -27,6 +27,11 @@ if ($use_date_picker)
 
 page(_($help_context = "Trial Balance"), false, false, "", $js);
 
+$k = 0;\r
+$pdeb = $pcre = $cdeb = $ccre = $tdeb = $tcre = $pbal = $cbal = $tbal = 0;\r
+$cls_pdeb = $cls_pcre = $cls_cdeb = $cls_ccre = $cls_tdeb = $cls_tcre = $cls_pbal = $cls_cbal = $cls_tbal = 0;\r
+$grp_pdeb = $grp_pcre = $grp_cdeb = $grp_ccre = $grp_tdeb = $grp_tcre = $grp_pbal = $grp_cbal = $grp_tbal = 0;\r
+\r
 //----------------------------------------------------------------------------------------------------
 // Ajax updates
 //
@@ -59,46 +64,19 @@ function gl_inquiry_controls()
 
 //----------------------------------------------------------------------------------------------------
 
-function display_trial_balance()
+function display_trial_balance($type, $typename)\r
 {
        global $path_to_root;
-
-       if (isset($_POST['TransFromDate']))
-       {
-               $row = get_current_fiscalyear();
-               if (date1_greater_date2($_POST['TransFromDate'], sql2date($row['end'])))
-               {
-                       display_error(_("The from date cannot be bigger than the fiscal year end."));
-                       set_focus('TransFromDate');
-                       return;
-               }       
-       }       
-       div_start('balance_tbl');
-       if (!isset($_POST['Dimension']))
-               $_POST['Dimension'] = 0;
-       if (!isset($_POST['Dimension2']))
-               $_POST['Dimension2'] = 0;
-       start_table(TABLESTYLE);
-       $tableheader =  "<tr>
-        <td rowspan=2 class='tableheader'>" . _("Account") . "</td>
-        <td rowspan=2 class='tableheader'>" . _("Account Name") . "</td>
-               <td colspan=2 class='tableheader'>" . _("Brought Forward") . "</td>
-               <td colspan=2 class='tableheader'>" . _("This Period") . "</td>
-               <td colspan=2 class='tableheader'>" . _("Balance") . "</td>
-               </tr><tr>
-               <td class='tableheader'>" . _("Debit") . "</td>
-        <td class='tableheader'>" . _("Credit") . "</td>
-               <td class='tableheader'>" . _("Debit") . "</td>
-               <td class='tableheader'>" . _("Credit") . "</td>
-        <td class='tableheader'>" . _("Debit") . "</td>
-        <td class='tableheader'>" . _("Credit") . "</td>
-        </tr>";
-
-    echo $tableheader;
+       \r
+       global $k, $pdeb, $pcre, $cdeb, $ccre, $tdeb, $tcre, $pbal, $cbal, $tbal;\r
+       $printtitle = 0; //Flag for printing type name          \r
 
        $k = 0;
 
-       $accounts = get_gl_accounts();
+       //$accounts = get_gl_accounts();\r
+       //Get Accounts directly under this group/type\r
+       $accounts = get_gl_accounts(null, null, $type);         \r
+       \r
        $pdeb = $pcre = $cdeb = $ccre = $tdeb = $tcre = $pbal = $cbal = $tbal = 0;
        $begin = begin_fiscalyear();
        if (date1_greater_date2($begin, $_POST['TransFromDate']))
@@ -107,6 +85,15 @@ function display_trial_balance()
        
        while ($account = db_fetch($accounts))
        {
+               //Print Type Title if it has atleast one non-zero account       \r
+               if (!$printtitle)\r
+               {       \r
+                       start_row("class='inquirybg' style='font-weight:bold'");\r
+                       label_cell("Group - ".$type ." - ".$typename, "colspan=8");\r
+                       end_row();              \r
+                       $printtitle = 1;                \r
+               }       \r
+       \r
                $prev = get_balance($account["account_code"], $_POST['Dimension'], $_POST['Dimension2'], $begin, $_POST['TransFromDate'], false, false);
                $curr = get_balance($account["account_code"], $_POST['Dimension'], $_POST['Dimension2'], $_POST['TransFromDate'], $_POST['TransToDate'], true, true);
                $tot = get_balance($account["account_code"], $_POST['Dimension'], $_POST['Dimension2'], $begin, $_POST['TransToDate'], false, true);
@@ -146,6 +133,76 @@ function display_trial_balance()
                end_row();
        }
 
+       //Get Account groups/types under this group/type\r
+       $result = get_account_types(false, false, $type);\r
+       while ($accounttype=db_fetch($result))\r
+       {\r
+               //Print Type Title if has sub types and not previously printed\r
+               if (!$printtitle)\r
+               {\r
+                       start_row("class='inquirybg' style='font-weight:bold'");\r
+                       label_cell("Group - ".$type ." - ".$typename, "colspan=8");\r
+                       end_row();              \r
+                       $printtitle = 1;                \r
+               }\r
+               display_trial_balance($accounttype["id"], $accounttype["name"].' ('.$typename.')');\r
+       }\r
+}\r
+\r
+//----------------------------------------------------------------------------------------------------\r
+\r
+gl_inquiry_controls();\r
+\r
+if (isset($_POST['TransFromDate']))\r
+{\r
+       $row = get_current_fiscalyear();\r
+       if (date1_greater_date2($_POST['TransFromDate'], sql2date($row['end'])))\r
+       {\r
+               display_error(_("The from date cannot be bigger than the fiscal year end."));\r
+               set_focus('TransFromDate');\r
+               return;\r
+       }       \r
+}      \r
+div_start('balance_tbl');\r
+if (!isset($_POST['Dimension']))\r
+       $_POST['Dimension'] = 0;\r
+if (!isset($_POST['Dimension2']))\r
+       $_POST['Dimension2'] = 0;\r
+start_table(TABLESTYLE);\r
+$tableheader =  "<tr>\r
+       <td rowspan=2 class='tableheader'>" . _("Account") . "</td>\r
+       <td rowspan=2 class='tableheader'>" . _("Account Name") . "</td>\r
+       <td colspan=2 class='tableheader'>" . _("Brought Forward") . "</td>\r
+       <td colspan=2 class='tableheader'>" . _("This Period") . "</td>\r
+       <td colspan=2 class='tableheader'>" . _("Balance") . "</td>\r
+       </tr><tr>\r
+       <td class='tableheader'>" . _("Debit") . "</td>\r
+       <td class='tableheader'>" . _("Credit") . "</td>\r
+       <td class='tableheader'>" . _("Debit") . "</td>\r
+       <td class='tableheader'>" . _("Credit") . "</td>\r
+       <td class='tableheader'>" . _("Debit") . "</td>\r
+       <td class='tableheader'>" . _("Credit") . "</td>\r
+       </tr>";\r
+\r
+echo $tableheader;\r
+\r
+//display_trial_balance();\r
+\r
+$classresult = get_account_classes(false);\r
+while ($class = db_fetch($classresult))\r
+{\r
+       start_row("class='inquirybg' style='font-weight:bold'");\r
+       label_cell("Class - ".$class['cid'] ." - ".$class['class_name'], "colspan=8");\r
+       end_row();\r
+\r
+       //Get Account groups/types under this group/type with no parents\r
+       $typeresult = get_account_types(false, $class['cid'], -1);\r
+       while ($accounttype=db_fetch($typeresult))\r
+       {\r
+               display_trial_balance($accounttype["id"], $accounttype["name"]);\r
+       }\r
+}\r
+\r
        //$prev = get_balance(null, $begin, $_POST['TransFromDate'], false, false);
        //$curr = get_balance(null, $_POST['TransFromDate'], $_POST['TransToDate'], true, true);
        //$tot = get_balance(null, $begin, $_POST['TransToDate'], false, true);
@@ -170,15 +227,8 @@ function display_trial_balance()
 
        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."));
+               //display_warning(_("The Opening Balance is not in balance, probably due to a non closed Previous Fiscalyear."));\r
        div_end();
-}
-
-//----------------------------------------------------------------------------------------------------
-
-gl_inquiry_controls();
-
-display_trial_balance();
 
 //----------------------------------------------------------------------------------------------------
 

diff --git a/includes/date_functions.inc b/includes/date_functions.inc
index e4b2c76f0f5644e895c52cd018fa3c3bc2feff02..94525a3307fcc3195c3d1e37d72a6c285636f758 100644 (file)
--- a/includes/date_functions.inc
+++ b/includes/date_functions.inc
@@ -266,13 +266,14 @@ function add_months($date, $months) // accepts negative values as well
 {
        global $date_system;
     list($day, $month, $year) = explode_date_to_dmy($date);
-
        $months += $year*12+$month;
        $month = ($months-1)%12+1;
        $year = ($months-$month)/12;
+       if ($month < 0)
+               $month += 12;
 
        $timet = mktime(0,0,0, $month, min($day, days_in_month($month, $year)), $year);
-       
+
     if ($date_system == 1 || $date_system == 2)
     {
        if ($date_system == 1)