X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=includes%2Fui%2Fui_view.inc;h=cc003088d2595ec51e8815823189b0f6a0534f8e;hb=fff85845ae2899b1dbf4a39df94d3e6f27a4fa7e;hp=03e343c38abbe0454d7452beb01b40be8e39932b;hpb=431531eebf3ba494002cfbf7ea36f9e82d4975c0;p=fa-stable.git

diff --git a/includes/ui/ui_view.inc b/includes/ui/ui_view.inc
index 03e343c3..cc003088 100644
--- a/includes/ui/ui_view.inc
+++ b/includes/ui/ui_view.inc
@@ -1,60 +1,60 @@
 <?php
-
+/**********************************************************************
+    Copyright (C) FrontAccounting, LLC.
+	Released under the terms of the GNU General Public License, GPL, 
+	as published by the Free Software Foundation, either version 3 
+	of the License, or (at your option) any later version.
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
+    See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
+***********************************************************************/
 include_once($path_to_root . "/admin/db/voiding_db.inc");
+include_once($path_to_root . "/includes/types.inc");
 
 //--------------------------------------------------------------------------------------
 
-function get_supplier_trans_view_str($type, $trans_no, $label="")
-{
-	global $path_to_root, $use_popup_windows;
-
-	$viewer = "";
-	if ($type == systypes::po())
-		$viewer = "view_po.php";
-	elseif ($type == 20)
-		$viewer = "view_supp_invoice.php";
-	elseif ($type == 21)
-		$viewer = "view_supp_credit.php";
-	elseif ($type == 22)
-		$viewer = "view_supp_payment.php";
-	elseif ($type == 25)
-		$viewer = "view_grn.php";
+function get_supplier_trans_view_str($type, $trans_no, $label="", $icon=false, 
+	$class='', $id='')
+{
+	$viewer = "purchasing/view/";
+	if ($type == ST_PURCHORDER)
+		$viewer .= "view_po.php";
+	elseif ($type == ST_SUPPINVOICE)
+		$viewer .= "view_supp_invoice.php";
+	elseif ($type == ST_SUPPCREDIT)
+		$viewer .= "view_supp_credit.php";
+	elseif ($type == ST_SUPPAYMENT)
+		$viewer .= "view_supp_payment.php";
+	elseif ($type == ST_SUPPRECEIVE)
+		$viewer .= "view_grn.php";
 	else
 		return null;
+	$viewer .= "?trans_no=$trans_no";
 
 	if ($label == "")
 		$label = $trans_no;
 
-	if ($viewer != "")
-	{
-		if ($use_popup_windows)
-			$preview_str = "<a target='_blank' href='$path_to_root/purchasing/view/$viewer?trans_no=$trans_no' onclick=\"javascript:openWindow(this.href,this.target); return false;\" >$label</a>";
-		else	
-			$preview_str = "<a target='_blank' href='$path_to_root/purchasing/view/$viewer?trans_no=$trans_no'>$label</a>";
-	}	
-	else
-		$preview_str = $label;
-
-	return $preview_str;
+	return viewer_link($label, $viewer, $class, $id,  $icon);
 }
 
 //--------------------------------------------------------------------------------------
 
-function get_gl_view_str($type, $trans_no, $label="", $force=false)
+function get_gl_view_str($type, $trans_no, $label="", $force=false, $class='', $id='')
 {
-	global $path_to_root, $use_popup_windows;
-
 	if (!$force && !user_show_gl_info())
 		return "";
 
+	$icon = false;
 	if ($label == "")
+	{
 		$label = _("GL");
-	if ($use_popup_windows)
-		$gl_view = "<a target='_blank' href='$path_to_root/gl/view/gl_trans_view.php?type_id=$type&trans_no=$trans_no' onclick=\"javascript:openWindow(this.href,this.target); return false;\" >$label</a>";
-	else
-		$gl_view = "<a target='_blank' href='$path_to_root/gl/view/gl_trans_view.php?type_id=$type&trans_no=$trans_no'>$label</a>";
+		$icon = ICON_GL;
+	}	
 
-	return $gl_view;
+	return viewer_link($label, 
+		"gl/view/gl_trans_view.php?type_id=$type&trans_no=$trans_no", 
+		$class, $id, $icon);
 }
 
 //--------------------------------------------------------------------------------------
@@ -68,223 +68,263 @@ function get_gl_view_str_cell($type, $trans_no, $label="")
 
 //--------------------------------------------------------------------------------------
 
-function get_customer_trans_view_str($type, $trans_no, $label="")
+function get_customer_trans_view_str($type, $trans_no, $label="", $icon=false, 
+	$class='', $id='')
 {
-	global $path_to_root, $use_popup_windows;
-
-	$viewer = "";
-	if ($type == 10)
-		$viewer = "view_invoice.php";
-	elseif ($type == 11)
-		$viewer = "view_credit.php";
-	elseif ($type == 12)
-		$viewer = "view_receipt.php";
-	elseif ($type == 30)
-		$viewer = "view_sales_order.php";
+	$viewer = "sales/view/";
+
+	if ($type == ST_SALESINVOICE)
+		$viewer .= "view_invoice.php";
+	elseif ($type == ST_CUSTCREDIT)
+		$viewer .= "view_credit.php";
+	elseif ($type == ST_CUSTPAYMENT)
+		$viewer .= "view_receipt.php";
+	elseif ($type == ST_CUSTDELIVERY)
+		$viewer .= "view_dispatch.php";
+	elseif ($type == ST_SALESORDER || $type == ST_SALESQUOTE)
+		$viewer .= "view_sales_order.php";
 	else
 		return null;
 
+  if(!is_array($trans_no)) $trans_no = array($trans_no);
+
+  $lbl = $label;
+  $preview_str = '';
+
+  foreach($trans_no as $trans) {
 	if ($label == "")
-		$label = $trans_no;
+		$lbl = $trans;
+	if($preview_str!='') $preview_str .= ',';
 
-	if ($viewer != "")
-	{
-		if ($use_popup_windows)
-			$preview_str = "<a target='_blank' href='$path_to_root/sales/view/$viewer?trans_no=$trans_no' onclick=\"javascript:openWindow(this.href,this.target); return false;\" >$label</a>";
-		else
-			$preview_str = "<a target='_blank' href='$path_to_root/sales/view/$viewer?trans_no=$trans_no'>$label</a>";
-	}		
-	else
-		$preview_str = $label;
+	$preview_str .= viewer_link($lbl, $viewer."?trans_no=$trans&trans_type=$type", 
+		$class, $id, $icon);
 
-	return $preview_str;
+  }
+  return $preview_str;
 }
 
 //--------------------------------------------------------------------------------------
 
-function get_banking_trans_view_str($type, $trans_no, $label="")
+function get_banking_trans_view_str($type, $trans_no, $label="", 
+	$icon=false, $class='', $id='')
 {
-	global $path_to_root, $use_popup_windows;
-
-	$viewer = "";
+	if ($label == "")
+		$label = $trans_no;
 
-	if ($type == 4)
+	if ($type == ST_BANKTRANSFER)
 		$viewer = "bank_transfer_view.php";
-	elseif ($type == 1)
+	elseif ($type == ST_BANKPAYMENT)
 		$viewer = "gl_payment_view.php";
-	elseif ($type == 2)
+	elseif ($type == ST_BANKDEPOSIT)
 		$viewer = "gl_deposit_view.php";
-	elseif ($type == 0)
-		$viewer = "";
 	else
 		return null;
 
-	if ($label == "")
-		$label = $trans_no;
-
-	if ($viewer != "")
-	{
-		if ($use_popup_windows)
-			$preview_str = "<a target='_blank' href='$path_to_root/gl/view/$viewer?trans_no=$trans_no' onclick=\"javascript:openWindow(this.href,this.target); return false;\" >$label</a>";
-		else	
-			$preview_str = "<a target='_blank' href='$path_to_root/gl/view/$viewer?trans_no=$trans_no'>$label</a>";
-	}		
-	else
-		$preview_str = $label;
-
-	return $preview_str;
+	return viewer_link($label, "gl/view/$viewer?trans_no=$trans_no", 
+		$class, $id,  $icon);
 }
 
 //--------------------------------------------------------------------------------------
 
-function get_inventory_trans_view_str($type, $trans_no, $label="")
+function get_inventory_trans_view_str($type, $trans_no, $label="", 
+	$icon=false, $class='', $id='')
 {
-	global $path_to_root, $use_popup_windows;
-
-	$viewer = "";
+	$viewer = "inventory/view/";
 
-	if ($type == systypes::inventory_adjustment())
-		$viewer = "view_adjustment.php";
-	elseif ($type == systypes::location_transfer())
-		$viewer = "view_transfer.php";
+	if ($type == ST_INVADJUST)
+		$viewer .= "view_adjustment.php";
+	elseif ($type == ST_LOCTRANSFER)
+		$viewer .= "view_transfer.php";
 	else
 		return null;
+	$viewer .= "?trans_no=$trans_no";
 
 	if ($label == "")
 		$label = $trans_no;
 
-	if ($viewer != "")
-	{
-		if ($use_popup_windows)
-			$preview_str = "<a target='_blank' href='$path_to_root/inventory/view/$viewer?trans_no=$trans_no' onclick=\"javascript:openWindow(this.href,this.target); return false;\" >$label</a>";
-		else	
-			$preview_str = "<a target='_blank' href='$path_to_root/inventory/view/$viewer?trans_no=$trans_no'>$label</a>";
-	}		
-	else
-		$preview_str = $label;
-
-	return $preview_str;
+	return viewer_link($label, $viewer, $class, $id,  $icon);
 }
 
 //--------------------------------------------------------------------------------------
 
-function get_manufacturing_trans_view_str($type, $trans_no, $label="")
+function get_manufacturing_trans_view_str($type, $trans_no, $label="", 
+	$icon=false, $class='', $id='')
 {
-	global $path_to_root, $use_popup_windows;
-
-	$viewer = "";
-
-	if ($type == 28)
-		$viewer = "wo_issue_view.php";
-	elseif ($type == 29)
-		$viewer = "wo_production_view.php";
-	elseif ($type == systypes::work_order())
-		$viewer = "work_order_view.php";
+	$viewer = "manufacturing/view/";
+
+	if ($type == ST_MANUISSUE)
+		$viewer .= "wo_issue_view.php";
+	elseif ($type == ST_MANURECEIVE)
+		$viewer .= "wo_production_view.php";
+	elseif ($type == ST_WORKORDER)
+		$viewer .= "work_order_view.php";
 	else
 		return null;
 
+	$viewer .= "?trans_no=$trans_no";
+
 	if ($label == "")
 		$label = $trans_no;
 
-	if ($viewer != "")
-	{
-		if ($use_popup_windows)
-			$preview_str = "<a target='_blank' href='$path_to_root/manufacturing/view/$viewer?trans_no=$trans_no' onclick=\"javascript:openWindow(this.href,this.target); return false;\" >$label</a>";
-		else	
-			$preview_str = "<a target='_blank' href='$path_to_root/manufacturing/view/$viewer?trans_no=$trans_no'>$label</a>";
-	}
-	else
-		$preview_str = $label;
-
-	return $preview_str;
+	return viewer_link($label, $viewer, $class, $id,  $icon);
 }
 
 //--------------------------------------------------------------------------------------
 
-function get_dimensions_trans_view_str($type, $trans_no, $label="")
+function get_dimensions_trans_view_str($type, $trans_no, $label="", $icon=false, 
+	$class='', $id='')
 {
-	global $path_to_root, $use_popup_windows;
+	if ($type == ST_DIMENSION)
+		$viewer = "dimensions/view/view_dimension.php?trans_no=$trans_no";
+	else
+		return null;
 
-	$viewer = "";
+	if ($label == "")
+		$label = $trans_no;
 
-	if ($type == 40)
-		$viewer = "view_dimension.php";
+	return viewer_link($label, $viewer, $class, $id,  $icon);
+}
+/*
+	Journal entry or cost update postings link
+*/
+function get_journal_trans_view_str($type, $trans_no, $label="", $icon=false, 
+	$class='', $id='')
+{
+	if ($type == ST_JOURNAL || $type == ST_COSTUPDATE)
+		$viewer = "gl/view/gl_trans_view.php?type_id=$type&trans_no=$trans_no";
 	else
 		return null;
 
 	if ($label == "")
 		$label = $trans_no;
 
-	if ($viewer != "")
-	{
-		if ($use_popup_windows)
-			$preview_str = "<a target='_blank' href='$path_to_root/dimensions/view/$viewer?trans_no=$trans_no' onclick=\"javascript:openWindow(this.href,this.target); return false;\" >$label</a>";
-		else	
-			$preview_str = "<a target='_blank' href='$path_to_root/dimensions/view/$viewer?trans_no=$trans_no'>$label</a>";
-	}		
-	else
-		$preview_str = $label;
+	return viewer_link($label, $viewer, $class, $id,  $icon);
+}
 
-	return $preview_str;
+//--------------------------------------------------------------------------------------
+
+function get_package_view_str($pkg, $label="", $icon=false, $class='', $id='')
+{
+	if ($label == "")
+	{
+		$label = _("Info");
+//		$icon = ICON_GL;
+	}
+	return viewer_link($label, "includes/ui/view_package.php?id=$pkg", $class, $id, $icon);
 }
 
+
 //--------------------------------------------------------------------------------------
 
-function get_trans_view_str($type, $trans_no, $label="")
+function get_trans_view_str($type, $trans_no, $label="", $icon=false, 
+	$class='', $id='')
 {
-	$view_str = get_customer_trans_view_str($type, $trans_no, $label);
+	$view_str = get_customer_trans_view_str($type, $trans_no, $label, $icon, $class, $id);
 	if ($view_str != null)
 		return $view_str;
 
-	$view_str = get_supplier_trans_view_str($type, $trans_no, $label);
+	$view_str = get_supplier_trans_view_str($type, $trans_no, $label, $icon, $class, $id);
 	if ($view_str != null)
 		return $view_str;
 
-	$view_str = get_banking_trans_view_str($type, $trans_no, $label);
+	$view_str = get_banking_trans_view_str($type, $trans_no, $label, $icon, $class, $id);
 	if ($view_str != null)
 		return $view_str;
 
-	$view_str = get_inventory_trans_view_str($type, $trans_no, $label);
+	$view_str = get_inventory_trans_view_str($type, $trans_no, $label, $icon, $class, $id);
 	if ($view_str != null)
 		return $view_str;
 
-	$view_str = get_manufacturing_trans_view_str($type, $trans_no, $label);
+	$view_str = get_manufacturing_trans_view_str($type, $trans_no, $label, $icon, $class, $id);
 	if ($view_str != null)
 		return $view_str;
 
-	$view_str = get_dimensions_trans_view_str($type, $trans_no, $label);
+	$view_str = get_dimensions_trans_view_str($type, $trans_no, $label, $icon, $class, $id);
+	if ($view_str != null)
+		return $view_str;
+
+	$view_str = get_journal_trans_view_str($type, $trans_no, $label, $icon, $class, $id);
 	if ($view_str != null)
 		return $view_str;
 
 	return null;
 }
 
-//--------------------------------------------------------------------------------------
+/*
+	Helper for ui drawing functions.
+	Checks whether any of input function parameters has changed or page is called with GET method (first page display).
+	$name - context
+*/
+function check_ui_refresh($name=null)
+{
+	$bt = debug_backtrace();
+	if (!$name)
+		$name = $bt[1]['function'];
+	$old = @$_SESSION['ui_context'][$name];
+	$new = $_SESSION['ui_context'][$name] = $bt[1]['args'];
+	return ($new != $old) || ($_SERVER['REQUEST_METHOD'] == 'GET');
+}
 
-function exchange_rate_display($from_currency, $to_currency, $date_, $buttons=true)
+//--------------------------------------------------------------------------------------
+// Displays currency exchange rate for given date.
+// When there is no exrate for today, 
+// gets it form ECB and stores in local database.
+//
+function exchange_rate_display($from_currency, $to_currency, $date_, $force_edit=false)
 {
+    global $Ajax, $xr_provider_authoritative;
+
+	$readonly = false;
+
 	if ($from_currency != $to_currency)
 	{
-		if ($buttons && isset($_POST['get_rate']))	
-		{
+	 	$rate = get_post('_ex_rate');
+	 	if (check_ui_refresh() || !$rate) { // readonly or ui context changed
 			$comp_currency = get_company_currency();
 			if ($from_currency == $comp_currency)
 				$currency = $to_currency;
 			else
 				$currency = $from_currency;
-			$rate = get_ecb_rate($currency);
-			if (get_date_exchange_rate($currency, $date_))
-				update_exchange_rate($currency, $date_, $rate, $rate);
-			else	
-				add_exchange_rate($currency, $date_, $rate, $rate);
-			if ($from_currency == $comp_currency)
-				$rate = 1 / $rate;
-		}	
-		else
-			$rate = get_exchange_rate_from_to($to_currency, $from_currency, $date_);
+
+			$rate = get_date_exchange_rate($currency, $date_); // try local
+
+			if ($rate)
+				$readonly = true; // if we have already local exrate keep it unchanged 
+
+			if (!$rate) {	// retry from remote service
+				$row = get_currency($currency);
+
+ 				if ($row['auto_update']) // autoupdate means use remote service & store exrate on first transaction.
+ 				{
+ 					$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) {
+						// if the remote exrate is considered authoritative we can store the rate here,
+						// otherwise exrate will be stored during transaction write
+						$readonly = true;
+						add_new_exchange_rate($currency, $date_, $rate);
+					}
+				}
+			}
+			if (!$rate)	{	// get and edit latest available
+				$rate = get_exchange_rate_from_home_currency($currency, $date_);
+			}
+			if ($from_currency != $comp_currency)
+				$rate = 1 / ($rate / get_exchange_rate_from_home_currency($to_currency, $date_));
+			$Ajax->activate('_ex_rate_span');
+		}
+
 		$rate = number_format2($rate, user_exrate_dec());
-    	label_row(_("Exchange Rate:"),"1 " . $from_currency . " = " .  $rate . " " . $to_currency .
-			($buttons?"  " . submit('get_rate',_("Get"), false):""));
+
+		if ($force_edit || !$readonly)
+			$ctrl = "<input type=\"text\" name=\"_ex_rate\" size=\"8\" maxlength=\"8\" value=\"$rate\">";
+	    else
+	    	$ctrl = "<span id=\"_ex_rate\">$rate</span>";
+
+		label_row(_("Exchange Rate:"), $span = "<span style='vertical-align:top;' id='_ex_rate_span'>$ctrl $from_currency = 1 $to_currency</span>" );
+
+	  	$Ajax->addUpdate('_ex_rate_span', '_ex_rate_span', $span);
 	}
 }
 
