2.4.4 no Longer Displays 0.00 Sales Invoices in customer_inquiry.php. Fixed. $Braath...

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

diff --git a/reporting/rep108.php b/reporting/rep108.php
index a64a71b05d5322b53af4b8f2cb1c0dacc243d750..2f20bb6394d7de623eba46d9ef0b682006e84f8b 100644 (file)
--- a/reporting/rep108.php
+++ b/reporting/rep108.php
@@ -32,21 +32,17 @@ 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 (".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) != 0";
+    $sql = "SELECT *,
+                       (ov_amount + ov_gst + ov_freight + ov_freight_tax + ov_discount) AS TotalAmount, alloc AS Allocated,
+                               ((type = ".ST_SALESINVOICE.") AND due_date < '$date') AS OverDue
+                       FROM ".TB_PREF."debtor_trans
+                       WHERE tran_date <= '$date' AND debtor_no = ".db_escape($debtorno)."
+                               AND type <> ".ST_CUSTDELIVERY."
+                               AND ABS(ov_amount + ov_gst + ov_freight + ov_freight_tax + ov_discount) > ". FLOAT_COMP_DELTA;
+
        if (!$show_also_allocated)
-               $sql .= " 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) - alloc <> 0";
-       $sql .= " ORDER BY ".TB_PREF."debtor_trans.tran_date";
+               $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");
 }
@@ -83,9 +79,9 @@ function print_statements()
 
        if ($email == 0)
                $rep = new FrontReport(_('STATEMENT'), "StatementBulk", user_pagesize(), 9, $orientation);
-   if ($orientation == 'L')
+    if ($orientation == 'L')
        recalculate_cols($cols);
- 
+
        $sql = "SELECT debtor_no, name AS DebtorName, address, tax_id, curr_code, curdate() AS tran_date FROM ".TB_PREF."debtors_master";
        if ($customer != ALL_TEXT)
                $sql .= " WHERE debtor_no = ".db_escape($customer);
@@ -95,6 +91,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_'] = "";
@@ -109,15 +108,17 @@ function print_statements()
                        $rep = new FrontReport("", "", user_pagesize(), 9, $orientation);
                        $rep->title = _('STATEMENT');
                        $rep->filename = "Statement" . $myrow['debtor_no'] . ".pdf";
-               }       
-               $rep->SetHeaderType('Header2');
+                       $rep->Info($params, $cols, null, $aligns);
+               }
+
+               $contacts = get_customer_contacts($myrow['debtor_no'], 'invoice');
                $rep->currency = $cur;
                $rep->Font();
                $rep->Info($params, $cols, null, $aligns);
 
-               $contacts = get_customer_contacts($myrow['debtor_no'], 'invoice');
                //= 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;
@@ -136,7 +137,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);
@@ -172,4 +174,3 @@ function print_statements()
                $rep->End();
 }
 
-?>
\ No newline at end of file