$salesacc = 0.0;
$last = -1;
+ $closeclass = false;
+ $convert = 1;
+
$accounts = get_gl_accounts_all(0);
while ($account=db_fetch($accounts))
$rep->Line($rep->row);
$rep->NewLine();
$rep->TextCol(0, 2, _('Total') . " " . $typename[$level]);
- $rep->AmountCol(2, 3, $typeper[$level], $dec);
- $rep->AmountCol(3, 4, $typeacc[$level], $dec);
+ $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)
{
$rep->NewLine();
$rep->Font('bold');
$rep->TextCol(0, 2, _('Total') . " " . $classname);
- $rep->AmountCol(2, 3, $classper, $dec);
- $rep->AmountCol(3, 4, $classacc, $dec);
+ $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;
$rep->Line($rep->row);
$rep->NewLine();
}
+ $convert = get_account_class_convert($account['ClassID']);
$classname = $account['AccountClassName'];
if ($account['account_code'] != null)
{
- $per_balance *= -1;
- $acc_balance *= -1;
+ //$per_balance *= -1;
+ //$acc_balance *= -1;
for ($i = 0; $i <= $level; $i++)
{
$rep->TextCol(0, 1, $account['account_code']);
$rep->TextCol(1, 2, $account['account_name']);
- $rep->AmountCol(2, 3, $per_balance, $dec);
- $rep->AmountCol(3, 4, $acc_balance, $dec);
+ $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->Line($rep->row);
$rep->NewLine();
$rep->TextCol(0, 2, _('Total') . " " . $typename[$level]);
- $rep->AmountCol(2, 3, $typeper[$level], $dec);
- $rep->AmountCol(3, 4, $typeacc[$level], $dec);
+ $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)
{
$rep->Font('bold');
$rep->TextCol(0, 2, _('Total') . " " . $classname);
- $rep->AmountCol(2, 3, $classper, $dec);
- $rep->AmountCol(3, 4, $classacc, $dec);
+ $rep->AmountCol(2, 3, $classper * $convert, $dec);
+ $rep->AmountCol(3, 4, $classacc * $convert, $dec);
$rep->AmountCol(4, 5, Achieve($classper, $classacc), $pdec);
$rep->NewLine(2);
$rep->TextCol(0, 2, _('Calculated Return'));
- $rep->AmountCol(2, 3, $calculateper, $dec);
- $rep->AmountCol(3, 4, $calculateacc, $dec);
+ $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)
{