Merged changes from stable branch up to 2.3.23.

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

diff --git a/gl/inquiry/profit_loss.php b/gl/inquiry/profit_loss.php
index b2a09d4f12d36d0ba1daacba184482bb72472b1a..f4a73e129b3147cc4076a14550264a9a71d5a620 100644 (file)
--- a/gl/inquiry/profit_loss.php
+++ b/gl/inquiry/profit_loss.php
@@ -21,7 +21,7 @@ include_once($path_to_root . "/includes/data_checks.inc");
 include_once($path_to_root . "/gl/includes/gl_db.inc");
 
 $js = "";
-if ($use_date_picker)
+if (user_use_date_picker())
        $js = get_js_date_picker();
 
 page(_($help_context = "Profit & Loss Drilldown"), false, false, "", $js);
@@ -161,15 +161,13 @@ function inquiry_controls()
     start_table(TABLESTYLE_NOBORDER);
     
        $date = today();
-       if (!isset($_POST['TransFromDate']))
-               $_POST['TransFromDate'] = begin_month($date);
        if (!isset($_POST['TransToDate']))
                $_POST['TransToDate'] = end_month($date);
+       if (!isset($_POST['TransFromDate']))
+               $_POST['TransFromDate'] = add_days(end_month($date), -user_transaction_days());
     date_cells(_("From:"), 'TransFromDate');
        date_cells(_("To:"), 'TransToDate');
        
-       //Compare Combo
-       global $sel;
        $sel = array(_("Accumulated"), _("Period Y-1"), _("Budget"));   
        echo "<td>"._("Compare to").":</td>\n";
        echo "<td>";
@@ -184,13 +182,15 @@ function inquiry_controls()
     end_table();
 
        hidden('AccGrp');
+
+       return $sel[get_post('Compare')];
 }
 
 //----------------------------------------------------------------------------------------------------
 
-function display_profit_and_loss()
+function display_profit_and_loss($compare)
 {
-       global $path_to_root, $sel;
+       global $path_to_root;
 
        if (!isset($_POST['Dimension']))
                $_POST['Dimension'] = 0;
@@ -201,7 +201,6 @@ function display_profit_and_loss()
 
        $from = $_POST['TransFromDate'];
        $to = $_POST['TransToDate'];
-       $compare = $_POST['Compare'];
        
        if (isset($_POST["AccGrp"]) && (strlen($_POST['AccGrp']) > 0))
                $drilldown = 1; // Deeper Level
@@ -234,7 +233,7 @@ function display_profit_and_loss()
        $tableheader =  "<tr>
         <td class='tableheader'>" . _("Group/Account Name") . "</td>
         <td class='tableheader'>" . _("Period") . "</td>
-               <td class='tableheader'>" . $sel[$compare] . "</td>
+               <td class='tableheader'>" . $compare . "</td>
                <td class='tableheader'>" . _("Achieved %") . "</td>
         </tr>";        
        
@@ -332,12 +331,11 @@ function display_profit_and_loss()
 
 start_form();
 
-inquiry_controls();
+$sel = inquiry_controls();
 
-display_profit_and_loss();
+display_profit_and_loss($sel);
 
 end_form();
 
 end_page();
 
-?>
\ No newline at end of file