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

diff --git a/purchasing/includes/ui/po_ui.inc b/purchasing/includes/ui/po_ui.inc
index 8adca98b..152df8f2 100644
--- a/purchasing/includes/ui/po_ui.inc
+++ b/purchasing/includes/ui/po_ui.inc
@@ -28,6 +28,10 @@ function copy_from_cart()
     $_POST['delivery_address'] = $cart->delivery_address;
     $_POST['tax_algorithm'] = $cart->tax_algorithm;
 	$_POST['prep_amount'] = price_format($cart->prep_amount);
+	$_POST['_ex_rate'] = $cart->ex_rate;
+	$_POST['cash_account'] = $cart->cash_account;
+    foreach($cart->tax_overrides as $id => $value)
+	    $_POST['mantax'][$id] = price_format($value);
 }
 
 function copy_to_cart()
@@ -37,7 +41,10 @@ function copy_to_cart()
 	$cart->supplier_id = $_POST['supplier_id'];	
 	$cart->orig_order_date = $_POST['OrderDate'];
 	if ($cart->trans_type == ST_SUPPINVOICE)
+	{
 		$cart->due_date = $_POST['due_date'];
+		$cart->cash_account = get_post('cash_account');
+	}
 	$cart->reference = $_POST['ref'];
 	$cart->supp_ref = $_POST['supp_ref'];
 	$cart->Comments = $_POST['Comments'];	
@@ -46,37 +53,12 @@ function copy_to_cart()
 	if (isset($_POST['tax_algorithm']))
 	    $cart->tax_algorithm = $_POST['tax_algorithm'];
 	$cart->prep_amount = input_num('prep_amount', 0);
-}
-// ------------------------------------------------------------------------------
+	$cart->ex_rate = input_num('_ex_rate', null);
 
-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"]);
+    if (isset($_POST['mantax'])) {
+		foreach($_POST['mantax'] as $id => $tax) {
+			$cart->tax_overrides[$id] = user_numeric($_POST['mantax'][$id]); }
+	}
 }
 
 //---------------------------------------------------------------------------------------------------
@@ -94,7 +76,6 @@ function create_new_po($trans_type, $trans_no)
 		$_POST['OrderDate'] = end_fiscalyear();
 	$cart->due_date = $cart->orig_order_date = $_POST['OrderDate'];
 
-	
 	$cart->trans_type = $trans_type;
 	$cart->order_no = $trans_no;
 	/*read in all the selected order into the Items cart  */
@@ -114,7 +95,7 @@ function display_po_header(&$order)
 
 	$editable = ($order->order_no == 0);
 
-	start_outer_table(TABLESTYLE2, "width=80%");
+	start_outer_table(TABLESTYLE2, 'width=80%');
 
 	table_section(1);
     if ($editable)
@@ -151,15 +132,25 @@ function display_po_header(&$order)
 	}
 	set_global_supplier($_POST['supplier_id']);
 
+	date_row($order->trans_type==ST_PURCHORDER ? _("Order Date:") :
+		($order->trans_type==ST_SUPPRECEIVE ? _("Delivery Date:") : _("Invoice Date:")),
+		'OrderDate', '', true, 0, 0, 0, null, true);
+
+	if (isset($_POST['_OrderDate_changed'])) {
+		$order->orig_order_date = $_POST['OrderDate'];
+	    get_duedate_from_terms($order);
+	    $_POST['due_date'] = $order->due_date;
+		$Ajax->activate('due_date');
+	}
+	supplier_credit_row($order->supplier_id, $order->credit);
+
 	if (!is_company_currency($order->curr_code))
 	{
 		label_row(_("Supplier Currency:"), $order->curr_code);
-		exchange_rate_display($order->curr_code, get_company_currency(),
+		exchange_rate_display(get_company_currency(), $order->curr_code,
 			$_POST['OrderDate']);
 	}
 
-	supplier_credit_row($order->supplier_id, $order->credit);
-
 
     if ($editable)
     {
@@ -173,26 +164,6 @@ function display_po_header(&$order)
 
 	table_section(2);
 
-	// check this out?????????
-	//if (!isset($_POST['OrderDate']) || $_POST['OrderDate'] == "")
-	//	$_POST['OrderDate'] = $order->orig_order_date;
-	//if (!isset($_POST['OrderDate']) || $_POST['OrderDate'] == "")
-	//{
-	//	$_POST['OrderDate'] = Today();
-	//	if (!is_date_in_fiscalyear($_POST['OrderDate']))
-	//		$_POST['OrderDate'] = end_fiscalyear();
-	//}
-	date_row($order->trans_type==ST_PURCHORDER ? _("Order Date:") :
-		($order->trans_type==ST_SUPPRECEIVE ? _("Delivery Date:") : _("Invoice Date:")),
-		'OrderDate', '', true, 0, 0, 0, null, true);
-
-	if (isset($_POST['_OrderDate_changed'])) {
-		$order->orig_order_date = $_POST['OrderDate'];
-	    get_duedate_from_terms($order);
-	    $_POST['due_date'] = $order->due_date;
-		$Ajax->activate('_ex_rate');
-		$Ajax->activate('due_date');
-	}
 	if ($order->trans_type==ST_SUPPINVOICE)
 		date_row(_("Due Date:"), 'due_date', '', false, 0, 0, 0, null, true);
 
@@ -207,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'];
@@ -297,7 +264,7 @@ function display_po_items(&$order, $editable=true)
 
 	$taxes = $order->get_taxes(input_num('freight_cost'));
 	
-	$tax_total = display_edit_tax_items($taxes, $colspan, $order->tax_included, 2);
+	$tax_total = display_edit_tax_items($taxes, $colspan, $order->tax_included, 2, $order->trans_type==ST_SUPPINVOICE);
 
 	$display_total = price_format(($total + input_num('freight_cost') + $tax_total));
 
@@ -412,7 +379,9 @@ function po_item_controls(&$order, &$rowcounter, $line_no=-1)
 	{
 //		hidden('line_no', ($_SESSION['PO']->lines_on_order + 1));
 
-		stock_purchasable_items_list_cells(null, 'stock_id', null, false, true, true);
+		//Chaitanya : Manufcatured item can be purchased
+		stock_items_list_cells(null, 'stock_id', null, false, true, false, true);
+		//stock_purchasable_items_list_cells(null, 'stock_id', null, false, true, true);
 		if (list_updated('stock_id')) {
 			    $Ajax->activate('price');
 			    $Ajax->activate('units');