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

diff --git a/purchasing/includes/ui/po_ui.inc b/purchasing/includes/ui/po_ui.inc
index 152df8f2..34252f34 100644
--- a/purchasing/includes/ui/po_ui.inc
+++ b/purchasing/includes/ui/po_ui.inc
@@ -18,7 +18,7 @@ function copy_from_cart()
 	$cart = &$_SESSION['PO'];
 
 	$_POST['supplier_id'] = $cart->supplier_id;
-	$_POST['OrderDate'] = $cart->orig_order_date;
+	$_POST['OrderDate'] = $cart->tran_date;
 	if ($cart->trans_type == ST_SUPPINVOICE)
 		$_POST['due_date'] = $cart->due_date;
     $_POST['supp_ref'] = $cart->supp_ref;
@@ -26,10 +26,11 @@ function copy_from_cart()
 	$_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);
 }
@@ -39,7 +40,7 @@ function copy_to_cart()
 	$cart = &$_SESSION['PO'];
 
 	$cart->supplier_id = $_POST['supplier_id'];	
-	$cart->orig_order_date = $_POST['OrderDate'];
+	$cart->tran_date = $_POST['OrderDate'];
 	if ($cart->trans_type == ST_SUPPINVOICE)
 	{
 		$cart->due_date = $_POST['due_date'];
@@ -50,8 +51,8 @@ function copy_to_cart()
 	$cart->Comments = $_POST['Comments'];	
 	$cart->Location = $_POST['StkLocation'];
 	$cart->delivery_address = $_POST['delivery_address'];
-	if (isset($_POST['tax_algorithm']))
-	    $cart->tax_algorithm = $_POST['tax_algorithm'];
+   	$cart->dimension = @$_POST['dimension'];
+	$cart->dimension2 =  @$_POST['dimension2'];
 	$cart->prep_amount = input_num('prep_amount', 0);
 	$cart->ex_rate = input_num('_ex_rate', null);
 
@@ -63,7 +64,7 @@ function copy_to_cart()
 
 //---------------------------------------------------------------------------------------------------
 
-function create_new_po($trans_type, $trans_no)
+function create_cart($trans_type, $trans_no)
 {
 	global $Refs;
 
@@ -71,19 +72,28 @@ function create_new_po($trans_type, $trans_no)
 		unset ($_SESSION['PO']->line_items, $_SESSION['PO']);
 
 	$cart = new purch_order;
-	$_POST['OrderDate'] = new_doc_date();
-	if (!is_date_in_fiscalyear($_POST['OrderDate']))
-		$_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  */
-	if ($trans_no) {
-		read_po($trans_no, $cart);
+
+	if ($trans_type == ST_SUPPRECEIVE && $trans_no != 0) {
+		read_grn($trans_no, $cart);
+		foreach($cart->line_items as &$line) {
+			$line->qty_old = $line->quantity; // for concurrency checks
+			$line->qty_received -= $line->quantity;
+		}
+	} else {
 		$cart->order_no = $trans_no;
-	} else
-		$cart->reference = $Refs->get_next($trans_type);
+		$_POST['OrderDate'] = new_doc_date();
+		if (!is_date_in_fiscalyear($_POST['OrderDate']))
+			$_POST['OrderDate'] = end_fiscalyear();
+		$cart->due_date = $cart->tran_date = $_POST['OrderDate'];
+		/* read in all the selected order into the Items cart  */
+		if ($trans_no) {
+			read_po($trans_no, $cart);
+			$cart->order_no = $trans_no;
+		} else
+			$cart->reference = $Refs->get_next($trans_type, null,
+				array('supplier_id' => $cart->supplier_id, 'date' => get_post('OrderDate')));
+	}
 	$_SESSION['PO'] = &$cart;
 }
 
@@ -95,7 +105,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)
@@ -116,7 +126,6 @@ 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) {
@@ -128,7 +137,6 @@ function display_po_header(&$order)
 		}
 	    $Ajax->activate('items_table');
 	    $Ajax->activate('due_date');
