X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=includes%2Fui%2Fui_view.inc;h=8e2591c3a9328ae619354dfa38a25e2e2e361369;hb=9478a0cdeaf9201d2f3947e11e58d90354050025;hp=ddd62fef061c4a720122da39805cb9415ebf9c0b;hpb=c2d8171259968d683568f3a5915b541f075fd194;p=fa-stable.git diff --git a/includes/ui/ui_view.inc b/includes/ui/ui_view.inc index ddd62fef..8e2591c3 100644 --- a/includes/ui/ui_view.inc +++ b/includes/ui/ui_view.inc @@ -1,61 +1,60 @@ . +***********************************************************************/ 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, + $class='', $id='') { - 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"; + $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 = "$label"; - else - $preview_str = "$label"; - } - 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 = "$label"; - else - $gl_view = "$label"; + $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); } //-------------------------------------------------------------------------------------- @@ -69,21 +68,21 @@ 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 == 13) - $viewer = "view_dispatch.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; @@ -91,179 +90,147 @@ 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"; - } - else - $preview_str .= $lbl; - } + $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 = "$label"; - else - $preview_str = "$label"; - } - 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 = "inventory/view/"; - $viewer = ""; - - 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 = "$label"; - else - $preview_str = "$label"; - } - 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 = "$label"; - else - $preview_str = "$label"; - } - 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; - - $viewer = ""; - - if ($type == 40) - $viewer = "view_dimension.php"; + if ($type == ST_DIMENSION) + $viewer = "dimensions/view/view_dimension.php?trans_no=$trans_no"; else return null; if ($label == "") $label = $trans_no; - if ($viewer != "") - { - if ($use_popup_windows) - $preview_str = "$label"; - else - $preview_str = "$label"; - } + 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 - $preview_str = $label; + return null; - return $preview_str; + if ($label == "") + $label = $trans_no; + + return viewer_link($label, $viewer, $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, $icon, $class, $id); if ($view_str != null) return $view_str; - $view_str = get_supplier_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_banking_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_inventory_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_manufacturing_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_dimensions_trans_view_str($type, $trans_no, $label); + $view_str = get_journal_trans_view_str($type, $trans_no, $label, $icon, $class, $id); if ($view_str != null) return $view_str; @@ -271,31 +238,44 @@ 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) { + $row = get_currency($currency); + if ($row['auto_update']) { + $rate = retrieve_exrate($currency, $date_); + 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); } } @@ -313,7 +293,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); @@ -353,7 +333,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) @@ -362,7 +342,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) @@ -376,7 +358,8 @@ function view_stock_status_cell($stock_id, $description=null) function display_debit_or_credit_cells($value) { - if ($value > 0) + $value = round2($value, user_price_dec()); + if ($value >= 0) { amount_cell($value); label_cell(""); @@ -386,12 +369,6 @@ function display_debit_or_credit_cells($value) label_cell(""); amount_cell(abs($value)); } - else - { - //label_cell(""); - amount_cell(0); - label_cell(""); - } } //-------------------------------------------------------------------------------------- @@ -419,7 +396,7 @@ function display_supp_trans_tax_details($tax_items, $columns) $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"); + _("Amount") . ": $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"); @@ -443,7 +420,7 @@ function display_edit_tax_items($taxes, $columns, $tax_included, $leftspan=0) { label_row($taxitem['tax_type_name'] . " (" . $taxitem['rate'] . "%)", number_format2($taxitem['Value'],user_price_dec()), "colspan=$columns align=right", "align=right",$leftspan); - $total += $taxitem['Value']; + $total += round2($taxitem['Value'], user_price_dec()); } } @@ -454,9 +431,8 @@ function display_edit_tax_items($taxes, $columns, $tax_included, $leftspan=0) function display_footer_exit() { - global $path_to_root; br(2); - end_page(); + end_page(false, false, true); exit; } @@ -464,7 +440,7 @@ function display_footer_exit() function display_allocations($alloc_result, $total) { - global $table_style; + global $table_style, $systypes_array; if (!$alloc_result || db_num_rows($alloc_result) == 0) return; @@ -483,9 +459,11 @@ 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()); amount_cell($alloc_row['Total']); //amount_cell($alloc_row['Total'] - $alloc_row['PrevAllocs'] - $alloc_row['amt']); amount_cell($alloc_row['Total'] - $alloc_row['amt']); @@ -500,6 +478,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(); @@ -512,92 +491,209 @@ function display_allocations_from($person_type, $person_id, $type, $type_no, $to { 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() +//-------------------------------------------------------------------------------------- +// +// 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='') { - $js = "\n\n"; - return $js; + $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'); + } + $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; + $item_tax = get_tax_type($qe_line['dest_id']); + if ($type == QE_SUPPINV && substr($qe_line['action'],0,1) != 'T') + { + $taxgroup = $cart->tax_group_id; + $rates = 0; + $res = get_tax_group_items($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; } + function get_js_open_window($width, $height) { - $js = "\n\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; } -//$focus_on = array(); /* Setting focus on element $name in $form. If $form<0 $name is element id. */ function set_focus($name, $form_no=0) { -// global $focus_on; -// $focus_on['name'] = $name; -// $focus_on['form'] = $form_no; + global $Ajax; + $Ajax->addFocus(true, $name); $_POST['_focus'] = $name; } // // Set default focus on first field $name if not set yet -// -function default_focus($name, $form_no=0) { -// global $focus_on; -// if (!isset($focus_on['name']) && (!isset($_POST['_focus']) || $_POST['_focus']=='') ) { -//echo "

$name

"; -// $focus_on['name'] = $name; -// $focus_on['form'] = $form_no; -// } +// 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'])) { - $_POST['_focus'] = $name; + set_focus($name); } + return $name; } /* -function set_js_focus() { - global $focus_on; - $js = ''; - -// if (isset($focus_on['name'])) { - - $js = ""; -// } - return $js; -} + Reset focus to next control element (e.g. link). */ +function reset_focus() +{ + unset($_POST['_focus']); +} + function get_js_png_fix() { - $js = "\n"; + . "}\n"; return $js; } 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 $sep = $dateseps[user_date_sep()]; // date separator - $wstart = (($date_system == 1 || $date_system == 2) ? 6 : ($how == 0 ? 0 : 1)); // weekstart (sun = 0, mon = 1) + $wstart = (($date_system == 1 || $date_system == 2 || $date_system == 3) ? 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")); @@ -836,6 +909,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) { @@ -856,6 +944,11 @@ function CC() { "; $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; @@ -895,6 +988,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); @@ -902,10 +996,11 @@ function CC() { var table = \"\"; table += \"\"; table += \" \"; - table += \" \"; + table += \" \"; table += \" \"; table += \"\"; table += \"\"; + table += \"\"; for (var n=0; n<7; n++) table += \"\"; table += \"\"; @@ -918,11 +1013,18 @@ 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'; "; - if ($date_system == 1 || $date_system == 2) + if ($date_system == 1 || $date_system == 2 || $date_system == 3) $js .= " } else if (dayOfWeek == 5) { "; @@ -943,7 +1045,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; } @@ -1007,19 +1109,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'); } } } @@ -1060,107 +1162,12 @@ document.write(\"