X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=purchasing%2Fincludes%2Fui%2Finvoice_ui.inc;h=b3957fd8cf66bf3f46e6ee780b9ddecdee41d1bb;hb=21ba0553185531c12f16efef9010033d5dd62cdc;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..b3957fd8 100644
--- a/purchasing/includes/ui/invoice_ui.inc
+++ b/purchasing/includes/ui/invoice_ui.inc
@@ -55,19 +55,19 @@ function copy_to_trans(&$supp_trans)
 
 function invoice_header(&$supp_trans)
 {
-	global $Ajax, $table_style, $Refs;
+	global $Ajax, $Refs;
 	
 	// if vars have been lost, recopy
 	if (!isset($_POST['tran_date']))
 		copy_from_trans($supp_trans);
 
-	start_outer_table("$table_style width=98%", 5);
+	start_outer_table(TABLESTYLE2, "width=95%");
 
 	table_section(1);
 
 	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']))
 	{
@@ -118,6 +118,8 @@ function invoice_header(&$supp_trans)
 
 	table_section(3, "33%");
 
+	set_global_supplier($_POST['supplier_id']);
+
 	$supplier_currency = get_supplier_currency($supp_trans->supplier_id);
 
 	$company_currency = get_company_currency();
@@ -137,26 +139,26 @@ function invoice_header(&$supp_trans)
 
 function invoice_totals(&$supp_trans)
 {
-	global $table_style, $table_style2;
-
 	copy_to_trans($supp_trans);
 
-    start_table("$table_style width=95%");
-   	label_row(_("Sub-total:"), price_format( $supp_trans->ov_amount), "align=right", "align=right");
+	$dim = get_company_pref('use_dimension');
+ 	$colspan = ($dim == 2 ? 7 : ($dim == 1 ? 6 : 5));
+   	start_table(TABLESTYLE, "width=95%");
+   	label_row(_("Sub-total:"), price_format( $supp_trans->ov_amount), "colspan=$colspan align=right", "align=right");
 
     $taxes = $supp_trans->get_taxes($supp_trans->tax_group_id);
-    $tax_total = display_edit_tax_items($taxes, 1, 0); // tax_included==0 (we are the company)
+    $tax_total = display_edit_tax_items($taxes, $colspan, 0); // tax_included==0 (we are the company)
 
     $display_total = price_format($supp_trans->ov_amount + $tax_total);
 
 	if ($supp_trans->is_invoice)
-    	label_row(_("Invoice Total:"), $display_total, "align=right style='font-weight:bold;'", "align=right style='font-weight:bold;'");
+    	label_row(_("Invoice Total:"), $display_total, "colspan=$colspan align=right style='font-weight:bold;'", "align=right style='font-weight:bold;'");
     else
 		label_row(_("Credit Note Total"),
-			$display_total, "align=right style='font-weight:bold;color:red;'", "nowrap align=right style='font-weight:bold;color:red;'");
+			$display_total, "colspan=$colspan align=right style='font-weight:bold;color:red;'", "nowrap align=right style='font-weight:bold;color:red;'");
 
     end_table(1);
-    start_table($table_style2);
+    start_table(TABLESTYLE2);
     textarea_row(_("Memo:"), "Comments", null, 50, 3);
     end_table(1);
 }
@@ -164,13 +166,11 @@ function invoice_totals(&$supp_trans)
 //--------------------------------------------------------------------------------------------------
 function display_gl_controls(&$supp_trans, $k)
 {
-	global $table_style;
-
 	$accs = get_supplier_accounts($supp_trans->supplier_id);
 	$_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);
@@ -197,20 +197,18 @@ function display_gl_controls(&$supp_trans, $k)
 
 function display_gl_items(&$supp_trans, $mode=0)
 {
-	global $table_style, $path_to_root, $Ajax;
+	global $path_to_root, $Ajax;
 
     // if displaying in form, and no items, exit
     if (($mode == 2 || $mode == 3) && count($supp_trans->gl_codes) == 0)
     	return 0;
 
-	start_outer_table("width=95%");
-
 	if ($supp_trans->is_invoice)
 		$heading = _("GL Items for this Invoice");
 	else
 		$heading = _("GL Items for this Credit Note");
 
-	start_outer_table("width=100%");
+	start_outer_table(TABLESTYLE, "width=95%");
 
 	if ($mode == 1)
 	{
@@ -219,7 +217,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
@@ -239,10 +237,8 @@ function display_gl_items(&$supp_trans, $mode=0)
 
 	end_outer_table(0, false);
 
-	vertical_space(); // ouer table
-
 	div_start('gl_items');
-	start_table("$table_style width=100%");
+	start_table(TABLESTYLE, "width=95%");
 
 	$dim = get_company_pref('use_dimension');
 	if ($dim == 2)
@@ -308,12 +304,11 @@ 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();
+	end_table(1);
 	div_end();
 
-    end_outer_table(0, false); // outertable
 	return $total_gl_value;
 }
 
@@ -321,8 +316,6 @@ function display_gl_items(&$supp_trans, $mode=0)
 
 function display_grn_items_for_selection(&$supp_trans, $k)
 {
-	global $table_style;
-
 	if ($supp_trans->is_invoice)
 		$result = get_grn_items(0, $supp_trans->supplier_id, true);
 	else
@@ -410,14 +403,14 @@ function display_grn_items_for_selection(&$supp_trans, $k)
 
 function display_grn_items(&$supp_trans, $mode=0)
 {
-	global $table_style, $path_to_root;
+	global $path_to_root;
 
     $ret = true;
     // if displaying in form, and no items, exit
     if (($mode == 2  || $mode == 3) && count($supp_trans->grn_items) == 0)
     	return 0;
 
-	start_outer_table("width=95%");
+	start_outer_table("style='border:1px solid #cccccc;' width=95%");
 
 	$heading2 = "";
 	if ($mode == 1)
@@ -439,8 +432,6 @@ function display_grn_items(&$supp_trans, $mode=0)
 			$heading = _("Received Items Credited on this Note");
 	}		
 
-	start_outer_table("width=100%");
-
 	display_heading($heading);
 
 	if ($mode == 1)
@@ -456,7 +447,6 @@ function display_grn_items(&$supp_trans, $mode=0)
 			
 		if ($heading2 != "")
 		{
-			//br();
 			display_note($heading2, 0, 0, "class='overduefg'");
 		}	
 		echo "</td><td width=10% align='right'>";
@@ -466,7 +456,7 @@ function display_grn_items(&$supp_trans, $mode=0)
 	end_outer_table(0, false);
 
   	div_start('grn_items');
-	start_table("$table_style width=100%");
+	start_table(TABLESTYLE, "width=95%");
 	if ($mode == 1)
 	{
     	$th = array(_("Delivery"), _("Sequence #"), _("P.O."), _("Item"), _("Description"),
@@ -496,7 +486,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);
@@ -543,20 +533,23 @@ function display_grn_items(&$supp_trans, $mode=0)
 		$colspan = 5;
 	label_row(_("Total"), price_format($total_grn_value),
 		"colspan=$colspan align=right", "nowrap align=right");
-    end_table();
 	if (!$ret)
 	{
+		start_row();
+		echo "<td colspan=".($colspan + 1).">";
 		if ($supp_trans->is_invoice)
-			display_note(_("There are no outstanding items received from this supplier that have not been invoiced by them."), 0, 1);
+			display_note(_("There are no outstanding items received from this supplier that have not been invoiced by them."), 0, 0);
 		else
 		{
 			display_note(_("There are no received items for the selected supplier that have been invoiced."));
-			display_note(_("Credits can only be applied to invoiced items."), 0, 1);
+			display_note(_("Credits can only be applied to invoiced items."), 0, 0);
 		}
+		echo "</td>";
+		end_row();
 	}	
+    end_table(1);
     div_end();
 
-    end_outer_table(0, false); // outertable
 	return $total_grn_value;
 }