Merged changes in main branch up to v.2.1.2
[fa-stable.git] / includes / ui / ui_view.inc
index 3e6d3c4eeb05d2c8c2e18729b1b2c1a6684419df..e2265f9d62522b1454f59a0718a5ec173a15de1e 100644 (file)
@@ -1,61 +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="")
+function get_supplier_trans_view_str($type, $trans_no, $label="", $icon=false, 
+       $class='', $id='')
 {
-       global $path_to_root, $use_popup_windows;
-
-       $viewer = "";
+       $viewer = "purchasing/view/";
        if ($type == systypes::po())
-               $viewer = "view_po.php";
+               $viewer .= "view_po.php";
        elseif ($type == 20)
-               $viewer = "view_supp_invoice.php";
+               $viewer .= "view_supp_invoice.php";
        elseif ($type == 21)
-               $viewer = "view_supp_credit.php";
+               $viewer .= "view_supp_credit.php";
        elseif ($type == 22)
                $viewer = "view_supp_payment.php";
        elseif ($type == 25)
-               $viewer = "view_grn.php";
+               $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);
 }
 
 //--------------------------------------------------------------------------------------
@@ -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 = "sales/view/";
 
-       $viewer = "";
        if ($type == 10)
-               $viewer = "view_invoice.php";
+               $viewer .= "view_invoice.php";
        elseif ($type == 11)
-               $viewer = "view_credit.php";
+               $viewer .= "view_credit.php";
        elseif ($type == 12)
-               $viewer = "view_receipt.php";
+               $viewer .= "view_receipt.php";
        elseif ($type == 13)
-               $viewer = "view_dispatch.php";
+               $viewer .= "view_dispatch.php";
        elseif ($type == 30)
-               $viewer = "view_sales_order.php";
+               $viewer .= "view_sales_order.php";
        else
                return null;
 
@@ -91,33 +90,26 @@ 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 .= "<a target='_blank' href='$path_to_root/sales/view/$viewer?trans_no=$trans' onclick=\"javascript:openWindow(this.href,this.target); return false;\" >$lbl</a>";
-               else
-                       $preview_str .= "<a target='_blank' href='$path_to_root/sales/view/$viewer?trans_no=$trans'>$lbl</a>";
-       }
-       else
-               $preview_str .= $lbl;
-  }
+       $preview_str .= viewer_link($lbl, $viewer."?trans_no=$trans", 
+               $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)
                $viewer = "bank_transfer_view.php";
@@ -126,144 +118,101 @@ function get_banking_trans_view_str($type, $trans_no, $label="")
        elseif ($type == 2)
                $viewer = "gl_deposit_view.php";
        elseif ($type == 0)
-               $viewer = "";
+               return $label;
        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";
+               $viewer .= "view_adjustment.php";
        elseif ($type == systypes::location_transfer())
-               $viewer = "view_transfer.php";
+               $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 = "";
+       $viewer = "manufacturing/view/";
 
        if ($type == 28)
-               $viewer = "wo_issue_view.php";
+               $viewer .= "wo_issue_view.php";
        elseif ($type == 29)
-               $viewer = "wo_production_view.php";
+               $viewer .= "wo_production_view.php";
        elseif ($type == systypes::work_order())
-               $viewer = "work_order_view.php";
+               $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;
-
-       $viewer = "";
-
        if ($type == 40)
-               $viewer = "view_dimension.php";
+               $viewer = "dimensions/view_dimension.php?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 $preview_str;
+       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);
+       $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;
 
@@ -271,37 +220,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;
-                       $Ajax->activate('get_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_);
-               $rate = number_format2($rate, user_exrate_dec());
-       label_row(_("Exchange Rate:"),"1 " . $from_currency . " = <span id='_ex_rate'>" . $rate . "</span> " . $to_currency .
-                       ($buttons?"  " . submit('get_rate',_("Get"), false, true):""));
-           if($buttons) {
-                 $Ajax->addUpdate('get_rate','_ex_rate', $rate);
+                       $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());
+               if ($edit_rate)
+                       text_row(_("Exchange Rate:"), '_ex_rate', $rate, 8, 8, null, "", " $from_currency = 1 $to_currency"); 
+               else
+               label_row(_("Exchange Rate:"),"<span id='_ex_rate'>$rate</span> $from_currency = 1 $to_currency" );
+               $Ajax->addUpdate('_ex_rate','_ex_rate', $rate);
        }
 }
 
@@ -359,7 +312,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)
@@ -368,7 +321,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)
@@ -425,7 +380,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");
@@ -449,7 +404,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());
        }
     }
 
