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);
+$compare_types = array(
+ _("Accumulated"),
+ _("Period Y-1"),
+ _("Budget")
+);
//----------------------------------------------------------------------------------------------------
// Ajax updates
$_POST["TransToDate"] = $_GET["TransToDate"];
if (isset($_GET["Compare"]))
$_POST["Compare"] = $_GET["Compare"];
+if (isset($_GET["Dimension"]))
+ $_POST["Dimension"] = $_GET["Dimension"];
+if (isset($_GET["Dimension2"]))
+ $_POST["Dimension2"] = $_GET["Dimension2"];
if (isset($_GET["AccGrp"]))
$_POST["AccGrp"] = $_GET["AccGrp"];
//----------------------------------------------------------------------------------------------------
function display_type ($type, $typename, $from, $to, $begin, $end, $compare, $convert,
- &$dec, &$pdec, &$rep, $dimension=0, $dimension2=0, $drilldown, $path_to_root)
+ $dimension=0, $dimension2=0, $drilldown, $path_to_root)
{
global $levelptr, $k;
//Get Accounts directly under this group/type
$result = get_gl_accounts(null, null, $type);
-
+
while ($account=db_fetch($result))
{
$per_balance = get_gl_trans_from_to($from, $to, $account["account_code"], $dimension, $dimension2);
if ($drilldown && $levelptr == 0)
{
$url = "<a href='$path_to_root/gl/inquiry/gl_account_inquiry.php?TransFromDate="
- . $from . "&TransToDate=" . $to
+ . $from . "&TransToDate=" . $to . "&Dimension=" . $dimension . "&Dimension2=" . $dimension2
. "&account=" . $account['account_code'] . "'>" . $account['account_code']
." ". $account['account_name'] ."</a>";
while ($accounttype=db_fetch($result))
{
$totals_arr = display_type($accounttype["id"], $accounttype["name"], $from, $to, $begin, $end,
- $compare, $convert, $dec, $pdec, $rep, $dimension, $dimension2, $drilldown, $path_to_root);
+ $compare, $convert, $dimension, $dimension2, $drilldown, $path_to_root);
$per_balance_total += $totals_arr[0];
$acc_balance_total += $totals_arr[1];
}
amount_cell(Achieve(($code_per_balance + $per_balance_total), ($code_acc_balance + $acc_balance_total)));
end_row();
}
- elseif ($drilldown && $type != $_POST["AccGrp"])
- {
+ //START Patch#1 : Display only direct child types
+ $acctype1 = get_account_type($type);
+ $parent1 = $acctype1["parent"];
+ if ($drilldown && $parent1 == $_POST["AccGrp"])
+ //END Patch#2
+ //elseif ($drilldown && $type != $_POST["AccGrp"])
+ {
$url = "<a href='$path_to_root/gl/inquiry/profit_loss.php?TransFromDate="
- . $from . "&TransToDate=" . $to . "&Compare=" . $compare
- . "&AccGrp=" . $type ."'>" . $typename ."</a>";
+ . $from . "&TransToDate=" . $to . "&Compare=" . $compare . "&Dimension=" . $dimension . "&Dimension2=" . $dimension2
+ . "&AccGrp=" . $type ."'>" . $type . " " . $typename ."</a>";
alt_table_row_color($k);
label_cell($url);
function inquiry_controls()
{
- start_table("class='tablestyle_noborder'");
+ global $compare_types;
+
+ $dim = get_company_pref('use_dimension');
+ start_table(TABLESTYLE_NOBORDER);
- date_cells(_("From:"), 'TransFromDate', '', null, -30);
+ $date = today();
+ 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>Comapre To:</td>\n";
+ echo "<td>"._("Compare to").":</td>\n";
echo "<td>";
- echo array_selector('Compare', null, $sel);
+ echo array_selector('Compare', null, $compare_types);
echo "</td>\n";
+
+ if ($dim >= 1)
+ dimensions_list_cells(_("Dimension")." 1:", 'Dimension', null, true, " ", false, 1);
+ if ($dim > 1)
+ dimensions_list_cells(_("Dimension")." 2:", 'Dimension2', null, true, " ", false, 2);
submit_cells('Show',_("Show"),'','', 'default');
end_table();
//----------------------------------------------------------------------------------------------------
-function display_profit_and_loss()
+function display_profit_and_loss($compare)
{
- global $comp_path, $path_to_root, $table_style, $sel;
+ global $path_to_root, $compare_types;
- $dim = get_company_pref('use_dimension');
- $dimension = $dimension2 = 0;
+ if (!isset($_POST['Dimension']))
+ $_POST['Dimension'] = 0;
+ if (!isset($_POST['Dimension2']))
+ $_POST['Dimension2'] = 0;
+ $dimension = $_POST['Dimension'];
+ $dimension2 = $_POST['Dimension2'];
$from = $_POST['TransFromDate'];
$to = $_POST['TransToDate'];
- $compare = $_POST['Compare'];
if (isset($_POST["AccGrp"]) && (strlen($_POST['AccGrp']) > 0))
$drilldown = 1; // Deeper Level
else
$drilldown = 0; // Root level
- $dec = 0;
- $pdec = user_percent_dec();
-
if ($compare == 0 || $compare == 2)
{
$end = $to;
div_start('pl_tbl');
- start_table("width=50% $table_style");
+ start_table(TABLESTYLE, "width='50%'");
$tableheader = "<tr>
<td class='tableheader'>" . _("Group/Account Name") . "</td>
<td class='tableheader'>" . _("Period") . "</td>
- <td class='tableheader'>" . $sel[$compare] . "</td>
+ <td class='tableheader'>" . $compare_types[$compare] . "</td>
<td class='tableheader'>" . _("Achieved %") . "</td>
</tr>";
if (!$drilldown) //Root Level
{
- $parent = -1;
- $classper = 0.0;
- $classacc = 0.0;
$salesper = 0.0;
$salesacc = 0.0;
//Get Account groups/types under this group/type
$typeresult = get_account_types(false, $class['cid'], -1);
+ $k = 0; // row color
while ($accounttype=db_fetch($typeresult))
{
$TypeTotal = display_type($accounttype["id"], $accounttype["name"], $from, $to, $begin, $end, $compare, $convert,
- $dec, $pdec, $rep, $dimension, $dimension2, $drilldown, $path_to_root);
+ $dimension, $dimension2, $drilldown, $path_to_root);
$class_per_total += $TypeTotal[0];
$class_acc_total += $TypeTotal[1];
if ($TypeTotal[0] != 0 || $TypeTotal[1] != 0 )
{
$url = "<a href='$path_to_root/gl/inquiry/profit_loss.php?TransFromDate="
- . $from . "&TransToDate=" . $to . "&Compare=" . $compare
- . "&AccGrp=" . $accounttype['id'] ."'>" . $accounttype['name'] ."</a>";
+ . $from . "&TransToDate=" . $to . "&Compare=" . $compare . "&Dimension=" . $dimension . "&Dimension2=" . $dimension2
+ . "&AccGrp=" . $accounttype['id'] ."'>" . $accounttype['id'] . " " . $accounttype['name'] ."</a>";
alt_table_row_color($k);
label_cell($url);
$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,
- $dec, $pdec, $rep, $dimension, $dimension2, $drilldown, $path_to_root);
+ $dimension, $dimension2, $drilldown, $path_to_root);
}
- end_table(1); // outer table
+ end_table(); // outer table
+ hyperlink_params($_SERVER['PHP_SELF'], _("Back"), "TransFromDate=". $from . "&TransToDate=" . $to . "&Dimension=" . $dimension . "&Dimension2=" . $dimension2);
div_end();
}
inquiry_controls();
-display_profit_and_loss();
+display_profit_and_loss(get_post('Compare'));
end_form();
-end_page();
+end_page(false, true);
-?>
\ No newline at end of file