Changed supplier payment to accept amount in foreign currency instead of exchange...

[fa-stable.git] / gl / inquiry / gl_trial_balance.php

diff --git a/gl/inquiry/gl_trial_balance.php b/gl/inquiry/gl_trial_balance.php
index e4228cb2beb4180e8688c10dcbf7ca708c046654..40456a139d26a50c1afadcbde3fffa7af943a6ab 100644 (file)
--- a/gl/inquiry/gl_trial_balance.php
+++ b/gl/inquiry/gl_trial_balance.php
@@ -46,7 +46,12 @@ function gl_inquiry_controls()
 
     start_table(TABLESTYLE_NOBORDER);
 
-    date_cells(_("From:"), 'TransFromDate', '', null, -30);
+       $date = today();
+       if (!isset($_POST['TransFromDate']))
+               $_POST['TransFromDate'] = begin_month($date);
+       if (!isset($_POST['TransToDate']))
+               $_POST['TransToDate'] = end_month($date);
+    date_cells(_("From:"), 'TransFromDate');
        date_cells(_("To:"), 'TransToDate');
        if ($dim >= 1)
                dimensions_list_cells(_("Dimension")." 1:", 'Dimension', null, true, " ", false, 1);
@@ -75,7 +80,8 @@ function display_trial_balance($type, $typename)
        //Get Accounts directly under this group/type
        $accounts = get_gl_accounts(null, null, $type);         
        
-       $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);
@@ -86,7 +92,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;                
                }       
@@ -138,7 +144,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;                
                }
@@ -189,7 +195,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