@@ -491,6 +446,8 @@ function display_allocations($alloc_result, $total)
        label_cell(systypes::name($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']);
@@ -505,6 +462,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();
 
@@ -528,18 +486,112 @@ function display_allocations_from($person_type, $person_id, $type, $type_no, $to
        }
 }
 
+//--------------------------------------------------------------------------------------
+//
+//     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 ($descr != '') $qe['description'] .= ': '.$descr;
+               $qe_lines = get_quick_entry_lines($id);
+               while ($qe_line = db_fetch($qe_lines))
+               {
+                       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
+                                       $taxes = get_taxes_for_item_tax($qe_line['dest_id']);
+                                       $tax_total = 0;
+                                       foreach ($taxes as $index => $item_tax) {
+                                               if(substr($qe_line['action'],0,1) != 'T')
+                                                       $tax = round2($base * $item_tax['rate'] 
+                                                               / ($item_tax['rate'] + 100),  user_price_dec());
+                                               else
+                                                       $tax = round2($base * $item_tax['rate'] / 100,  user_price_dec());
+
+                                               $gl_code = ($type == QE_DEPOSIT || ($type == QE_JOURNAL && $base < 0)) 
+                                                       ? $item_tax['sales_gl_code'] : $item_tax['purchasing_gl_code'];
+                                               $tax_total += $tax;
+                                               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_total;
+                                       elseif (strpos($qe_line['action'], '-'))
+                                               $base -= $tax_total;
+                                       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<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;
 }
 
@@ -548,21 +600,27 @@ function get_js_open_window($width, $height)
   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
-//
-function default_focus($name, $form_no=0) {
+//     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 get_js_png_fix()
 {
-       $js = "<script type=\"text/javascript\">\n"
-               . "function fixPNG(myImage)\n"
+       $js = "function fixPNG(myImage)\n"
                . "{\n"
                . " var arVersion = navigator.appVersion.split(\"MSIE\")\n"
                . " var version = parseFloat(arVersion[1])\n"
@@ -581,40 +639,16 @@ function get_js_png_fix()
         . "    + \"(src=\'\" + myImage.src + \"\', sizingMethod='scale');\\\"></span>\"\n"
                . "  myImage.outerHTML = strNewHTML\n"
        . " }\n"
-               . "}\n"
-               . "</script>\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 = "<style>
-#CCIframe { display: none; left: 0px; position: absolute; top: 0px; height: 250px; width: 250px; 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; 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 .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;}
-#CC .previous { text-align: left;}
-#CC .next { text-align: right;}
-#CC .previous,#CC .next { padding: 1px 3px 1px 3px; font-size: 1.4em;}
-#CC .previous a,#CC .next a { color: #FFF; text-decoration: none; font-weight: bold;}
-#CC .title { text-align: center; font-weight: bold; color: #FFF;}
-#CC .empty { background-color: #CCC; border: 1px solid #FFF;}
-</style>
-";
-    add_js_source($js);
-
-    if (!file_exists($fpath)) {
+    if (!file_exists($fpath) || $go_debug) {
 
        global $dateseps, $date_system;
 
@@ -623,6 +657,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"));
@@ -801,6 +836,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) {
@@ -821,6 +871,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;
@@ -860,6 +915,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);
@@ -867,10 +923,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>\";
@@ -883,6 +940,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';
@@ -908,7 +972,7 @@ function CC() {
       }
       table += \"</tr>\";
     }
-    table += \"<tr class='header'><th colspan='7' style='padding: 3px;text-align:center;'><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;
   }
@@ -972,19 +1036,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');
       }
     }
   }
@@ -1045,12 +1109,52 @@ if (!function_exists('_vd'))
        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";
+       $str = (!empty($title) ? ($title .':') : '') .'<pre>';
+       $str .= print_r($mixed, true); //var_dump($mixed);
+       $str .= "</pre>\n";
+               display_error('<table><tr><td>'.$str.'</td></tr></table>');
        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 .= '<table border=0>';
+        $trace = debug_backtrace();
+               foreach($trace as $trn => $tr) {
+                       if (!$trn) continue;
+                       $str .= '<tr><td>';
+                       $str .= $tr['file'].':'.$tr['line'].': ';
+                       $str .= '</td><td>';
+                       if (isset($tr['type'])) {
+                               if($tr['type'] == '::') {
+                                       $str .= $tr['class'].'::';
+                               } else if($tr['type'] == '->') {
+                                       $str .= '('.$tr['class'].' Object)'.'->';
+                               }
+                       }
+                       foreach($tr['args'] as $n=>$a) {
+                               if (is_object($tr['args'][$n]))
+                                       $tr['args'][$n] = "(".get_class($tr['args'][$n])." Object)";
+                               if (is_array($tr['args'][$n]))
+                                       $tr['args'][$n] = "(Array[".count($tr['args'][$n])."])";
+                               else
+                                       $tr['args'][$n] = "'".$tr['args'][$n]."'";
+                       }
+                       $str .= $tr['function'].'('. implode(',',$tr['args']).')</td>';
+
+                       $str .= '</tr>';
+               }
+               
+               $str .= '</table>';
+               display_error($str);
+       }
+}
+
 ?>
\ No newline at end of file