Customer/Supplier Balances Report | Allocated column not showing correctly. Fixed.

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

diff --git a/reporting/rep101.php b/reporting/rep101.php
index 6bff59510dad8e2f30edd1c665c4e9dc8c216d58..4c6c0f497e474cbb94d7fd979c0fb3400afaf5ef 100644 (file)
--- a/reporting/rep101.php
+++ b/reporting/rep101.php
@@ -30,34 +30,19 @@ include_once($path_to_root . "/sales/includes/db/customers_db.inc");
 // trial_inquiry_controls();
 print_customer_balances();
 
-function get_open_balance($debtorno, $to, $convert)
+function get_open_balance($debtorno, $to)
 {
        if($to)
                $to = date2sql($to);
 
     $sql = "SELECT SUM(IF(t.type = ".ST_SALESINVOICE." OR t.type = ".ST_BANKPAYMENT.",
-       (t.ov_amount + t.ov_gst + t.ov_freight + t.ov_freight_tax + t.ov_discount)";
-    if ($convert)
-       $sql .= " * rate";
-    $sql .= ", 0)) AS charges,
+       (t.ov_amount + t.ov_gst + t.ov_freight + t.ov_freight_tax + t.ov_discount), 0)) AS charges,
        SUM(IF(t.type <> ".ST_SALESINVOICE." AND t.type <> ".ST_BANKPAYMENT.",
-       (t.ov_amount + t.ov_gst + t.ov_freight + t.ov_freight_tax + t.ov_discount)";
-    if ($convert)
-       $sql .= " * rate";
-    $sql .= " * -1, 0)) AS credits,
-               SUM(t.alloc";
-       if ($convert)
-               $sql .= " * rate";
-       $sql .= ") AS Allocated,
+               (t.ov_amount + t.ov_gst + t.ov_freight + t.ov_freight_tax + t.ov_discount) * -1, 0)) AS credits,
+               SUM(IF(t.type <> ".ST_SALESINVOICE." AND t.type <> ".ST_BANKPAYMENT.",t.alloc * -1, t.alloc)) AS Allocated,
                SUM(IF(t.type = ".ST_SALESINVOICE." OR t.type = ".ST_BANKPAYMENT.",
-                       (t.ov_amount + t.ov_gst + t.ov_freight + t.ov_freight_tax + t.ov_discount - t.alloc)";
-    if ($convert)
-       $sql .= " * rate";
-    $sql .= ", 
-       ((t.ov_amount + t.ov_gst + t.ov_freight + t.ov_freight_tax + t.ov_discount) * -1 + t.alloc)";
-    if ($convert)
-       $sql .= " * rate";
-    $sql .= ")) AS OutStanding
+                       (t.ov_amount + t.ov_gst + t.ov_freight + t.ov_freight_tax + t.ov_discount - t.alloc),
+               ((t.ov_amount + t.ov_gst + t.ov_freight + t.ov_freight_tax + t.ov_discount) * -1 + t.alloc))) AS OutStanding
                FROM ".TB_PREF."debtor_trans t
        WHERE t.debtor_no = ".db_escape($debtorno)
                ." AND t.type <> ".ST_CUSTDELIVERY;
@@ -74,18 +59,16 @@ function get_transactions($debtorno, $from, $to)
        $from = date2sql($from);
        $to = date2sql($to);
 
-    $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 < '$to') AS OverDue
-       FROM ".TB_PREF."debtor_trans
-       WHERE ".TB_PREF."debtor_trans.tran_date >= '$from'
-               AND ".TB_PREF."debtor_trans.tran_date <= '$to'
-               AND ".TB_PREF."debtor_trans.debtor_no = ".db_escape($debtorno)."
-               AND ".TB_PREF."debtor_trans.type <> ".ST_CUSTDELIVERY."
-       ORDER BY ".TB_PREF."debtor_trans.tran_date";
+    $sql = "SELECT *,
+               (t.ov_amount + t.ov_gst + t.ov_freight + t.ov_freight_tax + t.ov_discount) AS TotalAmount, 
+               IF(t.type <> ".ST_SALESINVOICE." AND t.type <> ".ST_BANKPAYMENT.",t.alloc * -1, t.alloc) AS Allocated,
+               ((t.type = ".ST_SALESINVOICE.") AND t.due_date < '$to') AS OverDue
+       FROM ".TB_PREF."debtor_trans t
+       WHERE t.tran_date >= '$from'
+               AND t.tran_date <= '$to'
+               AND t.debtor_no = ".db_escape($debtorno)."
+               AND t.type <> ".ST_CUSTDELIVERY."
+       ORDER BY t.tran_date";
 
     return db_query($sql,"No transactions were returned");
 }
