X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=gl%2Finquiry%2Fprofit_loss.php;h=8dcf81e2ff9a393f1fc84fc8f1788c3454444d7d;hb=63ed17b5a7a6436c148adc545f3df532b30b493f;hp=3af0e4a7ca65f142fda8b25ec79ab08bcb479b23;hpb=d9b4de9d7e9d3ba77f6ece752fd6cc988effd8f1;p=fa-stable.git diff --git a/gl/inquiry/profit_loss.php b/gl/inquiry/profit_loss.php index 3af0e4a7..8dcf81e2 100644 --- a/gl/inquiry/profit_loss.php +++ b/gl/inquiry/profit_loss.php @@ -21,11 +21,16 @@ 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); +$compare_types = array( + _("Accumulated"), + _("Period Y-1"), + _("Budget") +); //---------------------------------------------------------------------------------------------------- // Ajax updates @@ -40,6 +45,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"]; @@ -59,7 +68,7 @@ function display_type ($type, $typename, $from, $to, $begin, $end, $compare, $co //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); @@ -74,7 +83,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 +123,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 +162,28 @@ function Achieve($d1, $d2) function inquiry_controls() { + 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 "Comapre To:\n"; + echo ""._("Compare to").":\n"; echo ""; - echo array_selector('Compare', null, $sel); + echo array_selector('Compare', null, $compare_types); echo "\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(); @@ -169,16 +193,19 @@ function inquiry_controls() //---------------------------------------------------------------------------------------------------- -function display_profit_and_loss() +function display_profit_and_loss($compare) { - global $path_to_root, $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 @@ -206,12 +233,12 @@ function display_profit_and_loss() div_start('pl_tbl'); - start_table(TABLESTYLE, "width=50%"); + start_table(TABLESTYLE, "width='50%'"); $tableheader = " " . _("Group/Account Name") . " " . _("Period") . " - " . $sel[$compare] . " + " . $compare_types[$compare] . " " . _("Achieved %") . " "; @@ -247,8 +274,8 @@ function display_profit_and_loss() if ($TypeTotal[0] != 0 || $TypeTotal[1] != 0 ) { $url = "" . $accounttype['name'] .""; + . $from . "&TransToDate=" . $to . "&Compare=" . $compare . "&Dimension=" . $dimension . "&Dimension2=" . $dimension2 + . "&AccGrp=" . $accounttype['id'] ."'>" . $accounttype['id'] . " " . $accounttype['name'] .""; alt_table_row_color($k); label_cell($url); @@ -292,7 +319,7 @@ function display_profit_and_loss() $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, @@ -311,10 +338,9 @@ start_form(); inquiry_controls(); -display_profit_and_loss(); +display_profit_and_loss(get_post('Compare')); end_form(); end_page(); -?> \ No newline at end of file