X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=purchasing%2Fincludes%2Fui%2Finvoice_ui.inc;h=7805faec6106e6511c773a155ba09275fde1a82e;hb=c001557f8ebee630494c6323477bd865a61942d9;hp=7470300dd71b0118dfe51e07e8c24f02f3bed22b;hpb=e9ad9e87f5eb2682d2e91c93134250fd8a8d2ad9;p=fa-stable.git

diff --git a/purchasing/includes/ui/invoice_ui.inc b/purchasing/includes/ui/invoice_ui.inc
index 7470300d..7805faec 100644
--- a/purchasing/includes/ui/invoice_ui.inc
+++ b/purchasing/includes/ui/invoice_ui.inc
@@ -122,12 +122,6 @@ function invoice_header(&$supp_trans)
 	}
 		text_row(_("Supplier's Ref.:"), 'supp_reference', $_POST['supp_reference'], 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);
-
 	table_section(2, "33%");
 
 	if (isset($_POST['_tran_date_changed'])) {
@@ -142,6 +136,12 @@ function invoice_header(&$supp_trans)
 
     label_row(_("Terms:"), $supp_trans->terms['description']);
 
+	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);
+
 	table_section(3, "33%");
 
 	set_global_supplier($_POST['supplier_id']);
@@ -199,8 +199,9 @@ function invoice_totals(&$supp_trans)
 function display_gl_controls(&$supp_trans, $k)
 {
 	$accs = get_supplier_accounts($supp_trans->supplier_id);
-	$_POST['gl_code'] = $accs['purchase_account'] ? 
-		$accs['purchase_account'] : get_company_pref('default_cogs_act');
+    if (!isset($_POST['gl_code']))
+		$_POST['gl_code'] = $accs['purchase_account'] ? 
+			$accs['purchase_account'] : get_company_pref('default_cogs_act');
 
 	alt_table_row_color($k);
 	echo gl_all_accounts_list('gl_code', null, true, true);
@@ -316,7 +317,8 @@ function display_gl_items(&$supp_trans, $mode=0)
 			{
 				delete_button_cell("Delete2" . $entered_gl_code->Counter, _("Delete"),
 					  _('Remove line from document'));
-				label_cell("");
+                edit_button_cell("Edit" . $entered_gl_code->Counter, _("Edit"),
+                      _('Edit line from document'));
 			}	
 			end_row();
 			if ($mode > 1) {
@@ -359,16 +361,15 @@ function display_grn_items_for_selection(&$supp_trans, $k)
 			$result = get_grn_items(0, $supp_trans->supplier_id, false, true, 0, $_POST['receive_begin'], $_POST['receive_end']);
 		elseif ($supp_trans->src_docs)
 			$result = get_grn_items(0, $supp_trans->supplier_id, false, true, array_keys($supp_trans->src_docs));
-		else	
+		else
 			$result = get_grn_items(0, $supp_trans->supplier_id, false, true);
 	}
     if (db_num_rows($result) == 0)
     {
     	return false;
     }
-    
-    /*Set up a table to show the outstanding GRN items for selection */
 
+    /*Set up a table to show the outstanding GRN items for selection */
     while ($myrow = db_fetch($result))
     {
 		$grn_already_on_invoice = false;
@@ -383,19 +384,18 @@ function display_grn_items_for_selection(&$supp_trans, $k)
 
     	if ($grn_already_on_invoice == false)
     	{
-
 			alt_table_row_color($k);
 
 			$n = $myrow["id"];
-    		label_cell(get_trans_view_str(ST_SUPPRECEIVE, $myrow["grn_batch_id"]));
-           	hidden('qty_recd'.$n, $myrow["qty_recd"], false);
-           	hidden('item_code'.$n, $myrow["item_code"], false);
-           	hidden('item_description'.$n, $myrow["description"], false);
-           	hidden('prev_quantity_inv'.$n, $myrow['quantity_inv'], false);
-           	hidden('order_price'.$n, $myrow['unit_price'], false);
-           	hidden('std_cost_unit'.$n, $myrow['std_cost_unit'], false);
-           	hidden('po_detail_item'.$n, $myrow['po_detail_item'], false);
-        	label_cell(get_trans_view_str(ST_PURCHORDER, $myrow["purch_order_no"]));
+			label_cell(get_trans_view_str(ST_SUPPRECEIVE, $myrow["grn_batch_id"]), "nowrap align='right'");
+		   	hidden('qty_recd'.$n, $myrow["qty_recd"]);
+           	hidden('item_code'.$n, $myrow["item_code"]);
+           	hidden('item_description'.$n, $myrow["description"]);
+           	hidden('prev_quantity_inv'.$n, $myrow['quantity_inv']);
+           	hidden('order_price'.$n, $myrow['unit_price']);
+           	hidden('std_cost_unit'.$n, $myrow['std_cost_unit']);
+           	hidden('po_detail_item'.$n, $myrow['po_detail_item']);
+        	label_cell(get_trans_view_str(ST_PURCHORDER, $myrow["purch_order_no"]), "nowrap align='right'");
             label_cell($myrow["item_code"]);
             label_cell($myrow["description"]);
             label_cell(sql2date($myrow["delivery_date"]));
@@ -570,7 +570,7 @@ function display_grn_items(&$supp_trans, $mode=0)
 	if ($mode == 1)
 	{
 		$ret = display_grn_items_for_selection($supp_trans, $k);
-    	$colspan = 10;
+    	$colspan = 9;
 	}
 	else
 		$colspan = 5;