X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=gl%2Finquiry%2Fprofit_loss.php;h=3e7a26f4ff55a58b199df4970a62bc6c013a6fd8;hb=e6d9f3706a42003ac003820c0532db20d5d50ff8;hp=f7e6ea6958a914ec8bb7d664adf7602227e4deee;hpb=648933d504efd675f49e4e07942ebafb9492745d;p=fa-stable.git diff --git a/gl/inquiry/profit_loss.php b/gl/inquiry/profit_loss.php index f7e6ea69..3e7a26f4 100644 --- a/gl/inquiry/profit_loss.php +++ b/gl/inquiry/profit_loss.php @@ -40,6 +40,10 @@ if (isset($_GET["TransToDate"])) $_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"]; @@ -74,7 +78,7 @@ function display_type ($type, $typename, $from, $to, $begin, $end, $compare, $co if ($drilldown && $levelptr == 0) { $url = "" . $account['account_code'] ." ". $account['account_name'] .""; @@ -114,11 +118,16 @@ function display_type ($type, $typename, $from, $to, $begin, $end, $compare, $co 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 = "" . $typename .""; + . $from . "&TransToDate=" . $to . "&Compare=" . $compare . "&Dimension=" . $dimension . "&Dimension2=" . $dimension2 + . "&AccGrp=" . $type ."'>" . $type . " " . $typename .""; alt_table_row_color($k); label_cell($url); @@ -148,18 +157,28 @@ function Achieve($d1, $d2) 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 = 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'); //Compare Combo global $sel; $sel = array(_("Accumulated"), _("Period Y-1"), _("Budget")); - echo "