projects
/
fa-stable.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Access to system settings moved from global scope to SysPrefs.
[fa-stable.git]
/
gl
/
inquiry
/
profit_loss.php
diff --git
a/gl/inquiry/profit_loss.php
b/gl/inquiry/profit_loss.php
index 1e236159a2f8172bf0b447f36d084e096817db75..347b9ff8539ccdc9d198e27a3dea01602f09e67f 100644
(file)
--- a/
gl/inquiry/profit_loss.php
+++ b/
gl/inquiry/profit_loss.php
@@
-168,8
+168,6
@@
function inquiry_controls()
date_cells(_("From:"), 'TransFromDate');
date_cells(_("To:"), 'TransToDate');
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>";
$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');
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;
if (!isset($_POST['Dimension']))
$_POST['Dimension'] = 0;
@@
-201,7
+201,6
@@
function display_profit_and_loss()
$from = $_POST['TransFromDate'];
$to = $_POST['TransToDate'];
$from = $_POST['TransFromDate'];
$to = $_POST['TransToDate'];
- $compare = $_POST['Compare'];
if (isset($_POST["AccGrp"]) && (strlen($_POST['AccGrp']) > 0))
$drilldown = 1; // Deeper Level
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>
$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>";
<td class='tableheader'>" . _("Achieved %") . "</td>
</tr>";
@@
-332,9
+331,9
@@
function display_profit_and_loss()
start_form();
start_form();
-inquiry_controls();
+
$sel =
inquiry_controls();
-display_profit_and_loss();
+display_profit_and_loss(
$sel
);
end_form();
end_form();