$path_to_root="..";
include_once($path_to_root . "/includes/session.inc");
+include_once($path_to_root . "/admin/db/fiscalyears_db.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");
$dimension = $_POST['PARAM_4'];
$dimension2 = $_POST['PARAM_5'];
$comments = $_POST['PARAM_6'];
- $destination = $_POST['PARAM_7'];
+ $orientation = $_POST['PARAM_7'];
+ $destination = $_POST['PARAM_8'];
}
else if ($dim == 1)
{
$dimension = $_POST['PARAM_4'];
$comments = $_POST['PARAM_5'];
- $destination = $_POST['PARAM_6'];
+ $orientation = $_POST['PARAM_6'];
+ $destination = $_POST['PARAM_7'];
}
else
{
$comments = $_POST['PARAM_4'];
- $destination = $_POST['PARAM_5'];
+ $orientation = $_POST['PARAM_5'];
+ $destination = $_POST['PARAM_6'];
}
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');
- $rep = new FrontReport(_('GL Account Transactions'), "GLAccountTransactions", user_pagesize());
+ $rep = new FrontReport(_('GL Account Transactions'), "GLAccountTransactions", user_pagesize(), 9, $orientation);
$dec = user_price_dec();
//$cols = array(0, 80, 100, 150, 210, 280, 340, 400, 450, 510, 570);
1 => array('text' => _('Period'), 'from' => $from, 'to' => $to),
2 => array('text' => _('Accounts'),'from' => $fromacc,'to' => $toacc));
}
+ if ($orientation == 'L')
+ recalculate_cols($cols);
$rep->Font();
$rep->Info($params, $cols, $headers, $aligns);
- $rep->Header();
+ $rep->NewPage();
$accounts = get_gl_accounts($fromacc, $toacc);
$begin = "";
else
{
- $begin = begin_fiscalyear();
+ $begin = get_fiscalyear_begin_for_date($from);
if (date1_greater_date2($begin, $from))
$begin = $from;
$begin = add_days($begin, -1);
$rep->TextCol(4, 5, get_dimension_string($myrow['dimension_id']));
if ($dim > 1)
$rep->TextCol(5, 6, get_dimension_string($myrow['dimension2_id']));
- $rep->TextCol(6, 7, payment_person_name($myrow["person_type_id"],$myrow["person_id"], false));
+ $txt = payment_person_name($myrow["person_type_id"],$myrow["person_id"], false);
+ $memo = $myrow['memo_'];
+ if ($txt != "")
+ {
+ if ($memo != "")
+ $txt = $txt."/".$memo;
+ }
+ else
+ $txt = $memo;
+ $rep->TextCol(6, 7, $txt, -2);
if ($myrow['amount'] > 0.0)
$rep->AmountCol(7, 8, abs($myrow['amount']), $dec);
else
if ($rep->row < $rep->bottomMargin + $rep->lineHeight)
{
$rep->Line($rep->row - 2);
- $rep->Header();
+ $rep->NewPage();
}
}
$rep->NewLine();
$rep->End();
}
-?>
\ No newline at end of file