-	    $Ajax->activate('tax_algorithm');
 	}
 	set_global_supplier($_POST['supplier_id']);
 
@@ -137,7 +145,7 @@ function display_po_header(&$order)
 		'OrderDate', '', true, 0, 0, 0, null, true);
 
 	if (isset($_POST['_OrderDate_changed'])) {
-		$order->orig_order_date = $_POST['OrderDate'];
+		$order->tran_date = $_POST['OrderDate'];
 	    get_duedate_from_terms($order);
 	    $_POST['due_date'] = $order->due_date;
 		$Ajax->activate('due_date');
@@ -151,10 +159,9 @@ function display_po_header(&$order)
 			$_POST['OrderDate']);
 	}
 
-
     if ($editable)
     {
-    	ref_row(_("Reference:"), 'ref');
+    	ref_row(_("Reference:"), 'ref', '', null, false, $order->trans_type, array('date'=> @$_POST['OrderDate']));
     }
     else
     {
@@ -167,8 +174,13 @@ function display_po_header(&$order)
 	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);
-	locations_list_row(_("Receive Into:"), 'StkLocation', null, false, true); 
+  	text_row(_("Supplier's Reference:"), 'supp_ref', null, 20, 60);
+
+	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, $order->fixed_asset); 
 
 	table_section(3);
 
@@ -205,15 +217,20 @@ function display_po_items(&$order, $editable=true)
     display_heading(_("Order Items"));
 
     div_start('items_table');
-    start_table(TABLESTYLE, "width=80%");
+    start_table(TABLESTYLE, "width='80%'");
+
+	$new = $order->order_no == 0;
+
+   	$th = array(_("Item Code"), _("Item Description"), _("Quantity"), _("Received"),
+   		_("Unit"), _("Required Delivery Date"), $order->tax_included ? _("Price after Tax") : _("Price before Tax"), _("Line Total"), "");
 
-   	$th = array(_("Item Code"), _("Item Description"), _("Quantity"),
-		_("Received"), _("Unit"),
-   		_("Required Delivery Date"), $order->tax_included ? _("Price after Tax") : _("Price before Tax"), _("Line Total"), "");
 	if ($order->trans_type != ST_PURCHORDER)
 		array_remove($th, 5);
-		
+	if ($new)
+		array_remove($th, 3);
+
 	if (count($order->line_items)) $th[] = '';
+
    	table_header($th);
 
 	$id = find_submit('Edit');
@@ -227,8 +244,12 @@ function display_po_items(&$order, $editable=true)
     		alt_table_row_color($k);
         	label_cell($po_line->stock_id);
     		label_cell($po_line->item_description);
-            qty_cell($po_line->quantity, false, get_qty_dec($po_line->stock_id));
-            qty_cell($po_line->qty_received, false, get_qty_dec($po_line->stock_id));
+        	if ($order->fixed_asset)
+    		    label_cell(1);
+         	else
+            	qty_cell($po_line->quantity, false, get_qty_dec($po_line->stock_id));
+			if (!$new)
+	            qty_cell($po_line->qty_received, false, get_qty_dec($po_line->stock_id));
     		label_cell($po_line->units);
 			if ($order->trans_type == ST_PURCHORDER)
         	    label_cell($po_line->req_del_date);
@@ -270,7 +291,8 @@ function display_po_items(&$order, $editable=true)
 
 	start_row();
 	label_cells(_("Amount Total"), $display_total, "colspan=$colspan align='right'","align='right'");
-	$order->order_no ? submit_cells('update', _("Update"), "colspan=2 align='center'", _("Refresh"), true)
+	$order->trans_type == ST_SUPPINVOICE
+	 ? submit_cells('update', _("Update"), "colspan=2 align='center'", _("Refresh"), true)
 		: label_cell('', "colspan=2");
 	end_row();
 
