X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=purchasing%2Fincludes%2Fui%2Finvoice_ui.inc;h=c5eafa8039f8188b66015f546cf63526d42cd42c;hb=ddadb47f2620ce6902ad4694ce6512568862ba05;hp=79f2441edb6d981bf4f7997bcc6ff11d2a88f2f4;hpb=8864b1ec0fd3321e510511ef22614bc36845540e;p=fa-stable.git

diff --git a/purchasing/includes/ui/invoice_ui.inc b/purchasing/includes/ui/invoice_ui.inc
index 79f2441e..c5eafa80 100644
--- a/purchasing/includes/ui/invoice_ui.inc
+++ b/purchasing/includes/ui/invoice_ui.inc
@@ -44,7 +44,9 @@ function copy_to_trans(&$supp_trans)
 	{
 		foreach ( $supp_trans->gl_codes as $gl_line)
 		{
-			$supp_trans->ov_amount += $gl_line->amount;
+			////////// 2009-08-18 Joe Hunt
+			if (!is_tax_account($gl_line->gl_code))
+				$supp_trans->ov_amount += $gl_line->amount;
 		}
 	}
 }
@@ -53,7 +55,7 @@ function copy_to_trans(&$supp_trans)
 
 function invoice_header(&$supp_trans)
 {
-	global $Ajax, $table_style;
+	global $Ajax, $table_style, $Refs;
 	
 	// if vars have been lost, recopy
 	if (!isset($_POST['tran_date']))
@@ -65,14 +67,14 @@ 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));
 	}	
 	else
 	{
-    	if (!isset($_POST['supplier_id']) && (get_global_supplier() != reserved_words::get_all()))
+    	if (!isset($_POST['supplier_id']) && (get_global_supplier() != ALL_TEXT))
     		$_POST['supplier_id'] = get_global_supplier();
 
 		supplier_list_row(_("Supplier:"), 'supplier_id', $_POST['supplier_id'], false, true);
@@ -88,9 +90,9 @@ function invoice_header(&$supp_trans)
 	}
 
 	if ($supp_trans->is_invoice)
-    	ref_row(_("Reference:"), 'reference', '', references::get_next(20));
+    	ref_row(_("Reference:"), 'reference', '', $Refs->get_next(ST_SUPPINVOICE));
     else
-    	ref_row(_("Reference:"), 'reference', '', references::get_next(21));
+    	ref_row(_("Reference:"), 'reference', '', $Refs->get_next(ST_SUPPCREDIT));
 
 	if (isset($_POST['invoice_no']))
 	{
@@ -288,9 +290,11 @@ function display_gl_items(&$supp_trans, $mode=0)
 				label_cell("");
 			}	
 			end_row();
-
-			$total_gl_value += $entered_gl_code->amount;
-
+			/////////// 2009-08-18 Joe Hunt
+			if ($mode > 1 && !is_tax_account($entered_gl_code->gl_code))
+				$total_gl_value += $entered_gl_code->amount;
+			else	
+				$total_gl_value += $entered_gl_code->amount;
 			$i++;
 			if ($i > 15)
 			{
@@ -363,7 +367,7 @@ function display_grn_items_for_selection(&$supp_trans, $k)
             	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(systypes::po(), $myrow["purch_order_no"]));
+        	label_cell(get_trans_view_str(ST_PURCHORDER, $myrow["purch_order_no"]));
             label_cell($myrow["item_code"]);
             label_cell($myrow["description"]);
             label_cell(sql2date($myrow["delivery_date"]));
@@ -376,7 +380,8 @@ function display_grn_items_for_selection(&$supp_trans, $k)
             else		
             	qty_cells(null, 'This_QuantityCredited'.$n, number_format2(max($myrow["quantity_inv"], 0), $dec), 
             		null, null, $dec);
-            amount_cells(null, 'ChgPrice'.$n, price_format($myrow["unit_price"]));
+            $dec2 = 0; 		
+            amount_cells(null, 'ChgPrice'.$n, price_decimal_format($myrow["unit_price"], $dec2), null, null, $dec2);
             if ($supp_trans->is_invoice)
             	amount_cell(round2($myrow["unit_price"] * ($myrow["qty_recd"] - $myrow["quantity_inv"]), user_price_dec()));
             else	
