$_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"];
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>";
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'");
+ $dim = get_company_pref('use_dimension');
+ start_table(TABLESTYLE_NOBORDER);
date_cells(_("From:"), 'TransFromDate', '', null, -30);
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 "</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()
{
- global $path_to_root, $table_style, $sel;
+ global $path_to_root, $sel;
- $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'];
div_start('pl_tbl');
- start_table("width=50% $table_style");
+ start_table(TABLESTYLE, "width=50%");
$tableheader = "<tr>
<td class='tableheader'>" . _("Group/Account Name") . "</td>
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,