X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;ds=inline;f=includes%2Fui%2Fui_view.inc;h=0832c3f35ed1ef5a261acd34d7d4716b3080c461;hb=013ea39b39e3804a662db8e84761999281ce0230;hp=3a47f128f7937b9590b2c6c67cdc69dff3358ba9;hpb=f63c58475b057c9f4a05894a6935ea351b6d7af3;p=fa-stable.git
diff --git a/includes/ui/ui_view.inc b/includes/ui/ui_view.inc
index 3a47f128..0832c3f3 100644
--- a/includes/ui/ui_view.inc
+++ b/includes/ui/ui_view.inc
@@ -1,6 +1,7 @@
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 . " = " . $rate . " " . $to_currency .
+ ($buttons?" " . submit('get_rate',_("Get"), false, true):""));
+ if($buttons) {
+ $Ajax->addUpdate('get_rate','_ex_rate', $rate);
+ }
}
}
@@ -312,7 +319,7 @@ function is_voided_display($type, $id, $label)
echo "
$label ";
echo "" . _("Date Voided:") . " " . sql2date($void_entry["date_"]) . " ";
if (strlen($void_entry["memo_"]) > 0)
- echo "" . _("Memo:") . " " . $void_entry["memo_"] . " ";
+ echo "" . _("Memo:") . " " . $void_entry["memo_"] . " ";
echo " |
";
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\n";
- return $js;
-}
-
function get_js_open_window($width, $height)
{
$js = "\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'])) {
+ $_POST['_focus'] = $name;
+ }
}
function get_js_png_fix()
@@ -609,15 +592,16 @@ function get_js_date_picker()
$fpath = $comp_path.'/'.user_company().'/js_cache/'.'date_picker.js';
$js = "
";
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
@@ -640,6 +624,7 @@ function get_js_date_picker()
$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"));
@@ -818,6 +803,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) {
@@ -877,6 +877,7 @@ function CC() {
function calendarDrawTable() {
var dayOfMonth = 1;
var wstart = $wstart;
+ var wno = ' $wno ';
var validDay = 0;
var startDayOfWeek = getDayOfWeek(currentYear, currentMonth, dayOfMonth);
var daysInMonth = getDaysInMonth(currentYear, currentMonth);
@@ -884,10 +885,11 @@ function CC() {
var table = \"\";
table += \"\";
table += \"\";
+ table += \"\"+wno+\" | \";
for (var n=0; n<7; n++)
table += \"\" + wdays[(wstart+n)%7]+\" | \";
table += \"
\";
@@ -900,6 +902,13 @@ function CC() {
} else if (validDay == 1 && dayOfMonth > daysInMonth) {
validDay = 0;
}
+ if (n==0)
+ {
+ if (dayOfMonth > daysInMonth)
+ table += \" | \";
+ else
+ table += \"\"+getWeek(currentYear, currentMonth, dayOfMonth)+\" | \";
+ }
if(validDay) {
if (dayOfMonth == selectedDay && currentYear == selectedYear && currentMonth == selectedMonth) {
css_class = 'current';
@@ -925,7 +934,7 @@ function CC() {
}
table += \"\";
}
- table += \"\";
+ table += \"\";
table += \"
\";
return table;
}
@@ -1042,107 +1051,12 @@ document.write(\"