Cleanup: removed all closing tags in php files.

[fa-stable.git] / purchasing / includes / db / po_db.inc

diff --git a/purchasing/includes/db/po_db.inc b/purchasing/includes/db/po_db.inc
index 4818dda3e386324262c5fc8049d43b4c4ed8cc8e..30978da91afddffbcceab24c6099f99a897bfe43 100644 (file)
--- a/purchasing/includes/db/po_db.inc
+++ b/purchasing/includes/db/po_db.inc
@@ -9,6 +9,38 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
     See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
 ***********************************************************************/
+// ------------------------------------------------------------------------------
+
+function get_supplier_details_to_order(&$order, $supplier_id)
+{
+       $sql = "SELECT curr_code, supp_name, tax_group_id, supp.tax_included, supp.tax_algorithm,
+                       supp.credit_limit - Sum(IFNULL(IF(trans.type=".ST_SUPPCREDIT.", -1, 1) 
+                               * (ov_amount + ov_gst + ov_discount),0)) as cur_credit,
+                               terms.terms, terms.days_before_due, terms.day_in_following_month
+               FROM ".TB_PREF."suppliers supp
+                        LEFT JOIN ".TB_PREF."supp_trans trans ON supp.supplier_id = trans.supplier_id
+                        LEFT JOIN ".TB_PREF."payment_terms terms ON supp.payment_terms=terms.terms_indicator
+               WHERE supp.supplier_id = ".db_escape($supplier_id)."
+               GROUP BY
+                         supp.supp_name";
+
+       $result = db_query($sql, "The supplier details could not be retreived");
+       $myrow = db_fetch($result);
+
+       $order->credit = $myrow["cur_credit"];
+       $order->terms = array( 
+               'description' => $myrow['terms'],
+               'days_before_due' => $myrow['days_before_due'], 
+               'day_in_following_month' => $myrow['day_in_following_month'] );
+
+       $_POST['supplier_id'] = $supplier_id;
+       $_POST['supplier_name'] = $myrow["supp_name"];
+       $_POST['curr_code'] = $myrow["curr_code"];
+
+       $order->set_supplier($supplier_id, $myrow["supp_name"], $myrow["curr_code"], 
+               $myrow["tax_group_id"], $myrow["tax_included"], $myrow["tax_algorithm"]);
+}
+
 //----------------------------------------------------------------------------------------
 
 function delete_po($po)
@@ -155,7 +187,7 @@ function read_po_header($order_no, &$order)
                $order->credit = get_current_supp_credit($order->supplier_id);
 
        $order->orig_order_date = sql2date($myrow["ord_date"]);
-       $order->Comments = $myrow["comments"];
+       $order->Comments = nl2br($myrow["comments"]);
        $order->Location = $myrow["into_stock_location"];
        $order->supp_ref = $myrow["requisition_no"];
        $order->reference = $myrow["reference"];
@@ -258,9 +290,9 @@ function get_short_info($stock_id)
        return db_query($sql,"The stock details for " . $stock_id . " could not be retrieved");
 }
 
-function get_sql_for_po_search_completed()
+function get_sql_for_po_search_completed($from, $to, $supplier_id=ALL_TEXT, $location=ALL_TEXT,
+       $order_number = '', $stock_id = '')
 {
-       global $order_number, $selected_stock_item;;
 
        $sql = "SELECT 
                porder.order_no, 
@@ -280,8 +312,8 @@ function get_sql_for_po_search_completed()
                AND porder.supplier_id = supplier.supplier_id
                AND location.loc_code = porder.into_stock_location ";
 
-       if (isset($_GET['supplier_id']))
-               $sql .= "AND supplier.supplier_id=".@$_GET['supplier_id']." ";
+       if ($supplier_id != ALL_TEXT)
+               $sql .= "AND supplier.supplier_id=".$supplier_id." ";
        if (isset($order_number) && $order_number != "")
        {
                $sql .= "AND porder.reference LIKE ".db_escape('%'. $order_number . '%');
@@ -289,28 +321,30 @@ function get_sql_for_po_search_completed()
        else
        {
 
-               $data_after = date2sql($_POST['OrdersAfterDate']);
-               $date_before = date2sql($_POST['OrdersToDate']);
+               $data_after = date2sql($from);
+               $date_before = date2sql($to);
 
                $sql .= " AND porder.ord_date >= '$data_after'";
                $sql .= " AND porder.ord_date <= '$date_before'";
 
-               if (isset($_POST['StockLocation']) && $_POST['StockLocation'] != ALL_TEXT)
+               if ($location != ALL_TEXT)
                {
-                       $sql .= " AND porder.into_stock_location = ".db_escape($_POST['StockLocation']);
+                       $sql .= " AND porder.into_stock_location = ".db_escape($location);
                }
                if (isset($selected_stock_item))
                {
-                       $sql .= " AND line.item_code=".db_escape($selected_stock_item);
+                       $sql .= " AND line.item_code=".db_escape($stock_id);
                }
+               if ($supplier_id != ALL_TEXT)
+                       $sql .= " AND supplier.supplier_id=".db_escape($supplier_id);
 
-       } //end not order number selected
+       }
 
        $sql .= " GROUP BY porder.order_no";
        return $sql;
-}      
+}
 
-function get_sql_for_po_search()
+function get_sql_for_po_search($from, $to, $supplier_id=ALL_TEXT, $location=ALL_TEXT)
 {
        global $all_items, $order_number, $selected_stock_item;;
        
@@ -341,25 +375,26 @@ function get_sql_for_po_search()
        }
        else
        {
-               $data_after = date2sql($_POST['OrdersAfterDate']);
-               $data_before = date2sql($_POST['OrdersToDate']);
+               $data_after = date2sql($from);
+               $data_before = date2sql($to);
 
                $sql .= "  AND porder.ord_date >= '$data_after'";
                $sql .= "  AND porder.ord_date <= '$data_before'";
 
-               if (isset($_POST['StockLocation']) && $_POST['StockLocation'] != $all_items)
+               if ($location != ALL_TEXT)
                {
-                       $sql .= " AND porder.into_stock_location = ".db_escape($_POST['StockLocation']);
+                       $sql .= " AND porder.into_stock_location = ".db_escape($location);
                }
 
                if (isset($selected_stock_item))
                {
                        $sql .= " AND line.item_code=".db_escape($selected_stock_item);
                }
+               if ($supplier_id != ALL_TEXT)
+                       $sql .= " AND supplier.supplier_id=".db_escape($supplier_id);
        } //end not order number selected
 
        $sql .= " GROUP BY porder.order_no";
        return $sql;
 }
 
-?>
\ No newline at end of file