Moving 2.0 development version to main trunk.
[fa-stable.git] / includes / ui / ui_view.inc
index a2e965644097b62df4fdd80ecac206d5c7b410e5..7ca792aee8e30cd76afdd4a81d76d7f4bc888f4e 100644 (file)
@@ -1,6 +1,7 @@
 <?php
 
 include_once($path_to_root . "/admin/db/voiding_db.inc");
+include_once($path_to_root . "/includes/types.inc");
 
 //--------------------------------------------------------------------------------------
 
@@ -29,9 +30,9 @@ function get_supplier_trans_view_str($type, $trans_no, $label="")
        {
                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    
+               else
                        $preview_str = "<a target='_blank' href='$path_to_root/purchasing/view/$viewer?trans_no=$trans_no'>$label</a>";
-       }       
+       }
        else
                $preview_str = $label;
 
@@ -79,23 +80,33 @@ function get_customer_trans_view_str($type, $trans_no, $label="")
                $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";
        else
                return null;
 
+  if(!is_array($trans_no)) $trans_no = array($trans_no);
+
+  $lbl = $label;
+  $preview_str = '';
+  foreach($trans_no as $trans) {
        if ($label == "")
-               $label = $trans_no;
+               $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_no' onclick=\"javascript:openWindow(this.href,this.target); return false;\" >$label</a>";
+                       $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_no'>$label</a>";
-       }               
+                       $preview_str .= "<a target='_blank' href='$path_to_root/sales/view/$viewer?trans_no=$trans'>$lbl</a>";
+       }
        else
-               $preview_str = $label;
+               $preview_str .= $lbl;
+  }
 
        return $preview_str;
 }
@@ -126,9 +137,9 @@ function get_banking_trans_view_str($type, $trans_no, $label="")
        {
                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    
+               else
                        $preview_str = "<a target='_blank' href='$path_to_root/gl/view/$viewer?trans_no=$trans_no'>$label</a>";
-       }               
+       }
        else
                $preview_str = $label;
 
@@ -157,9 +168,9 @@ function get_inventory_trans_view_str($type, $trans_no, $label="")
        {
                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    
+               else
                        $preview_str = "<a target='_blank' href='$path_to_root/inventory/view/$viewer?trans_no=$trans_no'>$label</a>";
-       }               
+       }
        else
                $preview_str = $label;
 
@@ -190,7 +201,7 @@ function get_manufacturing_trans_view_str($type, $trans_no, $label="")
        {
                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    
+               else
                        $preview_str = "<a target='_blank' href='$path_to_root/manufacturing/view/$viewer?trans_no=$trans_no'>$label</a>";
        }
        else
@@ -219,9 +230,9 @@ function get_dimensions_trans_view_str($type, $trans_no, $label="")
        {
                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    
+               else
                        $preview_str = "<a target='_blank' href='$path_to_root/dimensions/view/$viewer?trans_no=$trans_no'>$label</a>";
-       }               
+       }
        else
                $preview_str = $label;
 
@@ -263,9 +274,11 @@ function get_trans_view_str($type, $trans_no, $label="")
 
 function exchange_rate_display($from_currency, $to_currency, $date_, $buttons=true)
 {
+    global $Ajax;
+    $hint = _('Get daily ECB exchange rate and save for later use in invoicing process');
        if ($from_currency != $to_currency)
        {
-               if ($buttons && isset($_POST['get_rate']))      
+               if ($buttons && isset($_POST['get_rate']))
                {
                        $comp_currency = get_company_currency();
                        if ($from_currency == $comp_currency)
@@ -275,16 +288,20 @@ function exchange_rate_display($from_currency, $to_currency, $date_, $buttons=tr
                        $rate = get_ecb_rate($currency);
                        if (get_date_exchange_rate($currency, $date_))
                                update_exchange_rate($currency, $date_, $rate, $rate);
-                       else    
+                       else
                                add_exchange_rate($currency, $date_, $rate, $rate);
                        if ($from_currency == $comp_currency)
                                $rate = 1 / $rate;
-               }       
+                       $Ajax->activate('get_rate');
+               }
                else
                        $rate = get_exchange_rate_from_to($to_currency, $from_currency, $date_);
                $rate = number_format2($rate, user_exrate_dec());
-       label_row(_("Exchange Rate:"),"1 " . $from_currency . " = " .  $rate . " " . $to_currency .
-                       ($buttons?"  " . submit('get_rate',_("Get"), false):""));
+       label_row(_("Exchange Rate:"),"1 " . $from_currency . " = <span id='_ex_rate'>" . $rate . "</span> " . $to_currency .
+               ($buttons?"  " . submit('get_rate',_("Get"), false, $hint, true):""));
+           if($buttons) {
+                 $Ajax->addUpdate('get_rate','_ex_rate', $rate);
+               }
        }
 }
 
