X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=includes%2Fui%2Fui_view.inc;h=2b0905c08e4db3bcfe493cb9bb5b2899ac8ef63d;hb=e1face140a007355cdeea1725c02d10cb34c80dd;hp=6c893e0f7f12fa9f2bf98f2d6629061393203e30;hpb=be2f084444559f98377583ea35807a4c672122c6;p=fa-stable.git diff --git a/includes/ui/ui_view.inc b/includes/ui/ui_view.inc index 6c893e0f..2b0905c0 100644 --- a/includes/ui/ui_view.inc +++ b/includes/ui/ui_view.inc @@ -1,12 +1,22 @@ . +***********************************************************************/ 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="") +function get_supplier_trans_view_str($type, $trans_no, $label="", $icon=false) { - global $path_to_root, $use_popup_windows; + global $path_to_root; $viewer = ""; if ($type == systypes::po()) @@ -27,10 +37,10 @@ function get_supplier_trans_view_str($type, $trans_no, $label="") if ($viewer != "") { - if ($use_popup_windows) - $preview_str = "$label"; - else - $preview_str = "$label"; + $pars = access_string($label); + if (user_graphic_links() && $icon) + $pars[0] = set_icon($icon, $pars[0]); + $preview_str = "$pars[0]"; } else $preview_str = $label; @@ -42,17 +52,21 @@ function get_supplier_trans_view_str($type, $trans_no, $label="") function get_gl_view_str($type, $trans_no, $label="", $force=false) { - global $path_to_root, $use_popup_windows; + global $path_to_root; if (!$force && !user_show_gl_info()) return ""; + $icon = false; if ($label == "") + { $label = _("GL"); - if ($use_popup_windows) - $gl_view = "$label"; - else - $gl_view = "$label"; + $icon = ICON_GL; + } + $pars = access_string($label); + if (user_graphic_links() && $icon) + $pars[0] = set_icon($icon, $pars[0]); + $gl_view = "$pars[0]"; return $gl_view; } @@ -68,9 +82,9 @@ 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) { - global $path_to_root, $use_popup_windows; + global $path_to_root; $viewer = ""; if ($type == 10) @@ -90,18 +104,18 @@ function get_customer_trans_view_str($type, $trans_no, $label="") $lbl = $label; $preview_str = ''; + foreach($trans_no as $trans) { if ($label == "") $lbl = $trans; - if($preview_str!='') $preview_str .= ','; if ($viewer != "") { - if ($use_popup_windows) - $preview_str .= "$lbl"; - else - $preview_str .= "$lbl"; + $pars = access_string($lbl); + if (user_graphic_links() && $icon) + $pars[0] = set_icon($icon, $pars[0]); + $preview_str .= "$pars[0]"; } else $preview_str .= $lbl; @@ -112,9 +126,9 @@ function get_customer_trans_view_str($type, $trans_no, $label="") //-------------------------------------------------------------------------------------- -function get_banking_trans_view_str($type, $trans_no, $label="") +function get_banking_trans_view_str($type, $trans_no, $label="", $icon=false) { - global $path_to_root, $use_popup_windows; + global $path_to_root; $viewer = ""; @@ -134,10 +148,10 @@ function get_banking_trans_view_str($type, $trans_no, $label="") if ($viewer != "") { - if ($use_popup_windows) - $preview_str = "$label"; - else - $preview_str = "$label"; + $pars = access_string($label); + if (user_graphic_links() && $icon) + $pars[0] = set_icon($icon, $pars[0]); + $preview_str = "$pars[0]"; } else $preview_str = $label; @@ -147,9 +161,9 @@ function get_banking_trans_view_str($type, $trans_no, $label="") //-------------------------------------------------------------------------------------- -function get_inventory_trans_view_str($type, $trans_no, $label="") +function get_inventory_trans_view_str($type, $trans_no, $label="", $icon=false) { - global $path_to_root, $use_popup_windows; + global $path_to_root; $viewer = ""; @@ -165,10 +179,10 @@ function get_inventory_trans_view_str($type, $trans_no, $label="") if ($viewer != "") { - if ($use_popup_windows) - $preview_str = "$label"; - else - $preview_str = "$label"; + $pars = access_string($label); + if (user_graphic_links() && $icon) + $pars[0] = set_icon($icon, $pars[0]); + $preview_str = "$pars[0]"; } else $preview_str = $label; @@ -178,9 +192,9 @@ function get_inventory_trans_view_str($type, $trans_no, $label="") //-------------------------------------------------------------------------------------- -function get_manufacturing_trans_view_str($type, $trans_no, $label="") +function get_manufacturing_trans_view_str($type, $trans_no, $label="", $icon=false) { - global $path_to_root, $use_popup_windows; + global $path_to_root; $viewer = ""; @@ -198,10 +212,10 @@ function get_manufacturing_trans_view_str($type, $trans_no, $label="") if ($viewer != "") { - if ($use_popup_windows) - $preview_str = "$label"; - else - $preview_str = "$label"; + $pars = access_string($label); + if (user_graphic_links() && $icon) + $pars[0] = set_icon($icon, $pars[0]); + $preview_str = "$pars[0]"; } else $preview_str = $label; @@ -211,9 +225,9 @@ function get_manufacturing_trans_view_str($type, $trans_no, $label="") //-------------------------------------------------------------------------------------- -function get_dimensions_trans_view_str($type, $trans_no, $label="") +function get_dimensions_trans_view_str($type, $trans_no, $label="", $icon=false) { - global $path_to_root, $use_popup_windows; + global $path_to_root; $viewer = ""; @@ -227,10 +241,10 @@ function get_dimensions_trans_view_str($type, $trans_no, $label="") if ($viewer != "") { - if ($use_popup_windows) - $preview_str = "$label"; - else - $preview_str = "$label"; + $pars = access_string($label); + if (user_graphic_links() && $icon) + $pars[0] = set_icon($icon, $pars[0]); + $preview_str = "$pars[0]"; } else $preview_str = $label; @@ -240,29 +254,29 @@ function get_dimensions_trans_view_str($type, $trans_no, $label="") //-------------------------------------------------------------------------------------- -function get_trans_view_str($type, $trans_no, $label="") +function get_trans_view_str($type, $trans_no, $label="", $icon=false) { - $view_str = get_customer_trans_view_str($type, $trans_no, $label); + $view_str = get_customer_trans_view_str($type, $trans_no, $label, $icon); 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); 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); 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); 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); 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); if ($view_str != null) return $view_str; @@ -270,31 +284,41 @@ function get_trans_view_str($type, $trans_no, $label="") } //-------------------------------------------------------------------------------------- - -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_, $edit_rate=false) { + global $Ajax; + if ($from_currency != $to_currency) { - if ($buttons && isset($_POST['get_rate'])) - { - $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; - } + $comp_currency = get_company_currency(); + if ($from_currency == $comp_currency) + $currency = $to_currency; else - $rate = get_exchange_rate_from_to($to_currency, $from_currency, $date_); + $currency = $from_currency; + $rate = 0; + if ($date_ == Today()) { + $rate = get_date_exchange_rate($currency, $date_); + if (!$rate) { + $rate = get_ecb_rate($currency); + if ($rate) + add_exchange_rate($currency, $date_, $rate, $rate); + } + } + if (!$rate) + $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_)); + $rate = number_format2($rate, user_exrate_dec()); - label_row(_("Exchange Rate:"),"1 " . $from_currency . " = " . $rate . " " . $to_currency . - ($buttons?" " . submit('get_rate',_("Get"), false):"")); + if ($edit_rate) + text_row(_("Exchange Rate:"), '_ex_rate', $rate, 8, 8, null, "", " $from_currency = 1 $to_currency"); + else + label_row(_("Exchange Rate:"),"$rate $from_currency = 1 $to_currency" ); + $Ajax->addUpdate('_ex_rate','_ex_rate', $rate); } } @@ -312,7 +336,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); @@ -352,7 +376,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) @@ -361,7 +385,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 = "$stock_id"; - echo $preview_str; + if($echo) + echo $preview_str; + return $preview_str; } function view_stock_status_cell($stock_id, $description=null) @@ -453,7 +479,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 +547,84 @@ function display_allocations_from($person_type, $person_id, $type, $type_no, $to } } -function get_js_go_back() +//-------------------------------------------------------------------------------------- +function display_quick_entries(&$cart, $id, $totamount, $payment=true, $supp_trans=false) { - $js = "\n\n"; - return $js; + if (!isset($id) || $id == null || $id == "") + { + display_error( _("No Quick Entries are defined.")); + set_focus('totamount'); + } + else + { + $rate = 0; + if (!$payment) + $totamount = -$totamount; + if (!$supp_trans) + $cart->clear_items(); + $qe = get_quick_entry($id); + $qe_lines = get_quick_entry_lines($id); + while ($qe_line = db_fetch($qe_lines)) + { + if ($qe_line['tax_acc']) + { + $account = get_gl_account($qe_line['account']); + $tax_group = $account['tax_code']; + $items = get_tax_group_items($tax_group); + while ($item = db_fetch($items)) + $rate += $item['rate']; + if ($rate != 0) + $totamount = $totamount * 100 / ($rate + 100); + //$cart->clear_items(); + if (!$supp_trans) + $cart->add_gl_item($qe_line['account'], $qe_line['dimension_id'], $qe_line['dimension2_id'], + $totamount, $qe['description']); + else + { + $acc_name = get_gl_account_name($qe_line['account']); + $cart->add_gl_codes_to_trans($qe_line['account'], $acc_name, $qe_line['dimension_id'], + $qe_line['dimension2_id'], $totamount, $qe['description']); + } + $items = get_tax_group_items($tax_group); + while ($item = db_fetch($items)) + { + if ($item['rate'] != 0) + { + $amount = $totamount * $item['rate'] / 100; + $code = (($amount < 0 || $payment || $supp_trans) ? $item['purchasing_gl_code'] : + $item['sales_gl_code']); + if (!$supp_trans) + $cart->add_gl_item($code, 0, 0, $amount, $qe['description']); + else + { + $acc_name = get_gl_account_name($code); + $cart->add_gl_codes_to_trans($code, $acc_name, 0, 0, $amount, $qe['description']); + } + } + } + } + else + { + if ($qe_line['pct']) + $amount = $totamount * $qe_line['amount'] / 100; + else + $amount = $qe_line['amount']; + if (!$supp_trans) + $cart->add_gl_item($qe_line['account'], $qe_line['dimension_id'], $qe_line['dimension2_id'], + $amount, $qe['description']); + else + { + $acc_name = get_gl_account_name($qe_line['account']); + $cart->add_gl_codes_to_trans($qe_line['account'], $acc_name, $qe_line['dimension_id'], + $qe_line['dimension2_id'], $amount, $qe['description']); + } + } + } + //line_start_focus(); + } } + function get_js_open_window($width, $height) { $js = "\n\n"; return $js; } -function get_js_form_entry($edit_name, $sel_name, $next_name) -{ - global $comp_path; - $fpath = $comp_path.'/'.user_company().'/js_cache/form_entry.js'; - - if (!file_exists($fpath)) { - - - $js = "\n\n"; - cache_js_file($fpath, $js); - } - add_js_ufile($fpath); - - return ''; +/* + 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\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() @@ -643,19 +687,20 @@ function get_js_png_fix() function get_js_date_picker() { - global $comp_path; + global $comp_path, $go_debug; $fpath = $comp_path.'/'.user_company().'/js_cache/'.'date_picker.js'; $js = " "; add_js_source($js); - - if (!file_exists($fpath)) { - + + if (!file_exists($fpath) || $go_debug) { + global $dateseps, $date_system; $how = user_date_format(); // 0 = us/ca, 1 = eu, au, nz, 2 = jp, sw @@ -678,6 +723,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")); @@ -856,6 +902,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) { @@ -876,6 +937,9 @@ function CC() { "; $js .= " dateField.value = dateString; + setFocus(dateField.name); + if (dateField.className=='searchbox') + dateField.onblur(); hide(); } return; @@ -915,6 +979,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); @@ -922,10 +987,11 @@ function CC() { var table = \"\"; table += \"\"; table += \" \"; - table += \" \"; + table += \" \"; table += \" \"; table += \"\"; table += \"\"; + table += \"\"; for (var n=0; n<7; n++) table += \"\"; table += \"\"; @@ -938,6 +1004,13 @@ function CC() { } else if (validDay == 1 && dayOfMonth > daysInMonth) { validDay = 0; } + if (n==0) + { + if (dayOfMonth > daysInMonth) + table += \"\"; + else + table += \"\"; + } if(validDay) { if (dayOfMonth == selectedDay && currentYear == selectedYear && currentMonth == selectedMonth) { css_class = 'current'; @@ -963,7 +1036,7 @@ function CC() { } table += \"\"; } - table += \"\"; + table += \"\"; table += \"
<
«		\" + months[currentMonth-1] + \"
\" + currentYear + \"		\" + months[currentMonth-1] + \"
\" + currentYear + \"		>
»
\"+wno+\"\" + wdays[(wstart+n)%7]+\"
 \"+getWeek(currentYear, currentMonth, dayOfMonth)+\"
$back
$back
\"; return table; } @@ -1027,19 +1100,19 @@ function CC() { if(document.getElementById){ calendar = document.getElementById(calendarId); calendar.innerHTML = calendarDrawTable(currentYear, currentMonth); - setProperty('display', 'block'); 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('display', 'block', 'CCIframe'); 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'); } } } @@ -1080,107 +1153,12 @@ document.write(\"