X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=purchasing%2Fincludes%2Fui%2Finvoice_ui.inc;h=93524a4b3cd7503e2152e6e4dd6c9eaf99a07478;hb=3862c1a48d8d699ff03d6fe31ee7b4cf492aa5e0;hp=b172ed90627fcf5d7d5ff529ef35010b2e20ed82;hpb=17b390efcf904072b02ec866b2a427490471a260;p=fa-stable.git

diff --git a/purchasing/includes/ui/invoice_ui.inc b/purchasing/includes/ui/invoice_ui.inc
index b172ed90..93524a4b 100644
--- a/purchasing/includes/ui/invoice_ui.inc
+++ b/purchasing/includes/ui/invoice_ui.inc
@@ -19,7 +19,6 @@ function copy_from_trans(&$supp_trans)
 	$_POST['supp_reference'] = $supp_trans->supp_reference;
 	$_POST['reference'] = $supp_trans->reference;
 	$_POST['supplier_id'] = $supp_trans->supplier_id;
-	$_POST['tax_algorithm'] = $supp_trans->tax_algorithm;
     $_POST['dimension'] = $supp_trans->dimension;
     $_POST['dimension2'] = $supp_trans->dimension2;
 
@@ -38,8 +37,6 @@ function copy_to_trans(&$supp_trans)
 	$supp_trans->due_date = $_POST['due_date'];
 	$supp_trans->supp_reference = $_POST['supp_reference'];
 	$supp_trans->reference = $_POST['reference'];
- 	if (isset($_POST['tax_algorithm']))
- 	    $supp_trans->tax_algorithm = $_POST['tax_algorithm'];
    	$supp_trans->dimension = @$_POST['dimension'];
 	$supp_trans->dimension2 =  @$_POST['dimension2'];
 