@@ -302,7 +319,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);
 
@@ -314,10 +331,10 @@ function is_voided_display($type, $id, $label)
 function comments_display_row($type, $id)
 {
        $comments = get_comments($type, $id);
-       if ($comments and db_num_rows($comments)) 
+       if ($comments and db_num_rows($comments))
        {
                echo "<tr><td colspan=15>";
-       while ($comment = db_fetch($comments)) 
+       while ($comment = db_fetch($comments))
        {
                echo $comment["memo_"] . "<br>";
        }
@@ -331,7 +348,7 @@ function get_comments_string($type, $type_no)
 {
        $str_return = "";
        $result = get_comments($type, $type_no);
-       while ($comment = db_fetch($result)) 
+       while ($comment = db_fetch($result))
        {
                if (strlen($str_return))
                        $str_return = $str_return . " \n";
@@ -351,7 +368,7 @@ 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;      
+       echo $preview_str;
 }
 
 function view_stock_status_cell($stock_id, $description=null)
@@ -369,12 +386,12 @@ function display_debit_or_credit_cells($value)
        {
                amount_cell($value);
                label_cell("");
-       }       
+       }
        elseif ($value < 0)
        {
                label_cell("");
                amount_cell(abs($value));
-       }       
+       }
        else
        {
                //label_cell("");
@@ -387,7 +404,7 @@ function display_debit_or_credit_cells($value)
 
 function display_customer_trans_tax_details($tax_items, $columns)
 {
-    while ($tax_item = db_fetch($tax_items)) 
+    while ($tax_item = db_fetch($tax_items))
     {
        $tax = number_format2($tax_item['amount'],user_price_dec());
        if ($tax_item['included_in_price'])
@@ -403,7 +420,7 @@ function display_customer_trans_tax_details($tax_items, $columns)
 
 function display_supp_trans_tax_details($tax_items, $columns)
 {
-    while ($tax_item = db_fetch($tax_items)) 
+    while ($tax_item = db_fetch($tax_items))
     {
        $tax = number_format2(abs($tax_item['amount']),user_price_dec());
        if ($tax_item['included_in_price'])
@@ -417,21 +434,21 @@ function display_supp_trans_tax_details($tax_items, $columns)
 
 //--------------------------------------------------------------------------------------
 
-function display_edit_tax_items($taxes, $columns)
+function display_edit_tax_items($taxes, $columns, $tax_included, $leftspan=0)
 {
        $total = 0;
 
-    foreach ($taxes as $taxitem) 
+    foreach ($taxes as $taxitem)
     {
-       if ($taxitem['included_in_price']) 
+       if ($tax_included)
        {
                label_row(_("Included") . " " . $taxitem['tax_type_name'] . " (" . $taxitem['rate'] . "%) " .
-                       _("Amount:") . " " . number_format2($taxitem['Value'],user_price_dec()), "", "colspan=$columns align=right", "align=right");
-       } 
-       else 
+                       _("Amount:") . " " . number_format2($taxitem['Value'],user_price_dec()), "", "colspan=$columns align=right", "align=right",$leftspan);
+       }
+       else
        {
                label_row($taxitem['tax_type_name'] . " (" . $taxitem['rate'] . "%)",
-                       number_format2($taxitem['Value'],user_price_dec()), "colspan=$columns align=right", "align=right");
+                       number_format2($taxitem['Value'],user_price_dec()), "colspan=$columns align=right", "align=right",$leftspan);
                $total +=  $taxitem['Value'];
        }
     }
@@ -443,7 +460,6 @@ function display_edit_tax_items($taxes, $columns)
 
 function display_footer_exit()
 {
-       global $path_to_root;
        br(2);
        end_page();
        exit;
@@ -461,7 +477,7 @@ function display_allocations($alloc_result, $total)
     display_heading2(_("Allocations"));
 
     start_table("$table_style width=80%");
-    
+
     $th = array( _("Type"), _("Number"), _("Date"), _("Total Amount"),
        _("Left to Allocate"), _("This Allocation"));
        table_header($th);
@@ -499,7 +515,7 @@ function display_allocations($alloc_result, $total)
 
 function display_allocations_from($person_type, $person_id, $type, $type_no, $total)
 {
-       switch ($person_type) 
+       switch ($person_type)
        {
                case payment_person_types::customer() :
                        $alloc_result = get_allocatable_to_cust_transactions($person_id, $type_no, $type);
@@ -512,22 +528,6 @@ function display_allocations_from($person_type, $person_id, $type, $type_no, $to
        }
 }
 
-function get_js_go_back()
-{
-       $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;
-}      
-
 function get_js_open_window($width, $height)
 {
        $js = "\n<script type=\"text/javascript\">\n"
@@ -536,116 +536,74 @@ 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;
 }
 
-function get_js_form_entry($edit_name, $sel_name, $next_name)
-{
-       $js = "\n<script type=\"text/javascript\">\n"
-               . "<!--\n"
-               . "function recalcAccounts()\n"
-               . "{\n"
-               . "     var myForm = document.forms[0];\n"
-               . "     var len = myForm.$sel_name.length;\n"
-               . "     var txt;\n"
-               . "     var ac = myForm.$edit_name.value;\n"
-               . "     var i;\n"
-               . "     myForm.$sel_name.options[myForm.$sel_name.selectedIndex].selected = false;\n"
-               . "     for (i = 0; i < len; i++)\n"
-               . "     {\n"
-               . "             txt = myForm.$sel_name.options[i].text;\n"
-               . "             if (txt.indexOf(ac) == 0)\n"
-               . "             {\n"
-               . "                     myForm.$sel_name.options[i].selected = true;\n"
-               . "                     break;\n"
-               . "             }\n"
-               . "     }\n"
-               . "}\n"
-               . "function setAccount(p, s)\n"
-               . "{\n"
-               . "     var myForm = document.forms[0];\n"
-               . " if (p == 0 && myForm.$edit_name.value == \"\")\n"
-               . "             return true;\n"
-               . "     myForm.$edit_name.value = myForm.$sel_name.options[myForm.$sel_name.selectedIndex].value;\n"
-               . " if (s)\n"
-               . "  myForm.submit();\n"
-               . "     myForm.$next_name.focus();\n"
-               . "     return true;\n"
-               . "}\n"
-               . "-->\n"
-               . "</script>\n";
-       return $js;     
+/*
+  Setting focus on element $name in $form.
+  If $form<0 $name is element id.
+*/
+function set_focus($name, $form_no=0) {
+  global $Ajax;
+       $Ajax->addFocus(true, $name);
+    $_POST['_focus'] = $name;
 }
-
-function get_js_set_focus($name)
-{
-       $js = "\n<script type=\"text/javascript\">\n"
-               . "<!--\n"
-               . "function setFocus()\n"
-               . "{\n"
-               . "     document.forms[0].$name.focus();\n"
-               . "}\n"
-               . "-->\n"
-               . "</script>\n";
-       return $js;     
+//
+//     Set default focus on first field $name if not set yet
+//
+function default_focus($name, $form_no=0) {
+    if (!isset($_POST['_focus'])) {
+         set_focus($name);
+    }
 }
 
 function get_js_png_fix()
 {
        $js = "<script type=\"text/javascript\">\n"
-               . "function fixPNG(myImage)\n" 
+               . "function fixPNG(myImage)\n"
                . "{\n"
                . " var arVersion = navigator.appVersion.split(\"MSIE\")\n"
                . " var version = parseFloat(arVersion[1])\n"
-       . " if ((version >= 5.5) && (version < 7) && (document.body.filters))\n" 
+       . " if ((version >= 5.5) && (version < 7) && (document.body.filters))\n"
        . " {\n"
                . "  var imgID = (myImage.id) ? \"id='\" + myImage.id + \"' \" : \"\"\n"
                . "  var imgClass = (myImage.className) ? \"class='\" + myImage.className + \"' \" : \"\"\n"
-               . "  var imgTitle = (myImage.title) ?\n" 
+               . "  var imgTitle = (myImage.title) ?\n"
                . "    \"title='\" + myImage.title  + \"' \" : \"title='\" + myImage.alt + \"' \"\n"
                . "  var imgStyle = \"display:inline-block;\" + myImage.style.cssText\n"
                . "  var strNewHTML = \"<span \" + imgID + imgClass + imgTitle\n"
-        . "    + \" style=\\\"\" + \"width:\" + myImage.width\n" 
-        . "    + \"px; height:\" + myImage.height\n" 
+        . "    + \" style=\\\"\" + \"width:\" + myImage.width\n"
+        . "    + \"px; height:\" + myImage.height\n"
         . "    + \"px;\" + imgStyle + \";\"\n"
         . "    + \"filter:progid:DXImageTransform.Microsoft.AlphaImageLoader\"\n"
         . "    + \"(src=\'\" + myImage.src + \"\', sizingMethod='scale');\\\"></span>\"\n"
-               . "  myImage.outerHTML = strNewHTML\n"    
+               . "  myImage.outerHTML = strNewHTML\n"
        . " }\n"
                . "}\n"
                . "</script>\n";
        return $js;
-}      
+}
 
 function get_js_date_picker()
 {
-       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)
-       $months = array(_("January"),_("February"),_("March"),_("April"),_("May"),_("June"),_("July"),_("August"),_("September"),_("October"),_("November"),_("December"));
-       $wdays = array(_("Su"),_("Mo"),_("Tu"),_("We"),_("Th"),_("Fr"),_("Sa"));
-       $back = _("Back");
-       if ($date_system == 1)
-               list($cyear, $cmon, $cday) = gregorian_to_jalali(date("Y"), date("n"), date("j"));
-       else if ($date_system == 2)
-               list($cyear, $cmon, $cday) = gregorian_to_islamic(date("Y"), date("n"), date("j"));
+    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;}
@@ -657,8 +615,26 @@ function get_js_date_picker()
 #CC .empty { background-color: #CCC; border: 1px solid #FFF;}
 </style>
 ";
-       $js .= "<script type=\"text/javascript\">
-<!--\n
+    add_js_source($js);
+
+    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)
+       $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"));
+       else if ($date_system == 2)
+               list($cyear, $cmon, $cday) = gregorian_to_islamic(date("Y"), date("n"), date("j"));
+
+
+       $js = "
 function positionInfo(object) {
   var p_elm = object;
   this.getElementLeft = getElementLeft;
@@ -804,17 +780,17 @@ function CC() {
     epbase = year - ((year >= 0) ? 474 : 473);
     epyear = 474 + mod(epbase, 2820);
     t = day + ((month <= 7) ? ((month - 1) * 31) : (((month - 1) * 30) + 6)) +
-      Math.floor(((epyear * 682) - 110) / 2816) + (epyear - 1) * 365 + 
+      Math.floor(((epyear * 682) - 110) / 2816) + (epyear - 1) * 365 +
       Math.floor(epbase / 2820) * 1029983 + (1948320.5 - 1);
 ";
        else if ($date_system == 2)
                $js .= "
-       var t;  
-       t = Math.floor((11 * year + 3) / 30) + 354 * year + 30 * month - 
+       var t;
+       t = Math.floor((11 * year + 3) / 30) + 354 * year + 30 * month -
          Math.floor((month - 1) / 2) + day + 1948440 - 385;
 ";
        $js .= "
-    return jwday(t);        
+    return jwday(t);
 ";
        }
        else
@@ -829,6 +805,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) {
@@ -839,7 +830,7 @@ function CC() {
                $js .= "
       var dateString = month+'$sep'+day+'$sep'+year;
 ";
-       else if ($how == 1)     
+       else if ($how == 1)
                $js .= "
       var dateString = day+'$sep'+month+'$sep'+year;
 ";
@@ -881,13 +872,14 @@ function CC() {
   }
   function getCurrentMonth() {
     return new Date().getMonth() + 1;
-  } 
+  }
   function getCurrentDay() {
     return new Date().getDate();
   }
   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);
@@ -895,10 +887,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>\";
@@ -911,6 +904,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';
@@ -936,7 +936,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;
   }
@@ -1050,13 +1050,15 @@ function changeCCMonth(change) {
   cC.changeMonth(change);
 }
 document.write(\"<iframe id='CCIframe' src='javascript:false;' frameBorder='0' scrolling='no'></iframe>\");
-document.write(\"<div id='CC'></div>\");
--->
-</script>
-";
-       return $js;     
+document.write(\"<div id='CC'></div>\");";
+
+     cache_js_file($fpath, $js);
+    }
+    add_js_ufile($fpath);
+
+ return '';
 }
-               
+
 function alert($msg)
 {
        echo "\n<script type=\"text/javascript\">\n"
@@ -1064,17 +1066,17 @@ function alert($msg)
                . "alert('$msg');\n"
                . "-->\n"
                . "</script>\n";
-}              
+}
 
-if (!function_exists('_vd')) 
+if (!function_exists('_vd'))
 {
-       function _vd($mixed, $title = '', $exit = false) 
+       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";
-       if ($exit) 
+       if ($exit)
                exit;
        }
 }