X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=purchasing%2Fincludes%2Fui%2Fpo_ui.inc;h=811bcb880148779fca35c22074693190d1212d9e;hb=4568f3745a4a9e6efd6d796baccc0e9b23b81764;hp=10dd7c5f8e9aa21d47f8ccd94d9a2e1fea34811e;hpb=9af96a2e461b905dbb20f2b87ffb5c28f9b3461c;p=fa-stable.git

diff --git a/purchasing/includes/ui/po_ui.inc b/purchasing/includes/ui/po_ui.inc
index 10dd7c5f..811bcb88 100644
--- a/purchasing/includes/ui/po_ui.inc
+++ b/purchasing/includes/ui/po_ui.inc
@@ -19,13 +19,21 @@ function copy_from_cart()
 
 	$_POST['supplier_id'] = $cart->supplier_id;
 	$_POST['OrderDate'] = $cart->orig_order_date;
-	if ($cart->trans_type==ST_SUPPINVOICE)
+	if ($cart->trans_type == ST_SUPPINVOICE)
 		$_POST['due_date'] = $cart->due_date;
     $_POST['supp_ref'] = $cart->supp_ref;
     $_POST['ref'] = $cart->reference;
 	$_POST['Comments'] = $cart->Comments;
     $_POST['StkLocation'] = $cart->Location;
     $_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;
+    $_POST['dimension'] = $cart->dimension;
+    $_POST['dimension2'] = $cart->dimension2;
+    foreach($cart->tax_overrides as $id => $value)
+	    $_POST['mantax'][$id] = price_format($value);
 }
 
 function copy_to_cart()
@@ -34,44 +42,27 @@ function copy_to_cart()
 
 	$cart->supplier_id = $_POST['supplier_id'];	
 	$cart->orig_order_date = $_POST['OrderDate'];
-	if ($cart->trans_type==ST_SUPPINVOICE)
+	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'];	
 	$cart->Location = $_POST['StkLocation'];
 	$cart->delivery_address = $_POST['delivery_address'];
-}
-// ------------------------------------------------------------------------------
-
-function get_supplier_details_to_order(&$order, $supplier_id)
-{
-	$sql = "SELECT curr_code, supp_name, tax_group_id, supp.tax_included,
-			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"]);
+   	$cart->dimension = @$_POST['dimension'];
+	$cart->dimension2 =  @$_POST['dimension2'];
+	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);
+
+    if (isset($_POST['mantax'])) {
+		foreach($_POST['mantax'] as $id => $tax) {
+			$cart->tax_overrides[$id] = user_numeric($_POST['mantax'][$id]); }
+	}
 }
 
 //---------------------------------------------------------------------------------------------------
@@ -89,7 +80,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  */
@@ -109,7 +99,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)
@@ -130,6 +120,7 @@ function display_po_header(&$order)
 		get_supplier_details_to_order($order, $_POST['supplier_id']); 
 	    get_duedate_from_terms($order);
 		$_POST['due_date'] = $order->due_date;
+		$_POST['tax_algorithm'] = $order->tax_algorithm;
 
 		// supplier default price update
 		foreach ($order->line_items as $line_no=>$item) {
@@ -141,19 +132,29 @@ function display_po_header(&$order)
 		}
 	    $Ajax->activate('items_table');
 	    $Ajax->activate('due_date');
+	    $Ajax->activate('tax_algorithm');
 	}
 	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)
     {
     	ref_row(_("Reference:"), 'ref');
@@ -166,27 +167,15 @@ 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 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);
 
   	text_row(_("Supplier's Reference:"), 'supp_ref', null, 16, 15);
+
+	if (get_company_pref('use_dimension'))
+		dimensions_list_row(_('Dimension').':', 'dimension', null, true, _('Default'), false, 1);
+	if (get_company_pref('use_dimension') == 2)
+		dimensions_list_row(_('Dimension 2').':', 'dimension2', null, true, _('Default'), false, 2);
 	locations_list_row(_("Receive Into:"), 'StkLocation', null, false, true); 
 
 	table_section(3);
