X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=purchasing%2Fincludes%2Fui%2Fpo_ui.inc;h=152df8f2059344d9319a6460746f89c5f2344799;hb=3faff3b471c0953bc1d11a6c00308779787a55f2;hp=ba60460976fd8ad4037f84e2f1939df18c1db7e4;hpb=1b9351ae81a67726e757eba55895a4f059c7f128;p=fa-stable.git

diff --git a/purchasing/includes/ui/po_ui.inc b/purchasing/includes/ui/po_ui.inc
index ba604609..152df8f2 100644
--- a/purchasing/includes/ui/po_ui.inc
+++ b/purchasing/includes/ui/po_ui.inc
@@ -60,37 +60,6 @@ function copy_to_cart()
 			$cart->tax_overrides[$id] = user_numeric($_POST['mantax'][$id]); }
 	}
 }
-// ------------------------------------------------------------------------------
-
-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"]);
-}
 
 //---------------------------------------------------------------------------------------------------
 
@@ -209,13 +178,9 @@ function display_po_header(&$order)
     {
     	/*If this is the first time the form loaded set up defaults */
 
-        //$_POST['StkLocation'] = $_SESSION['UserStockLocation'];
-        $sql = "SELECT delivery_address, phone FROM ".TB_PREF."locations WHERE loc_code=".db_escape($_POST['StkLocation']);
-        $result = db_query($sql,"could not get location info");
-
-        if (db_num_rows($result) == 1)
+		$loc_row = get_item_location(get_post('StkLocation'));
+        if ($loc_row)
         {
-    	  	$loc_row = db_fetch($result);
     	  	$_POST['delivery_address'] = $loc_row["delivery_address"];
 			$Ajax->activate('delivery_address');
     	  	$_SESSION['PO']->Location = $_POST['StkLocation'];