Minor bugs in layout and quick entries.
[fa-stable.git] / includes / ui / ui_view.inc
index d76dd824a34ef138c096182a6d26a0f28df5a85b..2b0905c08e4db3bcfe493cb9bb5b2899ac8ef63d 100644 (file)
@@ -1,12 +1,22 @@
 <?php
-
+/**********************************************************************
+    Copyright (C) FrontAccounting, LLC.
+       Released under the terms of the GNU Affero General Public License,
+       AGPL, 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/agpl-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)
 {
-       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 = "<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>";
+               $pars = access_string($label);
+               if (user_graphic_links() && $icon)
+                       $pars[0] = set_icon($icon, $pars[0]);
+               $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;\"$pars[1]>$pars[0]</a>";
        }
        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 = "<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;
+       }       
+       $pars = access_string($label);
+       if (user_graphic_links() && $icon)
+               $pars[0] = set_icon($icon, $pars[0]);
+       $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;\"$pars[1]>$pars[0]</a>";
 
        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 .= "<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>";
+               $pars = access_string($lbl);
+               if (user_graphic_links() && $icon)
+                       $pars[0] = set_icon($icon, $pars[0]);
+               $preview_str .= "<a target='_blank' href='$path_to_root/sales/view/$viewer?trans_no=$trans' onclick=\"javascript:openWindow(this.href,this.target); return false;\" $pars[1]>$pars[0]</a>";
        }
        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 = "<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>";
+               $pars = access_string($label);
+               if (user_graphic_links() && $icon)
+                       $pars[0] = set_icon($icon, $pars[0]);
+               $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;\"$pars[1]>$pars[0]</a>";
        }
        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 = "<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>";
+               $pars = access_string($label);
+               if (user_graphic_links() && $icon)
+                       $pars[0] = set_icon($icon, $pars[0]);
+               $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;\"$pars[1]>$pars[0]</a>";
        }
        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 = "<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>";
+               $pars = access_string($label);
+               if (user_graphic_links() && $icon)
+                       $pars[0] = set_icon($icon, $pars[0]);
+               $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;\"$pars[1]>$pars[0]</a>";
        }
        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 = "<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>";
+               $pars = access_string($label);
+               if (user_graphic_links() && $icon)
+                       $pars[0] = set_icon($icon, $pars[0]);
+               $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;\"$pars[1]>$pars[0]</a>";
        }
        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:"),"<span id='_ex_rate'>$rate</span> $from_currency = 1 $to_currency" );
+               $Ajax->addUpdate('_ex_rate','_ex_rate', $rate);
        }
 }
 
@@ -312,7 +336,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);
 
@@ -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 = "<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)
@@ -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<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;
+       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<script type=\"text/javascript\">\n"
@@ -546,53 +633,31 @@ 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;
 }
 
-//$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 "<h2>$name</h2>";
-//     $focus_on['name'] = $name;
-//     $focus_on['form'] = $form_no;
-//    }
     if (!isset($_POST['_focus'])) {
-       $_POST['_focus'] = $name;
+         set_focus($name);
     }
 }
-/*
-function set_js_focus() {
-  global $focus_on;
-  $js = '';
-
-//  if (isset($focus_on['name'])) {
-
-    $js =  "<script type=\"text/javascript\">\n"
-       ."Behaviour.addLoadEvent(function(){ setFocus('".$focus_on['name']."'".( $focus_on['form']>=0 ?  (",".$focus_on['form']): '').
-       ");});"
-       ."</script>";
-//  }
-  return $js;
-}
-*/
+
 function get_js_png_fix()
 {
        $js = "<script type=\"text/javascript\">\n"
@@ -622,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 = "<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;}
@@ -647,9 +713,9 @@ function get_js_date_picker()
 </style>
 ";
     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
@@ -657,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"));
@@ -835,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) {
@@ -855,6 +937,9 @@ function CC() {
 ";
        $js .= "
       dateField.value = dateString;
+         setFocus(dateField.name);
+         if (dateField.className=='searchbox')
+               dateField.onblur();
       hide();
     }
     return;
@@ -894,6 +979,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);
@@ -901,10 +987,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>\";
@@ -917,6 +1004,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';
@@ -942,7 +1036,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;
   }
@@ -1006,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');
       }
     }
   }
@@ -1059,107 +1153,12 @@ document.write(\"<iframe id='CCIframe' src='javascript:false;' frameBorder='0' s
 document.write(\"<div id='CC'></div>\");";
 
      cache_js_file($fpath, $js);
-    } 
+    }
     add_js_ufile($fpath);
 
  return '';
 }
 
-//
-//     Javascript conversions to/from user numeric format.
-//
-function add_js_user_num() {
-
-    global $comp_path;
-    $fpath = $comp_path.'/'.user_company().'/js_cache/'.'user_num.js';
-
-    if (!file_exists($fpath)) {
-    
-       global $thoseps, $decseps;
-       $ts = $thoseps[user_tho_sep()];
-       $ds = $decseps[user_dec_sep()];
-
-       $js = "function price_format(post, num, dec, label) {
-       //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;
-       if(label)
-           document.getElementById(post).innerHTML = num;
-       else
-           document.getElementsByName(post)[0].value = num;
-       }
-       function get_amount(doc, label) {
-           if(label)
-               var val = document.getElementById(doc).innerHTML;
-           else
-               var val = document.getElementsByName(doc)[0].value;
-               val = val.replace(/\\".$ts."/g,'');
-               val = val.replace(/\\".$ds."/g,'.');
-               return 1*val;
-       }
-       ";
-
-     cache_js_file($fpath, $js);
-    } 
-    add_js_ufile($fpath);
-}
-
-function add_js_allocate() {
-    global $comp_path;
-    $fpath = $comp_path.'/'.user_company().'/js_cache/'.'allocate.js';
-
-    if (!file_exists($fpath)) {
-    
-       $js =
-       "function allocate_all(doc) {
-       var amount = get_amount('amount'+doc);
-       var unallocated = get_amount('un_allocated'+doc);
-       var total = get_amount('total_allocated', 1);
-       var left = get_amount('left_to_allocate', 1);
-
-       if(unallocated<amount) amount = unallocated;
-       if((unallocated-amount)<=left){
-           left-=unallocated-amount;
-           total+=unallocated-amount;
-           amount=unallocated;
-       }else{
-       total+=left;
-       amount+=left;
-       left=0;
-       }
-       price_format('amount'+doc, amount, ".user_price_dec().");
-       price_format('left_to_allocate', left, ".user_price_dec().", 1);
-       price_format('total_allocated', total, ".user_price_dec().", 1);
-       }
-       function allocate_none(doc) {
-       amount = get_amount('amount'+doc);
-       left = get_amount('left_to_allocate', 1);
-       total = get_amount('total_allocated', 1);
-       price_format('left_to_allocate',amount+left, ".user_price_dec().", 1);
-       price_format('amount'+doc, 0, ".user_price_dec().");
-       price_format('total_allocated', total-amount, ".user_price_dec().", 1);
-       }";
-
-     cache_js_file($fpath, $js);
-    } 
-    add_js_ufile($fpath);
-    add_js_user_num();
-}
-
 function alert($msg)
 {
        echo "\n<script type=\"text/javascript\">\n"
@@ -1174,9 +1173,10 @@ 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;
        }