X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=purchasing%2Fincludes%2Fui%2Finvoice_ui.inc;h=9c75a9714275aa9b05846b63969e62b15079d089;hb=561f438a3a1f7b5753d2b09238871418710e687f;hp=bc03ee82100b9a932e2775fd6fa2a01b7eedac25;hpb=953b3605810699962454b624e19bd0779b17e7f7;p=fa-stable.git

diff --git a/purchasing/includes/ui/invoice_ui.inc b/purchasing/includes/ui/invoice_ui.inc
index bc03ee82..9c75a971 100644
--- a/purchasing/includes/ui/invoice_ui.inc
+++ b/purchasing/includes/ui/invoice_ui.inc
@@ -19,6 +19,10 @@ 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['_ex_rate'] = $supp_trans->ex_rate;
+	if (isset($supp_trans->tax_overrides))
+	    foreach($supp_trans->tax_overrides as $id => $value)
+		    $_POST['mantax'][$id] = price_format($value);
 }
 
 //--------------------------------------------------------------------------------------------------
@@ -30,8 +34,17 @@ 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'];
+	$supp_trans->ex_rate = input_num('_ex_rate', null);
+
+	$supp_trans->ov_amount = $supp_trans->ov_discount = 0; /* for starters */
+    if (isset($_POST['mantax'])) {
+		foreach($_POST['mantax'] as $id => $tax) {
+	    	$supp_trans->tax_overrides[$id] = user_numeric($_POST['mantax'][$id]);
+	    	}
+	}
+	else
+		unset($supp_trans->tax_overrides);
 
-	$supp_trans->ov_amount = 0; /* for starters */
 	if (count($supp_trans->grn_items) > 0)
 	{
 		foreach ( $supp_trans->grn_items as $grn)
@@ -45,7 +58,7 @@ 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))
+			if (!is_tax_account($gl_line->gl_code) || $supp_trans->tax_included)
 				$supp_trans->ov_amount += $gl_line->amount;
 		}
 	}
@@ -55,13 +68,13 @@ function copy_to_trans(&$supp_trans)
 
 function invoice_header(&$supp_trans)
 {
-	global $Ajax, $table_style2, $Refs;
+	global $Ajax, $Refs;
 	
 	// if vars have been lost, recopy
 	if (!isset($_POST['tran_date']))
 		copy_from_trans($supp_trans);
 
-	start_outer_table("width=95% $table_style2");
+	start_outer_table(TABLESTYLE2, "width='95%'");
 
 	table_section(1);
 
@@ -69,7 +82,7 @@ function invoice_header(&$supp_trans)
 	{
 		$trans = get_supp_trans($_POST['invoice_no'], ST_SUPPINVOICE);
 		$_POST['supplier_id'] = $trans['supplier_id'];
-		$supp = $trans['supplier_name'] . " - " . $trans['SupplierCurrCode'];
+		$supp = $trans['supplier_name'] . " - " . $trans['curr_code'];
 		label_row(_("Supplier:"), $supp.hidden('supplier_id', $_POST['supplier_id'], false));
 	}	
 	else
@@ -89,17 +102,14 @@ function invoice_header(&$supp_trans)
 		copy_from_trans($supp_trans);
 	}
 
-	if ($supp_trans->is_invoice)
-    	ref_row(_("Reference:"), 'reference', '', $Refs->get_next(ST_SUPPINVOICE));
-    else
-    	ref_row(_("Reference:"), 'reference', '', $Refs->get_next(ST_SUPPCREDIT));
+   	ref_row(_("Reference:"), 'reference', '', $Refs->get_next($supp_trans->trans_type));
 
 	if (isset($_POST['invoice_no']))
 	{
 		label_row(_("Supplier's Ref.:"), $_POST['invoice_no'].hidden('invoice_no', $_POST['invoice_no'], false).hidden('supp_reference', $_POST['invoice_no'], false));
 	}	
 	else
-   		text_row(_("Supplier's Ref.:"), 'supp_reference', $_POST['supp_reference'], 20, 20);
+   		text_row(_("Supplier's Ref.:"), 'supp_reference', $_POST['supp_reference'], 20, 60);
 
 	table_section(2, "33%");
 
@@ -114,10 +124,12 @@ function invoice_header(&$supp_trans)
 
     date_row(_("Due Date") . ":", 'due_date');
 
-    label_row(_("Terms:"), $supp_trans->terms_description);
+    label_row(_("Terms:"), $supp_trans->terms['description']);
 
 	table_section(3, "33%");
 
