projects
/
fa-stable.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Additional fixes to upgrade scripts.
[fa-stable.git]
/
reporting
/
rep707.php
diff --git
a/reporting/rep707.php
b/reporting/rep707.php
index 30e1d5616f5b4d40e4389c193f0f3c007b306faa..15690a09a23ac1e0e840d42b2e9a37f9a937d480 100644
(file)
--- a/
reporting/rep707.php
+++ b/
reporting/rep707.php
@@
-1,15
+1,15
@@
<?php
/**********************************************************************
Copyright (C) FrontAccounting, LLC.
<?php
/**********************************************************************
Copyright (C) FrontAccounting, LLC.
- Released under the terms of the GNU
Affero General Public License,
- AGPL, as published by the Free Software Foundation, either version
-
3
of the License, or (at your option) any later version.
+ Released under the terms of the GNU
General Public License, GPL,
+ as published by the Free Software Foundation, either version 3
+ of the License, or (at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- See the License here <http://www.gnu.org/licenses/
a
gpl-3.0.html>.
+ See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
***********************************************************************/
***********************************************************************/
-$page_security =
2
;
+$page_security =
'SA_GLANALYTIC'
;
// ----------------------------------------------------------------
// $ Revision: 2.0 $
// Creator: Joe Hunt
// ----------------------------------------------------------------
// $ Revision: 2.0 $
// Creator: Joe Hunt
@@
-25,7
+25,6
@@
include_once($path_to_root . "/gl/includes/gl_db.inc");
//----------------------------------------------------------------------------------------------------
//----------------------------------------------------------------------------------------------------
-// trial_inquiry_controls();
print_profit_and_loss_statement();
//----------------------------------------------------------------------------------------------------
print_profit_and_loss_statement();
//----------------------------------------------------------------------------------------------------
@@
-48,7
+47,6
@@
function print_profit_and_loss_statement()
{
global $comp_path, $path_to_root;
{
global $comp_path, $path_to_root;
- include_once($path_to_root . "/reporting/includes/pdf_report.inc");
$dim = get_company_pref('use_dimension');
$dimension = $dimension2 = 0;
$dim = get_company_pref('use_dimension');
$dimension = $dimension2 = 0;
@@
-61,18
+59,25
@@
function print_profit_and_loss_statement()
$dimension2 = $_POST['PARAM_4'];
$graphics = $_POST['PARAM_5'];
$comments = $_POST['PARAM_6'];
$dimension2 = $_POST['PARAM_4'];
$graphics = $_POST['PARAM_5'];
$comments = $_POST['PARAM_6'];
+ $destination = $_POST['PARAM_7'];
}
else if ($dim == 1)
{
$dimension = $_POST['PARAM_3'];
$graphics = $_POST['PARAM_4'];
$comments = $_POST['PARAM_5'];
}
else if ($dim == 1)
{
$dimension = $_POST['PARAM_3'];
$graphics = $_POST['PARAM_4'];
$comments = $_POST['PARAM_5'];
+ $destination = $_POST['PARAM_6'];
}
else
{
$graphics = $_POST['PARAM_3'];
$comments = $_POST['PARAM_4'];
}
else
{
$graphics = $_POST['PARAM_3'];
$comments = $_POST['PARAM_4'];
+ $destination = $_POST['PARAM_5'];
}
}
+ if ($destination)
+ include_once($path_to_root . "/reporting/includes/excel_report.inc");
+ else
+ include_once($path_to_root . "/reporting/includes/pdf_report.inc");
if ($graphics)
{
include_once($path_to_root . "/reporting/includes/class.graphic.inc");
if ($graphics)
{
include_once($path_to_root . "/reporting/includes/class.graphic.inc");
@@
-129,34
+134,49
@@
function print_profit_and_loss_statement()
$headers[3] = _('Period Y-1');
}
$headers[3] = _('Period Y-1');
}
- $rep = new FrontReport(_('Profit and Loss Statement'), "ProfitAndLoss
.pdf
", user_pagesize());
+ $rep = new FrontReport(_('Profit and Loss Statement'), "ProfitAndLoss", user_pagesize());
$rep->Font();
$rep->Info($params, $cols, $headers, $aligns);
$rep->Header();
$classname = '';
$rep->Font();
$rep->Info($params, $cols, $headers, $aligns);
$rep->Header();
$classname = '';
- $group = '';
- $totalper = 0.0;
- $totalacc = 0.0;
+
+ $typeper = array(0,0,0,0,0,0,0,0,0,0);
+ $typeacc = array(0,0,0,0,0,0,0,0,0,0);
+ $typename = array('','','','','','','','','','');
+ $closing = array(-1,-1,-1,-1,-1,-1,-1,-1,-1,-1);
+ $level = 0;
+
$classper = 0.0;
$classacc = 0.0;
$salesper = 0.0;
$salesacc = 0.0;
$classper = 0.0;
$classacc = 0.0;
$salesper = 0.0;
$salesacc = 0.0;
+ $last = -1;
+
+ $closeclass = false;
+ $convert = 1;
+ $ctype = 0;
$accounts = get_gl_accounts_all(0);
while ($account=db_fetch($accounts))
{
$accounts = get_gl_accounts_all(0);
while ($account=db_fetch($accounts))
{
- $per_balance = get_gl_trans_from_to($from, $to, $account["account_code"], $dimension, $dimension2);
-
- if ($compare == 2)
- $acc_balance = get_budget_trans_from_to($begin, $end, $account["account_code"], $dimension, $dimension2);
- else
- $acc_balance = get_gl_trans_from_to($begin, $end, $account["account_code"], $dimension, $dimension2);
- if (!$per_balance && !$acc_balance)
+ if ($account['account_code'] == null && $account['parent'] > 0)
continue;
continue;
+ if ($account['account_code'] != null)
+ {
+ $per_balance = get_gl_trans_from_to($from, $to, $account["account_code"], $dimension, $dimension2);
+
+ if ($compare == 2)
+ $acc_balance = get_budget_trans_from_to($begin, $end, $account["account_code"], $dimension, $dimension2);
+ else
+ $acc_balance = get_gl_trans_from_to($begin, $end, $account["account_code"], $dimension, $dimension2);
+ if (!$per_balance && !$acc_balance)
+ continue;
+ }
+
if ($account['AccountClassName'] != $classname)
{
if ($classname != '')
if ($account['AccountClassName'] != $classname)
{
if ($classname != '')
@@
-165,38
+185,49
@@
function print_profit_and_loss_statement()
}
}
}
}
- if ($account['AccountTypeName'] != $
group
)
+ if ($account['AccountTypeName'] != $
typename[$level]
)
{
{
- if ($
group
!= '')
+ if ($
typename[$level]
!= '')
{
{
- $rep->Line($rep->row + 6);
- $rep->row -= 6;
- $rep->TextCol(0, 2, _('Total') . " " . $group);
- $rep->TextCol(2, 3, number_format2($totalper, $dec));
- $rep->TextCol(3, 4, number_format2($totalacc, $dec));
- $rep->TextCol(4, 5, number_format2(Achieve($totalper, $totalacc), $pdec));
- if ($graphics)
+ for ( ; $level >= 0, $typename[$level] != ''; $level--)
{
{
- $pg->x[] = $group;
- $pg->y[] = abs($totalper);
- $pg->z[] = abs($totalacc);
+ if ($account['parent'] == $closing[$level] || $account['parent'] < $last || $account['parent'] <= 0)
+ {
+ $rep->row += 6;
+ $rep->Line($rep->row);
+ $rep->NewLine();
+ $rep->TextCol(0, 2, _('Total') . " " . $typename[$level]);
+ $rep->AmountCol(2, 3, $typeper[$level] * $convert, $dec);
+ $rep->AmountCol(3, 4, $typeacc[$level] * $convert, $dec);
+ $rep->AmountCol(4, 5, Achieve($typeper[$level], $typeacc[$level]), $pdec);
+ if ($graphics)
+ {
+ $pg->x[] = $typename[$level];
+ $pg->y[] = abs($typeper[$level]);
+ $pg->z[] = abs($typeacc[$level]);
+ }
+ $typeper[$level] = $typeacc[$level] = 0.0;
+ }
+ else
+ break;
+ $rep->NewLine();
}
}
- $totalper = $totalacc = 0.0;
- $rep->row -= ($rep->lineHeight + 4);
+ //$rep->NewLine();
if ($closeclass)
{
if ($closeclass)
{
- $rep->Line($rep->row + 6);
- $rep->row -= 6;
+ $rep->row += 6;
+ $rep->Line($rep->row);
+ $rep->NewLine();
$rep->Font('bold');
$rep->TextCol(0, 2, _('Total') . " " . $classname);
$rep->Font('bold');
$rep->TextCol(0, 2, _('Total') . " " . $classname);
- $rep->
TextCol(2, 3, number_format2($classper, $dec)
);
- $rep->
TextCol(3, 4, number_format2($classacc, $dec)
);
- $rep->
TextCol(4, 5, number_format2(Achieve($classper, $classacc), $pdec)
);
+ $rep->
AmountCol(2, 3, $classper * $convert, $dec
);
+ $rep->
AmountCol(3, 4, $classacc * $convert, $dec
);
+ $rep->
AmountCol(4, 5, Achieve($classper, $classacc), $pdec
);
$rep->Font();
$salesper += $classper;
$salesacc += $classacc;
$classper = $classacc = 0.0;
$rep->Font();
$salesper += $classper;
$salesacc += $classacc;
$classper = $classacc = 0.0;
- $rep->NewLine(
3
);
+ $rep->NewLine(
2
);
$closeclass = false;
}
}
$closeclass = false;
}
}
@@
-205,35
+236,51
@@
function print_profit_and_loss_statement()
$rep->Font('bold');
$rep->TextCol(0, 5, $account['AccountClassName']);
$rep->Font();
$rep->Font('bold');
$rep->TextCol(0, 5, $account['AccountClassName']);
$rep->Font();
- $rep->
row -= ($rep->lineHeight + 4
);
+ $rep->
NewLine(
);
}
}
- $group = $account['AccountTypeName'];
+ $level++;
+ if ($account['parent'] != $last)
+ $last = $account['parent'];
+ $typename[$level] = $account['AccountTypeName'];
+ $closing[$level] = $account['parent'];
+
+ $rep->row -= 4;
$rep->TextCol(0, 5, $account['AccountTypeName']);
$rep->TextCol(0, 5, $account['AccountTypeName']);
- $rep->Line($rep->row - 4);
- $rep->row -= ($rep->lineHeight + 4);
+ $rep->row -= 4;
+ $rep->Line($rep->row);
+ $rep->NewLine();
}
$classname = $account['AccountClassName'];
}
$classname = $account['AccountClassName'];
+ $ctype = $account['ClassType'];
+ $convert = get_class_type_convert($ctype);
+
+ if ($account['account_code'] != null)
+ {
+ //$per_balance *= -1;
+ //$acc_balance *= -1;
+
+ for ($i = 0; $i <= $level; $i++)
+ {
+ $typeper[$i] += $per_balance;
+ $typeacc[$i] += $acc_balance;
+ }
+ $classper += $per_balance;
+ $classacc += $acc_balance;
+ $rep->TextCol(0, 1, $account['account_code']);
+ $rep->TextCol(1, 2, $account['account_name']);
- $per_balance *= -1;
- $acc_balance *= -1;
- $totalper += $per_balance;
- $totalacc += $acc_balance;
- $classper += $per_balance;
- $classacc += $acc_balance;
- $rep->TextCol(0, 1, $account['account_code']);
- $rep->TextCol(1, 2, $account['account_name']);
-
- $rep->TextCol(2, 3, number_format2($per_balance, $dec));
- $rep->TextCol(3, 4, number_format2($acc_balance, $dec));
- $rep->TextCol(4, 5, number_format2(Achieve($per_balance, $acc_balance), $pdec));
+ $rep->AmountCol(2, 3, $per_balance * $convert, $dec);
+ $rep->AmountCol(3, 4, $acc_balance * $convert, $dec);
+ $rep->AmountCol(4, 5, Achieve($per_balance, $acc_balance), $pdec);
- $rep->NewLine();
+
$rep->NewLine();
- if ($rep->row < $rep->bottomMargin + 3 * $rep->lineHeight)
- {
- $rep->Line($rep->row - 2);
- $rep->Header();
- }
+ if ($rep->row < $rep->bottomMargin + 3 * $rep->lineHeight)
+ {
+ $rep->Line($rep->row - 2);
+ $rep->Header();
+ }
+ }
}
if ($account['AccountClassName'] != $classname)
{
}
if ($account['AccountClassName'] != $classname)
{
@@
-242,41
+289,54
@@
function print_profit_and_loss_statement()
$closeclass = true;
}
}
$closeclass = true;
}
}
- if ($account['AccountTypeName'] != $
group
)
+ if ($account['AccountTypeName'] != $
typename[$level]
)
{
{
- if ($
group
!= '')
+ if ($
typename[$level]
!= '')
{
{
- $rep->Line($rep->row + 6);
- $rep->row -= 6;
- $rep->TextCol(0, 2, _('Total') . " " . $group);
- $rep->TextCol(2, 3, number_format2($totalper, $dec));
- $rep->TextCol(3, 4, number_format2($totalacc, $dec));
- $rep->TextCol(4, 5, number_format2(Achieve($totalper, $totalacc), $pdec));
- if ($graphics)
+ for ( ; $level >= 0, $typename[$level] != ''; $level--)
{
{
- $pg->x[] = $group;
- $pg->y[] = abs($totalper);
- $pg->z[] = abs($totalacc);
+ if ($account['parent'] == $closing[$level] || $account['parent'] < $last || $account['parent'] <= 0)
+ {
+ $rep->row += 6;
+ $rep->Line($rep->row);
+ $rep->NewLine();
+ $rep->TextCol(0, 2, _('Total') . " " . $typename[$level]);
+ $rep->AmountCol(2, 3, $typeper[$level] * $convert, $dec);
+ $rep->AmountCol(3, 4, $typeacc[$level] * $convert, $dec);
+ $rep->AmountCol(4, 5, Achieve($typeper[$level], $typeacc[$level]), $pdec);
+ if ($graphics)
+ {
+ $pg->x[] = $typename[$level];
+ $pg->y[] = abs($typeper[$level]);
+ $pg->z[] = abs($typeacc[$level]);
+ }
+ $typeper[$level] = $typeacc[$level] = 0.0;
+ }
+ else
+ break;
+ $rep->NewLine();
}
}
-
$rep->row -= ($rep->lineHeight + 4
);
+
//$rep->NewLine(
);
if ($closeclass)
{
$rep->Line($rep->row + 6);
$calculateper = $salesper + $classper;
$calculateacc = $salesacc + $classacc;
if ($closeclass)
{
$rep->Line($rep->row + 6);
$calculateper = $salesper + $classper;
$calculateacc = $salesacc + $classacc;
- $rep->row -= 6;
+ $rep->row += 6;
+ $rep->Line($rep->row);
+ $rep->NewLine();
$rep->Font('bold');
$rep->TextCol(0, 2, _('Total') . " " . $classname);
$rep->Font('bold');
$rep->TextCol(0, 2, _('Total') . " " . $classname);
- $rep->
TextCol(2, 3, number_format2($classper, $dec)
);
- $rep->
TextCol(3, 4, number_format2($classacc, $dec)
);
- $rep->
TextCol(4, 5, number_format2(Achieve($classper, $classacc), $pdec)
);
+ $rep->
AmountCol(2, 3, $classper * $convert, $dec
);
+ $rep->
AmountCol(3, 4, $classacc * $convert, $dec
);
+ $rep->
AmountCol(4, 5, Achieve($classper, $classacc), $pdec
);
- $rep->
row -= ($rep->lineHeight + 8
);
+ $rep->
NewLine(2
);
$rep->TextCol(0, 2, _('Calculated Return'));
$rep->TextCol(0, 2, _('Calculated Return'));
- $rep->
TextCol(2, 3, number_format2($calculateper, $dec));
- $rep->
TextCol(3, 4, number_format2($calculateacc, $dec)
);
- $rep->
TextCol(4, 5, number_format2(Achieve($calculateper, $calculateacc), $pdec)
);
+ $rep->
AmountCol(2, 3, $calculateper *-1, $dec); // always convert
+ $rep->
AmountCol(3, 4, $calculateacc * -1, $dec
);
+ $rep->
AmountCol(4, 5, Achieve($calculateper, $calculateacc), $pdec
);
if ($graphics)
{
$pg->x[] = _('Calculated Return');
if ($graphics)
{
$pg->x[] = _('Calculated Return');