X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=includes%2Fui%2Fui_view.inc;h=65a9f39341ab8cfcb491ee0aa7b9857d678ff006;hb=c935a4090e3f152dd5549217d69b5b5036197024;hp=9f0e445092c0f99f8ad9eb1965788eed1fb705f3;hpb=15adf0b69c4d0c07d6dcf07e104a73595bc113b0;p=fa-stable.git

diff --git a/includes/ui/ui_view.inc b/includes/ui/ui_view.inc
index 9f0e4450..65a9f393 100644
--- a/includes/ui/ui_view.inc
+++ b/includes/ui/ui_view.inc
@@ -1,6 +1,7 @@
 <?php
 
 include_once($path_to_root . "/admin/db/voiding_db.inc");
+include_once($path_to_root . "/includes/types.inc");
 
 //--------------------------------------------------------------------------------------
 
@@ -273,6 +274,8 @@ function get_trans_view_str($type, $trans_no, $label="")
 
 function exchange_rate_display($from_currency, $to_currency, $date_, $buttons=true)
 {
+    global $Ajax;
+    $hint = _('Get daily ECB exchange rate and save for later use in invoicing process');
 	if ($from_currency != $to_currency)
 	{
 		if ($buttons && isset($_POST['get_rate']))
@@ -289,12 +292,16 @@ function exchange_rate_display($from_currency, $to_currency, $date_, $buttons=tr
 				add_exchange_rate($currency, $date_, $rate, $rate);
 			if ($from_currency == $comp_currency)
 				$rate = 1 / $rate;
+			$Ajax->activate('get_rate');
 		}
 		else
 			$rate = get_exchange_rate_from_to($to_currency, $from_currency, $date_);
 		$rate = number_format2($rate, user_exrate_dec());
-    	label_row(_("Exchange Rate:"),"1 " . $from_currency . " = " .  $rate . " " . $to_currency .
-			($buttons?"  " . submit('get_rate',_("Get"), false):""));
+    	label_row(_("Exchange Rate:"),"1 " . $from_currency . " = <span id='_ex_rate'>" . $rate . "</span> " . $to_currency .
+		($buttons?"  " . submit('get_rate',_("Get"), false, $hint, true):""));
+	    if($buttons) {
+		  $Ajax->addUpdate('get_rate','_ex_rate', $rate);
+		}
 	}
 }
 
@@ -312,7 +319,7 @@ function is_voided_display($type, $id, $label)
 	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);
 
@@ -453,7 +460,6 @@ function display_edit_tax_items($taxes, $columns, $tax_included, $leftspan=0)
 
 function display_footer_exit()
 {
-	global $path_to_root;
 	br(2);
 	end_page();
 	exit;
@@ -522,22 +528,6 @@ function display_allocations_from($person_type, $person_id, $type, $type_no, $to
 	}
 }
 
-function get_js_go_back()
-{
-	$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;
-}
-
 function get_js_open_window($width, $height)
 {
 	$js = "\n<script type=\"text/javascript\">\n"
@@ -546,62 +536,29 @@ function get_js_open_window($width, $height)
 		. "{\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"
+		. " return 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 $js;
 }
 