+	set_global_supplier($_POST['supplier_id']);
+
 	$supplier_currency = get_supplier_currency($supp_trans->supplier_id);
 
 	$company_currency = get_company_currency();
@@ -125,10 +137,11 @@ function invoice_header(&$supp_trans)
 	if ($supplier_currency != $company_currency)
 	{
         label_row(_("Supplier's Currency:"), "<b>" . $supplier_currency . "</b>");
-		exchange_rate_display($supplier_currency, $company_currency, $_POST['tran_date']);
+		exchange_rate_display($company_currency, $supplier_currency, $_POST['tran_date']);
 	}
 
   	label_row(_("Tax Group:"), $supp_trans->tax_description);
+	supplier_credit_row($supp_trans->supplier_id, $supp_trans->credit);
 
 	end_outer_table(1);
 }
@@ -137,28 +150,27 @@ function invoice_header(&$supp_trans)
 
 function invoice_totals(&$supp_trans)
 {
-	global $table_style, $table_style2;
-
 	copy_to_trans($supp_trans);
 
 	$dim = get_company_pref('use_dimension');
  	$colspan = ($dim == 2 ? 7 : ($dim == 1 ? 6 : 5));
-   	start_table("$table_style width=95%");
+   	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, $colspan, 0); // tax_included==0 (we are the company)
+    $tax_total = display_edit_tax_items($taxes, $colspan, $supp_trans->tax_included, 0, true);
 
     $display_total = price_format($supp_trans->ov_amount + $tax_total);
 
-	if ($supp_trans->is_invoice)
-    	label_row(_("Invoice Total:"), $display_total, "colspan=$colspan align=right style='font-weight:bold;'", "align=right style='font-weight:bold;'");
+	if ($supp_trans->trans_type == ST_SUPPINVOICE)
+    	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, "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);
 }
@@ -166,10 +178,9 @@ function invoice_totals(&$supp_trans)
 //--------------------------------------------------------------------------------------------------
 function display_gl_controls(&$supp_trans, $k)
 {
-	global $table_style, $table_style2;
-
 	$accs = get_supplier_accounts($supp_trans->supplier_id);
-	$_POST['gl_code'] = $accs['purchase_account'];
+	$_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);
@@ -199,18 +210,18 @@ function display_gl_controls(&$supp_trans, $k)
 
 function display_gl_items(&$supp_trans, $mode=0)
 {
-	global $table_style, $table_style2, $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;
 
-	if ($supp_trans->is_invoice)
+	if ($supp_trans->trans_type == ST_SUPPINVOICE)
 		$heading = _("GL Items for this Invoice");
 	else
 		$heading = _("GL Items for this Credit Note");
 
-	start_outer_table("$table_style width=95%");
+	start_outer_table(TABLESTYLE, "width='95%'");
 
 	if ($mode == 1)
 	{
@@ -240,7 +251,7 @@ function display_gl_items(&$supp_trans, $mode=0)
 	end_outer_table(0, false);
 
 	div_start('gl_items');
-	start_table("$table_style width=95%");
+	start_table(TABLESTYLE, "width='95%'");
 
 	$dim = get_company_pref('use_dimension');
 	if ($dim == 2)
@@ -256,7 +267,7 @@ function display_gl_items(&$supp_trans, $mode=0)
 		$th[] = "";
 	}	
 	table_header($th);
-	$total_gl_value=0;
+	$total_gl_value=$total = 0;
 	$i = $k = 0;
 
 	if (count($supp_trans->gl_codes) > 0)
@@ -289,10 +300,13 @@ function display_gl_items(&$supp_trans, $mode=0)
 			}	
 			end_row();
 			/////////// 2009-08-18 Joe Hunt
-			if ($mode > 1 && !is_tax_account($entered_gl_code->gl_code))
-				$total_gl_value += $entered_gl_code->amount;
+			if ($mode > 1) {
+				if ($supp_trans->tax_included || !is_tax_account($entered_gl_code->gl_code))
+					$total_gl_value += $entered_gl_code->amount;
+			}		
 			else	
 				$total_gl_value += $entered_gl_code->amount;
