projects
/
fa-stable.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Password reset mail could take several hours. After fix only a couple of seconds...
[fa-stable.git]
/
reporting
/
rep704.php
diff --git
a/reporting/rep704.php
b/reporting/rep704.php
index 08391fbd07b51c491c9d0b1495c0340cf50f5c77..443ac0715911222cd17c58d6a47c33fda0225a48 100644
(file)
--- a/
reporting/rep704.php
+++ b/
reporting/rep704.php
@@
-19,6
+19,7
@@
$page_security = 'SA_GLREP';
$path_to_root="..";
include_once($path_to_root . "/includes/session.inc");
$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");
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");
@@
-45,29
+46,32
@@
function print_GL_transactions()
$dimension = $_POST['PARAM_4'];
$dimension2 = $_POST['PARAM_5'];
$comments = $_POST['PARAM_6'];
$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)
+ elseif ($dim == 1)
{
$dimension = $_POST['PARAM_4'];
$comments = $_POST['PARAM_5'];
{
$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'];
}
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");
}
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();
$dec = user_price_dec();
- //$cols = array(0, 80, 100, 150, 210, 280, 340, 400, 450, 510, 570);
- $cols = array(0, 65, 105, 125, 175, 230, 290, 345, 405, 465, 525);
+ $cols = array(0, 65, 105, 125, 175, 230, 272, 345, 405, 465, 525);
//------------0--1---2---3----4----5----6----7----8----9----10-------
//-----------------------dim1-dim2-----------------------------------
//-----------------------dim1----------------------------------------
//------------0--1---2---3----4----5----6----7----8----9----10-------
//-----------------------dim1-dim2-----------------------------------
//-----------------------dim1----------------------------------------
@@
-94,7
+98,7
@@
function print_GL_transactions()
4 => array('text' => _('Dimension')." 2", 'from' => get_dimension_string($dimension2),
'to' => ''));
}
4 => array('text' => _('Dimension')." 2", 'from' => get_dimension_string($dimension2),
'to' => ''));
}
- else
if ($dim == 1)
+ elseif ($dim == 1)
{
$params = array( 0 => $comments,
1 => array('text' => _('Period'), 'from' => $from, 'to' => $to),
{
$params = array( 0 => $comments,
1 => array('text' => _('Period'), 'from' => $from, 'to' => $to),
@@
-108,6
+112,8
@@
function print_GL_transactions()
1 => array('text' => _('Period'), 'from' => $from, 'to' => $to),
2 => array('text' => _('Accounts'),'from' => $fromacc,'to' => $toacc));
}
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->Font();
$rep->Info($params, $cols, $headers, $aligns);
@@
-121,7
+127,7
@@
function print_GL_transactions()
$begin = "";
else
{
$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);
if (date1_greater_date2($begin, $from))
$begin = $from;
$begin = add_days($begin, -1);
@@
-194,4
+200,3
@@
function print_GL_transactions()
$rep->End();
}
$rep->End();
}
-?>
\ No newline at end of file