Added Account tags selection in Annual Expense Breakdown, Balanse Sheet

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

diff --git a/reporting/rep105.php b/reporting/rep105.php
index d4916ca8428ca7849173749af2ea9c1fa5a7cbda..e0dd503637cd407d4acce43c597582fb9074fe80 100644 (file)
--- a/reporting/rep105.php
+++ b/reporting/rep105.php
@@ -51,17 +51,17 @@ function GetSalesOrders($from, $to, $category=0, $location=null, $backorder=0)
                INNER JOIN ".TB_PREF."sales_order_details
                    ON (".TB_PREF."sales_orders.order_no = ".TB_PREF."sales_order_details.order_no
                    AND ".TB_PREF."sales_orders.trans_type = ".TB_PREF."sales_order_details.trans_type
-                   AND ".TB_PREF."sales_orders.trans_type = 30)
+                   AND ".TB_PREF."sales_orders.trans_type = ".ST_SALESORDER.")
                INNER JOIN ".TB_PREF."stock_master
                    ON ".TB_PREF."sales_order_details.stk_code = ".TB_PREF."stock_master.stock_id
             WHERE ".TB_PREF."sales_orders.ord_date >='$fromdate'
                 AND ".TB_PREF."sales_orders.ord_date <='$todate'";
        if ($category > 0)
-               $sql .= " AND ".TB_PREF."stock_master.category_id=$category";
+               $sql .= " AND ".TB_PREF."stock_master.category_id=".db_escape($category);
        if ($location != null)
-               $sql .= " AND ".TB_PREF."sales_orders.from_stk_loc='$location'";
+               $sql .= " AND ".TB_PREF."sales_orders.from_stk_loc=".db_escape($location);
        if ($backorder)
-               $sql .= "AND ".TB_PREF."sales_order_details.quantity - ".TB_PREF."sales_order_details.qty_sent > 0";
+               $sql .= " AND ".TB_PREF."sales_order_details.quantity - ".TB_PREF."sales_order_details.qty_sent > 0";
        $sql .= " ORDER BY ".TB_PREF."sales_orders.order_no";
 
        return db_query($sql, "Error getting order details");
@@ -125,7 +125,7 @@ function print_order_status_list()
        $rep->Font();
        $rep->Info($params, $cols, $headers, $aligns, $cols2, $headers2, $aligns2);
 
-       $rep->Header();
+       $rep->NewPage();
        $orderno = 0;
 
        $result = GetSalesOrders($from, $to, $category, $location, $backorder);
@@ -135,7 +135,7 @@ function print_order_status_list()
                if ($rep->row < $rep->bottomMargin + (2 * $rep->lineHeight))
                {
                        $orderno = 0;
-                       $rep->Header();
+                       $rep->NewPage();
                }
                $rep->NewLine(0, 2, false, $orderno);
                if ($orderno != $myrow['order_no'])
@@ -171,7 +171,7 @@ function print_order_status_list()
                if ($rep->row < $rep->bottomMargin + (2 * $rep->lineHeight))
                {
                        $orderno = 0;
-                       $rep->Header();
+                       $rep->NewPage();
                }
        }
        $rep->Line($rep->row);