+			$total += $entered_gl_code->amount;	
 			$i++;
 			if ($i > 15)
 			{
@@ -305,7 +319,7 @@ function display_gl_items(&$supp_trans, $mode=0)
 	if ($mode == 1)
 		display_gl_controls($supp_trans, $k);
 	$colspan = ($dim == 2 ? 4 : ($dim == 1 ? 3 : 2));
-	label_row(_("Total"), price_format($total_gl_value),
+	label_row(_("Total"), price_format($total),
 		"colspan=".$colspan." align=right", "nowrap align=right", ($mode==1?3:1));
 
 	end_table(1);
@@ -318,9 +332,8 @@ 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)
+	if ($supp_trans->trans_type == ST_SUPPINVOICE)
 		$result = get_grn_items(0, $supp_trans->supplier_id, true);
 	else
 	{
@@ -355,15 +368,15 @@ function display_grn_items_for_selection(&$supp_trans, $k)
 			alt_table_row_color($k);
 
 			$n = $myrow["id"];
-    		label_cell(get_trans_view_str(25, $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(25, $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).
+           	hidden('location'.$n, $myrow["loc_code"], false));
         	label_cell(get_trans_view_str(ST_PURCHORDER, $myrow["purch_order_no"]));
             label_cell($myrow["item_code"]);
             label_cell($myrow["description"]);
@@ -371,26 +384,31 @@ function display_grn_items_for_selection(&$supp_trans, $k)
             $dec = get_qty_dec($myrow["item_code"]);
             qty_cell($myrow["qty_recd"], false, $dec);
             qty_cell($myrow["quantity_inv"], false, $dec);
-            if ($supp_trans->is_invoice)
+            if ($supp_trans->trans_type == ST_SUPPINVOICE)
             	qty_cells(null, 'this_quantity_inv'.$n, number_format2($myrow["qty_recd"] - $myrow["quantity_inv"], $dec), 
             		null, null, $dec);
             else		
             	qty_cells(null, 'This_QuantityCredited'.$n, number_format2(max($myrow["quantity_inv"], 0), $dec), 
             		null, null, $dec);
             $dec2 = 0; 		
-            amount_cells(null, 'ChgPrice'.$n, price_decimal_format($myrow["unit_price"], $dec2), null, null, $dec2);
-            if ($supp_trans->is_invoice)
+            if ($supp_trans->trans_type == ST_SUPPINVOICE)
+            {
+            	amount_cells(null, 'ChgPrice'.$n, price_decimal_format($myrow["unit_price"], $dec2), null, null, $dec2);
             	amount_cell(round2($myrow["unit_price"] * ($myrow["qty_recd"] - $myrow["quantity_inv"]), user_price_dec()));
-            else	
-            	amount_cell(round2($myrow["unit_price"] * max($myrow['quantity_inv'], 0), user_price_dec()));
-            if ($supp_trans->is_invoice)	
+            }
+            else
+            {
+            	amount_cells(null, 'ChgPrice'.$n, price_decimal_format($myrow["act_price"], $dec2), null, null, $dec2);
+            	amount_cell(round2($myrow["act_price"] * max($myrow['quantity_inv'], 0), user_price_dec()));
+            }	
+            if ($supp_trans->trans_type == ST_SUPPINVOICE)
         		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"]->can_access('SA_GRNDELETE')) {	// Added 2008-10-18 by Joe Hunt. Special access rights needed.
+    		if (($supp_trans->trans_type == ST_SUPPINVOICE) && $_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));
+					_('You are about to remove all yet non-invoiced items from selected delivery line. This operation also irreversibly changes related order line. Do you want to continue ?'));
 			}
 			end_row();
     	}