@@ -282,7 +304,7 @@ function display_po_items(&$order, $editable=true)
 
 function display_po_summary(&$po, $is_self=false, $editable=false)
 {
-    start_table(TABLESTYLE, "width=90%");
+    start_table(TABLESTYLE, "width='90%'");
 
     start_row();
     label_cells(_("Reference"), $po->reference, "class='tableheader2'");
@@ -299,7 +321,7 @@ function display_po_summary(&$po, $is_self=false, $editable=false)
     }
 	end_row();
 	start_row();
-    label_cells(_("Date"), $po->orig_order_date, "class='tableheader2'");
+    label_cells(_("Date"), $po->tran_date, "class='tableheader2'");
 
     if ($editable)
     {
@@ -343,17 +365,16 @@ function po_item_controls(&$order, &$rowcounter, $line_no=-1)
    global $Ajax, $SysPrefs;
 
 	alt_table_row_color($rowcounter);
+	$new = $order->order_no == 0;
 
 	$dec2 = 0;
 	$id = find_submit('Edit');
 	if (($id != -1) && $line_no == $id)
 	{
-//		hidden('line_no', $id);
 
 		$_POST['stock_id'] = $order->line_items[$id]->stock_id;
 		$dec = get_qty_dec($_POST['stock_id']);
 		$_POST['qty'] = qty_format($order->line_items[$id]->quantity, $_POST['stock_id'], $dec);
-		//$_POST['price'] = price_format($order->line_items[$id]->price);
 		$_POST['price'] = price_decimal_format($order->line_items[$id]->price, $dec2);
 		if ($order->trans_type == ST_PURCHORDER)
 			$_POST['req_del_date'] = $order->line_items[$id]->req_del_date;
@@ -368,7 +389,6 @@ function po_item_controls(&$order, &$rowcounter, $line_no=-1)
 			text_cells(null,'item_description', null, 45, 150);
 		else {
 			hidden('item_description', $_POST['item_description']);
-//			label_cell($_POST['item_description']);
 			label_cell($order->line_items[$id]->item_description); 
 		}
 
@@ -377,11 +397,13 @@ function po_item_controls(&$order, &$rowcounter, $line_no=-1)
 	}
 	else
 	{
-//		hidden('line_no', ($_SESSION['PO']->lines_on_order + 1));
 
-		//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);
+		// Manufactured item can be purchased
+		if ($order->fixed_asset)
+			stock_purchasable_fa_list_cells(null, 'stock_id', null, false, true, false, true, $order->line_items);
+		else
+			stock_items_list_cells(null, 'stock_id', null, false, true, false, true, array('editable' => 30, 'where'=>array("NOT no_purchase")));
+
 		if (list_updated('stock_id')) {
 			    $Ajax->activate('price');
 			    $Ajax->activate('units');
@@ -394,15 +416,20 @@ function po_item_controls(&$order, &$rowcounter, $line_no=-1)
 
    		$dec = $item_info["decimals"];
    		$_POST['qty'] =	number_format2(get_purchase_conversion_factor ($order->supplier_id, $_POST['stock_id']), $dec);
-		//$_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(), $SysPrefs->default_receival_required_by());
 		$qty_rcvd = '';
 	}
 
-	qty_cells(null, 'qty', null, null, null, $dec);
-	qty_cell($qty_rcvd, false, $dec);
+	if ($order->fixed_asset) {
+		label_cell(1, '', 'qty');
+		hidden('qty', 1);
+	} else
+		qty_cells(null, 'qty', null, null, null, $dec);
+
+	if (!$new)
+		qty_cell($qty_rcvd, false, $dec);
 
 	label_cell($_POST['units'], '', 'units');
 	if ($order->trans_type == ST_PURCHORDER)
@@ -415,7 +442,6 @@ function po_item_controls(&$order, &$rowcounter, $line_no=-1)
    	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());
 	amount_cell($line_total, false, '','line_total');
 
@@ -445,13 +471,7 @@ function display_po_footer(&$trans)
 
 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');
@@ -464,4 +484,3 @@ end_table();
 
 
 
-?>
\ No newline at end of file