Fixed Customer statement reflecting wrong balance. @Braath Waate.

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

diff --git a/reporting/rep108.php b/reporting/rep108.php
index 1a122c0435df2359fbdaf62297d78d7ba5388a70..f329b09c873a0f00050359dfcfaace9cb5db8540 100644 (file)
--- a/reporting/rep108.php
+++ b/reporting/rep108.php
@@ -32,21 +32,24 @@ print_statements();
 
 function getTransactions($debtorno, $date, $show_also_allocated)
 {
-    $sql = "SELECT ".TB_PREF."debtor_trans.*,
-                               (".TB_PREF."debtor_trans.ov_amount + ".TB_PREF."debtor_trans.ov_gst + ".TB_PREF."debtor_trans.ov_freight +
-                               ".TB_PREF."debtor_trans.ov_freight_tax + ".TB_PREF."debtor_trans.ov_discount)
-                               AS TotalAmount, ".TB_PREF."debtor_trans.alloc AS Allocated,
-                               ((".TB_PREF."debtor_trans.type = ".ST_SALESINVOICE.")
-                               AND ".TB_PREF."debtor_trans.due_date < '$date') AS OverDue
-                               FROM ".TB_PREF."debtor_trans
-                               WHERE ".TB_PREF."debtor_trans.tran_date <= '$date' AND ".TB_PREF."debtor_trans.debtor_no = ".db_escape($debtorno)."
-                               AND ".TB_PREF."debtor_trans.type <> ".ST_CUSTDELIVERY."
-                                       AND ABS(".TB_PREF."debtor_trans.ov_amount + ".TB_PREF."debtor_trans.ov_gst + ".TB_PREF."debtor_trans.ov_freight +
-                               ".TB_PREF."debtor_trans.ov_freight_tax + ".TB_PREF."debtor_trans.ov_discount) > 1e-6";
-       if (!$show_also_allocated)
-               $sql .= " AND ABS(ABS(".TB_PREF."debtor_trans.ov_amount + ".TB_PREF."debtor_trans.ov_gst + ".TB_PREF."debtor_trans.ov_freight +
-                               ".TB_PREF."debtor_trans.ov_freight_tax + ".TB_PREF."debtor_trans.ov_discount) - alloc) > 1e-6";
-       $sql .= " ORDER BY ".TB_PREF."debtor_trans.tran_date";
+    $sql = "SELECT trans.type,
+        trans.trans_no,
+        trans.order_,
+        trans.reference,
+        trans.tran_date,
+        trans.due_date,
+        (ov_amount + ov_gst + ov_freight + ov_freight_tax + ov_discount) AS TotalAmount, alloc AS Allocated,
+               ((trans.type = ".ST_SALESINVOICE.") AND due_date < '$date') AS OverDue
+               FROM ".TB_PREF."debtor_trans trans
+               LEFT JOIN ".TB_PREF."voided as v
+            ON trans.trans_no=v.id AND trans.type=v.type
+        WHERE tran_date <= '$date' AND debtor_no = ".db_escape($debtorno)."
+                       AND trans.type <> ".ST_CUSTDELIVERY." AND ISNULL(v.date_)
+                       AND ABS(ov_amount + ov_gst + ov_freight + ov_freight_tax + ov_discount) > ". FLOAT_COMP_DELTA;
+       
+       if (!$show_also_allocated)
+               $sql .= " AND ABS(ABS(ov_amount + ov_gst + ov_freight + ov_freight_tax + ov_discount) - alloc) > ". FLOAT_COMP_DELTA;
+       $sql .= " ORDER BY tran_date";
 
     return db_query($sql,"No transactions were returned");
 }
@@ -81,8 +84,6 @@ function print_statements()
        $PastDueDays1 = get_company_pref('past_due_days');
        $PastDueDays2 = 2 * $PastDueDays1;
 
-       if ($email == 0)
-               $rep = new FrontReport(_('STATEMENT'), "StatementBulk", user_pagesize(), 9, $orientation);
     if ($orientation == 'L')
        recalculate_cols($cols);
 
@@ -95,6 +96,9 @@ function print_statements()
 
        while ($myrow=db_fetch($result))
        {
+               if ($currency != ALL_TEXT && $myrow['curr_code'] != $currency) {
+                       continue;
+               }       
                $date = date('Y-m-d');
 
                $myrow['order_'] = "";
@@ -104,6 +108,8 @@ function print_statements()
                $params['bankaccount'] = $baccount['id'];
                if (db_num_rows($TransResult) == 0)
                        continue;
+        if ($email == 0 && !isset($rep))
+            $rep = new FrontReport(_('STATEMENT'), "StatementBulk", user_pagesize(), 9, $orientation);
                if ($email == 1)
                {
                        $rep = new FrontReport("", "", user_pagesize(), 9, $orientation);
@@ -113,13 +119,13 @@ function print_statements()
                }
 
                $contacts = get_customer_contacts($myrow['debtor_no'], 'invoice');
-               $rep->SetHeaderType('Header2');
                $rep->currency = $cur;
                $rep->Font();
                $rep->Info($params, $cols, null, $aligns);
 
                //= get_branch_contacts($branch['branch_code'], 'invoice', $branch['debtor_no']);
                $rep->SetCommonData($myrow, null, null, $baccount, ST_STATEMENT, $contacts);
+               $rep->SetHeaderType('Header2');
                $rep->NewPage();
                $rep->NewLine();
                $doctype = ST_STATEMENT;
@@ -138,7 +144,8 @@ function print_statements()
                        $rep->TextCol(2, 3,     sql2date($myrow2['tran_date']), -2);
                        if ($myrow2['type'] == ST_SALESINVOICE)
                                $rep->TextCol(3, 4,     sql2date($myrow2['due_date']), -2);
-                       if ($myrow2['type'] == ST_SALESINVOICE || $myrow2['type'] == ST_BANKPAYMENT)
+                       if ($myrow2['type'] == ST_SALESINVOICE || $myrow2['type'] == ST_BANKPAYMENT || 
+                               ($myrow2['type'] == ST_JOURNAL && $myrow2["TotalAmount"] > 0.0))
                                $rep->TextCol(4, 5,     $DisplayTotal, -2);
                        else
                                $rep->TextCol(5, 6,     $DisplayTotal, -2);
@@ -170,8 +177,10 @@ function print_statements()
                        $rep->End($email, _("Statement") . " " . _("as of") . " " . sql2date($date));
 
        }
-       if ($email == 0)
+
+    if (!isset($rep))
+        display_notification("No customers with outstanding balances found");
+       else if ($email == 0)
                $rep->End();
 }
 
-?>