-function get_js_form_entry($edit_name, $sel_name, $next_name)
-{
-	$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;
+/*
+  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;
 }
-
-function get_js_set_focus($name)
-{
-	$js = "\n<script type=\"text/javascript\">\n"
-		. "<!--\n"
-		. "function setFocus()\n"
-		. "{\n"
-		. "	document.forms[0].$name.focus();\n"
-		. "}\n"
-		. "-->\n"
-		. "</script>\n";
-	return $js;
+//
+//	Set default focus on first field $name if not set yet
+//
+function default_focus($name, $form_no=0) {
+    if (!isset($_POST['_focus'])) {
+	  set_focus($name);
+    }
 }
 
 function get_js_png_fix()
@@ -633,29 +590,20 @@ function get_js_png_fix()
 
 function get_js_date_picker()
 {
-	global $dateseps, $date_system;
-
-	$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) ? 6 : ($how == 0 ? 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"));
-	$back = _("Back");
-	if ($date_system == 1)
-		list($cyear, $cmon, $cday) = gregorian_to_jalali(date("Y"), date("n"), date("j"));
-	else if ($date_system == 2)
-		list($cyear, $cmon, $cday) = gregorian_to_islamic(date("Y"), date("n"), date("j"));
+    global $comp_path;
+    $fpath = $comp_path.'/'.user_company().'/js_cache/'.'date_picker.js';
 
 	$js = "<style>
-#CCIFrame { display: none; left: 0px; position: absolute; top: 0px; height: 250px; width: 250px; z-index: 99;}
+#CCIframe { display: none; left: 0px; position: absolute; top: 0px; height: 250px; width: 270px; z-index: 99;}
 #CC { position:absolute; background-color:#FFF; margin:0; padding:0; display:none; z-index: 100;}
 #CC table { font-family: arial, verdana, helvetica, sans-serif;font-size: 8pt; border-left: 1px solid #336; border-right: 1px solid #336;}
-#CC th { font-weight: normal;}
+#CC th { font-weight: normal; text-align: center;}
 #CC th a { font-weight: normal; text-decoration: none; color: #FFF; padding: 1px;}
 #CC td { text-align: center;}
 #CC .header { background-color: #336;}
 #CC .weekday { background-color: #DDD; color: #000;}
 #CC .weekend { background-color: #FFC; color: #000;}
+#CC .weekno { background-color: #c0daf8; color: #555;}
 #CC .current { border: 1px solid #339; background-color: #336; color: #FFF;}
 #CC .weekday,#CC .weekend,#CC .current { display: block; text-decoration: none; border: 1px solid #FFF; width: 2em;}
 #CC .weekday:hover,#CC .weekend:hover,#CC .current:hover { color: #FFF; background-color: #336; border: 1px solid #999;}
@@ -667,8 +615,26 @@ function get_js_date_picker()
 #CC .empty { background-color: #CCC; border: 1px solid #FFF;}
 </style>
 ";
-	$js .= "<script type=\"text/javascript\">
-<!--\n
+    add_js_source($js);
+
+    if (!file_exists($fpath)) {
+
+	global $dateseps, $date_system;
+
+	$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) ? 6 : ($how == 0 ? 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"));
+	else if ($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;
@@ -839,6 +805,21 @@ function CC() {
     dateField.value = '';
     hide();
   }
+  this.getWeek = getWeek;
+  function getWeek(year, month, day) {
+";
+	if ($how == 0)
+		$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) {
@@ -898,6 +879,7 @@ function CC() {
   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);
@@ -905,10 +887,11 @@ function CC() {
     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='3' class='title'>\" + months[currentMonth-1] + \"<br>\" + currentYear + \"</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>\";
@@ -921,6 +904,13 @@ function CC() {
         } 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';
@@ -946,7 +936,7 @@ function CC() {
       }
       table += \"</tr>\";
     }
-    table += \"<tr class='header'><th colspan='7' style='padding: 3px;'><a href='javascript:hideCC();'>$back</a></td></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;
   }
@@ -1060,79 +1050,13 @@ 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>\");
--->
-</script>
-";
-	return $js;
-}
-//
-//	Javascript conversions to/from user numeric format.
-//
-function add_js_user_num() {
-	global $thoseps, $decseps;
-	$ts = $thoseps[user_tho_sep()];
-	$ds = $decseps[user_dec_sep()];
-
-	$js =
-	"<script language=\"javascript\">
-function price_format(post, num, dec) {
-	//num = num.toString().replace(/\\$|\\,/g,'');
-	if(isNaN(num))
-		num = \"0\";
-	sign = (num == (num = Math.abs(num)));
-	if(dec<0) dec = 2;
-	decsize = Math.pow(10, dec);
-	num = Math.floor(num*decsize+0.50000000001);
-	cents = num%decsize;
-	num = Math.floor(num/decsize).toString();
-	for( i=cents.toString().length; i<dec; i++){
-		cents = \"0\" + cents;
-	}
-	for (var i = 0; i < Math.floor((num.length-(1+i))/3); i++)
-		num = num.substring(0,num.length-(4*i+3))+'".$ts."'+
-			num.substring(num.length-(4*i+3));
-	 num = ((sign)?'':'-') + num;
-	 if(dec!=0) num = num + '".$ds."' + cents;
-	document.getElementsByName(post)[0].value = num;
-	}
-	function get_amount(doc) {
-		var val = document.getElementsByName(doc)[0].value;
-		val = val.replace(/\\".$ts."/g,'');
-		val = val.replace(/\\".$ds."/g,'.');
-		return 1*val;
-	}
-	</script>";
-  add_js_source($js);
-}
+document.write(\"<div id='CC'></div>\");";
 
-function add_js_allocate() {
-	$source =
-	"<script>
-	function allocate_all(doc) {
-	var alloc = get_amount('left_to_allocate');
-	var amount = get_amount('amount'+doc);
-	var unallocated = get_amount('un_allocated'+doc);
-	if(unallocated<amount) amount = unallocated;
-	if((unallocated-amount)<=alloc){
-		alloc-=unallocated-amount;
-	amount=unallocated;
-	}else{
-	amount=amount+alloc;
-	alloc=0;
-	}
-	price_format('amount'+doc, amount, ".user_price_dec().");
-	price_format('left_to_allocate', alloc, ".user_price_dec().");
-	}
-	function allocate_none(doc) {
-	amount = get_amount('amount'+doc);
-	left = get_amount('left_to_allocate');
-	price_format('left_to_allocate',amount+left, ".user_price_dec().");
-	price_format('amount'+doc, 0, ".user_price_dec().");
-	}
-	</script>";
-	add_js_user_num();
-	add_js_source($source);
+     cache_js_file($fpath, $js);
+    }
+    add_js_ufile($fpath);
+
+ return '';
 }
 
 function alert($msg)