X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=purchasing%2Fincludes%2Fui%2Finvoice_ui.inc;h=baf2ceb5fa281f390a920d1eb1a198921bc9e77f;hb=e67a7d7074ceb37291846e68f8c5683bb93560ab;hp=75c8a24f304bb923ee9b2bda717d9794484e43b2;hpb=80dd97a37f674cc3691fa04af4c29607067566b2;p=fa-stable.git

diff --git a/purchasing/includes/ui/invoice_ui.inc b/purchasing/includes/ui/invoice_ui.inc
index 75c8a24f..baf2ceb5 100644
--- a/purchasing/includes/ui/invoice_ui.inc
+++ b/purchasing/includes/ui/invoice_ui.inc
@@ -67,7 +67,7 @@ function invoice_header(&$supp_trans)
 
 	if (isset($_POST['invoice_no']))
 	{
-		$trans = get_supp_trans($_POST['invoice_no'], 20);
+		$trans = get_supp_trans($_POST['invoice_no'], ST_SUPPINVOICE);
 		$_POST['supplier_id'] = $trans['supplier_id'];
 		$supp = $trans['supplier_name'] . " - " . $trans['SupplierCurrCode'];
 		label_row(_("Supplier:"), $supp.hidden('supplier_id', $_POST['supplier_id'], false));
@@ -90,9 +90,9 @@ function invoice_header(&$supp_trans)
 	}
 
 	if ($supp_trans->is_invoice)
-    	ref_row(_("Reference:"), 'reference', '', $Refs->get_next(20));
+    	ref_row(_("Reference:"), 'reference', '', $Refs->get_next(ST_SUPPINVOICE));
     else
-    	ref_row(_("Reference:"), 'reference', '', $Refs->get_next(21));
+    	ref_row(_("Reference:"), 'reference', '', $Refs->get_next(ST_SUPPCREDIT));
 
 	if (isset($_POST['invoice_no']))
 	{
@@ -170,7 +170,7 @@ function display_gl_controls(&$supp_trans, $k)
 	$_POST['gl_code'] = $accs['purchase_account'];
 
 	alt_table_row_color($k);
-	gl_all_accounts_list('gl_code', null, true, true);
+	echo gl_all_accounts_list('gl_code', null, true, true);
 	$dim = get_company_pref('use_dimension');
 	if ($dim >= 1)
 		dimensions_list_cells(null, 'dimension_id', null, true, " ", false, 1);
@@ -219,7 +219,7 @@ function display_gl_items(&$supp_trans, $mode=0)
 		{
 			echo "<div style='float:right;'>";
 			echo _("Quick Entry:")."&nbsp;"; 
-			quick_entries_list('qid', null, QE_SUPPINV, true);
+			echo quick_entries_list('qid', null, QE_SUPPINV, true);
 			$qid = get_quick_entry(get_post('qid'));
 			if (list_updated('qid')) {
 				unset($_POST['totamount']); // enable default
@@ -308,7 +308,7 @@ function display_gl_items(&$supp_trans, $mode=0)
 		display_gl_controls($supp_trans, $k);
 	$colspan = ($dim == 2 ? 4 : ($dim == 1 ? 3 : 2));
 	label_row(_("Total"), price_format($total_gl_value),
-		"colspan=".$colspan." align=right", "nowrap align=right");
+		"colspan=".$colspan." align=right", "nowrap align=right", ($mode==1?3:1));
 
 	end_table();
 	div_end();
@@ -496,7 +496,7 @@ function display_grn_items(&$supp_trans, $mode=0)
     		alt_table_row_color($k);
 
 			$grn_batch = get_grn_batch_from_item($entered_grn->id);
-    		label_cell(get_trans_view_str(25,$grn_batch));
+    		label_cell(get_trans_view_str(ST_SUPPRECEIVE,$grn_batch));
     		if ($mode == 1)
     		{
 				label_cell($entered_grn->id);