@@ -292,17 +332,16 @@ function exchange_rate_display($from_currency, $to_currency, $date_, $buttons=tr
 
 function is_voided_display($type, $id, $label)
 {
-	global $table_style;
 	$void_entry = get_voided_entry($type, $id);
 
 	if ($void_entry == null)
 		return false;
 
-	start_table("width=50% $table_style");
+	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)
-		echo "<center><font color=red>" . _("Memo:") . " " . $void_entry["memo_"] . "</font><br>";
+		echo "<center><font color=red>" . _("Memo:") . " " . $void_entry["memo_"] . "</font></center><br>";
 	echo "</td></tr>";
 	end_table(1);
 
@@ -314,12 +353,12 @@ function is_voided_display($type, $id, $label)
 function comments_display_row($type, $id)
 {
 	$comments = get_comments($type, $id);
-	if ($comments and db_num_rows($comments)) 
+	if ($comments and db_num_rows($comments))
 	{
 		echo "<tr><td colspan=15>";
-    	while ($comment = db_fetch($comments)) 
+    	while ($comment = db_fetch($comments))
     	{
-    		echo $comment["memo_"] . "<br>";
+    		echo nl2br($comment["memo_"]) . "<br>";
     	}
 		echo "</td></tr>";
 	}
@@ -331,7 +370,7 @@ function get_comments_string($type, $type_no)
 {
 	$str_return = "";
 	$result = get_comments($type, $type_no);
-	while ($comment = db_fetch($result)) 
+	while ($comment = db_fetch($result))
 	{
 		if (strlen($str_return))
 			$str_return = $str_return . " \n";
@@ -342,7 +381,7 @@ function get_comments_string($type, $type_no)
 
 //--------------------------------------------------------------------------------------
 
-function view_stock_status($stock_id, $description=null)
+function view_stock_status($stock_id, $description=null, $echo=true)
 {
 	global $path_to_root;
 	if ($description)
@@ -351,7 +390,9 @@ function view_stock_status($stock_id, $description=null)
 	else
 		//hyperlink_params_separate($path_to_root . "/inventory/inquiry/stock_status.php", $stock_id, "stock_id=$stock_id");
 		$preview_str = "<a target='_blank' href='$path_to_root/inventory/inquiry/stock_status.php?stock_id=$stock_id' onclick=\"javascript:openWindow(this.href,this.target); return false;\" >$stock_id</a>";
-	echo $preview_str;	
+	if($echo)
+		echo $preview_str;
+	return $preview_str;
 }
 
 function view_stock_status_cell($stock_id, $description=null)
@@ -363,23 +404,18 @@ function view_stock_status_cell($stock_id, $description=null)
 
 //--------------------------------------------------------------------------------------
 
-function display_debit_or_credit_cells($value)
+function display_debit_or_credit_cells($value, $bold=false)
 {
-	if ($value > 0)
+	$value = round2($value, user_price_dec());
+	if ($value >= 0)
 	{
-		amount_cell($value);
+		amount_cell($value, $bold);
 		label_cell("");
-	}	
+	}
 	elseif ($value < 0)
 	{
 		label_cell("");
-		amount_cell(abs($value));
-	}	
-	else
-	{
-		//label_cell("");
-		amount_cell(0);
-		label_cell("");
+		amount_cell(abs($value), $bold);
 	}
 }
 
@@ -387,15 +423,34 @@ function display_debit_or_credit_cells($value)
 
 function display_customer_trans_tax_details($tax_items, $columns)
 {
-    while ($tax_item = db_fetch($tax_items)) 
+	global $alternative_tax_include_on_docs, $suppress_tax_rates;
+	$first = true;
+    while ($tax_item = db_fetch($tax_items))
     {
+     	if (!$tax_item['amount'])
+     		continue;
+
     	$tax = number_format2($tax_item['amount'],user_price_dec());
+		if (isset($suppress_tax_rates) && $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'])
-        	label_row(_("Included") . " " . $tax_item['tax_type_name'] . " (" . $tax_item['rate'] . "%) " .
-        		_("Amount") . ": $tax", "", "colspan=$columns align=right", "align=right");
+    	{
+			if (isset($alternative_tax_include_on_docs) && $alternative_tax_include_on_docs == 1)
+  			{
+  				if ($first)
+  					label_row(_("Total Tax Excluded"), number_format2($tax_item['net_amount'], user_price_dec()),
+  						"colspan=$columns align=right", "align=right");
+        		label_row($tax_type_name, $tax, "colspan=$columns align=right", "align=right");
+        		$first = false;
+        	}
+        	else
+        		label_row(_("Included") . " " . $tax_type_name
+        			. ": $tax", "", "colspan=$columns align=right", "align=right");
+        }			
     	else
-        	label_row($tax_item['tax_type_name'] . " (" . $tax_item['rate'] . "%)",
-        		$tax, "colspan=$columns align=right", "align=right");
+        	label_row($tax_type_name, $tax, "colspan=$columns align=right", "align=right");
     }
 }
 
@@ -403,12 +458,15 @@ function display_customer_trans_tax_details($tax_items, $columns)
 
 function display_supp_trans_tax_details($tax_items, $columns)
 {
-    while ($tax_item = db_fetch($tax_items)) 
+    while ($tax_item = db_fetch($tax_items))
     {
+     	if (!$tax_item['amount'])
+     		continue;
+
     	$tax = number_format2(abs($tax_item['amount']),user_price_dec());
     	if ($tax_item['included_in_price'])
-        	label_row(_("Included") . " " . $tax_item['tax_type_name'] . " (" . $tax_item['rate'] . "%) " .
-        		_("Amount:") . ": $tax", "colspan=$columns align=right", "align=right");
+        	label_row(_("Included") . " " . $tax_item['tax_type_name'] . " (" . $tax_item['rate'] . "%) "
+        		. ": $tax", '', "colspan=$columns align=right", "align=right");
     	else
         	label_row($tax_item['tax_type_name'] . " (" . $tax_item['rate'] . "%)",
         		$tax, "colspan=$columns align=right", "align=right");
@@ -417,51 +475,75 @@ function display_supp_trans_tax_details($tax_items, $columns)
 
 //--------------------------------------------------------------------------------------
 
-function display_edit_tax_items($taxes, $columns)
+function display_edit_tax_items($taxes, $columns, $tax_included, $rightspan=0, $editable=false)
 {
 	$total = 0;
 
-    foreach ($taxes as $taxitem) 
-    {
-    	if ($taxitem['included_in_price']) 
-    	{
-        	label_row(_("Included") . " " . $taxitem['tax_type_name'] . " (" . $taxitem['rate'] . "%) " .
-        		_("Amount:") . " " . number_format2($taxitem['Value'],user_price_dec()), "", "colspan=$columns align=right", "align=right");
-    	} 
-    	else 
-    	{
-        	label_row($taxitem['tax_type_name'] . " (" . $taxitem['rate'] . "%)",
-        		number_format2($taxitem['Value'],user_price_dec()), "colspan=$columns align=right", "align=right");
-        	$total +=  $taxitem['Value'];
-    	}
-    }
-
-    return $total;
+    foreach ($taxes as $taxitem)
+	{
+		$amount = isset($taxitem['Override']) ? $taxitem['Override'] : $taxitem['Value'];
+		if ($taxitem['Value'] != 0){
+			if ($editable) {
+				if (!isset($_POST['mantax['.$taxitem['tax_type_id'].']']))
+					$_POST['mantax['.$taxitem['tax_type_id'].']'] = price_format($amount);
+				start_row();
+				if ($tax_included) {
+					$colspan = $columns-1;
+					label_cell(_("Included") . " " . $taxitem['tax_type_name'].":",
+						"colspan={$colspan} align='right'");
+					amount_cells(null, 'mantax['.$taxitem['tax_type_id'].']',
+						null, "colspan=$columns align=right", '<td></td>', user_price_dec());
+				} else {
+					label_cell($taxitem['tax_type_name'], "colspan=$columns align='right'");
+					amount_cells(null, 'mantax['.$taxitem['tax_type_id'].']',
+						null, "colspan=$columns align=right", null, user_price_dec());
+					$total +=  round2($amount, user_price_dec());
+				}
+				if ($rightspan)
+					label_cell('', "colspan ='$rightspan'");
+				end_row();
+			} else {
+				$value = number_format2($taxitem['Value'],user_price_dec());
+				if ($tax_included)
+				{
+					label_row(_("Included") . " " . $taxitem['tax_type_name']
+						. " " . $value , "", "colspan=$columns align=right", "align=right", $rightspan);
+				}
+				else
+				{
+					label_row($taxitem['tax_type_name'],
+						$value, "colspan=$columns align=right", "align=right", $rightspan);
+					$total +=  round2($taxitem['Value'], user_price_dec());
+				}
+			}
+		}
+	}
+	return $total;
 }
 
 //--------------------------------------------------------------------------------------
 
-function display_footer_exit()
+function display_footer_exit($space=2)
 {
-	global $path_to_root;
-	br(2);
-	end_page();
+	if ($space)
+		br($space);
+	end_page(false, false, true);
 	exit;
 }
 
 //--------------------------------------------------------------------------------------
 
-function display_allocations($alloc_result, $total)
+function display_allocations($alloc_result, $total, $payments=false)
 {
-	global $table_style;
+	global $systypes_array;
 
 	if (!$alloc_result || db_num_rows($alloc_result) == 0)
 		return;
 
-    display_heading2(_("Allocations"));
+    display_heading2(($payments ? _("Payments") : _("Allocations")));
+
+    start_table(TABLESTYLE, "width='80%'");
 
-    start_table("$table_style width=80%");
-    
     $th = array( _("Type"), _("Number"), _("Date"), _("Total Amount"),
     	_("Left to Allocate"), _("This Allocation"));
 	table_header($th);
@@ -472,12 +554,15 @@ function display_allocations($alloc_result, $total)
 
     	alt_table_row_color($k);
 
-    	label_cell(systypes::name($alloc_row['type']));
+    	label_cell($systypes_array[$alloc_row['type']]);
     	label_cell(get_trans_view_str($alloc_row['type'],$alloc_row['trans_no']));
     	label_cell(sql2date($alloc_row['tran_date']));
+    	$alloc_row['Total'] = round2($alloc_row['Total'], user_price_dec());
+    	$alloc_row['amt'] = round2($alloc_row['amt'], user_price_dec());
+    	if ($payments && ($alloc_row['type'] == ST_SUPPAYMENT || $alloc_row['type'] == ST_BANKPAYMENT || $alloc_row['type'] == ST_SUPPCREDIT))
+    		$alloc_row['Total'] = -$alloc_row['Total'];
     	amount_cell($alloc_row['Total']);
-    	//amount_cell($alloc_row['Total'] - $alloc_row['PrevAllocs'] - $alloc_row['amt']);
-    	amount_cell($alloc_row['Total'] - $alloc_row['amt']);
+   		amount_cell($alloc_row['Total'] - $alloc_row['amt']);
     	amount_cell($alloc_row['amt']);
     	end_row();
 
@@ -489,6 +574,7 @@ function display_allocations($alloc_result, $total)
 	end_row();
 	start_row();
     label_cell(_("Left to Allocate:"), "align=right colspan=5");
+    $total = round2($total, user_price_dec());
     amount_cell($total - $total_allocated);
     end_row();
 
@@ -499,301 +585,784 @@ function display_allocations($alloc_result, $total)
 
 function display_allocations_from($person_type, $person_id, $type, $type_no, $total)
 {
-	switch ($person_type) 
+	switch ($person_type)
 	{
-		case payment_person_types::customer() :
+		case PT_CUSTOMER :
 			$alloc_result = get_allocatable_to_cust_transactions($person_id, $type_no, $type);
 			display_allocations($alloc_result, $total);
 			return;
-		case payment_person_types::supplier() :
+		case PT_SUPPLIER :
 			$alloc_result = get_allocatable_to_supp_transactions($person_id, $type_no, $type);
 			display_allocations($alloc_result, $total);
 			return;
 	}
 }
 
-function get_js_go_back()
+//--------------------------------------------------------------------------------------
+
+function display_allocations_to($person_type, $person_id, $type, $type_no, $total)
 {
-	$js = "\n<script type=\"text/javascript\">\n"
-	 	. "<!--\n"
-		. "function goBack()\n"
-		. "{\n"
-		. "	if (window.history.length <= 1)\n"
-		. "	 window.close();\n"
-		. "	else\n"	
-		. "	 window.history.go(-1);\n"			
-		. "}\n"
-		. "-->\n"
-		. "</script>\n";
-	return $js;
-}	
+	switch ($person_type)
+	{
+		case PT_CUSTOMER :
+			$alloc_result = get_allocatable_from_cust_transactions($person_id, $type_no, $type);
+			display_allocations($alloc_result, $total, true);
+			return;
+		case PT_SUPPLIER :
+			$alloc_result = get_allocatable_from_supp_transactions($person_id, $type_no, $type);
+			display_allocations($alloc_result, $total, true);
+			return;
+	}
+}
+
+//--------------------------------------------------------------------------------------
+//
+//	Expands selected quick entry $id into GL posings and adds to cart.
+//		returns calculated amount posted to bank GL account.
+//
+function display_quick_entries(&$cart, $id, $base, $type, $descr='')
+{
+	$bank_amount = 0;
+	
+	if (!isset($id) || $id == null || $id == "")
+	{
+		display_error( _("No Quick Entries are defined."));
+		set_focus('totamount');
+	}
+	else
+	{
+		if ($type == QE_DEPOSIT)
+			$base = -$base;
+		if ($type != QE_SUPPINV)	// only one quick entry on journal/bank transaction
+			$cart->clear_items();
+		$qe = get_quick_entry($id);
+		if ($qe['bal_type'] == 1)
+		{
+			if ($qe['base_amount'] == 1.0) // monthly
+				$begin = begin_month($cart->tran_date);
+			else
+			{
+				if (is_account_balancesheet($qe['base_desc'])) // total
+					$begin = "";
+				else
+					$begin = begin_fiscalyear(); // from fiscalyear begin
+			}		
+			$base = get_gl_trans_from_to($begin, $cart->tran_date, $qe['base_desc']);
+				
+		}
+		if ($descr != '') $qe['description'] .= ': '.$descr;
+		$result = get_quick_entry_lines($id);
+		if (db_num_rows($result) == 0)
+		{
+			display_error( _("No Quick Entry lines are defined."));
+			set_focus('totamount');
+			return 0;
+		}	
+		$totrate = 0;
+		while ($row = db_fetch($result))
+		{
+			$qe_lines[] = $row;
+
+			switch (strtolower($row['action'])) {
+				case "t": // post taxes calculated on base amount
+				case "t+": // ditto & increase base amount
+				case "t-": // ditto & reduce base amount
+					if (substr($row['action'],0,1) != 'T') 
+						$totrate += get_tax_type_default_rate($row['dest_id']);
+			}
+		}
+		$first = true;
+		$taxbase = 0;
+		foreach($qe_lines as $qe_line)
+		{
+			switch (strtolower($qe_line['action'])) {
+				case "=": // post current base amount to GL account
+					$part = $base;
+					break;
+				case "a": // post amount to GL account and reduce base
+					$part = $qe_line['amount'];
+					break;
+				case "a+": // post amount to GL account and increase base
+					$part = $qe_line['amount']; $base += $part;
+					break;
+				case "a-": // post amount to GL account and reduce base
+					$part = $qe_line['amount']; $base -= $part;
+					break;
+				case "%":	// store acc*amount% to GL account
+					$part = round2($base * $qe_line['amount'] / 100, user_price_dec());
+					break;
+				case "%+":	// ditto & increase base amount
+					$part = round2($base * $qe_line['amount'] / 100, user_price_dec());
+					$base += $part;
+					break;
+				case "%-":	// ditto & reduce base amount
+					$part = round2($base * $qe_line['amount'] / 100, user_price_dec());
+					$base -= $part;
+					break;
+				case "t": // post taxes calculated on base amount
+				case "t+": // ditto & increase base amount
+				case "t-": // ditto & reduce base amount
+					if ($first)
+					{
+						$taxbase = $base/($totrate+100);
+						$first = false;
+					}
+
+					if (substr($qe_line['action'],0,1) != 'T') 
+						$part = $taxbase;
+					else
+						$part = $base/100;
+					$item_tax = get_tax_type($qe_line['dest_id']);
+					//if ($type == QE_SUPPINV && substr($qe_line['action'],0,1) != 'T')
+					if ($type == QE_SUPPINV)
+					{
+						$taxgroup = $cart->tax_group_id;
+						$rates = 0;
+						$res = get_tax_group_rates($cart->tax_group_id);
+						while ($row = db_fetch($res))
+							$rates += $row['rate'];
+						if ($rates == 0)
+							continue 2;
+					}
+					$tax = round2($part * $item_tax['rate'],  user_price_dec());
+					if ($tax==0) continue 2;
+					$gl_code = ($type == QE_DEPOSIT || ($type == QE_JOURNAL && $base < 0)) 
+						? $item_tax['sales_gl_code'] : $item_tax['purchasing_gl_code'];
+					if (!is_tax_gl_unique($gl_code)) {
+	   					display_error(_("Cannot post to GL account used by more than one tax type."));
+						break 2;
+					}
+					if ($type != QE_SUPPINV)
+						$cart->add_gl_item($gl_code, 
+							$qe_line['dimension_id'], $qe_line['dimension2_id'], 
+							$tax, $qe['description']);
+					else 
+					{
+						$acc_name = get_gl_account_name($gl_code);
+						$cart->add_gl_codes_to_trans($gl_code, 
+							$acc_name, $qe_line['dimension_id'], 
+							$qe_line['dimension2_id'], $tax, $qe['description']);
+					}
+					if (strpos($qe_line['action'], '+'))
+						$base += $tax;
+					elseif (strpos($qe_line['action'], '-'))
+						$base -= $tax;
+					continue 2;
+			}
+			if ($type != QE_SUPPINV)
+				$cart->add_gl_item($qe_line['dest_id'], $qe_line['dimension_id'],
+					$qe_line['dimension2_id'], $part, $qe['description']);
+			else 
+			{
+				$acc_name = get_gl_account_name($qe_line['dest_id']);
+				$cart->add_gl_codes_to_trans($qe_line['dest_id'], 
+					$acc_name, $qe_line['dimension_id'], 
+					$qe_line['dimension2_id'], $part, $qe['description']);
+			}
+		}
+	}	
+	return $bank_amount;
+}
+
+//--------------------------------------------------------------------------------------
+//
+//	Simple English version of number to words conversion.
+//
+function _number_to_words($number) 
+{ 
+    $Bn = floor($number / 1000000000); /* Billions (giga) */ 
+    $number -= $Bn * 1000000000; 
+    $Gn = floor($number / 1000000);  /* Millions (mega) */ 
+    $number -= $Gn * 1000000; 
+    $kn = floor($number / 1000);     /* Thousands (kilo) */ 
+    $number -= $kn * 1000; 
+    $Hn = floor($number / 100);      /* Hundreds (hecto) */ 
+    $number -= $Hn * 100; 
+    $Dn = floor($number / 10);       /* Tens (deca) */ 
+    $n = $number % 10;               /* Ones */
+
+    $res = ""; 
+
+    if ($Bn) 
+        $res .= _number_to_words($Bn) . " Billion"; 
+    if ($Gn) 
+        $res .= (empty($res) ? "" : " ") . _number_to_words($Gn) . " Million"; 
+    if ($kn) 
+        $res .= (empty($res) ? "" : " ") . _number_to_words($kn) . " Thousand"; 
+    if ($Hn) 
+        $res .= (empty($res) ? "" : " ") . _number_to_words($Hn) . " Hundred"; 
+
+    $ones = array("", "One", "Two", "Three", "Four", "Five", "Six", 
+        "Seven", "Eight", "Nine", "Ten", "Eleven", "Twelve", "Thirteen", 
+        "Fourteen", "Fifteen", "Sixteen", "Seventeen", "Eighteen", 
+        "Nineteen"); 
+    $tens = array("", "", "Twenty", "Thirty", "Fourty", "Fifty", "Sixty", 
+        "Seventy", "Eighty", "Ninety"); 
+
+    if ($Dn || $n) 
+    { 
+        if (!empty($res)) 
+            $res .= " and "; 
+        if ($Dn < 2) 
+            $res .= $ones[$Dn * 10 + $n]; 
+        else 
+        { 
+            $res .= $tens[$Dn]; 
+            if ($n) 
+                $res .= "-" . $ones[$n]; 
+        } 
+    } 
+
+    if (empty($res)) 
+        $res = "zero"; 
+    return $res; 
+} 
+
+function price_in_words($amount, $document=0)
+{
+	// use local price_in_words() if the hook is defined
+	$price = hook_price_in_words($amount, $document);
+	if ($price) 
+		return $price;
+
+	// Only usefor Remittance and Receipts as default
+	if (!($document == ST_SUPPAYMENT || $document == ST_CUSTPAYMENT || $document == ST_CHEQUE))
+		return "";
+	if ($amount < 0 || $amount > 999999999999)
+		return "";
+	$dec = user_price_dec();
+	if ($dec > 0)
+	{
+		$divisor = pow(10, $dec);
+        $frac = round2($amount - floor($amount), $dec) * $divisor;
+		$frac = sprintf("%0{$dec}d", round2($frac, 0));
+		$and = _("and");
+    	$frac = " $and $frac/$divisor";
+    }
+    else
+    	$frac = "";
+    return _number_to_words(intval($amount)) . $frac;
+}    
 
 function get_js_open_window($width, $height)
 {
-	$js = "\n<script type=\"text/javascript\">\n"
-	 	. "<!--\n"
-		. "function openWindow(url, title)\n"
+	$js ="function openWindow(url, title)\n"
 		. "{\n"
 		. " var left = (screen.width - $width) / 2;\n"
 		. " var top = (screen.height - $height) / 2;\n"
-		. " window.open(url, title, 'width=$width,height=$height,left='+left+',top='+top+',screenX='+left+',screenY='+top+',status=no,scrollbars=yes');\n"
-		. "}\n"
-		. "-->\n"
-		. "</script>\n";
+		. " return window.open(url, title, 'width=$width,height=$height,left='+left+',top='+top+',screenX='+left+',screenY='+top+',status=no,scrollbars=yes');\n"
+		. "}\n";
 	return $js;
 }
 
-function get_js_form_entry($edit_name, $sel_name, $next_name)
+/*
+  Setting focus on element $name in $form.
+  If $form<0 $name is element id.
+*/
+function set_focus($name, $form_no=0) {
+  global $Ajax;
+	$Ajax->addFocus(true, $name);
+    $_POST['_focus'] = $name;
+}
+//
+//	Set default focus on first field $name if not set yet
+//	Returns unique name if $name=null
+//	
+function default_focus($name=null, $form_no=0) {
+	static $next; 
+	if ($name==null) 
+		$name = uniqid('_el',true);
+    if (!isset($_POST['_focus'])) {
+	  set_focus($name);
+    }
+	return $name;
+}
+/*
+	Reset focus to next control element (e.g. link).
+*/
+function reset_focus()
 {
-	$js = "\n<script type=\"text/javascript\">\n"
-		. "<!--\n"
-		. "function recalcAccounts()\n"
-		. "{\n"
-		. "	var myForm = document.forms[0];\n"
-		. "	var len = myForm.$sel_name.length;\n"
-		. "	var txt;\n"
-		. "	var ac = myForm.$edit_name.value;\n"
-		. "	var i;\n"
-		. "	myForm.$sel_name.options[myForm.$sel_name.selectedIndex].selected = false;\n"
-		. "	for (i = 0; i < len; i++)\n"
-		. "	{\n"
-		. "		txt = myForm.$sel_name.options[i].text;\n"
-		. "		if (txt.indexOf(ac) == 0)\n"
-		. "		{\n"
-		. "			myForm.$sel_name.options[i].selected = true;\n"
-		. "			break;\n"
-		. "		}\n"
-		. "	}\n"
-		. "}\n"
-		. "function setAccount(p, s)\n"
-		. "{\n"
-		. "	var myForm = document.forms[0];\n"
-		. " if (p == 0 && myForm.$edit_name.value == \"\")\n"
-		. "		return true;\n"
-		. "	myForm.$edit_name.value = myForm.$sel_name.options[myForm.$sel_name.selectedIndex].value;\n"
-		. " if (s)\n"
-		. "  myForm.submit();\n"
-		. "	myForm.$next_name.focus();\n"
-		. "	return true;\n"
-		. "}\n"
-		. "-->\n"
-		. "</script>\n";
-	return $js;	
+	unset($_POST['_focus']);
 }
 
-function get_js_set_focus($name)
+function get_js_date_picker()
 {
-	$js = "\n<script type=\"text/javascript\">\n"
-		. "<!--\n"
-		. "function setFocus()\n"
-		. "{\n"
-		. "	document.forms[0].$name.focus();\n"
-		. "}\n"
-		. "-->\n"
-		. "</script>\n";
-	return $js;	
+    global $go_debug;
+    $fpath = company_path().'/js_cache/'.'date_picker.js';
+
+    if (!file_exists($fpath) || $go_debug) {
+
+	global $dateseps, $date_system, $tmonths;
+
+	$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)
+	$months = array(_("January"),_("February"),_("March"),_("April"),_("May"),_("June"),_("July"),_("August"),_("September"),_("October"),_("November"),_("December"));
+	$wdays = array(_("Su"),_("Mo"),_("Tu"),_("We"),_("Th"),_("Fr"),_("Sa"));
+	$wno = _("W"); // week no
+	$back = _("Back");
+	if ($date_system == 1)
+		list($cyear, $cmon, $cday) = gregorian_to_jalali(date("Y"), date("n"), date("j"));
+	elseif ($date_system == 2)
+		list($cyear, $cmon, $cday) = gregorian_to_islamic(date("Y"), date("n"), date("j"));
+
+
+	$js = "
+function positionInfo(object) {
+  var p_elm = object;
+  this.getElementLeft = getElementLeft;
+  function getElementLeft() {
+    var x = 0;
+    var elm;
+    if(typeof(p_elm) == 'object'){
+      elm = p_elm;
+    } else {
+      elm = document.getElementById(p_elm);
+    }
+    while (elm != null) {
+      x+= elm.offsetLeft;
+      elm = elm.offsetParent;
+    }
+    return parseInt(x);
+  }
+  this.getElementWidth = getElementWidth;
+  function getElementWidth(){
+    var elm;
+    if(typeof(p_elm) == 'object'){
+      elm = p_elm;
+    } else {
+      elm = document.getElementById(p_elm);
+    }
+    return parseInt(elm.offsetWidth);
+  }
+  this.getElementRight = getElementRight;
+  function getElementRight(){
+    return getElementLeft(p_elm) + getElementWidth(p_elm);
+  }
+  this.getElementTop = getElementTop;
+  function getElementTop() {
+    var y = 0;
+    var elm;
+    if(typeof(p_elm) == 'object'){
+      elm = p_elm;
+    } else {
+      elm = document.getElementById(p_elm);
+    }
+    while (elm != null) {
+      y+= elm.offsetTop;
+      elm = elm.offsetParent;
+    }
+    return parseInt(y);
+  }
+  this.getElementHeight = getElementHeight;
+  function getElementHeight(){
+    var elm;
+    if(typeof(p_elm) == 'object'){
+      elm = p_elm;
+    } else {
+      elm = document.getElementById(p_elm);
+    }
+    return parseInt(elm.offsetHeight);
+  }
+  this.getElementBottom = getElementBottom;
+  function getElementBottom(){
+    return getElementTop(p_elm) + getElementHeight(p_elm);
+  }
 }
+function CC() {
+  var calendarId = 'CC';
+  var currentYear = 0;
+  var currentMonth = 0;
+  var currentDay = 0;
+  var selectedYear = 0;
+  var selectedMonth = 0;
+  var selectedDay = 0;
+  var months = ['$months[0]','$months[1]','$months[2]','$months[3]','$months[4]','$months[5]','$months[6]','$months[7]','$months[8]','$months[9]','$months[10]','$months[11]'];
+  var wdays = ['$wdays[0]', '$wdays[1]', '$wdays[2]', '$wdays[3]', '$wdays[4]', '$wdays[5]', '$wdays[6]'];
+  var tmonths = ['$tmonths[0]','$tmonths[1]','$tmonths[2]','$tmonths[3]','$tmonths[4]','$tmonths[5]','$tmonths[6]','$tmonths[7]','$tmonths[8]','$tmonths[9]','$tmonths[10]','$tmonths[11]','$tmonths[12]'];
+  var dateField = null;
+  function getProperty(p_property){
+    var p_elm = calendarId;
+    var elm = null;
+    if(typeof(p_elm) == 'object'){
+      elm = p_elm;
+    } else {
+      elm = document.getElementById(p_elm);
+    }
+    if (elm != null){
+      if(elm.style){
+        elm = elm.style;
+        if(elm[p_property]){
+          return elm[p_property];
+        } else {
+          return null;
+        }
+      } else {
+        return null;
+      }
+    }
+  }
+  function setElementProperty(p_property, p_value, p_elmId){
+    var p_elm = p_elmId;
+    var elm = null;
+    if(typeof(p_elm) == 'object'){
+      elm = p_elm;
+    } else {
+      elm = document.getElementById(p_elm);
+    }
+    if((elm != null) && (elm.style != null)){
+      elm = elm.style;
+      elm[ p_property ] = p_value;
+    }
+  }
+  function setProperty(p_property, p_value) {
+    setElementProperty(p_property, p_value, calendarId);
+  }
+  function getDaysInMonth(year, month) {
+";
+	if ($date_system == 1)
+		$js .= "
+    return [31,31,31,31,31,31,30,30,30,30,30,(((((((year - ((year > 0) ? 474 : 473)) % 2820) + 474) + 38) * 682) % 2816) < 682 ? 30 : 29)][month-1];
+";
+	elseif ($date_system == 2)
+		$js .= "
+    return [30,29,30,29,30,29,30,29,30,29,30,(((((11 * year) + 14) % 30) < 11) ? 30 : 29)][month-1];
+";
+	else
+		$js .= "
+    return [31,((!(year % 4 ) && ( (year % 100 ) || !( year % 400 ) ))?29:28),31,30,31,30,31,31,30,31,30,31][month-1];
+";
+	$js .= "
+  }
+  function getDayOfWeek(year, month, day) {
+";
+	if ($date_system == 1 || $date_system == 2)
+	{
+		$js .= "
+	function mod(a, b)
+	{
+	    return a - (b * Math.floor(a / b));
+	}
+	function jwday(j)
+	{
+	    return mod(Math.floor((j + 1.5)), 7);
+	}
+";
+	if ($date_system == 1)
+		$js .= "
+    var epbase, epyear, t;
+    epbase = year - ((year >= 0) ? 474 : 473);
+    epyear = 474 + mod(epbase, 2820);
+    t = day + ((month <= 7) ? ((month - 1) * 31) : (((month - 1) * 30) + 6)) +
+      Math.floor(((epyear * 682) - 110) / 2816) + (epyear - 1) * 365 +
+      Math.floor(epbase / 2820) * 1029983 + (1948320.5 - 1);
+";
+	elseif ($date_system == 2)
+		$js .= "
+	var t;
+	t = Math.floor((11 * year + 3) / 30) + 354 * year + 30 * month -
+	  Math.floor((month - 1) / 2) + day + 1948440 - 385;
+";
+	$js .= "
+    return jwday(t);
+";
+	}
+	else
+		$js .= "
+    var date = new Date(year,month-1,day)
+    return date.getDay();
+";
+	$js .= "
+  }
+  this.clearDate = clearDate;
+  function clearDate() {
+    dateField.value = '';
+    hide();
+  }
+  this.getWeek = getWeek;
+  function getWeek(year, month, day) {
+";
+	if ($how == 0 || $how == 3)
+		$js .= "  day++;";
+	$js .= "
+    var date = new Date(year,month-1,day);
+    var D = date.getDay();
+    if(D == 0) D = 7;
+    date.setDate(date.getDate() + (4 - D));
+    var YN = date.getFullYear();
+    var ZBDoCY = Math.floor((date.getTime() - new Date(YN, 0, 1, -6)) / 86400000);
+    var WN = 1 + Math.floor(ZBDoCY / 7);
+    return WN;
+  }
+  this.setDate = setDate;
+  function setDate(year, month, day) {
+    if (dateField){
+";
+	if ($how < 3)
+		$js .= "
+      if (month < 10) {month = '0' + month;}
+      if (day < 10) {day = '0' + day;}
+";
+	else
+		$js .= "
+      month = tmonths[month];
+";
+	if ($how == 0 || $how == 3)
+		$js .= "
+      var dateString = month+'$sep'+day+'$sep'+year;
+";
+	elseif ($how == 1 || $how == 4)
+		$js .= "
+      var dateString = day+'$sep'+month+'$sep'+year;
+";
+	elseif ($how == 2 || $how == 5)
+		$js .= "
+      var dateString = year+'$sep'+month+'$sep'+day;
+";
+	$js .= "
+      dateField.value = dateString;
+	  setFocus(dateField.name);
+	if(dateField.getAttribute('aspect')=='cdate')
+      setElementProperty('color', (dateField.value==user.date ? 'black':'red'), dateField);
+	  if (dateField.className=='searchbox')
+	  	dateField.onblur();
+      hide();
+    }
+    return;
+  }
+  this.changeMonth = changeMonth;
+  function changeMonth(change) {
+    currentMonth += change;
+    currentDay = 0;
+    if(currentMonth > 12) {
+      currentMonth = 1;
+      currentYear++;
+    } else if(currentMonth < 1) {
+      currentMonth = 12;
+      currentYear--;
+    }
+    calendar = document.getElementById(calendarId);
+    calendar.innerHTML = calendarDrawTable();
+  }
+  this.changeYear = changeYear;
+  function changeYear(change) {
+    currentYear += change;
+    currentDay = 0;
+    calendar = document.getElementById(calendarId);
+    calendar.innerHTML = calendarDrawTable();
+  }
+  function getCurrentYear() {
+    var year = new Date().getYear();
+    if(year < 1900) year += 1900;
+    return year;
+  }
+  function getCurrentMonth() {
+    return new Date().getMonth() + 1;
+  }
+  function getCurrentDay() {
+    return new Date().getDate();
+  }
+  function calendarDrawTable() {
+    var dayOfMonth = 1;
+    var wstart = $wstart;
+    var wno = '&nbsp;$wno&nbsp;';
+    var validDay = 0;
+    var startDayOfWeek = getDayOfWeek(currentYear, currentMonth, dayOfMonth);
+    var daysInMonth = getDaysInMonth(currentYear, currentMonth);
+    var css_class = null; //CSS class for each day
+    var table = \"<table cellspacing='0' cellpadding='0' border='0'>\";
+    table += \"<tr class='header'>\";
+    table += \"  <td colspan='2' class='previous'><a href='javascript:changeCCMonth(-1);'>&lt;</a><br><a href='javascript:changeCCYear(-1);'>&laquo;</a></td>\";
+    table += \"  <td colspan='4' class='title'>\" + months[currentMonth-1] + \"<br>\" + currentYear + \"</td>\";
+    table += \"  <td colspan='2' class='next'><a href='javascript:changeCCMonth(1);'>&gt;</a><br><a href='javascript:changeCCYear(1);'>&raquo;</a></td>\";
+    table += \"</tr>\";
+    table += \"<tr>\";
+    table += \"<th class='weekno'>\"+wno+\"</th>\";
+    for (var n=0; n<7; n++)
+    	table += \"<th>\" + wdays[(wstart+n)%7]+\"</th>\";
+    table += \"</tr>\";
+    for(var week=0; week < 6; week++) {
+      table += \"<tr>\";
+      for(var n=0; n < 7; n++) {
+        dayOfWeek = (wstart+n)%7;
+        if(week == 0 && startDayOfWeek == dayOfWeek) {
+          validDay = 1;
+        } else if (validDay == 1 && dayOfMonth > daysInMonth) {
+          validDay = 0;
+        }
+        if (n==0)
+        {
+        	if (dayOfMonth > daysInMonth)
+          		table += \"<td class='empty'>&nbsp;</td>\";
+       		else
+       			table += \"<td class='weekno'>\"+getWeek(currentYear, currentMonth, dayOfMonth)+\"</td>\";
+        }
+        if(validDay) {
+          if (dayOfMonth == selectedDay && currentYear == selectedYear && currentMonth == selectedMonth) {
+            css_class = 'current';
+";
+	if ($date_system == 1 || $date_system == 2 || $date_system == 3)
+		$js .= "
+          } else if (dayOfWeek == 5) {
+";
+	else
+		$js .= "
+          } else if (dayOfWeek == 0 || dayOfWeek == 6) {
+";
+		$js .= "
+            css_class = 'weekend';
+          } else {
+            css_class = 'weekday';
+          }
+          table += \"<td><a class='\"+css_class+\"' href=\\\"javascript:setCCDate(\"+currentYear+\",\"+currentMonth+\",\"+dayOfMonth+\")\\\">\"+dayOfMonth+\"</a></td>\";
+          dayOfMonth++;
+        } else {
+          table += \"<td class='empty'>&nbsp;</td>\";
+        }
+      }
+      table += \"</tr>\";
+    }
+    table += \"<tr class='header'><th colspan='8' style='padding: 3px;text-align:center;'><a href='javascript:hideCC();'>$back</a></td></tr>\";
+    table += \"</table>\";
+    return table;
+  }
+  this.show = show;
+  function show(field) {
+    can_hide = 0;
+    if (dateField == field) {
+      return;
+    } else {
+      dateField = field;
+    }
+    if(dateField) {
+      try {
+        var dateString = new String(dateField.value);
+        var dateParts = dateString.split('$sep');
+";
+	if ($how == 0)
+		$js .= "
+        selectedMonth = parseInt(dateParts[0],10);
+        selectedDay = parseInt(dateParts[1],10);
+        selectedYear = parseInt(dateParts[2],10);
+";
+	elseif ($how == 1)
+		$js .= "
+        selectedDay = parseInt(dateParts[0],10);
+        selectedMonth = parseInt(dateParts[1],10);
+        selectedYear = parseInt(dateParts[2],10);
+";
+	elseif ($how == 2)
+		$js .= "
+        selectedYear = parseInt(dateParts[0],10);
+        selectedMonth = parseInt(dateParts[1],10);
+        selectedDay = parseInt(dateParts[2],10);
+";
+	elseif ($how == 3)
+		$js .= "
+        selectedDay = parseInt(dateParts[1],10);
+        selectedMonth = parseInt(tmonths.indexOf(dateParts[0]),10);
+        selectedYear = parseInt(dateParts[2],10);
+";
+	elseif ($how == 4)
+		$js .= "
+        selectedDay = parseInt(dateParts[0],10);
+        selectedMonth = parseInt(tmonths.indexOf(dateParts[1]),10);
+        selectedYear = parseInt(dateParts[2],10);
+";
+	else
+		$js .= "
+        selectedYear = parseInt(dateParts[0],10);
+        selectedMonth = parseInt(tmonths.indexOf(dateParts[1]),10);
+        selectedDay = parseInt(dateParts[2],10);
+";
+	$js .= "
+      } catch(e) {}
+    }
+    if (!(selectedYear && selectedMonth && selectedDay)) {
+";
+	if ($date_system == 1 || $date_system == 2)
+	{
+		$js .= "
+      selectedMonth = $cmon;
+      selectedDay = $cday;
+      selectedYear = $cyear;
+";
+	}
+	else
+	{
+		$js .= "
+      selectedMonth = getCurrentMonth();
+      selectedDay = getCurrentDay();
+      selectedYear = getCurrentYear();
+";
+	}
+	$js .= "
+    }
+    currentMonth = selectedMonth;
+    currentDay = selectedDay;
+    currentYear = selectedYear;
+    if(document.getElementById){
+      calendar = document.getElementById(calendarId);
+      calendar.innerHTML = calendarDrawTable(currentYear, currentMonth);
+      var fieldPos = new positionInfo(dateField);
+      var calendarPos = new positionInfo(calendarId);
+      var x = fieldPos.getElementLeft();
+      var y = fieldPos.getElementBottom();
+      setProperty('left', x + 'px');
+      setProperty('top', y + 'px');
+      setProperty('display', 'block');
+      if (document.all) {
+        setElementProperty('left', x + 'px', 'CCIframe');
+        setElementProperty('top', y + 'px', 'CCIframe');
+        setElementProperty('width', calendarPos.getElementWidth() + 'px', 'CCIframe');
+        setElementProperty('height', calendarPos.getElementHeight() + 'px', 'CCIframe');
+        setElementProperty('display', 'block', 'CCIframe');
+      }
+    }
+  }
+  this.hide = hide;
+  function hide() {
+    if(dateField) {
+      setProperty('display', 'none');
+      setElementProperty('display', 'none', 'CCIframe');
+      dateField = null;
+    }
+  }
+  this.visible = visible;
+  function visible() {
+    return dateField
+  }
+  this.can_hide = can_hide;
+  var can_hide = 0;
+}
+var cC = new CC();
+function date_picker(textField) {
+  cC.show(textField);
+}
+function hideCC() {
+  if (cC.visible()) {
+    cC.hide();
+  }
+}
+function setCCDate(year, month, day) {
+  cC.setDate(year, month, day);
+}
+function changeCCYear(change) {
+  cC.changeYear(change);
+}
+function changeCCMonth(change) {
+  cC.changeMonth(change);
+}
+document.write(\"<iframe id='CCIframe' src='javascript:false;' frameBorder='0' scrolling='no'></iframe>\");
+document.write(\"<div id='CC'></div>\");";
 
-function get_js_png_fix()
-{
-	$js = "<script type=\"text/javascript\">\n"
-		. "function fixPNG(myImage)\n" 
-		. "{\n"
-		. " var arVersion = navigator.appVersion.split(\"MSIE\")\n"
-		. " var version = parseFloat(arVersion[1])\n"
-    	. " if ((version >= 5.5) && (version < 7) && (document.body.filters))\n" 
-    	. " {\n"
-       	. "  var imgID = (myImage.id) ? \"id='\" + myImage.id + \"' \" : \"\"\n"
-	   	. "  var imgClass = (myImage.className) ? \"class='\" + myImage.className + \"' \" : \"\"\n"
-	   	. "  var imgTitle = (myImage.title) ?\n" 
-		. "    \"title='\" + myImage.title  + \"' \" : \"title='\" + myImage.alt + \"' \"\n"
-	   	. "  var imgStyle = \"display:inline-block;\" + myImage.style.cssText\n"
-	   	. "  var strNewHTML = \"<span \" + imgID + imgClass + imgTitle\n"
-        . "    + \" style=\\\"\" + \"width:\" + myImage.width\n" 
-        . "    + \"px; height:\" + myImage.height\n" 
-        . "    + \"px;\" + imgStyle + \";\"\n"
-        . "    + \"filter:progid:DXImageTransform.Microsoft.AlphaImageLoader\"\n"
-        . "    + \"(src=\'\" + myImage.src + \"\', sizingMethod='scale');\\\"></span>\"\n"
-	   	. "  myImage.outerHTML = strNewHTML\n"	  
-    	. " }\n"
-		. "}\n"
-		. "</script>\n";
-	return $js;
-}	
+     cache_js_file($fpath, $js);
+    }
+    add_js_ufile($fpath);
 
-function get_js_date_picker()
-{
-	global $dateseps, $path_to_root;
-	
-	$encoding = $_SESSION['language']->encoding;	// character encoding
-	$dir = $_SESSION['language']->dir;				// left to right, right to left
-	$how = user_date_format();						// 0 = us/ca, 1 = eu, au, nz, 2 = jp, sw
-	$sep = $dateseps[user_date_sep()];				// date separator
-	$wstart = ($how != 0);							// weekstart (sun = 0, mon = 1)
-	$width = 250;									// datepicker width
-	$height = 180;									// datepicker height
-	$path = "$path_to_root/themes/default/images/";	// path to images
-	$tbgcolor = "#4682b4"; 							// title backgrond
-	$tcolor = "white";								// title color
-	$wbgcolor = "#87cefa";							// weekdays background
-	$wcolor = "white";								// weekdays color
-	$cbgcolor = "#ffb6c1";							// current day background
-	$ebgcolor = "#dbeaf5";							// week-end background
-	$bgcolor = "white";								// normal background
-	$color = "darkblue";							// month day color
-	$gcolor = "#aaaaaa";							// prev/next month day color
-	$family = "tahoma,verdana";						// font-family
-	
-	$js = "\n<script type=\"text/javascript\">\n"
-		. "<!--\n"
-		. "function date_picker(nm, val) {\n"
-		. " var mons = ['"._('January')."', '"._('February')."', '"._('March')."', '"._('April')."', '"._('May')."', '"._('June')."',\n"
-		. "  '"._('July')."', '"._('August')."', '"._('Sebtember')."', '"._('October')."', '"._('November')."', '"._('December')."'];\n"
-		. " var wdays = ['"._('Su')."', '"._('Mo')."', '"._('Tu')."', '"._('We')."', '"._('Th')."', '"._('Fr')."', '"._('Sa')."'];\n"
-		. " var wstart = $wstart; // day of week starts from (normally 0 or 1)\n"
-		. " var _date = (val == null || val =='' ?  new Date() : str2dt(val));\n"
-		. " var _prev = new Date(_date);\n"
-		. " _prev.setMonth(_date.getMonth()-1);\n"
-		. " var _next = new Date(_date);\n"
-		. " _next.setMonth(_date.getMonth()+1);\n"
-		. " var _prevy = new Date(_date);\n"
-		. " _prevy.setFullYear(_date.getFullYear()-1);\n"
-		. " var _nexty = new Date(_date);\n"
-		. " _nexty.setFullYear(_date.getFullYear()+1);\n"
-		. " var _first = new Date(_date);\n"
-		. " _first.setDate(1);\n"
-		. " _first.setDate(1-(7+_first.getDay()-wstart)%7);\n"
-		. " var _last = new Date(_next);\n"
-		. " _last.setDate(0);\n"
-		. " var left = (screen.width - $width) / 2;\n"
-		. " var top = (screen.height - $height) / 2;\n"
-		. "	var buff = new String (\n"
-		. "\"<html dir='$dir'>\\n\"+\n"
-		. "\"<head>\\n\"+\n"
-		. "\"	<title>DatePicker</title>\\n\"+\n"
-		. "\"   <meta http-equiv='Content-type' content='text/html'; charset='$encoding'>\\n\"+\n"
-		. "\"	<style>\\n\"+\n"
-		. "\"	    body { background-color:$tbgcolor; margin:0; padding:0; font-family: $family; font-size: 13px; }\\n\"+\n"
-		. "\"	    select { font-size: 12px; }\\n\"+\n"
-		. "\"	    a { text-decoration: none; }\\n\"+\n"
-		. "\"	    a:hover { text-decoration: underline; }\\n\"+\n"
-		. "\"	    .tbg { background-color: $tbgcolor; color: $tcolor; font-size: 12px; font-weight: bold; text-align: center;}\\n\"+\n"
-		. "\"	    .wbg { background-color: $wbgcolor; color: $wcolor; font-size: 12px; text-align: right; }\\n\"+\n"
-		. "\"	    .cbg { background-color: $cbgcolor; font-size: 12px; text-align: right; }\\n\"+\n"
-		. "\"	    .ebg { background-color: $ebgcolor; font-size: 12px; text-align: right; }\\n\"+\n"
-		. "\"	    .bg { background-color: $bgcolor; font-size: 12px; text-align: right; }\\n\"+\n"
-		. "\"	    .c { color: $color; }\\n\"+\n"
-		. "\"	    .gc { color: $gcolor; }\\n\"+\n"
-		. "\"	</style>\\n\"+\n"
-		. "\"</head>\\n\"+\n"
-		. "\"<body>\\n\"+\n"
-		. "\"<table cellspacing=\\\"0\\\" border=\\\"0\\\" style=\\\"width:100%;\\\">\\n\"+\n"
-		. "\"<tr><td class=\\\"tbg\\\">\\n\"+\n"
-		. "\"<table cellspacing=\\\"1\\\" cellpadding=\\\"2\\\" border=\\\"0\\\" style=\\\"width:100%;\\\">\\n\"+\n"
-		. "\"<tr>\\n	<td class=\\\"tbg\\\"><a href=\\\"javascript:window.opener.date_picker('\"+\n"
-		. " nm+\"', '\"+ dt2dtstr(_prev)+\"');\\\">\"+\n"
-		. "\"<img src=\\\"".$path."prev.gif\\\" width=\\\"16\\\" height=\\\"16\\\" border=\\\"0\\\"\"+\n"
-		. "\" alt=\\\""._('previous month')."\\\"></a></td>\\n\"+\n"
-		. "\"	<td class=\\\"tbg\\\" colspan=\\\"5\\\">\"+\n"
-		. " mons[_date.getMonth()]+\"</td>\\n\"+\n"
-		. "\"	<td class=\\\"tbg\\\"><a href=\\\"javascript:window.opener.date_picker('\"\n"
-		. " +nm+\"', '\"+dt2dtstr(_next)+\"');\\\">\"+\n"
-		. "\"<img src=\\\"".$path."next.gif\\\" width=\\\"16\\\" height=\\\"16\\\" border=\\\"0\\\"\"+\n"
-		. "\" alt=\\\""._('next month')."\\\"></a></td>\\n</tr>\\n\"+\n"
-		. "\"<tr>\\n	<td class=\\\"tbg\\\"><a href=\\\"javascript:window.opener.date_picker('\"+\n"
-		. " nm+\"', '\"+ dt2dtstr(_prevy)+\"');\\\">\"+\n"
-		. "\"<img src=\\\"".$path."prev.gif\\\" width=\\\"16\\\" height=\\\"16\\\" border=\\\"0\\\"\"+\n"
-		. "\" alt=\\\""._('previous year')."\\\"></a></td>\\n\"+\n"
-		. "\"	<td class=\\\"tbg\\\" colspan=\\\"5\\\">\"+\n"
-		. " _date.getFullYear()+\"</td>\\n\"+\n"
-		. "\"	<td class=\\\"tbg\\\"><a href=\\\"javascript:window.opener.date_picker('\"\n"
-		. " +nm+\"', '\"+dt2dtstr(_nexty)+\"');\\\">\"+\n"
-		. "\"<img src=\\\"".$path."next.gif\\\" width=\\\"16\\\" height=\\\"16\\\" border=\\\"0\\\"\"+\n"
-		. "\" alt=\\\""._('next year')."\\\"></a></td>\\n</tr>\\n\"\n"
-		. ");\n"
-		. " var _current = new Date(_first);\n"
-		. " // weekdays titles\n"
-		. " buff += \"<tr>\\n\";\n"
-		. " for (var n=0; n<7; n++)\n"
-		. "  buff += \"	<td class=\\\"wbg\\\">\"+\n"
-		. " wdays[(wstart+n)%7]+\"</td>\\n\";\n"
-		. " // calendar table\n"
-		. " buff += \"</tr>\\n\";\n"
-		. " for (var i=0; i<6; i++) {\n"
-		. "  // row heder\n"
-		. "  buff += \"<tr>\\n\";\n"
-		. "  for (var n=0; n<7; n++) {\n"
-		. "   if (_current.getDate() == _date.getDate() &&\n"
-		. "    _current.getMonth() == _date.getMonth())\n"
-		. "    // current date\n"
-		. "	   buff += \"	<td class=\\\"cbg\\\">\";\n"
-		. "	  else if (_current.getDay() == 0 || _current.getDay() == 6)\n"
-		. "	   // weekend days\n"
-		. "    buff += \"	<td class=\\\"ebg\\\">\";\n"
-		. "   else\n"
-		. "    // working days of current month\n"
-		. "	   buff += \"	<td class=\\\"bg\\\">\";\n"
-		. "	  if (_current.getMonth() == _date.getMonth())\n"
-		. "    // days of current month\n"
-		. "    buff += \"<a href=\\\"javascript:window.opener.\"+nm+\n"
-		. "		\".value='\"+dt2dtstr(_current)+\"'; window.close();\\\">\"+\n"
-		. "		\"<span class=\\\"c\\\">\";\n"
-		. "   else\n" 
-		. "    // days of other months\n"
-		. "    buff += \"<a href=\\\"javascript:window.opener.\"+nm+\n"
-		. "		\".value='\"+dt2dtstr(_current)+\"'; window.close();\\\">\"+\n"
-		. "		\"<span class=\\\"gc\\\">\";\n"
-		. "   buff += _current.getDate()+\"</span></a></td>\\n\";\n"
-		. "   _current.setDate(_current.getDate()+1);\n"
-		. "  }\n"
-		. "  // row footer\n"
-		. "  buff += \"</tr>\\n\";\n"
-		. " }\n"
-		. " // picker footer\n"
-		. " buff +=\n"
-		. " \"</table>\\n\" +\n"
-		. " \"</tr>\\n</td>\\n</table>\\n\" +\n"
-		. " \"</body>\\n\" +\n"
-		. " \"</html>\\n\";\n"
-		. "	var picker = window.open('', 'DatePicker',\n" 
-		. "  'width=$width,height=$height,status=no,resizable=yes,top='+top+',left='+left+'');\n"
-		. " picker.opener = self;\n"
-		. " var _doc = picker.document;\n"
-		. " _doc.write (buff);\n"
-		. " _doc.close();\n"
-		. "}\n"
-		. "// datetime parsing and formatting routimes. modify them if you wish other datetime format\n"
-		. "function str2dt (val) {\n"
-		. " var re_date = /^(\\d+)\\".$sep."(\\d+)\\".$sep."(\\d+)+$/;\n"
-		. " if (!re_date.exec(val))\n"
-		. "  return alert('"._('Invalid Datetime format').": '+ val);\n";
-	if ($how == 0)	
-		$js .= " return (new Date (RegExp.$3, RegExp.$1-1, RegExp.$2));\n";
-	elseif ($how == 1)		
-		$js .= " return (new Date (RegExp.$3, RegExp.$2-1, RegExp.$1));\n";
-	else	
-		$js .= " return (new Date (RegExp.$1, RegExp.$2-1, RegExp.$3));\n";
-	$js .= "}\n"
-		. "function dt2dtstr (_date) {\n"
-		. " var da = new String(_date.getDate());\n"
-		. " var mo = new String(_date.getMonth()+1);\n"
-		. " var yr = _date.getFullYear();\n"
-		. " if (da.length < 2)\n"
-		. "  da = '0'+da;\n"
-		. " if (mo.length < 2)\n"
-		. "  mo = '0'+mo;\n";
-	if ($how == 0)	
-		$js .= " return (new String (mo+'$sep'+da+'$sep'+yr));\n";
-	elseif ($how == 1)	
-		$js .= " return (new String (da+'$sep'+mo+'$sep'+yr));\n";
-	else	
-		$js .= " return (new String (yr+'$sep'+mo+'$sep'+da));\n";
-	$js .= "}\n"
-		. "-->\n"
-		. "</script>\n";
-	return $js;	
+ return '';
 }
-	
+
 function alert($msg)
 {
 	echo "\n<script type=\"text/javascript\">\n"
@@ -801,19 +1370,65 @@ function alert($msg)
 		. "alert('$msg');\n"
 		. "-->\n"
 		. "</script>\n";
-}		
+}
 
-if (!function_exists('_vd')) 
+if (!function_exists('_vd'))
 {
-  	function _vd($mixed, $title = '', $exit = false) 
+  	function _vd($mixed, $title = '', $exit = false)
   	{
-    	// Only the site admin is able to proceed here.
-    	echo (!empty($title) ? ($title .':') : '') .'<pre>';
-    	var_dump($mixed);
-    	echo "</pre>\n";
-    	if ($exit) 
+    	$str = (!empty($title) ? ($title .':') : '') .'<pre>';
+    	$str .= print_r($mixed, true); //var_dump($mixed);
+    	$str .= "</pre>\n";
+		display_notification('<table><tr><td>'.$str.'</td></tr></table>');
+    	if ($exit)
     		exit;
   	}
 }
 
+function _vl($mixed, $title = '', $exit = false)
+{
+	error_log((!empty($title) ? ($title .':') : '') . var_export($mixed, true));
+	if ($exit)
+		exit;
+}
+
+function display_backtrace($cond=true, $msg='') {
+	if ($cond) {
+		if ($msg) 
+			$str = "<center><span class='headingtext'>$msg</span></center>\n";
+		else
+			$str = '';
+		$str .= get_backtrace(true);
+   		display_error($str);
+	}
+}
+
+//
+// FIXME: $payment_services array will be moved to bank_accounts in 2.4.x
+//
+if (!isset($payment_services))
+{
+	$payment_services = array(
+		'PayPal' => "https://www.paypal.com/xclick?business=<company_email>&item_name=<comment>&amount=<amount>&currency_code=<currency>",
+	);
+}
+/*
+*	Payment link generation. Options provided during invoice generation:
+*	company_email, comment, amount, currency
+*/
+function payment_link($name, $options)
+{
+	global $payment_services;
+
+	$link = @$payment_services[$name];
+
+	if (!$link) return null;
+
+	$patterns = array();
+	foreach ($options as $id => $option)
+		$patterns['<'.$id.'>'] = urlencode($options[$id]);
+
+	return strtr($link, $patterns);
+}
+
 ?>
\ No newline at end of file