Customer balances reports: fixed balance sums for prepayment invoices.

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

diff --git a/reporting/rep115.php b/reporting/rep115.php
index 0ed751930cfdc56ff19e56ce681facb8599c6c1a..484746b61c11ddb6c02acbd026f16efbf2af3eca 100644 (file)
--- a/reporting/rep115.php
+++ b/reporting/rep115.php
@@ -35,7 +35,7 @@ function get_open_balance($debtorno, $to)
         $to = date2sql($to);
 
     $sql = "SELECT SUM(IF(t.type = ".ST_SALESINVOICE." OR (t.type IN (".ST_JOURNAL." , ".ST_BANKPAYMENT.") AND t.ov_amount>0),
-        -abs(t.ov_amount + t.ov_gst + t.ov_freight + t.ov_freight_tax + t.ov_discount), 0)) AS charges,";
+        -abs(IF(prep_amount, prep_amount, ov_amount + ov_gst + ov_freight + ov_freight_tax + ov_discount)), 0)) AS charges,";
        $sql .= "SUM(IF(t.type != ".ST_SALESINVOICE." AND NOT(t.type IN (".ST_JOURNAL." , ".ST_BANKPAYMENT.") AND t.ov_amount>0),
         abs(t.ov_amount + t.ov_gst + t.ov_freight + t.ov_freight_tax + t.ov_discount) * -1, 0)) AS credits,";
     $sql .= "SUM(IF(t.type != ".ST_SALESINVOICE." AND NOT(t.type IN (".ST_JOURNAL." , ".ST_BANKPAYMENT.")),