@@ -66,7 +63,6 @@ function copy_to_trans(&$supp_trans)
 	{
 		foreach ( $supp_trans->gl_codes as $gl_line)
 		{
-			////////// 2009-08-18 Joe Hunt
 			if (!is_tax_account($gl_line->gl_code) || $supp_trans->tax_included)
 				$supp_trans->ov_amount += $gl_line->amount;
 		}
@@ -89,11 +85,6 @@ function invoice_header(&$supp_trans)
 
 	if ($supp_trans->trans_type == ST_SUPPCREDIT && $supp_trans->src_docs)
 	{
-//		$trans = get_supp_trans($_POST['invoice_no'], ST_SUPPINVOICE);
-//		$trans = get_supp_trans($supp_trans->supplier_id, ST_SUPPINVOICE);
-//		$_POST['supplier_id'] = $trans['supplier_id'];
-//		$supp = $trans['supplier_name'] . " - " . $trans['SupplierCurrCode'];
-
 		$_POST['supplier_id'] = $supp_trans->supplier_id;
 		$supp = $supp_trans->supplier_name." - ".$supp_trans->currency;
 		label_row(_("Supplier:"), $supp.hidden('supplier_id', $_POST['supplier_id'], false));
@@ -120,7 +111,10 @@ function invoice_header(&$supp_trans)
 		copy_from_trans($supp_trans);
 	}
 
-   	ref_row(_("Reference:"), 'reference', '', $Refs->get_next($supp_trans->trans_type));
+   	date_row(_("Date") . ":", 'tran_date', '', true, 0, 0, 0, "", true);
+
+   	ref_row(_("Reference:"), 'reference', '', $Refs->get_next($supp_trans->trans_type, null, 
+   		array('supplier' => get_post('supplier_id'), 'date' => get_post('tran_date'))), false, $supp_trans->trans_type);
 
 	if ($supp_trans->trans_type == ST_SUPPCREDIT)
 	{
@@ -128,15 +122,8 @@ 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%");
 
-   	date_row(_("Date") . ":", 'tran_date', '', true, 0, 0, 0, "", true);
 	if (isset($_POST['_tran_date_changed'])) {
 		$Ajax->activate('_ex_rate');
 		$supp_trans->tran_date = $_POST['tran_date'];
@@ -149,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']);
@@ -197,11 +190,6 @@ function invoice_totals(&$supp_trans)
 
     end_table(1);
     start_table(TABLESTYLE2);
-    tax_algorithm_list_row(_("Tax algorithm:"), 'tax_algorithm', null, true);
-	if (list_updated('tax_algorithm')) {
-		$supp_trans->tax_algorithm = $_POST['tax_algorithm'];
-	    $Ajax->activate('tax_table');
-	}
     textarea_row(_("Memo:"), "Comments", null, 50, 3);
     end_table(1);
 	div_end();
@@ -224,7 +212,7 @@ function display_gl_controls(&$supp_trans, $k)
 	amount_cells(null, 'amount');
 	if ($dim < 1)	
 		text_cells_ex(null, 'memo_', 35, 50, null, null, null, hidden('dimension_id', 0, false).hidden('dimension2_id', 0, false));
-	else if ($dim < 2)	
+	elseif ($dim < 2)	
 		text_cells_ex(null, 'memo_', 35, 50, null, null, null, hidden('dimension2_id', 0, false));
 	else	
 		text_cells_ex(null, 'memo_', 35, 50, null, null, null);
@@ -288,7 +276,7 @@ function display_gl_items(&$supp_trans, $mode=0)
 	$dim = get_company_pref('use_dimension');
 	if ($dim == 2)
     	$th = array(_("Account"), _("Name"), _("Dimension")." 1", _("Dimension")." 2", _("Amount"), _("Memo"));
-	else if ($dim == 1)
+	elseif ($dim == 1)
     	$th = array(_("Account"), _("Name"), _("Dimension"), _("Amount"), _("Memo"));
     else
     	$th = array(_("Account"), _("Name"), _("Amount"), _("Memo"));
@@ -331,7 +319,6 @@ function display_gl_items(&$supp_trans, $mode=0)
 				label_cell("");
 			}	
 			end_row();
-			/////////// 2009-08-18 Joe Hunt
 			if ($mode > 1) {
 				if ($supp_trans->tax_included || !is_tax_account($entered_gl_code->gl_code))
 					$total_gl_value += $entered_gl_code->amount;
@@ -370,18 +357,17 @@ function display_grn_items_for_selection(&$supp_trans, $k)
 	{ // only invoiced
 		if (isset($_POST['receive_begin']) && isset($_POST['receive_end']))
 			$result = get_grn_items(0, $supp_trans->supplier_id, false, true, 0, $_POST['receive_begin'], $_POST['receive_end']);
-		else if ($supp_trans->src_docs)
+		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;
@@ -396,20 +382,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"]));
-        	label_cell($myrow["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"]));
@@ -514,7 +498,7 @@ function display_grn_items(&$supp_trans, $mode=0)
 	start_table(TABLESTYLE, "width='95%'");
 	if ($mode == 1)
 	{
-    	$th = array(_("Delivery"), _("Sequence #"), _("P.O."), _("Item"), _("Description"),
+    	$th = array(_("Delivery"), _("P.O."), _("Item"), _("Description"),
     		_("Received On"), _("Quantity Received"), _("Quantity Invoiced"),
     		_("Qty Yet To Invoice"), $supp_trans->tax_included ? _("Price after Tax") : _("Price before Tax"), 
     		_("Total"), "");
@@ -522,7 +506,7 @@ function display_grn_items(&$supp_trans, $mode=0)
     		$th[] = "";
 		if ($supp_trans->trans_type == ST_SUPPCREDIT)
 		{
-			$th[8] = _("Qty Yet To Credit");
+			$th[7] = _("Qty Yet To Credit");
 		}
     }
     else
@@ -545,7 +529,7 @@ function display_grn_items(&$supp_trans, $mode=0)
     		label_cell(get_trans_view_str(ST_SUPPRECEIVE, $grn_batch));
     		if ($mode == 1)
     		{
-				label_cell($entered_grn->id);
+//				label_cell($entered_grn->id);
  				$row = get_grn_batch($grn_batch);
 				label_cell(get_trans_view_str(ST_PURCHORDER, $row["purch_order_no"])); // PO
 			}	
@@ -584,7 +568,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;