Merged bugfixes since 2.0.6

[fa-stable.git] / reporting / rep101.php

diff --git a/reporting/rep101.php b/reporting/rep101.php
index fa6d832841a7f508cd0c6c0f059ca84ff0356829..f8e04caa6873816f1ef9afb1d14f02aed68a05e9 100644 (file)
--- a/reporting/rep101.php
+++ b/reporting/rep101.php
@@ -1,5 +1,14 @@
 <?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.
+    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/agpl-3.0.html>.
+***********************************************************************/
 $page_security = 2;
 
 // ----------------------------------------------------------------
@@ -8,12 +17,12 @@ $page_security = 2;
 // date_:      2005-05-19
 // Title:      Customer Balances
 // ----------------------------------------------------------------
-$path_to_root="../";
+$path_to_root="..";
 
-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 . "/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");
 
 //----------------------------------------------------------------------------------------------------
 
@@ -30,7 +39,9 @@ function get_transactions($debtorno, $date)
                ((".TB_PREF."debtor_trans.type = 10)
                AND ".TB_PREF."debtor_trans.due_date < '$date') AS OverDue
        FROM ".TB_PREF."debtor_trans, ".TB_PREF."sys_types
-       WHERE ".TB_PREF."debtor_trans.tran_date <= '$date' AND ".TB_PREF."debtor_trans.debtor_no = '$debtorno'
+       WHERE ".TB_PREF."debtor_trans.tran_date <= '$date'
+       AND ".TB_PREF."debtor_trans.debtor_no = '$debtorno'
+       AND ".TB_PREF."debtor_trans.type != 13
        AND ".TB_PREF."debtor_trans.type = ".TB_PREF."sys_types.type_id
        ORDER BY ".TB_PREF."debtor_trans.tran_date";
 
@@ -43,7 +54,7 @@ function print_customer_balances()
 {
     global $path_to_root;
 
-       include_once($path_to_root . "reporting/includes/pdf_report.inc");
+       include_once($path_to_root . "/reporting/includes/pdf_report.inc");
 
     $to = $_POST['PARAM_0'];
     $fromcust = $_POST['PARAM_1'];
@@ -82,8 +93,7 @@ function print_customer_balances()
     $rep->Info($params, $cols, $headers, $aligns);
     $rep->Header();
 
-       $total = array();
-       $grandtotal = array();
+       $grandtotal = array(0,0,0,0);
 
        $sql = "SELECT debtor_no, name, curr_code FROM ".TB_PREF."debtors_master ";
        if ($fromcust != reserved_words::get_all_numeric())
@@ -105,7 +115,7 @@ function print_customer_balances()
                if (db_num_rows($res)==0)
                        continue;
                $rep->Line($rep->row + 4);
-               $total[0] = $total[1] = $total[2] = $total[3] = 0.0;
+               $total = array(0,0,0,0);
                while ($trans = db_fetch($res))
                {
                        $rep->NewLine(1, 2);
@@ -117,25 +127,33 @@ function print_customer_balances()
                                $rep->TextCol(3, 4,     sql2date($trans['due_date']));
                        $item[0] = $item[1] = 0.0;
                        if ($convert)
-                               $rate = get_exchange_rate_from_home_currency($myrow['curr_code'], $date);
+                               $rate = $trans['rate'];
                        else
                                $rate = 1.0;
+                       if ($trans['type'] == 11 || $trans['type'] == 12 || $trans['type'] == 2)
+                               $trans['TotalAmount'] *= -1;
                        if ($trans['TotalAmount'] > 0.0)
                        {
-                               $item[0] = abs($trans['TotalAmount']) * $rate;
+                               $item[0] = round2(abs($trans['TotalAmount']) * $rate, $dec);
                                $rep->TextCol(4, 5,     number_format2($item[0], $dec));
                        }
                        else
                        {
-                               $item[1] = Abs($trans['TotalAmount']) * $rate;
+                               $item[1] = round2(Abs($trans['TotalAmount']) * $rate, $dec);
                                $rep->TextCol(5, 6,     number_format2($item[1], $dec));
                        }
-                       $item[2] = $trans['Allocated'] * $rate;
+                       $item[2] = round2($trans['Allocated'] * $rate, $dec);
                        $rep->TextCol(6, 7,     number_format2($item[2], $dec));
+                       /*
                        if ($trans['type'] == 10)
                                $item[3] = ($trans['TotalAmount'] - $trans['Allocated']) * $rate;
                        else
                                $item[3] = ($trans['TotalAmount'] + $trans['Allocated']) * $rate;
+                       */
+                       if ($trans['type'] == 10)
+                               $item[3] = $item[0] + $item[1] - $item[2];
+                       else    
+                               $item[3] = $item[0] - $item[1] + $item[2];
                        $rep->TextCol(7, 8, number_format2($item[3], $dec));
                        for ($i = 0; $i < 4; $i++)
                        {