@@ -407,19 +425,19 @@ 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("style='border:1px solid #cccccc;' width=95%");
+	start_outer_table("style='border:1px solid #cccccc;' width='95%'");
 
 	$heading2 = "";
 	if ($mode == 1)
 	{
-		if ($supp_trans->is_invoice)
+		if ($supp_trans->trans_type == ST_SUPPINVOICE)
 		{
 			$heading = _("Items Received Yet to be Invoiced");
     		if ($_SESSION["wa_current_user"]->can_access('SA_GRNDELETE'))	// Added 2008-10-18 by Joe Hunt. Only admins can remove GRNs
@@ -430,7 +448,7 @@ function display_grn_items(&$supp_trans, $mode=0)
 	}
 	else
 	{
-		if ($supp_trans->is_invoice)
+		if ($supp_trans->trans_type == ST_SUPPINVOICE)
 			$heading = _("Received Items Charged on this Invoice");
 		else
 			$heading = _("Received Items Credited on this Note");
@@ -440,7 +458,7 @@ function display_grn_items(&$supp_trans, $mode=0)
 
 	if ($mode == 1)
 	{
-		if (!$supp_trans->is_invoice && !isset($_POST['invoice_no']))
+		if ($supp_trans->trans_type == ST_SUPPCREDIT && !isset($_POST['invoice_no']))
 		{
 			echo "</td>";
 			date_cells(_("Received between"), 'receive_begin', "", null, -30, 0, 0, "valign=middle");
@@ -453,24 +471,25 @@ function display_grn_items(&$supp_trans, $mode=0)
 		{
 			display_note($heading2, 0, 0, "class='overduefg'");
 		}	
-		echo "</td><td width=10% align='right'>";
+		echo "</td><td width='10%' align='right'>";
 		submit('InvGRNAll', _("Add All Items"), true, false,true);
 	}	
 
 	end_outer_table(0, false);
 
   	div_start('grn_items');
-	start_table("$table_style width=95%");
+	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"), _("Order Price"), _("Total"), "");
-    	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
+    		_("Qty Yet To Invoice"), $supp_trans->tax_included ? _("Price after Tax") : _("Price before Tax"), 
+    		_("Total"), "");
+    	if (($supp_trans->trans_type == ST_SUPPINVOICE) && $_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)
+		if ($supp_trans->trans_type == ST_SUPPCREDIT)
 		{
-			$th[8] = _("Qty Yet To Credit");
+			$th[7] = _("Qty Yet To Credit");
 		}
     }
     else
@@ -493,16 +512,16 @@ 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(""); // PO
-			}	
+				$row = get_grn_batch($grn_batch);
+				label_cell($row['purch_order_no']); // PO
+			}
 			label_cell($entered_grn->item_code);
 			label_cell($entered_grn->item_description);
             $dec = get_qty_dec($entered_grn->item_code);
             if ($mode == 1)
             {
-            	label_cell("");
-				qty_cell($entered_grn->qty_recd, false, $dec);
+           		label_cell(sql2date($row['delivery_date']));
+ 				qty_cell($entered_grn->qty_recd, false, $dec);
 				qty_cell($entered_grn->prev_quantity_inv, false, $dec);
             }
 			qty_cell(abs($entered_grn->this_quantity_inv), true, $dec);
@@ -512,7 +531,7 @@ function display_grn_items(&$supp_trans, $mode=0)
 			if ($mode == 1)
 			{
 				delete_button_cell("Delete" . $entered_grn->id, _("Edit"), _('Edit document line'));
-				if ($supp_trans->is_invoice && $_SESSION["wa_current_user"]->can_access('SA_GRNDELETE'))	  
+				if (($supp_trans->trans_type == ST_SUPPINVOICE) && $_SESSION["wa_current_user"]->can_access('SA_GRNDELETE'))	  
 					label_cell("");
 			}	
 			end_row();
@@ -541,7 +560,7 @@ function display_grn_items(&$supp_trans, $mode=0)
 	{
 		start_row();
 		echo "<td colspan=".($colspan + 1).">";
-		if ($supp_trans->is_invoice)
+		if ($supp_trans->trans_type == ST_SUPPINVOICE)
 			display_note(_("There are no outstanding items received from this supplier that have not been invoiced by them."), 0, 0);
 		else
 		{
@@ -558,19 +577,22 @@ function display_grn_items(&$supp_trans, $mode=0)
 }
 
 //--------------------------------------------------------------------------------------------------
-function get_duedate_from_terms(&$supp_trans)
+function get_duedate_from_terms(&$trans)
 {
-	if (!is_date($supp_trans->tran_date))
+	$date = get_class($trans) == 'purch_order' ? $trans->orig_order_date : $trans->tran_date;
+
+	if (!is_date($date))
 	{
-		$supp_trans->tran_date = Today();
+		$date = Today();
 	}
-	if (substr( $supp_trans->terms, 0, 1) == "1")
+	if ($trans->terms['day_in_following_month'])
 	{ /*Its a day in the following month when due */
-		$supp_trans->due_date = add_days(end_month($supp_trans->tran_date), (int) substr( $supp_trans->terms,1));
+		$trans->due_date =
+			add_days(end_month($date), $trans->terms["day_in_following_month"]);
 	}
 	else
 	{ /*Use the Days Before Due to add to the invoice date */
-		$supp_trans->due_date = add_days($supp_trans->tran_date, (int) substr( $supp_trans->terms,1));
+		$trans->due_date = add_days($date, $trans->terms["days_before_due"]);
 	}
 }