Cleanup in document footer text.

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

diff --git a/reporting/rep102.php b/reporting/rep102.php
index b839b6b7e650c399eb5543749417abe998230278..2d00c063f1573e637498bb2e094892f1aa6ed8ac 100644 (file)
--- a/reporting/rep102.php
+++ b/reporting/rep102.php
@@ -34,9 +34,14 @@ function get_invoices($customer_id, $to, $all=true)
        $PastDueDays2 = 2 * $PastDueDays1;
 
        // Revomed allocated from sql
-    $value = "(".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)";
+       if ($all)
+       $value = "(".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)";
+       else            
+       $value = "(".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 - ".TB_PREF."debtor_trans.alloc)";
        $due = "IF (".TB_PREF."debtor_trans.type=".ST_SALESINVOICE.",".TB_PREF."debtor_trans.due_date,".TB_PREF."debtor_trans.tran_date)";
        $sql = "SELECT ".TB_PREF."debtor_trans.type, ".TB_PREF."debtor_trans.reference,
                ".TB_PREF."debtor_trans.tran_date,