Cleanup

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

diff --git a/reporting/rep101.php b/reporting/rep101.php
index 95a092810e0ce6f8678d7db98e0d19d5461b7bb9..4800ddc5e446ec2dcfad76e37d0c7fdd98f96421 100644 (file)
--- a/reporting/rep101.php
+++ b/reporting/rep101.php
@@ -23,6 +23,7 @@ include_once($path_to_root . "/includes/session.inc");
 include_once($path_to_root . "/includes/date_functions.inc");
 include_once($path_to_root . "/includes/data_checks.inc");
 include_once($path_to_root . "/gl/includes/gl_db.inc");
+include_once($path_to_root . "/sales/includes/db/customers_db.inc");
 
 //----------------------------------------------------------------------------------------------------
 
@@ -31,36 +32,38 @@ print_customer_balances();
 
 function get_open_balance($debtorno, $to, $convert)
 {
-       $to = date2sql($to);
+       if($to)
+               $to = date2sql($to);
 
-    $sql = "SELECT SUM(IF(".TB_PREF."debtor_trans.type = 10, (".TB_PREF."debtor_trans.ov_amount + ".TB_PREF."debtor_trans.ov_gst + 
-       ".TB_PREF."debtor_trans.ov_freight + ".TB_PREF."debtor_trans.ov_discount)";
+    $sql = "SELECT SUM(IF(t.type = ".ST_SALESINVOICE.",
+       (t.ov_amount + t.ov_gst + t.ov_freight + t.ov_freight_tax + t.ov_discount)";
     if ($convert)
        $sql .= " * rate";
     $sql .= ", 0)) AS charges,
-       SUM(IF(".TB_PREF."debtor_trans.type <> 10, (".TB_PREF."debtor_trans.ov_amount + ".TB_PREF."debtor_trans.ov_gst + 
-       ".TB_PREF."debtor_trans.ov_freight + ".TB_PREF."debtor_trans.ov_discount)";
+       SUM(IF(t.type <> ".ST_SALESINVOICE.",
+       (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(".TB_PREF."debtor_trans.alloc";
+               SUM(t.alloc";
        if ($convert)
                $sql .= " * rate";
        $sql .= ") AS Allocated,
-               SUM(IF(".TB_PREF."debtor_trans.type = 10, (".TB_PREF."debtor_trans.ov_amount + ".TB_PREF."debtor_trans.ov_gst + 
-       ".TB_PREF."debtor_trans.ov_freight + ".TB_PREF."debtor_trans.ov_discount - ".TB_PREF."debtor_trans.alloc)";
+               SUM(IF(t.type = ".ST_SALESINVOICE.",
+                       (t.ov_amount + t.ov_gst + t.ov_freight + t.ov_freight_tax + t.ov_discount - t.alloc)";
     if ($convert)
        $sql .= " * rate";
     $sql .= ", 
-       ((".TB_PREF."debtor_trans.ov_amount + ".TB_PREF."debtor_trans.ov_gst + ".TB_PREF."debtor_trans.ov_freight + 
-       ".TB_PREF."debtor_trans.ov_discount) * -1 + ".TB_PREF."debtor_trans.alloc)";
+       ((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
-               FROM ".TB_PREF."debtor_trans
-       WHERE ".TB_PREF."debtor_trans.tran_date < '$to'
-               AND ".TB_PREF."debtor_trans.debtor_no = '$debtorno'
-               AND ".TB_PREF."debtor_trans.type <> 13 GROUP BY debtor_no";
+               FROM ".TB_PREF."debtor_trans t
+       WHERE t.debtor_no = ".db_escape($debtorno)
+               ." AND t.type <> ".ST_CUSTDELIVERY;
+    if ($to)
+       $sql .= " AND t.tran_date < '$to'";
+       $sql .= " GROUP BY debtor_no";
 
     $result = db_query($sql,"No transactions were returned");
     return db_fetch($result);
@@ -72,15 +75,16 @@ function get_transactions($debtorno, $from, $to)
        $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_discount)
+               (".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 = 10)
+               ((".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 = '$debtorno'
-               AND ".TB_PREF."debtor_trans.type <> 13
+               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";
 
     return db_query($sql,"No transactions were returned");
@@ -130,17 +134,15 @@ function print_customer_balances()
                                    3 => array('text' => _('Currency'), 'from' => $currency, 'to' => ''));
 
     $rep = new FrontReport(_('Customer Balances'), "CustomerBalances", user_pagesize());
-
     $rep->Font();
     $rep->Info($params, $cols, $headers, $aligns);
-    $rep->Header();
-
+    $rep->NewPage();
        $grandtotal = array(0,0,0,0);
 
        $sql = "SELECT debtor_no, name, curr_code FROM ".TB_PREF."debtors_master ";
        if ($fromcust != ALL_NUMERIC)
-               $sql .= "WHERE debtor_no=$fromcust ";
-       $sql .= "ORDER BY name";
+               $sql .= "WHERE debtor_no=".db_escape($fromcust);
+       $sql .= " ORDER BY name";
        $result = db_query($sql, "The customers could not be retrieved");
 
        while ($myrow = db_fetch($result))
@@ -180,14 +182,14 @@ function print_customer_balances()
                        $rep->TextCol(0, 1, $systypes_array[$trans['type']]);
                        $rep->TextCol(1, 2,     $trans['reference']);
                        $rep->DateCol(2, 3,     $trans['tran_date'], true);
-                       if ($trans['type'] == 10)
+                       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'] == 11 || $trans['type'] == 12 || $trans['type'] == 2)
+                       if ($trans['type'] == ST_CUSTCREDIT || $trans['type'] == ST_CUSTPAYMENT || $trans['type'] == ST_BANKDEPOSIT)
                                $trans['TotalAmount'] *= -1;
                        if ($trans['TotalAmount'] > 0.0)
                        {
@@ -207,7 +209,7 @@ function print_customer_balances()
                        else
                                $item[3] = ($trans['TotalAmount'] + $trans['Allocated']) * $rate;
                        */
-                       if ($trans['type'] == 10 || $trans['type'] == 1)
+                       if ($trans['type'] == ST_SALESINVOICE || $trans['type'] == ST_BANKPAYMENT)
                                $item[3] = $item[0] + $item[1] - $item[2];
                        else    
                                $item[3] = $item[0] - $item[1] + $item[2];