@@ -197,13 +186,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='" . $_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'];
@@ -287,7 +272,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));
 
@@ -345,6 +330,14 @@ function display_po_summary(&$po, $is_self=false, $editable=false)
     	label_row(_("Delivery Address"), $po->delivery_address, "class='tableheader2'",
     		"colspan=9");
 
+	if (!$editable && ($po->prep_amount > 0))
+	{
+		start_row();
+		label_cells(_("Required Pre-Payment"), price_format($po->prep_amount), "class='tableheader2'");
+		label_cells(_("Pre-Payments Allocated"), price_format($po->alloc), "class='tableheader2'");
+		end_row();
+	}
+
     if ($po->Comments != "")
     	label_row(_("Order Comments"), $po->Comments, "class='tableheader2'",
     		"colspan=9");
@@ -355,7 +348,7 @@ function display_po_summary(&$po, $is_self=false, $editable=false)
 
 function po_item_controls(&$order, &$rowcounter, $line_no=-1)
 {
-   global $Ajax;
+   global $Ajax, $SysPrefs;
 
 	alt_table_row_color($rowcounter);
 
@@ -394,7 +387,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');
@@ -410,7 +405,7 @@ function po_item_controls(&$order, &$rowcounter, $line_no=-1)
 		//$_POST['price'] = price_format(get_purchase_price ($order->supplier_id, $_POST['stock_id']));
 		$_POST['price'] = price_decimal_format(get_purchase_price ($order->supplier_id, $_POST['stock_id']), $dec2);
 		if ($order->trans_type == ST_PURCHORDER)
-			$_POST['req_del_date'] = add_days(Today(), 10);
+			$_POST['req_del_date'] = add_days(Today(), $SysPrefs->default_receival_required_by());
 		$qty_rcvd = '';
 	}
 
@@ -420,7 +415,13 @@ function po_item_controls(&$order, &$rowcounter, $line_no=-1)
 	label_cell($_POST['units'], '', 'units');
 	if ($order->trans_type == ST_PURCHORDER)
 		date_cells(null, 'req_del_date', '', null, 0, 0, 0);
-	amount_cells(null, 'price', null, null, null, $dec2);
+	if ($qty_rcvd > 0)
+	{
+   		amount_decimal_cell($_POST['price']);
+   		hidden('price', $_POST['price']);
+   	}	
+   	else	
+		amount_cells(null, 'price', null, null, null, $dec2);
 
 	//$line_total = $_POST['qty'] * $_POST['price'] * (1 - $_POST['Disc'] / 100);
 	$line_total = round(input_num('qty') * input_num('price'),  user_price_dec());
@@ -446,6 +447,28 @@ function po_item_controls(&$order, &$rowcounter, $line_no=-1)
 
 //---------------------------------------------------------------------------------------------------
 
+function display_po_footer(&$trans)
+{
+	global $Ajax;
+
+start_table(TABLESTYLE2);
+
+if (list_updated('tax_algorithm')) {
+	$trans->tax_algorithm = $_POST['tax_algorithm'];
+    $Ajax->activate('items_table');
+}
+
+if ($trans->trans_type == ST_SUPPINVOICE) {
+	tax_algorithm_list_row(_("Tax algorithm:"), 'tax_algorithm', null, true);
+	cash_accounts_list_row(_("Payment:"), 'cash_account', null, false, _('Delayed'));
+} elseif ($trans->trans_type == ST_PURCHORDER)
+	amount_row(_("Pre-Payment Required:"), 'prep_amount');
+
+textarea_row(_("Memo:"), 'Comments', null, 70, 4);
+
+end_table();
+}
+//---------------------------------------------------------------------------------------------------
+
 
 
-?>
\ No newline at end of file