X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Frep705.php;h=58c58bec9be142a8fb4b0f0334e185e12ec3cbd1;hb=4a4bc22aa76fd989f2c005102bd3da8e0327e547;hp=2c14360d8aa08920bebafec8f9cafb916f631bbc;hpb=303eb17e9cdd9702eee9fdfcaee51e654a1da541;p=fa-stable.git diff --git a/reporting/rep705.php b/reporting/rep705.php index 2c14360d..58c58bec 100644 --- a/reporting/rep705.php +++ b/reporting/rep705.php @@ -22,6 +22,7 @@ include_once($path_to_root . "/includes/session.inc"); include_once($path_to_root . "/includes/date_functions.inc"); include_once($path_to_root . "/includes/data_checks.inc"); include_once($path_to_root . "/gl/includes/gl_db.inc"); +include_once($path_to_root . "/admin/db/tags_db.inc"); //---------------------------------------------------------------------------------------------------- @@ -71,7 +72,7 @@ function getPeriods($yr, $mo, $account, $dimension, $dimension2) //---------------------------------------------------------------------------------------------------- -function display_type ($type, $typename, $yr, $mo, $convert, &$dec, &$rep, $dimension, $dimension2) +function display_type ($type, $typename, $yr, $mo, $convert, &$dec, &$rep, $dimension, $dimension2, $tags) { $ctotal = array(1 => 0,0,0,0,0,0,0,0,0,0,0,0,0,0); $total = array(1 => 0,0,0,0,0,0,0,0,0,0,0,0,0,0); @@ -83,6 +84,11 @@ function display_type ($type, $typename, $yr, $mo, $convert, &$dec, &$rep, $dime $result = get_gl_accounts(null, null, $type); while ($account=db_fetch($result)) { + if ($tags != -1 && is_array($tags) && $tags[0] != false) + { + if (!is_record_in_tags($tags, TAG_ACCOUNT, $account['account_code'])) + continue; + } $bal = getPeriods($yr, $mo, $account["account_code"], $dimension, $dimension2); if (!$bal['per01'] && !$bal['per02'] && !$bal['per03'] && !$bal['per04'] && !$bal['per05'] && !$bal['per06'] && !$bal['per07'] && !$bal['per08'] && !$bal['per09'] && !$bal['per10'] && @@ -130,7 +136,7 @@ function display_type ($type, $typename, $yr, $mo, $convert, &$dec, &$rep, $dime $rep->NewLine(); } - $totals_arr = display_type($accounttype["id"], $accounttype["name"], $yr, $mo, $convert, $dec, $rep, $dimension, $dimension2); + $totals_arr = display_type($accounttype["id"], $accounttype["name"], $yr, $mo, $convert, $dec, $rep, $dimension, $dimension2, $tags); for ($i = 1; $i <= 12; $i++) { $total[$i] += $totals_arr[$i]; @@ -157,7 +163,7 @@ function display_type ($type, $typename, $yr, $mo, $convert, &$dec, &$rep, $dime function print_annual_expense_breakdown() { - global $path_to_root, $date_system; + global $path_to_root, $SysPrefs; $dim = get_company_pref('use_dimension'); $dimension = $dimension2 = 0; @@ -167,35 +173,39 @@ function print_annual_expense_breakdown() $year = $_POST['PARAM_0']; $dimension = $_POST['PARAM_1']; $dimension2 = $_POST['PARAM_2']; - $comments = $_POST['PARAM_3']; - $destination = $_POST['PARAM_4']; + $tags = (isset($_POST['PARAM_3']) ? $_POST['PARAM_3'] : -1); + $comments = $_POST['PARAM_4']; + $orientation = $_POST['PARAM_5']; + $destination = $_POST['PARAM_6']; } - else if ($dim == 1) + elseif ($dim == 1) { $year = $_POST['PARAM_0']; $dimension = $_POST['PARAM_1']; - $comments = $_POST['PARAM_2']; - $destination = $_POST['PARAM_3']; + $tags = (isset($_POST['PARAM_2']) ? $_POST['PARAM_2'] : -1); + $comments = $_POST['PARAM_3']; + $orientation = $_POST['PARAM_4']; + $destination = $_POST['PARAM_5']; } else { $year = $_POST['PARAM_0']; - $comments = $_POST['PARAM_1']; - $destination = $_POST['PARAM_2']; + $tags = (isset($_POST['PARAM_1']) ? $_POST['PARAM_1'] : -1); + $comments = $_POST['PARAM_2']; + $orientation = $_POST['PARAM_3']; + $destination = $_POST['PARAM_4']; } if ($destination) include_once($path_to_root . "/reporting/includes/excel_report.inc"); else include_once($path_to_root . "/reporting/includes/pdf_report.inc"); + $orientation = ($orientation ? 'L' : 'P'); $dec = 1; - //$pdec = user_percent_dec(); $cols = array(0, 40, 150, 180, 210, 240, 270, 300, 330, 360, 390, 420, 450, 480, 510); //------------0--1---2----3----4----5----6----7----8----10---11---12---13---14---15- - //$yr = date('Y'); - //$mo = date('m'): // from now $sql = "SELECT begin, end, YEAR(end) AS yr, MONTH(end) AS mo FROM ".TB_PREF."fiscal_year WHERE id=".db_escape($year); $result = db_query($sql, "could not get fiscal year"); @@ -205,9 +215,9 @@ function print_annual_expense_breakdown() $yr = $row['yr']; $mo = $row['mo']; $da = 1; - if ($date_system == 1) + if ($SysPrefs->date_system == 1) list($yr, $mo, $da) = jalali_to_gregorian($yr, $mo, $da); - elseif ($date_system == 2) + elseif ($SysPrefs->date_system == 2) list($yr, $mo, $da) = islamic_to_gregorian($yr, $mo, $da); $per12 = strftime('%b',mktime(0,0,0,$mo,$da,$yr)); $per11 = strftime('%b',mktime(0,0,0,$mo-1,$da,$yr)); @@ -237,17 +247,19 @@ function print_annual_expense_breakdown() 'from' => get_dimension_string($dimension), 'to' => ''), 3 => array('text' => _("Dimension")." 2", 'from' => get_dimension_string($dimension2), 'to' => ''), - 4 => array('text' => _('Info'), 'from' => _('Amounts in thousands'), + 4 => array('text' => _('Tags'), 'from' => get_tag_names($tags), 'to' => ''), + 5 => array('text' => _('Info'), 'from' => _('Amounts in thousands'), 'to' => '')); } - else if ($dim == 1) + elseif ($dim == 1) { $params = array( 0 => $comments, 1 => array('text' => _("Year"), 'from' => $year, 'to' => ''), 2 => array('text' => _('Dimension'), 'from' => get_dimension_string($dimension), 'to' => ''), - 3 => array('text' => _('Info'), 'from' => _('Amounts in thousands'), + 3 => array('text' => _('Tags'), 'from' => get_tag_names($tags), 'to' => ''), + 4 => array('text' => _('Info'), 'from' => _('Amounts in thousands'), 'to' => '')); } else @@ -255,15 +267,18 @@ function print_annual_expense_breakdown() $params = array( 0 => $comments, 1 => array('text' => _("Year"), 'from' => $year, 'to' => ''), - 2 => array('text' => _('Info'), 'from' => _('Amounts in thousands'), + 2 => array('text' => _('Tags'), 'from' => get_tag_names($tags), 'to' => ''), + 3 => array('text' => _('Info'), 'from' => _('Amounts in thousands'), 'to' => '')); } - $rep = new FrontReport(_('Annual Expense Breakdown'), "AnnualBreakDown", user_pagesize()); + $rep = new FrontReport(_('Annual Expense Breakdown'), "AnnualBreakDown", user_pagesize(), 9, $orientation); + if ($orientation == 'L') + recalculate_cols($cols); $rep->Font(); $rep->Info($params, $cols, $headers, $aligns); - $rep->Header(); + $rep->NewPage(); $sales = Array(1 => 0,0,0,0,0,0,0,0,0,0,0,0,0,0); @@ -283,7 +298,8 @@ function print_annual_expense_breakdown() $typeresult = get_account_types(false, $class['cid'], -1); while ($accounttype=db_fetch($typeresult)) { - $classtotal = display_type($accounttype["id"], $accounttype["name"], $yr, $mo, $convert, $dec, $rep, $dimension, $dimension2); + $classtotal = display_type($accounttype["id"], $accounttype["name"], $yr, $mo, $convert, $dec, $rep, $dimension, + $dimension2, $tags); for ($i = 1; $i <= 12; $i++) $ctotal[$i] += $classtotal[$i]; } @@ -313,4 +329,3 @@ function print_annual_expense_breakdown() $rep->End(); } -?> \ No newline at end of file