@@ -157,30 +140,29 @@ function print_customer_balances()
                $sql .= "WHERE debtor_no=".db_escape($fromcust);
        $sql .= " ORDER BY name";
        $result = db_query($sql, "The customers could not be retrieved");
-       $num_lines = 0;
 
        while ($myrow = db_fetch($result))
        {
                if (!$convert && $currency != $myrow['curr_code']) continue;
                
                $accumulate = 0;
+               $rate = $convert ? get_exchange_rate_from_home_currency($myrow['curr_code'], Today()) : 1;
                $bal = get_open_balance($myrow['debtor_no'], $from, $convert);
                $init[0] = $init[1] = 0.0;
-               $init[0] = round2(abs($bal['charges']), $dec);
-               $init[1] = round2(Abs($bal['credits']), $dec);
-               $init[2] = round2($bal['Allocated'], $dec);
+               $init[0] = round2(abs($bal['charges']*$rate), $dec);
+               $init[1] = round2(Abs($bal['credits']*$rate), $dec);
+               $init[2] = round2($bal['Allocated']*$rate, $dec);
                if ($show_balance)
                {
                        $init[3] = $init[0] - $init[1];
                        $accumulate += $init[3];
                }       
                else    
-                       $init[3] = round2($bal['OutStanding'], $dec);
+                       $init[3] = round2($bal['OutStanding']*$rate, $dec);
 
                $res = get_transactions($myrow['debtor_no'], $from, $to);
                if ($no_zeros && db_num_rows($res) == 0) continue;
 
-               $num_lines++;
                $rep->fontSize += 2;
                $rep->TextCol(0, 2, $myrow['name']);
                if ($convert)
@@ -198,9 +180,11 @@ function print_customer_balances()
                        $grandtotal[$i] += $init[$i];
                }
                $rep->NewLine(1, 2);
-               if (db_num_rows($res)==0)
-                       continue;
                $rep->Line($rep->row + 4);
+               if (db_num_rows($res)==0) {
+                       $rep->NewLine(1, 2);
+                       continue;
+               }
                while ($trans = db_fetch($res))
                {
                        if ($no_zeros && floatcmp($trans['TotalAmount'], $trans['Allocated']) == 0) continue;
@@ -211,10 +195,6 @@ function print_customer_balances()
                        if ($trans['type'] == ST_SALESINVOICE)
                                $rep->DateCol(3, 4,     $trans['due_date'], true);
                        $item[0] = $item[1] = 0.0;
-                       if ($convert)
-                               $rate = $trans['rate'];
-                       else
-                               $rate = 1.0;
                        if ($trans['type'] == ST_CUSTCREDIT || $trans['type'] == ST_CUSTPAYMENT || $trans['type'] == ST_BANKDEPOSIT)
                                $trans['TotalAmount'] *= -1;
                        if ($trans['TotalAmount'] > 0.0)
@@ -232,9 +212,9 @@ function print_customer_balances()
                        $item[2] = round2($trans['Allocated'] * $rate, $dec);
                        $rep->AmountCol(6, 7, $item[2], $dec);
                        if ($trans['type'] == ST_SALESINVOICE || $trans['type'] == ST_BANKPAYMENT)
-                               $item[3] = $item[0] + $item[1] - $item[2];
+                               $item[3] = $item[0] - $item[2];
                        else    
-                               $item[3] = $item[0] - $item[1] + $item[2];
+                               $item[3] = -$item[1] - $item[2];
                        if ($show_balance)      
                                $rep->AmountCol(7, 8, $accumulate, $dec);
                        else