@@ -385,7 +390,7 @@ function display_grn_items_for_selection(&$supp_trans, $k)
         		submit_cells('grn_item_id'.$n, _("Add"), '', _("Add to Invoice"), true);
         	else	
         		submit_cells('grn_item_id'.$n, _("Add"), '', _("Add to Credit Note"), true);
-    		if ($supp_trans->is_invoice && $_SESSION["wa_current_user"]->access == 2) {	// Added 2008-10-18 by Joe Hunt. Only admins can remove GRNs
+    		if ($supp_trans->is_invoice && $_SESSION["wa_current_user"]->can_access('SA_GRNDELETE')) {	// Added 2008-10-18 by Joe Hunt. Special access rights needed.
         		submit_cells('void_item_id'.$n, _("Remove"), '', _("WARNING! Be careful with removal. The operation is executed immediately and cannot be undone !!!"), true);
 				submit_js_confirm('void_item_id'.$n,
 					sprintf(_('You are about to remove all yet non-invoiced items from delivery line #%d. This operation also irreversibly changes related order line. Do you want to continue ?'), $n));
@@ -420,7 +425,7 @@ function display_grn_items(&$supp_trans, $mode=0)
 		if ($supp_trans->is_invoice)
 		{
 			$heading = _("Items Received Yet to be Invoiced");
-    		if ($_SESSION["wa_current_user"]->access == 2)	// Added 2008-10-18 by Joe Hunt. Only admins can remove GRNs
+    		if ($_SESSION["wa_current_user"]->can_access('SA_GRNDELETE'))	// Added 2008-10-18 by Joe Hunt. Only admins can remove GRNs
 				$heading2 = _("WARNING! Be careful with removal. The operation is executed immediately and cannot be undone !!!");
 		}
 		else
@@ -443,8 +448,8 @@ function display_grn_items(&$supp_trans, $mode=0)
 		if (!$supp_trans->is_invoice && !isset($_POST['invoice_no']))
 		{
 			echo "</td>";
-			date_cells(_("Received between"), 'receive_begin', "", null, -30);
-			date_cells(_("and"), 'receive_end', '', null, 1);
+			date_cells(_("Received between"), 'receive_begin', "", null, -30, 0, 0, "valign=middle");
+			date_cells(_("and"), 'receive_end', '', null, 1, 0, 0, "valign=middle");
 			submit_cells('RefreshInquiry', _("Search"),'',_('Refresh Inquiry'), true);
 			echo "<td>";
 		}	
@@ -467,7 +472,7 @@ function display_grn_items(&$supp_trans, $mode=0)
     	$th = array(_("Delivery"), _("Sequence #"), _("P.O."), _("Item"), _("Description"),
     		_("Received On"), _("Quantity Received"), _("Quantity Invoiced"),
     		_("Qty Yet To Invoice"), _("Order Price"), _("Total"), "");
-    	if ($supp_trans->is_invoice && $_SESSION["wa_current_user"]->access == 2)	// Added 2008-10-18 by Joe Hunt. Only admins can remove GRNs
+    	if ($supp_trans->is_invoice && $_SESSION["wa_current_user"]->can_access('SA_GRNDELETE'))	// Added 2008-10-18 by Joe Hunt. Only admins can remove GRNs
     		$th[] = "";
 		if (!$supp_trans->is_invoice)
 		{
@@ -491,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);
@@ -507,13 +512,13 @@ function display_grn_items(&$supp_trans, $mode=0)
 				qty_cell($entered_grn->prev_quantity_inv, false, $dec);
             }
 			qty_cell(abs($entered_grn->this_quantity_inv), true, $dec);
-			amount_cell($entered_grn->chg_price);
+			amount_decimal_cell($entered_grn->chg_price);
 			amount_cell( round2($entered_grn->chg_price * abs($entered_grn->this_quantity_inv), user_price_dec()), true);
 
 			if ($mode == 1)
 			{
 				delete_button_cell("Delete" . $entered_grn->id, _("Edit"), _('Edit document line'));
-				if ($supp_trans->is_invoice && $_SESSION["wa_current_user"]->access == 2)	  
+				if ($supp_trans->is_invoice && $_SESSION["wa_current_user"]->can_access('SA_GRNDELETE'))	  
 					label_cell("");
 			}	
 			end_row();