X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=includes%2Fui%2Fui_view.inc;h=16da77e4ff5851fd06d7828abde4a33a0505ded2;hb=17b390efcf904072b02ec866b2a427490471a260;hp=f16e72f7cd809c585bed941447b3ddee9c87735d;hpb=fbf51ab0febfd0885620abcab8738339d156ff45;p=fa-stable.git

diff --git a/includes/ui/ui_view.inc b/includes/ui/ui_view.inc
index f16e72f7..16da77e4 100644
--- a/includes/ui/ui_view.inc
+++ b/includes/ui/ui_view.inc
@@ -210,7 +210,7 @@ function get_package_view_str($pkg, $label="", $icon=false, $class='', $id='')
 		$label = _("Info");
 //		$icon = ICON_GL;
 	}
-	return viewer_link($label, "includes/ui/view_package.php?id=$pkg", $class, $id, $icon);
+	return viewer_link($label, "admin/view/view_package.php?id=$pkg", $class, $id, $icon);
 }
 
 
@@ -272,7 +272,7 @@ function check_ui_refresh($name=null)
 //
 function exchange_rate_display($from_currency, $to_currency, $date_, $force_edit=false)
 {
-    global $Ajax, $xr_provider_authoritative;
+    global $Ajax, $SysPrefs;
 
 	$readonly = false;
 
@@ -299,7 +299,7 @@ function exchange_rate_display($from_currency, $to_currency, $date_, $force_edit
  					$rate = retrieve_exrate($currency, $date_);
 					if (!$rate)
 						display_warning(sprintf(_("Cannot retrieve exchange rate for currency %s. Please adjust approximate rate if needed."), $currency));
-					elseif ($xr_provider_authoritative) {
+					elseif ($SysPrefs->xr_provider_authoritative) {
 						// if the remote exrate is considered authoritative we can store the rate here,
 						// otherwise exrate will be stored during transaction write
 						$readonly = true;
@@ -337,7 +337,7 @@ function is_voided_display($type, $id, $label)
 	if ($void_entry == null)
 		return false;
 
-	start_table(TABLESTYLE, "width=50%");
+	start_table(TABLESTYLE, "width='50%'");
 	echo "<tr><td align=center><font color=red>$label</font><br>";
 	echo "<font color=red>" . _("Date Voided:") . " " . sql2date($void_entry["date_"]) . "</font><br>";
 	if (strlen($void_entry["memo_"]) > 0)
@@ -423,7 +423,8 @@ function display_debit_or_credit_cells($value, $bold=false)
 
 function display_customer_trans_tax_details($tax_items, $columns)
 {
-	global $alternative_tax_include_on_docs, $suppress_tax_rates;
+	global $SysPrefs;
+
 	$first = true;
     while ($tax_item = db_fetch($tax_items))
     {
@@ -431,13 +432,13 @@ function display_customer_trans_tax_details($tax_items, $columns)
      		continue;
 
     	$tax = number_format2($tax_item['amount'],user_price_dec());
-		if (isset($suppress_tax_rates) && $suppress_tax_rates == 1)
+		if ($SysPrefs->suppress_tax_rates() == 1)
 			$tax_type_name = $tax_item['tax_type_name'];
 		else
 			$tax_type_name = $tax_item['tax_type_name']." (".$tax_item['rate']."%) ";
     	if ($tax_item['included_in_price'])
     	{
-			if (isset($alternative_tax_include_on_docs) && $alternative_tax_include_on_docs == 1)
+			if ($SysPrefs->alternative_tax_include_on_docs() == 1)
   			{
   				if ($first)
   					label_row(_("Total Tax Excluded"), number_format2($tax_item['net_amount'], user_price_dec()),
@@ -542,7 +543,7 @@ function display_allocations($alloc_result, $total, $title, $show_summary=true)
 
     display_heading2($title);
 
-    start_table(TABLESTYLE, "width=80%");
+    start_table(TABLESTYLE, "width='80%'");
 
     $th = array( _("Type"), _("Number"), _("Date"), _("Total Amount"),
     	_("Left to Allocate"), _("This Allocation"));
@@ -888,13 +889,14 @@ function reset_focus()
 
 function get_js_date_picker()
 {
-    global $go_debug;
-    $fpath = company_path().'/js_cache/'.'date_picker.js';
+    global $SysPrefs, $tmonths;
 
-    if (!file_exists($fpath) || $go_debug) {
+    $fpath = user_js_cache().'/'.'date_picker.js';
 
-	global $dateseps, $date_system, $tmonths;
+    if (!file_exists($fpath) || $SysPrefs->go_debug) {
 
+	$date_system = $SysPrefs->date_system;
+	$dateseps = $SysPrefs->dateseps;
 	$how = user_date_format();				// 0 = us/ca, 1 = eu, au, nz, 2 = jp, sw
 	$sep = $dateseps[user_date_sep()];		// date separator
 	$wstart = (($date_system == 1 || $date_system == 2 || $date_system == 3) ? 6 : ($how == 0 || $how == 3 ? 0 : 1));	// weekstart (sun = 0, mon = 1)
@@ -1431,3 +1433,37 @@ function payment_link($name, $options)
 
 	return strtr($link, $patterns);
 }
+
+function trans_editor_link($type, $trans_no)
+{
+	global $path_to_root;
+
+	$editor_url = array(
+		ST_JOURNAL => "/gl/gl_journal.php?ModifyGL=Yes&trans_no=%d&trans_type=%d",
+		ST_BANKPAYMENT => "/gl/gl_bank.php?ModifyPayment=Yes&trans_no=%d&trans_type=%d",
+		ST_BANKDEPOSIT => "/gl/gl_bank.php?ModifyDeposit=Yes&trans_no=%d&trans_type=%d",
+	    ST_BANKTRANSFER => "/gl/bank_transfer.php?ModifyTransfer=Yes&trans_no=%d&trans_type=%d",
+    	ST_SALESINVOICE => "/sales/customer_invoice.php?ModifyInvoice=%d",
+		ST_CUSTCREDIT => "/sales/credit_note_entry.php?ModifyCredit=%d", // only for free hand credit notes (debtors_trans.order_==0)
+		ST_CUSTPAYMENT => "/sales/customer_payments.php?trans_no=%d",
+		ST_CUSTDELIVERY => "/sales/customer_delivery.php?ModifyDelivery=%d",
+//   16=> Location Transfer,
+//   17=> Inventory Adjustment,
+		ST_SUPPINVOICE => "/purchasing/supplier_invoice.php?ModifyInvoice=%d",
+		ST_SUPPCREDIT =>  "/purchasing/supplier_credit.php?ModifyCredit=%d",
+//   21=> Supplier Credit Note,
+//   22=> Supplier Payment,
+//   25=> Purchase Order Delivery,
+		ST_PURCHORDER => "/purchasing/po_entry_items.php?ModifyOrderNumber=%d",
+//   28=> Work Order Issue,
+//   29=> Work Order Production",
+		ST_WORKORDER => "/manufacturing/work_order_entry.php?trans_no=%d",
+		ST_SALESORDER => "/sales/sales_order_entry.php?ModifyOrderNumber=%d",
+		ST_SALESQUOTE => "/sales/sales_order_entry.php?ModifyQuotationNumber=%d",
+	//   35=> Cost Update,
+	);
+
+	return !isset($editor_url[$type]) ? '' :
+		(is_closed_trans($type, $trans_no) ? set_icon(ICON_CLOSED, _('Closed')) :
+			pager_link(_("Edit"), sprintf($editor_url[$type], $trans_no, $type), ICON_EDIT));
+}