[0000936] Fixed invalid sales order update on voiding delivery note after SO line...

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

diff --git a/reporting/rep102.php b/reporting/rep102.php
index b839b6b7e650c399eb5543749417abe998230278..18fab24d052952aa6649e80e8064fde507fec187 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,
@@ -46,11 +51,9 @@ function get_invoices($customer_id, $to, $all=true)
                IF ((TO_DAYS('$todate') - TO_DAYS($due)) >= $PastDueDays2,$value,0) AS Overdue2
 
                FROM ".TB_PREF."debtors_master,
-                       ".TB_PREF."payment_terms,
                        ".TB_PREF."debtor_trans
 
                WHERE ".TB_PREF."debtor_trans.type <> ".ST_CUSTDELIVERY."
-                       AND ".TB_PREF."debtor_trans.payment_terms = ".TB_PREF."payment_terms.terms_indicator
                        AND ".TB_PREF."debtors_master.debtor_no = ".TB_PREF."debtor_trans.debtor_no
                        AND ".TB_PREF."debtor_trans.debtor_no = $customer_id 
                        AND ".TB_PREF."debtor_trans.tran_date <= '$todate'