diff --git a/Makefile b/Makefile
new file mode 100644
index 00000000000..0a4d41800e0
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,29 @@
+.PHONY: all release clean
+
+HOST = 127.0.0.1
+PORT = 8080
+
+
+all: run
+
+run:
+	python openerp-web.py -a ${HOST} -p ${PORT}
+
+release:
+	python setup.py sdist
+
+install:
+	python setup.py install
+
+clean:
+	@find . -name '*.pyc' -exec rm -f {} +
+	@find . -name '*.pyo' -exec rm -f {} +
+	@find . -name '*.swp' -exec rm -f {} +
+	@find . -name '*~' -exec rm -f {} +
+	@rm -rf build
+	@rm -rf dist
+	@rm -rf *.egg-info
+
+cloc:
+	cloc openerpweb/*.py addons/*/controllers/*.py addons/*/static/src/*.js addons/*/static/src/js/*.js addons/*/static/src/css/*.css addons/*/static/src/xml/*.xml
+
diff --git a/addons/base/controllers/main.py b/addons/base/controllers/main.py
index efd4a7bcef9..bdedb85e63d 100644
--- a/addons/base/controllers/main.py
+++ b/addons/base/controllers/main.py
@@ -1,5 +1,6 @@
 # -*- coding: utf-8 -*-
 import glob, os
+import pprint
 from xml.etree import ElementTree
 from cStringIO import StringIO
 
@@ -9,6 +10,8 @@ import openerpweb
 import openerpweb.ast
 import openerpweb.nonliterals
 
+import cherrypy
+
 # Should move to openerpweb.Xml2Json
 class Xml2Json:
     # xml2json-direct
@@ -55,13 +58,17 @@ class Xml2Json:
 class Session(openerpweb.Controller):
     _cp_path = "/base/session"
 
-    def manifest_glob(self, modlist, key):
+    def manifest_glob(self, addons, key):
         files = []
-        for i in modlist:
-            globlist = openerpweb.addons_manifest.get(i, {}).get(key, [])
-            for j in globlist:
-                for k in glob.glob(os.path.join(openerpweb.path_addons, i, j)):
-                    files.append(k[len(openerpweb.path_addons):])
+        for addon in addons:
+            globlist = openerpweb.addons_manifest.get(addon, {}).get(key, [])
+
+            files.extend([
+                resource_path[len(openerpweb.path_addons):]
+                for pattern in globlist
+                for resource_path in glob.glob(os.path.join(
+                    openerpweb.path_addons, addon, pattern))
+            ])
         return files
 
     def concat_files(self, file_list):
@@ -93,14 +100,16 @@ class Session(openerpweb.Controller):
 
     @openerpweb.jsonrequest
     def modules(self, req):
-        return {"modules": ["base", "base_hello", "base_calendar", "base_gantt", "base_graph"]}
+        return {"modules": [name
+            for name, manifest in openerpweb.addons_manifest.iteritems()
+            if manifest.get('active', True)]}
 
     @openerpweb.jsonrequest
-    def csslist(self, req, mods='base,base_hello'):
+    def csslist(self, req, mods='base'):
         return {'files': self.manifest_glob(mods.split(','), 'css')}
 
     @openerpweb.jsonrequest
-    def jslist(self, req, mods='base,base_hello'):
+    def jslist(self, req, mods='base'):
         return {'files': self.manifest_glob(mods.split(','), 'js')}
 
     def css(self, req, mods='base,base_hello'):
@@ -169,25 +178,70 @@ class Session(openerpweb.Controller):
             'group_by': group_by_sequence
         }
 
+    @openerpweb.jsonrequest
+    def save_session_action(self, req, the_action):
+        """
+        This method store an action object in the session object and returns an integer
+        identifying that action. The method get_session_action() can be used to get
+        back the action.
+        
+        :param the_action: The action to save in the session.
+        :type the_action: anything
+        :return: A key identifying the saved action.
+        :rtype: integer
+        """
+        saved_actions = cherrypy.session.get('saved_actions')
+        if not saved_actions:
+            saved_actions = {"next":0, "actions":{}}
+            cherrypy.session['saved_actions'] = saved_actions
+        # we don't allow more than 10 stored actions
+        if len(saved_actions["actions"]) >= 10:
+            del saved_actions["actions"][min(saved_actions["actions"].keys())]
+        key = saved_actions["next"]
+        saved_actions["actions"][key] = the_action
+        saved_actions["next"] = key + 1
+        return key
+
+    @openerpweb.jsonrequest
+    def get_session_action(self, req, key):
+        """
+        Gets back a previously saved action. This method can return None if the action
+        was saved since too much time (this case should be handled in a smart way).
+        
+        :param key: The key given by save_session_action()
+        :type key: integer
+        :return: The saved action or None.
+        :rtype: anything
+        """
+        saved_actions = cherrypy.session.get('saved_actions')
+        if not saved_actions:
+            return None
+        return saved_actions["actions"].get(key)
+        
+        
 def load_actions_from_ir_values(req, key, key2, models, meta, context):
     Values = req.session.model('ir.values')
     actions = Values.get(key, key2, models, meta, context)
 
     for _, _, action in actions:
-        # values come from the server, we can just eval them
-        if isinstance(action['context'], basestring):
-            action['context'] = eval(
-                action['context'],
-                req.session.evaluation_context()) or {}
+        clean_action(action, req.session)
 
-        if isinstance(action['domain'], basestring):
-            action['domain'] = eval(
-                action['domain'],
-                req.session.evaluation_context(
-                    action['context'])) or []
-        fix_view_modes(action)
     return actions
 
+def clean_action(action, session):
+    # values come from the server, we can just eval them
+    if isinstance(action['context'], basestring):
+        action['context'] = eval(
+            action['context'],
+            session.evaluation_context()) or {}
+
+    if isinstance(action['domain'], basestring):
+        action['domain'] = eval(
+            action['domain'],
+            session.evaluation_context(
+                action['context'])) or []
+    fix_view_modes(action)
+
 def fix_view_modes(action):
     """ For historical reasons, OpenERP has weird dealings in relation to
     view_mode and the view_type attribute (on window actions):
@@ -239,7 +293,7 @@ class Menu(openerpweb.Controller):
         menu_items = Menus.read(menu_ids, ['name', 'sequence', 'parent_id'])
         menu_root = {'id': False, 'name': 'root', 'parent_id': [-1, '']}
         menu_items.append(menu_root)
-
+        
         # make a tree using parent_id
         menu_items_map = dict((menu_item["id"], menu_item) for menu_item in menu_items)
         for menu_item in menu_items:
@@ -287,18 +341,17 @@ class DataSet(openerpweb.Controller):
         :param int offset: from which index should the results start being returned
         :param int limit: the maximum number of records to return
         :param list domain: the search domain for the query
-        :param dict context: the context in which the search should be executed
         :param list sort: sorting directives
         :returns: a list of result records
         :rtype: list
         """
         Model = request.session.model(model)
         ids = Model.search(domain or [], offset or 0, limit or False,
-                           sort or False, context or False)
+                           sort or False, request.context)
         if fields and fields == ['id']:
             # shortcut read if we only want the ids
             return map(lambda id: {'id': id}, ids)
-        return Model.read(ids, fields or False)
+        return Model.read(ids, fields or False, request.context)
 
     @openerpweb.jsonrequest
     def get(self, request, model, ids, fields=False):
@@ -316,6 +369,9 @@ class DataSet(openerpweb.Controller):
         :type model: str
         :param ids: a list of identifiers
         :type ids: list
+        :param fields: a list of fields to fetch, ``False`` or empty to fetch
+                       all fields in the model
+        :type fields: list | False
         :returns: a list of records, in the same order as the list of ids
         :rtype: list
         """
@@ -335,6 +391,12 @@ class DataSet(openerpweb.Controller):
             value = r[0]
         return {'value': value}
 
+    @openerpweb.jsonrequest
+    def create(self, req, model, data, context={}):
+        m = req.session.model(model)
+        r = m.create(data, context)
+        return {'result': r}
+
     @openerpweb.jsonrequest
     def save(self, req, model, id, data, context={}):
         m = req.session.model(model)
@@ -354,16 +416,20 @@ class DataSet(openerpweb.Controller):
         return {'result': r}
 
 class View(openerpweb.Controller):
-    def fields_view_get(self, session, model, view_id, view_type, transform=True):
-        Model = session.model(model)
-        r = Model.fields_view_get(view_id, view_type)
+    def fields_view_get(self, request, model, view_id, view_type,
+                        transform=True, toolbar=False, submenu=False):
+        Model = request.session.model(model)
+        fvg = Model.fields_view_get(view_id, view_type, request.context,
+                                    toolbar, submenu)
         if transform:
-            context = {} # TODO: dict(ctx_sesssion, **ctx_action)
-            xml = self.transform_view(r['arch'], session, context)
+            evaluation_context = request.session.evaluation_context(
+                request.context or {})
+            xml = self.transform_view(
+                fvg['arch'], request.session, evaluation_context)
         else:
-            xml = ElementTree.fromstring(r['arch'])
-        r['arch'] = Xml2Json.convert_element(xml)
-        return r
+            xml = ElementTree.fromstring(fvg['arch'])
+        fvg['arch'] = Xml2Json.convert_element(xml)
+        return fvg
 
     def normalize_attrs(self, elem, context):
         """ Normalize @attrs, @invisible, @required, @readonly and @states, so
@@ -377,19 +443,16 @@ class View(openerpweb.Controller):
         :param dict context: evaluation context
         """
         # If @attrs is normalized in json by server, the eval should be replaced by simplejson.loads
-        attrs = eval(elem.attrib.get('attrs', '{}'))
+        attrs = openerpweb.ast.literal_eval(elem.get('attrs', '{}'))
         if 'states' in elem.attrib:
-            if 'invisible' not in attrs:
-                attrs['invisible'] = []
-                # This should be done by the server
-            attrs['invisible'].append(('state', 'not in', elem.attrib['states'].split(',')))
-            del(elem.attrib['states'])
+            attrs.setdefault('invisible', [])\
+                .append(('state', 'not in', elem.attrib.pop('states').split(',')))
         if attrs:
-            elem.attrib['attrs'] = simplejson.dumps(attrs)
+            elem.set('attrs', simplejson.dumps(attrs))
         for a in ['invisible', 'readonly', 'required']:
             if a in elem.attrib:
                 # In the XML we trust
-                avalue = bool(eval(elem.attrib.get(a, 'False'),
+                avalue = bool(eval(elem.get(a, 'False'),
                                    {'context': context or {}}))
                 if not avalue:
                     del elem.attrib[a]
@@ -460,35 +523,97 @@ class FormView(View):
     _cp_path = "/base/formview"
 
     @openerpweb.jsonrequest
-    def load(self, req, model, view_id):
-        fields_view = self.fields_view_get(req.session, model, view_id, 'form')
+    def load(self, req, model, view_id, toolbar=False):
+        fields_view = self.fields_view_get(req, model, view_id, 'form', toolbar=toolbar)
         return {'fields_view': fields_view}
 
 class ListView(View):
     _cp_path = "/base/listview"
 
     @openerpweb.jsonrequest
-    def load(self, req, model, view_id):
-        fields_view = self.fields_view_get(req.session, model, view_id, 'tree')
+    def load(self, req, model, view_id, toolbar=False):
+        fields_view = self.fields_view_get(req, model, view_id, 'tree', toolbar=toolbar)
         return {'fields_view': fields_view}
 
+    def fields_view_get(self, request, model, view_id, view_type="tree",
+                        transform=True, toolbar=False, submenu=False):
+        """ Sets @editable on the view's arch if it isn't already set and
+        ``set_editable`` is present in the request context
+        """
+        view = super(ListView, self).fields_view_get(
+            request, model, view_id, view_type, transform, toolbar, submenu)
+
+        view_attributes = view['arch']['attrs']
+        if request.context.get('set_editable')\
+                and 'editable' not in view_attributes:
+            view_attributes['editable'] = 'bottom'
+        return view
+
+    @openerpweb.jsonrequest
+    def fill(self, request, model, id, domain,
+             offset=0, limit=False):
+        return self.do_fill(request, model, id, domain, offset, limit)
+
+    def do_fill(self, request, model, id, domain,
+                offset=0, limit=False):
+        """ Returns all information needed to fill a table:
+
+        * view with processed ``editable`` flag
+        * fields (columns) with processed ``invisible`` flag
+        * rows with processed ``attrs`` and ``colors``
+
+        .. note:: context is passed through ``request`` parameter
+
+        :param request: OpenERP request
+        :type request: openerpweb.openerpweb.JsonRequest
+        :type str model: OpenERP model for this list view
+        :type int id: view_id, or False if none provided
+        :param list domain: the search domain to search for
+        :param int offset: search offset, for pagination
+        :param int limit: search limit, for pagination
+        :returns: hell if I have any idea yet
+        """
+        view = self.fields_view_get(request, model, id)
+
+        rows = DataSet().do_search_read(request, model,
+                                        offset=offset, limit=limit,
+                                        domain=domain)
+        eval_context = request.session.evaluation_context(
+            request.context)
+        return [
+            {'data': dict((key, {'value': value})
+                          for key, value in row.iteritems()),
+             'color': self.process_colors(view, row, eval_context)}
+            for row in rows
+        ]
+
+    def process_colors(self, view, row, context):
+        colors = view['arch']['attrs'].get('colors')
+
+        if not colors:
+            return None
+
+        color = [
+            pair.split(':')[0]
+            for pair in colors.split(';')
+            if eval(pair.split(':')[1], dict(context, **row))
+        ]
+
+        if not color:
+            return None
+        elif len(color) == 1:
+            return color[0]
+        return 'maroon'
+
+
 class SearchView(View):
     _cp_path = "/base/searchview"
 
     @openerpweb.jsonrequest
     def load(self, req, model, view_id):
-        fields_view = self.fields_view_get(req.session, model, view_id, 'search')
+        fields_view = self.fields_view_get(req, model, view_id, 'search')
         return {'fields_view': fields_view}
 
-class SideBar(View):
-    _cp_path = "/base/sidebar"
-
-    @openerpweb.jsonrequest
-    def get_actions(self, request, model, object_id=0):
-        result = load_actions_from_ir_values(request, "action", "client_action_multi",
-                                             [[model, object_id]], False, {})
-        return result
-
 class Action(openerpweb.Controller):
     _cp_path = "/base/action"
 
diff --git a/addons/base/static/lib/jquery.ba-bbq/jquery.ba-bbq.js b/addons/base/static/lib/jquery.ba-bbq/jquery.ba-bbq.js
new file mode 100644
index 00000000000..f251123acd7
--- /dev/null
+++ b/addons/base/static/lib/jquery.ba-bbq/jquery.ba-bbq.js
@@ -0,0 +1,1137 @@
+/*!
+ * jQuery BBQ: Back Button & Query Library - v1.2.1 - 2/17/2010
+ * http://benalman.com/projects/jquery-bbq-plugin/
+ * 
+ * Copyright (c) 2010 "Cowboy" Ben Alman
+ * Dual licensed under the MIT and GPL licenses.
+ * http://benalman.com/about/license/
+ */
+
+// Script: jQuery BBQ: Back Button & Query Library
+//
+// *Version: 1.2.1, Last updated: 2/17/2010*
+// 
+// Project Home - http://benalman.com/projects/jquery-bbq-plugin/
+// GitHub       - http://github.com/cowboy/jquery-bbq/
+// Source       - http://github.com/cowboy/jquery-bbq/raw/master/jquery.ba-bbq.js
+// (Minified)   - http://github.com/cowboy/jquery-bbq/raw/master/jquery.ba-bbq.min.js (4.0kb)
+// 
+// About: License
+// 
+// Copyright (c) 2010 "Cowboy" Ben Alman,
+// Dual licensed under the MIT and GPL licenses.
+// http://benalman.com/about/license/
+// 
+// About: Examples
+// 
+// These working examples, complete with fully commented code, illustrate a few
+// ways in which this plugin can be used.
+// 
+// Basic AJAX     - http://benalman.com/code/projects/jquery-bbq/examples/fragment-basic/
+// Advanced AJAX  - http://benalman.com/code/projects/jquery-bbq/examples/fragment-advanced/
+// jQuery UI Tabs - http://benalman.com/code/projects/jquery-bbq/examples/fragment-jquery-ui-tabs/
+// Deparam        - http://benalman.com/code/projects/jquery-bbq/examples/deparam/
+// 
+// About: Support and Testing
+// 
+// Information about what version or versions of jQuery this plugin has been
+// tested with, what browsers it has been tested in, and where the unit tests
+// reside (so you can test it yourself).
+// 
+// jQuery Versions - 1.3.2, 1.4.1, 1.4.2
+// Browsers Tested - Internet Explorer 6-8, Firefox 2-3.7, Safari 3-4,
+//                   Chrome 4-5, Opera 9.6-10.1.
+// Unit Tests      - http://benalman.com/code/projects/jquery-bbq/unit/
+// 
+// About: Release History
+// 
+// 1.2.1 - (2/17/2010) Actually fixed the stale window.location Safari bug from
+//         <jQuery hashchange event> in BBQ, which was the main reason for the
+//         previous release!
+// 1.2   - (2/16/2010) Integrated <jQuery hashchange event> v1.2, which fixes a
+//         Safari bug, the event can now be bound before DOM ready, and IE6/7
+//         page should no longer scroll when the event is first bound. Also
+//         added the <jQuery.param.fragment.noEscape> method, and reworked the
+//         <hashchange event (BBQ)> internal "add" method to be compatible with
+//         changes made to the jQuery 1.4.2 special events API.
+// 1.1.1 - (1/22/2010) Integrated <jQuery hashchange event> v1.1, which fixes an
+//         obscure IE8 EmulateIE7 meta tag compatibility mode bug.
+// 1.1   - (1/9/2010) Broke out the jQuery BBQ event.special <hashchange event>
+//         functionality into a separate plugin for users who want just the
+//         basic event & back button support, without all the extra awesomeness
+//         that BBQ provides. This plugin will be included as part of jQuery BBQ,
+//         but also be available separately. See <jQuery hashchange event>
+//         plugin for more information. Also added the <jQuery.bbq.removeState>
+//         method and added additional <jQuery.deparam> examples.
+// 1.0.3 - (12/2/2009) Fixed an issue in IE 6 where location.search and
+//         location.hash would report incorrectly if the hash contained the ?
+//         character. Also <jQuery.param.querystring> and <jQuery.param.fragment>
+//         will no longer parse params out of a URL that doesn't contain ? or #,
+//         respectively.
+// 1.0.2 - (10/10/2009) Fixed an issue in IE 6/7 where the hidden IFRAME caused
+//         a "This page contains both secure and nonsecure items." warning when
+//         used on an https:// page.
+// 1.0.1 - (10/7/2009) Fixed an issue in IE 8. Since both "IE7" and "IE8
+//         Compatibility View" modes erroneously report that the browser
+//         supports the native window.onhashchange event, a slightly more
+//         robust test needed to be added.
+// 1.0   - (10/2/2009) Initial release
+
+(function($,window){
+  '$:nomunge'; // Used by YUI compressor.
+  
+  // Some convenient shortcuts.
+  var undefined,
+    aps = Array.prototype.slice,
+    decode = decodeURIComponent,
+    
+    // Method / object references.
+    jq_param = $.param,
+    jq_param_fragment,
+    jq_deparam,
+    jq_deparam_fragment,
+    jq_bbq = $.bbq = $.bbq || {},
+    jq_bbq_pushState,
+    jq_bbq_getState,
+    jq_elemUrlAttr,
+    jq_event_special = $.event.special,
+    
+    // Reused strings.
+    str_hashchange = 'hashchange',
+    str_querystring = 'querystring',
+    str_fragment = 'fragment',
+    str_elemUrlAttr = 'elemUrlAttr',
+    str_location = 'location',
+    str_href = 'href',
+    str_src = 'src',
+    
+    // Reused RegExp.
+    re_trim_querystring = /^.*\?|#.*$/g,
+    re_trim_fragment = /^.*\#/,
+    re_no_escape,
+    
+    // Used by jQuery.elemUrlAttr.
+    elemUrlAttr_cache = {};
+  
+  // A few commonly used bits, broken out to help reduce minified file size.
+  
+  function is_string( arg ) {
+    return typeof arg === 'string';
+  };
+  
+  // Why write the same function twice? Let's curry! Mmmm, curry..
+  
+  function curry( func ) {
+    var args = aps.call( arguments, 1 );
+    
+    return function() {
+      return func.apply( this, args.concat( aps.call( arguments ) ) );
+    };
+  };
+  
+  // Get location.hash (or what you'd expect location.hash to be) sans any
+  // leading #. Thanks for making this necessary, Firefox!
+  function get_fragment( url ) {
+    return url.replace( /^[^#]*#?(.*)$/, '$1' );
+  };
+  
+  // Get location.search (or what you'd expect location.search to be) sans any
+  // leading #. Thanks for making this necessary, IE6!
+  function get_querystring( url ) {
+    return url.replace( /(?:^[^?#]*\?([^#]*).*$)?.*/, '$1' );
+  };
+  
+  // Section: Param (to string)
+  // 
+  // Method: jQuery.param.querystring
+  // 
+  // Retrieve the query string from a URL or if no arguments are passed, the
+  // current window.location.
+  // 
+  // Usage:
+  // 
+  // > jQuery.param.querystring( [ url ] );
+  // 
+  // Arguments:
+  // 
+  //  url - (String) A URL containing query string params to be parsed. If url
+  //    is not passed, the current window.location is used.
+  // 
+  // Returns:
+  // 
+  //  (String) The parsed query string, with any leading "?" removed.
+  //
+  
+  // Method: jQuery.param.querystring (build url)
+  // 
+  // Merge a URL, with or without pre-existing query string params, plus any
+  // object, params string or URL containing query string params into a new URL.
+  // 
+  // Usage:
+  // 
+  // > jQuery.param.querystring( url, params [, merge_mode ] );
+  // 
+  // Arguments:
+  // 
+  //  url - (String) A valid URL for params to be merged into. This URL may
+  //    contain a query string and/or fragment (hash).
+  //  params - (String) A params string or URL containing query string params to
+  //    be merged into url.
+  //  params - (Object) A params object to be merged into url.
+  //  merge_mode - (Number) Merge behavior defaults to 0 if merge_mode is not
+  //    specified, and is as-follows:
+  // 
+  //    * 0: params in the params argument will override any query string
+  //         params in url.
+  //    * 1: any query string params in url will override params in the params
+  //         argument.
+  //    * 2: params argument will completely replace any query string in url.
+  // 
+  // Returns:
+  // 
+  //  (String) Either a params string with urlencoded data or a URL with a
+  //    urlencoded query string in the format 'a=b&c=d&e=f'.
+  
+  // Method: jQuery.param.fragment
+  // 
+  // Retrieve the fragment (hash) from a URL or if no arguments are passed, the
+  // current window.location.
+  // 
+  // Usage:
+  // 
+  // > jQuery.param.fragment( [ url ] );
+  // 
+  // Arguments:
+  // 
+  //  url - (String) A URL containing fragment (hash) params to be parsed. If
+  //    url is not passed, the current window.location is used.
+  // 
+  // Returns:
+  // 
+  //  (String) The parsed fragment (hash) string, with any leading "#" removed.
+  
+  // Method: jQuery.param.fragment (build url)
+  // 
+  // Merge a URL, with or without pre-existing fragment (hash) params, plus any
+  // object, params string or URL containing fragment (hash) params into a new
+  // URL.
+  // 
+  // Usage:
+  // 
+  // > jQuery.param.fragment( url, params [, merge_mode ] );
+  // 
+  // Arguments:
+  // 
+  //  url - (String) A valid URL for params to be merged into. This URL may
+  //    contain a query string and/or fragment (hash).
+  //  params - (String) A params string or URL containing fragment (hash) params
+  //    to be merged into url.
+  //  params - (Object) A params object to be merged into url.
+  //  merge_mode - (Number) Merge behavior defaults to 0 if merge_mode is not
+  //    specified, and is as-follows:
+  // 
+  //    * 0: params in the params argument will override any fragment (hash)
+  //         params in url.
+  //    * 1: any fragment (hash) params in url will override params in the
+  //         params argument.
+  //    * 2: params argument will completely replace any query string in url.
+  // 
+  // Returns:
+  // 
+  //  (String) Either a params string with urlencoded data or a URL with a
+  //    urlencoded fragment (hash) in the format 'a=b&c=d&e=f'.
+  
+  function jq_param_sub( is_fragment, get_func, url, params, merge_mode ) {
+    var result,
+      qs,
+      matches,
+      url_params,
+      hash;
+    
+    if ( params !== undefined ) {
+      // Build URL by merging params into url string.
+      
+      // matches[1] = url part that precedes params, not including trailing ?/#
+      // matches[2] = params, not including leading ?/#
+      // matches[3] = if in 'querystring' mode, hash including leading #, otherwise ''
+      matches = url.match( is_fragment ? /^([^#]*)\#?(.*)$/ : /^([^#?]*)\??([^#]*)(#?.*)/ );
+      
+      // Get the hash if in 'querystring' mode, and it exists.
+      hash = matches[3] || '';
+      
+      if ( merge_mode === 2 && is_string( params ) ) {
+        // If merge_mode is 2 and params is a string, merge the fragment / query
+        // string into the URL wholesale, without converting it into an object.
+        qs = params.replace( is_fragment ? re_trim_fragment : re_trim_querystring, '' );
+        
+      } else {
+        // Convert relevant params in url to object.
+        url_params = jq_deparam( matches[2] );
+        
+        params = is_string( params )
+          
+          // Convert passed params string into object.
+          ? jq_deparam[ is_fragment ? str_fragment : str_querystring ]( params )
+          
+          // Passed params object.
+          : params;
+        
+        qs = merge_mode === 2 ? params                              // passed params replace url params
+          : merge_mode === 1  ? $.extend( {}, params, url_params )  // url params override passed params
+          : $.extend( {}, url_params, params );                     // passed params override url params
+        
+        // Convert params object to a string.
+        qs = jq_param( qs );
+        
+        // Unescape characters specified via $.param.noEscape. Since only hash-
+        // history users have requested this feature, it's only enabled for
+        // fragment-related params strings.
+        if ( is_fragment ) {
+          qs = qs.replace( re_no_escape, decode );
+        }
+      }
+      
+      // Build URL from the base url, querystring and hash. In 'querystring'
+      // mode, ? is only added if a query string exists. In 'fragment' mode, #
+      // is always added.
+      result = matches[1] + ( is_fragment ? '#' : qs || !matches[1] ? '?' : '' ) + qs + hash;
+      
+    } else {
+      // If URL was passed in, parse params from URL string, otherwise parse
+      // params from window.location.
+      result = get_func( url !== undefined ? url : window[ str_location ][ str_href ] );
+    }
+    
+    return result;
+  };
+  
+  jq_param[ str_querystring ]                  = curry( jq_param_sub, 0, get_querystring );
+  jq_param[ str_fragment ] = jq_param_fragment = curry( jq_param_sub, 1, get_fragment );
+  
+  // Method: jQuery.param.fragment.noEscape
+  // 
+  // Specify characters that will be left unescaped when fragments are created
+  // or merged using <jQuery.param.fragment>, or when the fragment is modified
+  // using <jQuery.bbq.pushState>. This option only applies to serialized data
+  // object fragments, and not set-as-string fragments. Does not affect the
+  // query string. Defaults to ",/" (comma, forward slash).
+  // 
+  // Note that this is considered a purely aesthetic option, and will help to
+  // create URLs that "look pretty" in the address bar or bookmarks, without
+  // affecting functionality in any way. That being said, be careful to not
+  // unescape characters that are used as delimiters or serve a special
+  // purpose, such as the "#?&=+" (octothorpe, question mark, ampersand,
+  // equals, plus) characters.
+  // 
+  // Usage:
+  // 
+  // > jQuery.param.fragment.noEscape( [ chars ] );
+  // 
+  // Arguments:
+  // 
+  //  chars - (String) The characters to not escape in the fragment. If
+  //    unspecified, defaults to empty string (escape all characters).
+  // 
+  // Returns:
+  // 
+  //  Nothing.
+  
+  jq_param_fragment.noEscape = function( chars ) {
+    chars = chars || '';
+    var arr = $.map( chars.split(''), encodeURIComponent );
+    re_no_escape = new RegExp( arr.join('|'), 'g' );
+  };
+  
+  // A sensible default. These are the characters people seem to complain about
+  // "uglifying up the URL" the most.
+  jq_param_fragment.noEscape( ',/' );
+  
+  // Section: Deparam (from string)
+  // 
+  // Method: jQuery.deparam
+  // 
+  // Deserialize a params string into an object, optionally coercing numbers,
+  // booleans, null and undefined values; this method is the counterpart to the
+  // internal jQuery.param method.
+  // 
+  // Usage:
+  // 
+  // > jQuery.deparam( params [, coerce ] );
+  // 
+  // Arguments:
+  // 
+  //  params - (String) A params string to be parsed.
+  //  coerce - (Boolean) If true, coerces any numbers or true, false, null, and
+  //    undefined to their actual value. Defaults to false if omitted.
+  // 
+  // Returns:
+  // 
+  //  (Object) An object representing the deserialized params string.
+  
+  $.deparam = jq_deparam = function( params, coerce ) {
+    var obj = {},
+      coerce_types = { 'true': !0, 'false': !1, 'null': null };
+    
+    // Iterate over all name=value pairs.
+    $.each( params.replace( /\+/g, ' ' ).split( '&' ), function(j,v){
+      var param = v.split( '=' ),
+        key = decode( param[0] ),
+        val,
+        cur = obj,
+        i = 0,
+        
+        // If key is more complex than 'foo', like 'a[]' or 'a[b][c]', split it
+        // into its component parts.
+        keys = key.split( '][' ),
+        keys_last = keys.length - 1;
+      
+      // If the first keys part contains [ and the last ends with ], then []
+      // are correctly balanced.
+      if ( /\[/.test( keys[0] ) && /\]$/.test( keys[ keys_last ] ) ) {
+        // Remove the trailing ] from the last keys part.
+        keys[ keys_last ] = keys[ keys_last ].replace( /\]$/, '' );
+        
+        // Split first keys part into two parts on the [ and add them back onto
+        // the beginning of the keys array.
+        keys = keys.shift().split('[').concat( keys );
+        
+        keys_last = keys.length - 1;
+      } else {
+        // Basic 'foo' style key.
+        keys_last = 0;
+      }
+      
+      // Are we dealing with a name=value pair, or just a name?
+      if ( param.length === 2 ) {
+        val = decode( param[1] );
+        
+        // Coerce values.
+        if ( coerce ) {
+          val = val && !isNaN(val)            ? +val              // number
+            : val === 'undefined'             ? undefined         // undefined
+            : coerce_types[val] !== undefined ? coerce_types[val] // true, false, null
+            : val;                                                // string
+        }
+        
+        if ( keys_last ) {
+          // Complex key, build deep object structure based on a few rules:
+          // * The 'cur' pointer starts at the object top-level.
+          // * [] = array push (n is set to array length), [n] = array if n is 
+          //   numeric, otherwise object.
+          // * If at the last keys part, set the value.
+          // * For each keys part, if the current level is undefined create an
+          //   object or array based on the type of the next keys part.
+          // * Move the 'cur' pointer to the next level.
+          // * Rinse & repeat.
+          for ( ; i <= keys_last; i++ ) {
+            key = keys[i] === '' ? cur.length : keys[i];
+            cur = cur[key] = i < keys_last
+              ? cur[key] || ( keys[i+1] && isNaN( keys[i+1] ) ? {} : [] )
+              : val;
+          }
+          
+        } else {
+          // Simple key, even simpler rules, since only scalars and shallow
+          // arrays are allowed.
+          
+          if ( $.isArray( obj[key] ) ) {
+            // val is already an array, so push on the next value.
+            obj[key].push( val );
+            
+          } else if ( obj[key] !== undefined ) {
+            // val isn't an array, but since a second value has been specified,
+            // convert val into an array.
+            obj[key] = [ obj[key], val ];
+            
+          } else {
+            // val is a scalar.
+            obj[key] = val;
+          }
+        }
+        
+      } else if ( key ) {
+        // No value was defined, so set something meaningful.
+        obj[key] = coerce
+          ? undefined
+          : '';
+      }
+    });
+    
+    return obj;
+  };
+  
+  // Method: jQuery.deparam.querystring
+  // 
+  // Parse the query string from a URL or the current window.location,
+  // deserializing it into an object, optionally coercing numbers, booleans,
+  // null and undefined values.
+  // 
+  // Usage:
+  // 
+  // > jQuery.deparam.querystring( [ url ] [, coerce ] );
+  // 
+  // Arguments:
+  // 
+  //  url - (String) An optional params string or URL containing query string
+  //    params to be parsed. If url is omitted, the current window.location
+  //    is used.
+  //  coerce - (Boolean) If true, coerces any numbers or true, false, null, and
+  //    undefined to their actual value. Defaults to false if omitted.
+  // 
+  // Returns:
+  // 
+  //  (Object) An object representing the deserialized params string.
+  
+  // Method: jQuery.deparam.fragment
+  // 
+  // Parse the fragment (hash) from a URL or the current window.location,
+  // deserializing it into an object, optionally coercing numbers, booleans,
+  // null and undefined values.
+  // 
+  // Usage:
+  // 
+  // > jQuery.deparam.fragment( [ url ] [, coerce ] );
+  // 
+  // Arguments:
+  // 
+  //  url - (String) An optional params string or URL containing fragment (hash)
+  //    params to be parsed. If url is omitted, the current window.location
+  //    is used.
+  //  coerce - (Boolean) If true, coerces any numbers or true, false, null, and
+  //    undefined to their actual value. Defaults to false if omitted.
+  // 
+  // Returns:
+  // 
+  //  (Object) An object representing the deserialized params string.
+  
+  function jq_deparam_sub( is_fragment, url_or_params, coerce ) {
+    if ( url_or_params === undefined || typeof url_or_params === 'boolean' ) {
+      // url_or_params not specified.
+      coerce = url_or_params;
+      url_or_params = jq_param[ is_fragment ? str_fragment : str_querystring ]();
+    } else {
+      url_or_params = is_string( url_or_params )
+        ? url_or_params.replace( is_fragment ? re_trim_fragment : re_trim_querystring, '' )
+        : url_or_params;
+    }
+    
+    return jq_deparam( url_or_params, coerce );
+  };
+  
+  jq_deparam[ str_querystring ]                    = curry( jq_deparam_sub, 0 );
+  jq_deparam[ str_fragment ] = jq_deparam_fragment = curry( jq_deparam_sub, 1 );
+  
+  // Section: Element manipulation
+  // 
+  // Method: jQuery.elemUrlAttr
+  // 
+  // Get the internal "Default URL attribute per tag" list, or augment the list
+  // with additional tag-attribute pairs, in case the defaults are insufficient.
+  // 
+  // In the <jQuery.fn.querystring> and <jQuery.fn.fragment> methods, this list
+  // is used to determine which attribute contains the URL to be modified, if
+  // an "attr" param is not specified.
+  // 
+  // Default Tag-Attribute List:
+  // 
+  //  a      - href
+  //  base   - href
+  //  iframe - src
+  //  img    - src
+  //  input  - src
+  //  form   - action
+  //  link   - href
+  //  script - src
+  // 
+  // Usage:
+  // 
+  // > jQuery.elemUrlAttr( [ tag_attr ] );
+  // 
+  // Arguments:
+  // 
+  //  tag_attr - (Object) An object containing a list of tag names and their
+  //    associated default attribute names in the format { tag: 'attr', ... } to
+  //    be merged into the internal tag-attribute list.
+  // 
+  // Returns:
+  // 
+  //  (Object) An object containing all stored tag-attribute values.
+  
+  // Only define function and set defaults if function doesn't already exist, as
+  // the urlInternal plugin will provide this method as well.
+  $[ str_elemUrlAttr ] || ($[ str_elemUrlAttr ] = function( obj ) {
+    return $.extend( elemUrlAttr_cache, obj );
+  })({
+    a: str_href,
+    base: str_href,
+    iframe: str_src,
+    img: str_src,
+    input: str_src,
+    form: 'action',
+    link: str_href,
+    script: str_src
+  });
+  
+  jq_elemUrlAttr = $[ str_elemUrlAttr ];
+  
+  // Method: jQuery.fn.querystring
+  // 
+  // Update URL attribute in one or more elements, merging the current URL (with
+  // or without pre-existing query string params) plus any params object or
+  // string into a new URL, which is then set into that attribute. Like
+  // <jQuery.param.querystring (build url)>, but for all elements in a jQuery
+  // collection.
+  // 
+  // Usage:
+  // 
+  // > jQuery('selector').querystring( [ attr, ] params [, merge_mode ] );
+  // 
+  // Arguments:
+  // 
+  //  attr - (String) Optional name of an attribute that will contain a URL to
+  //    merge params or url into. See <jQuery.elemUrlAttr> for a list of default
+  //    attributes.
+  //  params - (Object) A params object to be merged into the URL attribute.
+  //  params - (String) A URL containing query string params, or params string
+  //    to be merged into the URL attribute.
+  //  merge_mode - (Number) Merge behavior defaults to 0 if merge_mode is not
+  //    specified, and is as-follows:
+  //    
+  //    * 0: params in the params argument will override any params in attr URL.
+  //    * 1: any params in attr URL will override params in the params argument.
+  //    * 2: params argument will completely replace any query string in attr
+  //         URL.
+  // 
+  // Returns:
+  // 
+  //  (jQuery) The initial jQuery collection of elements, but with modified URL
+  //  attribute values.
+  
+  // Method: jQuery.fn.fragment
+  // 
+  // Update URL attribute in one or more elements, merging the current URL (with
+  // or without pre-existing fragment/hash params) plus any params object or
+  // string into a new URL, which is then set into that attribute. Like
+  // <jQuery.param.fragment (build url)>, but for all elements in a jQuery
+  // collection.
+  // 
+  // Usage:
+  // 
+  // > jQuery('selector').fragment( [ attr, ] params [, merge_mode ] );
+  // 
+  // Arguments:
+  // 
+  //  attr - (String) Optional name of an attribute that will contain a URL to
+  //    merge params into. See <jQuery.elemUrlAttr> for a list of default
+  //    attributes.
+  //  params - (Object) A params object to be merged into the URL attribute.
+  //  params - (String) A URL containing fragment (hash) params, or params
+  //    string to be merged into the URL attribute.
+  //  merge_mode - (Number) Merge behavior defaults to 0 if merge_mode is not
+  //    specified, and is as-follows:
+  //    
+  //    * 0: params in the params argument will override any params in attr URL.
+  //    * 1: any params in attr URL will override params in the params argument.
+  //    * 2: params argument will completely replace any fragment (hash) in attr
+  //         URL.
+  // 
+  // Returns:
+  // 
+  //  (jQuery) The initial jQuery collection of elements, but with modified URL
+  //  attribute values.
+  
+  function jq_fn_sub( mode, force_attr, params, merge_mode ) {
+    if ( !is_string( params ) && typeof params !== 'object' ) {
+      // force_attr not specified.
+      merge_mode = params;
+      params = force_attr;
+      force_attr = undefined;
+    }
+    
+    return this.each(function(){
+      var that = $(this),
+        
+        // Get attribute specified, or default specified via $.elemUrlAttr.
+        attr = force_attr || jq_elemUrlAttr()[ ( this.nodeName || '' ).toLowerCase() ] || '',
+        
+        // Get URL value.
+        url = attr && that.attr( attr ) || '';
+      
+      // Update attribute with new URL.
+      that.attr( attr, jq_param[ mode ]( url, params, merge_mode ) );
+    });
+    
+  };
+  
+  $.fn[ str_querystring ] = curry( jq_fn_sub, str_querystring );
+  $.fn[ str_fragment ]    = curry( jq_fn_sub, str_fragment );
+  
+  // Section: History, hashchange event
+  // 
+  // Method: jQuery.bbq.pushState
+  // 
+  // Adds a 'state' into the browser history at the current position, setting
+  // location.hash and triggering any bound <hashchange event> callbacks
+  // (provided the new state is different than the previous state).
+  // 
+  // If no arguments are passed, an empty state is created, which is just a
+  // shortcut for jQuery.bbq.pushState( {}, 2 ).
+  // 
+  // Usage:
+  // 
+  // > jQuery.bbq.pushState( [ params [, merge_mode ] ] );
+  // 
+  // Arguments:
+  // 
+  //  params - (String) A serialized params string or a hash string beginning
+  //    with # to merge into location.hash.
+  //  params - (Object) A params object to merge into location.hash.
+  //  merge_mode - (Number) Merge behavior defaults to 0 if merge_mode is not
+  //    specified (unless a hash string beginning with # is specified, in which
+  //    case merge behavior defaults to 2), and is as-follows:
+  // 
+  //    * 0: params in the params argument will override any params in the
+  //         current state.
+  //    * 1: any params in the current state will override params in the params
+  //         argument.
+  //    * 2: params argument will completely replace current state.
+  // 
+  // Returns:
+  // 
+  //  Nothing.
+  // 
+  // Additional Notes:
+  // 
+  //  * Setting an empty state may cause the browser to scroll.
+  //  * Unlike the fragment and querystring methods, if a hash string beginning
+  //    with # is specified as the params agrument, merge_mode defaults to 2.
+  
+  jq_bbq.pushState = jq_bbq_pushState = function( params, merge_mode ) {
+    if ( is_string( params ) && /^#/.test( params ) && merge_mode === undefined ) {
+      // Params string begins with # and merge_mode not specified, so completely
+      // overwrite window.location.hash.
+      merge_mode = 2;
+    }
+    
+    var has_args = params !== undefined,
+      // Merge params into window.location using $.param.fragment.
+      url = jq_param_fragment( window[ str_location ][ str_href ],
+        has_args ? params : {}, has_args ? merge_mode : 2 );
+    
+    // Set new window.location.href. If hash is empty, use just # to prevent
+    // browser from reloading the page. Note that Safari 3 & Chrome barf on
+    // location.hash = '#'.
+    window[ str_location ][ str_href ] = url + ( /#/.test( url ) ? '' : '#' );
+  };
+  
+  // Method: jQuery.bbq.getState
+  // 
+  // Retrieves the current 'state' from the browser history, parsing
+  // location.hash for a specific key or returning an object containing the
+  // entire state, optionally coercing numbers, booleans, null and undefined
+  // values.
+  // 
+  // Usage:
+  // 
+  // > jQuery.bbq.getState( [ key ] [, coerce ] );
+  // 
+  // Arguments:
+  // 
+  //  key - (String) An optional state key for which to return a value.
+  //  coerce - (Boolean) If true, coerces any numbers or true, false, null, and
+  //    undefined to their actual value. Defaults to false.
+  // 
+  // Returns:
+  // 
+  //  (Anything) If key is passed, returns the value corresponding with that key
+  //    in the location.hash 'state', or undefined. If not, an object
+  //    representing the entire 'state' is returned.
+  
+  jq_bbq.getState = jq_bbq_getState = function( key, coerce ) {
+    return key === undefined || typeof key === 'boolean'
+      ? jq_deparam_fragment( key ) // 'key' really means 'coerce' here
+      : jq_deparam_fragment( coerce )[ key ];
+  };
+  
+  // Method: jQuery.bbq.removeState
+  // 
+  // Remove one or more keys from the current browser history 'state', creating
+  // a new state, setting location.hash and triggering any bound
+  // <hashchange event> callbacks (provided the new state is different than
+  // the previous state).
+  // 
+  // If no arguments are passed, an empty state is created, which is just a
+  // shortcut for jQuery.bbq.pushState( {}, 2 ).
+  // 
+  // Usage:
+  // 
+  // > jQuery.bbq.removeState( [ key [, key ... ] ] );
+  // 
+  // Arguments:
+  // 
+  //  key - (String) One or more key values to remove from the current state,
+  //    passed as individual arguments.
+  //  key - (Array) A single array argument that contains a list of key values
+  //    to remove from the current state.
+  // 
+  // Returns:
+  // 
+  //  Nothing.
+  // 
+  // Additional Notes:
+  // 
+  //  * Setting an empty state may cause the browser to scroll.
+  
+  jq_bbq.removeState = function( arr ) {
+    var state = {};
+    
+    // If one or more arguments is passed..
+    if ( arr !== undefined ) {
+      
+      // Get the current state.
+      state = jq_bbq_getState();
+      
+      // For each passed key, delete the corresponding property from the current
+      // state.
+      $.each( $.isArray( arr ) ? arr : arguments, function(i,v){
+        delete state[ v ];
+      });
+    }
+    
+    // Set the state, completely overriding any existing state.
+    jq_bbq_pushState( state, 2 );
+  };
+  
+  // Event: hashchange event (BBQ)
+  // 
+  // Usage in jQuery 1.4 and newer:
+  // 
+  // In jQuery 1.4 and newer, the event object passed into any hashchange event
+  // callback is augmented with a copy of the location.hash fragment at the time
+  // the event was triggered as its event.fragment property. In addition, the
+  // event.getState method operates on this property (instead of location.hash)
+  // which allows this fragment-as-a-state to be referenced later, even after
+  // window.location may have changed.
+  // 
+  // Note that event.fragment and event.getState are not defined according to
+  // W3C (or any other) specification, but will still be available whether or
+  // not the hashchange event exists natively in the browser, because of the
+  // utility they provide.
+  // 
+  // The event.fragment property contains the output of <jQuery.param.fragment>
+  // and the event.getState method is equivalent to the <jQuery.bbq.getState>
+  // method.
+  // 
+  // > $(window).bind( 'hashchange', function( event ) {
+  // >   var hash_str = event.fragment,
+  // >     param_obj = event.getState(),
+  // >     param_val = event.getState( 'param_name' ),
+  // >     param_val_coerced = event.getState( 'param_name', true );
+  // >   ...
+  // > });
+  // 
+  // Usage in jQuery 1.3.2:
+  // 
+  // In jQuery 1.3.2, the event object cannot to be augmented as in jQuery 1.4+,
+  // so the fragment state isn't bound to the event object and must instead be
+  // parsed using the <jQuery.param.fragment> and <jQuery.bbq.getState> methods.
+  // 
+  // > $(window).bind( 'hashchange', function( event ) {
+  // >   var hash_str = $.param.fragment(),
+  // >     param_obj = $.bbq.getState(),
+  // >     param_val = $.bbq.getState( 'param_name' ),
+  // >     param_val_coerced = $.bbq.getState( 'param_name', true );
+  // >   ...
+  // > });
+  // 
+  // Additional Notes:
+  // 
+  // * Due to changes in the special events API, jQuery BBQ v1.2 or newer is
+  //   required to enable the augmented event object in jQuery 1.4.2 and newer.
+  // * See <jQuery hashchange event> for more detailed information.
+  
+  jq_event_special[ str_hashchange ] = $.extend( jq_event_special[ str_hashchange ], {
+    
+    // Augmenting the event object with the .fragment property and .getState
+    // method requires jQuery 1.4 or newer. Note: with 1.3.2, everything will
+    // work, but the event won't be augmented)
+    add: function( handleObj ) {
+      var old_handler;
+      
+      function new_handler(e) {
+        // e.fragment is set to the value of location.hash (with any leading #
+        // removed) at the time the event is triggered.
+        var hash = e[ str_fragment ] = jq_param_fragment();
+        
+        // e.getState() works just like $.bbq.getState(), but uses the
+        // e.fragment property stored on the event object.
+        e.getState = function( key, coerce ) {
+          return key === undefined || typeof key === 'boolean'
+            ? jq_deparam( hash, key ) // 'key' really means 'coerce' here
+            : jq_deparam( hash, coerce )[ key ];
+        };
+        
+        old_handler.apply( this, arguments );
+      };
+      
+      // This may seem a little complicated, but it normalizes the special event
+      // .add method between jQuery 1.4/1.4.1 and 1.4.2+
+      if ( $.isFunction( handleObj ) ) {
+        // 1.4, 1.4.1
+        old_handler = handleObj;
+        return new_handler;
+      } else {
+        // 1.4.2+
+        old_handler = handleObj.handler;
+        handleObj.handler = new_handler;
+      }
+    }
+    
+  });
+  
+})(jQuery,this);
+
+/*!
+ * jQuery hashchange event - v1.2 - 2/11/2010
+ * http://benalman.com/projects/jquery-hashchange-plugin/
+ * 
+ * Copyright (c) 2010 "Cowboy" Ben Alman
+ * Dual licensed under the MIT and GPL licenses.
+ * http://benalman.com/about/license/
+ */
+
+// Script: jQuery hashchange event
+//
+// *Version: 1.2, Last updated: 2/11/2010*
+// 
+// Project Home - http://benalman.com/projects/jquery-hashchange-plugin/
+// GitHub       - http://github.com/cowboy/jquery-hashchange/
+// Source       - http://github.com/cowboy/jquery-hashchange/raw/master/jquery.ba-hashchange.js
+// (Minified)   - http://github.com/cowboy/jquery-hashchange/raw/master/jquery.ba-hashchange.min.js (1.1kb)
+// 
+// About: License
+// 
+// Copyright (c) 2010 "Cowboy" Ben Alman,
+// Dual licensed under the MIT and GPL licenses.
+// http://benalman.com/about/license/
+// 
+// About: Examples
+// 
+// This working example, complete with fully commented code, illustrate one way
+// in which this plugin can be used.
+// 
+// hashchange event - http://benalman.com/code/projects/jquery-hashchange/examples/hashchange/
+// 
+// About: Support and Testing
+// 
+// Information about what version or versions of jQuery this plugin has been
+// tested with, what browsers it has been tested in, and where the unit tests
+// reside (so you can test it yourself).
+// 
+// jQuery Versions - 1.3.2, 1.4.1, 1.4.2
+// Browsers Tested - Internet Explorer 6-8, Firefox 2-3.7, Safari 3-4, Chrome, Opera 9.6-10.1.
+// Unit Tests      - http://benalman.com/code/projects/jquery-hashchange/unit/
+// 
+// About: Known issues
+// 
+// While this jQuery hashchange event implementation is quite stable and robust,
+// there are a few unfortunate browser bugs surrounding expected hashchange
+// event-based behaviors, independent of any JavaScript window.onhashchange
+// abstraction. See the following examples for more information:
+// 
+// Chrome: Back Button - http://benalman.com/code/projects/jquery-hashchange/examples/bug-chrome-back-button/
+// Firefox: Remote XMLHttpRequest - http://benalman.com/code/projects/jquery-hashchange/examples/bug-firefox-remote-xhr/
+// WebKit: Back Button in an Iframe - http://benalman.com/code/projects/jquery-hashchange/examples/bug-webkit-hash-iframe/
+// Safari: Back Button from a different domain - http://benalman.com/code/projects/jquery-hashchange/examples/bug-safari-back-from-diff-domain/
+// 
+// About: Release History
+// 
+// 1.2   - (2/11/2010) Fixed a bug where coming back to a page using this plugin
+//         from a page on another domain would cause an error in Safari 4. Also,
+//         IE6/7 Iframe is now inserted after the body (this actually works),
+//         which prevents the page from scrolling when the event is first bound.
+//         Event can also now be bound before DOM ready, but it won't be usable
+//         before then in IE6/7.
+// 1.1   - (1/21/2010) Incorporated document.documentMode test to fix IE8 bug
+//         where browser version is incorrectly reported as 8.0, despite
+//         inclusion of the X-UA-Compatible IE=EmulateIE7 meta tag.
+// 1.0   - (1/9/2010) Initial Release. Broke out the jQuery BBQ event.special
+//         window.onhashchange functionality into a separate plugin for users
+//         who want just the basic event & back button support, without all the
+//         extra awesomeness that BBQ provides. This plugin will be included as
+//         part of jQuery BBQ, but also be available separately.
+
+(function($,window,undefined){
+  '$:nomunge'; // Used by YUI compressor.
+  
+  // Method / object references.
+  var fake_onhashchange,
+    jq_event_special = $.event.special,
+    
+    // Reused strings.
+    str_location = 'location',
+    str_hashchange = 'hashchange',
+    str_href = 'href',
+    
+    // IE6/7 specifically need some special love when it comes to back-button
+    // support, so let's do a little browser sniffing..
+    browser = $.browser,
+    mode = document.documentMode,
+    is_old_ie = browser.msie && ( mode === undefined || mode < 8 ),
+    
+    // Does the browser support window.onhashchange? Test for IE version, since
+    // IE8 incorrectly reports this when in "IE7" or "IE8 Compatibility View"!
+    supports_onhashchange = 'on' + str_hashchange in window && !is_old_ie;
+  
+  // Get location.hash (or what you'd expect location.hash to be) sans any
+  // leading #. Thanks for making this necessary, Firefox!
+  function get_fragment( url ) {
+    url = url || window[ str_location ][ str_href ];
+    return url.replace( /^[^#]*#?(.*)$/, '$1' );
+  };
+  
+  // Property: jQuery.hashchangeDelay
+  // 
+  // The numeric interval (in milliseconds) at which the <hashchange event>
+  // polling loop executes. Defaults to 100.
+  
+  $[ str_hashchange + 'Delay' ] = 100;
+  
+  // Event: hashchange event
+  // 
+  // Fired when location.hash changes. In browsers that support it, the native
+  // window.onhashchange event is used (IE8, FF3.6), otherwise a polling loop is
+  // initialized, running every <jQuery.hashchangeDelay> milliseconds to see if
+  // the hash has changed. In IE 6 and 7, a hidden Iframe is created to allow
+  // the back button and hash-based history to work.
+  // 
+  // Usage:
+  // 
+  // > $(window).bind( 'hashchange', function(e) {
+  // >   var hash = location.hash;
+  // >   ...
+  // > });
+  // 
+  // Additional Notes:
+  // 
+  // * The polling loop and Iframe are not created until at least one callback
+  //   is actually bound to 'hashchange'.
+  // * If you need the bound callback(s) to execute immediately, in cases where
+  //   the page 'state' exists on page load (via bookmark or page refresh, for
+  //   example) use $(window).trigger( 'hashchange' );
+  // * The event can be bound before DOM ready, but since it won't be usable
+  //   before then in IE6/7 (due to the necessary Iframe), recommended usage is
+  //   to bind it inside a $(document).ready() callback.
+  
+  jq_event_special[ str_hashchange ] = $.extend( jq_event_special[ str_hashchange ], {
+    
+    // Called only when the first 'hashchange' event is bound to window.
+    setup: function() {
+      // If window.onhashchange is supported natively, there's nothing to do..
+      if ( supports_onhashchange ) { return false; }
+      
+      // Otherwise, we need to create our own. And we don't want to call this
+      // until the user binds to the event, just in case they never do, since it
+      // will create a polling loop and possibly even a hidden Iframe.
+      $( fake_onhashchange.start );
+    },
+    
+    // Called only when the last 'hashchange' event is unbound from window.
+    teardown: function() {
+      // If window.onhashchange is supported natively, there's nothing to do..
+      if ( supports_onhashchange ) { return false; }
+      
+      // Otherwise, we need to stop ours (if possible).
+      $( fake_onhashchange.stop );
+    }
+    
+  });
+  
+  // fake_onhashchange does all the work of triggering the window.onhashchange
+  // event for browsers that don't natively support it, including creating a
+  // polling loop to watch for hash changes and in IE 6/7 creating a hidden
+  // Iframe to enable back and forward.
+  fake_onhashchange = (function(){
+    var self = {},
+      timeout_id,
+      iframe,
+      set_history,
+      get_history;
+    
+    // Initialize. In IE 6/7, creates a hidden Iframe for history handling.
+    function init(){
+      // Most browsers don't need special methods here..
+      set_history = get_history = function(val){ return val; };
+      
+      // But IE6/7 do!
+      if ( is_old_ie ) {
+        
+        // Create hidden Iframe after the end of the body to prevent initial
+        // page load from scrolling unnecessarily.
+        iframe = $('<iframe src="javascript:0"/>').hide().insertAfter( 'body' )[0].contentWindow;
+        
+        // Get history by looking at the hidden Iframe's location.hash.
+        get_history = function() {
+          return get_fragment( iframe.document[ str_location ][ str_href ] );
+        };
+        
+        // Set a new history item by opening and then closing the Iframe
+        // document, *then* setting its location.hash.
+        set_history = function( hash, history_hash ) {
+          if ( hash !== history_hash ) {
+            var doc = iframe.document;
+            doc.open().close();
+            doc[ str_location ].hash = '#' + hash;
+          }
+        };
+        
+        // Set initial history.
+        set_history( get_fragment() );
+      }
+    };
+    
+    // Start the polling loop.
+    self.start = function() {
+      // Polling loop is already running!
+      if ( timeout_id ) { return; }
+      
+      // Remember the initial hash so it doesn't get triggered immediately.
+      var last_hash = get_fragment();
+      
+      // Initialize if not yet initialized.
+      set_history || init();
+      
+      // This polling loop checks every $.hashchangeDelay milliseconds to see if
+      // location.hash has changed, and triggers the 'hashchange' event on
+      // window when necessary.
+      (function loopy(){
+        var hash = get_fragment(),
+          history_hash = get_history( last_hash );
+        
+        if ( hash !== last_hash ) {
+          set_history( last_hash = hash, history_hash );
+          
+          $(window).trigger( str_hashchange );
+          
+        } else if ( history_hash !== last_hash ) {
+          window[ str_location ][ str_href ] = window[ str_location ][ str_href ].replace( /#.*/, '' ) + '#' + history_hash;
+        }
+        
+        timeout_id = setTimeout( loopy, $[ str_hashchange + 'Delay' ] );
+      })();
+    };
+    
+    // Stop the polling loop, but only if an IE6/7 Iframe wasn't created. In
+    // that case, even if there are no longer any bound event handlers, the
+    // polling loop is still necessary for back/next to work at all!
+    self.stop = function() {
+      if ( !iframe ) {
+        timeout_id && clearTimeout( timeout_id );
+        timeout_id = 0;
+      }
+    };
+    
+    return self;
+  })();
+  
+})(jQuery,this);
diff --git a/addons/base/static/lib/jquery.ba-bbq/jquery.ba-bbq.min.js b/addons/base/static/lib/jquery.ba-bbq/jquery.ba-bbq.min.js
new file mode 100644
index 00000000000..bcbf24834ac
--- /dev/null
+++ b/addons/base/static/lib/jquery.ba-bbq/jquery.ba-bbq.min.js
@@ -0,0 +1,18 @@
+/*
+ * jQuery BBQ: Back Button & Query Library - v1.2.1 - 2/17/2010
+ * http://benalman.com/projects/jquery-bbq-plugin/
+ * 
+ * Copyright (c) 2010 "Cowboy" Ben Alman
+ * Dual licensed under the MIT and GPL licenses.
+ * http://benalman.com/about/license/
+ */
+(function($,p){var i,m=Array.prototype.slice,r=decodeURIComponent,a=$.param,c,l,v,b=$.bbq=$.bbq||{},q,u,j,e=$.event.special,d="hashchange",A="querystring",D="fragment",y="elemUrlAttr",g="location",k="href",t="src",x=/^.*\?|#.*$/g,w=/^.*\#/,h,C={};function E(F){return typeof F==="string"}function B(G){var F=m.call(arguments,1);return function(){return G.apply(this,F.concat(m.call(arguments)))}}function n(F){return F.replace(/^[^#]*#?(.*)$/,"$1")}function o(F){return F.replace(/(?:^[^?#]*\?([^#]*).*$)?.*/,"$1")}function f(H,M,F,I,G){var O,L,K,N,J;if(I!==i){K=F.match(H?/^([^#]*)\#?(.*)$/:/^([^#?]*)\??([^#]*)(#?.*)/);J=K[3]||"";if(G===2&&E(I)){L=I.replace(H?w:x,"")}else{N=l(K[2]);I=E(I)?l[H?D:A](I):I;L=G===2?I:G===1?$.extend({},I,N):$.extend({},N,I);L=a(L);if(H){L=L.replace(h,r)}}O=K[1]+(H?"#":L||!K[1]?"?":"")+L+J}else{O=M(F!==i?F:p[g][k])}return O}a[A]=B(f,0,o);a[D]=c=B(f,1,n);c.noEscape=function(G){G=G||"";var F=$.map(G.split(""),encodeURIComponent);h=new RegExp(F.join("|"),"g")};c.noEscape(",/");$.deparam=l=function(I,F){var H={},G={"true":!0,"false":!1,"null":null};$.each(I.replace(/\+/g," ").split("&"),function(L,Q){var K=Q.split("="),P=r(K[0]),J,O=H,M=0,R=P.split("]["),N=R.length-1;if(/\[/.test(R[0])&&/\]$/.test(R[N])){R[N]=R[N].replace(/\]$/,"");R=R.shift().split("[").concat(R);N=R.length-1}else{N=0}if(K.length===2){J=r(K[1]);if(F){J=J&&!isNaN(J)?+J:J==="undefined"?i:G[J]!==i?G[J]:J}if(N){for(;M<=N;M++){P=R[M]===""?O.length:R[M];O=O[P]=M<N?O[P]||(R[M+1]&&isNaN(R[M+1])?{}:[]):J}}else{if($.isArray(H[P])){H[P].push(J)}else{if(H[P]!==i){H[P]=[H[P],J]}else{H[P]=J}}}}else{if(P){H[P]=F?i:""}}});return H};function z(H,F,G){if(F===i||typeof F==="boolean"){G=F;F=a[H?D:A]()}else{F=E(F)?F.replace(H?w:x,""):F}return l(F,G)}l[A]=B(z,0);l[D]=v=B(z,1);$[y]||($[y]=function(F){return $.extend(C,F)})({a:k,base:k,iframe:t,img:t,input:t,form:"action",link:k,script:t});j=$[y];function s(I,G,H,F){if(!E(H)&&typeof H!=="object"){F=H;H=G;G=i}return this.each(function(){var L=$(this),J=G||j()[(this.nodeName||"").toLowerCase()]||"",K=J&&L.attr(J)||"";L.attr(J,a[I](K,H,F))})}$.fn[A]=B(s,A);$.fn[D]=B(s,D);b.pushState=q=function(I,F){if(E(I)&&/^#/.test(I)&&F===i){F=2}var H=I!==i,G=c(p[g][k],H?I:{},H?F:2);p[g][k]=G+(/#/.test(G)?"":"#")};b.getState=u=function(F,G){return F===i||typeof F==="boolean"?v(F):v(G)[F]};b.removeState=function(F){var G={};if(F!==i){G=u();$.each($.isArray(F)?F:arguments,function(I,H){delete G[H]})}q(G,2)};e[d]=$.extend(e[d],{add:function(F){var H;function G(J){var I=J[D]=c();J.getState=function(K,L){return K===i||typeof K==="boolean"?l(I,K):l(I,L)[K]};H.apply(this,arguments)}if($.isFunction(F)){H=F;return G}else{H=F.handler;F.handler=G}}})})(jQuery,this);
+/*
+ * jQuery hashchange event - v1.2 - 2/11/2010
+ * http://benalman.com/projects/jquery-hashchange-plugin/
+ * 
+ * Copyright (c) 2010 "Cowboy" Ben Alman
+ * Dual licensed under the MIT and GPL licenses.
+ * http://benalman.com/about/license/
+ */
+(function($,i,b){var j,k=$.event.special,c="location",d="hashchange",l="href",f=$.browser,g=document.documentMode,h=f.msie&&(g===b||g<8),e="on"+d in i&&!h;function a(m){m=m||i[c][l];return m.replace(/^[^#]*#?(.*)$/,"$1")}$[d+"Delay"]=100;k[d]=$.extend(k[d],{setup:function(){if(e){return false}$(j.start)},teardown:function(){if(e){return false}$(j.stop)}});j=(function(){var m={},r,n,o,q;function p(){o=q=function(s){return s};if(h){n=$('<iframe src="javascript:0"/>').hide().insertAfter("body")[0].contentWindow;q=function(){return a(n.document[c][l])};o=function(u,s){if(u!==s){var t=n.document;t.open().close();t[c].hash="#"+u}};o(a())}}m.start=function(){if(r){return}var t=a();o||p();(function s(){var v=a(),u=q(t);if(v!==t){o(t=v,u);$(i).trigger(d)}else{if(u!==t){i[c][l]=i[c][l].replace(/#.*/,"")+"#"+u}}r=setTimeout(s,$[d+"Delay"])})()};m.stop=function(){if(!n){r&&clearTimeout(r);r=0}};return m})()})(jQuery,this);
\ No newline at end of file
diff --git a/addons/base/static/lib/jquery.jqGrid/Changes.txt b/addons/base/static/lib/jquery.jqGrid/Changes.txt
deleted file mode 100644
index 4494fbd555c..00000000000
--- a/addons/base/static/lib/jquery.jqGrid/Changes.txt
+++ /dev/null
@@ -1,1160 +0,0 @@
-3.6 version
-===========
-Bug Fixes
----------
-   * Fix problem with getAbsoluteIndex on IE8
-   * Fix in triggerReload grid to reset the savedRow array.
-   * Fix in setGridWidth  method when try to resize a grid a and there is no data.
-   * Fix header aligment in ie8
-   * Fix in createEl function to check for val and not for html when select
-   * making getChangedCells method compatible with unformat function if defined
-   * Fixed record count when scroll true
-   * Fix in setSelection method to accept numbers
-   * Fix IE header checkbox when multiselect is true
-   * Fix for searching DOM elements with id containing special characters
-   * Fix a checkbox checking in form editing module.
-   * Fix getCol to use unformat function
-   * Better looking buttons in form editing
-   * Fix searchFilter in IE7 and IE6 not to return undefined value when more 
-than one field is searched.
-   * Some fixes for datepicker UI in inline and cell edit (when present)
-   * Fix in setLabel method not to clear the sort icons when we set new label
-   * Fix in form edit when a formatter select is used
-   * Fix the id pollution when multiselect is enabled. Now the id of every 
-common multiselect is combination of cb_ + id of the grid 
-   * Fixed bug when deselectAfterSort false and we are in multiselect mode
-   * Fix in unformat number and currency
-   * Fixed bug when creating a select with dataUrl and select is set to multiple.
-   * Fix a bug when creating select with multiple option. Also the attribute 
-should be set immediatley after the element is created and not after.
-   * Fix a bug in form edit. The comapared values should be trimed since of 
-split(",") which cause the elements to begin with space.
-   * Fix a jqGrid loader (development version) for IE browsers
-   * Fix for form icons in Opera
-   * Fix getGridParam to return values 0 or false 
-   * Avoiding the overhead of local functions and maintenance issues when the 
-parameters change
-   * Opera fix for cursor col-resize
-   * Fix in editGridRow when a save key is defined and the key is Eneter we 
-should not do save when we are in teaxtarea element
-   * Fix in formatter checkbox when the value is undefined. We also add a 
-default format for the checkbox too
-   * Fix addRowData to use key:true (keyIndex) when rowid is not defined
-   * Fix formatter bug for the select to use the defaultFormat
-   * Adding a 3 parameter to the unformat function - the cellobject.
-   * Fix alternate rows when we sort data locally.
-   * Fix in addRowData for alternate rows when we add item as last
-   * Fix collapseRow in treegrid preventing infinite recursion
-   * Fix in stripHtml function to parse numeric values
-   * Fix in delGridRow to get "fresh" Data from delData object
-   * Fix problems with width option if set as string.
-   * Fixing $jgrid.format function in base module to accept undefined parameter.
-   * Fix for saveRow method in aftersave function. Also we pass the request and 
-not the responseText. Also both aftersave and  success functions have the 
-same type parameter - the response
-   * Fix for serchhidden in searchGrid method
-   * Fix for setGridWidth method
-   * Fix  setColWidth function
-   * Fix for topinfo and bottom info in formedit to appear separatley in edit and add dialogs
-   * Fix searchFilter css to work when called from subgrid 
-   * Fix celledit to work better when datepicker is attached
-   * Fix in viewGrid row to vizualize only the columns that only not hidden.
-
-   
-Additions and changes
----------------------
-   * New API
-   * RTL Support
-   * Column reordering
-   * Added life scrolling of data
-   * Added gridResize method which can resize the grid. Also use a jQuery UI 
-resizable and can use any options of this widget
-   * Added sortableRows method which allow us to sort rows with drag and drop
-   * Added gridDnD method. The method connect two or more grids so that drag and drop rows
-between these is possible
-   * Add columnChooser method which allows choosing/sorting columns at the same 
-time. This method requiere multiselect plugin
-   * Now getRowData can return all rows when rowid is not set.
-   * getCol now can return summary, average and count of the selected row. The 
-3 parameter determines this (valid are sum, avg, count). If this parameter 
-is set and is valid, the returned value is a scalar.If the param is not 
-valid the returned value is empty array. 
-   * To setRowData we add a 3 parameter. If the parameter is string we use 
-addClass to add classes. If the parameter is object we use css to add css 
-properties. Note that we can set properties and classes without data, in 
-this case we should set data to false 
-   * Adding a event object to ondblClickRow and onRightClickRow events as 4 parameter
-   * Add a ant based build system which allow us to minify the JS code
-   * Added custom validation property in editing modules
-   * Added possibility to create custom element in editing modules
-   * Adding support to configure the ajax request in a way that user want. This
-is done in all modules where ajax is used.
-   * Added class in cell edit and inline edit so that the cell or row can not
-be edited - the corresponding classes are 'not-editable-cell' and
-'not-editable-row'.
-   * Added Hebrew Translation
-   * Added a beforeCheckValues event in editGridRow method. The execution is 
-before checking the values. Should return object of the posted data.
-   * Added Romanian translation 
-   * Added a property classes in colModel where we can attach classes to column.
-   * info_dialog function can be used as separate modal dialog
-   * Added a class ui-ellipsis in grid css file. Also work in FireFox too.
-   * Changind the order of calling the events beforeSearch and beforeClear in 
-filterToolbar method. Also the events are called immediatley after triggering the grid
-   * To onCellSelect we replace the 4 parameter with the more natuaral event instead of e.target - 
-sorry if this will bring to some confusions.
-   * Added searchoptions value parameter in order to separate the editing module and search module.
-We first look for such option in searchoptions and if not found we use the
-editoptions value
-   * Added fixed property in colModel which allow us not to change the  
-column width if shrinkToFit is true and we set new width of the grid.
-   * Added buildSelect function to deserialize data for the select. This is option
-can be added in editoptions or search options
-
-   
-Please read The Installation instructions first in install.txt
-================================================
-3.5 beta (buld6- build11)
-
-New Properties and methods
-==========================
-
-- Added new grid parameter hoverrows. When set to false the mouse hovering is
-disabled in the grid data rows.
-
-- Added rowid as parameter to error function in saveRow method - inline 
-editing module
-
-- treeGrid to be initially work with datatype local 
-
-- Added new method updateGridRows (grid.custom.js)
-This method update the existing data in the grid by given id rowname.
-
-Syntax: updateGridRows (data, rowidname, jsonreader)
-
-data is a array of data in format
-[{name:value,name1:value1...},{name:value,name2:value2...}]
-where the name is the name from colModel and value is the actuall value.
-It is not neccessary that all columns are present in the data item object
-(the same as setRowData method)
-
-rowidname (string) - is the name of the row which should acts as id.
-If not set the name "id" is used.
-
-jsonreader (boolean) default false. If set to true a jsonReader definition
-is used to set the data. Note that this work only of the item in jsonReader
-object 'repeatitems' is set to true.
-
-- Switch to namedItems JS function. This improve the speed. Previously we
-walk throught the entry rowset to find the rowIndex of the given rowid.
-Now we use the build in javaScript method namedItems which do the same.
-
-- multiselect is enabled in inline edit module.
-
-- To the  importComplete event in jqGridImport method we pass the response.
-
-- Added support for alternate rows. Also added new jqGrid option altclass.
-The default value is 'ui-priority-secondary' THis way we can develop our own
-alternate class.
-
-- Added ShrinkToFit option in setColumns method which fit columns to the grid 
-width. Default value is false.
-
-- Extend tableToGrid method to use custom options when building the grid.
-The call to this function is
-tableToGrid(selector, options)
-where options is the object with jqGrid options.
-
-- Adding 4px right to the view records text for better view 
-
-- Add a onClose event to all modals in form editing (except alert dialog)
-The default value is null. This event can be passed in editGridRow, delGridRow,
-viewGridRow, and setColumns methods. The event raised when a close icon is clicked,
-a cancel button is clicked or ESC key is pressed (if this is enabled).
-
-- Significant speed improvents in tree Grid when a relative large data is loaded.
-
-- Added dataheight parameter to all modal windows, where we can control the
-scrolling content. Intitially this parameter is auto.
-To summarize - we have two parameters for controlling the height of the modal.
-height and dataheight.
-The height parameter control the height of the entry modal, dataheight parameter
-control the height of the scrolling content.  The buttons of the modals are
-allways visible at the bottom of the modal.Also some improvments in jqDnR.
-
-- In setColumns method we add colnameview and closeAfterSubmit parameters. The
-colnameview (default true). If set to false the names from colModel are not
-visible. closeAfterSubmit if defined cleses the dialog after the submit
-button is clicked.
-
-- Added parameter viewsortcols in jqGrid parameters. The purpose of this
-parameter is to define different look and behavior of sorting icons that
-appear near the header. This parameter is array with the following default
-options
-viewsortcols : [false,'vertical',true]
-
-The first parameter determines if all icons should be viewed at the same time
-when all columns  have sort property set to true.
-The default of false determines that only the icons of the current sorting column
-should be viewed.
-Setting this parameter to true causes all icons in all sortable columns to be viewed.
-
-The second parameter determines how icons should be placed - vertical means that
-the sorting icons are one under another. 'horizontal' means that the icons should
-be one near other.
-
-The third parameter determines the click functionality. If set to true the columns are
-sorted if the header is clicked. If set to false the columns are sorted only when
-the icons are clicked.
-
-Important note: When set a third parameter to false be a sure that the first parameter
-is set to true, otherwise you will lost the sorting.
-
-
-Fixes
-=====
-- Fixed bug in filterToolbar. We search now by index and when not found by 
-name. 
-
-- Fix in searchGrid method. We search now by index and when not found by 
-name. 
-
-- Fixed bug in IE when resizing columns. The function getOffset is changed
-so that the resizing speed is the same as in Safari and FF.
-
-- Fix multiple select bug in createEl function. Now we set the options before
-checking for multiple:true
-
-- Fixed bug in treegrid. The strict comparation in getNodeParent method
-causes bad results.
-
-- Fix in setGridWidth method. We do not initialize correct the new width which
-causes after the first set of the width to not work in other grid in the same
-page.
-
-- Fixed bug in GridExport. We delete the columns that are generated 
-dynamically - multiselect, subgrid, treegrid or rownumbers. This way the
-import is without errors 
-
-- Fixed a bug in addRowData method to add data with id = 0 (number)
-
-- Fixed a forever loading bug in IE.
-
-- Fixed altRows bug in delRowData method
-
-- navGrid method fix for warning modal and IE6
-
-- Fix setColumns method to the common apprach of forms and modals
-
-- Fix for IE8 in getAbsoluteIndex method. IE8 seems to work as other browsers
-
-- Fixed bug in delRowData - the grid does not resize when first row is 
-deleted.
-
-- Fixed bug when rownumbers and subgrid are used together 
-
-- Fixed bug in row editing when the column name contain dot.
-
-- Fixing bug in viewGridRow - also the id manes of the form are changed in order
-to be not equal of those in editGridRow
-
-
-
-3.5 beta (buld5)
-
-FormEditing
-===========
-- added options checkOnUpdate (default false) in editGridRow method.
-Also available in add and edit mode.
-When this option is set to true the behaviour as follow:
-When something is changed in the form and the user click on
-Cancel button, navigator buttons, close button (on upper right corner of the
-form), in overlay (if available) or press Esc key (if set) a message box apper
-asking the user to save the changes, not to save the changes and go back in the
-form or cancel all changes (this will close the modal form)
-Note that checkOnSubmit option will work only when a submit button is clicked.
-When nothing is changed we contionue with the action.
-
-- added option -  rowabove (default false) in colModel formoptions
-When set to true a new empty row is added above this row in form editing.
-- added option - rowcontent (default empty) in colModel formoptions.
-This option have sense only when rowabove option is set to true.
-With this option is possible to set a content to the new added empty row in
-the form. In order to style easy these rows a class 'contentinfo' is set.
-
-- added new items in the language files to support the checkOnUpdate option
-
-- added class 'delmsg' in the delGridRow method. This allow us to change the
-message dynamically using a beforeShow or afterSow eventrs. The class is added
-to a element td.
-
-Fixes
-=====
-- fix in Bulgarian translations files.
-- fix in searchGrid method. Now we search by index (from colModel) and only if
-it is not available we search by name.
-- Fix for date parser in the base module. Now we can sort locally on
-dates that contain month names
-- Fixed bug in searchGrid. The translation messages for the operations does not 
-apper when not set in colModel
-- removed some not needed events  from base grid. Also return false do these
-by default;
-- Fix bug to check if datepicker is available in searchGrid.
-- Fix a bug in searchGrid in IE6, where the data value is not set for elements
-after the first 
-- Fixed bug when calling of jqModal multiple times on the same element. We 
-need the initialization only once and not every time. This cause a memory 
-leaks
-- Fixed bug in formatter where the data containing ' causes break in IE 
-- Fixed bug in base module when adding data where the data contain a ' char.
-This breaks in IE browsers.
-- Fixed bug in checkboxes. We add the value setted in the editoptions. Also 
-converting to lower case make the option checkOnUpdate to be true every time. 
-- We replace white-space nowrap with pre in td element in the CSS file. This fixes
-the bug in IE where the first row does not wrap when the text is longer than
-the column width. Also this requiere DOCTYPE declaration in the document.
-- Fixed bug in viewGridRow method where when resizing the modal causes the data
-to apper bad.
-
-
-3.5 beta (buld4)
-Base
-====
-- added option footerrow - default false. If set to true this will place a
-footer table with one row below the gird records and above the pager.
-The number of columns equal of these from colModel
-
--added option userDataOnFooter(default false) which directly place the user data
-array at footer. The rules are as follow: If the userData array contain name
-which is equal to those of colModel then the value is placed in that column.
-If there are no such values nothing is palced. Note that if this option
-is used we use the current formatter options (if available) for that column.
-
--Added method getCol(colname). Colname can be either number which represents
-the index of the column or name from colModel. The method return array with
-the values of the coulmn.
-
-- Added method footerData ( action, data, format). This method get or set data
-on footer.
-
-action - can be 'get' or 'set'. If not set default is get.
-When set to 'get' - the result is object of type name:value, where the name is
-a name from colModel. This will return a data from the footer. The other two
-options  does not have effect in this case.
-
-When set to 'set' a data array (object) should be set. This will place
-the values in the footer.
-
-format - default is true. This instruct the method to use the formmater
-(if set in colModel) when a new values are set.
-Setting to false will disable the using of formatter.
-
-Related css items in the ui.jqgrid.css
-.ui-jqgrid-sdiv - is a div container for the footer
-.ui-jqgrid-ftable - is the class for the table
-tr.footrow - is the class for the footer row
-tr.footrow td is the item for the cell formating
-
-In order to format every cell in a way that you want
-maybe you can use
-
-jQuery("tr.footrow td:eq(2)","#gbox_mygrid").css(...)
-where the td:eq(2)  point to the third column
-and mygrid is the id of the grid. The id of the global grid container
-is constructed via "gbox_"+the id of the grid.
-
-There are no methods to show and hide the footer row dynamically, but
-following the above example we can do
-
-jQuery(".ui-jqgrid-sdiv","#gbox_mygrid").hide() - this will hide the footer row.
-
-jQuery(".ui-jqgrid-sdiv","#gbox_mygrid").show() - this will show the footer row.
-
-
-Form Editing
-============
-aded option in editGridRow - checkOnSubmit (default false)
-This option only work in editing mode and not in add.
-When set to true - the method looks if any data is changed in the form and
-if this is a case a dilog message appear where the user is asked to confirm the
-changes or cancel it. Pressing cancel will return to the form, but does not
-set the values to its original state.
-
-Note that this causes a some changes in the language file.
-
-Fixes
-=====
-
-- Removed imgpath from cell edit and inline edit modules and common module.
-This parameter is no longer valid in 3.5
-- Replace $ with jQuery in grid.common.js which causes problems when used with
-other librariers like prototype.
-- removed a checking e.srcElement from base module. jQuery allready fix this.
-- fixing the size option in select when using ajax to load selects.
-- Fixed bug in IE browsers, when clicked on href tag with child nodes,
-IE incorrect report in all cases that this is a href element. This couses
-onSelectCell not to behave correct.
-- Fixed bug in searchGrid - group options are not passed to serchFilter in 
-order get them from Language file.
-- Fix in bulgarian trnslations.
-- Fix on sorting column. The initial sort check first for index and then for 
-column name. Before the checking for the index was missed.
-Sortorder converted to lower case in order to avoid some cofusions.
-- Fix in set columns module. The modal does not appear correctly due to 
-missed parameter 
-
-
-
-3.5 beta (buld3)
-
-Base
-====
-- To the loading message is added ui-state-active class from Theme roller.
-This is more natural, indicating that the grid is active when data is loaded.
-
-Form Editing
-============
-- Added keyboard navigation, which allow us to navigate throught the records while
-in form editing pressing certain keys. This option is available in editGridRow
-and viewGridRow methods. The default state is disabled. To enable this you
-should set the options in the edit/add parameters:
-
-navkeys: [true,38,40]
-The first item enables the navigation.
-The second item corresponds to reccord up and by default is the  the key code
-for Up key
-The third item corresponds to reccord down and by default is the  key code for
-Down key
-Example
-$("#mygrid").navGrid("#pager",{options},{id:'myeditid',navkeys: [true,38,40]}..)
-Also this option does not work in add mode.
-
-Note: Instead that this does not have sense, if you plan to navigate with keys
-it is recommended to add this option in add mode. This should be done
-because the form for add and edit is the same and it is unknown which action
-will be lunched first.
-
-- Added posibility to save the form pressing certain key - add/edit mode only
-By default this option is disabled.
-To enable
-savekey: [true,13]
-The first item enables saving with pressing certain key.
-The second item corresponds to key code for saving. Default Enter (key code 13)
-
-Note that this binding should be used for both adding and editing a row.
-Since the binding is for the form, there is no possibility to have one
-key in add and another in edit mode.
-
-- Added icons for the buttons in the form. The corresponding class in the css
-is "fm-button"
-By default all icons are enabled.
-For add/edit method editGridRow
-The save button is defined with
-saveicon : [true,"left","ui-icon-disk"]
-The close button is defined with
-closeicon: [true,"left","ui-icon-close"]
-
-The first item enables the icon
-The second item tells where to pu icon left or right
-The third item corresponds to valid ui icon from theme roller
-
-For viewGrid Row
-closeicon : [true,"left","ui-icon-close"]
-
-For Deleting
-delicon: [true,"left","ui-icon-scissors"]
-cancelicon: [true,"left","ui-icon-cancel"]
-
-Fixes
-======
--Fixed bug when getting the index of the row. Strict compare should be removed.
--Fixed bug when datatype is function - we need to exit when call it and not to 
-continue.
--Fixed bug in form editing - the buttons do not align properly.
-
-3.5 beta (build2)
-
-Navigator
-=========
-This was missed in the first build
-In the navGrid we can pass uniquie id's of the buttons in order to manipulate
-them easy. If no id is set we create one which is combination of:
-for add button "add_"+ the id of the grid
-for edit button "edit_"+ the id of the grid
-for view button "view_" + the id of the grid
-for delete button "del_" + the id of the grid
-for search button "search_" + the id of the grid
-for refresh button "refresh_" + the id of the grid
-Example:
-$("#mygrid").navGrid("#pager",{options}, {id:'myeditid'},{id:'myaddid'}...)
-
-Base Grid
-=========
-- Record number information now can format the values according to the 
-formatter setting (if available) getting information from language file.
-
-Fixes
-=====
-
-- Fixed bug when multi select with json. We pass wrong parameter to addMulti 
-function 
-- Spelling error in all language files, which cause not to set the default 
-value correct
-- Fixed bug when creating warning message. Fixed bug when determining the 
-number column element in the form
-- Fixed bug - clientSide datatype should be converted to lower case
-according to the new improvements 
-- Fixed bug in IE6/7 when try to select a option in the select generated via 
-ajax 
-
-===============================
-Upgrade from 3.4.x to 3.5 beta.
-===============================
-
-
-1. Installation
---------------
-See install.txt
-
-2. Code changes
----------------
-2.1 The following grid options are deprecated - i.e. you can remove them from
-the grid options. They are not needed in 3.5 version
-
-imgpath
-sortascimg
-sortdescimg
-firstimg
-previmg
-nextimg
-lastimg
-sortclass
-resizeclass
-
-2.2 Second change is related to custom formatters. Starting with version 3.5,
-the custom formatter is passed the following parameters:
-
-formatter : function ( cellvalue, options, rowObject )
-{
-// format the cellvalue to new format
-return new_formated_cellvalue;
-}
-
-Note the return in the function. This function should always return a value
-in order to work correctly. The parameters are
-
-cellvalue - is the value to be formatted
-options - is an object containing the following element
-
-options :  { rowId: rid, colModel: cm}
-where rid - is the id of the row
-colModel is the object of the properties for this column getted from colModel
-array of jqGrid
-
-rowObject - is a row data represented in the format determined from datatype
-option.
-If we have datatype: xml/xmlstring - the rowObject is xml node,provided
-according to the rules from xmlReader
-If we have datatype: json/jsonstring - the rowObject is array, provided
-according to the rules from jsonReader
-
-Example:
-Code in 3.4.x variant
-
-formatter : function ( elem, cellvalue, options)
-{
-var newval = "<strong>"+cellvalue+"</strong>";
-jQuery(elem).html(newval);
-}
-
-
-Code in 3.5
-
-formatter : function ( cellvalue, options, rowObject )
-{
-return "<strong>"+cellvalue+"</strong>";
-}
-
-
-Base Module
-============
-Bug fixes
----------
-- fixed bug in onCellSelect event when used in IE browsers - now the rowIndex
-passed to this event is calculated correctly regardless of hidden columns.
-
-- fixed width bug when multiselect is used. Previously the width of this column
-is recalculated according to table width and when shrinkToFit is set to true.
-Now the column has fixed width and is no longer recalculated when the grid
-width is changed. See documentation for the new options
-
-- fixed width bug when subgrid is used. Previously the width of this column is
-recalculated according to table width and when shrinkToFit is set to true. Now
-the column has fixed width and is no longer recalculated when the grid width
-is changed. See documentation for the new options
-
-- fixed bug in addRowData method when the grid is empty and we try to add one
-or more columns. The width of the data was not being recalculated correctly,
-according to the header elements.
-
-- fixed bug when we use xmlstring and jsonstring to add data. Previously all
-the data from the string is loaded without reference to the rowNum parameter.
-Also this behaviour is changed for xml and json data. In other words, we now
-load only rowNum number of rows even when the request consists of more rows.
-
-- fixed bug when posting values of input of type select set to multiple:true.
-Now in all editing modules the posted values in for multiselect are separated
-with comma 
- 
-- fixed bug in the size option of multi select. If the size option is not set
-for multiselect the default value is 3
-
-Deprecated options
-----------------
-imgpath: "", in all modules
-sortascimg: "sort_asc.gif",
-sortdescimg: "sort_desc.gif",
-firstimg: "first.gif",
-previmg: "prev.gif",
-nextimg: "next.gif",
-lastimg: "last.gif",
-sortclass: "grid_sort",
-resizeclass: "grid_resize",
-
-Note that imgpath is not used anymore in all modules. 
-The altRows option is still here, but will have no effect until the jQuery
-UI Theme roller supports alternative rows.
-
-
-Note that the table element where we define the grid can not have a class
-scroll - i.e. class scroll in the table definition can be omitted, but this
-is NOT true for the pager element.
-
-New options
------------
-datatype can now set as 'script'. In other words, we now support script
-as datatype.
-
-reccount: numeric, Default 0. Determines the exact number of available
-grid rows. Can be <= from rowNum parameter
-
-autowidth: boolean, Default false. When set to true, the grid width is
-recalculated automatically to the width of the parent element. This is done
-only initially when the grid is created. In order to resize the grid when
-the parent element changes width you should apply custom code and use a
-setGridWidth method for this purpose.
-
-scrollOffset: numeric, Default 18. Determines the width of the vertical
-scrollbar. Since different browsers interpret this width differently (and it
-is difficult to calculate it in all  browsers) this can be changed.
-
-cellLayout: numeric, Default 5. This option determines the padding + border
-width of the cell. Usually this should not be changed, but if custom changes
-to td element are made in the grid css file this will need to be changed.
-
-subGridWidth: numeric, Default 20. Determines the width of the subgrid column
-if the subGrid option is set to true.
-
-multiselectWidth: numeric, Default 20. Determines the width of the multiselect
-column if multiselect is set to true.
-
-rownumbers: boolean, Default false. If this option is set to true, a new column
-at left of the grid is added. The purpose of this column is to count the number
-of available rows, beginning from 1. In this case colModel is extended
-automatically with new element with name - 'rn'. Also, be careful not to use
-the name 'rn' in colModel
-
-rownumWidth: numeric, Default 25. Determines the width of the row number column
-if rownumbers option is set to true.
-
-pagerpos: string, Default 'center'. Determines the position of the pager in the
-grid. By default the pager element when created is divided in 3 parts (one part
-for pager, one part for navigator buttons and one part for record information)
-
-recordpos: string, Default 'right'. Determines the position of the record
-information in the pager.
-
-toolbar now accepts another option: "both". When we set toolbar: [true,"both"]
-two toolbars are created -- one on the top of table data and one of the bottom
-of the table data. When we have two toolbars then we create two elements (div).
-The id of the top bar is constructed like "t_"+id of the grid and the bottom
-toolbar the id is "tb_"+id of the grid. In case when only one toolbar is
-created we have the id as "t_" + id of the grid, independent of where this
-toolbar is created (top or bottom)
-
-gridview: boolean, Default value false. In the previous versions of jqGrid,
-including 3.5 alfa, reading a relatively big data sets (Rows >=100 ) caused
-speed problems. The reason for this was that as every cell was inserted into
-the grid we applied about 5-6 jQuery calls to it. Now this problem is resolved;
-we now  insert the entry row at once with a jQuery append. The result is
-impressive - about 3-5 times faster. What will be the result if we insert all
-the data at once? Yes, this can be done with a help of gridview option when set
-to true. The result is a grid that is 5 to 10 times faster. Of course when this
-option is set to true we have some limitations. If set to true we can not use
-- treeGrid
-- subGrid, or 
-- afterInsertRow event.
-If you do not use these three options in the grid you can set this option to
-true and enjoy the speed.
-
-addRowData now is 1-2 times faster because we are using the concept to insert
-the row at once
-
-Added jQuery function parse (removed from json2.js module):
-jQuery.parse(jsonstring)
-To prevent JavaScript hijacking attacks, web application authors are encouraged
-to use this function. This returns a JSON representation of the variable. 
-
-Cyclic structures are detected and safely interrupted, but could not be further
-restored.
-1. The while(1); construct, located at the beginning of JSON text,
-2. Comments at the beginning and end of the text.
-JSON data providers are encouraged to use one or both of these methods to
-prevent data execution. Such JSON response may then look like this: 
-while(1);/*{[
-    {"name":"safe value 1"},
-    {"name":"safe value 2"},
-   ...
-]}*/
-jqGrid uses this function when obtaining a data with datatype:'json', also used
-in subGrid.
-
-Added jQuery function stringToDoc: jQuery.stringToDoc(xmlstring). This returns
-the xml document of xml string
-
-Added new method: jQuery("#mygrid").updateColumns(); this synchronizes the
-width of the headers with the data. Useful when used with table drag and drop.
-
-
-colModel changes and additions
-------------------------------
-searchhidden is removed from editrules object
-
-added searchoptions object to define properties, events and other settings when
-a search is performed
-searchoptions : {
-    dataUrl : value,
-    dataInit: function,
-    dataEvents : array,
-    defaultValue: value,
-    attr: object,
-    searchhidden: boolean,
-    sopt: array
-}
-To summarize - when we want to deal with search we should use the following
-options in colModel
-
-search : boolean , // true/false
-stype: value, // text/select
-searchoptions : object // see above
-
-Note: when the dataUrl is not used for the search type select, the definitions
-for the select are taken from editoptions value property - i.e
-editoptions:{value:"1:one;2:two",...}. See below for how to use these options in
-different search methods.
-
-
-Added new object formoptions to define various settings in form editing. Also
-valid only in this module.
-
-formoptions : {
-    elmprefix:value,
-    elmsuffix:value,
-    rowpos: number,
-    colpos:number,
-    label: value
-}
-See below for how to use
-
-The editoptions are extended with the following properties. Valid in all editing
-modules editoptions : {
-    dataUrl : value, dataInit: function, dataEvents : array, defaultValue:
-    value/function,
-} See below
-
-
-Changes in all editing modules
-==============================
-
-edittype property is extended with the support of the following input elements:
-button, image and file
-
-As described above in all editing modules we can add additional properties and
-events to the editing element:
-
-editoptions : {
-    dataUrl : value, dataInit: function, dataEvents : array, defaultValue:
-    value/function
-}
--------------------------------------------------------------------------------
-dataUrl option is valid only for the elements of type select - i.e.,
-edittype:select
-
-When this option is set, the element will be filled with values from the ajax
-request. The data should be a valid html select element with the desired
-options. <select>
-    <option value="1">One</option> <option value="2">Two</option>
-</select>
-
-In form editing for add/edit this is called only once. In order to call it every
-time the form is launched you should set the option recreateForm:true or use
-other events like beforeShowForm (with another custom ajax call) to fill the
-desired element.
-
-In inline edit and cell edit this is fired every time you edit the row or cell
-element.
---------------------------------------------------------------------------------
-dataInit : function (elem) {
-// do something
-}
-
-If set, this function is called only once ? when the element is created. The
-function is passed the specified element. This option is ideal for attaching
-date picker, time picker, etc. Example:
-
-dataInit : function (elem) {
-    $(elem).datepicker();
-}
---------------------------------------------------------------------------------
-dataEvents: list of events to apply to the data element; uses
-$("#id").bind(type, [data], fn) to bind events to data element
-
-Should be described like this dataEvents: [
-    { type: 'click', data: { i: 7 }, fn: function(e) { console.log(e.data.i); }
-    }, { type: 'keypress', fn: function(e) { console.log('keypress'); } }
-]
-
-The event(s) are called only once when the element is created
--------------------------------------------------------------------------------
-defaultValue: 'value' or function This option is valid only in Form Editing
-module when used with editGridRow method in add mode.If set this the input
-element is set with this value if only element is empty. If used in selects the
-text should be provided and not the key. Also when a function is used the
-function should return value.
-
-Now we can validate a url. The corresponding settings is in colModel
-editrules:{required:true, url:true}
-
-
-FormEditing
-===========
-In all methods that deal with the modals are added the following options (thanks
-to Faserline Team: www.faserline.com)
-
-jqModal: true. The default value is true. How it works. If set to true, first
-jqGrid checks if the jqModal plugin is available. If this plugin is available we
-create the modal according to the jqModal plugin. If this plugin is not
-available jqGrid create its own modal. The difference between the jqModal window
-and jqGrid modal window is that the overlay covers only the grid, but not the
-entry page as jqModal does. If this option is set to false, jqGrid will create
-its own modal as described above even if jqModal is available.
-
-The only exception here is searchGrid method created with the new searchFilter
-plugin, where this option is not available. In this method a jqGrid modal window
-is used.
-
-closeOnEscape : false. Default false. When set to true the modal window can be
-closed with ESC key.
-
-
-
-=======searchGrid==================
-From now on jqGrid use a new search engine
-thanks to wonderful plugin provided from Kasey Speakman (kasey@cornerspeed.com).
-This plugin can also be used separately. Detailed documentation is provided in
-the jquery.searchFilter.js which is provided with jqGrid package.
-
-These options are not used anymore in the searchGrid method
-----------------------------------------------------------
-top : 0,
-left: 0,
-width: 360,
-height: 80,
-modal: false,
-closeicon: 'ico-close.gif',
-dirty: false,
-processData: "",
-
-Added the following options
----------------------------
-
-recreateFilter: false, This option construct the filter every time a search
-button is clicked.
-
-multipleSearch : false, When set to false the behaviour of the search is the
-same as those in versions before 3.5 When set to true: 1. We have a possibility
-to add/delete as many conditions as we want 2. The posted data to the server is
-string (actually a json array converted to string)
-
-sFilter: 'filters', This option has an effect only when the multipleSearch is
-set to true; it describes the name of the posted string. By default this, i.e.
-the posted data, can look like this
-
-filters ={
- "groupOp":"AND","rules":[{"field":"id","op":"gt","data":"1"},
-{"field":"name","op":"bw","data":"Client"}]
-}
-
-groupOp determines the logical operator that can be used in the where statement
-of the select. The value can be AND or OR. This can be changed used a select box
-which is created at bottom of the search filter.
-
-The rules array describes actually which fields and how they are included in the
-where clause The field element describes the name of the field The op element
-describes the operator that should be used in the search The data element is the
-data that we want to search.
-
-The above example (if getted and constructed correctly) should generate the
-following where clause
-
-SELECT .... FROM table,... WHERE id > 1 AND name LIKE 'Client%'
--------------------------------------------------------------------------------
-As described above the search is constructed according to the searchoptions in
-colModel
-
-search : boolean , // true/false stype: value, // text/select
-
-searchoptions : {
-    dataUrl : value,
-    dataInit: function,
-    dataEvents : array,
-    attr: object,
-    searchhidden: boolean,
-    sopt: array
-}
-Note that here is missing the defaultValue. The option is not implemented in
-this method.
-
-
-stype determines the search type - can be select or text. If not set a text is
-used
-
-searchoptions
--------------------------------------------------------------------------------
-dataUrl option is valid only for the elements of type select, i.e.
-edittype:select
-
-When this option is set the element will be filled with values from the ajax
-request. The data should be a valid html select element with the desired
-options. <select>
-    <option value="1">One</option> <option value="2">Two</option>
-</select>
-
-This is called only once.
-
--------------------------------------------------------------------------------
-dataInit : function (elem) {
-// do something
-}
-
-If set this function is called only once when the element is created. To the
-function is passed the element. Also this option is ideal for attaching date
-picker, time picker and etc. Example
-
-dataInit : function (elem) {
-    $(elem).datepicker();
-}
---------------------------------------------------------------------------------
-dataEvents: list of events to apply to the data element; uses
-$("#id").bind(type, [data], fn) to bind events to data element
-
-Should be described like this
-dataEvents: [
-{ type: 'click', data: { i: 7 }, fn: function(e) { console.log(e.data.i); }},
-{ type: 'keypress', fn: function(e) { console.log('keypress'); } }
-]
-
-The event(s) are called only once when the element is created
---------------------------------------------------------------------------------
-attr is object where we can set valid attributes to the created element
-
-attr : { title: "Some title" }
-------------------------------------------------------------------------------
-searchhidden : if set to true, the hidden element will appear in the search.
--------------------------------------------------------------------------------
-array that correspond to the op element in the posted data and determines the
-operation. If not set all the available options will be used; if set only the
-set values will appear as selectboxes.
-
-All available option are sopt:
-['eq','ne','lt','le','gt','ge','bw','bn','in','ni','ew','en','cn','nc']
-
-The corresponding texts are in language file and mean the following ['equal',
-'not equal', 'less', 'less or equal','greater','greater or equal', 'begins
-with','does not begin with','is in','is not in','ends with','does not end
-with','contains','does not contain'],
-
-Note that the elements in sopt array can be mixed in any order.
-
-
-=========add/edit form==========
-In the editGridRow method the following options are no longer used
-
-closeicon: 'ico-close.gif',
-imgpath: ''
-
-Added new property formoptions (in colModel); thanks to Faserline Team
-(www.faserline.com)
-
-The purpose of these options is to reorder the elements in the form and to add
-some information before and after the editing element.
-
-formoptions : {
-    elmprefix:'',
-    elmsuffix:'',
-    rowpos:number,
-    colpos:number,
-    label: value
-}
-
-If you go to use this object in collModel it is recommended that all editing
-fields use this property and with at least the rowpos and colpos set.
-
-Elemprefix: if set, a text or html content appears before the input element
-
-Elemsuffix: if set, a text or html content appears after the input element
-
-Label: if set, this replace the name from colNames array that appears as label
-in the form.
-
-rowpos : number determines the row position of the element (again with the
-text-label) in the form; the count begins from 1
-
-colpos : number determines the column position of the element (again with the
-label) in the form beginning from 1
-
-Two elements can have equal row position, but different column position. This
-will place the two elements in one row on the form.
-
-=========== delete=================================
-In the delGridRow method the following options are no longer used
-
-closeicon: 'ico-close.gif',
-imgpath: '',
-
-
-
-============= view =============================
-Added viewGridRow method; thanks to Faserline Team (www.faserline.com)
-
-This method is similar to the editGridRow method except that the fields are not
-editable and we do not have any events attached to the form. Here are the
-options viewGridRow (options) where
-options = {
-    top : 0,
-    left: 0,
-    width: 0,
-    height: 0,
-    modal: false,
-    drag: true,
-    closeOnEscape : false,
-    labelswidth: '30%'
-}
-
-
-All the options have the same thing as these in editGridRow except the option
-labelswidth which default value is 30%. Since we construct the view with table
-element it is difficult to calculate, in this case, how much width is needed for
-the labels. Depending on the needs this value can be increased or decreased
-
-Custom method
-=============
-In the custom module is added new method filterToolbar.
-
-This method is the same as filterGrid, except that the search input elements are
-placed in the grid just below the header elements. When the header elements are
-resized the input search elements are also resized according to the new width.
-Another difference to the filterGrid is that the filter toolbar uses definitions
-from colModel just like the searchGrid
-
-Should be called like this
-
-jQuery("#mygrid").filterToolbar(options)
-
-where options are
-
-options = {
-    autosearch: true,
-    beforeSearch: null,
-    afterSearch: null,
-    beforeClear: null,
-    afterClear: null,
-    searchurl : ''
-}
-
-autosearch: true Search is performed according to the following rules For text
-element when a Enter key is pressed while inputting values a search is
-performed. For select element when the value changes.
-
-beforeSearch - event which fires before a search
-
-afterSearch - event which fires after a search
-
-beforeClear - event which fires before clearing entered values (i.e.,
-clearToolbar is activated)
-
-afterClear - event which fires after clearing entered values (i.e., clearToolbar
-is activated)
-
-The rules of creating toolbar search input elements are the same as searchGrid
-using the colModel
-searchoptions : {
-    dataUrl : value,
-    dataInit: function,
-    dataEvents : array,
-    defaultValue: value,
-    attr: object
-}
-
-Note the missing sopt element, but addition of defaultValue property
-
-This method has 3 new additional methods that can be used:
-
-triggerToolbar - when called perform a search dynamically
-
-clearToolbar - when called clear the search values and set the default one if
-available
-
-toggleToolbar - toggles the searchbar
-
-A typical call to these methods
-
-var sgrid = $("#mygrid")[0] sgrid.triggerToolbar();
-
-will trigger the search of mygrid.
-
-
-Import module
-=============
-added option importComplete event which fires after constructing the grid.
-
-
-Inline edit
-===========
-added afterrestorefunc as 9th parameter. The event fires after the row is
-restored
-
-treeGrid
-========
-the tree icons can be changed using the following grid parameter treeIcons. The
-default values are.
-treeIcons ={
-    plus:'ui-icon-triangle-1-e',
-    minus:'ui-icon-triangle-1-s',
-    leaf:'ui-icon-radio-off'
-};
-Note that icons from UI Theme should be used.
-
-formatter
-=========
-
-- the source format for date formatter (srcformat) now can accept month names
-- it is possible to enable checkboxes as editable when created with formatter In
-  the format options we should in this case checkbox : {disabled:false} The
-  default is false. To enable this option globally you can change this value in
-  the language file
-
-- the showLink now can accept custom name for the id The parameter is idName :
-  'id' The default is id. Can be changed in formatoptions or in the language
-  file.
-
diff --git a/addons/base/static/lib/jquery.jqGrid/build.properties b/addons/base/static/lib/jquery.jqGrid/build.properties
deleted file mode 100644
index 2a1d763639d..00000000000
--- a/addons/base/static/lib/jquery.jqGrid/build.properties
+++ /dev/null
@@ -1,8 +0,0 @@
-# Path for the Google Compiler jar file. By default in the same directory as this properties file.
-GoogleCompiler = compiler.jar
-
-srcdir = js
-distdir = dist
-
-target = jquery.jqGrid.js
-target.min = jquery.jqGrid.min.js
\ No newline at end of file
diff --git a/addons/base/static/lib/jquery.jqGrid/build.xml b/addons/base/static/lib/jquery.jqGrid/build.xml
deleted file mode 100644
index 5886de11f72..00000000000
--- a/addons/base/static/lib/jquery.jqGrid/build.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0"?>
-<project name="jqGrid" default="build" basedir=".">
-
-    <!-- define the path of compressor in this file -->
-    <property file="build.properties" />
-
-    <target name="init">
-        <mkdir dir="${distdir}" />
-    </target>
-
-    <target name="jqgrid" depends="init">
-        <concat destfile="${distdir}/${target}">
-		<fileset file="js/grid.base.js"/>
-		<fileset file="js/grid.custom.js"/>
-		<fileset file="js/jqModal.js"/>
-		<fileset file="js/jqDnR.js"/>
-		<fileset file="js/JsonXml.js"/>
-		<fileset file="js/jquery.fmatter.js"/>
-		<fileset file="js/grid.common.js"/>
-		<fileset file="js/grid.filter.js"/>
-		<fileset file="js/grid.formedit.js"/>
-		<fileset file="js/grid.inlinedit.js"/>
-		<fileset file="js/grid.celledit.js"/>
-		<fileset file="js/grid.subgrid.js"/>
-		<fileset file="js/grid.treegrid.js"/>
-		<fileset file="js/grid.grouping.js"/>
-		<fileset file="js/grid.import.js"/>
-		<fileset file="js/grid.jqueryui.js"/>
-		<fileset file="js/grid.tbltogrid.js"/>
-        </concat>
-    </target>
-
-    <target name="jqgrid.min" depends="jqgrid">
-        <apply executable="java" parallel="false" verbose="true" failonerror="true" dest="${distdir}">
-            <fileset dir="${distdir}">
-                <include name="${target}" />
-            </fileset>
-            <arg line="-jar" />
-            <arg path="${GoogleCompiler}" />
-            <arg value="--warning_level" />
-            <arg value="QUIET" />
-            <arg value="--js_output_file" />
-            <targetfile />
-            <arg value="--js" />
-            <mapper type="glob" from="${target}" to="${target.min}" />
-        </apply>
-      	<echo message="${target.min} built." />
-    </target>
-
-    <target name="i18n">
-        <mkdir dir="${distdir}/i18n" />
-        <copy todir="${distdir}/i18n" overwrite="true">
-            <fileset dir="${srcdir}/i18n">
-                <include name="grid.locale-*.js" />
-            </fileset>
-        </copy>
-    </target>
-
-    <target name="build" depends="jqgrid, jqgrid.min, i18n"/>
-
-    <target name="clean">
-        <delete dir="${distdir}" />
-    </target>
-
-    <target name="all" depends="clean,build"/>
-
-</project>
diff --git a/addons/base/static/lib/jquery.jqGrid/css/ellipsis-xbl.xml b/addons/base/static/lib/jquery.jqGrid/css/ellipsis-xbl.xml
deleted file mode 100644
index b293657d8d2..00000000000
--- a/addons/base/static/lib/jquery.jqGrid/css/ellipsis-xbl.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0"?>
-<bindings
-    xmlns="http://www.mozilla.org/xbl"
-    xmlns:xbl="http://www.mozilla.org/xbl"
-    xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-    <binding id="ellipsis">
-        <content>
-            <xul:window><!-- xul:window tag required for FF2 -->
-                <xul:description crop="end" xbl:inherits="value=xbl:text"><children/></xul:description>
-            </xul:window>
-        </content>
-    </binding>
-</bindings>
diff --git a/addons/base/static/lib/jquery.jqGrid/css/ui.jqgrid.css b/addons/base/static/lib/jquery.jqGrid/css/ui.jqgrid.css
deleted file mode 100644
index dc4b37b2372..00000000000
--- a/addons/base/static/lib/jquery.jqGrid/css/ui.jqgrid.css
+++ /dev/null
@@ -1,139 +0,0 @@
-/*Grid*/
-.ui-jqgrid {position: relative; font-size:11px;}
-.ui-jqgrid .ui-jqgrid-view {position: relative;left:0px; top: 0px; padding: .0em;}
-/* caption*/
-.ui-jqgrid .ui-jqgrid-titlebar {padding: .3em .2em .2em .3em; position: relative; border-left: 0px none;border-right: 0px none; border-top: 0px none;}
-.ui-jqgrid .ui-jqgrid-title { float: left; margin: .1em 0 .2em; }
-.ui-jqgrid .ui-jqgrid-titlebar-close { position: absolute;top: 50%; width: 19px; margin: -10px 0 0 0; padding: 1px; height:18px;}.ui-jqgrid .ui-jqgrid-titlebar-close span { display: block; margin: 1px; }
-.ui-jqgrid .ui-jqgrid-titlebar-close:hover { padding: 0; }
-/* header*/
-.ui-jqgrid .ui-jqgrid-hdiv {position: relative; margin: 0em;padding: 0em; overflow-x: hidden; overflow-y: auto; border-left: 0px none !important; border-top : 0px none !important; border-right : 0px none !important;}
-.ui-jqgrid .ui-jqgrid-hbox {float: left; padding-right: 20px;}
-.ui-jqgrid .ui-jqgrid-htable {table-layout:fixed;margin:0em;}
-.ui-jqgrid .ui-jqgrid-htable th {height:22px;padding: 0 2px 0 2px;}
-.ui-jqgrid .ui-jqgrid-htable th div {overflow: hidden; position:relative; height:17px;}
-.ui-th-column, .ui-jqgrid .ui-jqgrid-htable th.ui-th-column {overflow: hidden;white-space: nowrap;text-align:center;border-top : 0px none;border-bottom : 0px none;}
-.ui-th-ltr, .ui-jqgrid .ui-jqgrid-htable th.ui-th-ltr {border-left : 0px none;}
-.ui-th-rtl, .ui-jqgrid .ui-jqgrid-htable th.ui-th-rtl {border-right : 0px none;}
-.ui-jqgrid .ui-th-div-ie {white-space: nowrap; zoom :1; height:17px;}
-.ui-jqgrid .ui-jqgrid-resize {height:20px !important;position: relative; cursor :e-resize;display: inline;overflow: hidden;}
-.ui-jqgrid .ui-grid-ico-sort {overflow:hidden;position:absolute;display:inline; cursor: pointer !important;}
-.ui-jqgrid .ui-icon-asc {margin-top:-3px; height:12px;}
-.ui-jqgrid .ui-icon-desc {margin-top:3px;height:12px;}
-.ui-jqgrid .ui-i-asc {margin-top:0px;height:16px;}
-.ui-jqgrid .ui-i-desc {margin-top:0px;margin-left:13px;height:16px;}
-.ui-jqgrid .ui-jqgrid-sortable {cursor:pointer;}
-.ui-jqgrid tr.ui-search-toolbar th { border-top-width: 1px !important; border-top-color: inherit !important; border-top-style: ridge !important }
-tr.ui-search-toolbar input {margin: 1px 0px 0px 0px}
-tr.ui-search-toolbar select {margin: 1px 0px 0px 0px}
-/* body */ 
-.ui-jqgrid .ui-jqgrid-bdiv {position: relative; margin: 0em; padding:0; overflow: auto; text-align:left;}
-.ui-jqgrid .ui-jqgrid-btable {table-layout:fixed; margin:0em;}
-.ui-jqgrid tr.jqgrow td {font-weight: normal; overflow: hidden; white-space: pre; height: 22px;padding: 0 2px 0 2px;border-bottom-width: 1px; border-bottom-color: inherit; border-bottom-style: solid;}
-.ui-jqgrid tr.jqgfirstrow td {padding: 0 2px 0 2px;border-right-width: 1px; border-right-style: solid;}
-.ui-jqgrid tr.jqgroup td {font-weight: normal; overflow: hidden; white-space: pre; height: 22px;padding: 0 2px 0 2px;border-bottom-width: 1px; border-bottom-color: inherit; border-bottom-style: solid;}
-.ui-jqgrid tr.jqfoot td {font-weight: bold; overflow: hidden; white-space: pre; height: 22px;padding: 0 2px 0 2px;border-bottom-width: 1px; border-bottom-color: inherit; border-bottom-style: solid;}
-.ui-jqgrid tr.ui-row-ltr td {text-align:left;border-right-width: 1px; border-right-color: inherit; border-right-style: solid;}
-.ui-jqgrid tr.ui-row-rtl td {text-align:right;border-left-width: 1px; border-left-color: inherit; border-left-style: solid;}
-.ui-jqgrid td.jqgrid-rownum { padding: 0 2px 0 2px; margin: 0px; border: 0px none;}
-.ui-jqgrid .ui-jqgrid-resize-mark { width:2px; left:0; background-color:#777; cursor: e-resize; cursor: col-resize; position:absolute; top:0; height:100px; overflow:hidden; display:none;	border:0 none;}
-/* footer */
-.ui-jqgrid .ui-jqgrid-sdiv {position: relative; margin: 0em;padding: 0em; overflow: hidden; border-left: 0px none !important; border-top : 0px none !important; border-right : 0px none !important;}
-.ui-jqgrid .ui-jqgrid-ftable {table-layout:fixed; margin-bottom:0em;}
-.ui-jqgrid tr.footrow td {font-weight: bold; overflow: hidden; white-space:nowrap; height: 21px;padding: 0 2px 0 2px;border-top-width: 1px; border-top-color: inherit; border-top-style: solid;}
-.ui-jqgrid tr.footrow-ltr td {text-align:left;border-right-width: 1px; border-right-color: inherit; border-right-style: solid;}
-.ui-jqgrid tr.footrow-rtl td {text-align:right;border-left-width: 1px; border-left-color: inherit; border-left-style: solid;}
-/* Pager*/
-.ui-jqgrid .ui-jqgrid-pager { border-left: 0px none !important;border-right: 0px none !important; border-bottom: 0px none !important; margin: 0px !important; padding: 0px !important; position: relative; height: 25px;white-space: nowrap;overflow: hidden;}
-.ui-jqgrid .ui-pager-control {position: relative;}
-.ui-jqgrid .ui-pg-table {position: relative; padding-bottom:2px; width:auto; margin: 0em;}
-.ui-jqgrid .ui-pg-table td {font-weight:normal; vertical-align:middle; padding:1px;}
-.ui-jqgrid .ui-pg-button  { height:19px !important;}
-.ui-jqgrid .ui-pg-button span { display: block; margin: 1px; float:left;}
-.ui-jqgrid .ui-pg-button:hover { padding: 0px; }
-.ui-jqgrid .ui-state-disabled:hover {padding:1px;}
-.ui-jqgrid .ui-pg-input { height:13px;font-size:.8em; margin: 0em;}
-.ui-jqgrid .ui-pg-selbox {font-size:.8em; line-height:18px; display:block; height:18px; margin: 0em;}
-.ui-jqgrid .ui-separator {height: 18px; border-left: 1px solid #ccc ; border-right: 1px solid #ccc ; margin: 1px; float: right;}
-.ui-jqgrid .ui-paging-info {font-weight: normal;height:19px; margin-top:3px;margin-right:4px;}
-.ui-jqgrid .ui-jqgrid-pager .ui-pg-div {padding:1px 0;float:left;list-style-image:none;list-style-position:outside;list-style-type:none;position:relative;}
-.ui-jqgrid .ui-jqgrid-pager .ui-pg-button { cursor:pointer; }
-.ui-jqgrid .ui-jqgrid-pager .ui-pg-div  span.ui-icon {float:left;margin:0 2px;}
-.ui-jqgrid td input, .ui-jqgrid td select .ui-jqgrid td textarea { margin: 0em;}
-.ui-jqgrid td textarea {width:auto;height:auto;}
-.ui-jqgrid .ui-jqgrid-toppager {border-left: 0px none !important;border-right: 0px none !important; border-top: 0px none !important; margin: 0px !important; padding: 0px !important; position: relative; height: 25px !important;white-space: nowrap;overflow: hidden;}
-/*subgrid*/
-.ui-jqgrid .ui-jqgrid-btable .ui-sgcollapsed span {display: block;}
-.ui-jqgrid .ui-subgrid {margin:0em;padding:0em; width:100%;}
-.ui-jqgrid .ui-subgrid table {table-layout: fixed;}
-.ui-jqgrid .ui-subgrid tr.ui-subtblcell td {height:18px;border-right-width: 1px; border-right-color: inherit; border-right-style: solid;border-bottom-width: 1px; border-bottom-color: inherit; border-bottom-style: solid;}
-.ui-jqgrid .ui-subgrid td.subgrid-data {border-top:  0px none !important;}
-.ui-jqgrid .ui-subgrid td.subgrid-cell {border-width: 0px 0px 1px 0px;}
-.ui-jqgrid .ui-th-subgrid {height:20px;}
-/* loading */
-.ui-jqgrid .loading {position: absolute; top: 45%;left: 45%;width: auto;z-index:101;padding: 6px; margin: 5px;text-align: center;font-weight: bold;display: none;border-width: 2px !important;}
-.ui-jqgrid .jqgrid-overlay {display:none;z-index:100;}
-* html .jqgrid-overlay {width: expression(this.parentNode.offsetWidth+'px');height: expression(this.parentNode.offsetHeight+'px');}
-* .jqgrid-overlay iframe {position:absolute;top:0;left:0;z-index:-1;width: expression(this.parentNode.offsetWidth+'px');height: expression(this.parentNode.offsetHeight+'px');}
-/* end loading div */
-/* toolbar */
-.ui-jqgrid .ui-userdata {border-left: 0px none;	border-right: 0px none;	height : 21px;overflow: hidden;	}
-/*Modal Window */
-.ui-jqdialog { display: none; width: 300px; position: absolute; padding: .2em; font-size:11px; overflow:visible;}
-.ui-jqdialog .ui-jqdialog-titlebar { padding: .3em .2em; position: relative;  }
-.ui-jqdialog .ui-jqdialog-title { margin: .1em 0 .2em; } 
-.ui-jqdialog .ui-jqdialog-titlebar-close { position: absolute;  top: 50%; width: 19px; margin: -10px 0 0 0; padding: 1px; height: 18px; }
-
-.ui-jqdialog .ui-jqdialog-titlebar-close span { display: block; margin: 1px; }
-.ui-jqdialog .ui-jqdialog-titlebar-close:hover, .ui-jqdialog .ui-jqdialog-titlebar-close:focus { padding: 0; }
-.ui-jqdialog-content, .ui-jqdialog .ui-jqdialog-content { border: 0; padding: .3em .2em; background: none; height:auto;}
-.ui-jqdialog .ui-jqconfirm {padding: .4em 1em; border-width:3px;position:absolute;bottom:10px;right:10px;overflow:visible;display:none;height:80px;width:220px;text-align:center;}
-/* end Modal window*/
-/* Form edit */
-.ui-jqdialog-content .FormGrid {margin: 0px;}
-.ui-jqdialog-content .EditTable { width: 100%; margin-bottom:0em;}
-.ui-jqdialog-content .DelTable { width: 100%; margin-bottom:0em;}
-.EditTable td input, .EditTable td select, .EditTable td textarea {margin: 0em;}
-.EditTable td textarea { width:auto; height:auto;}
-.ui-jqdialog-content td.EditButton {text-align: right;border-top: 0px none;border-left: 0px none;border-right: 0px none; padding-bottom:5px; padding-top:5px;}
-.ui-jqdialog-content td.navButton {text-align: center; border-left: 0px none;border-top: 0px none;border-right: 0px none; padding-bottom:5px; padding-top:5px;}
-.ui-jqdialog-content input.FormElement {padding:.3em}
-.ui-jqdialog-content .data-line {padding-top:.1em;border: 0px none;}
-
-.ui-jqdialog-content .CaptionTD {text-align: left; vertical-align: middle;border: 0px none; padding: 2px;white-space: nowrap;}
-.ui-jqdialog-content .DataTD {padding: 2px; border: 0px none; vertical-align: top;}
-.ui-jqdialog-content .form-view-data {white-space:pre}
-.fm-button { display: inline-block; margin:0 4px 0 0; padding: .4em .5em; text-decoration:none !important; cursor:pointer; position: relative; text-align: center; zoom: 1; }
-.fm-button-icon-left { padding-left: 1.9em; }
-.fm-button-icon-right { padding-right: 1.9em; }
-.fm-button-icon-left .ui-icon { right: auto; left: .2em; margin-left: 0; position: absolute; top: 50%; margin-top: -8px; }
-.fm-button-icon-right .ui-icon { left: auto; right: .2em; margin-left: 0; position: absolute; top: 50%; margin-top: -8px;}
-#nData, #pData { float: left; margin:3px;padding: 0; width: 15px; }
-/* End Eorm edit */
-/*.ui-jqgrid .edit-cell {}*/
-.ui-jqgrid .selected-row, div.ui-jqgrid .selected-row td {font-style : normal;border-left: 0px none;}
-/* Tree Grid */
-.ui-jqgrid .tree-wrap {float: left; position: relative;height: 18px;white-space: nowrap;overflow: hidden;}
-.ui-jqgrid .tree-minus {position: absolute; height: 18px; width: 18px; overflow: hidden;}
-.ui-jqgrid .tree-plus {position: absolute;	height: 18px; width: 18px;	overflow: hidden;}
-.ui-jqgrid .tree-leaf {position: absolute;	height: 18px; width: 18px;overflow: hidden;}
-.ui-jqgrid .treeclick {cursor: pointer;}
-/* moda dialog */
-.jqmOverlay { background-color: #000; }
-* iframe.jqm {position:absolute;top:0;left:0;z-index:-1;width: expression(this.parentNode.offsetWidth+'px');height: expression(this.parentNode.offsetHeight+'px');}
-.ui-jqgrid-dnd tr td {border-right-width: 1px; border-right-color: inherit; border-right-style: solid; height:20px}
-/* RTL Support */
-.ui-jqgrid .ui-jqgrid-title-rtl {float:right;margin: .1em 0 .2em; }
-.ui-jqgrid .ui-jqgrid-hbox-rtl {float: right; padding-left: 20px;}
-.ui-jqgrid .ui-jqgrid-resize-ltr {float: right;margin: -2px -2px -2px 0px;}
-.ui-jqgrid .ui-jqgrid-resize-rtl {float: left;margin: -2px 0px -1px -3px;}
-.ui-jqgrid .ui-sort-rtl {left:0px;}
-.ui-jqgrid .tree-wrap-ltr {float: left;}
-.ui-jqgrid .tree-wrap-rtl {float: right;}
-.ui-jqgrid .ui-ellipsis {text-overflow:ellipsis; -moz-binding:url('ellipsis-xbl.xml#ellipsis');}
-.ui-searchFilter { display: none; position: absolute; z-index: 770; overflow: visible;}
-.ui-searchFilter table {position:relative; margin:0em; width:auto}
-.ui-searchFilter table td {margin: 0em; padding: 1px;}
-.ui-searchFilter table td input, .ui-searchFilter table td select {margin: 0.1em;}
-.ui-searchFilter .ui-state-default { cursor: pointer; }
-.ui-searchFilter .divider hr {margin: 1px; }
\ No newline at end of file
diff --git a/addons/base/static/lib/jquery.jqGrid/install.txt b/addons/base/static/lib/jquery.jqGrid/install.txt
deleted file mode 100644
index 5407b35b2c4..00000000000
--- a/addons/base/static/lib/jquery.jqGrid/install.txt
+++ /dev/null
@@ -1,43 +0,0 @@
-Installation
-
-Download the jqGrid package from the www.trirand/blog site section downloads.
-Note the new download manager where you can choose which modules you want to
-include in the download.
-
-In order to use jqGrid 3.5, first a UI theme css file should be loaded.
-Download the desired theme (or build a custom one) from jQueryUI site
-(www.jqueryui.com) and point in your link tag in head section the path to the
-theme css
-
-<link rel="stylesheet" type="text/css" media="screen" href="path_to_ui_css_file/jquery-ui-1.7.1.custom.css" />
-
-where the path_to_ui_css_file is a valid path to the ui theme file
-
-Extract the jqGrid package and copy the ui.jqgrid.css from css directory to
-your webserver directory. It is not necessary that the jqgrid css file is in
-the same directory as those of the jquery ui css.
-
-<link rel="stylesheet" type="text/css" media="screen" href="path_to_jqgrid_css_file/ui.jqgrid.css" />
-
-Starting with this version, jqGrid does not use a loader (which loads the
-needed files one by one), but all the needed code is contained in one file.
-The desired modules can be built using the jqGrid download manager from the
-site pointed above. In order to use this, first a language file should be
-loaded and then the jqgrid file.
-
-Copy the desired language file from js/i18n directory to your web server
-directory where you store the java script files. Every language file is
-named grid.locale-XX.js, where XX is a two-letter code for the language.
-Copy the jquery.jqGid.min.js file to the same or other valid directory in
-your web server
-
-Include both the files in script tags in the head section
-
-<script src="path_to_js_files/grid.locale-en.js" type="text/javascript"></script>
-<script src="path_to_js_files/jquery.jqGrid.min.js" type="text/javascript"></script>
-
-For debugging purposes, I have created a grid.loader.js which does the same
-loading of the files as in previous versions. The location of the file is in
-src directory of the package. In order to use this, the variable pathojsfiles
-should be adjusted to point to the appropriate folder - see 3.4.x docs.
-
diff --git a/addons/base/static/lib/jquery.jqGrid/jquery.jqGrid.js b/addons/base/static/lib/jquery.jqGrid/jquery.jqGrid.js
deleted file mode 100644
index 3aa554a0d83..00000000000
--- a/addons/base/static/lib/jquery.jqGrid/jquery.jqGrid.js
+++ /dev/null
@@ -1,50 +0,0 @@
-//This file should be used if you want to debug and develop
-function jqGridInclude()
-{
-    var pathtojsfiles = "/base/static/lib/jquery.jqGrid/js/"; // need to be ajusted
-    // set include to false if you do not want some modules to be included
-    var modules = [
-        { include: true, incfile:'i18n/grid.locale-en.js'}, // jqGrid translation
-        { include: true, incfile:'grid.base.js'}, // jqGrid base
-        { include: true, incfile:'grid.common.js'}, // jqGrid common for editing
-        { include: true, incfile:'grid.formedit.js'}, // jqGrid Form editing
-        { include: true, incfile:'grid.inlinedit.js'}, // jqGrid inline editing
-        { include: true, incfile:'grid.celledit.js'}, // jqGrid cell editing
-        { include: true, incfile:'grid.subgrid.js'}, //jqGrid subgrid
-        { include: true, incfile:'grid.treegrid.js'}, //jqGrid treegrid
-	{ include: true, incfile:'grid.grouping.js'}, //jqGrid grouping
-        { include: true, incfile:'grid.custom.js'}, //jqGrid custom 
-        { include: true, incfile:'grid.tbltogrid.js'}, //jqGrid table to grid 
-        { include: true, incfile:'grid.import.js'}, //jqGrid import
-        { include: true, incfile:'jquery.fmatter.js'}, //jqGrid formater
-        { include: true, incfile:'JsonXml.js'}, //xmljson utils
-        { include: true, incfile:'grid.jqueryui.js'}, //jQuery UI utils
-        { include: true, incfile:'grid.filter.js'} // filter Plugin
-    ];
-    var filename;
-    for(var i=0;i<modules.length; i++)
-    {
-        if(modules[i].include === true) {
-        	filename = pathtojsfiles+modules[i].incfile;
-			if(jQuery.browser.safari) {
-				jQuery.ajax({url:filename,dataType:'script', async:false, cache: true});
-			} else {
-				if (jQuery.browser.msie) {
-					document.write('<script charset="utf-8" type="text/javascript" src="'+filename+'"></script>');
-				} else {
-					IncludeJavaScript(filename);
-				}
-			}
-		}
-    }
-	function IncludeJavaScript(jsFile)
-    {
-        var oHead = document.getElementsByTagName('head')[0];
-        var oScript = document.createElement('script');
-        oScript.setAttribute('type', 'text/javascript');
-        oScript.setAttribute('language', 'javascript');
-        oScript.setAttribute('src', jsFile);
-        oHead.appendChild(oScript);
-    }
-}
-jqGridInclude();
diff --git a/addons/base/static/lib/jquery.jqGrid/js/JsonXml.js b/addons/base/static/lib/jquery.jqGrid/js/JsonXml.js
deleted file mode 100644
index e682ebe9eaf..00000000000
--- a/addons/base/static/lib/jquery.jqGrid/js/JsonXml.js
+++ /dev/null
@@ -1,338 +0,0 @@
-/*
-	The below work is licensed under Creative Commons GNU LGPL License.
-
-	Original work:
-
-	License:     http://creativecommons.org/licenses/LGPL/2.1/
-	Author:      Stefan Goessner/2006
-	Web:         http://goessner.net/ 
-
-	Modifications made:
-
-	Version:     0.9-p5
-	Description: Restructured code, JSLint validated (no strict whitespaces),
-	             added handling of empty arrays, empty strings, and int/floats values.
-	Author:      Michael Schøler/2008-01-29
-	Web:         http://michael.hinnerup.net/blog/2008/01/26/converting-json-to-xml-and-xml-to-json/
-	
-	Description: json2xml added support to convert functions as CDATA
-	             so it will be easy to write characters that cause some problems when convert
-	Author:      Tony Tomov
-*/
-
-/*global alert */
-var xmlJsonClass = {
-	// Param "xml": Element or document DOM node.
-	// Param "tab": Tab or indent string for pretty output formatting omit or use empty string "" to supress.
-	// Returns:     JSON string
-	xml2json: function(xml, tab) {
-		if (xml.nodeType === 9) {
-			// document node
-			xml = xml.documentElement;
-		}
-		var nws = this.removeWhite(xml);
-		var obj = this.toObj(nws);
-		var json = this.toJson(obj, xml.nodeName, "\t");
-		return "{\n" + tab + (tab ? json.replace(/\t/g, tab) : json.replace(/\t|\n/g, "")) + "\n}";
-	},
-
-	// Param "o":   JavaScript object
-	// Param "tab": tab or indent string for pretty output formatting omit or use empty string "" to supress.
-	// Returns:     XML string
-	json2xml: function(o, tab) {
-		var toXml = function(v, name, ind) {
-			var xml = "";
-			var i, n;
-			if (v instanceof Array) {
-				if (v.length === 0) {
-					xml += ind + "<"+name+">__EMPTY_ARRAY_</"+name+">\n";
-				}
-				else {
-					for (i = 0, n = v.length; i < n; i += 1) {
-						var sXml = ind + toXml(v[i], name, ind+"\t") + "\n";
-						xml += sXml;
-					}
-				}
-			}
-			else if (typeof(v) === "object") {
-				var hasChild = false;
-				xml += ind + "<" + name;
-				var m;
-				for (m in v) if (v.hasOwnProperty(m)) {
-					if (m.charAt(0) === "@") {
-						xml += " " + m.substr(1) + "=\"" + v[m].toString() + "\"";
-					}
-					else {
-						hasChild = true;
-					}
-				}
-				xml += hasChild ? ">" : "/>";
-				if (hasChild) {
-					for (m in v) if (v.hasOwnProperty(m)) {
-						if (m === "#text") {
-							xml += v[m];
-						}
-						else if (m === "#cdata") {
-							xml += "<![CDATA[" + v[m] + "]]>";
-						}
-						else if (m.charAt(0) !== "@") {
-							xml += toXml(v[m], m, ind+"\t");
-						}
-					}
-					xml += (xml.charAt(xml.length - 1) === "\n" ? ind : "") + "</" + name + ">";
-				}
-			}
-			else if (typeof(v) === "function") {
-				xml += ind + "<" + name + ">" + "<![CDATA[" + v + "]]>" + "</" + name + ">";
-			}
-			else {
-				if (v.toString() === "\"\"" || v.toString().length === 0) {
-					xml += ind + "<" + name + ">__EMPTY_STRING_</" + name + ">";
-				} 
-				else {
-					xml += ind + "<" + name + ">" + v.toString() + "</" + name + ">";
-				}
-			}
-			return xml;
-		};
-		var xml = "";
-		var m;
-		for (m in o) if (o.hasOwnProperty(m)) {
-			xml += toXml(o[m], m, "");
-		}
-		return tab ? xml.replace(/\t/g, tab) : xml.replace(/\t|\n/g, "");
-	},
-	// Internal methods
-	toObj: function(xml) {
-		var o = {};
-		var FuncTest = /function/i;
-		if (xml.nodeType === 1) {
-			// element node ..
-			if (xml.attributes.length) {
-				// element with attributes ..
-				var i;
-				for (i = 0; i < xml.attributes.length; i += 1) {
-					o["@" + xml.attributes[i].nodeName] = (xml.attributes[i].nodeValue || "").toString();
-				}
-			}
-			if (xml.firstChild) {
-				// element has child nodes ..
-				var textChild = 0, cdataChild = 0, hasElementChild = false;
-				var n;
-				for (n = xml.firstChild; n; n = n.nextSibling) {
-					if (n.nodeType === 1) {
-						hasElementChild = true;
-					}
-					else if (n.nodeType === 3 && n.nodeValue.match(/[^ \f\n\r\t\v]/)) {
-						// non-whitespace text
-						textChild += 1;
-					}
-					else if (n.nodeType === 4) {
-						// cdata section node
-						cdataChild += 1;
-					}
-				}
-				if (hasElementChild) {
-					if (textChild < 2 && cdataChild < 2) {
-						// structured element with evtl. a single text or/and cdata node ..
-						this.removeWhite(xml);
-						for (n = xml.firstChild; n; n = n.nextSibling) {
-							if (n.nodeType === 3) {
-								// text node
-								o["#text"] = this.escape(n.nodeValue);
-							}
-							else if (n.nodeType === 4) {
-								// cdata node
-								if (FuncTest.test(n.nodeValue)) {
-									o[n.nodeName] = [o[n.nodeName], n.nodeValue];
-								} else {
-									o["#cdata"] = this.escape(n.nodeValue);
-								}
-							}
-							else if (o[n.nodeName]) {
-								// multiple occurence of element ..
-								if (o[n.nodeName] instanceof Array) {
-									o[n.nodeName][o[n.nodeName].length] = this.toObj(n);
-								}
-								else {
-									o[n.nodeName] = [o[n.nodeName], this.toObj(n)];
-								}
-							}
-							else {
-								// first occurence of element ..
-								o[n.nodeName] = this.toObj(n);
-							}
-						}
-					}
-					else {
-						// mixed content
-						if (!xml.attributes.length) {
-							o = this.escape(this.innerXml(xml));
-						}
-						else {
-							o["#text"] = this.escape(this.innerXml(xml));
-						}
-					}
-				}
-				else if (textChild) {
-					// pure text
-					if (!xml.attributes.length) {
-						o = this.escape(this.innerXml(xml));
-						if (o === "__EMPTY_ARRAY_") {
-							o = "[]";
-						} else if (o === "__EMPTY_STRING_") {
-							o = "";
-						}
-					}
-					else {
-						o["#text"] = this.escape(this.innerXml(xml));
-					}
-				}
-				else if (cdataChild) {
-					// cdata
-					if (cdataChild > 1) {
-						o = this.escape(this.innerXml(xml));
-					}
-					else {
-						for (n = xml.firstChild; n; n = n.nextSibling) {
-							if(FuncTest.test(xml.firstChild.nodeValue)) {
-								o = xml.firstChild.nodeValue;
-								break;
-							} else {
-								o["#cdata"] = this.escape(n.nodeValue);
-							}
-						}
-					}
-				}
-			}
-			if (!xml.attributes.length && !xml.firstChild) {
-				o = null;
-			}
-		}
-		else if (xml.nodeType === 9) {
-			// document.node
-			o = this.toObj(xml.documentElement);
-		}
-		else {
-			alert("unhandled node type: " + xml.nodeType);
-		}
-		return o;
-	},
-	toJson: function(o, name, ind, wellform) {
-		if(wellform === undefined) wellform = true;
-		var json = name ? ("\"" + name + "\"") : "", tab = "\t", newline = "\n";
-		if(!wellform) {
-			tab= ""; newline= "";
-		}
-
-		if (o === "[]") {
-			json += (name ? ":[]" : "[]");
-		}
-		else if (o instanceof Array) {
-			var n, i, ar=[];
-			for (i = 0, n = o.length; i < n; i += 1) {
-				ar[i] = this.toJson(o[i], "", ind + tab, wellform);
-			}
-			json += (name ? ":[" : "[") + (ar.length > 1 ? (newline + ind + tab + ar.join(","+newline + ind + tab) + newline + ind) : ar.join("")) + "]";
-		}
-		else if (o === null) {
-			json += (name && ":") + "null";
-		}
-		else if (typeof(o) === "object") {
-			var arr = [], m;
-			for (m in o) {
-				if (o.hasOwnProperty(m)) {
-					arr[arr.length] = this.toJson(o[m], m, ind + tab, wellform);
-			}
-		}
-			json += (name ? ":{" : "{") + (arr.length > 1 ? (newline + ind + tab + arr.join(","+newline + ind + tab) + newline + ind) : arr.join("")) + "}";
-		}
-		else if (typeof(o) === "string") {
-			/*
-			var objRegExp  = /(^-?\d+\.?\d*$)/;
-			var FuncTest = /function/i;
-			var os = o.toString();
-			if (objRegExp.test(os) || FuncTest.test(os) || os==="false" || os==="true") {
-				// int or float
-				json += (name && ":")  + "\"" +os + "\"";
-			} 
-			else {
-			*/
-				json += (name && ":") + "\"" + o.replace(/\\/g,'\\\\').replace(/\"/g,'\\"') + "\"";
-			//}
-			}
-		else {
-			json += (name && ":") +  "\"" + o.toString()+ "\"";
-		}
-		return json;
-	},
-	innerXml: function(node) {
-		var s = "";
-		if ("innerHTML" in node) {
-			s = node.innerHTML;
-		}
-		else {
-			var asXml = function(n) {
-				var s = "", i;
-				if (n.nodeType === 1) {
-					s += "<" + n.nodeName;
-					for (i = 0; i < n.attributes.length; i += 1) {
-						s += " " + n.attributes[i].nodeName + "=\"" + (n.attributes[i].nodeValue || "").toString() + "\"";
-					}
-					if (n.firstChild) {
-						s += ">";
-						for (var c = n.firstChild; c; c = c.nextSibling) {
-							s += asXml(c);
-						}
-						s += "</" + n.nodeName + ">";
-					}
-					else {
-						s += "/>";
-					}
-				}
-				else if (n.nodeType === 3) {
-					s += n.nodeValue;
-				}
-				else if (n.nodeType === 4) {
-					s += "<![CDATA[" + n.nodeValue + "]]>";
-				}
-				return s;
-			};
-			for (var c = node.firstChild; c; c = c.nextSibling) {
-				s += asXml(c);
-			}
-		}
-		return s;
-	},
-	escape: function(txt) {
-		return txt.replace(/[\\]/g, "\\\\").replace(/[\"]/g, '\\"').replace(/[\n]/g, '\\n').replace(/[\r]/g, '\\r');
-	},
-	removeWhite: function(e) {
-		e.normalize();
-		var n;
-		for (n = e.firstChild; n; ) {
-			if (n.nodeType === 3) {
-				// text node
-				if (!n.nodeValue.match(/[^ \f\n\r\t\v]/)) {
-					// pure whitespace text node
-					var nxt = n.nextSibling;
-					e.removeChild(n);
-					n = nxt;
-				}
-				else {
-					n = n.nextSibling;
-				}
-			}
-			else if (n.nodeType === 1) {
-				// element node
-				this.removeWhite(n);
-				n = n.nextSibling;
-			}
-			else {
-				// any other node
-				n = n.nextSibling;
-			}
-		}
-		return e;
-	}
-};
\ No newline at end of file
diff --git a/addons/base/static/lib/jquery.jqGrid/js/grid.base.js b/addons/base/static/lib/jquery.jqGrid/js/grid.base.js
deleted file mode 100644
index 11adb4a269e..00000000000
--- a/addons/base/static/lib/jquery.jqGrid/js/grid.base.js
+++ /dev/null
@@ -1,3124 +0,0 @@
-/*
- * jqGrid  3.8.2  - jQuery Grid
- * Copyright (c) 2008, Tony Tomov, tony@trirand.com
- * Dual licensed under the MIT and GPL licenses
- * http://www.opensource.org/licenses/mit-license.php
- * http://www.gnu.org/licenses/gpl-2.0.html
- * Date: 2010-12-14
- */
-//jsHint options
-/*global document, window, jQuery, DOMParser, ActiveXObject $ */
-
-(function ($) {
-
-$.jgrid = $.jgrid || {};
-$.extend($.jgrid,{
-	htmlDecode : function(value){
-		if(value=='&nbsp;' || value=='&#160;' || (value.length==1 && value.charCodeAt(0)==160)) { return "";}
-		return !value ? value : String(value).replace(/&amp;/g, "&").replace(/&gt;/g, ">").replace(/&lt;/g, "<").replace(/&quot;/g, '"');
-	},
-	htmlEncode : function (value){
-		return !value ? value : String(value).replace(/&/g, "&amp;").replace(/>/g, "&gt;").replace(/</g, "&lt;").replace(/\"/g, "&quot;");
-	},
-	format : function(format){ //jqgformat
-		var args = $.makeArray(arguments).slice(1);
-		if(format===undefined) { format = ""; }
-		return format.replace(/\{(\d+)\}/g, function(m, i){
-			return args[i];
-		});
-	},
-	getCellIndex : function (cell) {
-		var c = $(cell);
-		if (c.is('tr')) { return -1; }
-		c = (!c.is('td') && !c.is('th') ? c.closest("td,th") : c)[0];
-		if ($.browser.msie) { return $.inArray(c, c.parentNode.cells); }
-		return c.cellIndex;
-	},
-	stripHtml : function(v) {
-		v = v+"";
-		var regexp = /<("[^"]*"|'[^']*'|[^'">])*>/gi;
-		if (v) {
-			v = v.replace(regexp,"");
-			return (v && v !== '&nbsp;' && v !== '&#160;') ? v.replace(/\"/g,"'") : "";
-		} else {
-			return v;
-		}
-	},
-	stringToDoc : function (xmlString) {
-		var xmlDoc;
-		if(typeof xmlString !== 'string') { return xmlString; }
-		try	{
-			var parser = new DOMParser();
-			xmlDoc = parser.parseFromString(xmlString,"text/xml");
-		}
-		catch(e) {
-			xmlDoc = new ActiveXObject("Microsoft.XMLDOM");
-			xmlDoc.async=false;
-			xmlDoc.loadXML(xmlString);
-		}
-		return (xmlDoc && xmlDoc.documentElement && xmlDoc.documentElement.tagName != 'parsererror') ? xmlDoc : null;
-	},
-	parse : function(jsonString) {
-		var js = jsonString;
-		if (js.substr(0,9) == "while(1);") { js = js.substr(9); }
-		if (js.substr(0,2) == "/*") { js = js.substr(2,js.length-4); }
-		if(!js) { js = "{}"; }
-		return ($.jgrid.useJSON===true && typeof (JSON) === 'object' && typeof (JSON.parse) === 'function') ?
-		    JSON.parse(js) :
-		    eval('(' + js + ')');
-	},
-	parseDate : function(format, date) {
-		var tsp = {m : 1, d : 1, y : 1970, h : 0, i : 0, s : 0},k,hl,dM, regdate = /[\\\/:_;.,\t\T\s-]/;
-		if(date && date !== null && date !== undefined){
-			date = $.trim(date);
-			date = date.split(regdate);
-			format = format.split(regdate);
-			var dfmt  = $.jgrid.formatter.date.monthNames;
-			var afmt  = $.jgrid.formatter.date.AmPm;
-			var h12to24 = function(ampm, h){
-				if (ampm === 0){ if (h == 12) { h = 0;} }
-				          else { if (h != 12) { h += 12; } }
-				return h;
-			};
-			for(k=0,hl=format.length;k<hl;k++){
-				if(format[k] == 'M') {
-					dM = $.inArray(date[k],dfmt);
-					if(dM !== -1 && dM < 12){date[k] = dM+1;}
-				}
-				if(format[k] == 'F') {
-					dM = $.inArray(date[k],dfmt);
-					if(dM !== -1 && dM > 11){date[k] = dM+1-12;}
-				}
-				if(format[k] == 'a') {
-					dM = $.inArray(date[k],afmt);
-					if(dM !== -1 && dM < 2 && date[k] == afmt[dM]){
-						date[k] = dM;
-						tsp.h = h12to24(date[k], tsp.h);
-					}
-				}
-				if(format[k] == 'A') {
-					dM = $.inArray(date[k],afmt);
-					if(dM !== -1 && dM > 1 && date[k] == afmt[dM]){
-						date[k] = dM-2;
-						tsp.h = h12to24(date[k], tsp.h);
-					}
-				}
-				if(date[k] !== undefined) {
-					tsp[format[k].toLowerCase()] = parseInt(date[k],10);
-				}
-			}
-			tsp.m = parseInt(tsp.m,10)-1;
-			var ty = tsp.y;
-			if (ty >= 70 && ty <= 99) {tsp.y = 1900+tsp.y;}
-			else if (ty >=0 && ty <=69) {tsp.y= 2000+tsp.y;}
-		}
-		return new Date(tsp.y, tsp.m, tsp.d, tsp.h, tsp.i, tsp.s,0);
-	},
-	jqID : function(sid){
-		sid = sid + "";
-		return sid.replace(/([\.\:\[\]])/g,"\\$1");
-	},
-	getAccessor : function(obj, expr) {
-		var ret,p,prm = [], i;
-		if( typeof expr === 'function') { return expr(obj); }
-		ret = obj[expr];
-		if(ret===undefined) {
-			try {
-				if ( typeof expr === 'string' ) {
-					prm = expr.split('.');
-				}
-				i = prm.length; 
-				if( i ) {
-					ret = obj;
-				    while (ret && i--) {
-						p = prm.shift();
-						ret = ret[p];
-					}
-				}
-			} catch (e) {}
-		}
-		return ret;
-	},
-	ajaxOptions: {},
-	from : function(source,initalQuery){
-		// Original Author Hugo Bonacci
-		// License MIT http://jlinq.codeplex.com/license
-		var queryObject=function(d,q){
-		if(typeof(d)=="string"){
-			d=$.data(d);
-		}
-		var self=this,
-		_data=d,
-		_usecase=true,
-		_trim=false,
-		_query=q,
-		_stripNum = /[\$,%]/g,
-		_lastCommand=null,
-		_lastField=null,
-		_negate=false,
-		_queuedOperator="",
-		_sorting=[],
-		_useProperties=true;
-		if(typeof(d)=="object"&&d.push) {
-			if(d.length>0){
-				if(typeof(d[0])!="object"){
-					_useProperties=false;
-				}else{
-					_useProperties=true;
-				}
-			}
-		}else{
-			throw "data provides is not an array";
-		}
-		this._hasData=function(){
-			return _data===null?false:_data.length===0?false:true;
-		};
-		this._getStr=function(s){
-			var phrase=[];
-			if(_trim){
-				phrase.push("jQuery.trim(");
-			}
-			phrase.push("String("+s+")");
-			if(_trim){
-				phrase.push(")");
-			}
-			if(!_usecase){
-				phrase.push(".toLowerCase()");
-			}
-			return phrase.join("");
-		};
-		this._strComp=function(val){
-			if(typeof(val)=="string"){
-				return".toString()";
-			}else{
-				return"";
-			}
-		};
-		this._group=function(f,u){
-			return({field:f.toString(),unique:u,items:[]});
-		};
-		this._toStr=function(phrase){
-			if(_trim){
-				phrase=$.trim(phrase);
-			}
-			if(!_usecase){
-				phrase=phrase.toLowerCase();
-			}
-			phrase=phrase.toString().replace(/\\/g,'\\\\').replace(/\"/g,'\\"');
-			return phrase;
-		};
-		this._funcLoop=function(func){
-			var results=[];
-			$.each(_data,function(i,v){
-				results.push(func(v));
-			});
-			return results;
-		};
-		this._append=function(s){
-			if(_query===null){
-				_query="";
-			} else {
-				_query+=_queuedOperator === "" ? " && " :_queuedOperator;
-			}
-			if(_negate){
-				_query+="!";
-			}
-			_query+="("+s+")";
-			_negate=false;
-			_queuedOperator="";
-		};
-		this._setCommand=function(f,c){
-			_lastCommand=f;
-			_lastField=c;
-		};
-		this._resetNegate=function(){
-			_negate=false;
-		};
-		this._repeatCommand=function(f,v){
-			if(_lastCommand===null){
-				return self;
-			}
-			if(f!==null&&v!==null){
-				return _lastCommand(f,v);
-			}
-			if(_lastField===null){
-				return _lastCommand(f);
-			}
-			if(!_useProperties){
-				return _lastCommand(f);
-			}
-			return _lastCommand(_lastField,f);
-		};
-		this._equals=function(a,b){
-			return(self._compare(a,b,1)===0);
-		};
-		this._compare=function(a,b,d){
-			if( d === undefined) { d = 1; }
-			if(a===undefined) { a = null; }
-			if(b===undefined) { b = null; }
-			if(a===null && b===null){
-				return 0;
-			}
-			if(a===null&&b!==null){
-				return 1;
-			}
-			if(a!==null&&b===null){
-				return -1;
-			}
-			if(!_usecase && typeof(a) !== "number" && typeof(b) !== "number" ) {
-				a=String(a).toLowerCase();
-				b=String(b).toLowerCase();
-			}
-			if(a<b){return -d;}
-			if(a>b){return d;}
-			return 0;
-		};
-		this._performSort=function(){
-			if(_sorting.length===0){return;}
-			_data=self._doSort(_data,0);
-		};
-		this._doSort=function(d,q){
-			var by=_sorting[q].by,
-			dir=_sorting[q].dir,
-			type = _sorting[q].type,
-			dfmt = _sorting[q].datefmt;
-			if(q==_sorting.length-1){
-				return self._getOrder(d, by, dir, type, dfmt);
-			}
-			q++;
-			var values=self._getGroup(d,by,dir,type,dfmt);
-			var results=[];
-			for(var i=0;i<values.length;i++){
-				var sorted=self._doSort(values[i].items,q);
-				for(var j=0;j<sorted.length;j++){
-					results.push(sorted[j]);
-				}
-			}
-			return results;
-		};
-		this._getOrder=function(data,by,dir,type, dfmt){
-			var sortData=[],_sortData=[], newDir = dir=="a" ? 1 : -1, i,ab,j,
-			findSortKey;
-
-			if(type === undefined ) { type = "text"; }
-			if (type == 'float' || type== 'number' || type== 'currency' || type== 'numeric') {
-				findSortKey = function($cell, a) {
-					var key = parseFloat( String($cell).replace(_stripNum, ''));
-					return isNaN(key) ? 0.00 : key;
-				};
-			} else if (type=='int' || type=='integer') {
-				findSortKey = function($cell, a) {
-					return $cell ? parseFloat(String($cell).replace(_stripNum, '')) : 0;
-				};
-			} else if(type == 'date' || type == 'datetime') {
-				findSortKey = function($cell, a) {
-					return $.jgrid.parseDate(dfmt,$cell).getTime();
-				};
-			} else if($.isFunction(type)) {
-				findSortKey = type;
-			} else {
-				findSortKey = function($cell, a) {
-					if(!$cell) {$cell ="";}
-					return $.trim(String($cell).toUpperCase());
-				};
-			}
-			$.each(data,function(i,v){
-				ab = by!=="" ? $.jgrid.getAccessor(v,by) : v;
-				if(ab === undefined) { ab = ""; }
-				ab = findSortKey(ab, v);
-				_sortData.push({ 'vSort': ab,'index':i});
-			});
-
-			_sortData.sort(function(a,b){
-				a = a.vSort;
-				b = b.vSort;
-				return self._compare(a,b,newDir);
-			});
-			j=0;
-			var nrec= data.length;
-			// overhead, but we do not change the original data.
-			while(j<nrec) {
-				i = _sortData[j].index;
-				sortData.push(data[i]);
-				j++;
-			}
-			return sortData;
-		};
-		this._getGroup=function(data,by,dir,type, dfmt){
-			var results=[],
-			group=null,
-			last=null, val;
-			$.each(self._getOrder(data,by,dir,type, dfmt),function(i,v){
-				val = $.jgrid.getAccessor(v, by);
-				if(val === undefined) { val = ""; }
-				if(!self._equals(last,val)){
-					last=val;
-					if(group !== null){
-						results.push(group);
-					}
-					group=self._group(by,val);
-				}
-				group.items.push(v);
-			});
-			if(group !== null){
-				results.push(group);
-			}
-			return results;
-		};
-		this.ignoreCase=function(){
-			_usecase=false;
-			return self;
-		};
-		this.useCase=function(){
-			_usecase=true;
-			return self;
-		};
-		this.trim=function(){
-			_trim=true;
-			return self;
-		};
-		this.noTrim=function(){
-			_trim=false;
-			return self;
-		};
-		this.execute=function(){
-			var match=_query, results=[];
-			if(match === null){
-				return self;
-			}
-			$.each(_data,function(){
-				if(eval(match)){results.push(this);}
-			});
-			_data=results;
-			return self;
-		};
-		this.data=function(){
-			return _data;
-		};
-		this.select=function(f){
-			self._performSort();
-			if(!self._hasData()){ return[]; }
-			self.execute();
-			if($.isFunction(f)){
-				var results=[];
-				$.each(_data,function(i,v){
-					results.push(f(v));
-				});
-				return results;
-			}
-			return _data;
-		};
-		this.hasMatch=function(f){
-			if(!self._hasData()) { return false; }
-			self.execute();
-			return _data.length>0;
-		};
-		this.andNot=function(f,v,x){
-			_negate=!_negate;
-			return self.and(f,v,x);
-		};
-		this.orNot=function(f,v,x){
-			_negate=!_negate;
-			return self.or(f,v,x);
-		};
-		this.not=function(f,v,x){
-			return self.andNot(f,v,x);
-		};
-		this.and=function(f,v,x){
-			_queuedOperator=" && ";
-			if(f===undefined){
-				return self;
-			}
-			return self._repeatCommand(f,v,x);
-		};
-		this.or=function(f,v,x){
-			_queuedOperator=" || ";
-			if(f===undefined) { return self; }
-			return self._repeatCommand(f,v,x);
-		};
-		this.isNot=function(f){
-			_negate=!_negate;
-			return self.is(f);
-		};
-		this.is=function(f){
-			self._append('this.'+f);
-			self._resetNegate();
-			return self;
-		};
-		this._compareValues=function(func,f,v,how,t){
-			var fld;
-			if(_useProperties){
-				fld='this.'+f;
-			}else{
-				fld='this';
-			}
-			if(v===undefined) { v = null; }
-			//var val=v===null?f:v,
-			var val =v,
-			swst = t.stype === undefined ? "text" : t.stype;
-			if(v !== null) {
-			switch(swst) {
-				case 'int':
-				case 'integer':
-					val = (isNaN(Number(val)) || val==="") ? '0' : val; // To be fixed with more inteligent code
-					fld = 'parseInt('+fld+',10)';
-					val = 'parseInt('+val+',10)';
-					break;
-				case 'float':
-				case 'number':
-				case 'numeric':
-					val = String(val).replace(_stripNum, '');
-					val = (isNaN(Number(val)) || val==="") ? '0' : val; // To be fixed with more inteligent code
-					fld = 'parseFloat('+fld+')';
-					val = 'parseFloat('+val+')';
-					break;
-				case 'date':
-				case 'datetime':
-					val = String($.jgrid.parseDate(t.newfmt || 'Y-m-d',val).getTime());
-					fld = 'jQuery.jgrid.parseDate("'+t.srcfmt+'",'+fld+').getTime()';
-					break;
-				default :
-					fld=self._getStr(fld);
-					val=self._getStr('"'+self._toStr(val)+'"');
-			}
-			}
-			self._append(fld+' '+how+' '+val);
-			self._setCommand(func,f);
-			self._resetNegate();
-			return self;
-		};
-		this.equals=function(f,v,t){
-			return self._compareValues(self.equals,f,v,"==",t);
-		};
-		this.notEquals=function(f,v,t){
-			return self._compareValues(self.equals,f,v,"!==",t);
-		};
-		this.isNull = function(f,v,t){
-			return self._compareValues(self.equals,f,null,"===",t);
-		};
-		this.greater=function(f,v,t){
-			return self._compareValues(self.greater,f,v,">",t);
-		};
-		this.less=function(f,v,t){
-			return self._compareValues(self.less,f,v,"<",t);
-		};
-		this.greaterOrEquals=function(f,v,t){
-			return self._compareValues(self.greaterOrEquals,f,v,">=",t);
-		};
-		this.lessOrEquals=function(f,v,t){
-			return self._compareValues(self.lessOrEquals,f,v,"<=",t);
-		};
-		this.startsWith=function(f,v){
-			var val = (v===undefined || v===null) ? f: v,
-			length=_trim ? $.trim(val.toString()).length : val.toString().length;
-			if(_useProperties){
-				self._append(self._getStr('this.'+f)+'.substr(0,'+length+') == '+self._getStr('"'+self._toStr(v)+'"'));
-			}else{
-				length=_trim?$.trim(v.toString()).length:v.toString().length;
-				self._append(self._getStr('this')+'.substr(0,'+length+') == '+self._getStr('"'+self._toStr(f)+'"'));
-			}
-			self._setCommand(self.startsWith,f);
-			self._resetNegate();
-			return self;
-		};
-		this.endsWith=function(f,v){
-			var val = (v===undefined || v===null) ? f: v,
-			length=_trim ? $.trim(val.toString()).length:val.toString().length;
-			if(_useProperties){
-				self._append(self._getStr('this.'+f)+'.substr('+self._getStr('this.'+f)+'.length-'+length+','+length+') == "'+self._toStr(v)+'"');
-			} else {
-				self._append(self._getStr('this')+'.substr('+self._getStr('this')+'.length-"'+self._toStr(f)+'".length,"'+self._toStr(f)+'".length) == "'+self._toStr(f)+'"');
-			}
-			self._setCommand(self.endsWith,f);self._resetNegate();
-			return self;
-		};
-		this.contains=function(f,v){
-			if(_useProperties){
-				self._append(self._getStr('this.'+f)+'.indexOf("'+self._toStr(v)+'",0) > -1');
-			}else{
-				self._append(self._getStr('this')+'.indexOf("'+self._toStr(f)+'",0) > -1');
-			}
-			self._setCommand(self.contains,f);
-			self._resetNegate();
-			return self;
-		};
-		this.groupBy=function(by,dir,type, datefmt){
-			if(!self._hasData()){
-				return null;
-			}
-			return self._getGroup(_data,by,dir,type, datefmt);
-		};
-		this.orderBy=function(by,dir,stype, dfmt){
-			dir =  dir === undefined || dir === null ? "a" :$.trim(dir.toString().toLowerCase());
-			if(stype === null || stype === undefined) { stype = "text"; }
-			if(dfmt === null || dfmt === undefined) { dfmt = "Y-m-d"; }
-			if(dir=="desc"||dir=="descending"){dir="d";}
-			if(dir=="asc"||dir=="ascending"){dir="a";}
-			_sorting.push({by:by,dir:dir,type:stype, datefmt: dfmt});
-			return self;
-		};
-		return self;
-		};
-	return new queryObject(source,null);
-	},
-	extend : function(methods) {
-		$.extend($.fn.jqGrid,methods);
-		if (!this.no_legacy_api) {
-			$.fn.extend(methods);
-		}
-	}
-});
-
-$.fn.jqGrid = function( pin ) {
-	if (typeof pin == 'string') {
-		//var fn = $.fn.jqGrid[pin];
-		var fn = $.jgrid.getAccessor($.fn.jqGrid,pin);
-		if (!fn) {
-			throw ("jqGrid - No such method: " + pin);
-		}
-		var args = $.makeArray(arguments).slice(1);
-		return fn.apply(this,args);
-	}
-	return this.each( function() {
-		if(this.grid) {return;}
-
-		var p = $.extend(true,{
-			url: "",
-			height: 150,
-			page: 1,
-			rowNum: 20,
-			rowTotal : null,
-			records: 0,
-			pager: "",
-			pgbuttons: true,
-			pginput: true,
-			colModel: [],
-			rowList: [],
-			colNames: [],
-			sortorder: "asc",
-			sortname: "",
-			datatype: "xml",
-			mtype: "GET",
-			altRows: false,
-			selarrrow: [],
-			savedRow: [],
-			shrinkToFit: true,
-			xmlReader: {},
-			jsonReader: {},
-			subGrid: false,
-			subGridModel :[],
-			reccount: 0,
-			lastpage: 0,
-			lastsort: 0,
-			selrow: null,
-			beforeSelectRow: null,
-			onSelectRow: null,
-			onSortCol: null,
-			ondblClickRow: null,
-			onRightClickRow: null,
-			onPaging: null,
-			onSelectAll: null,
-			loadComplete: null,
-			gridComplete: null,
-			loadError: null,
-			loadBeforeSend: null,
-			afterInsertRow: null,
-			beforeRequest: null,
-			onHeaderClick: null,
-			viewrecords: false,
-			loadonce: false,
-			multiselect: false,
-			multikey: false,
-			editurl: null,
-			search: false,
-			caption: "",
-			hidegrid: true,
-			hiddengrid: false,
-			postData: {},
-			userData: {},
-			treeGrid : false,
-			treeGridModel : 'nested',
-			treeReader : {},
-			treeANode : -1,
-			ExpandColumn: null,
-			tree_root_level : 0,
-			prmNames: {page:"page",rows:"rows", sort: "sidx",order: "sord", search:"_search", nd:"nd", id:"id",oper:"oper",editoper:"edit",addoper:"add",deloper:"del", subgridid:"id", npage: null, totalrows:"totalrows"},
-			forceFit : false,
-			gridstate : "visible",
-			cellEdit: false,
-			cellsubmit: "remote",
-			nv:0,
-			loadui: "enable",
-			toolbar: [false,""],
-			scroll: false,
-			multiboxonly : false,
-			deselectAfterSort : true,
-			scrollrows : false,
-			autowidth: false,
-			scrollOffset :18,
-			cellLayout: 5,
-			subGridWidth: 20,
-			multiselectWidth: 20,
-			gridview: false,
-			rownumWidth: 25,
-			rownumbers : false,
-			pagerpos: 'center',
-			recordpos: 'right',
-			footerrow : false,
-			userDataOnFooter : false,
-			hoverrows : true,
-			altclass : 'ui-priority-secondary',
-			viewsortcols : [false,'vertical',true],
-			resizeclass : '',
-			autoencode : false,
-			remapColumns : [],
-			ajaxGridOptions :{},
-			direction : "ltr",
-			toppager: false,
-			headertitles: false,
-			scrollTimeout: 40,
-			data : [],
-			_index : {},
-			grouping : false,
-			groupingView : {groupField:[],groupOrder:[], groupText:[],groupColumnShow:[],groupSummary:[], showSummaryOnHide: false, sortitems:[], sortnames:[], groupDataSorted : false, summary:[],summaryval:[], plusicon: 'ui-icon-circlesmall-plus', minusicon: 'ui-icon-circlesmall-minus'},
-			ignoreCase : false,
-			cmTemplate : {}
-		}, $.jgrid.defaults, pin || {});
-		var grid={
-			headers:[],
-			cols:[],
-			footers: [],
-			dragStart: function(i,x,y) {
-				this.resizing = { idx: i, startX: x.clientX, sOL : y[0]};
-				this.hDiv.style.cursor = "col-resize";
-				this.curGbox = $("#rs_m"+$.jgrid.jqID(p.id),"#gbox_"+$.jgrid.jqID(p.id));
-				this.curGbox.css({display:"block",left:y[0],top:y[1],height:y[2]});
-				if($.isFunction(p.resizeStart)) { p.resizeStart.call(this,x,i); }
-				document.onselectstart=function(){return false;};
-			},
-			dragMove: function(x) {
-				if(this.resizing) {
-					var diff = x.clientX-this.resizing.startX,
-					h = this.headers[this.resizing.idx],
-					newWidth = p.direction === "ltr" ? h.width + diff : h.width - diff, hn, nWn;
-					if(newWidth > 33) {
-						this.curGbox.css({left:this.resizing.sOL+diff});
-						if(p.forceFit===true ){
-							hn = this.headers[this.resizing.idx+p.nv];
-							nWn = p.direction === "ltr" ? hn.width - diff : hn.width + diff;
-							if(nWn >33) {
-								h.newWidth = newWidth;
-								hn.newWidth = nWn;
-							}
-						} else {
-							this.newWidth = p.direction === "ltr" ? p.tblwidth+diff : p.tblwidth-diff;
-							h.newWidth = newWidth;
-						}
-					}
-				}
-			},
-			dragEnd: function() {
-				this.hDiv.style.cursor = "default";
-				if(this.resizing) {
-					var idx = this.resizing.idx,
-					nw = this.headers[idx].newWidth || this.headers[idx].width;
-					nw = parseInt(nw,10);
-					this.resizing = false;
-					$("#rs_m"+$.jgrid.jqID(p.id)).css("display","none");
-					p.colModel[idx].width = nw;
-					this.headers[idx].width = nw;
-					this.headers[idx].el.style.width = nw + "px";
-					this.cols[idx].style.width = nw+"px";
-					if(this.footers.length>0) {this.footers[idx].style.width = nw+"px";}
-					if(p.forceFit===true){
-						nw = this.headers[idx+p.nv].newWidth || this.headers[idx+p.nv].width;
-						this.headers[idx+p.nv].width = nw;
-						this.headers[idx+p.nv].el.style.width = nw + "px";
-						this.cols[idx+p.nv].style.width = nw+"px";
-						if(this.footers.length>0) {this.footers[idx+p.nv].style.width = nw+"px";}
-						p.colModel[idx+p.nv].width = nw;
-					} else {
-						p.tblwidth = this.newWidth || p.tblwidth;
-						$('table:first',this.bDiv).css("width",p.tblwidth+"px");
-						$('table:first',this.hDiv).css("width",p.tblwidth+"px");
-						this.hDiv.scrollLeft = this.bDiv.scrollLeft;
-						if(p.footerrow) {
-							$('table:first',this.sDiv).css("width",p.tblwidth+"px");
-							this.sDiv.scrollLeft = this.bDiv.scrollLeft;
-						}
-					}
-					if($.isFunction(p.resizeStop)) { p.resizeStop.call(this,nw,idx); }
-				}
-				this.curGbox = null;
-				document.onselectstart=function(){return true;};
-			},
-			populateVisible: function() {
-				if (grid.timer) { clearTimeout(grid.timer); }
-				grid.timer = null;
-				var dh = $(grid.bDiv).height();
-				if (!dh) { return; }
-				var table = $("table:first", grid.bDiv);
-				var rows = $("> tbody > tr:gt(0):visible:first", table);
-				var rh = rows.outerHeight() || grid.prevRowHeight;
-				if (!rh) { return; }
-				grid.prevRowHeight = rh;
-				var rn = p.rowNum;
-				var scrollTop = grid.scrollTop = grid.bDiv.scrollTop;
-				var ttop = Math.round(table.position().top) - scrollTop;
-				var tbot = ttop + table.height();
-				var div = rh * rn;
-				var page, npage, empty;
-			    if ( tbot < dh && ttop <= 0 &&  
-					(p.lastpage===undefined||parseInt((tbot + scrollTop + div - 1) / div,10) <= p.lastpage))
-				{
-					npage = parseInt((dh - tbot + div - 1) / div,10);
-					if (tbot >= 0 || npage < 2 || p.scroll === true) {
-						page = Math.round((tbot + scrollTop) / div) + 1;
-						ttop = -1;
-					} else {
-						ttop = 1;
-					}
-				}
-				if (ttop > 0) {
-					page = parseInt(scrollTop / div,10) + 1;
-					npage = parseInt((scrollTop + dh) / div,10) + 2 - page;
-					empty = true;
-				}
-				if (npage) {
-					if (p.lastpage && page > p.lastpage || p.lastpage==1) {
-						return;
-					}
-					if (grid.hDiv.loading) {
-						grid.timer = setTimeout(grid.populateVisible, p.scrollTimeout);
-					} else {
-						p.page = page;
-						if (empty) {
-							grid.selectionPreserver(table[0]);
-							grid.emptyRows(grid.bDiv,false);
-						}
-						grid.populate(npage);
-					}
-				}
-			},
-			scrollGrid: function() {
-				if(p.scroll) {
-					var scrollTop = grid.bDiv.scrollTop;
-					if(grid.scrollTop === undefined) { grid.scrollTop = 0; }
-					if (scrollTop != grid.scrollTop) {
-						grid.scrollTop = scrollTop;
-						if (grid.timer) { clearTimeout(grid.timer); }
-						grid.timer = setTimeout(grid.populateVisible, p.scrollTimeout);
-					}
-				}
-				grid.hDiv.scrollLeft = grid.bDiv.scrollLeft;
-				if(p.footerrow) {
-					grid.sDiv.scrollLeft = grid.bDiv.scrollLeft;
-				}
-			},
-			selectionPreserver : function(ts) {
-				var p = ts.p;
-				var sr = p.selrow, sra = p.selarrrow ? $.makeArray(p.selarrrow) : null;
-				var left = ts.grid.bDiv.scrollLeft;
-				var complete = p.gridComplete;
-				p.gridComplete = function() {
-					p.selrow = null;
-					p.selarrrow = [];
-					if(p.multiselect && sra && sra.length>0) {
-						for(var i=0;i<sra.length;i++){
-							if (sra[i] != sr) {
-								$(ts).jqGrid("setSelection",sra[i],false);
-							}
-						}
-					}
-					if (sr) {
-						$(ts).jqGrid("setSelection",sr,false);
-					}
-					ts.grid.bDiv.scrollLeft = left;
-					p.gridComplete = complete;
-					if (p.gridComplete) {
-						complete();
-					}
-				};
-			}
-		};
-		if(this.tagName != 'TABLE') {
-			alert("Element is not a table");
-			return;
-		}
-		$(this).empty();
-		this.p = p ;
-		var i, dir,ts;
-		if(this.p.colNames.length === 0) {
-			for (i=0;i<this.p.colModel.length;i++){
-				this.p.colNames[i] = this.p.colModel[i].label || this.p.colModel[i].name;
-			}
-		}
-		if( this.p.colNames.length !== this.p.colModel.length ) {
-			alert($.jgrid.errors.model);
-			return;
-		}
-		var gv = $("<div class='ui-jqgrid-view'></div>"), ii,
-		isMSIE = $.browser.msie ? true:false,
-		isSafari = $.browser.safari ? true : false;
-		ts = this;
-		ts.p.direction = $.trim(ts.p.direction.toLowerCase());
-		if($.inArray(ts.p.direction,["ltr","rtl"]) == -1) { ts.p.direction = "ltr"; }
-		dir = ts.p.direction;
-
-		$(gv).insertBefore(this);
-		$(this).appendTo(gv).removeClass("scroll");
-		var eg = $("<div class='ui-jqgrid ui-widget ui-widget-content ui-corner-all'></div>");
-		$(eg).insertBefore(gv).attr({"id" : "gbox_"+this.id,"dir":dir});
-		$(gv).appendTo(eg).attr("id","gview_"+this.id);
-		if (isMSIE && $.browser.version <= 6) {
-			ii = '<iframe style="display:block;position:absolute;z-index:-1;filter:Alpha(Opacity=\'0\');" src="javascript:false;"></iframe>';
-		} else { ii="";}
-		$("<div class='ui-widget-overlay jqgrid-overlay' id='lui_"+this.id+"'></div>").append(ii).insertBefore(gv);
-		$("<div class='loading ui-state-default ui-state-active' id='load_"+this.id+"'>"+this.p.loadtext+"</div>").insertBefore(gv);
-		$(this).attr({cellspacing:"0",cellpadding:"0",border:"0","role":"grid","aria-multiselectable":!!this.p.multiselect,"aria-labelledby":"gbox_"+this.id});
-		var sortkeys = ["shiftKey","altKey","ctrlKey"],
-		intNum = function(val,defval) {
-			val = parseInt(val,10);
-			if (isNaN(val)) { return defval ? defval : 0;}
-			else {return val;}
-		},
-		formatCol = function (pos, rowInd, tv, rawObject, rowId, rdata){
-			var cm = ts.p.colModel[pos],
-			ral = cm.align, result="style=\"", clas = cm.classes, nm = cm.name, celp, acp=[];
-			if(ral) { result += "text-align:"+ral+";"; }
-			if(cm.hidden===true) { result += "display:none;"; }
-			if(rowInd===0) {
-				result += "width: "+grid.headers[pos].width+"px;";
-			} else if (cm.cellattr && $.isFunction(cm.cellattr))
-			{
-				celp = cm.cellattr.call(ts, rowId, tv, rawObject, cm, rdata);
-				if(celp && typeof(celp) === "string") {
-					celp = celp.replace(/style/i,'style').replace(/title/i,'title');
-					if(celp.indexOf('title') > -1) { cm.title=false;}
-					if(celp.indexOf('class') > -1) { clas = undefined;}
-					acp = celp.split("style");
-					if(acp.length === 2 ) {
-						acp[1] =  $.trim(acp[1].replace("=",""));
-						if(acp[1].indexOf("'") === 0 || acp[1].indexOf('"') === 0) {
-							acp[1] = acp[1].substring(1);
-			}
- 						result += acp[1].replace(/'/gi,'"');
-					} else {
-						result += "\"";
-					}
-				}
-			}
-			if(!acp.length) { acp[0] = ""; result += "\"";}
-			result += (clas !== undefined ? (" class=\""+clas+"\"") :"") + ((cm.title && tv) ? (" title=\""+$.jgrid.stripHtml(tv)+"\"") :"");
-			result += " aria-describedby=\""+ts.p.id+"_"+nm+"\"";
-			return result + acp[0];
-		},
-		cellVal =  function (val) {
-			return val === undefined || val === null || val === "" ? "&#160;" : (ts.p.autoencode ? $.jgrid.htmlEncode(val) : val+"");
-		},
-		formatter = function (rowId, cellval , colpos, rwdat, _act){
-			var cm = ts.p.colModel[colpos],v;
-			if(typeof cm.formatter !== 'undefined') {
-				var opts= {rowId: rowId, colModel:cm, gid:ts.p.id, pos:colpos };
-				if($.isFunction( cm.formatter ) ) {
-					v = cm.formatter.call(ts,cellval,opts,rwdat,_act);
-				} else if($.fmatter){
-					v = $.fn.fmatter(cm.formatter, cellval,opts, rwdat, _act);
-				} else {
-					v = cellVal(cellval);
-				}
-			} else {
-				v = cellVal(cellval);
-			}
-			return v;
-		},
-		addCell = function(rowId,cell,pos,irow, srvr) {
-			var v,prp;
-			v = formatter(rowId,cell,pos,srvr,'add');
-			prp = formatCol( pos,irow, v, srvr, rowId, true);
-			return "<td role=\"gridcell\" "+prp+">"+v+"</td>";
-		},
-		addMulti = function(rowid,pos,irow){
-			var	v = "<input role=\"checkbox\" type=\"checkbox\""+" id=\"jqg_"+ts.p.id+"_"+rowid+"\" class=\"cbox\" name=\"jqg_"+ts.p.id+"_"+rowid+"\"/>",
-			prp = formatCol( pos,irow,'',null, rowid, true);
-			return "<td role=\"gridcell\" "+prp+">"+v+"</td>";
-		},
-		addRowNum = function (pos,irow,pG,rN) {
-			var v =  (parseInt(pG,10)-1)*parseInt(rN,10)+1+irow,
-			prp = formatCol( pos,irow,v, null, irow, true);
-			return "<td role=\"gridcell\" class=\"ui-state-default jqgrid-rownum\" "+prp+">"+v+"</td>";
-		},
-		reader = function (datatype) {
-			var field, f=[], j=0, i;
-			for(i =0; i<ts.p.colModel.length; i++){
-				field = ts.p.colModel[i];
-				if (field.name !== 'cb' && field.name !=='subgrid' && field.name !=='rn') {
-					if(datatype == "local") {
-						f[j] = field.name;
-					} else {
-						f[j] = (datatype=="xml") ? field.xmlmap || field.name : field.jsonmap || field.name;
-					}
-					j++;
-				}
-			}
-			return f;
-		},
-		orderedCols = function (offset) {
-			var order = ts.p.remapColumns;
-			if (!order || !order.length) {
-				order = $.map(ts.p.colModel, function(v,i) { return i; });
-			}
-			if (offset) {
-				order = $.map(order, function(v) { return v<offset?null:v-offset; });
-			}
-			return order;
-		},
-		emptyRows = function (parent, scroll) {
-			if(ts.p.deepempty) {$("#"+$.jgrid.jqID(ts.p.id)+" tbody:first tr:gt(0)").remove();}
-			else {
-				var trf = $("#"+$.jgrid.jqID(ts.p.id)+" tbody:first tr:first")[0];
-				$("#"+$.jgrid.jqID(ts.p.id)+" tbody:first").empty().append(trf);
-			}
-			if (scroll && ts.p.scroll) {
-				$(">div:first", parent).css({height:"auto"}).children("div:first").css({height:0,display:"none"});
-				parent.scrollTop = 0;
-			}
-		},
-		refreshIndex = function() {
-			var datalen = ts.p.data.length, idname, i, val,
-			ni = ts.p.rownumbers===true ? 1 :0,
-			gi = ts.p.multiselect ===true ? 1 :0,
-			si = ts.p.subGrid===true ? 1 :0;
-
-			if(ts.p.keyIndex === false || ts.p.loadonce === true) {
-				idname = ts.p.localReader.id;
-			} else {
-				idname = ts.p.colModel[ts.p.keyIndex+gi+si+ni].name;
-			}
-			for(i =0;i < datalen; i++) {
-				val = $.jgrid.getAccessor(ts.p.data[i],idname);
-				ts.p._index[val] = i;
-			}
-		},
-		addXmlData = function (xml,t, rcnt, more, adjust) {
-			var startReq = new Date(),
-			locdata = (ts.p.datatype != "local" && ts.p.loadonce) || ts.p.datatype == "xmlstring",
-			xmlid,
-			frd = ts.p.datatype == "local" ? "local" : "xml";
-			if(locdata) {
-				ts.p.data = [];
-				ts.p._index = {};
-				ts.p.localReader.id = xmlid = "_id_";
-			}			
-			ts.p.reccount = 0;
-			if($.isXMLDoc(xml)) {
-				if(ts.p.treeANode===-1 && !ts.p.scroll) {
-					emptyRows(t,false);
-					rcnt=1;
-				} else { rcnt = rcnt > 1 ? rcnt :1; }
-			} else { return; }
-			var i,fpos,ir=0,v,row,gi=0,si=0,ni=0,idn, getId,f=[],F,rd ={}, xmlr,rid, rowData=[], cn=(ts.p.altRows === true) ? " "+ts.p.altclass:"",cn1;
-			if(!ts.p.xmlReader.repeatitems) {f = reader(frd);}
-			if( ts.p.keyIndex===false) {
-				idn = ts.p.xmlReader.id;
-			} else {
-				idn = ts.p.keyIndex;
-			}
-			if(f.length>0 && !isNaN(idn)) {
-				if (ts.p.remapColumns && ts.p.remapColumns.length) {
-					idn = $.inArray(idn, ts.p.remapColumns);
-				}
-				idn=f[idn];
-			}
-			if( (idn+"").indexOf("[") === -1 ) {
-				if (f.length) {
-					getId = function( trow, k) {return $(idn,trow).text() || k;};
-				} else {
-					getId = function( trow, k) {return $(ts.p.xmlReader.cell,trow).eq(idn).text() || k;};
-				}
-			}
-			else {
-				getId = function( trow, k) {return trow.getAttribute(idn.replace(/[\[\]]/g,"")) || k;};
-			}
-			ts.p.userData = {};
-			$(ts.p.xmlReader.page,xml).each(function() {ts.p.page = this.textContent  || this.text || 0; });
-			$(ts.p.xmlReader.total,xml).each(function() {ts.p.lastpage = this.textContent  || this.text; if(ts.p.lastpage===undefined) { ts.p.lastpage=1; } }  );
-			$(ts.p.xmlReader.records,xml).each(function() {ts.p.records = this.textContent  || this.text  || 0; }  );
-			$(ts.p.xmlReader.userdata,xml).each(function() {ts.p.userData[this.getAttribute("name")]=this.textContent || this.text;});
-			var gxml = $(ts.p.xmlReader.root+" "+ts.p.xmlReader.row,xml);
-			if (!gxml) { gxml = []; }
-			var gl = gxml.length, j=0, grpdata={}, rn;
-			if(gxml && gl){
-			rn = parseInt(ts.p.rowNum,10);
-			var br=ts.p.scroll?(parseInt(ts.p.page,10)-1)*rn+1:1,altr;
-			if (adjust) { rn *= adjust+1; }
-			var afterInsRow = $.isFunction(ts.p.afterInsertRow), hiderow="";
-			if(ts.p.grouping && ts.p.groupingView.groupCollapse === true) {
-				hiderow = " style=\"display:none;\"";
-			}
-			while (j<gl) {
-				xmlr = gxml[j];
-				rid = getId(xmlr,br+j);
-				altr = rcnt === 0 ? 0 : rcnt+1;
-				cn1 = (altr+j)%2 == 1 ? cn : '';
-				rowData.push( "<tr"+hiderow+" id=\""+rid+"\" role=\"row\" class =\"ui-widget-content jqgrow ui-row-"+ts.p.direction+""+cn1+"\">" );
-				if(ts.p.rownumbers===true) {
-					rowData.push( addRowNum(0,j,ts.p.page,ts.p.rowNum) );
-					ni=1;
-				}
-				if(ts.p.multiselect===true) {
-					rowData.push( addMulti(rid,ni,j) );
-					gi=1;
-				}
-				if (ts.p.subGrid===true) {
-					rowData.push( $(ts).jqGrid("addSubGridCell",gi+ni,j+rcnt) );
-					si= 1;
-				}
-				if(ts.p.xmlReader.repeatitems){
-					if (!F) { F=orderedCols(gi+si+ni); }
-					var cells = $(ts.p.xmlReader.cell,xmlr);
-					$.each(F, function (k) {
-						var cell = cells[this];
-						if (!cell) { return false; }
-						v = cell.textContent || cell.text;
-						rd[ts.p.colModel[k+gi+si+ni].name] = v;
-						rowData.push( addCell(rid,v,k+gi+si+ni,j+rcnt,xmlr) );
-					});
-				} else {
-					for(i = 0; i < f.length;i++) {
-						v = $(f[i],xmlr).text();
-						rd[ts.p.colModel[i+gi+si+ni].name] = v;
-						rowData.push( addCell(rid, v, i+gi+si+ni, j+rcnt, xmlr) );
-					}
-				}
-				rowData.push("</tr>");
-				if(ts.p.grouping) {
-					var grlen = ts.p.groupingView.groupField.length, grpitem = [];
-					for(var z=0;z<grlen;z++) {
-						grpitem.push(rd[ts.p.groupingView.groupField[z]]);
-					}
-					grpdata = $(ts).jqGrid('groupingPrepare',rowData, grpitem, grpdata, rd);
-					rowData = [];
-				}
-				if(locdata) {
-					rd[xmlid] = rid;
-					ts.p.data.push(rd);
-				}
-				if(ts.p.gridview === false ) {
-					if( ts.p.treeGrid === true) {
-						fpos = ts.p.treeANode > -1 ? ts.p.treeANode: 0;
-						row = $(rowData.join(''))[0]; // speed overhead
-						$(ts.rows[j+fpos]).after(row);
-						try {$(ts).jqGrid("setTreeNode",rd,row);} catch (e) {}
-					} else {
-						$("tbody:first",t).append(rowData.join(''));
-					}
-					if (ts.p.subGrid===true) {
-						try {$(ts).jqGrid("addSubGrid",ts.rows[ts.rows.length-1],gi+ni);} catch (_){}
-					}
-					if(afterInsRow) {ts.p.afterInsertRow.call(ts,rid,rd,xmlr);}
-					rowData=[];
-				}
-				rd={};
-				ir++;
-				j++;
-				if(ir==rn) {break;}
-			}
-			}
-			if(ts.p.gridview === true) {
-				if(ts.p.grouping) {
-					$(ts).jqGrid('groupingRender',grpdata,ts.p.colModel.length);
-					grpdata = null;
-				} else {				
-					$("tbody:first",t).append(rowData.join(''));
-				}
-			}
-			ts.p.totaltime = new Date() - startReq;
-			if(ir>0) { if(ts.p.records===0) { ts.p.records=gl;} }
-			rowData =null;
-			if(!ts.p.treeGrid && !ts.p.scroll) {ts.grid.bDiv.scrollTop = 0;}
-			ts.p.reccount=ir;
-			ts.p.treeANode = -1;
-			if(ts.p.userDataOnFooter) { $(ts).jqGrid("footerData","set",ts.p.userData,true); }
-			if(locdata) {
-				ts.p.records = gl;
-				ts.p.lastpage = Math.ceil(gl/ rn);
-			}
-			if (!more) { ts.updatepager(false,true); }
-			if(locdata) {
-				while (ir<gl) {
-					xmlr = gxml[ir];
-					rid = getId(xmlr,ir);
-					if(ts.p.xmlReader.repeatitems){
-						if (!F) { F=orderedCols(gi+si+ni); }
-						var cells2 = $(ts.p.xmlReader.cell,xmlr);
-						$.each(F, function (k) {
-							var cell = cells2[this];
-							if (!cell) { return false; }
-							v = cell.textContent || cell.text;
-							rd[ts.p.colModel[k+gi+si+ni].name] = v;
-						});
-					} else {
-						for(i = 0; i < f.length;i++) {
-							v = $(f[i],xmlr).text();
-							rd[ts.p.colModel[i+gi+si+ni].name] = v;
-						}
-					}
-					rd[xmlid] = rid;
-					ts.p.data.push(rd);
-					rd = {};
-					ir++;
-				}
-				refreshIndex();
-			}
-		},
-		addJSONData = function(data,t, rcnt, more, adjust) {
-			var startReq = new Date();
-			if(data) {
-				if(ts.p.treeANode === -1 && !ts.p.scroll) {
-					emptyRows(t,false);
-					rcnt=1;
-				} else { rcnt = rcnt > 1 ? rcnt :1; }
-			} else { return; }
-			
-			var dReader, locid, frd,
-			locdata = (ts.p.datatype != "local" && ts.p.loadonce) || ts.p.datatype == "jsonstring";
-			if(locdata) { ts.p.data = []; ts.p._index = {}; locid = ts.p.localReader.id = "_id_";}
-			ts.p.reccount = 0;
-			if(ts.p.datatype == "local") {
-				dReader =  ts.p.localReader;
-				frd= 'local';
-			} else {
-				dReader =  ts.p.jsonReader;
-				frd='json';
-			}
-			var ir=0,v,i,j,row,f=[],F,cur,gi=0,si=0,ni=0,len,drows,idn,rd={}, fpos, idr,rowData=[],cn=(ts.p.altRows === true) ? " "+ts.p.altclass:"",cn1,lp;
-			ts.p.page = $.jgrid.getAccessor(data,dReader.page) || 0;
-			lp = $.jgrid.getAccessor(data,dReader.total);
-			ts.p.lastpage = lp === undefined ? 1 : lp;
-			ts.p.records = $.jgrid.getAccessor(data,dReader.records) || 0;
-			ts.p.userData = $.jgrid.getAccessor(data,dReader.userdata) || {};
-			if(!dReader.repeatitems) {
-				F = f = reader(frd);
-			}
-			if( ts.p.keyIndex===false ) {
-				idn = dReader.id;
-			} else {
-				idn = ts.p.keyIndex;
-			}
-			if(f.length>0 && !isNaN(idn)) {
-				if (ts.p.remapColumns && ts.p.remapColumns.length) {
-					idn = $.inArray(idn, ts.p.remapColumns);
-				}
-				idn=f[idn];
-			}
-			drows = $.jgrid.getAccessor(data,dReader.root);
-			if (!drows) { drows = []; }
-			len = drows.length; i=0;
-			var rn = parseInt(ts.p.rowNum,10),br=ts.p.scroll?(parseInt(ts.p.page,10)-1)*rn+1:1, altr;
-			if (adjust) { rn *= adjust+1; }
-			var afterInsRow = $.isFunction(ts.p.afterInsertRow), grpdata={}, hiderow="";
-			if(ts.p.grouping && ts.p.groupingView.groupCollapse === true) {
-				hiderow = " style=\"display:none;\"";
-			}
-			while (i<len) {
-				cur = drows[i];
-				idr = $.jgrid.getAccessor(cur,idn);
-				if(idr === undefined) {
-					idr = br+i;
-					if(f.length===0){
-						if(dReader.cell){
-							var ccur = $.jgrid.getAccessor(cur,dReader.cell);
-							idr = ccur[idn] || idr;
-							ccur=null;
-						}
-					}
-				}
-				altr = rcnt === 1 ? 0 : rcnt;
-				cn1 = (altr+i)%2 == 1 ? cn : '';
-				rowData.push("<tr"+hiderow+" id=\""+ idr +"\" role=\"row\" class= \"ui-widget-content jqgrow ui-row-"+ts.p.direction+""+cn1+"\">");
-				if(ts.p.rownumbers===true) {
-					rowData.push( addRowNum(0,i,ts.p.page,ts.p.rowNum) );
-					ni=1;
-				}
-				if(ts.p.multiselect){
-					rowData.push( addMulti(idr,ni,i) );
-					gi = 1;
-				}
-				if (ts.p.subGrid) {
-					rowData.push( $(ts).jqGrid("addSubGridCell",gi+ni,i+rcnt) ); 
-					si= 1;
-				}
-				if (dReader.repeatitems) {
-					if(dReader.cell) {cur = $.jgrid.getAccessor(cur,dReader.cell);}
-					if (!F) { F=orderedCols(gi+si+ni); }
-				}
-				for (j=0;j<F.length;j++) {
-					v = $.jgrid.getAccessor(cur,F[j]);
-					rowData.push( addCell(idr,v,j+gi+si+ni,i+rcnt,cur) );
-					rd[ts.p.colModel[j+gi+si+ni].name] = v;
-				}
-				rowData.push( "</tr>" );
-				if(ts.p.grouping) {
-					var grlen = ts.p.groupingView.groupField.length, grpitem = [];
-					for(var z=0;z<grlen;z++) {
-						grpitem.push(rd[ts.p.groupingView.groupField[z]]);
-					}
-					grpdata = $(ts).jqGrid('groupingPrepare',rowData, grpitem, grpdata, rd);
-					rowData = [];
-				}
-				if(locdata) { rd[locid] = idr; ts.p.data.push(rd); }
-				if(ts.p.gridview === false ) {
-					if( ts.p.treeGrid === true) {
-						fpos = ts.p.treeANode > -1 ? ts.p.treeANode: 0;
-						row = $(rowData.join(''))[0];
-						$(ts.rows[i+fpos]).after(row);
-						try {$(ts).jqGrid("setTreeNode",rd,row);} catch (e) {}
-					} else {
-						$("#"+$.jgrid.jqID(ts.p.id)+" tbody:first").append(rowData.join(''));
-					}
-					if(ts.p.subGrid === true ) {
-						try { $(ts).jqGrid("addSubGrid",ts.rows[ts.rows.length-1],gi+ni);} catch (_){}
-					}
-					if(afterInsRow) {ts.p.afterInsertRow.call(ts,idr,rd,cur);}
-					rowData=[];//ari=0;
-				}
-				rd={};
-				ir++;
-				i++;
-				if(ir==rn) { break; }
-			}
-			if(ts.p.gridview === true ) {
-				if(ts.p.grouping) {
-					$(ts).jqGrid('groupingRender',grpdata,ts.p.colModel.length);
-					grpdata = null;
-				} else {
-					$("#"+$.jgrid.jqID(ts.p.id)+" tbody:first").append(rowData.join(''));
-				}
-			}
-			ts.p.totaltime = new Date() - startReq;
-			if(ir>0) {
-				if(ts.p.records===0) { ts.p.records=len; }
-			}
-			rowData = null;
-			if(!ts.p.treeGrid && !ts.p.scroll) {ts.grid.bDiv.scrollTop = 0;}
-			ts.p.reccount=ir;
-			ts.p.treeANode = -1;
-			if(ts.p.userDataOnFooter) { $(ts).jqGrid("footerData","set",ts.p.userData,true); }
-			if(locdata) {
-				ts.p.records = len;
-				ts.p.lastpage = Math.ceil(len/ rn);
-			}
-			if (!more) { ts.updatepager(false,true); }
-			if(locdata) {
-				while (ir<len && drows[ir]) {
-					cur = drows[ir];
-					idr = $.jgrid.getAccessor(cur,idn);
-					if(idr === undefined) {
-						idr = br+ir;
-						if(f.length===0){
-							if(dReader.cell){
-								var ccur2 = $.jgrid.getAccessor(cur,dReader.cell);
-								idr = ccur2[idn] || idr;
-								ccur2=null;
-							}
-						}
-					}					
-					if(cur) {
-						if (dReader.repeatitems) {
-							if(dReader.cell) {cur = $.jgrid.getAccessor(cur,dReader.cell);}
-							if (!F) { F=orderedCols(gi+si+ni); }
-						}
-
-						for (j=0;j<F.length;j++) {
-							v = $.jgrid.getAccessor(cur,F[j]);
-							rd[ts.p.colModel[j+gi+si+ni].name] = v;
-						}
-						rd[locid] = idr;
-						ts.p.data.push(rd);
-						rd = {};
-					}
-					ir++;
-				}
-				refreshIndex();
-			}
-		},
-		addLocalData = function() {
-			var st, fndsort=false, cmtypes={}, grtypes=[], grindexes=[], srcformat, sorttype, newformat;
-			if(!$.isArray(ts.p.data)) {
-				return;
-			}
-			var grpview = ts.p.grouping ? ts.p.groupingView : false;
-			$.each(ts.p.colModel,function(i,v){
-				sorttype = this.sorttype || "text";
-				if(sorttype == "date" || sorttype == "datetime") {
-					if(this.formatter && typeof(this.formatter) === 'string' && this.formatter == 'date') {
-						if(this.formatoptions && this.formatoptions.srcformat) {
-							srcformat = this.formatoptions.srcformat;
-						} else {
-							srcformat = $.jgrid.formatter.date.srcformat;
-						}
-						if(this.formatoptions && this.formatoptions.newformat) {
-							newformat = this.formatoptions.newformat;
-						} else {
-							newformat = $.jgrid.formatter.date.newformat;
-						}
-					} else {
-						srcformat = newformat = this.datefmt || "Y-m-d";
-					}
-					cmtypes[this.name] = {"stype": sorttype, "srcfmt": srcformat,"newfmt":newformat};
-				} else {
-					cmtypes[this.name] = {"stype": sorttype, "srcfmt":'',"newfmt":''};
-				}
-				if(ts.p.grouping && this.name == grpview.groupField[0]) {
-					var grindex = this.name;
-					if (typeof this.index != 'undefined') {
-						grindex = this.index;
-					}
-					grtypes[0] = cmtypes[grindex];
-					grindexes.push(grindex);
-				}
-				if(!fndsort && (this.index == ts.p.sortname || this.name == ts.p.sortname)){
-					st = this.name; // ???
-					fndsort = true;
-				}
-			});
-			if(ts.p.treeGrid) {
-				$(ts).jqGrid("SortTree", st, ts.p.sortorder, cmtypes[st].stype, cmtypes[st].srcfmt);
-				return;
-			}
-			var compareFnMap = {
-				'eq':function(queryObj, op) {return queryObj.equals;},
-				'ne':function(queryObj,op) {return queryObj.notEquals;},
-				'lt':function(queryObj,op) {return queryObj.less;},
-				'le':function(queryObj,op) {return queryObj.lessOrEquals;},
-				'gt':function(queryObj,op) {return queryObj.greater;},
-				'ge':function(queryObj,op) {return queryObj.greaterOrEquals;},
-				'cn':function(queryObj,op) {return queryObj.contains;},
-				'nc':function(queryObj,op) {return op === "OR" ? queryObj.orNot().contains : queryObj.andNot().contains;},
-				'bw':function(queryObj,op) {return queryObj.startsWith;},
-				'bn':function(queryObj,op) {return op === "OR" ? queryObj.orNot().startsWith : queryObj.andNot().startsWith;},
-				'en':function(queryObj,op) {return op === "OR" ? queryObj.orNot().endsWith : queryObj.andNot().endsWith;},
-				'ew':function(queryObj,op) {return queryObj.endsWith;},
-				'ni':function(queryObj,op) {return op === "OR" ? queryObj.orNot().equals : queryObj.andNot().equals;},
-				'in':function(queryObj,op) {return queryObj.equals;},
-				'nu':function(queryObj,op) {return queryObj.isNull;},
-				'nn':function(queryObj,op) {return op === "OR" ? queryObj.orNot().isNull : queryObj.andNot().isNull;}
-				
-			},
-			query = $.jgrid.from(ts.p.data);
-			if (ts.p.ignoreCase) { query = query.ignoreCase(); }
-			function tojLinq ( group ) {
-				var s = 0, index, opr, rule;
-				if (group.groups !== undefined) {
-					for (index = 0; index < group.groups.length; index++) {
-						try {
-							tojLinq(group.groups[index]);
-						} catch (e) {alert(e);}
-						s++;
-					}
-				}
-				if (group.rules !== undefined) {
-					if(s>0) {
-						var result = query.select();
-						query = $.jgrid.from( result);
-					}
-					try{
-						for (index = 0; index < group.rules.length; index++) {
-							rule = group.rules[index];
-							opr = group.groupOp.toString().toUpperCase();
-							if (compareFnMap[rule.op] && rule.field ) {
-								if(s > 0 && opr && opr === "OR") {
-									query = query.or();
-								}
-								query = compareFnMap[rule.op](query, opr)(rule.field, rule.data, cmtypes[rule.field]);
-							}
-							s++;
-						}
-					} catch (g) {alert(g);}
-				}
-			}
-
-			if (ts.p.search === true) {
-				var srules = ts.p.postData.filters;
-				if(srules) {
-					if(typeof srules == "string") { srules = $.jgrid.parse(srules);}
-					tojLinq( srules );
-				} else {
-					try {
-						query = compareFnMap[ts.p.postData.searchOper](query)(ts.p.postData.searchField, ts.p.postData.searchString,cmtypes[ts.p.postData.searchField]);
-					} catch (se){}
-				}
-			}
-			if(ts.p.grouping) {
-				query.orderBy(grindexes,grpview.groupOrder[0],grtypes[0].stype, grtypes[0].srcfmt);
-				grpview.groupDataSorted = true;
-			}
-			if (st && ts.p.sortorder && fndsort) {
-				if(ts.p.sortorder.toUpperCase() == "DESC") {
-					query.orderBy(ts.p.sortname, "d", cmtypes[st].stype, cmtypes[st].srcfmt);
-				} else {
-					query.orderBy(ts.p.sortname, "a", cmtypes[st].stype, cmtypes[st].srcfmt);
-				}
-			}
-			var queryResults = query.select(),
-			recordsperpage = parseInt(ts.p.rowNum,10),
-			total = queryResults.length,
-			page = parseInt(ts.p.page,10),
-			totalpages = Math.ceil(total / recordsperpage),
-			retresult = {};
-			queryResults = queryResults.slice( (page-1)*recordsperpage , page*recordsperpage );
-			query = null;
-			cmtypes = null;
-			retresult[ts.p.localReader.total] = totalpages;
-			retresult[ts.p.localReader.page] = page;
-			retresult[ts.p.localReader.records] = total;
-			retresult[ts.p.localReader.root] = queryResults;
-			queryResults = null;
-			return  retresult;
-		},
-		updatepager = function(rn, dnd) {
-			var cp, last, base, from,to,tot,fmt, pgboxes = "";
-			base = parseInt(ts.p.page,10)-1;
-			if(base < 0) { base = 0; }
-			base = base*parseInt(ts.p.rowNum,10);
-			to = base + ts.p.reccount;
-			if (ts.p.scroll) {
-				var rows = $("tbody:first > tr:gt(0)", ts.grid.bDiv);
-				base = to - rows.length;
-				ts.p.reccount = rows.length;
-				var rh = rows.outerHeight() || ts.grid.prevRowHeight;
-				if (rh) {
-					var top = base * rh;
-					var height = parseInt(ts.p.records,10) * rh;
-				    $(">div:first",ts.grid.bDiv).css({height : height}).children("div:first").css({height:top,display:top?"":"none"});
-				}
-				ts.grid.bDiv.scrollLeft = ts.grid.hDiv.scrollLeft;				
-			}
-			pgboxes = ts.p.pager ? ts.p.pager : "";
-			pgboxes += ts.p.toppager ?  (pgboxes ? "," + ts.p.toppager : ts.p.toppager) : "";
-			if(pgboxes) {
-				fmt = $.jgrid.formatter.integer || {};
-				cp = intNum(ts.p.page);
-				last = intNum(ts.p.lastpage);
-				$(".selbox",pgboxes).attr("disabled",false);
-				if(ts.p.pginput===true) {
-					$('.ui-pg-input',pgboxes).val(ts.p.page);
-					$('#sp_1',pgboxes).html($.fmatter ? $.fmatter.util.NumberFormat(ts.p.lastpage,fmt):ts.p.lastpage);
-					
-				}
-				if (ts.p.viewrecords){
-					if(ts.p.reccount === 0) {
-						$(".ui-paging-info",pgboxes).html(ts.p.emptyrecords);
-					} else {
-						from = base+1;
-						tot=ts.p.records;
-						if($.fmatter) {
-							from = $.fmatter.util.NumberFormat(from,fmt);
-							to = $.fmatter.util.NumberFormat(to,fmt);
-							tot = $.fmatter.util.NumberFormat(tot,fmt);
-						}
-						$(".ui-paging-info",pgboxes).html($.jgrid.format(ts.p.recordtext,from,to,tot));
-					}
-				}
-				if(ts.p.pgbuttons===true) {
-					if(cp<=0) {cp = last = 0;}
-					if(cp==1 || cp === 0) {
-						$("#first, #prev",ts.p.pager).addClass('ui-state-disabled').removeClass('ui-state-hover');
-						if(ts.p.toppager) { $("#first_t, #prev_t",ts.p.toppager).addClass('ui-state-disabled').removeClass('ui-state-hover'); }
-					} else {
-						$("#first, #prev",ts.p.pager).removeClass('ui-state-disabled');
-						if(ts.p.toppager) { $("#first_t, #prev_t",ts.p.toppager).removeClass('ui-state-disabled'); }
-					}
-					if(cp==last || cp === 0) {
-						$("#next, #last",ts.p.pager).addClass('ui-state-disabled').removeClass('ui-state-hover');
-						if(ts.p.toppager) { $("#next_t, #last_t",ts.p.toppager).addClass('ui-state-disabled').removeClass('ui-state-hover'); }
-					} else {
-						$("#next, #last",ts.p.pager).removeClass('ui-state-disabled');
-						if(ts.p.toppager) { $("#next_t, #last_t",ts.p.toppager).removeClass('ui-state-disabled'); }
-					}
-				}
-			}
-			if(rn===true && ts.p.rownumbers === true) {
-				$("td.jqgrid-rownum",ts.rows).each(function(i){
-					$(this).html(base+1+i);
-				});
-			}
-			if(dnd && ts.p.jqgdnd) { $(ts).jqGrid('gridDnD','updateDnD');}
-			if($.isFunction(ts.p.gridComplete)) {ts.p.gridComplete.call(ts);}
-		},
-		beginReq = function() {
-			ts.grid.hDiv.loading = true;
-			if(ts.p.hiddengrid) { return;}
-			switch(ts.p.loadui) {
-				case "disable":
-					break;
-				case "enable":
-					$("#load_"+$.jgrid.jqID(ts.p.id)).show();
-					break;
-				case "block":
-					$("#lui_"+$.jgrid.jqID(ts.p.id)).show();
-					$("#load_"+$.jgrid.jqID(ts.p.id)).show();
-					break;
-			}
-		},
-		endReq = function() {
-			ts.grid.hDiv.loading = false;
-			switch(ts.p.loadui) {
-				case "disable":
-					break;
-				case "enable":
-					$("#load_"+$.jgrid.jqID(ts.p.id)).hide();
-					break;
-				case "block":
-					$("#lui_"+$.jgrid.jqID(ts.p.id)).hide();
-					$("#load_"+$.jgrid.jqID(ts.p.id)).hide();
-					break;
-			}
-		},
-		populate = function (npage) {
-			if(!ts.grid.hDiv.loading) {
-				var pvis = ts.p.scroll && npage === false;
-				var prm = {}, dt, dstr, pN=ts.p.prmNames;
-				if(ts.p.page <=0) { ts.p.page = 1; }
-				if(pN.search !== null) {prm[pN.search] = ts.p.search;} if(pN.nd !== null) {prm[pN.nd] = new Date().getTime();}
-				if(pN.rows !== null) {prm[pN.rows]= ts.p.rowNum;} if(pN.page !== null) {prm[pN.page]= ts.p.page;}
-				if(pN.sort !== null) {prm[pN.sort]= ts.p.sortname;} if(pN.order !== null) {prm[pN.order]= ts.p.sortorder;}
-				if(ts.p.rowTotal !== null && pN.totalrows !== null) { prm[pN.totalrows]= ts.p.rowTotal; }
-				var lc = ts.p.loadComplete;
-				var lcf = $.isFunction(lc);
-				if (!lcf) { lc = null; }
-				var adjust = 0;
-				npage = npage || 1;
-				if (npage > 1) {
-					if(pN.npage !== null) {
-						prm[pN.npage] = npage;
-						adjust = npage - 1;
-						npage = 1;
-					} else {
-						lc = function(req) {
-							ts.p.page++;
-							ts.grid.hDiv.loading = false;
-							if (lcf) {
-								ts.p.loadComplete.call(ts,req);
-							}
-							populate(npage-1);
-						};
-					}
-				} else if (pN.npage !== null) {
-					delete ts.p.postData[pN.npage];
-				}
-				if(ts.p.grouping) {
-					$(ts).jqGrid('groupingSetup');
-					if(ts.p.groupingView.groupDataSorted === true) {
-						prm[pN.sort] = ts.p.groupingView.groupField[0] +" "+ ts.p.groupingView.groupOrder[0]+", "+prm[pN.sort];
-					}
-				}
-				$.extend(ts.p.postData,prm);
-				var rcnt = !ts.p.scroll ? 1 : ts.rows.length-1; 
-				if ($.isFunction(ts.p.datatype)) { ts.p.datatype.call(ts,ts.p.postData,"load_"+ts.p.id); return;}
-				else if($.isFunction(ts.p.beforeRequest)) {ts.p.beforeRequest.call(ts);}
-				dt = ts.p.datatype.toLowerCase();
-				switch(dt)
-				{
-				case "json":
-				case "jsonp":
-				case "xml":
-				case "script":
-					$.ajax($.extend({
-						url:ts.p.url,
-						type:ts.p.mtype,
-						dataType: dt ,
-						data: $.isFunction(ts.p.serializeGridData)? ts.p.serializeGridData.call(ts,ts.p.postData) : ts.p.postData,
-						success:function(data,st) {
-							if(dt === "xml") { addXmlData(data,ts.grid.bDiv,rcnt,npage>1,adjust); }
-							else { addJSONData(data,ts.grid.bDiv,rcnt,npage>1,adjust); }
-							if(lc) { lc.call(ts,data); }
-							if (pvis) { ts.grid.populateVisible(); }
-							if( ts.p.loadonce || ts.p.treeGrid) {ts.p.datatype = "local";}
-							data=null;
-							endReq();
-						},
-						error:function(xhr,st,err){
-							if($.isFunction(ts.p.loadError)) { ts.p.loadError.call(ts,xhr,st,err); }
-							endReq();
-							xhr=null;
-						},
-						beforeSend: function(xhr){
-							beginReq();
-							if($.isFunction(ts.p.loadBeforeSend)) { ts.p.loadBeforeSend.call(ts,xhr); }
-						}
-					},$.jgrid.ajaxOptions, ts.p.ajaxGridOptions));
-				break;
-				case "xmlstring":
-					beginReq();
-					dstr = $.jgrid.stringToDoc(ts.p.datastr);
-					addXmlData(dstr,ts.grid.bDiv);
-					if(lcf) {ts.p.loadComplete.call(ts,dstr);}
-					ts.p.datatype = "local";
-					ts.p.datastr = null;
-					endReq();
-				break;
-				case "jsonstring":
-					beginReq();
-					if(typeof ts.p.datastr == 'string') { dstr = $.jgrid.parse(ts.p.datastr); }
-					else { dstr = ts.p.datastr; }
-					addJSONData(dstr,ts.grid.bDiv);
-					if(lcf) {ts.p.loadComplete.call(ts,dstr);}
-					ts.p.datatype = "local";
-					ts.p.datastr = null;
-					endReq();
-				break;
-				case "local":
-				case "clientside":
-					beginReq();
-					ts.p.datatype = "local";
-					var req = addLocalData();
-					addJSONData(req,ts.grid.bDiv,rcnt,npage>1,adjust);
-					if(lc) { lc.call(ts,req); }
-					if (pvis) { ts.grid.populateVisible(); }
-					endReq();
-				break;
-				}
-			}
-		},
-        setPager = function (pgid, tp){
-            // TBD - consider escaping pgid with pgid = $.jgrid.jqID(pgid);
-			var sep = "<td class='ui-pg-button ui-state-disabled' style='width:4px;'><span class='ui-separator'></span></td>",
-			pginp = "",
-			pgl="<table cellspacing='0' cellpadding='0' border='0' style='table-layout:auto;' class='ui-pg-table'><tbody><tr>",
-			str="", pgcnt, lft, cent, rgt, twd, tdw, i,
-			clearVals = function(onpaging){
-				var ret;
-				if ($.isFunction(ts.p.onPaging) ) { ret = ts.p.onPaging.call(ts,onpaging); }
-				ts.p.selrow = null;
-				if(ts.p.multiselect) {ts.p.selarrrow =[];$('#cb_'+$.jgrid.jqID(ts.p.id),ts.grid.hDiv).attr("checked",false);}
-				ts.p.savedRow = [];
-				if(ret=='stop') {return false;}
-				return true;
-			};
-			pgid = pgid.substr(1);
-			pgcnt = "pg_"+pgid;
-			lft = pgid+"_left"; cent = pgid+"_center"; rgt = pgid+"_right";
-			$("#"+$.jgrid.jqID(pgid) )
-			.append("<div id='"+pgcnt+"' class='ui-pager-control' role='group'><table cellspacing='0' cellpadding='0' border='0' class='ui-pg-table' style='width:100%;table-layout:fixed;height:100%;' role='row'><tbody><tr><td id='"+lft+"' align='left'></td><td id='"+cent+"' align='center' style='white-space:pre;'></td><td id='"+rgt+"' align='right'></td></tr></tbody></table></div>")
-			.attr("dir","ltr"); //explicit setting
-			if(ts.p.rowList.length >0){
-				str = "<td dir='"+dir+"'>";
-				str +="<select class='ui-pg-selbox' role='listbox'>";
-				for(i=0;i<ts.p.rowList.length;i++){
-					str +="<option role=\"option\" value=\""+ts.p.rowList[i]+"\""+((ts.p.rowNum == ts.p.rowList[i])?" selected=\"selected\"":"")+">"+ts.p.rowList[i]+"</option>";
-				}
-				str +="</select></td>";
-			}
-			if(dir=="rtl") { pgl += str; }
-			if(ts.p.pginput===true) { pginp= "<td dir='"+dir+"'>"+$.jgrid.format(ts.p.pgtext || "","<input class='ui-pg-input' type='text' size='2' maxlength='7' value='0' role='textbox'/>","<span id='sp_1'></span>")+"</td>";}
-			if(ts.p.pgbuttons===true) {
-				var po=["first"+tp,"prev"+tp, "next"+tp,"last"+tp]; if(dir=="rtl") { po.reverse(); }
-				pgl += "<td id='"+po[0]+"' class='ui-pg-button ui-corner-all'><span class='ui-icon ui-icon-seek-first'></span></td>";
-				pgl += "<td id='"+po[1]+"' class='ui-pg-button ui-corner-all'><span class='ui-icon ui-icon-seek-prev'></span></td>";
-				pgl += pginp !== "" ? sep+pginp+sep:"";
-				pgl += "<td id='"+po[2]+"' class='ui-pg-button ui-corner-all'><span class='ui-icon ui-icon-seek-next'></span></td>";
-				pgl += "<td id='"+po[3]+"' class='ui-pg-button ui-corner-all'><span class='ui-icon ui-icon-seek-end'></span></td>";
-			} else if (pginp !== "") { pgl += pginp; }
-			if(dir=="ltr") { pgl += str; }
-			pgl += "</tr></tbody></table>";
-			if(ts.p.viewrecords===true) {$("td#"+pgid+"_"+ts.p.recordpos,"#"+pgcnt).append("<div dir='"+dir+"' style='text-align:"+ts.p.recordpos+"' class='ui-paging-info'></div>");}
-			$("td#"+pgid+"_"+ts.p.pagerpos,"#"+pgcnt).append(pgl);
-			tdw = $(".ui-jqgrid").css("font-size") || "11px";
-			$(document.body).append("<div id='testpg' class='ui-jqgrid ui-widget ui-widget-content' style='font-size:"+tdw+";visibility:hidden;' ></div>");
-			twd = $(pgl).clone().appendTo("#testpg").width();
-			$("#testpg").remove();
-			if(twd > 0) {
-				if(pginp !== "") { twd += 50; } //should be param
-				$("td#"+pgid+"_"+ts.p.pagerpos,"#"+pgcnt).width(twd);
-			}
-			ts.p._nvtd = [];
-			ts.p._nvtd[0] = twd ? Math.floor((ts.p.width - twd)/2) : Math.floor(ts.p.width/3);
-			ts.p._nvtd[1] = 0;
-			pgl=null;
-			$('.ui-pg-selbox',"#"+pgcnt).bind('change',function() { 
-				ts.p.page = Math.round(ts.p.rowNum*(ts.p.page-1)/this.value-0.5)+1;
-				ts.p.rowNum = this.value;
-				if(tp) { $('.ui-pg-selbox',ts.p.pager).val(this.value); }
-				else if(ts.p.toppager) { $('.ui-pg-selbox',ts.p.toppager).val(this.value); }
-				if(!clearVals('records')) { return false; }
-				populate();
-				return false;
-			});
-			if(ts.p.pgbuttons===true) {
-			$(".ui-pg-button","#"+pgcnt).hover(function(e){
-				if($(this).hasClass('ui-state-disabled')) {
-					this.style.cursor='default';
-				} else {
-					$(this).addClass('ui-state-hover');
-					this.style.cursor='pointer';
-				}
-			},function(e) {
-				if($(this).hasClass('ui-state-disabled')) {
-				} else {
-					$(this).removeClass('ui-state-hover');
-					this.style.cursor= "default";
-				}
-			});
-			$("#first"+tp+", #prev"+tp+", #next"+tp+", #last"+tp,"#"+pgid).click( function(e) {
-				var cp = intNum(ts.p.page,1),
-				last = intNum(ts.p.lastpage,1), selclick = false,
-				fp=true, pp=true, np=true,lp=true;
-				if(last ===0 || last===1) {fp=false;pp=false;np=false;lp=false; }
-				else if( last>1 && cp >=1) {
-					if( cp === 1) { fp=false; pp=false; } 
-					else if( cp>1 && cp <last){ }
-					else if( cp===last){ np=false;lp=false; }
-				} else if( last>1 && cp===0 ) { np=false;lp=false; cp=last-1;}
-				if( this.id === 'first'+tp && fp ) { ts.p.page=1; selclick=true;} 
-				if( this.id === 'prev'+tp && pp) { ts.p.page=(cp-1); selclick=true;} 
-				if( this.id === 'next'+tp && np) { ts.p.page=(cp+1); selclick=true;} 
-				if( this.id === 'last'+tp && lp) { ts.p.page=last; selclick=true;}
-				if(selclick) {
-					if(!clearVals(this.id)) { return false; }
-					populate();
-				}
-				return false;
-			});
-			}
-			if(ts.p.pginput===true) {
-			$('input.ui-pg-input',"#"+pgcnt).keypress( function(e) {
-				var key = e.charCode ? e.charCode : e.keyCode ? e.keyCode : 0;
-				if(key == 13) {
-					ts.p.page = ($(this).val()>0) ? $(this).val():ts.p.page;
-					if(!clearVals('user')) { return false; }
-					populate();
-					return false;
-				}
-				return this;
-			});
-			}
-		},
-		sortData = function (index, idxcol,reload,sor){
-			if(!ts.p.colModel[idxcol].sortable) { return; }
-			var so;
-			if(ts.p.savedRow.length > 0) {return;}
-			if(!reload) {
-				if( ts.p.lastsort == idxcol ) {
-					if( ts.p.sortorder == 'asc') {
-						ts.p.sortorder = 'desc';
-					} else if(ts.p.sortorder == 'desc') { ts.p.sortorder = 'asc';}
-				} else { ts.p.sortorder = ts.p.colModel[idxcol].firstsortorder || 'asc'; }
-				ts.p.page = 1;
-			}
-			if(sor) {
-				if(ts.p.lastsort == idxcol && ts.p.sortorder == sor && !reload) { return; }
-				else { ts.p.sortorder = sor; }
-			}
-			var thd= $("thead:first",ts.grid.hDiv).get(0);
-			$("tr th:eq("+ts.p.lastsort+") span.ui-grid-ico-sort",thd).addClass('ui-state-disabled');
-			$("tr th:eq("+ts.p.lastsort+")",thd).attr("aria-selected","false");
-			$("tr th:eq("+idxcol+") span.ui-icon-"+ts.p.sortorder,thd).removeClass('ui-state-disabled');
-			$("tr th:eq("+idxcol+")",thd).attr("aria-selected","true");
-			if(!ts.p.viewsortcols[0]) {
-				if(ts.p.lastsort != idxcol) {
-					$("tr th:eq("+ts.p.lastsort+") span.s-ico",thd).hide();
-					$("tr th:eq("+idxcol+") span.s-ico",thd).show();
-				}
-			}
-			index = index.substring(5);
-			ts.p.sortname = ts.p.colModel[idxcol].index || index;
-			so = ts.p.sortorder;
-			if($.isFunction(ts.p.onSortCol)) {if (ts.p.onSortCol.call(ts,index,idxcol,so)=='stop') {ts.p.lastsort = idxcol; return;}}
-			if(ts.p.datatype == "local") {
-				if(ts.p.deselectAfterSort) {$(ts).jqGrid("resetSelection");}
-			} else {
-				ts.p.selrow = null;
-				if(ts.p.multiselect){$("#cb_"+$.jgrid.jqID(ts.p.id),ts.grid.hDiv).attr("checked",false);}
-				ts.p.selarrrow =[];
-				ts.p.savedRow =[];
-			}
-			if(ts.p.scroll) {
-				var sscroll = ts.grid.bDiv.scrollLeft;
-				emptyRows(ts.grid.bDiv,true);
-				ts.grid.hDiv.scrollLeft = sscroll;
-			}
-			if(ts.p.subGrid && ts.p.datatype=='local') {
-				$("td.sgexpanded","#"+$.jgrid.jqID(ts.p.id)).each(function(){
-					$(this).trigger("click");
-				});
-			}
-			populate();
-			ts.p.lastsort = idxcol;
-			if(ts.p.sortname != index && idxcol) {ts.p.lastsort = idxcol;}
-		},
-		setColWidth = function () {
-			var initwidth = 0, brd=ts.p.cellLayout, vc=0, lvc, scw=ts.p.scrollOffset,cw,hs=false,aw,tw=0,gw=0,
-			cl = 0, cr;
-			if (isSafari) { brd=0; }
-			$.each(ts.p.colModel, function(i) {
-				if(typeof this.hidden === 'undefined') {this.hidden=false;}
-				if(this.hidden===false){
-					initwidth += intNum(this.width,0);
-					if(this.fixed) {
-						tw += this.width;
-						gw += this.width+brd;
-					} else {
-						vc++;
-					}
-					cl++;
-				}
-			});
-			if (ts.p.shrinkToFit === false) {initwidth += brd*cl;}
-			if(isNaN(ts.p.width)) {ts.p.width = grid.width = initwidth;}
-			else { grid.width = ts.p.width;}
-			ts.p.tblwidth = initwidth;
-			if(ts.p.shrinkToFit ===false && ts.p.forceFit === true) {ts.p.forceFit=false;}
-			if(ts.p.shrinkToFit===true && vc > 0) {
-				aw = grid.width-brd*vc-gw;
-				if(isNaN(ts.p.height)) {
-				} else {
-					aw -= scw;
-					hs = true;
-				}
-				initwidth =0;
-				$.each(ts.p.colModel, function(i) {
-					if(this.hidden === false && !this.fixed){
-						cw = Math.round(aw*this.width/(ts.p.tblwidth-tw));
-						this.width =cw;
-						initwidth += cw;
-						lvc = i;
-					}
-				});
-				cr =0;
-				if (hs) {
-					if(grid.width-gw-(initwidth+brd*vc) !== scw){
-						cr = grid.width-gw-(initwidth+brd*vc)-scw;
-					}
-				} else if(!hs && Math.abs(grid.width-gw-(initwidth+brd*vc)) !== 1) {
-					cr = grid.width-gw-(initwidth+brd*vc);
-				}
-				ts.p.colModel[lvc].width += cr;
-				ts.p.tblwidth = initwidth+cr+tw+cl*brd;
-				if(ts.p.tblwidth > ts.p.width) {
-					ts.p.colModel[lvc].width -= (ts.p.tblwidth - parseInt(ts.p.width,10));
-					ts.p.tblwidth = ts.p.width;
-				}
-			}
-		},
-		nextVisible= function(iCol) {
-			var ret = iCol, j=iCol, i;
-			for (i = iCol+1;i<ts.p.colModel.length;i++){
-				if(ts.p.colModel[i].hidden !== true ) {
-					j=i; break;
-				}
-			}
-			return j-ret;
-		},
-		getOffset = function (iCol) {
-			var i, ret = {}, brd1 = isSafari ? 0 : ts.p.cellLayout;
-			ret[0] =  ret[1] = ret[2] = 0;
-			for(i=0;i<=iCol;i++){
-				if(ts.p.colModel[i].hidden === false ) {
-					ret[0] += ts.p.colModel[i].width+brd1;
-				}
-			}
-			if(ts.p.direction=="rtl") { ret[0] = ts.p.width - ret[0]; }
-			ret[0] = ret[0] - ts.grid.bDiv.scrollLeft;
-			if($(ts.grid.cDiv).is(":visible")) {ret[1] += $(ts.grid.cDiv).height() +parseInt($(ts.grid.cDiv).css("padding-top"),10)+parseInt($(ts.grid.cDiv).css("padding-bottom"),10);}
-			if(ts.p.toolbar[0]===true && (ts.p.toolbar[1]=='top' || ts.p.toolbar[1]=='both')) {ret[1] += $(ts.grid.uDiv).height()+parseInt($(ts.grid.uDiv).css("border-top-width"),10)+parseInt($(ts.grid.uDiv).css("border-bottom-width"),10);}
-			if(ts.p.toppager) {ret[1] += $(ts.grid.topDiv).height()+parseInt($(ts.grid.topDiv).css("border-bottom-width"),10);}
-			ret[2] += $(ts.grid.bDiv).height() + $(ts.grid.hDiv).height();
-			return ret;
-		};
-		this.p.id = this.id;
-		if ($.inArray(ts.p.multikey,sortkeys) == -1 ) {ts.p.multikey = false;}
-		ts.p.keyIndex=false;
-		for (i=0; i<ts.p.colModel.length;i++) {
-			ts.p.colModel[i] = $.extend({}, ts.p.cmTemplate, ts.p.colModel[i].template || {}, ts.p.colModel[i]);
-			if (ts.p.keyIndex === false && ts.p.colModel[i].key===true) {
-				ts.p.keyIndex = i;
-			}
-		}
-		ts.p.sortorder = ts.p.sortorder.toLowerCase();
-		if(ts.p.grouping===true) {
-			ts.p.scroll = false;
-			ts.p.rownumbers = false;
-			ts.p.subGrid = false;
-			ts.p.treeGrid = false;
-			ts.p.gridview = true;
-		}
-		if(this.p.treeGrid === true) {
-			try { $(this).jqGrid("setTreeGrid");} catch (_) {}
-			if(ts.p.datatype != "local") { ts.p.localReader = {id: "_id_"};	}
-		}
-		if(this.p.subGrid) {
-			try { $(ts).jqGrid("setSubGrid");} catch (s){}
-		}
-		if(this.p.multiselect) {
-			this.p.colNames.unshift("<input role='checkbox' id='cb_"+this.p.id+"' class='cbox' type='checkbox'/>");
-			this.p.colModel.unshift({name:'cb',width:isSafari ? ts.p.multiselectWidth+ts.p.cellLayout : ts.p.multiselectWidth,sortable:false,resizable:false,hidedlg:true,search:false,align:'center',fixed:true});
-		}
-		if(this.p.rownumbers) {
-			this.p.colNames.unshift("");
-			this.p.colModel.unshift({name:'rn',width:ts.p.rownumWidth,sortable:false,resizable:false,hidedlg:true,search:false,align:'center',fixed:true});
-		}
-		ts.p.xmlReader = $.extend(true,{
-			root: "rows",
-			row: "row",
-			page: "rows>page",
-			total: "rows>total",
-			records : "rows>records",
-			repeatitems: true,
-			cell: "cell",
-			id: "[id]",
-			userdata: "userdata",
-			subgrid: {root:"rows", row: "row", repeatitems: true, cell:"cell"}
-		}, ts.p.xmlReader);
-		ts.p.jsonReader = $.extend(true,{
-			root: "rows",
-			page: "page",
-			total: "total",
-			records: "records",
-			repeatitems: true,
-			cell: "cell",
-			id: "id",
-			userdata: "userdata",
-			subgrid: {root:"rows", repeatitems: true, cell:"cell"}
-		},ts.p.jsonReader);
-		ts.p.localReader = $.extend(true,{
-			root: "rows",
-			page: "page",
-			total: "total",
-			records: "records",
-			repeatitems: false,
-			cell: "cell",
-			id: "id",
-			userdata: "userdata",
-			subgrid: {root:"rows", repeatitems: true, cell:"cell"}
-		},ts.p.localReader);		
-		if(ts.p.scroll){
-			ts.p.pgbuttons = false; ts.p.pginput=false; ts.p.rowList=[];
-		}
-		if(ts.p.data.length) { refreshIndex(); }
-		var thead = "<thead><tr class='ui-jqgrid-labels' role='rowheader'>",
-		tdc, idn, w, res, sort,
-		td, ptr, tbody, imgs,iac="",idc="";
-		if(ts.p.shrinkToFit===true && ts.p.forceFit===true) {
-			for (i=ts.p.colModel.length-1;i>=0;i--){
-				if(!ts.p.colModel[i].hidden) {
-					ts.p.colModel[i].resizable=false;
-					break;
-				}
-			}
-		}
-		if(ts.p.viewsortcols[1] == 'horizontal') {iac=" ui-i-asc";idc=" ui-i-desc";}
-		tdc = isMSIE ?  "class='ui-th-div-ie'" :"";
-		imgs = "<span class='s-ico' style='display:none'><span sort='asc' class='ui-grid-ico-sort ui-icon-asc"+iac+" ui-state-disabled ui-icon ui-icon-triangle-1-n ui-sort-"+dir+"'></span>";
-		imgs += "<span sort='desc' class='ui-grid-ico-sort ui-icon-desc"+idc+" ui-state-disabled ui-icon ui-icon-triangle-1-s ui-sort-"+dir+"'></span></span>";
-		for(i=0;i<this.p.colNames.length;i++){
-			var tooltip = ts.p.headertitles ? (" title=\""+$.jgrid.stripHtml(ts.p.colNames[i])+"\"") :"";
-			thead += "<th id='"+ts.p.id+"_"+ts.p.colModel[i].name+"' role='columnheader' class='ui-state-default ui-th-column ui-th-"+dir+"'"+ tooltip+">";
-			idn = ts.p.colModel[i].index || ts.p.colModel[i].name;
-			thead += "<div id='jqgh_"+ts.p.colModel[i].name+"' "+tdc+">"+ts.p.colNames[i];
-			if(!ts.p.colModel[i].width)  { ts.p.colModel[i].width = 150; }
-			else { ts.p.colModel[i].width = parseInt(ts.p.colModel[i].width,10); }
-			if(typeof(ts.p.colModel[i].title) !== "boolean") { ts.p.colModel[i].title = true; }
-			if (idn == ts.p.sortname) {
-				ts.p.lastsort = i;
-			} 
-			thead += imgs+"</div></th>";
-		}
-		thead += "</tr></thead>";
-		imgs = null;
-		$(this).append(thead);
-		$("thead tr:first th",this).hover(function(){$(this).addClass('ui-state-hover');},function(){$(this).removeClass('ui-state-hover');});
-		if(this.p.multiselect) {
-			var emp=[], chk;
-			$('#cb_'+$.jgrid.jqID(ts.p.id),this).bind('click',function(){
-				ts.p.selarrrow = [];
-				if (this.checked) {
-					$("[id^=jqg_"+ts.p.id+"_"+"]").attr("checked","checked");
-					$(ts.rows).each(function(i) {
-						if ( i>0 ) {
-							if(!$(this).hasClass("subgrid") && !$(this).hasClass("jqgroup")){
-								$(this).addClass("ui-state-highlight").attr("aria-selected","true");
-								ts.p.selarrrow.push(this.id);
-								ts.p.selrow = this.id;
-							}
-						}
-					});
-					chk=true;
-					emp=[];
-				}
-				else {
-					$("[id^=jqg_"+ts.p.id+"_"+"]").removeAttr("checked");
-					$(ts.rows).each(function(i) {
-						if(i>0) {
-							if(!$(this).hasClass("subgrid")){
-								$(this).removeClass("ui-state-highlight").attr("aria-selected","false");
-								emp.push(this.id);
-							}
-						}
-					});
-					ts.p.selrow = null;
-					chk=false;
-				}
-				if($.isFunction(ts.p.onSelectAll)) {ts.p.onSelectAll.call(ts, chk ? ts.p.selarrrow : emp,chk);}
-			});
-		}
-		
-		if(ts.p.autowidth===true) {
-			var pw = $(eg).innerWidth();
-			ts.p.width = pw > 0?  pw: 'nw';
-		}
-		setColWidth();
-		$(eg).css("width",grid.width+"px").append("<div class='ui-jqgrid-resize-mark' id='rs_m"+ts.p.id+"'>&#160;</div>");
-		$(gv).css("width",grid.width+"px");
-		thead = $("thead:first",ts).get(0);
-		var	tfoot = "";
-		if(ts.p.footerrow) { tfoot += "<table role='grid' style='width:"+ts.p.tblwidth+"px' class='ui-jqgrid-ftable' cellspacing='0' cellpadding='0' border='0'><tbody><tr role='row' class='ui-widget-content footrow footrow-"+dir+"'>"; }
-		var thr = $("tr:first",thead),
-		firstr = "<tr class='jqgfirstrow' role='row' style='height:auto'>";
-		ts.p.disableClick=false;
-		$("th",thr).each(function ( j ) {
-			w = ts.p.colModel[j].width;
-			if(typeof ts.p.colModel[j].resizable === 'undefined') {ts.p.colModel[j].resizable = true;}
-			if(ts.p.colModel[j].resizable){
-				res = document.createElement("span");
-				$(res).html("&#160;").addClass('ui-jqgrid-resize ui-jqgrid-resize-'+dir);
-				if(!$.browser.opera) { $(res).css("cursor","col-resize"); }
-				$(this).addClass(ts.p.resizeclass);
-			} else {
-				res = "";
-			}
-			$(this).css("width",w+"px").prepend(res);
-			var hdcol = "";
-			if( ts.p.colModel[j].hidden ) {
-				$(this).css("display","none");
-				hdcol = "display:none;";
-			}
-			firstr += "<td role='gridcell' style='height:0px;width:"+w+"px;"+hdcol+"'></td>";
-			grid.headers[j] = { width: w, el: this };
-			sort = ts.p.colModel[j].sortable;
-			if( typeof sort !== 'boolean') {ts.p.colModel[j].sortable =  true; sort=true;}
-			var nm = ts.p.colModel[j].name;
-			if( !(nm == 'cb' || nm=='subgrid' || nm=='rn') ) {
-				if(ts.p.viewsortcols[2]){
-					$("div",this).addClass('ui-jqgrid-sortable');
-				}
-			}
-			if(sort) {
-				if(ts.p.viewsortcols[0]) {$("div span.s-ico",this).show(); if(j==ts.p.lastsort){ $("div span.ui-icon-"+ts.p.sortorder,this).removeClass("ui-state-disabled");}}
-				else if( j == ts.p.lastsort) {$("div span.s-ico",this).show();$("div span.ui-icon-"+ts.p.sortorder,this).removeClass("ui-state-disabled");}
-			}
-			if(ts.p.footerrow) { tfoot += "<td role='gridcell' "+formatCol(j,0,'', null, '', false)+">&#160;</td>"; }
-		}).mousedown(function(e) {
-			if ($(e.target).closest("th>span.ui-jqgrid-resize").length != 1) { return; }
-			var ci = $.jgrid.getCellIndex(this);
-			if(ts.p.forceFit===true) {ts.p.nv= nextVisible(ci);}
-			grid.dragStart(ci, e, getOffset(ci));
-			return false;
-		}).click(function(e) {
-			if (ts.p.disableClick) {
-				ts.p.disableClick = false;
-				return false;
-			}
-			var s = "th>div.ui-jqgrid-sortable",r,d;
-			if (!ts.p.viewsortcols[2]) { s = "th>div>span>span.ui-grid-ico-sort"; }
-			var t = $(e.target).closest(s);
-			if (t.length != 1) { return; }
-			var ci = $.jgrid.getCellIndex(this);
-			if (!ts.p.viewsortcols[2]) { r=true;d=t.attr("sort"); }
-			sortData( $('div',this)[0].id, ci, r, d);
-			return false;
-		});
-		if (ts.p.sortable && $.fn.sortable) {
-			try {
-				$(ts).jqGrid("sortableColumns", thr);
-			} catch (e){}
-		}
-		if(ts.p.footerrow) { tfoot += "</tr></tbody></table>"; }
-		firstr += "</tr>";
-		tbody = document.createElement("tbody");
-		this.appendChild(tbody);
-		$(this).addClass('ui-jqgrid-btable').append(firstr);
-		firstr = null;
-		var hTable = $("<table class='ui-jqgrid-htable' style='width:"+ts.p.tblwidth+"px' role='grid' aria-labelledby='gbox_"+this.id+"' cellspacing='0' cellpadding='0' border='0'></table>").append(thead),
-		hg = (ts.p.caption && ts.p.hiddengrid===true) ? true : false,
-		hb = $("<div class='ui-jqgrid-hbox" + (dir=="rtl" ? "-rtl" : "" )+"'></div>");
-		thead = null;
-		grid.hDiv = document.createElement("div");
-		$(grid.hDiv)
-			.css({ width: grid.width+"px"})
-			.addClass("ui-state-default ui-jqgrid-hdiv")
-			.append(hb);
-		$(hb).append(hTable);
-		hTable = null;
-		if(hg) { $(grid.hDiv).hide(); }
-        if(ts.p.pager){
-            // TBD -- escape ts.p.pager here?
-			if(typeof ts.p.pager == "string") {if(ts.p.pager.substr(0,1) !="#") { ts.p.pager = "#"+ts.p.pager;} }
-			else { ts.p.pager = "#"+ $(ts.p.pager).attr("id");}
-			$(ts.p.pager).css({width: grid.width+"px"}).appendTo(eg).addClass('ui-state-default ui-jqgrid-pager ui-corner-bottom');
-			if(hg) {$(ts.p.pager).hide();}
-			setPager(ts.p.pager,'');
-		}
-		if( ts.p.cellEdit === false && ts.p.hoverrows === true) {
-		$(ts).bind('mouseover',function(e) {
-			ptr = $(e.target).closest("tr.jqgrow");
-			if($(ptr).attr("class") !== "subgrid") {
-				$(ptr).addClass("ui-state-hover");
-			}
-			return false;
-		}).bind('mouseout',function(e) {
-			ptr = $(e.target).closest("tr.jqgrow");
-			$(ptr).removeClass("ui-state-hover");
-			return false;
-		});
-		}
-		var ri,ci;
-		$(ts).before(grid.hDiv).click(function(e) {
-			td = e.target;
-			var scb = $(td).hasClass("cbox");
-			ptr = $(td,ts.rows).closest("tr.jqgrow");
-			if($(ptr).length === 0 ) {
-				return this;
-			}
-			var cSel = true;
-			if($.isFunction(ts.p.beforeSelectRow)) { cSel = ts.p.beforeSelectRow.call(ts,ptr[0].id, e); }
-			if (td.tagName == 'A' || ((td.tagName == 'INPUT' || td.tagName == 'TEXTAREA' || td.tagName == 'OPTION' || td.tagName == 'SELECT' ) && !scb) ) { return this; }
-			if(cSel === true) {
-				if(ts.p.cellEdit === true) {
-					if(ts.p.multiselect && scb){
-						$(ts).jqGrid("setSelection",ptr[0].id,true);
-					} else {
-						ri = ptr[0].rowIndex;
-						ci = $.jgrid.getCellIndex(td);
-						try {$(ts).jqGrid("editCell",ri,ci,true);} catch (_) {}
-					}
-				} else if ( !ts.p.multikey ) {
-					if(ts.p.multiselect && ts.p.multiboxonly) {
-						if(scb){$(ts).jqGrid("setSelection",ptr[0].id,true);}
-						else {
-							$(ts.p.selarrrow).each(function(i,n){
-								var ind = ts.rows.namedItem(n);
-								$(ind).removeClass("ui-state-highlight");
-								$("#jqg_"+$.jgrid.jqID(ts.p.id)+"_"+$.jgrid.jqID(n)).attr("checked",false);
-							});
-							ts.p.selarrrow = [];
-							$("#cb_"+$.jgrid.jqID(ts.p.id),ts.grid.hDiv).attr("checked",false);
-							$(ts).jqGrid("setSelection",ptr[0].id,true);
-						}
-					} else {
-						$(ts).jqGrid("setSelection",ptr[0].id,true);
-					}
-				} else {
-					if(e[ts.p.multikey]) {
-						$(ts).jqGrid("setSelection",ptr[0].id,true);
-					} else if(ts.p.multiselect && scb) {
-						scb = $("[id^=jqg_"+ts.p.id+"_"+"]").attr("checked");
-						$("[id^=jqg_"+ts.p.id+"_"+"]").attr("checked",!scb);
-					}
-				}
-				if($.isFunction(ts.p.onCellSelect)) {
-					ri = ptr[0].id;
-					ci = $.jgrid.getCellIndex(td);
-					ts.p.onCellSelect.call(ts,ri,ci,$(td).html(),e);
-				}
-				e.stopPropagation();
-			} else {
-				return this;
-			}
-		}).bind('reloadGrid', function(e,opts) {
-			if(ts.p.treeGrid ===true) {	ts.p.datatype = ts.p.treedatatype;}
-			if (opts && opts.current) {
-				ts.grid.selectionPreserver(ts);
-			}
-			if(ts.p.datatype=="local"){ $(ts).jqGrid("resetSelection");  if(ts.p.data.length) { refreshIndex();} }
-			else if(!ts.p.treeGrid) {
-				ts.p.selrow=null;
-				if(ts.p.multiselect) {ts.p.selarrrow =[];$('#cb_'+$.jgrid.jqID(ts.p.id),ts.grid.hDiv).attr("checked",false);}
-				ts.p.savedRow = [];
-			}
-			if(ts.p.scroll) {emptyRows(ts.grid.bDiv,true);}
-			if (opts && opts.page) {
-				var page = opts.page;
-				if (page > ts.p.lastpage) { page = ts.p.lastpage; }
-				if (page < 1) { page = 1; }
-				ts.p.page = page;
-				if (ts.grid.prevRowHeight) {
-					ts.grid.bDiv.scrollTop = (page - 1) * ts.grid.prevRowHeight * ts.p.rowNum;
-				} else {
-					ts.grid.bDiv.scrollTop = 0;
-				}
-			}
-			if (ts.grid.prevRowHeight && ts.p.scroll) {
-                delete ts.p.lastpage;
-				ts.grid.populateVisible();
-			} else {
-				ts.grid.populate();
-			}
-			return false;
-		});
-		if( $.isFunction(this.p.ondblClickRow) ) {
-			$(this).dblclick(function(e) {
-				td = e.target;
-				ptr = $(td,ts.rows).closest("tr.jqgrow");
-				if($(ptr).length === 0 ){return false;}
-				ri = ptr[0].rowIndex;
-				ci = $.jgrid.getCellIndex(td);
-				ts.p.ondblClickRow.call(ts,$(ptr).attr("id"),ri,ci, e);
-				return false;
-			});
-		}
-		if ($.isFunction(this.p.onRightClickRow)) {
-			$(this).bind('contextmenu', function(e) {
-				td = e.target;
-				ptr = $(td,ts.rows).closest("tr.jqgrow");
-				if($(ptr).length === 0 ){return false;}
-				if(!ts.p.multiselect) {	$(ts).jqGrid("setSelection",ptr[0].id,true);	}
-				ri = ptr[0].rowIndex;
-				ci = $.jgrid.getCellIndex(td);
-				ts.p.onRightClickRow.call(ts,$(ptr).attr("id"),ri,ci, e);
-				return false;
-			});
-		}
-		grid.bDiv = document.createElement("div");
-		$(grid.bDiv)
-			.append($('<div style="position:relative;'+(isMSIE && $.browser.version < 8 ? "height:0.01%;" : "")+'"></div>').append('<div></div>').append(this))
-			.addClass("ui-jqgrid-bdiv")
-			.css({ height: ts.p.height+(isNaN(ts.p.height)?"":"px"), width: (grid.width)+"px"})
-			.scroll(grid.scrollGrid);
-		$("table:first",grid.bDiv).css({width:ts.p.tblwidth+"px"});
-		if( isMSIE ) {
-			if( $("tbody",this).size() == 2 ) { $("tbody:gt(0)",this).remove();}
-			if( ts.p.multikey) {$(grid.bDiv).bind("selectstart",function(){return false;});}
-		} else {
-			if( ts.p.multikey) {$(grid.bDiv).bind("mousedown",function(){return false;});}
-		}
-		if(hg) {$(grid.bDiv).hide();}
-		grid.cDiv = document.createElement("div");
-		var arf = ts.p.hidegrid===true ? $("<a role='link' href='javascript:void(0)'/>").addClass('ui-jqgrid-titlebar-close HeaderButton').hover(
-			function(){ arf.addClass('ui-state-hover');},
-			function() {arf.removeClass('ui-state-hover');})
-		.append("<span class='ui-icon ui-icon-circle-triangle-n'></span>").css((dir=="rtl"?"left":"right"),"0px") : "";
-		$(grid.cDiv).append(arf).append("<span class='ui-jqgrid-title"+(dir=="rtl" ? "-rtl" :"" )+"'>"+ts.p.caption+"</span>")
-		.addClass("ui-jqgrid-titlebar ui-widget-header ui-corner-top ui-helper-clearfix");
-		$(grid.cDiv).insertBefore(grid.hDiv);
-		if( ts.p.toolbar[0] ) {
-			grid.uDiv = document.createElement("div");
-			if(ts.p.toolbar[1] == "top") {$(grid.uDiv).insertBefore(grid.hDiv);}
-			else if (ts.p.toolbar[1]=="bottom" ) {$(grid.uDiv).insertAfter(grid.hDiv);}
-			if(ts.p.toolbar[1]=="both") {
-				grid.ubDiv = document.createElement("div");
-				$(grid.uDiv).insertBefore(grid.hDiv).addClass("ui-userdata ui-state-default").attr("id","t_"+this.id);
-				$(grid.ubDiv).insertAfter(grid.hDiv).addClass("ui-userdata ui-state-default").attr("id","tb_"+this.id);
-				if(hg)  {$(grid.ubDiv).hide();}
-			} else {
-				$(grid.uDiv).width(grid.width).addClass("ui-userdata ui-state-default").attr("id","t_"+this.id);
-			}
-			if(hg) {$(grid.uDiv).hide();}
-		}
-		if(ts.p.toppager) {
-			ts.p.toppager = $.jgrid.jqID(ts.p.id)+"_toppager";
-			grid.topDiv = $("<div id='"+ts.p.toppager+"'></div>")[0];
-			ts.p.toppager = "#"+ts.p.toppager;
-			$(grid.topDiv).insertBefore(grid.hDiv).addClass('ui-state-default ui-jqgrid-toppager').width(grid.width);
-			setPager(ts.p.toppager,'_t');
-		}
-		if(ts.p.footerrow) {
-			grid.sDiv = $("<div class='ui-jqgrid-sdiv'></div>")[0];
-			hb = $("<div class='ui-jqgrid-hbox"+(dir=="rtl"?"-rtl":"")+"'></div>");
-			$(grid.sDiv).append(hb).insertAfter(grid.hDiv).width(grid.width);
-			$(hb).append(tfoot);
-			grid.footers = $(".ui-jqgrid-ftable",grid.sDiv)[0].rows[0].cells;
-			if(ts.p.rownumbers) { grid.footers[0].className = 'ui-state-default jqgrid-rownum'; }
-			if(hg) {$(grid.sDiv).hide();}
-		}
-		hb = null;
-		if(ts.p.caption) {
-			var tdt = ts.p.datatype;
-			if(ts.p.hidegrid===true) {
-				$(".ui-jqgrid-titlebar-close",grid.cDiv).click( function(e){
-					var onHdCl = $.isFunction(ts.p.onHeaderClick),
-					elems = ".ui-jqgrid-bdiv, .ui-jqgrid-hdiv, .ui-jqgrid-pager, .ui-jqgrid-sdiv",
-					counter, self = this;
-					if(ts.p.toolbar[0]===true) {
-						if( ts.p.toolbar[1]=='both') {
-							elems += ', #' + $(grid.ubDiv).attr('id');
-						}
-						elems += ', #' + $(grid.uDiv).attr('id');
-					}
-					counter = $(elems,"#gview_"+$.jgrid.jqID(ts.p.id)).length;
-
-					if(ts.p.gridstate == 'visible') {
-						$(elems,"#gbox_"+$.jgrid.jqID(ts.p.id)).slideUp("fast", function() {
-							counter--;
-							if (counter === 0) {
-								$("span",self).removeClass("ui-icon-circle-triangle-n").addClass("ui-icon-circle-triangle-s");
-								ts.p.gridstate = 'hidden';
-								if($("#gbox_"+$.jgrid.jqID(ts.p.id)).hasClass("ui-resizable")) { $(".ui-resizable-handle","#gbox_"+$.jgrid.jqID(ts.p.id)).hide(); }
-								if(onHdCl) {if(!hg) {ts.p.onHeaderClick.call(ts,ts.p.gridstate,e);}}
-							}
-						});
-					} else if(ts.p.gridstate == 'hidden'){
-						$(elems,"#gbox_"+$.jgrid.jqID(ts.p.id)).slideDown("fast", function() {
-							counter--;
-							if (counter === 0) {
-								$("span",self).removeClass("ui-icon-circle-triangle-s").addClass("ui-icon-circle-triangle-n");
-								if(hg) {ts.p.datatype = tdt;populate();hg=false;}
-								ts.p.gridstate = 'visible';
-								if($("#gbox_"+$.jgrid.jqID(ts.p.id)).hasClass("ui-resizable")) { $(".ui-resizable-handle","#gbox_"+$.jgrid.jqID(ts.p.id)).show(); }
-								if(onHdCl) {if(!hg) {ts.p.onHeaderClick.call(ts,ts.p.gridstate,e);}}
-							}
-						});
-					}
-					return false;
-				});
-				if(hg) {ts.p.datatype="local"; $(".ui-jqgrid-titlebar-close",grid.cDiv).trigger("click");}
-			}
-		} else {$(grid.cDiv).hide();}
-		$(grid.hDiv).after(grid.bDiv)
-		.mousemove(function (e) {
-			if(grid.resizing){grid.dragMove(e);return false;}
-		});
-		$(".ui-jqgrid-labels",grid.hDiv).bind("selectstart", function () { return false; });
-		$(document).mouseup(function (e) {
-			if(grid.resizing) {	grid.dragEnd(); return false;}
-			return true;
-		});
-		ts.formatCol = formatCol;
-		ts.sortData = sortData;
-		ts.updatepager = updatepager;
-		ts.refreshIndex = refreshIndex;
-		ts.formatter = function ( rowId, cellval , colpos, rwdat, act){return formatter(rowId, cellval , colpos, rwdat, act);};
-		$.extend(grid,{populate : populate, emptyRows: emptyRows});
-		this.grid = grid;
-		ts.addXmlData = function(d) {addXmlData(d,ts.grid.bDiv);};
-		ts.addJSONData = function(d) {addJSONData(d,ts.grid.bDiv);};
-		this.grid.cols = this.rows[0].cells;
-
-		populate();ts.p.hiddengrid=false;
-		$(window).unload(function () {
-			ts = null;
-		});
-	});
-};
-$.jgrid.extend({
-	getGridParam : function(pName) {
-		var $t = this[0];
-		if (!$t || !$t.grid) {return;}
-		if (!pName) { return $t.p; }
-		else {return typeof($t.p[pName]) != "undefined" ? $t.p[pName] : null;}
-	},
-	setGridParam : function (newParams){
-		return this.each(function(){
-			if (this.grid && typeof(newParams) === 'object') {$.extend(true,this.p,newParams);}
-		});
-	},
-	getDataIDs : function () {
-		var ids=[], i=0, len, j=0;
-		this.each(function(){
-			len = this.rows.length;
-			if(len && len>0){
-				while(i<len) {
-					if($(this.rows[i]).hasClass('jqgrow')) {
-						ids[j] = this.rows[i].id;
-						j++;
-					}
-					i++;
-				}
-			}
-		});
-		return ids;
-	},
-	setSelection : function(selection,onsr) {
-		return this.each(function(){
-			var $t = this, stat,pt, ner, ia, tpsr;
-			if(selection === undefined) { return; }
-			onsr = onsr === false ? false : true;
-			pt=$t.rows.namedItem(selection+"");
-			if(!pt) { return; }
-			function scrGrid(iR){
-				var ch = $($t.grid.bDiv)[0].clientHeight,
-				st = $($t.grid.bDiv)[0].scrollTop,
-				rpos = $t.rows[iR].offsetTop,
-				rh = $t.rows[iR].clientHeight;
-				if(rpos+rh >= ch+st) { $($t.grid.bDiv)[0].scrollTop = rpos-(ch+st)+rh+st; }
-				else if(rpos < ch+st) {
-					if(rpos < st) {
-						$($t.grid.bDiv)[0].scrollTop = rpos;
-					}
-				}
-			}
-			if($t.p.scrollrows===true) {
-				ner = $t.rows.namedItem(selection).rowIndex;
-				if(ner >=0 ){
-					scrGrid(ner);
-				}
-			}
-			if(!$t.p.multiselect) {
-				if(pt.className !== "ui-subgrid") {
-					if( $t.p.selrow ) {
-						$($t.rows.namedItem($t.p.selrow)).removeClass("ui-state-highlight").attr("aria-selected","false");
-					}
-					if( $t.p.selrow != pt.id) {
-						$t.p.selrow = pt.id;
-						$(pt).addClass("ui-state-highlight").attr("aria-selected","true");
-						stat = true;
-					} else {
-						stat = false;
-						$t.p.selrow = null;
-					}
-					if( $t.p.onSelectRow && onsr) { $t.p.onSelectRow.call($t, pt.id, stat); }
-				}
-			} else {
-				$t.p.selrow = pt.id;
-				ia = $.inArray($t.p.selrow,$t.p.selarrrow);
-				if (  ia === -1 ){
-					if(pt.className !== "ui-subgrid") { $(pt).addClass("ui-state-highlight").attr("aria-selected","true");}
-					stat = true;
-					$("#jqg_"+$.jgrid.jqID($t.p.id)+"_"+$.jgrid.jqID($t.p.selrow)).attr("checked",stat);
-					$t.p.selarrrow.push($t.p.selrow);
-				} else {
-					if(pt.className !== "ui-subgrid") { $(pt).removeClass("ui-state-highlight").attr("aria-selected","false");}
-					stat = false;
-					$("#jqg_"+$.jgrid.jqID($t.p.id)+"_"+$.jgrid.jqID($t.p.selrow)).attr("checked",stat);
-					$t.p.selarrrow.splice(ia,1);
-					tpsr = $t.p.selarrrow[0];
-					$t.p.selrow = (tpsr === undefined) ? null : tpsr;
-				}
-				if( $t.p.onSelectRow && onsr) { $t.p.onSelectRow.call($t, pt.id , stat); }
-			}
-		});
-	},
-	resetSelection : function(){
-		return this.each(function(){
-			var t = this, ind;
-			if(!t.p.multiselect) {
-				if(t.p.selrow) {
-					$("#"+$.jgrid.jqID(t.p.id)+" tbody:first tr#"+$.jgrid.jqID(t.p.selrow)).removeClass("ui-state-highlight").attr("aria-selected","false");
-					t.p.selrow = null;
-				}
-			} else {
-				$(t.p.selarrrow).each(function(i,n){
-					ind = t.rows.namedItem(n);
-					$(ind).removeClass("ui-state-highlight").attr("aria-selected","false");
-					$("#jqg_"+$.jgrid.jqID(t.p.id)+"_"+$.jgrid.jqID(n)).attr("checked",false);
-				});
-				$("#cb_"+$.jgrid.jqID(t.p.id)).attr("checked",false);
-				t.p.selarrrow = [];
-			}
-			t.p.savedRow = [];
-		});
-	},
-	getRowData : function( rowid ) {
-		var res = {}, resall, getall=false, len, j=0;
-		this.each(function(){
-			var $t = this,nm,ind;
-			if(typeof(rowid) == 'undefined') {
-				getall = true;
-				resall = [];
-				len = $t.rows.length;
-			} else {
-				ind = $t.rows.namedItem(rowid);
-				if(!ind) { return res; }
-				len = 2;
-			}
-			while(j<len){
-				if(getall) { ind = $t.rows[j]; }
-				if( $(ind).hasClass('jqgrow') ) {
-					$('td',ind).each( function(i) {
-						nm = $t.p.colModel[i].name; 
-						if ( nm !== 'cb' && nm !== 'subgrid' && nm !== 'rn') {
-							if($t.p.treeGrid===true && nm == $t.p.ExpandColumn) {
-								res[nm] = $.jgrid.htmlDecode($("span:first",this).html());
-							} else {
-								try {
-									res[nm] = $.unformat(this,{rowId:ind.id, colModel:$t.p.colModel[i]},i);
-								} catch (e){
-									res[nm] = $.jgrid.htmlDecode($(this).html());
-								}
-							}
-						}
-					});
-					if(getall) { resall.push(res); res={}; }
-				}
-				j++;
-			}
-		});
-		return resall ? resall: res;
-	},
-	delRowData : function(rowid) {
-		var success = false, rowInd, ia, ri;
-		this.each(function() {
-			var $t = this;
-			rowInd = $t.rows.namedItem(rowid);
-			if(!rowInd) {return false;}
-			else {
-				ri = rowInd.rowIndex;
-				$(rowInd).remove();
-				$t.p.records--;
-				$t.p.reccount--;
-				$t.updatepager(true,false);
-				success=true;
-				if($t.p.multiselect) {
-					ia = $.inArray(rowid,$t.p.selarrrow);
-					if(ia != -1) { $t.p.selarrrow.splice(ia,1);}
-				}  
-				if(rowid == $t.p.selrow) {$t.p.selrow=null;}
-			}
-			if($t.p.datatype == 'local') {
-				var pos = $t.p._index[rowid];
-				if(typeof(pos) != 'undefined') {
-					$t.p.data.splice(pos,1);
-					$t.refreshIndex();
-				}
-			}
-			if( $t.p.altRows === true && success ) {
-				var cn = $t.p.altclass;
-				$($t.rows).each(function(i){
-					if(i % 2 ==1) { $(this).addClass(cn); }
-					else { $(this).removeClass(cn); }
-				});
-			}
-		});
-		return success;
-	},
-	setRowData : function(rowid, data, cssp) {
-		var nm, success=true, title;
-		this.each(function(){
-			if(!this.grid) {return false;}
-			var t = this, vl, ind, cp = typeof cssp, lcdata={};
-			ind = t.rows.namedItem(rowid);
-			if(!ind) { return false; }
-			if( data ) {
-				try {
-					$(this.p.colModel).each(function(i){
-						nm = this.name;
-						if( data[nm] !== undefined) {
-							lcdata[nm] = this.formatter && typeof(this.formatter) === 'string' && this.formatter == 'date' ? $.unformat.date(data[nm],this) : data[nm];
-							vl = t.formatter( rowid, data[nm], i, data, 'edit');
-							title = this.title ? {"title":$.jgrid.stripHtml(vl)} : {};
-							if(t.p.treeGrid===true && nm == t.p.ExpandColumn) {
-								$("td:eq("+i+") > span:first",ind).html(vl).attr(title);
-							} else {
-								$("td:eq("+i+")",ind).html(vl).attr(title); 
-							}
-						}
-					});
-					if(t.p.datatype == 'local') {
-						var pos = t.p._index[rowid];
-						if(typeof(pos) != 'undefined') {
-							t.p.data[pos] = $.extend(true, t.p.data[pos], lcdata);
-						}
-						lcdata = null;
-					}
-				} catch (e) {
-					success = false;
-				}
-			}
-			if(success) {
-				if(cp === 'string') {$(ind).addClass(cssp);} else if(cp === 'object') {$(ind).css(cssp);}
-			}
-		});
-		return success;
-	},
-	addRowData : function(rowid,rdata,pos,src) {
-		if(!pos) {pos = "last";}
-		var success = false, nm, row, gi, si, ni,sind, i, v, prp="", aradd, cnm, cn, data, cm;
-		if(rdata) {
-			if($.isArray(rdata)) {
-				aradd=true;
-				pos = "last";
-				cnm = rowid;
-			} else {
-				rdata = [rdata];
-				aradd = false;
-			}
-			this.each(function() {
-				var t = this, datalen = rdata.length;
-				ni = t.p.rownumbers===true ? 1 :0;
-				gi = t.p.multiselect ===true ? 1 :0;
-				si = t.p.subGrid===true ? 1 :0;
-				if(!aradd) {
-					if(typeof(rowid) != 'undefined') { rowid = rowid+"";}
-					else {
-						rowid = (t.p.records+1)+"";
-						if(t.p.keyIndex !== false) {
-							cnm = t.p.colModel[t.p.keyIndex+gi+si+ni].name;
-							if(typeof rdata[0][cnm] != "undefined") { rowid = rdata[0][cnm]; }
-						}
-					}
-				}
-				cn = t.p.altclass;
-				var k = 0, cna ="", lcdata = {},
-				air = $.isFunction(t.p.afterInsertRow) ? true : false;
-				while(k < datalen) {
-					data = rdata[k];
-					row="";
-					if(aradd) {
-						try {rowid = data[cnm];}
-						catch (e) {rowid = (t.p.records+1)+"";}
-						cna = t.p.altRows === true ?  (t.rows.length-1)%2 === 0 ? cn : "" : "";
-					}
-					if(ni){
-						prp = t.formatCol(0,1,'',null,rowid, true);
-						row += "<td role=\"gridcell\" aria-describedby=\""+t.p.id+"_rn\" class=\"ui-state-default jqgrid-rownum\" "+prp+">0</td>";
-					}
-					if(gi) {
-						v = "<input role=\"checkbox\" type=\"checkbox\""+" id=\"jqg_"+t.p.id+"_"+rowid+"\" class=\"cbox\"/>";
-						prp = t.formatCol(ni,1,'', null, rowid, true);
-						row += "<td role=\"gridcell\" aria-describedby=\""+t.p.id+"_cb\" "+prp+">"+v+"</td>";
-					}
-					if(si) {
-						row += $(t).jqGrid("addSubGridCell",gi+ni,1);
-					}
-					for(i = gi+si+ni; i < t.p.colModel.length;i++){
-						cm = t.p.colModel[i];
-						nm = cm.name;
-						lcdata[nm] = cm.formatter && typeof(cm.formatter) === 'string' && cm.formatter == 'date' ? $.unformat.date(data[nm],cm) : data[nm];
-						v = t.formatter( rowid, $.jgrid.getAccessor(data,nm), i, data, 'edit');
-						prp = t.formatCol(i,1,v, rowid, data, true);
-						row += "<td role=\"gridcell\" aria-describedby=\""+t.p.id+"_"+nm+"\" "+prp+">"+v+"</td>";
-					}
-					row = "<tr id=\""+rowid+"\" role=\"row\" class=\"ui-widget-content jqgrow ui-row-"+t.p.direction+" "+cna+"\">" + row+"</tr>";
-					if(t.p.subGrid===true) {
-						row = $(row)[0]; 
-						$(t).jqGrid("addSubGrid",row,gi+ni);
-					}
-					if(t.rows.length === 0){
-						$("table:first",t.grid.bDiv).append(row);
-					} else {
-					switch (pos) {
-						case 'last':
-							$(t.rows[t.rows.length-1]).after(row);
-							break;
-						case 'first':
-							$(t.rows[0]).after(row);
-							break;
-						case 'after':
-							sind = t.rows.namedItem(src);
-							if (sind) {
-								if($(t.rows[sind.rowIndex+1]).hasClass("ui-subgrid")) { $(t.rows[sind.rowIndex+1]).after(row); }
-								else { $(sind).after(row); }
-							}
-							break;
-						case 'before':
-							sind = t.rows.namedItem(src);
-							if(sind) {$(sind).before(row);sind=sind.rowIndex;}
-							break;
-					}
-					}
-					t.p.records++;
-					t.p.reccount++;
-					if(air) { t.p.afterInsertRow.call(t,rowid,data,data); }
-					k++;
-					if(t.p.datatype == 'local') {
-						t.p._index[rowid] = t.p.data.length;
-						t.p.data.push(lcdata);
-						lcdata = {};
-					}
-				}
-				if( t.p.altRows === true && !aradd) {
-					if (pos == "last") {
-						if ((t.rows.length-1)%2 == 1)  {$(t.rows[t.rows.length-1]).addClass(cn);}
-					} else {
-						$(t.rows).each(function(i){
-							if(i % 2 ==1) { $(this).addClass(cn); }
-							else { $(this).removeClass(cn); }
-						});
-					}
-				}
-				t.updatepager(true,true);
-				success = true;
-			});
-		}
-		return success;
-	},
-	footerData : function(action,data, format) {
-		var nm, success=false, res={}, title;
-		function isEmpty(obj) {
-			for(var i in obj) {
-				if (obj.hasOwnProperty(i)) { return false; }
-			}
-			return true;
-		}
-		if(typeof(action) == "undefined") { action = "get"; }
-		if(typeof(format) != "boolean") { format  = true; }
-		action = action.toLowerCase();
-		this.each(function(){
-			var t = this, vl;
-			if(!t.grid || !t.p.footerrow) {return false;}
-			if(action == "set") { if(isEmpty(data)) { return false; } }
-			success=true;
-			$(this.p.colModel).each(function(i){
-				nm = this.name;
-				if(action == "set") {
-					if( data[nm] !== undefined) {
-						vl = format ? t.formatter( "", data[nm], i, data, 'edit') : data[nm];
-						title = this.title ? {"title":$.jgrid.stripHtml(vl)} : {};
-						$("tr.footrow td:eq("+i+")",t.grid.sDiv).html(vl).attr(title); 
-						success = true;
-					}
-				} else if(action == "get") {
-					res[nm] = $("tr.footrow td:eq("+i+")",t.grid.sDiv).html();
-				}
-			});
-		});
-		return action == "get" ? res : success;
-	},
-	ShowHideCol : function(colname,show) {
-		return this.each(function() {
-			var $t = this, fndh=false;
-			if (!$t.grid ) {return;}
-			if( typeof colname === 'string') {colname=[colname];}
-			show = show != "none" ? "" : "none";
-			var sw = show === "" ? true :false;
-			$(this.p.colModel).each(function(i) {
-				if ($.inArray(this.name,colname) !== -1 && this.hidden === sw) {
-					$("tr",$t.grid.hDiv).each(function(){
-						$(this).children("th:eq("+i+")").css("display",show);
-					});
-					$($t.rows).each(function(j){
-						$(this).children("td:eq("+i+")").css("display",show);
-					});
-					if($t.p.footerrow) { $($t.grid.sDiv).children("td:eq("+i+")").css("display", show); }
-					if(show == "none") { $t.p.tblwidth -= this.width+$t.p.cellLayout;} else {$t.p.tblwidth += this.width;}
-					this.hidden = !sw;
-					fndh=true;
-				}
-			});
-			if(fndh===true) {
-				$("table:first",$t.grid.hDiv).width($t.p.tblwidth);
-				$("table:first",$t.grid.bDiv).width($t.p.tblwidth);
-				$t.grid.hDiv.scrollLeft = $t.grid.bDiv.scrollLeft;
-				if($t.p.footerrow) {
-					$("table:first",$t.grid.sDiv).width($t.p.tblwidth);
-					$t.grid.sDiv.scrollLeft = $t.grid.bDiv.scrollLeft;
-				}
-				if($t.p.shrinkToFit===true) {
-					$($t).jqGrid("setGridWidth",$t.grid.width-0.001,true);
-				}
-			}
-		});
-	},
-	hideCol : function (colname) {
-		return this.each(function(){$(this).jqGrid("ShowHideCol",colname,"none");});
-	},
-	showCol : function(colname) {
-		return this.each(function(){$(this).jqGrid("ShowHideCol",colname,"");});
-	},
-	remapColumns : function(permutation, updateCells, keepHeader)
-	{
-		function resortArray(a) {
-			var ac;
-			if (a.length) {
-				ac = $.makeArray(a);
-			} else {
-				ac = $.extend({}, a);
-			}
-			$.each(permutation, function(i) {
-				a[i] = ac[this];
-			});
-		}
-		var ts = this.get(0);
-		function resortRows(parent, clobj) {
-			$(">tr"+(clobj||""), parent).each(function() {
-				var row = this;
-				var elems = $.makeArray(row.cells);
-				$.each(permutation, function() {
-					var e = elems[this];
-					if (e) {
-						row.appendChild(e);
-					}
-				});
-			});
-		}
-		resortArray(ts.p.colModel);
-		resortArray(ts.p.colNames);
-		resortArray(ts.grid.headers);
-		resortRows($("thead:first", ts.grid.hDiv), keepHeader && ":not(.ui-jqgrid-labels)");
-		if (updateCells) {
-			resortRows($("#"+$.jgrid.jqID(ts.p.id)+" tbody:first"), ".jqgfirstrow, tr.jqgrow, tr.jqfoot");
-		}
-		if (ts.p.footerrow) {
-			resortRows($("tbody:first", ts.grid.sDiv));
-		}
-		if (ts.p.remapColumns) {
-			if (!ts.p.remapColumns.length){
-				ts.p.remapColumns = $.makeArray(permutation);
-			} else {
-				resortArray(ts.p.remapColumns);
-			}
-		}
-		ts.p.lastsort = $.inArray(ts.p.lastsort, permutation);
-		if(ts.p.treeGrid) { ts.p.expColInd = $.inArray(ts.p.expColInd, permutation); }
-	},
-	setGridWidth : function(nwidth, shrink) {
-		return this.each(function(){
-			if (!this.grid ) {return;}
-			var $t = this, cw,
-			initwidth = 0, brd=$t.p.cellLayout, lvc, vc=0, hs=false, scw=$t.p.scrollOffset, aw, gw=0, tw=0,
-			cl = 0,cr;
-			if(typeof shrink != 'boolean') {
-				shrink=$t.p.shrinkToFit;
-			}
-			if(isNaN(nwidth)) {return;}
-			else { nwidth = parseInt(nwidth,10); $t.grid.width = $t.p.width = nwidth;}
-			$("#gbox_"+$.jgrid.jqID($t.p.id)).css("width",nwidth+"px");
-			$("#gview_"+$.jgrid.jqID($t.p.id)).css("width",nwidth+"px");
-			$($t.grid.bDiv).css("width",nwidth+"px");
-			$($t.grid.hDiv).css("width",nwidth+"px");
-			if($t.p.pager ) {$($t.p.pager).css("width",nwidth+"px");}
-			if($t.p.toppager ) {$($t.p.toppager).css("width",nwidth+"px");}
-			if($t.p.toolbar[0] === true){
-				$($t.grid.uDiv).css("width",nwidth+"px");
-				if($t.p.toolbar[1]=="both") {$($t.grid.ubDiv).css("width",nwidth+"px");}
-			}
-			if($t.p.footerrow) { $($t.grid.sDiv).css("width",nwidth+"px"); }
-			if(shrink ===false && $t.p.forceFit === true) {$t.p.forceFit=false;}			
-			if(shrink===true) {
-				if ($.browser.safari) { brd=0;}
-				$.each($t.p.colModel, function(i) {
-					if(this.hidden===false){
-						initwidth += parseInt(this.width,10);
-						if(this.fixed) {
-							tw += this.width;
-							gw += this.width+brd;
-						} else {
-							vc++;
-						}
-						cl++;
-					}
-				});
-				if(vc  === 0) { return; }
-				$t.p.tblwidth = initwidth;
-				aw = nwidth-brd*vc-gw;
-				if(!isNaN($t.p.height)) {
-					if($($t.grid.bDiv)[0].clientHeight < $($t.grid.bDiv)[0].scrollHeight || $t.rows.length === 1){
-						hs = true;
-						aw -= scw;
-					}
-				}
-				initwidth =0;
-				var cle = $t.grid.cols.length >0;
-				$.each($t.p.colModel, function(i) {
-					if(this.hidden === false && !this.fixed){
-						cw = Math.round(aw*this.width/($t.p.tblwidth-tw));
-						if (cw < 0) { return; }
-						this.width =cw;
-						initwidth += cw;
-						$t.grid.headers[i].width=cw;
-						$t.grid.headers[i].el.style.width=cw+"px";
-						if($t.p.footerrow) { $t.grid.footers[i].style.width = cw+"px"; }
-						if(cle) { $t.grid.cols[i].style.width = cw+"px"; }
-						lvc = i;
-					}
-				});
-				cr =0;
-				if (hs) {
-					if(nwidth-gw-(initwidth+brd*vc) !== scw){
-						cr = nwidth-gw-(initwidth+brd*vc)-scw;
-					}
-				} else if( Math.abs(nwidth-gw-(initwidth+brd*vc)) !== 1) {
-					cr = nwidth-gw-(initwidth+brd*vc);
-				}
-				$t.p.colModel[lvc].width += cr;
-				$t.p.tblwidth = initwidth+cr+tw+brd*cl;
-				if($t.p.tblwidth > nwidth) {
-					var delta = $t.p.tblwidth - parseInt(nwidth,10);
-					$t.p.tblwidth = nwidth;
-					cw = $t.p.colModel[lvc].width = $t.p.colModel[lvc].width-delta;
-				} else {
-					cw= $t.p.colModel[lvc].width;
-				}
-				$t.grid.headers[lvc].width = cw;
-				$t.grid.headers[lvc].el.style.width=cw+"px";
-				if(cle) { $t.grid.cols[lvc].style.width = cw+"px"; }
-				$('table:first',$t.grid.bDiv).css("width",$t.p.tblwidth+"px");
-				$('table:first',$t.grid.hDiv).css("width",$t.p.tblwidth+"px");
-				$t.grid.hDiv.scrollLeft = $t.grid.bDiv.scrollLeft;
-				if($t.p.footerrow) {
-					$t.grid.footers[lvc].style.width = cw+"px";
-					$('table:first',$t.grid.sDiv).css("width",$t.p.tblwidth+"px");
-				}
-			}
-		});
-	},
-	setGridHeight : function (nh) {
-		return this.each(function (){
-			var $t = this;
-			if(!$t.grid) {return;}
-			$($t.grid.bDiv).css({height: nh+(isNaN(nh)?"":"px")});
-			$t.p.height = nh;
-			if ($t.p.scroll) { $t.grid.populateVisible(); }
-		});
-	},
-	setCaption : function (newcap){
-		return this.each(function(){
-			this.p.caption=newcap;
-			$("span.ui-jqgrid-title",this.grid.cDiv).html(newcap);
-			$(this.grid.cDiv).show();
-		});
-	},
-	setLabel : function(colname, nData, prop, attrp ){
-		return this.each(function(){
-			var $t = this, pos=-1;
-			if(!$t.grid) {return;}
-			if(isNaN(colname)) {
-				$($t.p.colModel).each(function(i){
-					if (this.name == colname) {
-						pos = i;return false;
-					}
-				});
-			} else {pos = parseInt(colname,10);}
-			if(pos>=0) {
-				var thecol = $("tr.ui-jqgrid-labels th:eq("+pos+")",$t.grid.hDiv);
-				if (nData){
-					var ico = $(".s-ico",thecol);
-					$("[id^=jqgh_]",thecol).empty().html(nData).append(ico);
-					$t.p.colNames[pos] = nData;
-				}
-				if (prop) {
-					if(typeof prop === 'string') {$(thecol).addClass(prop);} else {$(thecol).css(prop);}
-				}
-				if(typeof attrp === 'object') {$(thecol).attr(attrp);}
-			}
-		});
-	},
-	setCell : function(rowid,colname,nData,cssp,attrp, forceupd) {
-		return this.each(function(){
-			var $t = this, pos =-1,v, title;
-			if(!$t.grid) {return;}
-			if(isNaN(colname)) {
-				$($t.p.colModel).each(function(i){
-					if (this.name == colname) {
-						pos = i;return false;
-					}
-				});
-			} else {pos = parseInt(colname,10);}
-			if(pos>=0) {
-				var ind = $t.rows.namedItem(rowid);
-				if (ind){
-					var tcell = $("td:eq("+pos+")",ind);
-					if(nData !== "" || forceupd === true) {
-						v = $t.formatter(rowid, nData, pos,ind,'edit');
-						title = $t.p.colModel[pos].title ? {"title":$.jgrid.stripHtml(v)} : {};
-						if($t.p.treeGrid && $(".tree-wrap",$(tcell)).length>0) {
-							$("span",$(tcell)).html(v).attr(title);
-						} else {
-							$(tcell).html(v).attr(title);
-						}
-						if($t.p.datatype == "local") {
-							var cm = $t.p.colModel[pos], index;
-							nData = cm.formatter && typeof(cm.formatter) === 'string' && cm.formatter == 'date' ? $.unformat.date(nData,cm) : nData;
-							index = $t.p._index[rowid];
-							if(typeof index  != "undefined") {
-								$t.p.data[index][cm.name] = nData;
-							}
-						}
-					}
-					if(typeof cssp === 'string'){
-						$(tcell).addClass(cssp);
-					} else if(cssp) {
-						$(tcell).css(cssp);
-					}
-					if(typeof attrp === 'object') {$(tcell).attr(attrp);}
-				}
-			}
-		});
-	},
-	getCell : function(rowid,col) {
-		var ret = false;
-		this.each(function(){
-			var $t=this, pos=-1;
-			if(!$t.grid) {return;}
-			if(isNaN(col)) {
-				$($t.p.colModel).each(function(i){
-					if (this.name === col) {
-						pos = i;return false;
-					}
-				});
-			} else {pos = parseInt(col,10);}
-			if(pos>=0) {
-				var ind = $t.rows.namedItem(rowid);
-				if(ind) {
-					try {
-						ret = $.unformat($("td:eq("+pos+")",ind),{rowId:ind.id, colModel:$t.p.colModel[pos]},pos);
-					} catch (e){
-						ret = $.jgrid.htmlDecode($("td:eq("+pos+")",ind).html());
-					}
-				}
-			}
-		});
-		return ret;
-	},
-	getCol : function (col, obj, mathopr) {
-		var ret = [], val, sum=0;
-		obj = typeof (obj) != 'boolean' ? false : obj;
-		if(typeof mathopr == 'undefined') { mathopr = false; }
-		this.each(function(){
-			var $t=this, pos=-1;
-			if(!$t.grid) {return;}
-			if(isNaN(col)) {
-				$($t.p.colModel).each(function(i){
-					if (this.name === col) {
-						pos = i;return false;
-					}
-				});
-			} else {pos = parseInt(col,10);}
-			if(pos>=0) {
-				var ln = $t.rows.length, i =0;
-				if (ln && ln>0){
-					while(i<ln){
-						if($($t.rows[i]).hasClass('jqgrow')) {
-							try {
-								val = $.unformat($($t.rows[i].cells[pos]),{rowId:$t.rows[i].id, colModel:$t.p.colModel[pos]},pos);
-							} catch (e) {
-								val = $.jgrid.htmlDecode($t.rows[i].cells[pos].innerHTML);
-							}
-							if(mathopr) { sum += parseFloat(val); }
-							else if(obj) { ret.push( {id:$t.rows[i].id,value:val} ); }
-							else { ret.push( val ); }
-						}
-						i++;
-					}
-					if(mathopr) {
-						switch(mathopr.toLowerCase()){
-							case 'sum': ret =sum; break;
-							case 'avg': ret = sum/ln; break;
-							case 'count': ret = ln; break;
-						}
-					}
-				}
-			}
-		});
-		return ret;
-	},
-	clearGridData : function(clearfooter) {
-		return this.each(function(){
-			var $t = this;
-			if(!$t.grid) {return;}
-			if(typeof clearfooter != 'boolean') { clearfooter = false; }
-			if($t.p.deepempty) {$("#"+$.jgrid.jqID($t.p.id)+" tbody:first tr:gt(0)").remove();}
-			else {
-				var trf = $("#"+$.jgrid.jqID($t.p.id)+" tbody:first tr:first")[0];
-				$("#"+$.jgrid.jqID($t.p.id)+" tbody:first").empty().append(trf);
-			}
-			if($t.p.footerrow && clearfooter) { $(".ui-jqgrid-ftable td",$t.grid.sDiv).html("&#160;"); }
-			$t.p.selrow = null; $t.p.selarrrow= []; $t.p.savedRow = [];
-			$t.p.records = 0;$t.p.page=1;$t.p.lastpage=0;$t.p.reccount=0;
-			$t.p.data = []; $t.p_index = {};
-			$t.updatepager(true,false);
-		});
-	},
-	getInd : function(rowid,rc){
-		var ret =false,rw;
-		this.each(function(){
-			rw = this.rows.namedItem(rowid);
-			if(rw) {
-				ret = rc===true ? rw: rw.rowIndex;
-			}
-		});
-		return ret;
-	}
-});
-})(jQuery);
diff --git a/addons/base/static/lib/jquery.jqGrid/js/grid.celledit.js b/addons/base/static/lib/jquery.jqGrid/js/grid.celledit.js
deleted file mode 100644
index 38802091805..00000000000
--- a/addons/base/static/lib/jquery.jqGrid/js/grid.celledit.js
+++ /dev/null
@@ -1,486 +0,0 @@
-;(function($){
-/*
-**
- * jqGrid extension for cellediting Grid Data
- * Tony Tomov tony@trirand.com
- * http://trirand.com/blog/ 
- * Dual licensed under the MIT and GPL licenses:
- * http://www.opensource.org/licenses/mit-license.php
- * http://www.gnu.org/licenses/gpl-2.0.html
-**/ 
-/**
- * all events and options here are aded anonynous and not in the base grid
- * since the array is to big. Here is the order of execution.
- * From this point we use jQuery isFunction
- * formatCell
- * beforeEditCell,
- * onSelectCell (used only for noneditable cels)
- * afterEditCell,
- * beforeSaveCell, (called before validation of values if any)
- * beforeSubmitCell (if cellsubmit remote (ajax))
- * afterSubmitCell(if cellsubmit remote (ajax)),
- * afterSaveCell,
- * errorCell,
- * serializeCellData - new
- * Options
- * cellsubmit (remote,clientArray) (added in grid options)
- * cellurl
- * ajaxCellOptions
-* */
-$.jgrid.extend({
-	editCell : function (iRow,iCol, ed){
-		return this.each(function (){
-			var $t = this, nm, tmp,cc;
-			if (!$t.grid || $t.p.cellEdit !== true) {return;}
-			iCol = parseInt(iCol,10);
-			// select the row that can be used for other methods
-			$t.p.selrow = $t.rows[iRow].id;
-			if (!$t.p.knv) {$($t).jqGrid("GridNav");}
-			// check to see if we have already edited cell
-			if ($t.p.savedRow.length>0) {
-				// prevent second click on that field and enable selects
-				if (ed===true ) {
-					if(iRow == $t.p.iRow && iCol == $t.p.iCol){
-						return;
-					}
-				}
-				// save the cell
-				$($t).jqGrid("saveCell",$t.p.savedRow[0].id,$t.p.savedRow[0].ic);
-			} else {
-				window.setTimeout(function () { $("#"+$t.p.knv).attr("tabindex","-1").focus();},0);
-			}
-			nm = $t.p.colModel[iCol].name;
-			if (nm=='subgrid' || nm=='cb' || nm=='rn') {return;}
-			cc = $("td:eq("+iCol+")",$t.rows[iRow]);
-			if ($t.p.colModel[iCol].editable===true && ed===true && !cc.hasClass("not-editable-cell")) {
-				if(parseInt($t.p.iCol,10)>=0  && parseInt($t.p.iRow,10)>=0) {
-					$("td:eq("+$t.p.iCol+")",$t.rows[$t.p.iRow]).removeClass("edit-cell ui-state-highlight");
-					$($t.rows[$t.p.iRow]).removeClass("selected-row ui-state-hover");
-				}
-				$(cc).addClass("edit-cell ui-state-highlight");
-				$($t.rows[iRow]).addClass("selected-row ui-state-hover");
-				try {
-					tmp =  $.unformat(cc,{rowId: $t.rows[iRow].id, colModel:$t.p.colModel[iCol]},iCol);
-				} catch (_) {
-					tmp = $(cc).html();
-				}
-				if($t.p.autoencode) { tmp = $.jgrid.htmlDecode(tmp); }
-				if (!$t.p.colModel[iCol].edittype) {$t.p.colModel[iCol].edittype = "text";}
-				$t.p.savedRow.push({id:iRow,ic:iCol,name:nm,v:tmp});
-				if($.isFunction($t.p.formatCell)) {
-					var tmp2 = $t.p.formatCell.call($t, $t.rows[iRow].id,nm,tmp,iRow,iCol);
-					if(tmp2 !== undefined ) {tmp = tmp2;}
-				}
-				var opt = $.extend({}, $t.p.colModel[iCol].editoptions || {} ,{id:iRow+"_"+nm,name:nm});
-				var elc = $.jgrid.createEl($t.p.colModel[iCol].edittype,opt,tmp,true,$.extend({},$.jgrid.ajaxOptions,$t.p.ajaxSelectOptions || {}));
-				if ($.isFunction($t.p.beforeEditCell)) {
-					$t.p.beforeEditCell.call($t, $t.rows[iRow].id,nm,tmp,iRow,iCol);
-				}
-				$(cc).html("").append(elc).attr("tabindex","0");
-				window.setTimeout(function () { $(elc).focus();},0);
-				$("input, select, textarea",cc).bind("keydown",function(e) { 
-					if (e.keyCode === 27) {
-						if($("input.hasDatepicker",cc).length >0) {
-							if( $(".ui-datepicker").is(":hidden") )  { $($t).jqGrid("restoreCell",iRow,iCol); }
-							else { $("input.hasDatepicker",cc).datepicker('hide'); }
-						} else {
-							$($t).jqGrid("restoreCell",iRow,iCol);
-						}
-					} //ESC
-					if (e.keyCode === 13) {$($t).jqGrid("saveCell",iRow,iCol);}//Enter
-					if (e.keyCode == 9)  {
-						if(!$t.grid.hDiv.loading ) {
-							if (e.shiftKey) {$($t).jqGrid("prevCell",iRow,iCol);} //Shift TAb
-							else {$($t).jqGrid("nextCell",iRow,iCol);} //Tab
-						} else {
-							return false;
-						}
-					}
-					e.stopPropagation();
-				});
-				if ($.isFunction($t.p.afterEditCell)) {
-					$t.p.afterEditCell.call($t, $t.rows[iRow].id,nm,tmp,iRow,iCol);
-				}
-			} else {
-				if (parseInt($t.p.iCol,10)>=0  && parseInt($t.p.iRow,10)>=0) {
-					$("td:eq("+$t.p.iCol+")",$t.rows[$t.p.iRow]).removeClass("edit-cell ui-state-highlight");
-					$($t.rows[$t.p.iRow]).removeClass("selected-row ui-state-hover");
-				}
-				cc.addClass("edit-cell ui-state-highlight");
-				$($t.rows[iRow]).addClass("selected-row ui-state-hover"); 
-				if ($.isFunction($t.p.onSelectCell)) {
-					tmp = cc.html().replace(/\&#160\;/ig,'');
-					$t.p.onSelectCell.call($t, $t.rows[iRow].id,nm,tmp,iRow,iCol);
-				}
-			}
-			$t.p.iCol = iCol; $t.p.iRow = iRow;
-		});
-	},
-	saveCell : function (iRow, iCol){
-		return this.each(function(){
-			var $t= this, fr;
-			if (!$t.grid || $t.p.cellEdit !== true) {return;}
-			if ( $t.p.savedRow.length >= 1) {fr = 0;} else {fr=null;} 
-			if(fr !== null) {
-				var cc = $("td:eq("+iCol+")",$t.rows[iRow]),v,v2,
-				cm = $t.p.colModel[iCol], nm = cm.name, nmjq = $.jgrid.jqID(nm) ;
-				switch (cm.edittype) {
-					case "select":
-						if(!cm.editoptions.multiple) {
-							v = $("#"+iRow+"_"+nmjq+">option:selected",$t.rows[iRow]).val();
-							v2 = $("#"+iRow+"_"+nmjq+">option:selected",$t.rows[iRow]).text();
-						} else {
-							var sel = $("#"+iRow+"_"+nmjq,$t.rows[iRow]), selectedText = [];
-							v = $(sel).val();
-							if(v) { v.join(",");} else { v=""; }
-							$("option:selected",sel).each(
-								function(i,selected){
-									selectedText[i] = $(selected).text();
-								}
-							);
-							v2 = selectedText.join(",");
-						}
-						if(cm.formatter) { v2 = v; }
-						break;
-					case "checkbox":
-						var cbv  = ["Yes","No"];
-						if(cm.editoptions){
-							cbv = cm.editoptions.value.split(":");
-						}
-						v = $("#"+iRow+"_"+nmjq,$t.rows[iRow]).attr("checked") ? cbv[0] : cbv[1];
-						v2=v;
-						break;
-					case "password":
-					case "text":
-					case "textarea":
-					case "button" :
-						v = $("#"+iRow+"_"+nmjq,$t.rows[iRow]).val();
-						v2=v;
-						break;
-					case 'custom' :
-						try {
-							if(cm.editoptions && $.isFunction(cm.editoptions.custom_value)) {
-								v = cm.editoptions.custom_value.call($t, $(".customelement",cc),'get');
-								if (v===undefined) { throw "e2";} else { v2=v; }
-							} else { throw "e1"; }
-						} catch (e) {
-							if (e=="e1") { $.jgrid.info_dialog(jQuery.jgrid.errors.errcap,"function 'custom_value' "+$.jgrid.edit.msg.nodefined,jQuery.jgrid.edit.bClose); }
-							if (e=="e2") { $.jgrid.info_dialog(jQuery.jgrid.errors.errcap,"function 'custom_value' "+$.jgrid.edit.msg.novalue,jQuery.jgrid.edit.bClose); }
-							else {$.jgrid.info_dialog(jQuery.jgrid.errors.errcap,e.message,jQuery.jgrid.edit.bClose); }
-						}
-						break;
-				}
-				// The common approach is if nothing changed do not do anything
-				if (v2 != $t.p.savedRow[fr].v){
-					if ($.isFunction($t.p.beforeSaveCell)) {
-						var vv = $t.p.beforeSaveCell.call($t, $t.rows[iRow].id,nm, v, iRow,iCol);
-						if (vv) {v = vv; v2=vv;}
-					}
-					var cv = $.jgrid.checkValues(v,iCol,$t);
-					if(cv[0] === true) {
-						var addpost = {};
-						if ($.isFunction($t.p.beforeSubmitCell)) {
-							addpost = $t.p.beforeSubmitCell.call($t, $t.rows[iRow].id,nm, v, iRow,iCol);
-							if (!addpost) {addpost={};}
-						}
-						if( $("input.hasDatepicker",cc).length >0) { $("input.hasDatepicker",cc).datepicker('hide'); }
-						if ($t.p.cellsubmit == 'remote') {
-							if ($t.p.cellurl) {
-								var postdata = {};
-								if($t.p.autoencode) { v = $.jgrid.htmlEncode(v); }
-								postdata[nm] = v;
-								var idname,oper, opers;
-								opers = $t.p.prmNames;
-								idname = opers.id;
-								oper = opers.oper;
-								postdata[idname] = $t.rows[iRow].id;
-								postdata[oper] = opers.editoper;
-								postdata = $.extend(addpost,postdata);
-								$("#lui_"+$t.p.id).show();
-								$t.grid.hDiv.loading = true;
-								$.ajax( $.extend( {
-									url: $t.p.cellurl,
-									data :$.isFunction($t.p.serializeCellData) ? $t.p.serializeCellData.call($t, postdata) : postdata,
-									type: "POST",
-									complete: function (result, stat) {
-										$("#lui_"+$t.p.id).hide();
-										$t.grid.hDiv.loading = false;
-										if (stat == 'success') {
-											if ($.isFunction($t.p.afterSubmitCell)) {
-												var ret = $t.p.afterSubmitCell.call($t, result,postdata.id,nm,v,iRow,iCol);
-												if(ret[0] === true) {
-													$(cc).empty();
-													$($t).jqGrid("setCell",$t.rows[iRow].id, iCol, v2, false, false, true);
-													$(cc).addClass("dirty-cell");
-													$($t.rows[iRow]).addClass("edited");
-													if ($.isFunction($t.p.afterSaveCell)) {
-														$t.p.afterSaveCell.call($t, $t.rows[iRow].id,nm, v, iRow,iCol);
-													}
-													$t.p.savedRow.splice(0,1);
-												} else {
-													$.jgrid.info_dialog($.jgrid.errors.errcap,ret[1],$.jgrid.edit.bClose);
-													$($t).jqGrid("restoreCell",iRow,iCol);
-												}
-											} else {
-												$(cc).empty();
-												$($t).jqGrid("setCell",$t.rows[iRow].id, iCol, v2, false, false, true);
-												$(cc).addClass("dirty-cell");
-												$($t.rows[iRow]).addClass("edited");
-												if ($.isFunction($t.p.afterSaveCell)) {
-													$t.p.afterSaveCell.call($t, $t.rows[iRow].id,nm, v, iRow,iCol);
-												}
-												$t.p.savedRow.splice(0,1);
-											}
-										}
-									},
-									error:function(res,stat) {
-										$("#lui_"+$t.p.id).hide();
-										$t.grid.hDiv.loading = false;
-										if ($.isFunction($t.p.errorCell)) {
-											$t.p.errorCell.call($t, res,stat);
-											$($t).jqGrid("restoreCell",iRow,iCol);
-										} else {
-											$.jgrid.info_dialog($.jgrid.errors.errcap,res.status+" : "+res.statusText+"<br/>"+stat,$.jgrid.edit.bClose);
-											$($t).jqGrid("restoreCell",iRow,iCol);
-										}
-									}
-								}, $.jgrid.ajaxOptions, $t.p.ajaxCellOptions || {}));
-							} else {
-								try {
-									$.jgrid.info_dialog($.jgrid.errors.errcap,$.jgrid.errors.nourl,$.jgrid.edit.bClose);
-									$($t).jqGrid("restoreCell",iRow,iCol);
-								} catch (e) {}
-							}
-						}
-						if ($t.p.cellsubmit == 'clientArray') {
-							$(cc).empty();
-							$($t).jqGrid("setCell",$t.rows[iRow].id,iCol, v2, false, false, true);
-							$(cc).addClass("dirty-cell");
-							$($t.rows[iRow]).addClass("edited");
-							if ($.isFunction($t.p.afterSaveCell)) {
-								$t.p.afterSaveCell.call($t, $t.rows[iRow].id,nm, v, iRow,iCol);
-							}
-							$t.p.savedRow.splice(0,1);
-						}
-					} else {
-						try {
-							window.setTimeout(function(){$.jgrid.info_dialog($.jgrid.errors.errcap,v+" "+cv[1],$.jgrid.edit.bClose);},100);
-							$($t).jqGrid("restoreCell",iRow,iCol);
-						} catch (e) {}
-					}
-				} else {
-					$($t).jqGrid("restoreCell",iRow,iCol);
-				}
-			}
-			if ($.browser.opera) {
-				$("#"+$t.p.knv).attr("tabindex","-1").focus();
-			} else {
-				window.setTimeout(function () { $("#"+$t.p.knv).attr("tabindex","-1").focus();},0);
-			}
-		});
-	},
-	restoreCell : function(iRow, iCol) {
-		return this.each(function(){
-			var $t= this, fr;
-			if (!$t.grid || $t.p.cellEdit !== true ) {return;}
-			if ( $t.p.savedRow.length >= 1) {fr = 0;} else {fr=null;}
-			if(fr !== null) {
-				var cc = $("td:eq("+iCol+")",$t.rows[iRow]);
-				// datepicker fix
-				if($.isFunction($.fn.datepicker)) {
-					try {
-						$("input.hasDatepicker",cc).datepicker('hide');
-					} catch (e) {}
-				}
-				$(cc).empty().attr("tabindex","-1");
-				$($t).jqGrid("setCell",$t.rows[iRow].id, iCol, $t.p.savedRow[fr].v, false, false, true);
-				if ($.isFunction($t.p.afterRestoreCell)) {
-					$t.p.afterRestoreCell.call($t, $t.rows[iRow].id, $t.p.savedRow[fr].v, iRow, iCol);
-				}				
-				$t.p.savedRow.splice(0,1);
-			}
-			window.setTimeout(function () { $("#"+$t.p.knv).attr("tabindex","-1").focus();},0);
-		});
-	},
-	nextCell : function (iRow,iCol) {
-		return this.each(function (){
-			var $t = this, nCol=false;
-			if (!$t.grid || $t.p.cellEdit !== true) {return;}
-			// try to find next editable cell
-			for (var i=iCol+1; i<$t.p.colModel.length; i++) {
-				if ( $t.p.colModel[i].editable ===true) {
-					nCol = i; break;
-				}
-			}
-			if(nCol !== false) {
-				$($t).jqGrid("editCell",iRow,nCol,true);
-			} else {
-				if ($t.p.savedRow.length >0) {
-					$($t).jqGrid("saveCell",iRow,iCol);
-				}
-			}
-		});
-	},
-	prevCell : function (iRow,iCol) {
-		return this.each(function (){
-			var $t = this, nCol=false;
-			if (!$t.grid || $t.p.cellEdit !== true) {return;}
-			// try to find next editable cell
-			for (var i=iCol-1; i>=0; i--) {
-				if ( $t.p.colModel[i].editable ===true) {
-					nCol = i; break;
-				}
-			}
-			if(nCol !== false) {
-				$($t).jqGrid("editCell",iRow,nCol,true);
-			} else {
-				if ($t.p.savedRow.length >0) {
-					$($t).jqGrid("saveCell",iRow,iCol);
-				}
-			}
-		});
-	},
-	GridNav : function() {
-		return this.each(function () {
-			var  $t = this;
-			if (!$t.grid || $t.p.cellEdit !== true ) {return;}
-			// trick to process keydown on non input elements
-			$t.p.knv = $t.p.id + "_kn";
-			var selection = $("<span style='width:0px;height:0px;background-color:black;' tabindex='0'><span tabindex='-1' style='width:0px;height:0px;background-color:grey' id='"+$t.p.knv+"'></span></span>"),
-			i, kdir;
-			$(selection).insertBefore($t.grid.cDiv);
-			$("#"+$t.p.knv)
-			.focus()
-			.keydown(function (e){
-				kdir = e.keyCode;
-				if($t.p.direction == "rtl") {
-					if(kdir==37) { kdir = 39;}
-					else if (kdir==39) { kdir = 37; }
-				}
-				switch (kdir) {
-					case 38:
-						if ($t.p.iRow-1 >0 ) {
-							scrollGrid($t.p.iRow-1,$t.p.iCol,'vu');
-							$($t).jqGrid("editCell",$t.p.iRow-1,$t.p.iCol,false);
-						}
-					break;
-					case 40 :
-						if ($t.p.iRow+1 <=  $t.rows.length-1) {
-							scrollGrid($t.p.iRow+1,$t.p.iCol,'vd');
-							$($t).jqGrid("editCell",$t.p.iRow+1,$t.p.iCol,false);
-						}
-					break;
-					case 37 :
-						if ($t.p.iCol -1 >=  0) {
-							i = findNextVisible($t.p.iCol-1,'lft');
-							scrollGrid($t.p.iRow, i,'h');
-							$($t).jqGrid("editCell",$t.p.iRow, i,false);
-						}
-					break;
-					case 39 :
-						if ($t.p.iCol +1 <=  $t.p.colModel.length-1) {
-							i = findNextVisible($t.p.iCol+1,'rgt');
-							scrollGrid($t.p.iRow,i,'h');
-							$($t).jqGrid("editCell",$t.p.iRow,i,false);
-						}
-					break;
-					case 13:
-						if (parseInt($t.p.iCol,10)>=0 && parseInt($t.p.iRow,10)>=0) {
-							$($t).jqGrid("editCell",$t.p.iRow,$t.p.iCol,true);
-						}
-					break;
-				}
-				return false;
-			});
-			function scrollGrid(iR, iC, tp){
-				if (tp.substr(0,1)=='v') {
-					var ch = $($t.grid.bDiv)[0].clientHeight,
-					st = $($t.grid.bDiv)[0].scrollTop,
-					nROT = $t.rows[iR].offsetTop+$t.rows[iR].clientHeight,
-					pROT = $t.rows[iR].offsetTop;
-					if(tp == 'vd') {
-						if(nROT >= ch) {
-							$($t.grid.bDiv)[0].scrollTop = $($t.grid.bDiv)[0].scrollTop + $t.rows[iR].clientHeight;
-						}
-					}
-					if(tp == 'vu'){
-						if (pROT < st ) {
-							$($t.grid.bDiv)[0].scrollTop = $($t.grid.bDiv)[0].scrollTop - $t.rows[iR].clientHeight;
-						}
-					}
-				}
-				if(tp=='h') {
-					var cw = $($t.grid.bDiv)[0].clientWidth,
-					sl = $($t.grid.bDiv)[0].scrollLeft,
-					nCOL = $t.rows[iR].cells[iC].offsetLeft+$t.rows[iR].cells[iC].clientWidth,
-					pCOL = $t.rows[iR].cells[iC].offsetLeft;
-					if(nCOL >= cw+parseInt(sl,10)) {
-						$($t.grid.bDiv)[0].scrollLeft = $($t.grid.bDiv)[0].scrollLeft + $t.rows[iR].cells[iC].clientWidth;
-					} else if (pCOL < sl) {
-						$($t.grid.bDiv)[0].scrollLeft = $($t.grid.bDiv)[0].scrollLeft - $t.rows[iR].cells[iC].clientWidth;
-					}
-				}
-			}
-			function findNextVisible(iC,act){
-				var ind, i;
-				if(act == 'lft') {
-					ind = iC+1;
-					for (i=iC;i>=0;i--){
-						if ($t.p.colModel[i].hidden !== true) {
-							ind = i;
-							break;
-						}
-					}
-				}
-				if(act == 'rgt') {
-					ind = iC-1;
-					for (i=iC; i<$t.p.colModel.length;i++){
-						if ($t.p.colModel[i].hidden !== true) {
-							ind = i;
-							break;
-						}						
-					}
-				}
-				return ind;
-			}
-		});
-	},
-	getChangedCells : function (mthd) {
-		var ret=[];
-		if (!mthd) {mthd='all';}
-		this.each(function(){
-			var $t= this,nm;
-			if (!$t.grid || $t.p.cellEdit !== true ) {return;}
-			$($t.rows).each(function(j){
-				var res = {};
-				if ($(this).hasClass("edited")) {
-					$('td',this).each( function(i) {
-						nm = $t.p.colModel[i].name;
-						if ( nm !== 'cb' && nm !== 'subgrid') {
-							if (mthd=='dirty') {
-								if ($(this).hasClass('dirty-cell')) {
-									try {
-										res[nm] = $.unformat(this,{rowId:$t.rows[j].id, colModel:$t.p.colModel[i]},i);
-									} catch (e){
-										res[nm] = $.jgrid.htmlDecode($(this).html());
-									}
-								}
-							} else {
-								try {
-									res[nm] = $.unformat(this,{rowId:$t.rows[j].id,colModel:$t.p.colModel[i]},i);
-								} catch (e) {
-									res[nm] = $.jgrid.htmlDecode($(this).html());
-								}
-							}
-						}
-					});
-					res.id = this.id;
-					ret.push(res);
-				}
-			});
-		});
-		return ret;
-	}
-/// end  cell editing
-});
-})(jQuery);
diff --git a/addons/base/static/lib/jquery.jqGrid/js/grid.common.js b/addons/base/static/lib/jquery.jqGrid/js/grid.common.js
deleted file mode 100644
index 5f0a4a3d589..00000000000
--- a/addons/base/static/lib/jquery.jqGrid/js/grid.common.js
+++ /dev/null
@@ -1,656 +0,0 @@
-;(function($){
-/*
- * jqGrid common function
- * Tony Tomov tony@trirand.com
- * http://trirand.com/blog/ 
- * Dual licensed under the MIT and GPL licenses:
- * http://www.opensource.org/licenses/mit-license.php
- * http://www.gnu.org/licenses/gpl-2.0.html
-*/
-/*global jQuery, $ */
-
-$.extend($.jgrid,{
-// Modal functions
-	showModal : function(h) {
-		h.w.show();
-	},
-	closeModal : function(h) {
-		h.w.hide().attr("aria-hidden","true");
-		if(h.o) { h.o.remove(); }
-	},
-	hideModal : function (selector,o) {
-		o = $.extend({jqm : true, gb :''}, o || {});
-		if(o.onClose) {
-			var oncret =  o.onClose(selector);
-			if (typeof oncret == 'boolean'  && !oncret ) { return; }
-		}
-		if ($.fn.jqm && o.jqm === true) {
-			$(selector).attr("aria-hidden","true").jqmHide();
-		} else {
-			if(o.gb !== '') {
-				try {$(".jqgrid-overlay:first",o.gb).hide();} catch (e){}
-			}
-			$(selector).hide().attr("aria-hidden","true");
-		}
-	},
-//Helper functions
-	findPos : function(obj) {
-		var curleft = 0, curtop = 0;
-		if (obj.offsetParent) {
-			do {
-				curleft += obj.offsetLeft;
-				curtop += obj.offsetTop;
-			} while (obj = obj.offsetParent);
-			//do not change obj == obj.offsetParent
-		}
-		return [curleft,curtop];
-	},
-	createModal : function(aIDs, content, p, insertSelector, posSelector, appendsel) {
-		var mw  = document.createElement('div'), rtlsup, self = this;
-		rtlsup = $(p.gbox).attr("dir") == "rtl" ? true : false;
-		mw.className= "ui-widget ui-widget-content ui-corner-all ui-jqdialog";
-		mw.id = aIDs.themodal;
-		var mh = document.createElement('div');
-		mh.className = "ui-jqdialog-titlebar ui-widget-header ui-corner-all ui-helper-clearfix";
-		mh.id = aIDs.modalhead;
-		$(mh).append("<span class='ui-jqdialog-title'>"+p.caption+"</span>");
-		var ahr= $("<a href='javascript:void(0)' class='ui-jqdialog-titlebar-close ui-corner-all'></a>")
-		.hover(function(){ahr.addClass('ui-state-hover');},
-			   function(){ahr.removeClass('ui-state-hover');})
-		.append("<span class='ui-icon ui-icon-closethick'></span>");
-		$(mh).append(ahr);
-		if(rtlsup) {
-			mw.dir = "rtl";
-			$(".ui-jqdialog-title",mh).css("float","right");
-			$(".ui-jqdialog-titlebar-close",mh).css("left",0.3+"em");
-		} else {
-			mw.dir = "ltr";
-			$(".ui-jqdialog-title",mh).css("float","left");
-			$(".ui-jqdialog-titlebar-close",mh).css("right",0.3+"em");
-		}
-		var mc = document.createElement('div');
-		$(mc).addClass("ui-jqdialog-content ui-widget-content").attr("id",aIDs.modalcontent);
-		$(mc).append(content);
-		mw.appendChild(mc);
-		$(mw).prepend(mh);
-		if(appendsel===true) { $('body').append(mw); } //append as first child in body -for alert dialog
-		else {$(mw).insertBefore(insertSelector);}
-		if(typeof p.jqModal === 'undefined') {p.jqModal = true;} // internal use
-		var coord = {};
-		if ( $.fn.jqm && p.jqModal === true) {
-			if(p.left ===0 && p.top===0) {
-				var pos = [];
-				pos = this.findPos(posSelector);
-				p.left = pos[0] + 4;
-				p.top = pos[1] + 4;
-			}
-			coord.top = p.top+"px";
-			coord.left = p.left;
-		} else if(p.left !==0 || p.top!==0) {
-			coord.left = p.left;
-			coord.top = p.top+"px";
-		}
-		$("a.ui-jqdialog-titlebar-close",mh).click(function(e){
-			var oncm = $("#"+aIDs.themodal).data("onClose") || p.onClose;
-			var gboxclose = $("#"+aIDs.themodal).data("gbox") || p.gbox;
-			self.hideModal("#"+aIDs.themodal,{gb:gboxclose,jqm:p.jqModal,onClose:oncm});
-			return false;
-		});
-		if (p.width === 0 || !p.width) {p.width = 300;}
-		if(p.height === 0 || !p.height) {p.height =200;}
-		if(!p.zIndex) {
-			var parentZ = $(insertSelector).parents("*[role=dialog]").first().css("z-index");
-			if(parentZ) {
-				p.zIndex = parseInt(parentZ,10)+1;
-			} else {
-				p.zIndex = 950;
-		}
-		}
-		var rtlt = 0;
-		if( rtlsup && coord.left && !appendsel) {
-			rtlt = $(p.gbox).width()- (!isNaN(p.width) ? parseInt(p.width,10) :0) - 8; // to do
-		// just in case
-			coord.left = parseInt(coord.left,10) + parseInt(rtlt,10);
-		}
-		if(coord.left) { coord.left += "px"; }
-		$(mw).css($.extend({
-			width: isNaN(p.width) ? "auto": p.width+"px",
-			height:isNaN(p.height) ? "auto" : p.height + "px",
-			zIndex:p.zIndex,
-			overflow: 'hidden'
-		},coord))
-		.attr({tabIndex: "-1","role":"dialog","aria-labelledby":aIDs.modalhead,"aria-hidden":"true"});
-		if(typeof p.drag == 'undefined') { p.drag=true;}
-		if(typeof p.resize == 'undefined') {p.resize=true;}
-		if (p.drag) {
-			$(mh).css('cursor','move');
-			if($.fn.jqDrag) {
-				$(mw).jqDrag(mh);
-			} else {
-				try {
-					$(mw).draggable({handle: $("#"+mh.id)});
-				} catch (e) {}
-			}
-		}
-		if(p.resize) {
-			if($.fn.jqResize) {
-				$(mw).append("<div class='jqResize ui-resizable-handle ui-resizable-se ui-icon ui-icon-gripsmall-diagonal-se ui-icon-grip-diagonal-se'></div>");
-				$("#"+aIDs.themodal).jqResize(".jqResize",aIDs.scrollelm ? "#"+aIDs.scrollelm : false);
-			} else {
-				try {
-					$(mw).resizable({handles: 'se, sw',alsoResize: aIDs.scrollelm ? "#"+aIDs.scrollelm : false});
-				} catch (r) {}
-			}
-		}
-		if(p.closeOnEscape === true){
-			$(mw).keydown( function( e ) {
-				if( e.which == 27 ) {
-					var cone = $("#"+aIDs.themodal).data("onClose") || p.onClose;
-					self.hideModal(this,{gb:p.gbox,jqm:p.jqModal,onClose: cone});
-				}
-			});
-		}
-	},
-	viewModal : function (selector,o){
-		o = $.extend({
-			toTop: true,
-			overlay: 10,
-			modal: false,
-			onShow: this.showModal,
-			onHide: this.closeModal,
-			gbox: '',
-			jqm : true,
-			jqM : true
-		}, o || {});
-		if ($.fn.jqm && o.jqm === true) {
-			if(o.jqM) { $(selector).attr("aria-hidden","false").jqm(o).jqmShow(); }
-			else {$(selector).attr("aria-hidden","false").jqmShow();}
-		} else {
-			if(o.gbox !== '') {
-				$(".jqgrid-overlay:first",o.gbox).show();
-				$(selector).data("gbox",o.gbox);
-			}
-			$(selector).show().attr("aria-hidden","false");
-			try{$(':input:visible',selector)[0].focus();}catch(_){}
-		}
-	},
-
-	info_dialog : function(caption, content,c_b, modalopt) {
-		var mopt = {
-			width:290,
-			height:'auto',
-			dataheight: 'auto',
-			drag: true,
-			resize: false,
-			caption:"<b>"+caption+"</b>",
-			left:250,
-			top:170,
-			zIndex : 1000,
-			jqModal : true,
-			modal : false,
-			closeOnEscape : true,
-			align: 'center',
-			buttonalign : 'center',
-			buttons : []
-		// {text:'textbutt', id:"buttid", onClick : function(){...}}
-		// if the id is not provided we set it like info_button_+ the index in the array - i.e info_button_0,info_button_1...
-		};
-		$.extend(mopt,modalopt || {});
-		var jm = mopt.jqModal, self = this;
-		if($.fn.jqm && !jm) { jm = false; }
-		// in case there is no jqModal
-		var buttstr ="";
-		if(mopt.buttons.length > 0) {
-			for(var i=0;i<mopt.buttons.length;i++) {
-				if(typeof mopt.buttons[i].id == "undefined") { mopt.buttons[i].id = "info_button_"+i; }
-				buttstr += "<a href='javascript:void(0)' id='"+mopt.buttons[i].id+"' class='fm-button ui-state-default ui-corner-all'>"+mopt.buttons[i].text+"</a>";
-			}
-		}
-		var dh = isNaN(mopt.dataheight) ? mopt.dataheight : mopt.dataheight+"px",
-		cn = "text-align:"+mopt.align+";";
-		var cnt = "<div id='info_id'>";
-		cnt += "<div id='infocnt' style='margin:0px;padding-bottom:1em;width:100%;overflow:auto;position:relative;height:"+dh+";"+cn+"'>"+content+"</div>";
-		cnt += c_b ? "<div class='ui-widget-content ui-helper-clearfix' style='text-align:"+mopt.buttonalign+";padding-bottom:0.8em;padding-top:0.5em;background-image: none;border-width: 1px 0 0 0;'><a href='javascript:void(0)' id='closedialog' class='fm-button ui-state-default ui-corner-all'>"+c_b+"</a>"+buttstr+"</div>" :
-			buttstr !== ""  ? "<div class='ui-widget-content ui-helper-clearfix' style='text-align:"+mopt.buttonalign+";padding-bottom:0.8em;padding-top:0.5em;background-image: none;border-width: 1px 0 0 0;'>"+buttstr+"</div>" : "";
-		cnt += "</div>";
-
-		try {
-			if($("#info_dialog").attr("aria-hidden") == "false") {
-				this.hideModal("#info_dialog",{jqm:jm});
-			}
-			$("#info_dialog").remove();
-		} catch (e){}
-		this.createModal({
-			themodal:'info_dialog',
-			modalhead:'info_head',
-			modalcontent:'info_content',
-			scrollelm: 'infocnt'},
-			cnt,
-			mopt,
-			'','',true
-		);
-		// attach onclick after inserting into the dom
-		if(buttstr) {
-			$.each(mopt.buttons,function(i){
-				$("#"+this.id,"#info_id").bind('click',function(){mopt.buttons[i].onClick.call($("#info_dialog")); return false;});
-			});
-		}
-		$("#closedialog", "#info_id").click(function(e){
-			self.hideModal("#info_dialog",{jqm:jm});
-			return false;
-		});
-		$(".fm-button","#info_dialog").hover(
-			function(){$(this).addClass('ui-state-hover');},
-			function(){$(this).removeClass('ui-state-hover');}
-		);
-		if($.isFunction(mopt.beforeOpen) ) { mopt.beforeOpen(); }
-		this.viewModal("#info_dialog",{
-			onHide: function(h) {
-				h.w.hide().remove();
-				if(h.o) { h.o.remove(); }
-			},
-			modal :mopt.modal,
-			jqm:jm
-		});
-		if($.isFunction(mopt.afterOpen) ) { mopt.afterOpen(); }
-		try{ $("#info_dialog").focus();} catch (m){}
-	},
-// Form Functions
-	createEl : function(eltype,options,vl,autowidth, ajaxso) {
-		var elem = "";
-		function bindEv (el, opt) {
-			if($.isFunction(opt.dataInit)) {
-				opt.dataInit(el);
-			}
-			if(opt.dataEvents) {
-				$.each(opt.dataEvents, function() {
-					if (this.data !== undefined) {
-						$(el).bind(this.type, this.data, this.fn);
-					} else {
-						$(el).bind(this.type, this.fn);
-					}
-				});
-			}
-			return opt;
-		}
-		function setAttributes(elm, atr) {
-			var exclude = ['dataInit','dataEvents', 'value','dataUrl', 'buildSelect'];
-			$.each(atr, function(key, value){
-				if($.inArray(key, exclude) === -1) {
-					$(elem).attr(key,value);
-				}
-			});
-		}
-		switch (eltype)
-		{
-			case "textarea" :
-				elem = document.createElement("textarea");
-				if(autowidth) {
-					if(!options.cols) { $(elem).css({width:"98%"});}
-				} else if (!options.cols) { options.cols = 20; }
-				if(!options.rows) { options.rows = 2; }
-				if(vl=='&nbsp;' || vl=='&#160;' || (vl.length==1 && vl.charCodeAt(0)==160)) {vl="";}
-				elem.value = vl;
-				setAttributes(elem, options);
-				options = bindEv(elem,options);
-				$(elem).attr({"role":"textbox","multiline":"true"});
-			break;
-			case "checkbox" : //what code for simple checkbox
-				elem = document.createElement("input");
-				elem.type = "checkbox";
-				if( !options.value ) {
-					var vl1 = vl.toLowerCase();
-					if(vl1.search(/(false|0|no|off|undefined)/i)<0 && vl1!=="") {
-						elem.checked=true;
-						elem.defaultChecked=true;
-						elem.value = vl;
-					} else {
-						elem.value = "on";
-					}
-					$(elem).attr("offval","off");
-				} else {
-					var cbval = options.value.split(":");
-					if(vl === cbval[0]) {
-						elem.checked=true;
-						elem.defaultChecked=true;
-					}
-					elem.value = cbval[0];
-					$(elem).attr("offval",cbval[1]);
-				}
-				setAttributes(elem, options);
-				options = bindEv(elem,options);
-				$(elem).attr("role","checkbox");
-			break;
-			case "select" :
-				elem = document.createElement("select");
-				elem.setAttribute("role","select");
-				var msl, ovm = [];
-				if(options.multiple===true) {
-					msl = true;
-					elem.multiple="multiple";
-					$(elem).attr("aria-multiselectable","true");
-				} else { msl = false; }
-				if(typeof(options.dataUrl) != "undefined") {
-					$.ajax($.extend({
-						url: options.dataUrl,
-						type : "GET",
-						dataType: "html",
-						success: function(data,status){
-							var a;
-							if(typeof(options.buildSelect) != "undefined") {
-								var b = options.buildSelect(data);
-								a = $(b).html();
-							} else {
-								a = $(data).html();
-							}
-							if(a) {
-								$(elem).append(a);
-								setAttributes(elem, options);
-								options = bindEv(elem,options);
-								if(typeof options.size === 'undefined') { options.size =  msl ? 3 : 1;}
-								if(msl) {
-									ovm = vl.split(",");
-									ovm = $.map(ovm,function(n){return $.trim(n);});
-								} else {
-									ovm[0] = $.trim(vl);
-								}
-								//$(elem).attr(options);
-								setTimeout(function(){
-									$("option",elem).each(function(i){
-										//if(i===0) { this.selected = ""; }
-										$(this).attr("role","option");
-										if($.inArray($.trim($(this).text()),ovm) > -1 || $.inArray($.trim($(this).val()),ovm) > -1 ) {
-											this.selected= "selected";
-											if(!msl) { return false; }
-										}
-									});
-								},0);
-							}
-						}
-					},ajaxso || {}));
-				} else if(options.value) {
-					var i;
-					if(msl) {
-						ovm = vl.split(",");
-						ovm = $.map(ovm,function(n){return $.trim(n);});
-						if(typeof options.size === 'undefined') {options.size = 3;}
-					} else {
-						options.size = 1;
-					}
-					if(typeof options.value === 'function') { options.value = options.value(); }
-					var so,sv, ov;
-					if(typeof options.value === 'string') {
-						so = options.value.split(";");
-						for(i=0; i<so.length;i++){
-							sv = so[i].split(":");
-							if(sv.length > 2 ) {
-								sv[1] = $.map(sv,function(n,i){if(i>0) { return n;} }).join(":");
-							}
-							ov = document.createElement("option");
-							ov.setAttribute("role","option");
-							ov.value = sv[0]; ov.innerHTML = sv[1];
-							if (!msl &&  ($.trim(sv[0]) == $.trim(vl) || $.trim(sv[1]) == $.trim(vl))) { ov.selected ="selected"; }
-							if (msl && ($.inArray($.trim(sv[1]), ovm)>-1 || $.inArray($.trim(sv[0]), ovm)>-1)) {ov.selected ="selected";}
-							elem.appendChild(ov);
-						}
-					} else if (typeof options.value === 'object') {
-						var oSv = options.value;
-						for ( var key in oSv) {
-							if (oSv.hasOwnProperty(key ) ){
-								ov = document.createElement("option");
-								ov.setAttribute("role","option");
-								ov.value = key; ov.innerHTML = oSv[key];
-								if (!msl &&  ( $.trim(key) == $.trim(vl) || $.trim(oSv[key]) == $.trim(vl)) ) { ov.selected ="selected"; }
-								if (msl && ($.inArray($.trim(oSv[key]),ovm)>-1 || $.inArray($.trim(key),ovm)>-1)) { ov.selected ="selected"; }
-								elem.appendChild(ov);
-							}
-						}
-					}
-					setAttributes(elem, options);
-					options = bindEv(elem,options);
-				}
-			break;
-			case "text" :
-			case "password" :
-			case "button" :
-				var role;
-				if(eltype=="button") { role = "button"; }
-				else { role = "textbox"; }
-				elem = document.createElement("input");
-				elem.type = eltype;
-				elem.value = vl;
-				setAttributes(elem, options);
-				options = bindEv(elem,options);
-				if(eltype != "button"){
-					if(autowidth) {
-						if(!options.size) { $(elem).css({width:"98%"}); }
-					} else if (!options.size) { options.size = 20; }
-				}
-				$(elem).attr("role",role);
-			break;
-			case "image" :
-			case "file" :
-				elem = document.createElement("input");
-				elem.type = eltype;
-				setAttributes(elem, options);
-				options = bindEv(elem,options);
-				break;
-			case "custom" :
-				elem = document.createElement("span");
-				try {
-					if($.isFunction(options.custom_element)) {
-						var celm = options.custom_element.call(this,vl,options);
-						if(celm) {
-							celm = $(celm).addClass("customelement").attr({id:options.id,name:options.name});
-							$(elem).empty().append(celm);
-						} else {
-							throw "e2";
-						}
-					} else {
-						throw "e1";
-					}
-				} catch (e) {
-					if (e=="e1") { this.info_dialog($.jgrid.errors.errcap,"function 'custom_element' "+$.jgrid.edit.msg.nodefined, $.jgrid.edit.bClose);}
-					if (e=="e2") { this.info_dialog($.jgrid.errors.errcap,"function 'custom_element' "+$.jgrid.edit.msg.novalue,$.jgrid.edit.bClose);}
-					else { this.info_dialog($.jgrid.errors.errcap,typeof(e)==="string"?e:e.message,$.jgrid.edit.bClose); }
-				}
-			break;
-		}
-		return elem;
-	},
-// Date Validation Javascript
-	checkDate : function (format, date) {
-		var daysInFebruary = function(year){
-		// February has 29 days in any year evenly divisible by four,
-		// EXCEPT for centurial years which are not also divisible by 400.
-			return (((year % 4 === 0) && ( year % 100 !== 0 || (year % 400 === 0))) ? 29 : 28 );
-		},
-		DaysArray = function(n) {
-			for (var i = 1; i <= n; i++) {
-				this[i] = 31;
-				if (i==4 || i==6 || i==9 || i==11) {this[i] = 30;}
-				if (i==2) {this[i] = 29;}
-			}
-			return this;
-		};
-
-		var tsp = {}, sep;
-		format = format.toLowerCase();
-		//we search for /,-,. for the date separator
-		if(format.indexOf("/") != -1) {
-			sep = "/";
-		} else if(format.indexOf("-") != -1) {
-			sep = "-";
-		} else if(format.indexOf(".") != -1) {
-			sep = ".";
-		} else {
-			sep = "/";
-		}
-		format = format.split(sep);
-		date = date.split(sep);
-		if (date.length != 3) { return false; }
-		var j=-1,yln, dln=-1, mln=-1;
-		for(var i=0;i<format.length;i++){
-			var dv =  isNaN(date[i]) ? 0 : parseInt(date[i],10);
-			tsp[format[i]] = dv;
-			yln = format[i];
-			if(yln.indexOf("y") != -1) { j=i; }
-			if(yln.indexOf("m") != -1) { mln=i; }
-			if(yln.indexOf("d") != -1) { dln=i; }
-		}
-		if (format[j] == "y" || format[j] == "yyyy") {
-			yln=4;
-		} else if(format[j] =="yy"){
-			yln = 2;
-		} else {
-			yln = -1;
-		}
-		var daysInMonth = DaysArray(12),
-		strDate;
-		if (j === -1) {
-			return false;
-		} else {
-			strDate = tsp[format[j]].toString();
-			if(yln == 2 && strDate.length == 1) {yln = 1;}
-			if (strDate.length != yln || (tsp[format[j]]===0 && date[j]!="00")){
-				return false;
-			}
-		}
-		if(mln === -1) {
-			return false;
-		} else {
-			strDate = tsp[format[mln]].toString();
-			if (strDate.length<1 || tsp[format[mln]]<1 || tsp[format[mln]]>12){
-				return false;
-			}
-		}
-		if(dln === -1) {
-			return false;
-		} else {
-			strDate = tsp[format[dln]].toString();
-			if (strDate.length<1 || tsp[format[dln]]<1 || tsp[format[dln]]>31 || (tsp[format[mln]]==2 && tsp[format[dln]]>daysInFebruary(tsp[format[j]])) || tsp[format[dln]] > daysInMonth[tsp[format[mln]]]){
-				return false;
-			}
-		}
-		return true;
-	},
-	isEmpty : function(val)
-	{
-		if (val.match(/^\s+$/) || val === "")	{
-			return true;
-		} else {
-			return false;
-		}
-	},
-	checkTime : function(time){
-	// checks only hh:ss (and optional am/pm)
-		var re = /^(\d{1,2}):(\d{2})([ap]m)?$/,regs;
-		if(!this.isEmpty(time))
-		{
-			regs = time.match(re);
-			if(regs) {
-				if(regs[3]) {
-					if(regs[1] < 1 || regs[1] > 12) { return false; }
-				} else {
-					if(regs[1] > 23) { return false; }
-				}
-				if(regs[2] > 59) {
-					return false;
-				}
-			} else {
-				return false;
-			}
-		}
-		return true;
-	},
-	checkValues : function(val, valref,g, customobject, nam) {
-		var edtrul,i, nm, dft, len;
-		if(typeof(customobject) === "undefined") {
-			if(typeof(valref)=='string'){
-				for( i =0, len=g.p.colModel.length;i<len; i++){
-					if(g.p.colModel[i].name==valref) {
-						edtrul = g.p.colModel[i].editrules;
-						valref = i;
-						try { nm = g.p.colModel[i].formoptions.label; } catch (e) {}
-						break;
-					}
-				}
-			} else if(valref >=0) {
-				edtrul = g.p.colModel[valref].editrules;
-			}
-		} else {
-			edtrul = customobject;
-			nm = nam===undefined ? "_" : nam;
-		}
-		if(edtrul) {
-			if(!nm) { nm = g.p.colNames[valref]; }
-			if(edtrul.required === true) {
-				if( this.isEmpty(val) )  { return [false,nm+": "+$.jgrid.edit.msg.required,""]; }
-			}
-			// force required
-			var rqfield = edtrul.required === false ? false : true;
-			if(edtrul.number === true) {
-				if( !(rqfield === false && this.isEmpty(val)) ) {
-					if(isNaN(val)) { return [false,nm+": "+$.jgrid.edit.msg.number,""]; }
-				}
-			}
-			if(typeof edtrul.minValue != 'undefined' && !isNaN(edtrul.minValue)) {
-				if (parseFloat(val) < parseFloat(edtrul.minValue) ) { return [false,nm+": "+$.jgrid.edit.msg.minValue+" "+edtrul.minValue,""];}
-			}
-			if(typeof edtrul.maxValue != 'undefined' && !isNaN(edtrul.maxValue)) {
-				if (parseFloat(val) > parseFloat(edtrul.maxValue) ) { return [false,nm+": "+$.jgrid.edit.msg.maxValue+" "+edtrul.maxValue,""];}
-			}
-			var filter;
-			if(edtrul.email === true) {
-				if( !(rqfield === false && this.isEmpty(val)) ) {
-				// taken from $ Validate plugin
-					filter = /^((([a-z]|\d|[!#\$%&'\*\+\-\/=\?\^_`{\|}~]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])+(\.([a-z]|\d|[!#\$%&'\*\+\-\/=\?\^_`{\|}~]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])+)*)|((\x22)((((\x20|\x09)*(\x0d\x0a))?(\x20|\x09)+)?(([\x01-\x08\x0b\x0c\x0e-\x1f\x7f]|\x21|[\x23-\x5b]|[\x5d-\x7e]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(\\([\x01-\x09\x0b\x0c\x0d-\x7f]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF]))))*(((\x20|\x09)*(\x0d\x0a))?(\x20|\x09)+)?(\x22)))@((([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))\.)+(([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))\.?$/i;
-					if(!filter.test(val)) {return [false,nm+": "+$.jgrid.edit.msg.email,""];}
-				}
-			}
-			if(edtrul.integer === true) {
-				if( !(rqfield === false && this.isEmpty(val)) ) {
-					if(isNaN(val)) { return [false,nm+": "+$.jgrid.edit.msg.integer,""]; }
-					if ((val % 1 !== 0) || (val.indexOf('.') != -1)) { return [false,nm+": "+$.jgrid.edit.msg.integer,""];}
-				}
-			}
-			if(edtrul.date === true) {
-				if( !(rqfield === false && this.isEmpty(val)) ) {
-					if(g.p.colModel[valref].formatoptions && g.p.colModel[valref].formatoptions.newformat) {
-						dft = g.p.colModel[valref].formatoptions.newformat;
-					} else {
-						dft = g.p.colModel[valref].datefmt || "Y-m-d";
-					}
-					if(!this.checkDate (dft, val)) { return [false,nm+": "+$.jgrid.edit.msg.date+" - "+dft,""]; }
-				}
-			}
-			if(edtrul.time === true) {
-				if( !(rqfield === false && this.isEmpty(val)) ) {
-					if(!this.checkTime (val)) { return [false,nm+": "+$.jgrid.edit.msg.date+" - hh:mm (am/pm)",""]; }
-				}
-			}
-			if(edtrul.url === true) {
-				if( !(rqfield === false && this.isEmpty(val)) ) {
-					filter = /^(((https?)|(ftp)):\/\/([\-\w]+\.)+\w{2,3}(\/[%\-\w]+(\.\w{2,})?)*(([\w\-\.\?\\\/+@&#;`~=%!]*)(\.\w{2,})?)*\/?)/i;
-					if(!filter.test(val)) {return [false,nm+": "+$.jgrid.edit.msg.url,""];}
-				}
-			}
-			if(edtrul.custom === true) {
-				if( !(rqfield === false && this.isEmpty(val)) ) {
-					if($.isFunction(edtrul.custom_func)) {
-						var ret = edtrul.custom_func.call(g,val,nm);
-						if($.isArray(ret)) {
-							return ret;
-						} else {
-							return [false,$.jgrid.edit.msg.customarray,""];
-						}
-					} else {
-						return [false,$.jgrid.edit.msg.customfcheck,""];
-					}
-				}
-			}
-		}
-		return [true,"",""];
-	}
-});
-})(jQuery);
\ No newline at end of file
diff --git a/addons/base/static/lib/jquery.jqGrid/js/grid.custom.js b/addons/base/static/lib/jquery.jqGrid/js/grid.custom.js
deleted file mode 100644
index 0640f21c30b..00000000000
--- a/addons/base/static/lib/jquery.jqGrid/js/grid.custom.js
+++ /dev/null
@@ -1,440 +0,0 @@
-(function($){
-/**
- * jqGrid extension for custom methods
- * Tony Tomov tony@trirand.com
- * http://trirand.com/blog/ 
- * Dual licensed under the MIT and GPL licenses:
- * http://www.opensource.org/licenses/mit-license.php
- * http://www.gnu.org/licenses/gpl-2.0.html
-**/
-/*global jQuery, $ */
-
-$.jgrid.extend({
-	getColProp : function(colname){
-		var ret ={}, $t = this[0];
-		if ( !$t.grid ) { return false; }
-		var cM = $t.p.colModel;
-		for ( var i =0;i<cM.length;i++ ) {
-			if ( cM[i].name == colname ) {
-				ret = cM[i];
-				break;
-			}
-		}
-		return ret;
-	},
-	setColProp : function(colname, obj){
-		//do not set width will not work
-		return this.each(function(){
-			if ( this.grid ) {
-				if ( obj ) {
-					var cM = this.p.colModel;
-					for ( var i =0;i<cM.length;i++ ) {
-						if ( cM[i].name == colname ) {
-							$.extend(this.p.colModel[i],obj);
-							break;
-						}
-					}
-				}
-			}
-		});
-	},
-	sortGrid : function(colname,reload, sor){
-		return this.each(function(){
-			var $t=this,idx=-1;
-			if ( !$t.grid ) { return;}
-			if ( !colname ) { colname = $t.p.sortname; }
-			for ( var i=0;i<$t.p.colModel.length;i++ ) {
-				if ( $t.p.colModel[i].index == colname || $t.p.colModel[i].name==colname ) {
-					idx = i;
-					break;
-				}
-			}
-			if ( idx!=-1 ){
-				var sort = $t.p.colModel[idx].sortable;
-				if ( typeof sort !== 'boolean' ) { sort =  true; }
-				if ( typeof reload !=='boolean' ) { reload = false; }
-				if ( sort ) { $t.sortData("jqgh_"+colname, idx, reload, sor); }
-			}
-		});
-	},
-	GridDestroy : function () {
-		return this.each(function(){
-			if ( this.grid ) { 
-				if ( this.p.pager ) { // if not part of grid
-					$(this.p.pager).remove();
-				}
-				var gid = this.id;
-				try {
-					$("#gbox_"+gid).remove();
-				} catch (_) {}
-			}
-		});
-	},
-	GridUnload : function(){
-		return this.each(function(){
-			if ( !this.grid ) {return;}
-			var defgrid = {id: $(this).attr('id'),cl: $(this).attr('class')};
-			if (this.p.pager) {
-				$(this.p.pager).empty().removeClass("ui-state-default ui-jqgrid-pager corner-bottom");
-			}
-			var newtable = document.createElement('table');
-			$(newtable).attr({id:defgrid.id});
-			newtable.className = defgrid.cl;
-			var gid = this.id;
-			$(newtable).removeClass("ui-jqgrid-btable");
-			if( $(this.p.pager).parents("#gbox_"+gid).length === 1 ) {
-				$(newtable).insertBefore("#gbox_"+gid).show();
-				$(this.p.pager).insertBefore("#gbox_"+gid);
-			} else {
-				$(newtable).insertBefore("#gbox_"+gid).show();
-			}
-			$("#gbox_"+gid).remove();
-		});
-	},
-    setGridState : function(state) {
-		return this.each(function(){
-			if ( !this.grid ) {return;}
-            var $t = this;
-            if(state == 'hidden'){
-				$(".ui-jqgrid-bdiv, .ui-jqgrid-hdiv","#gview_"+$t.p.id).slideUp("fast");
-				if($t.p.pager) {$($t.p.pager).slideUp("fast");}
-				if($t.p.toppager) {$($t.p.toppager).slideUp("fast");}
-				if($t.p.toolbar[0]===true) {
-					if( $t.p.toolbar[1]=='both') {
-						$($t.grid.ubDiv).slideUp("fast");
-					}
-					$($t.grid.uDiv).slideUp("fast");
-				}
-				if($t.p.footerrow) { $(".ui-jqgrid-sdiv","#gbox_"+$t.p.id).slideUp("fast"); }
-				$(".ui-jqgrid-titlebar-close span",$t.grid.cDiv).removeClass("ui-icon-circle-triangle-n").addClass("ui-icon-circle-triangle-s");
-				$t.p.gridstate = 'hidden';
-            } else if(state=='visible') {
-				$(".ui-jqgrid-hdiv, .ui-jqgrid-bdiv","#gview_"+$t.p.id).slideDown("fast");
-				if($t.p.pager) {$($t.p.pager).slideDown("fast");}
-				if($t.p.toppager) {$($t.p.toppager).slideDown("fast");}
-				if($t.p.toolbar[0]===true) {
-					if( $t.p.toolbar[1]=='both') {
-						$($t.grid.ubDiv).slideDown("fast");
-					}
-					$($t.grid.uDiv).slideDown("fast");
-				}
-				if($t.p.footerrow) { $(".ui-jqgrid-sdiv","#gbox_"+$t.p.id).slideDown("fast"); }
-				$(".ui-jqgrid-titlebar-close span",$t.grid.cDiv).removeClass("ui-icon-circle-triangle-s").addClass("ui-icon-circle-triangle-n");
-				$t.p.gridstate = 'visible';
-			}
-
-		});
-	},
-	filterToolbar : function(p){
-		p = $.extend({
-			autosearch: true,
-			searchOnEnter : true,
-			beforeSearch: null,
-			afterSearch: null,
-			beforeClear: null,
-			afterClear: null,
-			searchurl : '',
-			stringResult: false,
-			groupOp: 'AND',
-			defaultSearch : "bw"
-		},p  || {});
-		return this.each(function(){
-			var $t = this;
-			if(this.ftoolbar) { return; }
-			var triggerToolbar = function() {
-				var sdata={}, j=0, v, nm, sopt={},so;
-				$.each($t.p.colModel,function(i,n){
-					nm = this.index || this.name;
-					switch (this.stype) {
-						case 'select' :
-							so  = (this.searchoptions && this.searchoptions.sopt) ? this.searchoptions.sopt[0] : 'eq';
-							v = $("select[name="+nm+"]",$t.grid.hDiv).val();
-							if(v) {
-								sdata[nm] = v;
-								sopt[nm] = so;
-								j++;
-							} else {
-								try {
-									delete $t.p.postData[nm];
-								} catch (e) {}
-							}
-							break;
-						case 'text':
-							so  = (this.searchoptions && this.searchoptions.sopt) ? this.searchoptions.sopt[0] : p.defaultSearch;
-							v = $("input[name="+nm+"]",$t.grid.hDiv).val();
-							if(v) {
-								sdata[nm] = v;
-								sopt[nm] = so;
-								j++;
-							} else {
-								try {
-									delete $t.p.postData[nm];
-								} catch (z) {}
-							}
-							break;
-					}
-				});
-				var sd =  j>0 ? true : false;
-				if(p.stringResult === true || $t.p.datatype == "local") {
-					var ruleGroup = "{\"groupOp\":\"" + p.groupOp + "\",\"rules\":[";
-					var gi=0;
-					$.each(sdata,function(i,n){
-						if (gi > 0) {ruleGroup += ",";}
-						ruleGroup += "{\"field\":\"" + i + "\",";
-						ruleGroup += "\"op\":\"" + sopt[i] + "\",";
-						n+="";
-						ruleGroup += "\"data\":\"" + n.replace(/\\/g,'\\\\').replace(/\"/g,'\\"') + "\"}";
-						gi++;
-					});
-					ruleGroup += "]}";
-					$.extend($t.p.postData,{filters:ruleGroup});
-					$.each(['searchField', 'searchString', 'searchOper'], function(i, n){
-						if($t.p.postData.hasOwnProperty(n)) { delete $t.p.postData[n];}
-					});
-				} else {
-					$.extend($t.p.postData,sdata);
-				}
-				var saveurl;
-				if($t.p.searchurl) {
-					saveurl = $t.p.url;
-					$($t).jqGrid("setGridParam",{url:$t.p.searchurl});
-				}
-				var bsr = false;
-				if($.isFunction(p.beforeSearch)){bsr = p.beforeSearch.call($t);}
-				if(!bsr) { $($t).jqGrid("setGridParam",{search:sd}).trigger("reloadGrid",[{page:1}]); }
-				if(saveurl) {$($t).jqGrid("setGridParam",{url:saveurl});}
-				if($.isFunction(p.afterSearch)){p.afterSearch();}
-			};
-			var clearToolbar = function(trigger){
-				var sdata={}, v, j=0, nm;
-				trigger = (typeof trigger != 'boolean') ? true : trigger;
-				$.each($t.p.colModel,function(i,n){
-					v = (this.searchoptions && this.searchoptions.defaultValue) ? this.searchoptions.defaultValue : "";
-					nm = this.index || this.name;
-					switch (this.stype) {
-						case 'select' :
-							var v1;
-							$("select[name="+nm+"] option",$t.grid.hDiv).each(function (i){
-								if(i===0) { this.selected = true; }
-								if ($(this).text() == v) {
-									this.selected = true;
-									v1 = $(this).val();
-									return false;
-								}
-							});
-							if (v1) {
-								// post the key and not the text
-								sdata[nm] = v1;
-								j++;
-							} else {
-								try {
-									delete $t.p.postData[nm];
-								} catch(e) {}
-							}
-							break;
-						case 'text':
-							$("input[name="+nm+"]",$t.grid.hDiv).val(v);
-							if(v) {
-								sdata[nm] = v;
-								j++;
-							} else {
-								try {
-									delete $t.p.postData[nm];
-								} catch (y){}
-							}
-							break;
-					}
-				});
-				var sd =  j>0 ? true : false;
-				if(p.stringResult === true || $t.p.datatype == "local") {
-					var ruleGroup = "{\"groupOp\":\"" + p.groupOp + "\",\"rules\":[";
-					var gi=0;
-					$.each(sdata,function(i,n){
-						if (gi > 0) {ruleGroup += ",";}
-						ruleGroup += "{\"field\":\"" + i + "\",";
-						ruleGroup += "\"op\":\"" + "eq" + "\",";
-						n+="";
-						ruleGroup += "\"data\":\"" + n.replace(/\\/g,'\\\\').replace(/\"/g,'\\"') + "\"}";
-						gi++;
-					});
-					ruleGroup += "]}";
-					$.extend($t.p.postData,{filters:ruleGroup});
-					$.each(['searchField', 'searchString', 'searchOper'], function(i, n){
-						if($t.p.postData.hasOwnProperty(n)) { delete $t.p.postData[n];}
-					});
-				} else {
-					$.extend($t.p.postData,sdata);
-				}
-				var saveurl;
-				if($t.p.searchurl) {
-					saveurl = $t.p.url;
-					$($t).jqGrid("setGridParam",{url:$t.p.searchurl});
-				}
-				var bcv = false;
-				if($.isFunction(p.beforeClear)){bcv = p.beforeClear.call($t);}
-				if(!bcv) {
-					if(trigger) {
-						$($t).jqGrid("setGridParam",{search:sd}).trigger("reloadGrid",[{page:1}]);
-					}
-				}
-				if(saveurl) {$($t).jqGrid("setGridParam",{url:saveurl});}
-				if($.isFunction(p.afterClear)){p.afterClear();}
-			};
-			var toggleToolbar = function(){
-				var trow = $("tr.ui-search-toolbar",$t.grid.hDiv);
-				if(trow.css("display")=='none') { trow.show(); }
-				else { trow.hide(); }
-			};
-			// create the row
-			function bindEvents(selector, events) {
-				var jElem = $(selector);
-				if (jElem[0]) {
-				    jQuery.each(events, function() {
-				        if (this.data !== undefined) {
-				            jElem.bind(this.type, this.data, this.fn);
-				        } else {
-				            jElem.bind(this.type, this.fn);
-				        }
-				    });
-				}
-			}
-			var tr = $("<tr class='ui-search-toolbar' role='rowheader'></tr>");
-			var timeoutHnd;
-			$.each($t.p.colModel,function(i,n){
-				var cm=this, thd , th, soptions,surl,self;
-				th = $("<th role='columnheader' class='ui-state-default ui-th-column ui-th-"+$t.p.direction+"'></th>");
-				thd = $("<div style='width:100%;position:relative;height:100%;padding-right:0.3em;'></div>");
-				if(this.hidden===true) { $(th).css("display","none");}
-				this.search = this.search === false ? false : true;
-				if(typeof this.stype == 'undefined' ) {this.stype='text';}
-				soptions = $.extend({},this.searchoptions || {});
-				if(this.search){
-					switch (this.stype)
-					{
-					case "select":
-						surl = this.surl || soptions.dataUrl;
-						if(surl) {
-							// data returned should have already constructed html select
-							// primitive jQuery load
-							self = thd;
-							$.ajax($.extend({
-								url: surl,
-								dataType: "html",
-								complete: function(res,status) {
-									if(soptions.buildSelect !== undefined) {
-										var d = soptions.buildSelect(res);
-										if (d) { $(self).append(d); }
-									} else {
-										$(self).append(res.responseText);
-									}
-									if(soptions.defaultValue) { $("select",self).val(soptions.defaultValue); }
-									$("select",self).attr({name:cm.index || cm.name, id: "gs_"+cm.name});
-									if(soptions.attr) {$("select",self).attr(soptions.attr);}
-									$("select",self).css({width: "100%"});
-									// preserve autoserch
-									if(soptions.dataInit !== undefined) { soptions.dataInit($("select",self)[0]); }
-									if(soptions.dataEvents !== undefined) { bindEvents($("select",self)[0],soptions.dataEvents); }
-									if(p.autosearch===true){
-										$("select",self).change(function(e){
-											triggerToolbar();
-											return false;
-										});
-									}
-									res=null;
-								}
-							}, $.jgrid.ajaxOptions, $t.p.ajaxSelectOptions || {} ));
-						} else {
-							var oSv;
-							if(cm.searchoptions && cm.searchoptions.value) {
-								oSv = cm.searchoptions.value;
-							} else if(cm.editoptions && cm.editoptions.value) {
-								oSv = cm.editoptions.value;
-							}
-							if (oSv) {	
-								var elem = document.createElement("select");
-								elem.style.width = "100%";
-								$(elem).attr({name:cm.index || cm.name, id: "gs_"+cm.name});
-								var so, sv, ov;
-								if(typeof oSv === "string") {
-									so = oSv.split(";");
-									for(var k=0; k<so.length;k++){
-										sv = so[k].split(":");
-										ov = document.createElement("option");
-										ov.value = sv[0]; ov.innerHTML = sv[1];
-										elem.appendChild(ov);
-									}
-								} else if(typeof oSv === "object" ) {
-									for ( var key in oSv) {
-										if(oSv.hasOwnProperty(key)) {
-											ov = document.createElement("option");
-											ov.value = key; ov.innerHTML = oSv[key];
-											elem.appendChild(ov);
-										}
-									}
-								}
-								if(soptions.defaultValue) { $(elem).val(soptions.defaultValue); }
-								if(soptions.attr) {$(elem).attr(soptions.attr);}
-								if(soptions.dataInit !== undefined) { soptions.dataInit(elem); }
-								if(soptions.dataEvents !== undefined) { bindEvents(elem, soptions.dataEvents); }
-								$(thd).append(elem);
-								if(p.autosearch===true){
-									$(elem).change(function(e){
-										triggerToolbar();
-										return false;
-									});
-								}
-							}
-						}
-						break;
-					case 'text':
-						var df = soptions.defaultValue ? soptions.defaultValue: "";
-						$(thd).append("<input type='text' style='width:95%;padding:0px;' name='"+(cm.index || cm.name)+"' id='gs_"+cm.name+"' value='"+df+"'/>");
-						if(soptions.attr) {$("input",thd).attr(soptions.attr);}
-						if(soptions.dataInit !== undefined) { soptions.dataInit($("input",thd)[0]); }
-						if(soptions.dataEvents !== undefined) { bindEvents($("input",thd)[0], soptions.dataEvents); }
-						if(p.autosearch===true){
-							if(p.searchOnEnter) {
-								$("input",thd).keypress(function(e){
-									var key = e.charCode ? e.charCode : e.keyCode ? e.keyCode : 0;
-									if(key == 13){
-										triggerToolbar();
-										return false;
-									}
-									return this;
-								});
-							} else {
-								$("input",thd).keydown(function(e){
-									var key = e.which;
-									switch (key) {
-										case 13:
-											return false;
-										case 9 :
-										case 16:
-										case 37:
-										case 38:
-										case 39:
-										case 40:
-										case 27:
-											break;
-										default :
-											if(timeoutHnd) { clearTimeout(timeoutHnd); }
-											timeoutHnd = setTimeout(function(){triggerToolbar();},500);
-									}
-								});
-							}
-						}
-						break;
-					}
-				}
-				$(th).append(thd);
-				$(tr).append(th);
-			});
-			$("table thead",$t.grid.hDiv).append(tr);
-			this.ftoolbar = true;
-			this.triggerToolbar = triggerToolbar;
-			this.clearToolbar = clearToolbar;
-			this.toggleToolbar = toggleToolbar;
-		});
-	}
-});
-})(jQuery);
\ No newline at end of file
diff --git a/addons/base/static/lib/jquery.jqGrid/js/grid.filter.js b/addons/base/static/lib/jquery.jqGrid/js/grid.filter.js
deleted file mode 100644
index c0c9d07c240..00000000000
--- a/addons/base/static/lib/jquery.jqGrid/js/grid.filter.js
+++ /dev/null
@@ -1,675 +0,0 @@
-/*
- * jqFilter  jQuery jqGrid filter addon.
- * Copyright (c) 2011, Tony Tomov, tony@trirand.com
- * Dual licensed under the MIT and GPL licenses
- * http://www.opensource.org/licenses/mit-license.php
- * http://www.gnu.org/licenses/gpl-2.0.html
- * 
- * The work is inspired from this Stefan Pirvu
- * http://www.codeproject.com/KB/scripting/json-filtering.aspx
- *
- * The filter uses JSON entities to hold filter rules and groups. Here is an example of a filter:
-
-{ "groupOp": "AND",
-      "groups" : [ 
-        { "groupOp": "OR",
-            "rules": [
-                { "field": "name", "op": "eq", "data": "England" }, 
-                { "field": "id", "op": "le", "data": "5"}
-             ]
-        } 
-      ],
-      "rules": [
-        { "field": "name", "op": "eq", "data": "Romania" }, 
-        { "field": "id", "op": "le", "data": "1"}
-      ]
-}
-*/
-/*global jQuery, $ */
-
-(function ($) {
-
-$.fn.jqFilter = function( arg ) {
-	if (typeof arg === 'string') {
-		
-		var fn = $.fn.jqFilter[arg];
-		if (!fn) {
-			throw ("jqFilter - No such method: " + arg);
-		}
-		var args = $.makeArray(arguments).slice(1);
-		return fn.apply(this,args);
-	}
-
-	var p = $.extend(true,{
-		filter: null,
-		columns: [],
-		onChange : null,
-		checkValues : null,
-		error: false,
-		errmsg : "",
-		errorcheck : true,
-		showQuery : true,
-		sopt : null,
-		ops : [
-			{"name": "eq", "description": "equal", "operator":"="},
-			{"name": "ne", "description": "not equal", "operator":"<>"},
-			{"name": "lt", "description": "less", "operator":"<"},
-			{"name": "le", "description": "less or equal","operator":"<="},
-			{"name": "gt", "description": "greater", "operator":">"},
-			{"name": "ge", "description": "greater or equal", "operator":">="},
-			{"name": "bw", "description": "begins with", "operator":"LIKE"},
-			{"name": "bn", "description": "does not begin with", "operator":"NOT LIKE"},
-			{"name": "in", "description": "in", "operator":"IN"},
-			{"name": "ni", "description": "not in", "operator":"NOT IN"},
-			{"name": "ew", "description": "ends with", "operator":"LIKE"},
-			{"name": "en", "description": "does not end with", "operator":"NOT LIKE"},
-			{"name": "cn", "description": "contains", "operator":"LIKE"},
-			{"name": "nc", "description": "does not contain", "operator":"NOT LIKE"},
-			{"name": "nu", "description": "is null", "operator":"IS NULL"},
-			{"name": "nn", "description": "is not null", "operator":"IS NOT NULL"}
-		],
-		numopts : ['eq','ne', 'lt', 'le', 'gt', 'ge', 'nu', 'nn', 'in', 'ni'],
-		stropts : ['eq', 'ne', 'bw', 'bn', 'ew', 'en', 'cn', 'nc', 'nu', 'nn', 'in', 'ni'],
-		_gridsopt : [], // grid translated strings, do not tuch
-		groupOps : ["AND", "OR"],
-		groupButton : true
-	}, arg || {});
-	return this.each( function() {
-		if (this.filter) {return;}
-		this.p = p;
-		// setup filter in case if they is not defined
-		if (this.p.filter === null || this.p.filter === undefined) {
-			this.p.filter = {
-				groupOp: this.p.groupOps[0],
-				rules: [],
-				groups: []
-			};
-		}
-		var i, len = this.p.columns.length, cl;
-
-		// translating the options
-		if(this.p._gridsopt.length) {
-			// ['eq','ne','lt','le','gt','ge','bw','bn','in','ni','ew','en','cn','nc']
-			for(i=0;i<this.p._gridsopt.length;i++) {
-				this.p.ops[i].description = this.p._gridsopt[i];
-			}
-		}
-		this.p.initFilter = $.extend(true,{},this.p.filter);
-
-		// set default values for the columns if they are not set
-		if( !len ) {return;}
-		for(i=0; i < len; i++) {
-			cl = this.p.columns[i];
-			if( cl.stype ) {
-				// grid compatibility
-				cl.inputtype = cl.stype;
-			} else if(!cl.inputtype) {
-				cl.inputtype = 'text';
-			}
-			if( cl.sorttype ) {
-				// grid compatibility
-				cl.searchtype = cl.sorttype;
-			} else if (!cl.searchtype) {
-				cl.searchtype = 'string';
-			}
-			if(cl.hidden === undefined) {
-				// jqGrid compatibility
-				cl.hidden = false;
-			}
-			if(!cl.label) {
-				cl.label = cl.name;
-			}
-			if(!cl.hasOwnProperty('searchoptions')) {
-				cl.searchoptions = {};
-			}
-			if(!cl.hasOwnProperty('searchrules')) {
-				cl.searchrules = {};
-			}
-
-		}
-		if(this.p.showQuery) {
-			$(this).append("<table class='queryresult ui-widget ui-widget-content' style='display:block;max-width:440px;border:0px none;'><tbody><tr><td class='query'></td></tr></tbody></table>");
-		}
-		/*
-		 *Perform checking.
-		 *
-		*/
-		var checkData = function(val, colModelItem) {
-			var ret = [true,""];
-			if($.isFunction(colModelItem.searchrules)) {
-				ret = colModelItem.searchrules(val, colModelItem);
-			} else if($.jgrid && $.jgrid.checkValues) {
-				try {
-					ret = $.jgrid.checkValues(val, -1, null, colModelItem.searchrules, colModelItem.label);
-				} catch (e) {}
-			}
-			if(ret && ret.length && ret[0] === false) {
-				p.error = !ret[0];
-				p.errmsg = ret[1];
-			}
-		},
-		randId = function() {
-			return Math.floor(Math.random()*10000).toString();
-		};
-
-		this.onchange = function (  ){
-			// clear any error 
-			this.p.error = false;
-			this.p.errmsg="";
-			return $.isFunction(this.p.onChange) ? this.p.onChange.call( this, this.p ) : false;
-		};
-		/*
-		 * Redrow the filter every time when new field is added/deleted
-		 * and field is  changed
-		 */
-		this.reDraw = function() {
-			$("table.group:first",this).remove();
-			var t = this.createTableForGroup(p.filter, null);
-			$(this).append(t);
-		};
-		/*
-		 * Creates a grouping data for the filter
-		 * @param group - object
-		 * @param parentgroup - object
-		 */
-		this.createTableForGroup = function(group, parentgroup) {
-			var that = this,  i;
-
-			// this table will hold all the group (tables) and rules (rows)
-			var table = $("<table class='group ui-widget ui-widget-content' style='border:0px none;'><tbody>");
-			// create error message row
-			if(parentgroup === null) {
-				$(table).append("<tr class='error' style='display:none;'><th colspan='5' class='ui-state-error' align='left'></th></tr>");
-			}
-
-			var tr = $("<tr></tr>");
-			$(table).append(tr);
-			// this header will hold the group operator type and group action buttons for
-			// creating subgroup "+ {}", creating rule "+" or deleting the group "-"
-			var th = $("<th colspan='5' align='left'></th>");
-			tr.append(th);
-
-			// dropdown for: choosing group operator type
-			var groupOpSelect = $("<select class='opsel'></select>");
-			th.append(groupOpSelect);
-			// populate dropdown with all posible group operators: or, and
-			var str= "", selected;
-			for (i = 0; i < p.groupOps.length; i++) {
-				selected =  group.groupOp === that.p.groupOps[i] ? " selected='selected'" :"";
-				str += "<option value='"+that.p.groupOps[i]+"'" + selected+">"+that.p.groupOps[i]+"</option>";
-			}
-
-			groupOpSelect
-			.append(str)
-			.bind('change',function() {
-				group.groupOp = $(groupOpSelect).val();
-				that.onchange(); // signals that the filter has changed
-			});
-
-			// button for adding a new subgroup
-			var inputAddSubgroup;
-			if(this.p.groupButton) {
-				inputAddSubgroup = $("<input type='button' value='+ {}' title='Add subgroup' class='add-group'/>");
-				inputAddSubgroup.bind('click',function() {
-					if (group.groups === undefined ) {
-						group.groups = [];
-					}
-
-					group.groups.push({
-						groupOp: p.groupOps[0],
-						rules: [],
-						groups: []
-					}); // adding a new group
-
-					that.reDraw(); // the html has changed, force reDraw
-
-					that.onchange(); // signals that the filter has changed
-					return false;
-				});
-			} else {
-				inputAddSubgroup = "<span></span>";
-			}
-			th.append(inputAddSubgroup);
-
-			// button for adding a new rule
-			var inputAddRule = $("<input type='button' value='+' title='Add rule' class='add-rule'/>"), cm;
-			inputAddRule.bind('click',function() {
-				//if(!group) { group = {};}
-				if (group.rules === undefined) {
-					group.rules = [];
-				}
-				for (i = 0; i < that.p.columns.length; i++) {
-				// but show only serchable and serchhidden = true fields
-					var searchable = (typeof that.p.columns[i].search === 'undefined') ?  true: that.p.columns[i].search ,
-					hidden = (that.p.columns[i].hidden === true),
-					ignoreHiding = (that.p.columns[i].searchoptions.searchhidden === true);
-					if ((ignoreHiding && searchable) || (searchable && !hidden)) {
-						cm = that.p.columns[i];
-						break;
-					}
-				}
-				var opr;
-				if( cm.searchoptions.sopt ) {opr = cm.searchoptions.sopt;}
-				else if(that.p.sopt) { opr= that.p.sopt; }
-				else if  (cm.searchtype === 'string') {opr = that.p.stropts;}
-				else {opr = that.p.numopts;}
-
-				group.rules.push({
-					field: cm.name,
-					op: opr[0],
-					data: ""
-				}); // adding a new rule
-
-				that.reDraw(); // the html has changed, force reDraw
-				// for the moment no change have been made to the rule, so
-				// this will not trigger onchange event
-				return false;
-			});
-			th.append(inputAddRule);
-
-			// button for delete the group
-			if (parentgroup !== null) { // ignore the first group
-				var inputDeleteGroup = $("<input type='button' value='-' title='Delete group' class='delete-group'/>");
-				th.append(inputDeleteGroup);
-				inputDeleteGroup.bind('click',function() {
-				// remove group from parent
-					for (i = 0; i < parentgroup.groups.length; i++) {
-						if (parentgroup.groups[i] === group) {
-							parentgroup.groups.splice(i, 1);
-							break;
-						}
-					}
-
-					that.reDraw(); // the html has changed, force reDraw
-
-					that.onchange(); // signals that the filter has changed
-					return false;
-				});
-			}
-
-			// append subgroup rows
-			if (group.groups !== undefined) {
-				for (i = 0; i < group.groups.length; i++) {
-					var trHolderForSubgroup = $("<tr></tr>");
-					table.append(trHolderForSubgroup);
-
-					var tdFirstHolderForSubgroup = $("<td class='first'></td>");
-					trHolderForSubgroup.append(tdFirstHolderForSubgroup);
-
-					var tdMainHolderForSubgroup = $("<td colspan='4'></td>");
-					tdMainHolderForSubgroup.append(this.createTableForGroup(group.groups[i], group));
-					trHolderForSubgroup.append(tdMainHolderForSubgroup);
-				}
-			}
-			if(group.groupOp === undefined) {
-				group.groupOp = that.p.groupOps[0];
-			}
-
-			// append rules rows
-			if (group.rules !== undefined) {
-				for (i = 0; i < group.rules.length; i++) {
-					table.append(
-                       this.createTableRowForRule(group.rules[i], group)
-					);
-				}
-			}
-
-			return table;
-		};
-		/*
-		 * Create the rule data for the filter
-		 */
-		this.createTableRowForRule = function(rule, group) {
-			// save current entity in a variable so that it could
-			// be referenced in anonimous method calls
-
-			var that=this, tr = $("<tr></tr>"),
-			//document.createElement("tr"),
-
-			// first column used for padding
-			//tdFirstHolderForRule = document.createElement("td"),
-			i, op, trpar, cm, str="", selected;
-			//tdFirstHolderForRule.setAttribute("class", "first");
-			tr.append("<td class='first'></td>");
-
-
-			// create field container
-			var ruleFieldTd = $("<td class='columns'></td>");
-			tr.append(ruleFieldTd);
-
-
-			// dropdown for: choosing field
-			var ruleFieldSelect = $("<select></select>");
-			ruleFieldTd.append(ruleFieldSelect);
-			ruleFieldSelect.bind('change',function() {
-				rule.field = $(ruleFieldSelect).val();
-
-				trpar = $(this).parents("tr:first");
-				for (i=0;i<that.p.columns.length;i++) {
-					if(that.p.columns[i].name ===  rule.field) {
-						cm = that.p.columns[i];
-						break;
-					}
-				}
-				if(!cm) { return;}
-				cm.searchoptions.id = randId();
-				var elm = $.jgrid.createEl(cm.inputtype,cm.searchoptions, "", true, that.p.ajaxSelectOptions, true);
-				$(elm).addClass("input-elm");
-				//that.createElement(rule, "");
-
-				if( cm.searchoptions.sopt ) {op = cm.searchoptions.sopt;}
-				else if(that.p.sopt) { op= that.p.sopt; }
-				else if  (cm.searchtype === 'string') {op = that.p.stropts;}
-				else {op = that.p.numopts;}
-				// operators
-				var s ="",so="";
-				for ( i = 0; i < that.p.ops.length; i++) {
-					if($.inArray(that.p.ops[i].name, op) !== -1) {
-						so = rule.op === that.p.ops[i].name ? " selected=selected" : "";
-						s += "<option value='"+that.p.ops[i].name+"'"+ so+">"+that.p.ops[i].description+"</option>";
-					}
-				}
-				$(".selectopts",trpar).empty().append( s );
-
-				// data
-				$(".data",trpar).empty().append( elm );
-				$(".input-elm",trpar).bind('change',function() {
-					rule.data = $(this).val();
-					if($.isArray(rule.data)) { rule.data = rule.data.join(","); }
-					that.onchange(); // signals that the filter has changed
-				});
-				setTimeout(function(){ //IE, Opera, Chrome
-				rule.data = $(elm).val();
-				that.onchange();  // signals that the filter has changed
-				}, 0);
-			});
-
-			// populate drop down with user provided column definitions
-			var j=0;
-			for (i = 0; i < that.p.columns.length; i++) {
-				// but show only serchable and serchhidden = true fields
-		        var searchable = (typeof that.p.columns[i].search === 'undefined') ?  true: that.p.columns[i].search ,
-		        hidden = (that.p.columns[i].hidden === true),
-				ignoreHiding = (that.p.columns[i].searchoptions.searchhidden === true);
-				if ((ignoreHiding && searchable) || (searchable && !hidden)) {
-					selected = "";
-					if(rule.field === that.p.columns[i].name) {
-						selected = " selected='selected'";
-						j=i;
-					}
-					str += "<option value='"+that.p.columns[i].name+"'" +selected+">"+that.p.columns[i].label+"</option>";
-				}
-			}
-			ruleFieldSelect.append( str );
-
-
-			// create operator container
-			var ruleOperatorTd = $("<td class='operators'></td>");
-			tr.append(ruleOperatorTd);
-			cm = p.columns[j];
-			// create it here so it can be referentiated in the onchange event
-			//var RD = that.createElement(rule, rule.data);
-			cm.searchoptions.id = randId();
-			var ruleDataInput = $.jgrid.createEl(cm.inputtype,cm.searchoptions, rule.data, true, that.p.ajaxSelectOptions, true);
-
-			// dropdown for: choosing operator
-			var ruleOperatorSelect = $("<select class='selectopts'></select>");
-			ruleOperatorTd.append(ruleOperatorSelect);
-			ruleOperatorSelect.bind('change',function() {
-				rule.op = $(ruleOperatorSelect).val();
-				trpar = $(this).parents("tr:first");
-				var rd = $(".input-elm",trpar)[0];
-				if (rule.op === "nu" || rule.op === "nn") { // disable for operator "is null" and "is not null"
-					rule.data = "";
-					rd.value = "";
-					rd.setAttribute("readonly", "true");
-					rd.setAttribute("disabled", "true");
-				} else {
-					rd.removeAttribute("readonly");
-					rd.removeAttribute("disabled");
-				}
-
-				that.onchange();  // signals that the filter has changed
-			});
-
-			// populate drop down with all available operators
-			if( cm.searchoptions.sopt ) {op = cm.searchoptions.sopt;}
-			else if(that.p.sopt) { op= that.p.sopt; }
-			else if  (cm.searchtype === 'string') {op = p.stropts;}
-			else {op = that.p.numopts;}
-			str="";
-			for ( i = 0; i < that.p.ops.length; i++) {
-				if($.inArray(that.p.ops[i].name, op) !== -1) {
-					selected = rule.op === that.p.ops[i].name ? " selected='selected'" : "";
-					str += "<option value='"+that.p.ops[i].name+"'"+selected+">"+that.p.ops[i].description+"</option>";
-				}
-			}
-			ruleOperatorSelect.append( str );
-			// create data container
-			var ruleDataTd = $("<td class='data'></td>");
-			tr.append(ruleDataTd);
-
-			// textbox for: data
-			// is created previously
-			//ruleDataInput.setAttribute("type", "text");
-			ruleDataTd.append(ruleDataInput);
-
-			$(ruleDataInput)
-			.addClass("input-elm")
-			.bind('change', function() {
-				rule.data = $(this).val();
-				if($.isArray(rule.data)) { rule.data = rule.data.join(","); }
-
-				that.onchange(); // signals that the filter has changed
-			});
-
-			// create action container
-			var ruleDeleteTd = $("<td></td>");
-			tr.append(ruleDeleteTd);
-
-			// create button for: delete rule
-			var ruleDeleteInput = $("<input type='button' value='-' title='Delete rule' class='delete-rule'/>");
-			ruleDeleteTd.append(ruleDeleteInput);
-			//$(ruleDeleteInput).html("").height(20).width(30).button({icons: {  primary: "ui-icon-minus", text:false}});
-			ruleDeleteInput.bind('click',function() {
-				// remove rule from group
-				for (i = 0; i < group.rules.length; i++) {
-					if (group.rules[i] === rule) {
-						group.rules.splice(i, 1);
-						break;
-					}
-				}
-
-				that.reDraw(); // the html has changed, force reDraw
-
-				that.onchange(); // signals that the filter has changed
-				return false;
-			});
-
-			return tr;
-		};
-
-		this.getStringForGroup = function(group) {
-			var s = "(", index;
-			if (group.groups !== undefined) {
-				for (index = 0; index < group.groups.length; index++) {
-					if (s.length > 1) {
-						s += " " + group.groupOp + " ";
-					}
-					try {
-						s += this.getStringForGroup(group.groups[index]);
-					} catch (eg) {alert(eg);}
-				}
-			}
-
-			if (group.rules !== undefined) {
-				try{
-					for (index = 0; index < group.rules.length; index++) {
-						if (s.length > 1) {
-							s += " " + group.groupOp + " ";
-						}
-						s += this.getStringForRule(group.rules[index]);
-					}
-				} catch (e) {alert(e);}
-			}
-
-			s += ")";
-
-			if (s === "()") {
-				return ""; // ignore groups that don't have rules
-			} else {
-				return s;
-			}
-		};
-		this.getStringForRule = function(rule) {
-			var opUF = "",opC="", i, cm, ret, val,
-			numtypes = ['int', 'integer', 'float', 'number', 'currency']; // jqGrid
-			for (i = 0; i < this.p.ops.length; i++) {
-				if (this.p.ops[i].name === rule.op) {
-					opUF = this.p.ops[i].operator;
-					opC = this.p.ops[i].name;
-					break;
-				}
-			}
-			for (i=0; i<this.p.columns.length; i++) {
-				if(this.p.columns[i].name === rule.field) {
-					cm = this.p.columns[i];
-					break;
-				}
-			}
-			val = rule.data;
-			if(opC === 'bw' || opC === 'bn') { val = val+"%"; }
-			if(opC === 'ew' || opC === 'en') { val = "%"+val; }
-			if(opC === 'cn' || opC === 'nc') { val = "%"+val+"%"; }
-			if(opC === 'in' || opC === 'ni') { val = " ("+val+")"; }
-			if(p.errorcheck) { checkData(rule.data, cm); }
-			if($.inArray(cm.searchtype, numtypes) !== -1 || opC === 'nn' || opC === 'nu') { ret = rule.field + " " + opUF + " " + val; }
-			else { ret = rule.field + " " + opUF + " \"" + val + "\""; }
-			return ret;
-		};
-		this.resetFilter = function () {
-			this.p.filter = $.extend(true,{},this.p.initFilter);
-			this.reDraw();
-			this.onchange();
-		};
-		this.hideError = function() {
-			$("th.ui-state-error", this).html("");
-			$("tr.error", this).hide();
-		};
-		this.showError = function() {
-			$("th.ui-state-error", this).html(this.p.errmsg);
-			$("tr.error", this).show();
-		};
-		this.toUserFriendlyString = function() {
-			return this.getStringForGroup(p.filter);
-		};
-		this.toString = function() {
-			// this will obtain a string that can be used to match an item.
-			var that = this;
-			function getStringRule(rule) {
-				if(that.p.errorcheck) {
-					var i, cm;
-					for (i=0; i<that.p.columns.length; i++) {
-						if(that.p.columns[i].name === rule.field) {
-							cm = that.p.columns[i];
-							break;
-						}
-					}
-					if(cm) {checkData(rule.data, cm);}
-				}
-				return rule.op + "(item." + rule.field + ",'" + rule.data + "')";
-			}
-
-			function getStringForGroup(group) {
-				var s = "(", index;
-
-				if (group.groups !== undefined) {
-					for (index = 0; index < group.groups.length; index++) {
-						if (s.length > 1) {
-							if (group.groupOp === "OR") {
-								s += " || ";
-							}
-							else {
-								s += " && ";
-							}
-						}
-						s += getStringForGroup(group.groups[index]);
-					}
-				}
-
-				if (group.rules !== undefined) {
-					for (index = 0; index < group.rules.length; index++) {
-						if (s.length > 1) {
-							if (group.groupOp === "OR") {
-								s += " || ";
-							}
-							else  {
-								s += " && ";
-							}
-						}
-						s += getStringRule(group.rules[index]);
-					}
-				}
-
-				s += ")";
-
-				if (s === "()") {
-					return ""; // ignore groups that don't have rules
-				} else {
-					return s;
-				}
-			}
-
-			return getStringForGroup(this.p.filter);
-		};
-
-		// Here we init the filter
-		this.reDraw();
-
-		if(this.p.showQuery) {
-			this.onchange();
-		}
-		// mark is as created so that it will not be created twice on this element
-		this.filter = true;
-	});
-};
-$.extend($.fn.jqFilter,{
-	/*
-	 * Return SQL like string. Can be used directly
-	 */
-	toSQLString : function()
-	{
-		var s ="";
-		this.each(function(){
-			s = this.toUserFriendlyString();
-		});
-		return s;
-	},
-	/*
-	 * Return filter data as object.
-	 */
-	filterData : function()
-	{
-		var s;
-		this.each(function(){
-			s = this.p.filter;
-		});
-		return s;
-
-	},
-	getParameter : function (param) {
-		if(param !== undefined) {
-			if (this.p.hasOwnProperty(param) ) {
-				return this.p[param];
-			}
-		}
-		return this.p;
-	},
-	resetFilter: function() {
-		return this.each(function(){
-			this.resetFilter();
-		});
-	}
-
-});
-})(jQuery);
diff --git a/addons/base/static/lib/jquery.jqGrid/js/grid.formedit.js b/addons/base/static/lib/jquery.jqGrid/js/grid.formedit.js
deleted file mode 100644
index aea99600a62..00000000000
--- a/addons/base/static/lib/jquery.jqGrid/js/grid.formedit.js
+++ /dev/null
@@ -1,1888 +0,0 @@
-(function($){
-/**
- * jqGrid extension for form editing Grid Data
- * Tony Tomov tony@trirand.com
- * http://trirand.com/blog/ 
- * Dual licensed under the MIT and GPL licenses:
- * http://www.opensource.org/licenses/mit-license.php
- * http://www.gnu.org/licenses/gpl-2.0.html
-**/
-/*global xmlJsonClass, jQuery, $  */
-var rp_ge = null;
-$.jgrid.extend({
-	searchGrid : function (p) {
-		p = $.extend({
-			recreateFilter: false,
-			drag: true,
-			sField:'searchField',
-			sValue:'searchString',
-			sOper: 'searchOper',
-			sFilter: 'filters',
-            loadDefaults: true, // this options activates loading of default filters from grid's postData for Multipe Search only.
-			beforeShowSearch: null,
-			afterShowSearch : null,
-			onInitializeSearch: null,
-			closeAfterSearch : false,
-			closeAfterReset: false,
-			closeOnEscape : false,
-			multipleSearch : false,
-			multipleGroup : false,
-			//cloneSearchRowOnAdd: true,
-			top : 0,
-			left: 0,
-			jqModal : true,
-			modal: true,
-			resize : false,
-			width: 450,
-			height: 'auto',
-			dataheight: 'auto',
-			showQuery: true,
-			errorcheck : true,
-			// translation
-			// if you want to change or remove the order change it in sopt
-			// ['eq','ne','lt','le','gt','ge','bw','bn','in','ni','ew','en','cn','nc'],
-			sopt: null,
-			stringResult: undefined,
-			onClose : null,
-			onSearch : null,
-			onReset : null,
-			overlay : 10,
-			columns : []
-		}, $.jgrid.search, p || {});
-		return this.each(function() {
-			var $t = this;
-			if(!$t.grid) {return;}
-			var fid = "fbox_"+$t.p.id,
-			showFrm = true,
-			IDs = {themodal:'editmod'+fid,modalhead:'edithd'+fid,modalcontent:'editcnt'+fid, scrollelm : fid},
-			defaultFilters  = $t.p.postData[p.sFilter],
-			fil = $("<div><div id='"+fid+"' class='searchFilter' style='overflow:auto'></div></div>").insertBefore("#gview_"+$t.p.id);
-			if(typeof(defaultFilters) === "string") {
-				defaultFilters = $.jgrid.parse( defaultFilters );
-			}
-			if(p.recreateFilter === true) {
-				$("#"+IDs.themodal).remove();
-			}
-			function showFilter() {
-				if($.isFunction(p.beforeShowSearch)) {
-					showFrm = p.beforeShowSearch($("#"+fid));
-					if(typeof(showFrm) === "undefined") {
-						showFrm = true;
-					}
-				}
-				if(showFrm) {
-					$.jgrid.viewModal("#"+IDs.themodal,{gbox:"#gbox_"+fid,jqm:p.jqModal, modal:p.modal, overlay: p.overlay});
-					if($.isFunction(p.afterShowSearch)) {
-						p.afterShowSearch($("#"+fid));
-					}
-				}
-			}
-			if ( $("#"+IDs.themodal).html() !== null ) {
-				showFilter();
-			} else {
-				if($.isFunction(p.onInitializeSearch) ) {
-					p.onInitializeSearch($("#"+fid));
-				}
-				var columns = $.extend([],$t.p.colModel),
-				bS  ="<a href='javascript:void(0)' id='"+fid+"_search' class='fm-button ui-state-default ui-corner-all fm-button-icon-left'><span class='ui-icon ui-icon-search'></span>"+p.Find+"</a>",
-				bC  ="<a href='javascript:void(0)' id='"+fid+"_reset' class='fm-button ui-state-default ui-corner-all fm-button-icon-left'><span class='ui-icon ui-icon-arrowreturnthick-1-w'></span>"+p.Reset+"</a>",
-				bQ = "";
-				if(p.showQuery) {
-					bQ ="<a href='javascript:void(0)' id='"+fid+"_query' class='fm-button ui-state-default ui-corner-all fm-button-icon-left'><span class='ui-icon ui-icon-comment'></span>Query</a>";
-				}
-				var bt = "<table border='0' cellspacing='0' cellpadding='0' class='EditTable ui-widget content' style='border:0px none;margin-top:5px' id='"+fid+"_2'><tbody><tr><td colspan='2'><hr class='ui-widget-content' style='margin:1px'/></td></tr><tr><td class='EditButton' style='text-align:left'>"+bC+"</td><td class='EditButton'>"+bQ+bS+"</td></tr></tbody></table>",
-				colnm, found=false;
-				if(!p.columns.length) {
-					$.each(columns, function(i,n){
-						if(!n.label) {
-							n.label = $t.p.colNames[i];
-						}
-						// find first searchable column and set it if no default filter
-						if(!found) {
-							var searchable = (typeof n.search === 'undefined') ?  true: n.search ,
-							hidden = (n.hidden === true),
-							ignoreHiding = (n.searchoptions && n.searchoptions.searchhidden === true);
-							if ((ignoreHiding && searchable) || (searchable && !hidden)) {
-								found = true;
-								colnm = n.name;
-							}
-						}
-					});
-				} else {
-					columns = p.columns;
-				}
-				// old behaviour
-				if( (!defaultFilters && colnm) || p.multipleSearch === false  ) {
-					defaultFilters = {"groupOp": "AND",rules:[{"field":colnm,"op":"eq","data":""}]};
-				}
-				$("#"+fid).jqFilter({
-					columns : columns,
-					filter: p.loadDefaults ? defaultFilters : null,
-					showQuery: p.showQuery,
-					errorcheck : p.errorcheck,
-					sopt: p.sopt,
-					groupButton : p.multipleGroup,
-					_gridsopt : $.jgrid.search.odata,
-					onChange : function( sp ) {
-						if(this.p.showQuery) {
-							$('.query',this).html(this.toUserFriendlyString());
-						}
-					}
-				});
-				fil.append( bt );
-				if(p.multipleSearch === false) {
-					$(".add-rule","#"+fid).hide();
-					$(".delete-rule","#"+fid).hide();
-				}
-				if($.isFunction(p.onInitializeSearch) ) {
-					p.onInitializeSearch($("#"+fid));
-				}
-				$.jgrid.createModal(IDs ,fil,p,"#gview_"+$t.p.id,$("#gbox_"+$t.p.id)[0]);
-				if(bQ) {
-					$("#"+fid+"_query").bind('click', function(e){
-						$(".queryresult", fil).toggle();
-						return false;
-					});
-				}
-				if (p.stringResult===undefined) {
-					// to provide backward compatibility, inferring stringResult value from multipleSearch
-					p.stringResult = p.multipleSearch;
-				}
-				$("#"+fid+"_search").bind('click', function(){
-					var fl = $("#"+fid),
-					sdata={}, res ,
-					filters = fl.jqFilter('filterData');
-					if(p.errorcheck) {
-						fl[0].hideError();
-						if(!p.showQuery) { fl.jqFilter('toSQLString'); }
-						if(fl[0].p.error) {
-							fl[0].showError();
-							return false;
-						}
-					}
-
-					if(p.stringResult && $t.p.datatype !== "local") {
-						try {
-							// xmlJsonClass or JSON.stringify
-							res = xmlJsonClass.toJson(filters, '', '', false);
-						} catch (e) {
-							try {
-								res = JSON.stringify(filters);
-							} catch (e2) { }
-						}
-						if(typeof(res)==="string") {
-							sdata[p.sFilter] = res;
-							$.each([p.sField,p.sValue, p.sOper], function() { sdata[this] = "";});
-						}
-					} else {
-						if(p.multipleSearch) {
-							sdata[p.sFilter] = filters;
-							$.each([p.sField,p.sValue, p.sOper], function() { sdata[this] = "";});
-						} else {
-							sdata[p.sField] = filters.rules[0].field;
-							sdata[p.sValue] = filters.rules[0].data;
-							sdata[p.sOper] = filters.rules[0].op;
-							sdata[p.sFilter] = "";
-						}
-					}
-					$t.p.search = true;
-					$.extend($t.p.postData,sdata);
-					$($t).trigger("reloadGrid",[{page:1}]);
-					if($.isFunction(p.onSearch) ) {
-						p.onSearch();
-					}
-					if(p.closeAfterSearch) {
-						$.jgrid.hideModal("#"+IDs.themodal,{gb:"#gbox_"+$t.p.id,jqm:p.jqModal,onClose: p.onClose});
-					}
-					return false;
-				});
-				$("#"+fid+"_reset").bind('click', function(){
-					var sdata={},
-					fl = $("#"+fid);
-					$t.p.search = false;
-					if(p.multipleSearch===false) {
-						sdata[p.sField] = sdata[p.sValue] = sdata[p.sOper] = "";
-					} else {
-						sdata[p.sFilter] = "";
-					}
-					fl[0].resetFilter();
-					$.extend($t.p.postData,sdata);
-					$($t).trigger("reloadGrid",[{page:1}]);
-					if($.isFunction(p.onReset) ) {
-						p.onReset();
-					}
-					return false;
-				});
-				showFilter();
-				$(".fm-button:not(.ui-state-disabled)",fil).hover(
-				   function(){$(this).addClass('ui-state-hover');},
-				   function(){$(this).removeClass('ui-state-hover');}
-				);
-			}
-		});
-	},
-	editGridRow : function(rowid, p){
-		p = $.extend({
-			top : 0,
-			left: 0,
-			width: 300,
-			height: 'auto',
-			dataheight: 'auto',
-			modal: false,
-			overlay : 10,
-			drag: true,
-			resize: true,
-			url: null,
-			mtype : "POST",
-			clearAfterAdd :true,
-			closeAfterEdit : false,
-			reloadAfterSubmit : true,
-			onInitializeForm: null,
-			beforeInitData: null,
-			beforeShowForm: null,
-			afterShowForm: null,
-			beforeSubmit: null,
-			afterSubmit: null,
-			onclickSubmit: null,
-			afterComplete: null,
-			onclickPgButtons : null,
-			afterclickPgButtons: null,
-			editData : {},
-			recreateForm : false,
-			jqModal : true,
-			closeOnEscape : false,
-			addedrow : "first",
-			topinfo : '',
-			bottominfo: '',
-			saveicon : [],
-			closeicon : [],
-			savekey: [false,13],
-			navkeys: [false,38,40],
-			checkOnSubmit : false,
-			checkOnUpdate : false,
-			_savedData : {},
-			processing : false,
-			onClose : null,
-			ajaxEditOptions : {},
-			serializeEditData : null,
-			viewPagerButtons : true
-		}, $.jgrid.edit, p || {});
-		rp_ge = p;
-		return this.each(function(){
-			var $t = this;
-			if (!$t.grid || !rowid) { return; }
-			var gID = $t.p.id,
-			frmgr = "FrmGrid_"+gID,frmtb = "TblGrid_"+gID,
-			IDs = {themodal:'editmod'+gID,modalhead:'edithd'+gID,modalcontent:'editcnt'+gID, scrollelm : frmgr},
-			onBeforeShow = $.isFunction(rp_ge.beforeShowForm) ? rp_ge.beforeShowForm : false,
-			onAfterShow = $.isFunction(rp_ge.afterShowForm) ? rp_ge.afterShowForm : false,
-			onBeforeInit = $.isFunction(rp_ge.beforeInitData) ? rp_ge.beforeInitData : false,
-			onInitializeForm = $.isFunction(rp_ge.onInitializeForm) ? rp_ge.onInitializeForm : false,
-			copydata = null,
-			showFrm = true,
-			maxCols = 1, maxRows=0,	postdata, extpost, newData, diff;
-			if (rowid === "new") {
-				rowid = "_empty";
-				p.caption=rp_ge.addCaption;
-			} else {
-				p.caption=rp_ge.editCaption;
-			}
-			if(p.recreateForm===true && $("#"+IDs.themodal).html() !== null) {
-				$("#"+IDs.themodal).remove();
-			}
-			var closeovrl = true;
-			if(p.checkOnUpdate && p.jqModal && !p.modal) {
-				closeovrl = false;
-			}
-			function getFormData(){
-				$(".FormElement", "#"+frmtb).each(function(i) {
-					var celm = $(".customelement", this);
-					if (celm.length) {
-						var  elem = celm[0], nm = $(elem).attr('name');
-						$.each($t.p.colModel, function(i,n){
-							if(this.name === nm && this.editoptions && $.isFunction(this.editoptions.custom_value)) {
-								try {
-									postdata[nm] = this.editoptions.custom_value($("#"+$.jgrid.jqID(nm),"#"+frmtb),'get');
-									if (postdata[nm] === undefined) { throw "e1"; }
-								} catch (e) {
-									if (e==="e1") { $.jgrid.info_dialog(jQuery.jgrid.errors.errcap,"function 'custom_value' "+$.jgrid.edit.msg.novalue,jQuery.jgrid.edit.bClose);}
-									else { $.jgrid.info_dialog(jQuery.jgrid.errors.errcap,e.message,jQuery.jgrid.edit.bClose); }
-								}
-								return true;
-							}
-						});
-					} else {
-					switch ($(this).get(0).type) {
-						case "checkbox":
-							if($(this).attr("checked")) {
-								postdata[this.name]= $(this).val();
-							}else {
-								var ofv = $(this).attr("offval");
-								postdata[this.name]= ofv;
-							}
-						break;
-						case "select-one":
-							postdata[this.name]= $("option:selected",this).val();
-							extpost[this.name]= $("option:selected",this).text();
-						break;
-						case "select-multiple":
-							postdata[this.name]= $(this).val();
-							if(postdata[this.name]) { postdata[this.name] = postdata[this.name].join(","); }
-							else { postdata[this.name] =""; }
-							var selectedText = [];
-							$("option:selected",this).each(
-								function(i,selected){
-									selectedText[i] = $(selected).text();
-								}
-							);
-							extpost[this.name]= selectedText.join(",");
-						break;								
-						case "password":
-						case "text":
-						case "textarea":
-						case "button":
-							postdata[this.name] = $(this).val();
-							
-						break;
-					}
-					if($t.p.autoencode) { postdata[this.name] = $.jgrid.htmlEncode(postdata[this.name]); }
-					}
-				});
-				return true;
-			}
-			function createData(rowid,obj,tb,maxcols){
-				var nm, hc,trdata, cnt=0,tmp, dc,elc, retpos=[], ind=false,
-				tdtmpl = "<td class='CaptionTD'>&#160;</td><td class='DataTD'>&#160;</td>", tmpl="", i; //*2
-				for (i =1; i<=maxcols;i++) {
-					tmpl += tdtmpl;
-				}
-				if(rowid != '_empty') {
-					ind = $(obj).jqGrid("getInd",rowid);
-				}
-				$(obj.p.colModel).each( function(i) {
-					nm = this.name;
-					// hidden fields are included in the form
-					if(this.editrules && this.editrules.edithidden === true) {
-						hc = false;
-					} else {
-						hc = this.hidden === true ? true : false;
-					}
-					dc = hc ? "style='display:none'" : "";
-					if ( nm !== 'cb' && nm !== 'subgrid' && this.editable===true && nm !== 'rn') {
-						if(ind === false) {
-							tmp = "";
-						} else {
-							if(nm == obj.p.ExpandColumn && obj.p.treeGrid === true) {
-								tmp = $("td:eq("+i+")",obj.rows[ind]).text();
-							} else {
-								try {
-									tmp =  $.unformat($("td:eq("+i+")",obj.rows[ind]),{rowId:rowid, colModel:this},i);
-								} catch (_) {
-									tmp = $("td:eq("+i+")",obj.rows[ind]).html();
-								}
-							}
-						}
-						var opt = $.extend({}, this.editoptions || {} ,{id:nm,name:nm}),
-						frmopt = $.extend({}, {elmprefix:'',elmsuffix:'',rowabove:false,rowcontent:''}, this.formoptions || {}),
-						rp = parseInt(frmopt.rowpos,10) || cnt+1,
-						cp = parseInt((parseInt(frmopt.colpos,10) || 1)*2,10);
-						if(rowid == "_empty" && opt.defaultValue ) {
-							tmp = $.isFunction(opt.defaultValue) ? opt.defaultValue() : opt.defaultValue; 
-						}
-						if(!this.edittype) { this.edittype = "text"; }
-						if($t.p.autoencode) { tmp = $.jgrid.htmlDecode(tmp); }
-						elc = $.jgrid.createEl(this.edittype,opt,tmp,false,$.extend({},$.jgrid.ajaxOptions,obj.p.ajaxSelectOptions || {}));
-						if(tmp === "" && this.edittype == "checkbox") {tmp = $(elc).attr("offval");}
-						if(tmp === "" && this.edittype == "select") {tmp = $("option:eq(0)",elc).text();}
-						if(rp_ge.checkOnSubmit || rp_ge.checkOnUpdate) { rp_ge._savedData[nm] = tmp; }
-						$(elc).addClass("FormElement");
-						if(this.edittype == 'text' || this.edittype == 'textarea') {
-							$(elc).addClass("ui-widget-content ui-corner-all");
-						}
-						trdata = $(tb).find("tr[rowpos="+rp+"]");
-						if(frmopt.rowabove) {
-							var newdata = $("<tr><td class='contentinfo' colspan='"+(maxcols*2)+"'>"+frmopt.rowcontent+"</td></tr>");
-							$(tb).append(newdata);
-							newdata[0].rp = rp;
-						}
-						if ( trdata.length===0 ) {
-							trdata = $("<tr "+dc+" rowpos='"+rp+"'></tr>").addClass("FormData").attr("id","tr_"+nm);
-							$(trdata).append(tmpl);
-							$(tb).append(trdata);
-							trdata[0].rp = rp;
-						}
-						$("td:eq("+(cp-2)+")",trdata[0]).html( typeof frmopt.label === 'undefined' ? obj.p.colNames[i]: frmopt.label);
-						$("td:eq("+(cp-1)+")",trdata[0]).append(frmopt.elmprefix).append(elc).append(frmopt.elmsuffix);
-						retpos[cnt] = i;
-						cnt++;
-					}
-				});
-				if( cnt > 0) {
-					var idrow = $("<tr class='FormData' style='display:none'><td class='CaptionTD'></td><td colspan='"+ (maxcols*2-1)+"' class='DataTD'><input class='FormElement' id='id_g' type='text' name='"+obj.p.id+"_id' value='"+rowid+"'/></td></tr>");
-					idrow[0].rp = cnt+999;
-					$(tb).append(idrow);
-					if(rp_ge.checkOnSubmit || rp_ge.checkOnUpdate) { rp_ge._savedData[obj.p.id+"_id"] = rowid; }
-				}
-				return retpos;
-			}
-			function fillData(rowid,obj,fmid){
-				var nm,cnt=0,tmp, fld,opt,vl,vlc;
-				if(rp_ge.checkOnSubmit || rp_ge.checkOnUpdate) {rp_ge._savedData = {};rp_ge._savedData[obj.p.id+"_id"]=rowid;}
-				var cm = obj.p.colModel;
-				if(rowid == '_empty') {
-					$(cm).each(function(i){
-						nm = this.name;
-						opt = $.extend({}, this.editoptions || {} );
-						fld = $("#"+$.jgrid.jqID(nm),"#"+fmid);
-						if(fld[0] !== null) {
-							vl = "";
-							if(opt.defaultValue ) {
-								vl = $.isFunction(opt.defaultValue) ? opt.defaultValue() : opt.defaultValue;
-								if(fld[0].type=='checkbox') {
-									vlc = vl.toLowerCase();
-									if(vlc.search(/(false|0|no|off|undefined)/i)<0 && vlc!=="") {
-										fld[0].checked = true;
-										fld[0].defaultChecked = true;
-										fld[0].value = vl;
-									} else {
-										fld.attr({checked:"",defaultChecked:""});
-									}
-								} else {fld.val(vl); }
-							} else {
-								if( fld[0].type=='checkbox' ) {
-									fld[0].checked = false;
-									fld[0].defaultChecked = false;
-									vl = $(fld).attr("offval");
-								} else if (fld[0].type && fld[0].type.substr(0,6)=='select') {
-									fld[0].selectedIndex = 0; 
-								} else {
-									fld.val(vl);
-								}
-							}
-							if(rp_ge.checkOnSubmit===true || rp_ge.checkOnUpdate) { rp_ge._savedData[nm] = vl; }
-						}
-					});
-					$("#id_g","#"+fmid).val(rowid);
-					return;
-				}
-				var tre = $(obj).jqGrid("getInd",rowid,true);
-				if(!tre) { return; }
-				$('td',tre).each( function(i) {
-					nm = cm[i].name;
-					// hidden fields are included in the form
-					if ( nm !== 'cb' && nm !== 'subgrid' && nm !== 'rn' && cm[i].editable===true) {
-						if(nm == obj.p.ExpandColumn && obj.p.treeGrid === true) {
-							tmp = $(this).text();
-						} else {
-							try {
-								tmp =  $.unformat($(this),{rowId:rowid, colModel:cm[i]},i);
-							} catch (_) {
-								tmp = $(this).html();
-							}
-						}
-						if($t.p.autoencode) { tmp = $.jgrid.htmlDecode(tmp); }
-						if(rp_ge.checkOnSubmit===true || rp_ge.checkOnUpdate) { rp_ge._savedData[nm] = tmp; }
-						nm = $.jgrid.jqID(nm);
-						switch (cm[i].edittype) {
-							case "password":
-							case "text":
-							case "button" :
-							case "image":
-								$("#"+nm,"#"+fmid).val(tmp);
-								break;
-							case "textarea":
-								if(tmp == "&nbsp;" || tmp == "&#160;" || (tmp.length==1 && tmp.charCodeAt(0)==160) ) {tmp='';}
-								$("#"+nm,"#"+fmid).val(tmp);
-								break;
-							case "select":
-								var opv = tmp.split(",");
-								opv = $.map(opv,function(n){return $.trim(n);});
-								$("#"+nm+" option","#"+fmid).each(function(j){
-									if (!cm[i].editoptions.multiple && (opv[0] == $.trim($(this).text()) || opv[0] == $.trim($(this).val())) ){
-										this.selected= true;
-									} else if (cm[i].editoptions.multiple){
-										if(  $.inArray($.trim($(this).text()), opv ) > -1 || $.inArray($.trim($(this).val()), opv ) > -1  ){
-											this.selected = true;
-										}else{
-											this.selected = false;
-										}
-									} else {
-										this.selected = false;
-									}
-								});
-								break;
-							case "checkbox":
-								tmp = tmp+"";
-								if(cm[i].editoptions && cm[i].editoptions.value) {
-									var cb = cm[i].editoptions.value.split(":");
-									if(cb[0] == tmp) {
-										$("#"+nm,"#"+fmid).attr("checked",true);
-										$("#"+nm,"#"+fmid).attr("defaultChecked",true); //ie
-									} else {
-										$("#"+nm,"#"+fmid).attr("checked",false);
-										$("#"+nm,"#"+fmid).attr("defaultChecked",""); //ie
-									}
-								} else {
-									tmp = tmp.toLowerCase();
-									if(tmp.search(/(false|0|no|off|undefined)/i)<0 && tmp!=="") {
-										$("#"+nm,"#"+fmid).attr("checked",true);
-										$("#"+nm,"#"+fmid).attr("defaultChecked",true); //ie
-									} else {
-										$("#"+nm,"#"+fmid).attr("checked",false);
-										$("#"+nm,"#"+fmid).attr("defaultChecked",""); //ie
-									}
-								}
-								break;
-							case 'custom' :
-								try {
-									if(cm[i].editoptions && $.isFunction(cm[i].editoptions.custom_value)) {
-										cm[i].editoptions.custom_value($("#"+nm,"#"+fmid),'set',tmp);
-									} else { throw "e1"; }
-								} catch (e) {
-									if (e=="e1") { $.jgrid.info_dialog(jQuery.jgrid.errors.errcap,"function 'custom_value' "+$.jgrid.edit.msg.nodefined,jQuery.jgrid.edit.bClose);}
-									else { $.jgrid.info_dialog(jQuery.jgrid.errors.errcap,e.message,jQuery.jgrid.edit.bClose); }
-								}
-								break;
-						}
-						cnt++;
-					}
-				});
-				if(cnt>0) { $("#id_g","#"+frmtb).val(rowid); }
-			}
-			function postIt() {
-				var copydata, ret=[true,"",""], onCS = {}, opers = $t.p.prmNames, idname, oper, key;
-				if($.isFunction(rp_ge.beforeCheckValues)) {
-					var retvals = rp_ge.beforeCheckValues(postdata,$("#"+frmgr),postdata[$t.p.id+"_id"] == "_empty" ? opers.addoper : opers.editoper);
-					if(retvals && typeof(retvals) === 'object') { postdata = retvals; }
-				}
-				for( key in postdata ){
-					if(postdata.hasOwnProperty(key)) {
-						ret = $.jgrid.checkValues(postdata[key],key,$t);
-						if(ret[0] === false) { break; }
-					}
-				}
-				if(ret[0]) {
-					if( $.isFunction( rp_ge.onclickSubmit)) { onCS = rp_ge.onclickSubmit(rp_ge,postdata) || {}; }
-					if( $.isFunction(rp_ge.beforeSubmit))  { ret = rp_ge.beforeSubmit(postdata,$("#"+frmgr)); }
-				}
-
-				if(ret[0] && !rp_ge.processing) {
-					rp_ge.processing = true;
-					$("#sData", "#"+frmtb+"_2").addClass('ui-state-active');
-					oper = opers.oper;
-					idname = opers.id;
-					// we add to pos data array the action - the name is oper
-					postdata[oper] = ($.trim(postdata[$t.p.id+"_id"]) == "_empty") ? opers.addoper : opers.editoper;
-					if(postdata[oper] != opers.addoper) {
-						postdata[idname] = postdata[$t.p.id+"_id"];
-					} else {
-						// check to see if we have allredy this field in the form and if yes lieve it
-						if( postdata[idname] === undefined ) { postdata[idname] = postdata[$t.p.id+"_id"]; }
-					}
-					delete postdata[$t.p.id+"_id"];
-					postdata = $.extend(postdata,rp_ge.editData,onCS);
-
-					var ajaxOptions = $.extend({
-						url: rp_ge.url ? rp_ge.url : $($t).jqGrid('getGridParam','editurl'),
-						type: rp_ge.mtype,
-						data: $.isFunction(rp_ge.serializeEditData) ? rp_ge.serializeEditData(postdata) :  postdata,
-						complete:function(data,Status){
-							if(Status != "success") {
-							    ret[0] = false;
-							    if ($.isFunction(rp_ge.errorTextFormat)) {
-							        ret[1] = rp_ge.errorTextFormat(data);
-							    } else {
-							        ret[1] = Status + " Status: '" + data.statusText + "'. Error code: " + data.status;
-								}
-							} else {
-								// data is posted successful
-								// execute aftersubmit with the returned data from server
-								if( $.isFunction(rp_ge.afterSubmit) ) {
-									ret = rp_ge.afterSubmit(data,postdata);
-								}
-							}
-							if(ret[0] === false) {
-								$("#FormError>td","#"+frmtb).html(ret[1]);
-								$("#FormError","#"+frmtb).show();
-							} else {
-								// remove some values if formattaer select or checkbox
-								$.each($t.p.colModel, function(i,n){
-									if(extpost[this.name] && this.formatter && this.formatter=='select') {
-										try {delete extpost[this.name];} catch (e) {}
-									}
-								});
-								postdata = $.extend(postdata,extpost);
-								if($t.p.autoencode) {
-									$.each(postdata,function(n,v){
-										postdata[n] = $.jgrid.htmlDecode(v);
-									});
-								}
-								rp_ge.reloadAfterSubmit = rp_ge.reloadAfterSubmit && $t.p.datatype != "local";
-								// the action is add
-								if(postdata[oper] == opers.addoper ) {
-									//id processing
-									// user not set the id ret[2]
-									if(!ret[2]) { ret[2] = (parseInt($t.p.records,10)+1)+""; }
-									postdata[idname] = ret[2];
-									if(rp_ge.closeAfterAdd) {
-										if(rp_ge.reloadAfterSubmit) { $($t).trigger("reloadGrid"); }
-										else {
-											$($t).jqGrid("addRowData",ret[2],postdata,p.addedrow);
-											$($t).jqGrid("setSelection",ret[2]);
-										}
-										$.jgrid.hideModal("#"+IDs.themodal,{gb:"#gbox_"+gID,jqm:p.jqModal,onClose: rp_ge.onClose});
-									} else if (rp_ge.clearAfterAdd) {
-										if(rp_ge.reloadAfterSubmit) { $($t).trigger("reloadGrid"); }
-										else { $($t).jqGrid("addRowData",ret[2],postdata,p.addedrow); }
-										fillData("_empty",$t,frmgr);
-									} else {
-										if(rp_ge.reloadAfterSubmit) { $($t).trigger("reloadGrid"); }
-										else { $($t).jqGrid("addRowData",ret[2],postdata,p.addedrow); }
-									}
-								} else {
-									// the action is update
-									if(rp_ge.reloadAfterSubmit) {
-										$($t).trigger("reloadGrid");
-										if( !rp_ge.closeAfterEdit ) { setTimeout(function(){$($t).jqGrid("setSelection",postdata[idname]);},1000); }
-									} else {
-										if($t.p.treeGrid === true) {
-											$($t).jqGrid("setTreeRow",postdata[idname],postdata);
-										} else {
-											$($t).jqGrid("setRowData",postdata[idname],postdata);
-										}
-									}
-									if(rp_ge.closeAfterEdit) { $.jgrid.hideModal("#"+IDs.themodal,{gb:"#gbox_"+gID,jqm:p.jqModal,onClose: rp_ge.onClose}); }
-								}
-								if($.isFunction(rp_ge.afterComplete)) {
-									copydata = data;
-									setTimeout(function(){rp_ge.afterComplete(copydata,postdata,$("#"+frmgr));copydata=null;},500);
-								}
-							}
-							rp_ge.processing=false;
-							if(rp_ge.checkOnSubmit || rp_ge.checkOnUpdate) {
-								$("#"+frmgr).data("disabled",false);
-								if(rp_ge._savedData[$t.p.id+"_id"] !="_empty"){
-									for(var key in rp_ge._savedData) {
-										if(postdata[key]) {
-											rp_ge._savedData[key] = postdata[key];
-										}
-									}
-								}
-							}
-							$("#sData", "#"+frmtb+"_2").removeClass('ui-state-active');
-							try{$(':input:visible',"#"+frmgr)[0].focus();} catch (e){}
-						},
-						error:function(xhr,st,err){
-							$("#FormError>td","#"+frmtb).html(st+ " : "+err);
-							$("#FormError","#"+frmtb).show();
-							rp_ge.processing=false;
-							$("#"+frmgr).data("disabled",false);
-							$("#sData", "#"+frmtb+"_2").removeClass('ui-state-active');
-						}
-					}, $.jgrid.ajaxOptions, rp_ge.ajaxEditOptions );
-					
-					if (!ajaxOptions.url && !rp_ge.useDataProxy) {
-						if ($.isFunction($t.p.dataProxy)) {
-							rp_ge.useDataProxy = true;
-						} else {
-							ret[0]=false; ret[1] += " "+$.jgrid.errors.nourl;
-						}
-					}
-					if (ret[0]) { 
-						if (rp_ge.useDataProxy) { $t.p.dataProxy.call($t, ajaxOptions, "set_"+$t.p.id); }
-						else { $.ajax(ajaxOptions); }
-					}
-				}
-				if(ret[0] === false) {
-					$("#FormError>td","#"+frmtb).html(ret[1]);
-					$("#FormError","#"+frmtb).show();
-					// return; 
-				}
-			}
-			function compareData(nObj, oObj ) {
-				var ret = false,key;
-				for (key in nObj) {
-					if(nObj[key] != oObj[key]) {
-						ret = true;
-						break;
-					}
-				}
-				return ret;
-			}
-			function checkUpdates () {
-				var stat = true;
-				$("#FormError","#"+frmtb).hide();
-				if(rp_ge.checkOnUpdate) {
-					postdata = {}; extpost={};
-					getFormData();
-					newData = $.extend({},postdata,extpost);
-					diff = compareData(newData,rp_ge._savedData);
-					if(diff) {
-						$("#"+frmgr).data("disabled",true);
-						$(".confirm","#"+IDs.themodal).show();
-						stat = false;
-					}
-				}
-				return stat;
-			}
-			function restoreInline()
-			{
-				if (rowid !== "_empty" && typeof($t.p.savedRow) !== "undefined" && $t.p.savedRow.length > 0 && $.isFunction($.fn.jqGrid.restoreRow)) {
-					for (var i=0;i<$t.p.savedRow.length;i++) {
-						if ($t.p.savedRow[i].id == rowid) {
-							$($t).jqGrid('restoreRow',rowid);
-							break;
-						}
-					}
-				}
-			}
-			function updateNav(cr,totr){
-				if (cr===0) { $("#pData","#"+frmtb+"_2").addClass('ui-state-disabled'); } else { $("#pData","#"+frmtb+"_2").removeClass('ui-state-disabled'); }
-				if (cr==totr) { $("#nData","#"+frmtb+"_2").addClass('ui-state-disabled'); } else { $("#nData","#"+frmtb+"_2").removeClass('ui-state-disabled'); }
-			}
-			function getCurrPos() {
-				var rowsInGrid = $($t).jqGrid("getDataIDs"),
-				selrow = $("#id_g","#"+frmtb).val(),
-				pos = $.inArray(selrow,rowsInGrid);
-				return [pos,rowsInGrid];
-			}
-
-			if ( $("#"+IDs.themodal).html() !== null ) {
-				if(onBeforeInit) {
-					showFrm = onBeforeInit($("#"+frmgr));
-					if(typeof(showFrm) == "undefined") {
-						showFrm = true;
-					}
-				}
-				if(showFrm === false) { return; }
-				restoreInline();
-				$(".ui-jqdialog-title","#"+IDs.modalhead).html(p.caption);
-				$("#FormError","#"+frmtb).hide();
-				if(rp_ge.topinfo) {
-					$(".topinfo","#"+frmtb+"_2").html(rp_ge.topinfo);
-					$(".tinfo","#"+frmtb+"_2").show();
-				} else {
-					$(".tinfo","#"+frmtb+"_2").hide();
-				}
-				if(rp_ge.bottominfo) {
-					$(".bottominfo","#"+frmtb+"_2").html(rp_ge.bottominfo);
-					$(".binfo","#"+frmtb+"_2").show();
-				} else {
-					$(".binfo","#"+frmtb+"_2").hide();
-				}
-				// filldata
-				fillData(rowid,$t,frmgr);
-				///
-				if(rowid=="_empty" || !rp_ge.viewPagerButtons) {
-					$("#pData, #nData","#"+frmtb+"_2").hide();
-				} else { 
-					$("#pData, #nData","#"+frmtb+"_2").show();
-				}
-				if(rp_ge.processing===true) {
-					rp_ge.processing=false;
-					$("#sData", "#"+frmtb+"_2").removeClass('ui-state-active');
-				}
-				if($("#"+frmgr).data("disabled")===true) {
-					$(".confirm","#"+IDs.themodal).hide();
-					$("#"+frmgr).data("disabled",false);
-				}
-				if(onBeforeShow) { onBeforeShow($("#"+frmgr)); }
-				$("#"+IDs.themodal).data("onClose",rp_ge.onClose);
-				$.jgrid.viewModal("#"+IDs.themodal,{gbox:"#gbox_"+gID,jqm:p.jqModal, jqM: false, overlay: p.overlay, modal:p.modal});
-				if(!closeovrl) {
-					$(".jqmOverlay").click(function(){
-						if(!checkUpdates()) { return false; }
-						$.jgrid.hideModal("#"+IDs.themodal,{gb:"#gbox_"+gID,jqm:p.jqModal, onClose: rp_ge.onClose});
-						return false;
-					});
-				}
-				if(onAfterShow) { onAfterShow($("#"+frmgr)); }
-			} else {
-				var dh = isNaN(p.dataheight) ? p.dataheight : p.dataheight+"px",
-				frm = $("<form name='FormPost' id='"+frmgr+"' class='FormGrid' onSubmit='return false;' style='width:100%;overflow:auto;position:relative;height:"+dh+";'></form>").data("disabled",false),
-				tbl = $("<table id='"+frmtb+"' class='EditTable' cellspacing='0' cellpadding='0' border='0'><tbody></tbody></table>");
-				if(onBeforeInit) {
-					showFrm = onBeforeInit($("#"+frmgr));
-					if(typeof(showFrm) == "undefined") {
-						showFrm = true;
-					}
-				}
-				if(showFrm === false) { return; }
-				restoreInline();
-				$($t.p.colModel).each( function(i) {
-					var fmto = this.formoptions;
-					maxCols = Math.max(maxCols, fmto ? fmto.colpos || 0 : 0 );
-					maxRows = Math.max(maxRows, fmto ? fmto.rowpos || 0 : 0 );
-				});
-				$(frm).append(tbl);
-				var flr = $("<tr id='FormError' style='display:none'><td class='ui-state-error' colspan='"+(maxCols*2)+"'></td></tr>");
-				flr[0].rp = 0;
-				$(tbl).append(flr);
-				//topinfo
-				flr = $("<tr style='display:none' class='tinfo'><td class='topinfo' colspan='"+(maxCols*2)+"'>"+rp_ge.topinfo+"</td></tr>");
-				flr[0].rp = 0;
-				$(tbl).append(flr);
-				// set the id.
-				// use carefull only to change here colproperties.
-				// create data
-				var rtlb = $t.p.direction == "rtl" ? true :false,
-				bp = rtlb ? "nData" : "pData",
-				bn = rtlb ? "pData" : "nData";
-				createData(rowid,$t,tbl,maxCols);
-				// buttons at footer
-				var bP = "<a href='javascript:void(0)' id='"+bp+"' class='fm-button ui-state-default ui-corner-left'><span class='ui-icon ui-icon-triangle-1-w'></span></div>",
-				bN = "<a href='javascript:void(0)' id='"+bn+"' class='fm-button ui-state-default ui-corner-right'><span class='ui-icon ui-icon-triangle-1-e'></span></div>",
-				bS  ="<a href='javascript:void(0)' id='sData' class='fm-button ui-state-default ui-corner-all'>"+p.bSubmit+"</a>",
-				bC  ="<a href='javascript:void(0)' id='cData' class='fm-button ui-state-default ui-corner-all'>"+p.bCancel+"</a>";
-				var bt = "<table border='0' cellspacing='0' cellpadding='0' class='EditTable' id='"+frmtb+"_2'><tbody><tr><td colspan='2'><hr class='ui-widget-content' style='margin:1px'/></td></tr><tr id='Act_Buttons'><td class='navButton'>"+(rtlb ? bN+bP : bP+bN)+"</td><td class='EditButton'>"+bS+bC+"</td></tr>";
-				bt += "<tr style='display:none' class='binfo'><td class='bottominfo' colspan='2'>"+rp_ge.bottominfo+"</td></tr>";
-				bt += "</tbody></table>";
-				if(maxRows >  0) {
-					var sd=[];
-					$.each($(tbl)[0].rows,function(i,r){
-						sd[i] = r;
-					});
-					sd.sort(function(a,b){
-						if(a.rp > b.rp) {return 1;}
-						if(a.rp < b.rp) {return -1;}
-						return 0;
-					});
-					$.each(sd, function(index, row) {
-						$('tbody',tbl).append(row);
-					});
-				}
-				p.gbox = "#gbox_"+gID;
-				var cle = false;
-				if(p.closeOnEscape===true){
-					p.closeOnEscape = false;
-					cle = true;
-				}
-				var tms = $("<span></span>").append(frm).append(bt);
-				$.jgrid.createModal(IDs,tms,p,"#gview_"+$t.p.id,$("#gbox_"+$t.p.id)[0]);
-				if(rtlb) {
-					$("#pData, #nData","#"+frmtb+"_2").css("float","right");
-					$(".EditButton","#"+frmtb+"_2").css("text-align","left");
-				}
-				if(rp_ge.topinfo) { $(".tinfo","#"+frmtb+"_2").show(); }
-				if(rp_ge.bottominfo) { $(".binfo","#"+frmtb+"_2").show(); } 
-				tms = null; bt=null;
-				$("#"+IDs.themodal).keydown( function( e ) {
-					var wkey = e.target;
-					if ($("#"+frmgr).data("disabled")===true ) { return false; }//??
-					if(rp_ge.savekey[0] === true && e.which == rp_ge.savekey[1]) { // save
-						if(wkey.tagName != "TEXTAREA") {
-							$("#sData", "#"+frmtb+"_2").trigger("click");
-							return false;
-						}
-					}
-					if(e.which === 27) {
-						if(!checkUpdates()) { return false; }
-						if(cle)	{ $.jgrid.hideModal(this,{gb:p.gbox,jqm:p.jqModal, onClose: rp_ge.onClose}); }
-						return false;
-					}
-					if(rp_ge.navkeys[0]===true) {
-						if($("#id_g","#"+frmtb).val() == "_empty") { return true; }
-						if(e.which == rp_ge.navkeys[1]){ //up
-							$("#pData", "#"+frmtb+"_2").trigger("click");
-							return false;
-						}
-						if(e.which == rp_ge.navkeys[2]){ //down
-							$("#nData", "#"+frmtb+"_2").trigger("click");
-							return false;
-						}
-					}
-				});
-				if(p.checkOnUpdate) {
-					$("a.ui-jqdialog-titlebar-close span","#"+IDs.themodal).removeClass("jqmClose");
-					$("a.ui-jqdialog-titlebar-close","#"+IDs.themodal).unbind("click")
-					.click(function(){
-						if(!checkUpdates()) { return false; }
-						$.jgrid.hideModal("#"+IDs.themodal,{gb:"#gbox_"+gID,jqm:p.jqModal,onClose: rp_ge.onClose});
-						return false;
-					});
-				}
-				p.saveicon = $.extend([true,"left","ui-icon-disk"],p.saveicon);
-				p.closeicon = $.extend([true,"left","ui-icon-close"],p.closeicon);
-				// beforeinitdata after creation of the form
-				if(p.saveicon[0]===true) {
-					$("#sData","#"+frmtb+"_2").addClass(p.saveicon[1] == "right" ? 'fm-button-icon-right' : 'fm-button-icon-left')
-					.append("<span class='ui-icon "+p.saveicon[2]+"'></span>");
-				}
-				if(p.closeicon[0]===true) {
-					$("#cData","#"+frmtb+"_2").addClass(p.closeicon[1] == "right" ? 'fm-button-icon-right' : 'fm-button-icon-left')
-					.append("<span class='ui-icon "+p.closeicon[2]+"'></span>");
-				}
-				if(rp_ge.checkOnSubmit || rp_ge.checkOnUpdate) {
-					bS  ="<a href='javascript:void(0)' id='sNew' class='fm-button ui-state-default ui-corner-all' style='z-index:1002'>"+p.bYes+"</a>";
-					bN  ="<a href='javascript:void(0)' id='nNew' class='fm-button ui-state-default ui-corner-all' style='z-index:1002'>"+p.bNo+"</a>";
-					bC  ="<a href='javascript:void(0)' id='cNew' class='fm-button ui-state-default ui-corner-all' style='z-index:1002'>"+p.bExit+"</a>";
-					var ii, zI = p.zIndex  || 999; zI ++;
-					if ($.browser.msie && $.browser.version ==6) {
-						ii = '<iframe style="display:block;position:absolute;z-index:-1;filter:Alpha(Opacity=\'0\');" src="javascript:false;"></iframe>';
-					} else { ii="";}
-					$("<div class='ui-widget-overlay jqgrid-overlay confirm' style='z-index:"+zI+";display:none;'>&#160;"+ii+"</div><div class='confirm ui-widget-content ui-jqconfirm' style='z-index:"+(zI+1)+"'>"+p.saveData+"<br/><br/>"+bS+bN+bC+"</div>").insertAfter("#"+frmgr);
-					$("#sNew","#"+IDs.themodal).click(function(){
-						postIt();
-						$("#"+frmgr).data("disabled",false);
-						$(".confirm","#"+IDs.themodal).hide();
-						return false;
-					});
-					$("#nNew","#"+IDs.themodal).click(function(){
-						$(".confirm","#"+IDs.themodal).hide();
-						$("#"+frmgr).data("disabled",false);
-						setTimeout(function(){$(":input","#"+frmgr)[0].focus();},0);
-						return false;
-					});
-					$("#cNew","#"+IDs.themodal).click(function(){
-						$(".confirm","#"+IDs.themodal).hide();
-						$("#"+frmgr).data("disabled",false);
-						$.jgrid.hideModal("#"+IDs.themodal,{gb:"#gbox_"+gID,jqm:p.jqModal,onClose: rp_ge.onClose});
-						return false;
-					});
-				}
-				// here initform - only once
-				if(onInitializeForm) { onInitializeForm($("#"+frmgr)); }
-				if(rowid=="_empty" || !rp_ge.viewPagerButtons) { $("#pData,#nData","#"+frmtb+"_2").hide(); } else { $("#pData,#nData","#"+frmtb+"_2").show(); }
-				if(onBeforeShow) { onBeforeShow($("#"+frmgr)); }
-				$("#"+IDs.themodal).data("onClose",rp_ge.onClose);
-				$.jgrid.viewModal("#"+IDs.themodal,{gbox:"#gbox_"+gID,jqm:p.jqModal, overlay: p.overlay,modal:p.modal});
-				if(!closeovrl) {
-					$(".jqmOverlay").click(function(){
-						if(!checkUpdates()) { return false; }
-						$.jgrid.hideModal("#"+IDs.themodal,{gb:"#gbox_"+gID,jqm:p.jqModal, onClose: rp_ge.onClose});
-						return false;
-					});
-				}
-				if(onAfterShow) { onAfterShow($("#"+frmgr)); }
-				$(".fm-button","#"+IDs.themodal).hover(
-				   function(){$(this).addClass('ui-state-hover');}, 
-				   function(){$(this).removeClass('ui-state-hover');}
-				);
-				$("#sData", "#"+frmtb+"_2").click(function(e){
-					postdata = {}; extpost={};
-					$("#FormError","#"+frmtb).hide();
-					// all depend on ret array
-					//ret[0] - succes
-					//ret[1] - msg if not succes
-					//ret[2] - the id  that will be set if reload after submit false
-					getFormData();
-					if(postdata[$t.p.id+"_id"] == "_empty")	{ postIt(); }
-					else if(p.checkOnSubmit===true ) {
-						newData = $.extend({},postdata,extpost);
-						diff = compareData(newData,rp_ge._savedData);
-						if(diff) {
-							$("#"+frmgr).data("disabled",true);
-							$(".confirm","#"+IDs.themodal).show();
-						} else {
-							postIt();
-						}
-					} else {
-						postIt();
-					}
-					return false;
-				});
-				$("#cData", "#"+frmtb+"_2").click(function(e){
-					if(!checkUpdates()) { return false; }
-					$.jgrid.hideModal("#"+IDs.themodal,{gb:"#gbox_"+gID,jqm:p.jqModal,onClose: rp_ge.onClose});
-					return false;
-				});
-				$("#nData", "#"+frmtb+"_2").click(function(e){
-					if(!checkUpdates()) { return false; }
-					$("#FormError","#"+frmtb).hide();
-					var npos = getCurrPos();
-					npos[0] = parseInt(npos[0],10);
-					if(npos[0] != -1 && npos[1][npos[0]+1]) {
-						if($.isFunction(p.onclickPgButtons)) {
-							p.onclickPgButtons('next',$("#"+frmgr),npos[1][npos[0]]);
-						}
-						fillData(npos[1][npos[0]+1],$t,frmgr);
-						$($t).jqGrid("setSelection",npos[1][npos[0]+1]);
-						if($.isFunction(p.afterclickPgButtons)) {
-							p.afterclickPgButtons('next',$("#"+frmgr),npos[1][npos[0]+1]);
-						}
-						updateNav(npos[0]+1,npos[1].length-1);
-					}
-					return false;
-				});
-				$("#pData", "#"+frmtb+"_2").click(function(e){
-					if(!checkUpdates()) { return false; }
-					$("#FormError","#"+frmtb).hide();
-					var ppos = getCurrPos();
-					if(ppos[0] != -1 && ppos[1][ppos[0]-1]) {
-						if($.isFunction(p.onclickPgButtons)) {
-							p.onclickPgButtons('prev',$("#"+frmgr),ppos[1][ppos[0]]);
-						}
-						fillData(ppos[1][ppos[0]-1],$t,frmgr);
-						$($t).jqGrid("setSelection",ppos[1][ppos[0]-1]);
-						if($.isFunction(p.afterclickPgButtons)) {
-							p.afterclickPgButtons('prev',$("#"+frmgr),ppos[1][ppos[0]-1]);
-						}
-						updateNav(ppos[0]-1,ppos[1].length-1);
-					}
-					return false;
-				});
-			}
-			var posInit =getCurrPos();
-			updateNav(posInit[0],posInit[1].length-1);
-
-		});
-	},
-	viewGridRow : function(rowid, p){
-		p = $.extend({
-			top : 0,
-			left: 0,
-			width: 0,
-			height: 'auto',
-			dataheight: 'auto',
-			modal: false,
-			overlay: 10,
-			drag: true,
-			resize: true,
-			jqModal: true,
-			closeOnEscape : false,
-			labelswidth: '30%',
-			closeicon: [],
-			navkeys: [false,38,40],
-			onClose: null,
-			beforeShowForm : null,
-			beforeInitData : null,
-			viewPagerButtons : true
-		}, $.jgrid.view, p || {});
-		return this.each(function(){
-			var $t = this;
-			if (!$t.grid || !rowid) { return; }
-			if(!p.imgpath) { p.imgpath= $t.p.imgpath; }
-			// I hate to rewrite code, but ...
-			var gID = $t.p.id,
-			frmgr = "ViewGrid_"+gID , frmtb = "ViewTbl_"+gID,
-			IDs = {themodal:'viewmod'+gID,modalhead:'viewhd'+gID,modalcontent:'viewcnt'+gID, scrollelm : frmgr},
-			onBeforeInit = $.isFunction(p.beforeInitData) ? p.beforeInitData : false,
-			showFrm = true,
-			maxCols = 1, maxRows=0;
-			function focusaref(){ //Sfari 3 issues
-				if(p.closeOnEscape===true || p.navkeys[0]===true) {
-					setTimeout(function(){$(".ui-jqdialog-titlebar-close","#"+IDs.modalhead).focus();},0);
-				}
-			}
-			function createData(rowid,obj,tb,maxcols){
-				var nm, hc,trdata, cnt=0,tmp, dc, retpos=[], ind=false,
-				tdtmpl = "<td class='CaptionTD form-view-label ui-widget-content' width='"+p.labelswidth+"'>&#160;</td><td class='DataTD form-view-data ui-helper-reset ui-widget-content'>&#160;</td>", tmpl="",
-				tdtmpl2 = "<td class='CaptionTD form-view-label ui-widget-content'>&#160;</td><td class='DataTD form-view-data ui-widget-content'>&#160;</td>",
-				fmtnum = ['integer','number','currency'],max1 =0, max2=0 ,maxw,setme, viewfld;
-				for (var i =1;i<=maxcols;i++) {
-					tmpl += i == 1 ? tdtmpl : tdtmpl2;
-				}
-				// find max number align rigth with property formatter
-				$(obj.p.colModel).each( function(i) {
-					if(this.editrules && this.editrules.edithidden === true) {
-						hc = false;
-					} else {
-						hc = this.hidden === true ? true : false;
-					}
-					if(!hc && this.align==='right') {
-						if(this.formatter && $.inArray(this.formatter,fmtnum) !== -1 ) {
-							max1 = Math.max(max1,parseInt(this.width,10));
-						} else {
-							max2 = Math.max(max2,parseInt(this.width,10));
-						}
-					}
-				});
-				maxw  = max1 !==0 ? max1 : max2 !==0 ? max2 : 0;
-				ind = $(obj).jqGrid("getInd",rowid);
-				$(obj.p.colModel).each( function(i) {
-					nm = this.name;
-					setme = false;
-					// hidden fields are included in the form
-					if(this.editrules && this.editrules.edithidden === true) {
-						hc = false;
-					} else {
-						hc = this.hidden === true ? true : false;
-					}
-					dc = hc ? "style='display:none'" : "";
-					viewfld = (typeof this.viewable != 'boolean') ? true : this.viewable;
-					if ( nm !== 'cb' && nm !== 'subgrid' && nm !== 'rn' && viewfld) {
-						if(ind === false) {
-							tmp = "";
-						} else {
-							if(nm == obj.p.ExpandColumn && obj.p.treeGrid === true) {
-								tmp = $("td:eq("+i+")",obj.rows[ind]).text();
-							} else {
-								tmp = $("td:eq("+i+")",obj.rows[ind]).html();
-							}
-						}
-						setme = this.align === 'right' && maxw !==0 ? true : false;
-						var opt = $.extend({}, this.editoptions || {} ,{id:nm,name:nm}),
-						frmopt = $.extend({},{rowabove:false,rowcontent:''}, this.formoptions || {}),
-						rp = parseInt(frmopt.rowpos,10) || cnt+1,
-						cp = parseInt((parseInt(frmopt.colpos,10) || 1)*2,10);
-						if(frmopt.rowabove) {
-							var newdata = $("<tr><td class='contentinfo' colspan='"+(maxcols*2)+"'>"+frmopt.rowcontent+"</td></tr>");
-							$(tb).append(newdata);
-							newdata[0].rp = rp;
-						}
-						trdata = $(tb).find("tr[rowpos="+rp+"]");
-						if ( trdata.length===0 ) {
-							trdata = $("<tr "+dc+" rowpos='"+rp+"'></tr>").addClass("FormData").attr("id","trv_"+nm);
-							$(trdata).append(tmpl);
-							$(tb).append(trdata);
-							trdata[0].rp = rp;
-						}
-						$("td:eq("+(cp-2)+")",trdata[0]).html('<b>'+ (typeof frmopt.label === 'undefined' ? obj.p.colNames[i]: frmopt.label)+'</b>');
-						$("td:eq("+(cp-1)+")",trdata[0]).append("<span>"+tmp+"</span>").attr("id","v_"+nm);
-						if(setme){
-							$("td:eq("+(cp-1)+") span",trdata[0]).css({'text-align':'right',width:maxw+"px"});
-						}
-						retpos[cnt] = i;
-						cnt++;
-					}
-				});
-				if( cnt > 0) {
-					var idrow = $("<tr class='FormData' style='display:none'><td class='CaptionTD'></td><td colspan='"+ (maxcols*2-1)+"' class='DataTD'><input class='FormElement' id='id_g' type='text' name='id' value='"+rowid+"'/></td></tr>");
-					idrow[0].rp = cnt+99;
-					$(tb).append(idrow);
-				}
-				return retpos;
-			}
-			function fillData(rowid,obj){
-				var nm, hc,cnt=0,tmp, opt,trv;
-				trv = $(obj).jqGrid("getInd",rowid,true);
-				if(!trv) { return; }
-				$('td',trv).each( function(i) {
-					nm = obj.p.colModel[i].name;
-					// hidden fields are included in the form
-					if(obj.p.colModel[i].editrules && obj.p.colModel[i].editrules.edithidden === true) {
-						hc = false;
-					} else {
-						hc = obj.p.colModel[i].hidden === true ? true : false;
-					}
-					if ( nm !== 'cb' && nm !== 'subgrid' && nm !== 'rn') {
-						if(nm == obj.p.ExpandColumn && obj.p.treeGrid === true) {
-							tmp = $(this).text();
-						} else {
-							tmp = $(this).html();
-						}
-						opt = $.extend({},obj.p.colModel[i].editoptions || {});
-						nm = $.jgrid.jqID("v_"+nm);
-						$("#"+nm+" span","#"+frmtb).html(tmp);
-						if (hc) { $("#"+nm,"#"+frmtb).parents("tr:first").hide(); }
-						cnt++;
-					}
-				});
-				if(cnt>0) { $("#id_g","#"+frmtb).val(rowid); }
-			}
-			function updateNav(cr,totr){
-				if (cr===0) { $("#pData","#"+frmtb+"_2").addClass('ui-state-disabled'); } else { $("#pData","#"+frmtb+"_2").removeClass('ui-state-disabled'); }
-				if (cr==totr) { $("#nData","#"+frmtb+"_2").addClass('ui-state-disabled'); } else { $("#nData","#"+frmtb+"_2").removeClass('ui-state-disabled'); }
-			}
-			function getCurrPos() {
-				var rowsInGrid = $($t).jqGrid("getDataIDs"),
-				selrow = $("#id_g","#"+frmtb).val(),
-				pos = $.inArray(selrow,rowsInGrid);
-				return [pos,rowsInGrid];
-			}
-
-			if ( $("#"+IDs.themodal).html() !== null ) {
-				if(onBeforeInit) {
-					showFrm = onBeforeInit($("#"+frmgr));
-					if(typeof(showFrm) == "undefined") {
-						showFrm = true;
-					}
-				}
-				if(showFrm === false) { return; }
-				$(".ui-jqdialog-title","#"+IDs.modalhead).html(p.caption);
-				$("#FormError","#"+frmtb).hide();
-				fillData(rowid,$t);
-				if($.isFunction(p.beforeShowForm)) { p.beforeShowForm($("#"+frmgr)); }
-				$.jgrid.viewModal("#"+IDs.themodal,{gbox:"#gbox_"+gID,jqm:p.jqModal, jqM: false, overlay: p.overlay, modal:p.modal});
-				focusaref();
-			} else {
-				var dh = isNaN(p.dataheight) ? p.dataheight : p.dataheight+"px";
-				var frm = $("<form name='FormPost' id='"+frmgr+"' class='FormGrid' style='width:100%;overflow:auto;position:relative;height:"+dh+";'></form>"),
-				tbl =$("<table id='"+frmtb+"' class='EditTable' cellspacing='1' cellpadding='2' border='0' style='table-layout:fixed'><tbody></tbody></table>");
-				if(onBeforeInit) {
-					showFrm = onBeforeInit($("#"+frmgr));
-					if(typeof(showFrm) == "undefined") {
-						showFrm = true;
-					}
-				}
-				if(showFrm === false) { return; }
-				$($t.p.colModel).each( function(i) {
-					var fmto = this.formoptions;
-					maxCols = Math.max(maxCols, fmto ? fmto.colpos || 0 : 0 );
-					maxRows = Math.max(maxRows, fmto ? fmto.rowpos || 0 : 0 );
-				});
-				// set the id.
-				$(frm).append(tbl);
-				createData(rowid, $t, tbl, maxCols);
-				var rtlb = $t.p.direction == "rtl" ? true :false,
-				bp = rtlb ? "nData" : "pData",
-				bn = rtlb ? "pData" : "nData",
-
-				// buttons at footer
-				bP = "<a href='javascript:void(0)' id='"+bp+"' class='fm-button ui-state-default ui-corner-left'><span class='ui-icon ui-icon-triangle-1-w'></span></a>",
-				bN = "<a href='javascript:void(0)' id='"+bn+"' class='fm-button ui-state-default ui-corner-right'><span class='ui-icon ui-icon-triangle-1-e'></span></a>",
-				bC  ="<a href='javascript:void(0)' id='cData' class='fm-button ui-state-default ui-corner-all'>"+p.bClose+"</a>";
-				if(maxRows >  0) {
-					var sd=[];
-					$.each($(tbl)[0].rows,function(i,r){
-						sd[i] = r;
-					});
-					sd.sort(function(a,b){
-						if(a.rp > b.rp) {return 1;}
-						if(a.rp < b.rp) {return -1;}
-						return 0;
-					});
-					$.each(sd, function(index, row) {
-						$('tbody',tbl).append(row);
-					});
-				}
-				p.gbox = "#gbox_"+gID;
-				var cle = false;
-				if(p.closeOnEscape===true){
-					p.closeOnEscape = false;
-					cle = true;
-				}				
-				var bt = $("<span></span>").append(frm).append("<table border='0' class='EditTable' id='"+frmtb+"_2'><tbody><tr id='Act_Buttons'><td class='navButton' width='"+p.labelswidth+"'>"+(rtlb ? bN+bP : bP+bN)+"</td><td class='EditButton'>"+bC+"</td></tr></tbody></table>");
-				$.jgrid.createModal(IDs,bt,p,"#gview_"+$t.p.id,$("#gview_"+$t.p.id)[0]);
-				if(rtlb) {
-					$("#pData, #nData","#"+frmtb+"_2").css("float","right");
-					$(".EditButton","#"+frmtb+"_2").css("text-align","left");
-				}
-				if(!p.viewPagerButtons) { $("#pData, #nData","#"+frmtb+"_2").hide(); }
-				bt = null;
-				$("#"+IDs.themodal).keydown( function( e ) {
-					if(e.which === 27) {
-						if(cle)	{ $.jgrid.hideModal(this,{gb:p.gbox,jqm:p.jqModal, onClose: p.onClose}); }
-						return false;
-					}
-					if(p.navkeys[0]===true) {
-						if(e.which === p.navkeys[1]){ //up
-							$("#pData", "#"+frmtb+"_2").trigger("click");
-							return false;
-						}
-						if(e.which === p.navkeys[2]){ //down
-							$("#nData", "#"+frmtb+"_2").trigger("click");
-							return false;
-						}
-					}
-				});
-				p.closeicon = $.extend([true,"left","ui-icon-close"],p.closeicon);
-				if(p.closeicon[0]===true) {
-					$("#cData","#"+frmtb+"_2").addClass(p.closeicon[1] == "right" ? 'fm-button-icon-right' : 'fm-button-icon-left')
-					.append("<span class='ui-icon "+p.closeicon[2]+"'></span>");
-				}
-				if($.isFunction(p.beforeShowForm)) { p.beforeShowForm($("#"+frmgr)); }
-				$.jgrid.viewModal("#"+IDs.themodal,{gbox:"#gbox_"+gID,jqm:p.jqModal, modal:p.modal});
-				$(".fm-button:not(.ui-state-disabled)","#"+frmtb+"_2").hover(
-				   function(){$(this).addClass('ui-state-hover');}, 
-				   function(){$(this).removeClass('ui-state-hover');}
-				);
-				focusaref();
-				$("#cData", "#"+frmtb+"_2").click(function(e){
-					$.jgrid.hideModal("#"+IDs.themodal,{gb:"#gbox_"+gID,jqm:p.jqModal, onClose: p.onClose});
-					return false;
-				});
-				$("#nData", "#"+frmtb+"_2").click(function(e){
-					$("#FormError","#"+frmtb).hide();
-					var npos = getCurrPos();
-					npos[0] = parseInt(npos[0],10);
-					if(npos[0] != -1 && npos[1][npos[0]+1]) {
-						if($.isFunction(p.onclickPgButtons)) {
-							p.onclickPgButtons('next',$("#"+frmgr),npos[1][npos[0]]);
-						}
-						fillData(npos[1][npos[0]+1],$t);
-						$($t).jqGrid("setSelection",npos[1][npos[0]+1]);
-						if($.isFunction(p.afterclickPgButtons)) {
-							p.afterclickPgButtons('next',$("#"+frmgr),npos[1][npos[0]+1]);
-						}
-						updateNav(npos[0]+1,npos[1].length-1);
-					}
-					focusaref();
-					return false;
-				});
-				$("#pData", "#"+frmtb+"_2").click(function(e){
-					$("#FormError","#"+frmtb).hide();
-					var ppos = getCurrPos();
-					if(ppos[0] != -1 && ppos[1][ppos[0]-1]) {
-						if($.isFunction(p.onclickPgButtons)) {
-							p.onclickPgButtons('prev',$("#"+frmgr),ppos[1][ppos[0]]);
-						}
-						fillData(ppos[1][ppos[0]-1],$t);
-						$($t).jqGrid("setSelection",ppos[1][ppos[0]-1]);
-						if($.isFunction(p.afterclickPgButtons)) {
-							p.afterclickPgButtons('prev',$("#"+frmgr),ppos[1][ppos[0]-1]);
-						}
-						updateNav(ppos[0]-1,ppos[1].length-1);
-					}
-					focusaref();
-					return false;
-				});
-			}
-			var posInit =getCurrPos();
-			updateNav(posInit[0],posInit[1].length-1);
-		});
-	},
-	delGridRow : function(rowids,p) {
-		p = $.extend({
-			top : 0,
-			left: 0,
-			width: 240,
-			height: 'auto',
-			dataheight : 'auto',
-			modal: false,
-			overlay: 10,
-			drag: true,
-			resize: true,
-			url : '',
-			mtype : "POST",
-			reloadAfterSubmit: true,
-			beforeShowForm: null,
-			beforeInitData : null,
-			afterShowForm: null,
-			beforeSubmit: null,
-			onclickSubmit: null,
-			afterSubmit: null,
-			jqModal : true,
-			closeOnEscape : false,
-			delData: {},
-			delicon : [],
-			cancelicon : [],
-			onClose : null,
-			ajaxDelOptions : {},
-			processing : false,
-			serializeDelData : null,
-			useDataProxy : false
-		}, $.jgrid.del, p ||{});
-		rp_ge = p;
-		return this.each(function(){
-			var $t = this;
-			if (!$t.grid ) { return; }
-			if(!rowids) { return; }
-			var onBeforeShow = typeof p.beforeShowForm === 'function' ? true: false,
-			onAfterShow = typeof p.afterShowForm === 'function' ? true: false,
-			onBeforeInit = $.isFunction(p.beforeInitData) ? p.beforeInitData : false,
-			gID = $t.p.id, onCS = {},
-			showFrm = true,
-			dtbl = "DelTbl_"+gID,postd, idname, opers, oper,
-			IDs = {themodal:'delmod'+gID,modalhead:'delhd'+gID,modalcontent:'delcnt'+gID, scrollelm: dtbl};
-			if (jQuery.isArray(rowids)) { rowids = rowids.join(); }
-			if ( $("#"+IDs.themodal).html() !== null ) {
-				if(onBeforeInit) {
-					showFrm = onBeforeInit( $("#"+dtbl));
-					if(typeof(showFrm) == "undefined") {
-						showFrm = true;
-					}
-				}
-				if(showFrm === false) { return; }
-				$("#DelData>td","#"+dtbl).text(rowids);
-				$("#DelError","#"+dtbl).hide();
-				if( rp_ge.processing === true) {
-					rp_ge.processing=false;
-					$("#dData", "#"+dtbl).removeClass('ui-state-active');
-				}
-				if(onBeforeShow) { p.beforeShowForm($("#"+dtbl)); }
-				$.jgrid.viewModal("#"+IDs.themodal,{gbox:"#gbox_"+gID,jqm:p.jqModal,jqM: false, overlay: p.overlay, modal:p.modal});
-				if(onAfterShow) { p.afterShowForm($("#"+dtbl)); }
-			} else {
-				var dh = isNaN(p.dataheight) ? p.dataheight : p.dataheight+"px";
-				var tbl = "<div id='"+dtbl+"' class='formdata' style='width:100%;overflow:auto;position:relative;height:"+dh+";'>";
-				tbl += "<table class='DelTable'><tbody>";
-				// error data 
-				tbl += "<tr id='DelError' style='display:none'><td class='ui-state-error'></td></tr>";
-				tbl += "<tr id='DelData' style='display:none'><td >"+rowids+"</td></tr>";
-				tbl += "<tr><td class=\"delmsg\" style=\"white-space:pre;\">"+p.msg+"</td></tr><tr><td >&#160;</td></tr>";
-				// buttons at footer
-				tbl += "</tbody></table></div>";
-				var bS  = "<a href='javascript:void(0)' id='dData' class='fm-button ui-state-default ui-corner-all'>"+p.bSubmit+"</a>",
-				bC  = "<a href='javascript:void(0)' id='eData' class='fm-button ui-state-default ui-corner-all'>"+p.bCancel+"</a>";
-				tbl += "<table cellspacing='0' cellpadding='0' border='0' class='EditTable' id='"+dtbl+"_2'><tbody><tr><td><hr class='ui-widget-content' style='margin:1px'/></td></tr></tr><tr><td class='DelButton EditButton'>"+bS+"&#160;"+bC+"</td></tr></tbody></table>";
-				p.gbox = "#gbox_"+gID;
-				$.jgrid.createModal(IDs,tbl,p,"#gview_"+$t.p.id,$("#gview_"+$t.p.id)[0]);
-				
-				if(onBeforeInit) {
-					showFrm = onBeforeInit( $("#"+dtbl) );
-					if(typeof(showFrm) == "undefined") {
-						showFrm = true;
-					}
-				}
-				if(showFrm === false) { return; }
-
-				$(".fm-button","#"+dtbl+"_2").hover(
-				   function(){$(this).addClass('ui-state-hover');}, 
-				   function(){$(this).removeClass('ui-state-hover');}
-				);
-				p.delicon = $.extend([true,"left","ui-icon-scissors"],p.delicon);
-				p.cancelicon = $.extend([true,"left","ui-icon-cancel"],p.cancelicon);
-				if(p.delicon[0]===true) {
-					$("#dData","#"+dtbl+"_2").addClass(p.delicon[1] == "right" ? 'fm-button-icon-right' : 'fm-button-icon-left')
-					.append("<span class='ui-icon "+p.delicon[2]+"'></span>");
-				}
-				if(p.cancelicon[0]===true) {
-					$("#eData","#"+dtbl+"_2").addClass(p.cancelicon[1] == "right" ? 'fm-button-icon-right' : 'fm-button-icon-left')
-					.append("<span class='ui-icon "+p.cancelicon[2]+"'></span>");
-				}				
-				$("#dData","#"+dtbl+"_2").click(function(e){
-					var ret=[true,""]; onCS = {};
-					var postdata = $("#DelData>td","#"+dtbl).text(); //the pair is name=val1,val2,...
-					if( typeof p.onclickSubmit === 'function' ) { onCS = p.onclickSubmit(rp_ge, postdata) || {}; }
-					if( typeof p.beforeSubmit === 'function' ) { ret = p.beforeSubmit(postdata); }
-					if(ret[0] && !rp_ge.processing) {
-						rp_ge.processing = true;
-						$(this).addClass('ui-state-active');
-						opers = $t.p.prmNames;
-						postd = $.extend({},rp_ge.delData, onCS);
-						oper = opers.oper;
-						postd[oper] = opers.deloper;
-						idname = opers.id;
-						postd[idname] = postdata;
-
-						var ajaxOptions = $.extend({
-							url: rp_ge.url ? rp_ge.url : $($t).jqGrid('getGridParam','editurl'),
-							type: p.mtype,
-							data: $.isFunction(p.serializeDelData) ? p.serializeDelData(postd) : postd,
-							complete:function(data,Status){
-								if(Status != "success") {
-									ret[0] = false;
-									if ($.isFunction(rp_ge.errorTextFormat)) {
-										ret[1] = rp_ge.errorTextFormat(data);
-									} else {
-										ret[1] = Status + " Status: '" + data.statusText + "'. Error code: " + data.status;
-									}
-								} else {
-									// data is posted successful
-									// execute aftersubmit with the returned data from server
-									if( typeof rp_ge.afterSubmit === 'function' ) {
-										ret = rp_ge.afterSubmit(data,postd);
-									}
-								}
-								if(ret[0] === false) {
-									$("#DelError>td","#"+dtbl).html(ret[1]);
-									$("#DelError","#"+dtbl).show();
-								} else {
-									if(rp_ge.reloadAfterSubmit && $t.p.datatype != "local") {
-										$($t).trigger("reloadGrid");
-									} else {
-										var toarr = [];
-										toarr = postdata.split(",");
-										if($t.p.treeGrid===true){
-												try {$($t).jqGrid("delTreeNode",toarr[0]);} catch(e){}
-										} else {
-											for(var i=0;i<toarr.length;i++) {
-												$($t).jqGrid("delRowData",toarr[i]);
-											}
-										}
-										$t.p.selrow = null;
-										$t.p.selarrrow = [];
-									}
-									if($.isFunction(rp_ge.afterComplete)) {
-										setTimeout(function(){rp_ge.afterComplete(data,postdata);},500);
-									}
-								}
-								rp_ge.processing=false;
-								$("#dData", "#"+dtbl+"_2").removeClass('ui-state-active');
-								if(ret[0]) { $.jgrid.hideModal("#"+IDs.themodal,{gb:"#gbox_"+gID,jqm:p.jqModal, onClose: rp_ge.onClose}); }
-							},
-							error:function(xhr,st,err){
-								$("#DelError>td","#"+dtbl).html(st+ " : "+err);
-								$("#DelError","#"+dtbl).show();
-								rp_ge.processing=false;
-									$("#dData", "#"+dtbl+"_2").removeClass('ui-state-active');
-							}
-						}, $.jgrid.ajaxOptions, p.ajaxDelOptions);
-
-
-						if (!ajaxOptions.url && !rp_ge.useDataProxy) {
-							if ($.isFunction($t.p.dataProxy)) {
-								rp_ge.useDataProxy = true;
-							} else {
-								ret[0]=false; ret[1] += " "+$.jgrid.errors.nourl;
-							}
-						}
-						if (ret[0]) {
-							if (rp_ge.useDataProxy) { $t.p.dataProxy.call($t, ajaxOptions, "del_"+$t.p.id); }
-							else { $.ajax(ajaxOptions); }
-						}
-					}
-
-					if(ret[0] === false) {
-						$("#DelError>td","#"+dtbl).html(ret[1]);
-						$("#DelError","#"+dtbl).show();
-					}
-					return false;
-				});
-				$("#eData", "#"+dtbl+"_2").click(function(e){
-					$.jgrid.hideModal("#"+IDs.themodal,{gb:"#gbox_"+gID,jqm:p.jqModal, onClose: rp_ge.onClose});
-					return false;
-				});
-				if(onBeforeShow) { p.beforeShowForm($("#"+dtbl)); }
-				$.jgrid.viewModal("#"+IDs.themodal,{gbox:"#gbox_"+gID,jqm:p.jqModal, overlay: p.overlay, modal:p.modal});
-				if(onAfterShow) { p.afterShowForm($("#"+dtbl)); }
-			}
-			if(p.closeOnEscape===true) {
-				setTimeout(function(){$(".ui-jqdialog-titlebar-close","#"+IDs.modalhead).focus();},0);
-			}
-		});
-	},
-	navGrid : function (elem, o, pEdit,pAdd,pDel,pSearch, pView) {
-		o = $.extend({
-			edit: true,
-			editicon: "ui-icon-pencil",
-			add: true,
-			addicon:"ui-icon-plus",
-			del: true,
-			delicon:"ui-icon-trash",
-			search: true,
-			searchicon:"ui-icon-search",
-			refresh: true,
-			refreshicon:"ui-icon-refresh",
-			refreshstate: 'firstpage',
-			view: false,
-			viewicon : "ui-icon-document",
-			position : "left",
-			closeOnEscape : true,
-			beforeRefresh : null,
-			afterRefresh : null,
-			cloneToTop : false
-		}, $.jgrid.nav, o ||{});
-		return this.each(function() {
-			if(this.nav) { return; }
-			var alertIDs = {themodal:'alertmod',modalhead:'alerthd',modalcontent:'alertcnt'},
-			$t = this, vwidth, vheight, twd, tdw;
-			if(!$t.grid || typeof elem != 'string') { return; }
-			if ($("#"+alertIDs.themodal).html() === null) {
-				if (typeof window.innerWidth != 'undefined') {
-					vwidth = window.innerWidth;
-					vheight = window.innerHeight;
-				} else if (typeof document.documentElement != 'undefined' && typeof document.documentElement.clientWidth != 'undefined' && document.documentElement.clientWidth !== 0) {
-					vwidth = document.documentElement.clientWidth;
-					vheight = document.documentElement.clientHeight;
-				} else {
-					vwidth=1024;
-					vheight=768;
-				}
-				$.jgrid.createModal(alertIDs,"<div>"+o.alerttext+"</div><span tabindex='0'><span tabindex='-1' id='jqg_alrt'></span></span>",{gbox:"#gbox_"+$t.p.id,jqModal:true,drag:true,resize:true,caption:o.alertcap,top:vheight/2-25,left:vwidth/2-100,width:200,height:'auto',closeOnEscape:o.closeOnEscape},"","",true);
-			}
-			var clone = 1;
-			if(o.cloneToTop && $t.p.toppager) { clone = 2; }
-			for(var i = 0; i<clone; i++) {
-				var tbd,
-				navtbl = $("<table cellspacing='0' cellpadding='0' border='0' class='ui-pg-table navtable' style='float:left;table-layout:auto;'><tbody><tr></tr></tbody></table>"),
-				sep = "<td class='ui-pg-button ui-state-disabled' style='width:4px;'><span class='ui-separator'></span></td>",
-				pgid, elemids;
-				if(i===0) {
-					pgid = elem;
-					elemids = $t.p.id;
-					if(pgid == $t.p.toppager) {
-						elemids += "_top";
-						clone = 1;
-					}
-				} else {
-					pgid = $t.p.toppager;
-					elemids = $t.p.id+"_top";
-				}
-				if($t.p.direction == "rtl") { $(navtbl).attr("dir","rtl").css("float","right"); }
-				if (o.add) {
-					pAdd = pAdd || {};
-					tbd = $("<td class='ui-pg-button ui-corner-all'></td>");
-					$(tbd).append("<div class='ui-pg-div'><span class='ui-icon "+o.addicon+"'></span>"+o.addtext+"</div>");
-					$("tr",navtbl).append(tbd);
-					$(tbd,navtbl)
-					.attr({"title":o.addtitle || "",id : pAdd.id || "add_"+elemids})
-					.click(function(){
-						if (!$(this).hasClass('ui-state-disabled')) {
-							if (typeof o.addfunc == 'function') {
-								o.addfunc();
-							} else {
-								$($t).jqGrid("editGridRow","new",pAdd);
-							}
-						}
-						return false;
-					}).hover(
-						function () {
-							if (!$(this).hasClass('ui-state-disabled')) {
-								$(this).addClass("ui-state-hover");
-							}
-						},
-						function () {$(this).removeClass("ui-state-hover");}
-					);
-					tbd = null;
-				}
-				if (o.edit) {
-					tbd = $("<td class='ui-pg-button ui-corner-all'></td>");
-					pEdit = pEdit || {};
-					$(tbd).append("<div class='ui-pg-div'><span class='ui-icon "+o.editicon+"'></span>"+o.edittext+"</div>");
-					$("tr",navtbl).append(tbd);
-					$(tbd,navtbl)
-					.attr({"title":o.edittitle || "",id: pEdit.id || "edit_"+elemids})
-					.click(function(){
-						if (!$(this).hasClass('ui-state-disabled')) {
-							var sr = $t.p.selrow;
-							if (sr) {
-								if(typeof o.editfunc == 'function') {
-									o.editfunc(sr);
-								} else {
-									$($t).jqGrid("editGridRow",sr,pEdit);
-								}
-							} else {
-								$.jgrid.viewModal("#"+alertIDs.themodal,{gbox:"#gbox_"+$t.p.id,jqm:true});
-								$("#jqg_alrt").focus();
-							}
-						}
-						return false;
-					}).hover(
-						function () {
-							if (!$(this).hasClass('ui-state-disabled')) {
-								$(this).addClass("ui-state-hover");
-							}
-						},
-						function () {$(this).removeClass("ui-state-hover");}
-					);
-					tbd = null;
-				}
-				if (o.view) {
-					tbd = $("<td class='ui-pg-button ui-corner-all'></td>");
-					pView = pView || {};
-					$(tbd).append("<div class='ui-pg-div'><span class='ui-icon "+o.viewicon+"'></span>"+o.viewtext+"</div>");
-					$("tr",navtbl).append(tbd);
-					$(tbd,navtbl)
-					.attr({"title":o.viewtitle || "",id: pView.id || "view_"+elemids})
-					.click(function(){
-						if (!$(this).hasClass('ui-state-disabled')) {
-							var sr = $t.p.selrow;
-							if (sr) {
-								$($t).jqGrid("viewGridRow",sr,pView);
-							} else {
-								$.jgrid.viewModal("#"+alertIDs.themodal,{gbox:"#gbox_"+$t.p.id,jqm:true});
-								$("#jqg_alrt").focus();
-							}
-						}
-						return false;
-					}).hover(
-						function () {
-							if (!$(this).hasClass('ui-state-disabled')) {
-								$(this).addClass("ui-state-hover");
-							}
-						},
-						function () {$(this).removeClass("ui-state-hover");}
-					);
-					tbd = null;
-				}
-				if (o.del) {
-					tbd = $("<td class='ui-pg-button ui-corner-all'></td>");
-					pDel = pDel || {};
-					$(tbd).append("<div class='ui-pg-div'><span class='ui-icon "+o.delicon+"'></span>"+o.deltext+"</div>");
-					$("tr",navtbl).append(tbd);
-					$(tbd,navtbl)
-					.attr({"title":o.deltitle || "",id: pDel.id || "del_"+elemids})
-					.click(function(){
-						if (!$(this).hasClass('ui-state-disabled')) {
-							var dr;
-							if($t.p.multiselect) {
-								dr = $t.p.selarrrow;
-								if(dr.length===0) { dr = null; }
-							} else {
-								dr = $t.p.selrow;
-							}
-							if(dr){
-								if("function" == typeof o.delfunc){
-									o.delfunc(dr);
-								}else{
-									$($t).jqGrid("delGridRow",dr,pDel);
-								}
-							} else  {
-								$.jgrid.viewModal("#"+alertIDs.themodal,{gbox:"#gbox_"+$t.p.id,jqm:true}); $("#jqg_alrt").focus();
-							}
-						}
-						return false;
-					}).hover(
-						function () {
-							if (!$(this).hasClass('ui-state-disabled')) {
-								$(this).addClass("ui-state-hover");
-							}
-						},
-						function () {$(this).removeClass("ui-state-hover");}
-					);
-					tbd = null;
-				}
-				if(o.add || o.edit || o.del || o.view) { $("tr",navtbl).append(sep); }
-				if (o.search) {
-					tbd = $("<td class='ui-pg-button ui-corner-all'></td>");
-					pSearch = pSearch || {};
-					$(tbd).append("<div class='ui-pg-div'><span class='ui-icon "+o.searchicon+"'></span>"+o.searchtext+"</div>");
-					$("tr",navtbl).append(tbd);
-					$(tbd,navtbl)
-					.attr({"title":o.searchtitle  || "",id:pSearch.id || "search_"+elemids})
-					.click(function(){
-						if (!$(this).hasClass('ui-state-disabled')) {
-							$($t).jqGrid("searchGrid",pSearch);
-						}
-						return false;
-					}).hover(
-						function () {
-							if (!$(this).hasClass('ui-state-disabled')) {
-								$(this).addClass("ui-state-hover");
-							}
-						},
-						function () {$(this).removeClass("ui-state-hover");}
-					);
-					tbd = null;
-				}
-				if (o.refresh) {
-					tbd = $("<td class='ui-pg-button ui-corner-all'></td>");
-					$(tbd).append("<div class='ui-pg-div'><span class='ui-icon "+o.refreshicon+"'></span>"+o.refreshtext+"</div>");
-					$("tr",navtbl).append(tbd);
-					$(tbd,navtbl)
-					.attr({"title":o.refreshtitle  || "",id: "refresh_"+elemids})
-					.click(function(){
-						if (!$(this).hasClass('ui-state-disabled')) {
-							if($.isFunction(o.beforeRefresh)) { o.beforeRefresh(); }
-							$t.p.search = false;
-							try {
-								var gID = $t.p.id;
-								$t.p.postData.filters ="";
-								$("#fbox_"+gID).jqFilter('resetFilter');
-							    if($.isFunction($t.clearToolbar)) { $t.clearToolbar(false); }
-							} catch (e) {}
-							switch (o.refreshstate) {
-								case 'firstpage':
-								    $($t).trigger("reloadGrid", [{page:1}]);
-									break;
-								case 'current':
-								    $($t).trigger("reloadGrid", [{current:true}]);
-									break;
-							}
-							if($.isFunction(o.afterRefresh)) { o.afterRefresh(); }
-						}
-						return false;
-					}).hover(
-						function () {
-							if (!$(this).hasClass('ui-state-disabled')) {
-								$(this).addClass("ui-state-hover");
-							}
-						},
-						function () {$(this).removeClass("ui-state-hover");}
-					);
-					tbd = null;
-				}
-				tdw = $(".ui-jqgrid").css("font-size") || "11px";
-				$('body').append("<div id='testpg2' class='ui-jqgrid ui-widget ui-widget-content' style='font-size:"+tdw+";visibility:hidden;' ></div>");
-				twd = $(navtbl).clone().appendTo("#testpg2").width();
-				$("#testpg2").remove();
-				$(pgid+"_"+o.position,pgid).append(navtbl);
-				if($t.p._nvtd) {
-					if(twd > $t.p._nvtd[0] ) {
-						$(pgid+"_"+o.position,pgid).width(twd);
-						$t.p._nvtd[0] = twd;
-					}
-					$t.p._nvtd[1] = twd;
-				}
-				tdw =null; twd=null; navtbl =null;
-				this.nav = true;
-			}
-		});
-	},
-	navButtonAdd : function (elem, p) {
-		p = $.extend({
-			caption : "newButton",
-			title: '',
-			buttonicon : 'ui-icon-newwin',
-			onClickButton: null,
-			position : "last",
-			cursor : 'pointer'
-		}, p ||{});
-		return this.each(function() {
-			if( !this.grid)  { return; }
-			if( elem.indexOf("#") !== 0) { elem = "#"+elem; }
-			var findnav = $(".navtable",elem)[0], $t = this;
-			if (findnav) {
-				if( p.id && $("#"+p.id, findnav).html() !== null )  { return; }
-				var tbd = $("<td></td>");
-				if(p.buttonicon.toString().toUpperCase() == "NONE") {
-                    $(tbd).addClass('ui-pg-button ui-corner-all').append("<div class='ui-pg-div'>"+p.caption+"</div>");
-				} else	{
-					$(tbd).addClass('ui-pg-button ui-corner-all').append("<div class='ui-pg-div'><span class='ui-icon "+p.buttonicon+"'></span>"+p.caption+"</div>");
-				}
-				if(p.id) {$(tbd).attr("id",p.id);}
-				if(p.position=='first'){
-					if(findnav.rows[0].cells.length ===0 ) {
-						$("tr",findnav).append(tbd);
-					} else {
-						$("tr td:eq(0)",findnav).before(tbd);
-					}
-				} else {
-					$("tr",findnav).append(tbd);
-				}
-				$(tbd,findnav)
-				.attr("title",p.title  || "")
-				.click(function(e){
-					if (!$(this).hasClass('ui-state-disabled')) {
-						if ($.isFunction(p.onClickButton) ) { p.onClickButton.call($t,e); }
-					}
-					return false;
-				})
-				.hover(
-					function () {
-						if (!$(this).hasClass('ui-state-disabled')) {
-							$(this).addClass('ui-state-hover');
-						}
-					},
-					function () {$(this).removeClass("ui-state-hover");}
-				);
-			}
-		});
-	},
-	navSeparatorAdd:function (elem,p) {
-		p = $.extend({
-			sepclass : "ui-separator",
-			sepcontent: ''
-		}, p ||{});		
-		return this.each(function() {
-			if( !this.grid)  { return; }
-			if( elem.indexOf("#") !== 0) { elem = "#"+elem; }
-			var findnav = $(".navtable",elem)[0];
-			if(findnav) {
-				var sep = "<td class='ui-pg-button ui-state-disabled' style='width:4px;'><span class='"+p.sepclass+"'></span>"+p.sepcontent+"</td>";
-				$("tr",findnav).append(sep);
-			}
-		});
-	},
-	GridToForm : function( rowid, formid ) {
-		return this.each(function(){
-			var $t = this;
-			if (!$t.grid) { return; } 
-			var rowdata = $($t).jqGrid("getRowData",rowid);
-			if (rowdata) {
-				for(var i in rowdata) {
-					if ( $("[name="+i+"]",formid).is("input:radio") || $("[name="+i+"]",formid).is("input:checkbox"))  {
-						$("[name="+i+"]",formid).each( function() {
-							if( $(this).val() == rowdata[i] ) {
-								$(this).attr("checked","checked");
-							} else {
-								$(this).attr("checked","");
-							}
-						});
-					} else {
-					// this is very slow on big table and form.
-						$("[name="+i+"]",formid).val(rowdata[i]);
-					}
-				}
-			}
-		});
-	},
-	FormToGrid : function(rowid, formid, mode, position){
-		return this.each(function() {
-			var $t = this;
-			if(!$t.grid) { return; }
-			if(!mode) { mode = 'set'; }
-			if(!position) { position = 'first'; }
-			var fields = $(formid).serializeArray();
-			var griddata = {};
-			$.each(fields, function(i, field){
-				griddata[field.name] = field.value;
-			});
-			if(mode=='add') { $($t).jqGrid("addRowData",rowid,griddata, position); }
-			else if(mode=='set') { $($t).jqGrid("setRowData",rowid,griddata); }
-		});
-	}
-});
-})(jQuery);
diff --git a/addons/base/static/lib/jquery.jqGrid/js/grid.grouping.js b/addons/base/static/lib/jquery.jqGrid/js/grid.grouping.js
deleted file mode 100644
index 1efa53165e5..00000000000
--- a/addons/base/static/lib/jquery.jqGrid/js/grid.grouping.js
+++ /dev/null
@@ -1,255 +0,0 @@
-// Grouping module
-;(function($){
-$.jgrid.extend({
-	groupingSetup : function () {
-		return this.each(function (){
-			var $t = this,
-			grp = $t.p.groupingView;
-			if(grp !== null && ( (typeof grp === 'object') || $.isFunction(grp) ) ) {
-				if(!grp.groupField.length) {
-					$t.p.grouping = false;
-                } else {
-					for(var i=0;i<grp.groupField.length;i++) {
-						if(!grp.groupOrder[i]) {
-							grp.groupOrder[i] = 'asc';
-						}
-						if(!grp.groupText[i]) {
-							grp.groupText[i] = '{0}';
-						}
-						if( typeof(grp.groupColumnShow[i]) != 'boolean') {
-							grp.groupColumnShow[i] = true;
-						}
-						if( typeof(grp.groupSummary[i]) != 'boolean') {
-							grp.groupSummary[i] = false;
-						}
-						if(grp.groupColumnShow[i] === true) {
-							$($t).jqGrid('showCol',grp.groupField[i]);
-						} else {
-							$($t).jqGrid('hideCol',grp.groupField[i]);
-						}
-						grp.sortitems[i] = [];
-						grp.sortnames[i] = [];
-						grp.summaryval[i] = [];
-						if(grp.groupSummary[i]) {
-							grp.summary[i] =[];
-							var cm = $t.p.colModel;
-							for(var j=0, cml = cm.length; j < cml; j++) {
-								if(cm[j].summaryType) {
-									grp.summary[i].push({nm:cm[j].name,st:cm[j].summaryType, v:''});
-								}
-							}
-						}
-					}
-					$t.p.scroll = false;
-					$t.p.rownumbers = false;
-					$t.p.subGrid = false;
-					$t.p.treeGrid = false;
-					$t.p.gridview = true;
-				}
-			} else {
-				$t.p.grouping = false;
-			}
-		});
-	},
-	groupingPrepare : function (rData, items, gdata, record) {
-		this.each(function(){
-			// currently only one level
-			// Is this a good idea to do it so!!!!?????
-			items[0]  += "";
-			var itm = items[0].toString().split(' ').join('');
-			
-			var grp = this.p.groupingView, $t= this;
-			if(gdata.hasOwnProperty(itm)) {
-				gdata[itm].push(rData);
-			} else {
-				gdata[itm] = [];
-				gdata[itm].push(rData);
-				grp.sortitems[0].push(itm);
-				grp.sortnames[0].push($.trim(items[0].toString()));
-				grp.summaryval[0][itm] = $.extend(true,[],grp.summary[0]);
-			}
-			if(grp.groupSummary[0]) {
-				$.each(grp.summaryval[0][itm],function(i,n) {
-					if ($.isFunction(this.st)) {
-						this.v = this.st.call($t, this.v, this.nm, record);
-					} else {
-						this.v = $($t).jqGrid('groupingCalculations.'+this.st, this.v, this.nm, record);
-					}
-				});
-			}
-		});
-		return gdata;
-	},
-	groupingToggle : function(hid){
-		this.each(function(){
-			var $t = this,
-			grp = $t.p.groupingView,
-			strpos = hid.lastIndexOf('_'),
-			uid = hid.substring(0,strpos+1),
-			num = parseInt(hid.substring(strpos+1),10)+1,
-			minus = grp.minusicon,
-			plus = grp.plusicon,
-			collapsed = false;
-			if( $("#"+hid+" span").hasClass(minus) ) {
-				if(grp.showSummaryOnHide && grp.groupSummary[0]) {
-					$("#"+hid).nextUntil(".jqfoot").hide();
-				} else  {
-					$("#"+hid).nextUntil("#"+uid+String(num)).hide();
-				}
-				$("#"+hid+" span").removeClass(minus).addClass(plus);
-				collapsed = true;
-			} else {
-				$("#"+hid).nextUntil("#"+uid+String(num)).show();
-				$("#"+hid+" span").removeClass(plus).addClass(minus);
-				collapsed = false;
-			}
-			if( $.isFunction($t.p.onClickGroup)) { $t.p.onClickGroup.call($t, hid , collapsed); }
-
-		});
-		return false;
-	},
-	groupingRender : function (grdata, colspans ) {
-		return this.each(function(){
-			var $t = this,
-			grp = $t.p.groupingView,
-			str = "", icon = "", hid, pmrtl ="", gv, cp, ii;
-			//only one level for now
-			if(!grp.groupDataSorted) {
-				// ???? TO BE IMPROVED
-				grp.sortitems[0].sort();
-				grp.sortnames[0].sort();
-				if(grp.groupOrder[0].toLowerCase() == 'desc')
-				{
-					grp.sortitems[0].reverse();
-					grp.sortnames[0].reverse();
-				}
-			}   
-			if(grp.groupCollapse) { pmrtl = grp.plusicon; }
-			else {pmrtl = grp.minusicon;}
-			pmrtl += " tree-wrap-"+$t.p.direction; 
-			ii = 0;
-			while(ii < colspans) {
-				if($t.p.colModel[ii].name == grp.groupField[0]) {
-					cp = ii;
-					break;
-				}
-				ii++;
-			}
-			$.each(grp.sortitems[0],function(i,n){
-				hid = $t.p.id+"ghead_"+i;
-				icon = "<span style='cursor:pointer;' class='ui-icon "+pmrtl+"' onclick=\"jQuery('#"+$t.p.id+"').jqGrid('groupingToggle','"+hid+"');return false;\"></span>";
-				try {
-					gv = $t.formatter(hid, grp.sortnames[0][i], cp, grp.sortitems[0] );
-				} catch (egv) {
-					gv = grp.sortnames[0][i];
-				}
-				str += "<tr id=\""+hid+"\" role=\"row\" class= \"ui-widget-content jqgroup ui-row-"+$t.p.direction+"\"><td colspan=\""+colspans+"\">"+icon+$.jgrid.format(grp.groupText[0], gv, grdata[n].length)+"</td></tr>";
-				for(var kk=0;kk<grdata[n].length;kk++) {
-					str += grdata[n][kk].join('');
-				}
-				if(grp.groupSummary[0]) {
-					var hhdr = "";
-					if(grp.groupCollapse && !grp.showSummaryOnHide) {
-						hhdr = " style=\"display:none;\"";
-					}
-					str += "<tr"+hhdr+" role=\"row\" class=\"ui-widget-content jqfoot ui-row-"+$t.p.direction+"\">";
-					var fdata = grp.summaryval[0][n],
-					cm = $t.p.colModel,
-					vv, grlen = grdata[n].length;
-					for(var k=0; k<colspans;k++) {
-						var tmpdata = "<td "+$t.formatCol(k,1,'')+">&#160;</td>",
-						tplfld = "{0}";
-						$.each(fdata,function(){
-							if(this.nm == cm[k].name) {
-								if(cm[k].summaryTpl)  {
-									tplfld = cm[k].summaryTpl;
-								}
-								if(this.st == 'avg') {
-									if(this.v && grlen > 0) {
-										this.v = (this.v/grlen);
-									}
-								}
-								try {
-									vv = $t.formatter('', this.v, k, this);
-								} catch (ef) {
-									vv = this.v;
-								}
-								tmpdata= "<td "+$t.formatCol(k,1,'')+">"+$.jgrid.format(tplfld,vv)+ "</td>";
-								return false;
-							}
-						});
-						str += tmpdata;
-					}
-					str += "</tr>";
-				}
-			});
-			$("#"+$t.p.id+" tbody:first").append(str);
-			// free up memory
-			str = null;
-		});
-	},
-	groupingGroupBy : function (name, options, current) {
-		return this.each(function(){
-			var $t = this;
-			if(typeof(name) == "string") {
-				name = [name];
-			}
-			var grp = $t.p.groupingView;
-			$t.p.grouping = true;
-			// show previoous hidden  groups if they are hidden
-			for(var i=0;i<grp.groupField.length;i++) {
-				if(!grp.groupColumnShow[i]) {
-					$($t).jqGrid('showCol',grp.groupField[i]);
-				}
-			}
-			$t.p.groupingView = $.extend($t.p.groupingView, options || {});
-			grp.groupField = name;
-			$($t).trigger("reloadGrid");
-		});
-	},
-	groupingRemove : function (current) {
-		return this.each(function(){
-			var $t = this;
-			if(typeof(current) == 'undefined') {
-				current = true;
-			}
-			$t.p.grouping = false;
-			if(current===true) {
-				$("tr.jqgroup, tr.jqfoot","#"+$t.p.id+" tbody:first").remove();
-				$("tr.jqgrow:hidden","#"+$t.p.id+" tbody:first").show();
-			} else {
-				$($t).trigger("reloadGrid");
-			}
-		});
-	},
-	groupingCalculations : {
-		"sum" : function(v, field, rc) {
-			return parseFloat(v||0) + parseFloat((rc[field]||0));
-		},
-		"min" : function(v, field, rc) {
-			if(v==="") {
-				return parseFloat(rc[field]||0);
-			}
-			return Math.min(parseFloat(v),parseFloat(rc[field]||0));
-		},
-		"max" : function(v, field, rc) {
-			if(v==="") {
-				return parseFloat(rc[field]||0);
-			}
-			return Math.max(parseFloat(v),parseFloat(rc[field]||0));
-		},
-		"count" : function(v, field, rc) {
-			if(v==="") {v=0;}
-			if(rc.hasOwnProperty(field)) {
-				return v+1;
-			} else {
-				return 0;
-			}
-		},
-		"avg" : function(v, field, rc) {
-			// the same as sum, but at end we divide it
-			return parseFloat(v||0) + parseFloat((rc[field]||0));
-		}
-	}
-});
-})(jQuery);
\ No newline at end of file
diff --git a/addons/base/static/lib/jquery.jqGrid/js/grid.import.js b/addons/base/static/lib/jquery.jqGrid/js/grid.import.js
deleted file mode 100644
index 9db115b16f0..00000000000
--- a/addons/base/static/lib/jquery.jqGrid/js/grid.import.js
+++ /dev/null
@@ -1,201 +0,0 @@
-;(function($){
-/*
- * jqGrid extension for constructing Grid Data from external file
- * Tony Tomov tony@trirand.com
- * http://trirand.com/blog/ 
- * Dual licensed under the MIT and GPL licenses:
- * http://www.opensource.org/licenses/mit-license.php
- * http://www.gnu.org/licenses/gpl-2.0.html
-**/ 
-    $.jgrid.extend({
-        jqGridImport : function(o) {
-            o = $.extend({
-                imptype : "xml", // xml, json, xmlstring, jsonstring
-                impstring: "",
-                impurl: "",
-                mtype: "GET",
-                impData : {},
-                xmlGrid :{
-                    config : "roots>grid",
-                    data: "roots>rows"
-                },
-                jsonGrid :{
-                    config : "grid",
-                    data: "data"
-                },
-                ajaxOptions :{}
-            }, o || {});
-            return this.each(function(){
-                var $t = this;
-                var XmlConvert = function (xml,o) {
-                    var cnfg = $(o.xmlGrid.config,xml)[0];
-                    var xmldata = $(o.xmlGrid.data,xml)[0], jstr, jstr1;
-                    if(xmlJsonClass.xml2json && $.jgrid.parse) {
-                        jstr = xmlJsonClass.xml2json(cnfg," ");
-                        jstr = $.jgrid.parse(jstr);
-                        for(var key in jstr) {
-                            if(jstr.hasOwnProperty(key)) {
-                                jstr1=jstr[key];
-                            }
-                        }
-                        if(xmldata) {
-                        // save the datatype
-                            var svdatatype = jstr.grid.datatype;
-                            jstr.grid.datatype = 'xmlstring';
-                            jstr.grid.datastr = xml;
-                            $($t).jqGrid( jstr1 ).jqGrid("setGridParam",{datatype:svdatatype});
-                        } else {
-                            $($t).jqGrid( jstr1 );
-                        }
-                        jstr = null;jstr1=null;
-                    } else {
-                        alert("xml2json or parse are not present");
-                    }
-                };
-                var JsonConvert = function (jsonstr,o){
-                    if (jsonstr && typeof jsonstr == 'string') {
-                        var json = $.jgrid.parse(jsonstr);
-                        var gprm = json[o.jsonGrid.config];
-                        var jdata = json[o.jsonGrid.data];
-                        if(jdata) {
-                            var svdatatype = gprm.datatype;
-                            gprm.datatype = 'jsonstring';
-                            gprm.datastr = jdata;
-                            $($t).jqGrid( gprm ).jqGrid("setGridParam",{datatype:svdatatype});
-                        } else {
-                            $($t).jqGrid( gprm );
-                        }
-                    }
-                };
-                switch (o.imptype){
-                    case 'xml':
-                        $.ajax($.extend({
-                            url:o.impurl,
-                            type:o.mtype,
-                            data: o.impData,
-                            dataType:"xml",
-                            complete: function(xml,stat) {
-                                if(stat == 'success') {
-                                    XmlConvert(xml.responseXML,o);
-                                    if($.isFunction(o.importComplete)) {
-                                        o.importComplete(xml);
-                                    }
-                                }
-                                xml=null;
-                            }
-                        }, o.ajaxOptions));
-                        break;
-                    case 'xmlstring' :
-                        // we need to make just the conversion and use the same code as xml
-                        if(o.impstring && typeof o.impstring == 'string') {
-                            var xmld = $.jgrid.stringToDoc(o.impstring);
-                            if(xmld) {
-                                XmlConvert(xmld,o);
-                                if($.isFunction(o.importComplete)) {
-                                    o.importComplete(xmld);
-                                }
-                                o.impstring = null;
-                            }
-                            xmld = null;
-                        }
-                        break;
-                    case 'json':
-                        $.ajax($.extend({
-                            url:o.impurl,
-                            type:o.mtype,
-                            data: o.impData,
-                            dataType:"json",
-                            complete: function(json,stat) {
-                                if(stat == 'success') {
-                                    JsonConvert(json.responseText,o );
-                                    if($.isFunction(o.importComplete)) {
-                                        o.importComplete(json);
-                                    }
-                                }
-                                json=null;
-                            }
-                        }, o.ajaxOptions ));
-                        break;
-                    case 'jsonstring' :
-                        if(o.impstring && typeof o.impstring == 'string') {
-                            JsonConvert(o.impstring,o );
-                            if($.isFunction(o.importComplete)) {
-                                o.importComplete(o.impstring);
-                            }
-                            o.impstring = null;
-                        }
-                        break;
-                }
-            });
-        },
-        jqGridExport : function(o) {
-            o = $.extend({
-                exptype : "xmlstring",
-                root: "grid",
-                ident: "\t"
-            }, o || {});
-            var ret = null;
-            this.each(function () {
-                if(!this.grid) { return;}
-                var gprm = $.extend({},$(this).jqGrid("getGridParam"));
-                // we need to check for:
-                // 1.multiselect, 2.subgrid  3. treegrid and remove the unneded columns from colNames
-                if(gprm.rownumbers) {
-                    gprm.colNames.splice(0,1);
-                    gprm.colModel.splice(0,1);
-                }
-                if(gprm.multiselect) {
-                    gprm.colNames.splice(0,1);
-                    gprm.colModel.splice(0,1);
-                }
-                if(gprm.subGrid) {
-                    gprm.colNames.splice(0,1);
-                    gprm.colModel.splice(0,1);
-                }
-                gprm.knv = null;
-                if(gprm.treeGrid) {
-                    for (var key in gprm.treeReader) {
-                        if(gprm.treeReader.hasOwnProperty(key)) {
-                            gprm.colNames.splice(gprm.colNames.length-1);
-                            gprm.colModel.splice(gprm.colModel.length-1);
-                        }
-                    }
-                }
-                switch (o.exptype) {
-                    case 'xmlstring' :
-                        ret = "<"+o.root+">"+xmlJsonClass.json2xml(gprm,o.ident)+"</"+o.root+">";
-                        break;
-                    case 'jsonstring' :
-                        ret = "{"+ xmlJsonClass.toJson(gprm,o.root,o.ident)+"}";
-                        if(gprm.postData.filters !== undefined) {
-                            ret=ret.replace(/filters":"/,'filters":');
-                            ret=ret.replace(/}]}"/,'}]}');
-                        }
-                        break;
-                }
-            });
-            return ret;
-        },
-        excelExport : function(o) {
-            o = $.extend({
-                exptype : "remote",
-                url : null,
-                oper: "oper",
-                tag: "excel",
-                exportOptions : {}
-            }, o || {});
-            return this.each(function(){
-                if(!this.grid) { return;}
-                var url;
-                if(o.exptype == "remote") {
-                    var pdata = $.extend({},this.p.postData);
-                    pdata[o.oper] = o.tag;
-                    var params = jQuery.param(pdata);
-                    if(o.url.indexOf("?") != -1) { url = o.url+"&"+params; }
-                    else { url = o.url+"?"+params; }
-                    window.location = url;
-                }
-            });
-        }
-    });
-})(jQuery);
\ No newline at end of file
diff --git a/addons/base/static/lib/jquery.jqGrid/js/grid.inlinedit.js b/addons/base/static/lib/jquery.jqGrid/js/grid.inlinedit.js
deleted file mode 100644
index 9f8e921f7a7..00000000000
--- a/addons/base/static/lib/jquery.jqGrid/js/grid.inlinedit.js
+++ /dev/null
@@ -1,255 +0,0 @@
-;(function($){
-/**
- * jqGrid extension for manipulating Grid Data
- * Tony Tomov tony@trirand.com
- * http://trirand.com/blog/ 
- * Dual licensed under the MIT and GPL licenses:
- * http://www.opensource.org/licenses/mit-license.php
- * http://www.gnu.org/licenses/gpl-2.0.html
-**/ 
-$.jgrid.extend({
-//Editing
-	editRow : function(rowid,keys,oneditfunc,succesfunc, url, extraparam, aftersavefunc,errorfunc, afterrestorefunc) {
-		return this.each(function(){
-			var $t = this, nm, tmp, editable, cnt=0, focus=null, svr={}, ind,cm;
-			if (!$t.grid ) { return; }
-			ind = $($t).jqGrid("getInd",rowid,true);
-			if( ind === false ) {return;}
-			editable = $(ind).attr("editable") || "0";
-			if (editable == "0" && !$(ind).hasClass("not-editable-row")) {
-				cm = $t.p.colModel;
-				$('td',ind).each( function(i) {
-					nm = cm[i].name;
-					var treeg = $t.p.treeGrid===true && nm == $t.p.ExpandColumn;
-					if(treeg) { tmp = $("span:first",this).html();}
-					else {
-						try {
-							tmp =  $.unformat(this,{rowId:rowid, colModel:cm[i]},i);
-						} catch (_) {
-							tmp = $(this).html();
-						}
-					}
-					if ( nm != 'cb' && nm != 'subgrid' && nm != 'rn') {
-						if($t.p.autoencode) { tmp = $.jgrid.htmlDecode(tmp); }
-						svr[nm]=tmp;
-						if(cm[i].editable===true) {
-							if(focus===null) { focus = i; }
-							if (treeg) { $("span:first",this).html(""); }
-							else { $(this).html(""); }
-							var opt = $.extend({},cm[i].editoptions || {},{id:rowid+"_"+nm,name:nm});
-							if(!cm[i].edittype) { cm[i].edittype = "text"; }
-							var elc = $.jgrid.createEl(cm[i].edittype,opt,tmp,true,$.extend({},$.jgrid.ajaxOptions,$t.p.ajaxSelectOptions || {}));
-							$(elc).addClass("editable");
-							if(treeg) { $("span:first",this).append(elc); }
-							else { $(this).append(elc); }
-							//Again IE
-							if(cm[i].edittype == "select" && cm[i].editoptions.multiple===true && $.browser.msie) {
-								$(elc).width($(elc).width());
-							}
-							cnt++;
-						}
-					}
-				});
-				if(cnt > 0) {
-					svr.id = rowid; $t.p.savedRow.push(svr);
-					$(ind).attr("editable","1");
-					$("td:eq("+focus+") input",ind).focus();
-					if(keys===true) {
-						$(ind).bind("keydown",function(e) {
-							if (e.keyCode === 27) {$($t).jqGrid("restoreRow",rowid, afterrestorefunc);}
-							if (e.keyCode === 13) {
-								var ta = e.target;
-								if(ta.tagName == 'TEXTAREA') { return true; }
-								$($t).jqGrid("saveRow",rowid,succesfunc, url, extraparam, aftersavefunc,errorfunc, afterrestorefunc );
-								return false;
-							}
-							e.stopPropagation();
-						});
-					}
-					if( $.isFunction(oneditfunc)) { oneditfunc.call($t, rowid); }
-				}
-			}
-		});
-	},
-	saveRow : function(rowid, succesfunc, url, extraparam, aftersavefunc,errorfunc, afterrestorefunc) {
-		return this.each(function(){
-		var $t = this, nm, tmp={}, tmp2={}, editable, fr, cv, ind;
-		if (!$t.grid ) { return; }
-		ind = $($t).jqGrid("getInd",rowid,true);
-		if(ind === false) {return;}
-		editable = $(ind).attr("editable");
-		url = url ? url : $t.p.editurl;
-		if (editable==="1") {
-			var cm;
-			$("td",ind).each(function(i) {
-				cm = $t.p.colModel[i];
-				nm = cm.name;
-				if ( nm != 'cb' && nm != 'subgrid' && cm.editable===true && nm != 'rn') {
-					switch (cm.edittype) {
-						case "checkbox":
-							var cbv = ["Yes","No"];
-							if(cm.editoptions ) {
-								cbv = cm.editoptions.value.split(":");
-							}
-							tmp[nm]=  $("input",this).attr("checked") ? cbv[0] : cbv[1]; 
-							break;
-						case 'text':
-						case 'password':
-						case 'textarea':
-						case "button" :
-							tmp[nm]=$("input, textarea",this).val();
-							break;
-						case 'select':
-							if(!cm.editoptions.multiple) {
-								tmp[nm] = $("select>option:selected",this).val();
-								tmp2[nm] = $("select>option:selected", this).text();
-							} else {
-								var sel = $("select",this), selectedText = [];
-								tmp[nm] = $(sel).val();
-								if(tmp[nm]) { tmp[nm]= tmp[nm].join(","); } else { tmp[nm] =""; }
-								$("select > option:selected",this).each(
-									function(i,selected){
-										selectedText[i] = $(selected).text();
-									}
-								);
-								tmp2[nm] = selectedText.join(",");
-							}
-							if(cm.formatter && cm.formatter == 'select') { tmp2={}; }
-							break;
-						case 'custom' :
-							try {
-								if(cm.editoptions && $.isFunction(cm.editoptions.custom_value)) {
-									tmp[nm] = cm.editoptions.custom_value.call($t, $(".customelement",this),'get');
-									if (tmp[nm] === undefined) { throw "e2"; }
-								} else { throw "e1"; }
-							} catch (e) {
-								if (e=="e1") { $.jgrid.info_dialog(jQuery.jgrid.errors.errcap,"function 'custom_value' "+$.jgrid.edit.msg.nodefined,jQuery.jgrid.edit.bClose); }
-								if (e=="e2") { $.jgrid.info_dialog(jQuery.jgrid.errors.errcap,"function 'custom_value' "+$.jgrid.edit.msg.novalue,jQuery.jgrid.edit.bClose); }
-								else { $.jgrid.info_dialog(jQuery.jgrid.errors.errcap,e.message,jQuery.jgrid.edit.bClose); }
-							}
-							break;
-					}
-					cv = $.jgrid.checkValues(tmp[nm],i,$t);
-					if(cv[0] === false) {
-						cv[1] = tmp[nm] + " " + cv[1];
-						return false;
-					}
-					if($t.p.autoencode) { tmp[nm] = $.jgrid.htmlEncode(tmp[nm]); }
-				}
-			});
-			if (cv[0] === false){
-				try {
-					var positions = $.jgrid.findPos($("#"+$.jgrid.jqID(rowid), $t.grid.bDiv)[0]);
-					$.jgrid.info_dialog($.jgrid.errors.errcap,cv[1],$.jgrid.edit.bClose,{left:positions[0],top:positions[1]});
-				} catch (e) {
-					alert(cv[1]);
-				}
-				return;
-			}
-			if(tmp) {
-				var idname, opers, oper;
-				opers = $t.p.prmNames;
-				oper = opers.oper;
-				idname = opers.id;
-				tmp[oper] = opers.editoper;
-				tmp[idname] = rowid;
-				if(typeof($t.p.inlineData) == 'undefined') { $t.p.inlineData ={}; }
-				if(typeof(extraparam) == 'undefined') { extraparam ={}; }
-				tmp = $.extend({},tmp,$t.p.inlineData,extraparam);
-			}
-			if (url == 'clientArray') {
-				tmp = $.extend({},tmp, tmp2);
-				if($t.p.autoencode) {
-					$.each(tmp,function(n,v){
-						tmp[n] = $.jgrid.htmlDecode(v);
-					});
-				}
-				var resp = $($t).jqGrid("setRowData",rowid,tmp);
-				$(ind).attr("editable","0");
-				for( var k=0;k<$t.p.savedRow.length;k++) {
-					if( $t.p.savedRow[k].id == rowid) {fr = k; break;}
-				}
-				if(fr >= 0) { $t.p.savedRow.splice(fr,1); }
-				if( $.isFunction(aftersavefunc) ) { aftersavefunc.call($t, rowid,resp); }
-			} else {
-				$("#lui_"+$t.p.id).show();
-				$.ajax($.extend({
-					url:url,
-					data: $.isFunction($t.p.serializeRowData) ? $t.p.serializeRowData.call($t, tmp) : tmp,
-					type: "POST",
-					complete: function(res,stat){
-						$("#lui_"+$t.p.id).hide();
-						if (stat === "success"){
-							var ret;
-							if( $.isFunction(succesfunc)) { ret = succesfunc.call($t, res);}
-							else { ret = true; }
-							if (ret===true) {
-								if($t.p.autoencode) {
-									$.each(tmp,function(n,v){
-										tmp[n] = $.jgrid.htmlDecode(v);
-									});
-								}
-								tmp = $.extend({},tmp, tmp2);
-								$($t).jqGrid("setRowData",rowid,tmp);
-								$(ind).attr("editable","0");
-								for( var k=0;k<$t.p.savedRow.length;k++) {
-									if( $t.p.savedRow[k].id == rowid) {fr = k; break;}
-								}
-								if(fr >= 0) { $t.p.savedRow.splice(fr,1); }
-								if( $.isFunction(aftersavefunc) ) { aftersavefunc.call($t, rowid,res); }
-							} else {
-								if($.isFunction(errorfunc) ) {
-									errorfunc.call($t, rowid, res, stat);
-								}
-								$($t).jqGrid("restoreRow",rowid, afterrestorefunc);
-							}
-						}
-					},
-					error:function(res,stat){
-						$("#lui_"+$t.p.id).hide();
-						if($.isFunction(errorfunc) ) {
-							errorfunc.call($t, rowid, res, stat);
-						} else {
-							alert("Error Row: "+rowid+" Result: " +res.status+":"+res.statusText+" Status: "+stat);
-						}
-						$($t).jqGrid("restoreRow",rowid, afterrestorefunc);
-					}
-				}, $.jgrid.ajaxOptions, $t.p.ajaxRowOptions || {}));
-			}
-			$(ind).unbind("keydown");
-		}
-		});
-	},
-	restoreRow : function(rowid, afterrestorefunc) {
-		return this.each(function(){
-			var $t= this, fr, ind, ares={};
-			if (!$t.grid ) { return; }
-			ind = $($t).jqGrid("getInd",rowid,true);
-			if(ind === false) {return;}
-			for( var k=0;k<$t.p.savedRow.length;k++) {
-				if( $t.p.savedRow[k].id == rowid) {fr = k; break;}
-			}
-			if(fr >= 0) {
-				if($.isFunction($.fn.datepicker)) {
-					try {
-						$("input.hasDatepicker","#"+$.jgrid.jqID(ind.id)).datepicker('hide');
-					} catch (e) {}
-				}
-				$.each($t.p.colModel, function(i,n){
-					if(this.editable === true && this.name in $t.p.savedRow[fr]) {
-						ares[this.name] = $t.p.savedRow[fr][this.name];
-					}
-				});
-				$($t).jqGrid("setRowData",rowid,ares);
-				$(ind).attr("editable","0").unbind("keydown");
-				$t.p.savedRow.splice(fr,1);
-			}
-			if ($.isFunction(afterrestorefunc))
-			{
-				afterrestorefunc.call($t, rowid);
-			}
-		});
-	}
-//end inline edit
-});
-})(jQuery);
diff --git a/addons/base/static/lib/jquery.jqGrid/js/grid.jqueryui.js b/addons/base/static/lib/jquery.jqGrid/js/grid.jqueryui.js
deleted file mode 100644
index 38b30919683..00000000000
--- a/addons/base/static/lib/jquery.jqGrid/js/grid.jqueryui.js
+++ /dev/null
@@ -1,504 +0,0 @@
-;(function($){
-/*
-**
- * jqGrid addons using jQuery UI 
- * Author: Mark Williams
- * Dual licensed under the MIT and GPL licenses:
- * http://www.opensource.org/licenses/mit-license.php
- * http://www.gnu.org/licenses/gpl-2.0.html
- * depends on jQuery UI 
-**/
-if ($.browser.msie && $.browser.version==8) {
-	$.expr[":"].hidden = function(elem) {
-		return elem.offsetWidth === 0 || elem.offsetHeight === 0 ||
-			elem.style.display == "none";
-	};
-}
-// requiere load multiselect before grid
-$.jgrid._multiselect = false;
-if($.ui) {
-	if ($.ui.multiselect ) {
-		if($.ui.multiselect.prototype._setSelected) {
-			var setSelected = $.ui.multiselect.prototype._setSelected;
-		    $.ui.multiselect.prototype._setSelected = function(item,selected) {
-		        var ret = setSelected.call(this,item,selected);
-		        if (selected && this.selectedList) {
-		            var elt = this.element;
-				    this.selectedList.find('li').each(function() {
-					    if ($(this).data('optionLink')) {
-						    $(this).data('optionLink').remove().appendTo(elt);
-					    }
-				    });
-		        }
-		        return ret;
-			};
-		}
-		if($.ui.multiselect.prototype.destroy) {
-			$.ui.multiselect.prototype.destroy = function() {
-				this.element.show();
-				this.container.remove();
-				if ($.Widget === undefined) {
-					$.widget.prototype.destroy.apply(this, arguments);
-				} else {
-					$.Widget.prototype.destroy.apply(this, arguments);
-	            }
-			};
-		}
-		$.jgrid._multiselect = true;
-	}
-}
-        
-$.jgrid.extend({
-	sortableColumns : function (tblrow)
-	{
-		return this.each(function (){
-			var ts = this;
-			function start() {ts.p.disableClick = true;}
-			var sortable_opts = {
-				"tolerance" : "pointer",
-				"axis" : "x",
-				"scrollSensitivity": "1",
-				"items": '>th:not(:has(#jqgh_cb,#jqgh_rn,#jqgh_subgrid),:hidden)',
-				"placeholder": {
-					element: function(item) {
-						var el = $(document.createElement(item[0].nodeName))
-						.addClass(item[0].className+" ui-sortable-placeholder ui-state-highlight")
-						.removeClass("ui-sortable-helper")[0];
-						return el;
-					},
-					update: function(self, p) {
-						p.height(self.currentItem.innerHeight() - parseInt(self.currentItem.css('paddingTop')||0, 10) - parseInt(self.currentItem.css('paddingBottom')||0, 10));
-						p.width(self.currentItem.innerWidth() - parseInt(self.currentItem.css('paddingLeft')||0, 10) - parseInt(self.currentItem.css('paddingRight')||0, 10));
-					}
-				},
-				"update": function(event, ui) {
-					var p = $(ui.item).parent();
-					var th = $(">th", p);
-					var colModel = ts.p.colModel;
-					var cmMap = {};
-					$.each(colModel, function(i) { cmMap[this.name]=i; });
-					var permutation = [];
-					th.each(function(i) {
-						var id = $(">div", this).get(0).id.replace(/^jqgh_/, "");
-							if (id in cmMap) {
-								permutation.push(cmMap[id]);
-							}
-					});
-	
-					$(ts).jqGrid("remapColumns",permutation, true, true);
-					if ($.isFunction(ts.p.sortable.update)) {
-						ts.p.sortable.update(permutation);
-					}
-					setTimeout(function(){ts.p.disableClick=false;}, 50);
-				}
-			};
-			if (ts.p.sortable.options) {
-				$.extend(sortable_opts, ts.p.sortable.options);
-			} else if ($.isFunction(ts.p.sortable)) {
-				ts.p.sortable = { "update" : ts.p.sortable };
-			}
-			if (sortable_opts.start) {
-				var s = sortable_opts.start;
-				sortable_opts.start = function(e,ui) {
-					start();
-					s.call(this,e,ui);
-				};
-			} else {
-				sortable_opts.start = start;
-			}
-			if (ts.p.sortable.exclude) {
-				sortable_opts.items += ":not("+ts.p.sortable.exclude+")";
-			}
-			tblrow.sortable(sortable_opts).data("sortable").floating = true;
-		});
-	},
-    columnChooser : function(opts) {
-        var self = this;
-		if($("#colchooser_"+self[0].p.id).length ) { return; }
-        var selector = $('<div id="colchooser_'+self[0].p.id+'" style="position:relative;overflow:hidden"><div><select multiple="multiple"></select></div></div>');
-        var select = $('select', selector);
-		
-		function insert(perm,i,v) {
-			if(i>=0){
-				var a = perm.slice();
-				var b = a.splice(i,Math.max(perm.length-i,i));
-				if(i>perm.length) { i = perm.length; }
-				a[i] = v;
-				return a.concat(b);
-			}
-		}
-        opts = $.extend({
-            "width" : 420,
-            "height" : 240,
-            "classname" : null,
-            "done" : function(perm) { if (perm) { self.jqGrid("remapColumns", perm, true); } },
-            /* msel is either the name of a ui widget class that
-               extends a multiselect, or a function that supports
-               creating a multiselect object (with no argument,
-               or when passed an object), and destroying it (when
-               passed the string "destroy"). */
-            "msel" : "multiselect",
-            /* "msel_opts" : {}, */
-
-            /* dlog is either the name of a ui widget class that 
-               behaves in a dialog-like way, or a function, that
-               supports creating a dialog (when passed dlog_opts)
-               or destroying a dialog (when passed the string
-               "destroy")
-               */
-            "dlog" : "dialog",
-
-            /* dlog_opts is either an option object to be passed 
-               to "dlog", or (more likely) a function that creates
-               the options object.
-               The default produces a suitable options object for
-               ui.dialog */
-            "dlog_opts" : function(opts) {
-                var buttons = {};
-                buttons[opts.bSubmit] = function() {
-                    opts.apply_perm();
-                    opts.cleanup(false);
-                };
-                buttons[opts.bCancel] = function() {
-                    opts.cleanup(true);
-                };
-                return {
-                    "buttons": buttons,
-                    "close": function() {
-                        opts.cleanup(true);
-                    },
-					"modal" : opts.modal ? opts.modal : false,
-					"resizable": opts.resizable ? opts.resizable : true,
-                    "width": opts.width+20
-                };
-            },
-            /* Function to get the permutation array, and pass it to the
-               "done" function */
-            "apply_perm" : function() {
-                $('option',select).each(function(i) {
-                    if (this.selected) {
-                        self.jqGrid("showCol", colModel[this.value].name);
-                    } else {
-                        self.jqGrid("hideCol", colModel[this.value].name);
-                    }
-                });
-                
-                var perm = [];
-				//fixedCols.slice(0);
-                $('option[selected]',select).each(function() { perm.push(parseInt(this.value,10)); });
-                $.each(perm, function() { delete colMap[colModel[parseInt(this,10)].name]; });
-                $.each(colMap, function() {
-					var ti = parseInt(this,10);
-					perm = insert(perm,ti,ti);
-				});
-                if (opts.done) {
-                    opts.done.call(self, perm);
-                }
-            },
-            /* Function to cleanup the dialog, and select. Also calls the
-               done function with no permutation (to indicate that the
-               columnChooser was aborted */
-            "cleanup" : function(calldone) {
-                call(opts.dlog, selector, 'destroy');
-                call(opts.msel, select, 'destroy');
-                selector.remove();
-                if (calldone && opts.done) {
-                    opts.done.call(self);
-                }
-            },
-			"msel_opts" : {}
-        }, $.jgrid.col, opts || {});
-		if($.ui) {
-			if ($.ui.multiselect ) {
-				if(opts.msel == "multiselect") {
-					if(!$.jgrid._multiselect) {
-						// should be in language file
-						alert("Multiselect plugin loaded after jqGrid. Please load the plugin before the jqGrid!");
-						return;
-					}
-					opts.msel_opts = $.extend($.ui.multiselect.defaults,opts.msel_opts);
-				}
-			}
-		}
-        if (opts.caption) {
-            selector.attr("title", opts.caption);
-        }
-        if (opts.classname) {
-            selector.addClass(opts.classname);
-            select.addClass(opts.classname);
-        }
-        if (opts.width) {
-            $(">div",selector).css({"width": opts.width,"margin":"0 auto"});
-            select.css("width", opts.width);
-        }
-        if (opts.height) {
-            $(">div",selector).css("height", opts.height);
-            select.css("height", opts.height - 10);
-        }
-        var colModel = self.jqGrid("getGridParam", "colModel");
-        var colNames = self.jqGrid("getGridParam", "colNames");
-        var colMap = {}, fixedCols = [];
-
-        select.empty();
-        $.each(colModel, function(i) {
-            colMap[this.name] = i;
-            if (this.hidedlg) {
-                if (!this.hidden) {
-                    fixedCols.push(i);
-                }
-                return;
-            }
-
-            select.append("<option value='"+i+"' "+
-                          (this.hidden?"":"selected='selected'")+">"+colNames[i]+"</option>");
-        });
-        function call(fn, obj) {
-            if (!fn) { return; }
-            if (typeof fn == 'string') {
-                if ($.fn[fn]) {
-                    $.fn[fn].apply(obj, $.makeArray(arguments).slice(2));
-                }
-            } else if ($.isFunction(fn)) {
-                fn.apply(obj, $.makeArray(arguments).slice(2));
-            }
-        }
-
-        var dopts = $.isFunction(opts.dlog_opts) ? opts.dlog_opts.call(self, opts) : opts.dlog_opts;
-        call(opts.dlog, selector, dopts);
-        var mopts = $.isFunction(opts.msel_opts) ? opts.msel_opts.call(self, opts) : opts.msel_opts;
-        call(opts.msel, select, mopts);
-    },
-	sortableRows : function (opts) {
-		// Can accept all sortable options and events
-		return this.each(function(){
-			var $t = this;
-			if(!$t.grid) { return; }
-			// Currently we disable a treeGrid sortable
-			if($t.p.treeGrid) { return; }
-			if($.fn.sortable) {
-				opts = $.extend({
-					"cursor":"move",
-					"axis" : "y",
-					"items": ".jqgrow"
-					},
-				opts || {});
-				if(opts.start && $.isFunction(opts.start)) {
-					opts._start_ = opts.start;
-					delete opts.start;
-				} else {opts._start_=false;}
-				if(opts.update && $.isFunction(opts.update)) {
-					opts._update_ = opts.update;
-					delete opts.update;
-				} else {opts._update_ = false;}
-				opts.start = function(ev,ui) {
-					$(ui.item).css("border-width","0px");
-					$("td",ui.item).each(function(i){
-						this.style.width = $t.grid.cols[i].style.width;
-					});
-					if($t.p.subGrid) {
-						var subgid = $(ui.item).attr("id");
-						try {
-							$($t).jqGrid('collapseSubGridRow',subgid);
-						} catch (e) {}
-					}
-					if(opts._start_) {
-						opts._start_.apply(this,[ev,ui]);
-					}
-				};
-				opts.update = function (ev,ui) {
-					$(ui.item).css("border-width","");
-					if($t.p.rownumbers === true) {
-						$("td.jqgrid-rownum",$t.rows).each(function(i){
-							$(this).html(i+1);
-						});
-					}
-					if(opts._update_) {
-						opts._update_.apply(this,[ev,ui]);
-					}
-				};
-				$("tbody:first",$t).sortable(opts);
-				$("tbody:first",$t).disableSelection();
-			}
-		});
-	},
-	gridDnD : function(opts) {
-		return this.each(function(){
-		var $t = this;
-		if(!$t.grid) { return; }
-		// Currently we disable a treeGrid drag and drop
-		if($t.p.treeGrid) { return; }
-		if(!$.fn.draggable || !$.fn.droppable) { return; }
-		function updateDnD ()
-		{
-			var datadnd = $.data($t,"dnd");
-		    $("tr.jqgrow:not(.ui-draggable)",$t).draggable($.isFunction(datadnd.drag) ? datadnd.drag.call($($t),datadnd) : datadnd.drag);
-		}
-		var appender = "<table id='jqgrid_dnd' class='ui-jqgrid-dnd'></table>";
-		if($("#jqgrid_dnd").html() === null) {
-			$('body').append(appender);
-		}
-
-		if(typeof opts == 'string' && opts == 'updateDnD' && $t.p.jqgdnd===true) {
-			updateDnD();
-			return;
-		}
-		opts = $.extend({
-			"drag" : function (opts) {
-				return $.extend({
-					start : function (ev, ui) {
-						// if we are in subgrid mode try to collapse the node
-						if($t.p.subGrid) {
-							var subgid = $(ui.helper).attr("id");
-							try {
-								$($t).jqGrid('collapseSubGridRow',subgid);
-							} catch (e) {}
-						}
-						// hack
-						// drag and drop does not insert tr in table, when the table has no rows
-						// we try to insert new empty row on the target(s)
-						for (var i=0;i<$.data($t,"dnd").connectWith.length;i++){
-							if($($.data($t,"dnd").connectWith[i]).jqGrid('getGridParam','reccount') == "0" ){
-								$($.data($t,"dnd").connectWith[i]).jqGrid('addRowData','jqg_empty_row',{});
-							}
-						}
-						ui.helper.addClass("ui-state-highlight");
-						$("td",ui.helper).each(function(i) {
-							this.style.width = $t.grid.headers[i].width+"px";
-						});
-						if(opts.onstart && $.isFunction(opts.onstart) ) { opts.onstart.call($($t),ev,ui); }
-					},
-					stop :function(ev,ui) {
-						if(ui.helper.dropped) {
-							var ids = $(ui.helper).attr("id");
-							$($t).jqGrid('delRowData',ids );
-						}
-						// if we have a empty row inserted from start event try to delete it
-						for (var i=0;i<$.data($t,"dnd").connectWith.length;i++){
-							$($.data($t,"dnd").connectWith[i]).jqGrid('delRowData','jqg_empty_row');
-						}
-						if(opts.onstop && $.isFunction(opts.onstop) ) { opts.onstop.call($($t),ev,ui); }
-					}
-				},opts.drag_opts || {});
-			},
-			"drop" : function (opts) {
-				return $.extend({
-					accept: function(d) {
-						if (!$(d).hasClass('jqgrow')) { return d;}
-						var tid = $(d).closest("table.ui-jqgrid-btable");
-						if(tid.length > 0 && $.data(tid[0],"dnd") !== undefined) {
-						    var cn = $.data(tid[0],"dnd").connectWith;
-						    return $.inArray('#'+this.id,cn) != -1 ? true : false;
-						}
-						return d;
-					},
-					drop: function(ev, ui) {
-						if (!$(ui.draggable).hasClass('jqgrow')) { return; }
-						var accept = $(ui.draggable).attr("id");
-						var getdata = ui.draggable.parent().parent().jqGrid('getRowData',accept);
-						if(!opts.dropbyname) {
-							var j =0, tmpdata = {}, dropname;
-							var dropmodel = $("#"+this.id).jqGrid('getGridParam','colModel');
-							try {
-								for (var key in getdata) {
-									if(getdata.hasOwnProperty(key) && dropmodel[j]) {
-										dropname = dropmodel[j].name;
-										tmpdata[dropname] = getdata[key];
-									}
-									j++;
-								}
-								getdata = tmpdata;
-							} catch (e) {}
-						}
-						ui.helper.dropped = true;
-						if(opts.beforedrop && $.isFunction(opts.beforedrop) ) {
-							//parameters to this callback - event, element, data to be inserted, sender, reciever
-							// should return object which will be inserted into the reciever
-							var datatoinsert = opts.beforedrop.call(this,ev,ui,getdata,$('#'+$t.id),$(this));
-							if (typeof datatoinsert != "undefined" && datatoinsert !== null && typeof datatoinsert == "object") { getdata = datatoinsert; }
-						}
-						if(ui.helper.dropped) {
-							var grid;
-							if(opts.autoid) {
-								if($.isFunction(opts.autoid)) {
-									grid = opts.autoid.call(this,getdata);
-								} else {
-									grid = Math.ceil(Math.random()*1000);
-									grid = opts.autoidprefix+grid;
-								}
-							}
-							// NULL is interpreted as undefined while null as object
-							$("#"+this.id).jqGrid('addRowData',grid,getdata,opts.droppos);
-						}
-						if(opts.ondrop && $.isFunction(opts.ondrop) ) { opts.ondrop.call(this,ev,ui, getdata); }
-					}}, opts.drop_opts || {});
-			},
-			"onstart" : null,
-			"onstop" : null,
-			"beforedrop": null,
-			"ondrop" : null,
-			"drop_opts" : {
-				"activeClass": "ui-state-active",
-				"hoverClass": "ui-state-hover"
-			},
-			"drag_opts" : {
-				"revert": "invalid",
-				"helper": "clone",
-				"cursor": "move",
-				"appendTo" : "#jqgrid_dnd",
-				"zIndex": 5000
-			},
-			"dropbyname" : false,
-			"droppos" : "first",
-			"autoid" : true,
-			"autoidprefix" : "dnd_"
-		}, opts || {});
-		
-		if(!opts.connectWith) { return; }
-		opts.connectWith = opts.connectWith.split(",");
-		opts.connectWith = $.map(opts.connectWith,function(n){return $.trim(n);});
-		$.data($t,"dnd",opts);
-		
-		if($t.p.reccount != "0" && !$t.p.jqgdnd) {
-			updateDnD();
-		}
-		$t.p.jqgdnd = true;
-		for (var i=0;i<opts.connectWith.length;i++){
-			var cn =opts.connectWith[i];
-			$(cn).droppable($.isFunction(opts.drop) ? opts.drop.call($($t),opts) : opts.drop);
-		}
-		});
-	},
-	gridResize : function(opts) {
-		return this.each(function(){
-			var $t = this;
-			if(!$t.grid || !$.fn.resizable) { return; }
-			opts = $.extend({}, opts || {});
-			if(opts.alsoResize ) {
-				opts._alsoResize_ = opts.alsoResize;
-				delete opts.alsoResize;
-			} else {
-				opts._alsoResize_ = false;
-			}
-			if(opts.stop && $.isFunction(opts.stop)) {
-				opts._stop_ = opts.stop;
-				delete opts.stop;
-			} else {
-				opts._stop_ = false;
-			}
-			opts.stop = function (ev, ui) {
-				$($t).jqGrid('setGridParam',{height:$("#gview_"+$t.p.id+" .ui-jqgrid-bdiv").height()});
-				$($t).jqGrid('setGridWidth',ui.size.width,opts.shrinkToFit);
-				if(opts._stop_) { opts._stop_.call($t,ev,ui); }
-			};
-			if(opts._alsoResize_) {
-				var optstest = "{\'#gview_"+$t.p.id+" .ui-jqgrid-bdiv\':true,'" +opts._alsoResize_+"':true}";
-				opts.alsoResize = eval('('+optstest+')'); // the only way that I found to do this
-			} else {
-				opts.alsoResize = $(".ui-jqgrid-bdiv","#gview_"+$t.p.id);
-			}
-			delete opts._alsoResize_;
-			$("#gbox_"+$t.p.id).resizable(opts);
-		});
-	}
-});
-})(jQuery);
diff --git a/addons/base/static/lib/jquery.jqGrid/js/grid.subgrid.js b/addons/base/static/lib/jquery.jqGrid/js/grid.subgrid.js
deleted file mode 100644
index d724c639958..00000000000
--- a/addons/base/static/lib/jquery.jqGrid/js/grid.subgrid.js
+++ /dev/null
@@ -1,260 +0,0 @@
-;(function($){
-/**
- * jqGrid extension for SubGrid Data
- * Tony Tomov tony@trirand.com
- * http://trirand.com/blog/ 
- * Dual licensed under the MIT and GPL licenses:
- * http://www.opensource.org/licenses/mit-license.php
- * http://www.gnu.org/licenses/gpl-2.0.html
-**/
-$.jgrid.extend({
-setSubGrid : function () {
-	return this.each(function (){
-		var $t = this, cm;
-		$t.p.colNames.unshift("");
-		$t.p.colModel.unshift({name:'subgrid',width: $.browser.safari ?  $t.p.subGridWidth+$t.p.cellLayout : $t.p.subGridWidth,sortable: false,resizable:false,hidedlg:true,search:false,fixed:true});
-		cm = $t.p.subGridModel;
-		if(cm[0]) {
-			cm[0].align = $.extend([],cm[0].align || []);
-			for(var i=0;i<cm[0].name.length;i++) { cm[0].align[i] = cm[0].align[i] || 'left';}
-		}
-	});
-},
-addSubGridCell :function (pos,iRow) {
-	var prp='',gv,sid;
-	this.each(function(){
-		prp = this.formatCol(pos,iRow);
-		gv = this.p.gridview;
-		sid= this.p.id;
-	});
-	if( gv === false ){
-		return "<td role=\"grid\" aria-describedby=\""+sid+"_subgrid\" class=\"ui-sgcollapsed sgcollapsed\" "+prp+"><a href='javascript:void(0);'><span class='ui-icon ui-icon-plus'></span></a></td>";
-	} else  {
-		return "<td role=\"grid\" aria-describedby=\""+sid+"_subgrid\" " +prp +"></td>";
-	}
-},
-addSubGrid : function(t,pos) {
-	return this.each(function(){
-		var ts = this;
-		if (!ts.grid ) { return; }
-		//-------------------------
-		var subGridCell = function(trdiv,cell,pos){
-			var tddiv = $("<td align='"+ts.p.subGridModel[0].align[pos]+"'></td>").html(cell);
-			$(trdiv).append(tddiv);
-		};
-		var subGridXml = function(sjxml, sbid){
-			var tddiv, i,  sgmap,
-			dummy = $("<table cellspacing='0' cellpadding='0' border='0'><tbody></tbody></table>"),
-			trdiv = $("<tr></tr>");
-			for (i = 0; i<ts.p.subGridModel[0].name.length; i++) {
-				tddiv = $("<th class='ui-state-default ui-th-subgrid ui-th-column ui-th-"+ts.p.direction+"'></th>");
-				$(tddiv).html(ts.p.subGridModel[0].name[i]);
-				$(tddiv).width( ts.p.subGridModel[0].width[i]);
-				$(trdiv).append(tddiv);
-			}
-			$(dummy).append(trdiv);
-			if (sjxml){
-				sgmap = ts.p.xmlReader.subgrid;
-				$(sgmap.root+" "+sgmap.row, sjxml).each( function(){
-					trdiv = $("<tr class='ui-widget-content ui-subtblcell'></tr>");
-					if(sgmap.repeatitems === true) {
-						$(sgmap.cell,this).each( function(i) {
-							subGridCell(trdiv, $(this).text() || '&#160;',i);
-						});
-					} else {
-						var f = ts.p.subGridModel[0].mapping || ts.p.subGridModel[0].name;
-						if (f) {
-							for (i=0;i<f.length;i++) {
-								subGridCell(trdiv, $(f[i],this).text() || '&#160;',i);
-							}
-						}
-					}
-					$(dummy).append(trdiv);
-				});
-			}
-			var pID = $("table:first",ts.grid.bDiv).attr("id")+"_";
-			$("#"+pID+sbid).append(dummy);
-			ts.grid.hDiv.loading = false;
-			$("#load_"+ts.p.id).hide();
-			return false;
-		};
-		var subGridJson = function(sjxml, sbid){
-			var tddiv,result , i,cur, sgmap,j,
-			dummy = $("<table cellspacing='0' cellpadding='0' border='0'><tbody></tbody></table>"),
-			trdiv = $("<tr></tr>");
-			for (i = 0; i<ts.p.subGridModel[0].name.length; i++) {
-				tddiv = $("<th class='ui-state-default ui-th-subgrid ui-th-column ui-th-"+ts.p.direction+"'></th>");
-				$(tddiv).html(ts.p.subGridModel[0].name[i]);
-				$(tddiv).width( ts.p.subGridModel[0].width[i]);
-				$(trdiv).append(tddiv);
-			}
-			$(dummy).append(trdiv);
-			if (sjxml){
-				sgmap = ts.p.jsonReader.subgrid;
-				result = sjxml[sgmap.root];
-				if ( typeof result !== 'undefined' ) {
-					for (i=0;i<result.length;i++) {
-						cur = result[i];
-						trdiv = $("<tr class='ui-widget-content ui-subtblcell'></tr>");
-						if(sgmap.repeatitems === true) {
-							if(sgmap.cell) { cur=cur[sgmap.cell]; }
-							for (j=0;j<cur.length;j++) {
-								subGridCell(trdiv, cur[j] || '&#160;',j);
-							}
-						} else {
-							var f = ts.p.subGridModel[0].mapping || ts.p.subGridModel[0].name;
-							if(f.length) {
-								for (j=0;j<f.length;j++) {
-									subGridCell(trdiv, cur[f[j]] || '&#160;',j);
-								}
-							}
-						}
-						$(dummy).append(trdiv);
-					}
-				}
-			}
-			var pID = $("table:first",ts.grid.bDiv).attr("id")+"_";
-			$("#"+pID+sbid).append(dummy);
-			ts.grid.hDiv.loading = false;
-			$("#load_"+ts.p.id).hide();
-			return false;
-		};
-		var populatesubgrid = function( rd ) {
-			var sid,dp, i, j;
-			sid = $(rd).attr("id");
-			dp = {nd_: (new Date().getTime())};
-			dp[ts.p.prmNames.subgridid]=sid;
-			if(!ts.p.subGridModel[0]) { return false; }
-			if(ts.p.subGridModel[0].params) {
-				for(j=0; j < ts.p.subGridModel[0].params.length; j++) {
-					for(i=0; i<ts.p.colModel.length; i++) {
-						if(ts.p.colModel[i].name == ts.p.subGridModel[0].params[j]) {
-							dp[ts.p.colModel[i].name]= $("td:eq("+i+")",rd).text().replace(/\&#160\;/ig,'');
-						}
-					}
-				}
-			}
-			if(!ts.grid.hDiv.loading) {
-				ts.grid.hDiv.loading = true;
-				$("#load_"+ts.p.id).show();
-				if(!ts.p.subgridtype) { ts.p.subgridtype = ts.p.datatype; }
-				if($.isFunction(ts.p.subgridtype)) {
-					ts.p.subgridtype.call(ts, dp);
-				} else {
-					ts.p.subgridtype = ts.p.subgridtype.toLowerCase();
-				}
-				switch(ts.p.subgridtype) {
-					case "xml":
-					case "json":
-					$.ajax($.extend({
-						type:ts.p.mtype,
-						url: ts.p.subGridUrl,
-						dataType:ts.p.subgridtype,
-						data: $.isFunction(ts.p.serializeSubGridData)? ts.p.serializeSubGridData.call(ts, dp) : dp,
-						complete: function(sxml) {
-							if(ts.p.subgridtype == "xml") {
-								subGridXml(sxml.responseXML, sid);
-							} else {
-								subGridJson($.jgrid.parse(sxml.responseText),sid);
-							}
-							sxml=null;
-						}
-					}, $.jgrid.ajaxOptions, ts.p.ajaxSubgridOptions || {}));
-					break;
-				}
-			}
-			return false;
-		};
-		var res,_id, pID,atd, nhc, subdata, bfsc;
-		$("td:eq("+pos+")",t).click( function(e) {
-			if($(this).hasClass("sgcollapsed")) {
-				pID = ts.p.id;
-				res = $(this).parent();
-				atd = pos >=1 ? "<td colspan='"+pos+"'>&#160;</td>":"";
-				_id = $(res).attr("id");
-				bfsc =true;
-				if($.isFunction(ts.p.subGridBeforeExpand)) {
-					bfsc = ts.p.subGridBeforeExpand.call(ts, pID+"_"+_id,_id);
-				}
-				if(bfsc === false) {return false;}
-				nhc = 0;
-				$.each(ts.p.colModel,function(i,v){
-					if(this.hidden === true || this.name == 'rn' || this.name == 'cb') {nhc++;}
-				});
-				subdata = "<tr role='row' class='ui-subgrid'>"+atd+"<td class='ui-widget-content subgrid-cell'><span class='ui-icon ui-icon-carat-1-sw'/></td><td colspan='"+parseInt(ts.p.colNames.length-1-nhc,10)+"' class='ui-widget-content subgrid-data'><div id="+pID+"_"+_id+" class='tablediv'>";
-				$(this).parent().after( subdata+ "</div></td></tr>" );
-				if( $.isFunction(ts.p.subGridRowExpanded)) {
-					ts.p.subGridRowExpanded.call(ts, pID+"_"+ _id,_id);
-				} else {
-					populatesubgrid(res);
-				}
-				$(this).html("<a href='javascript:void(0);'><span class='ui-icon ui-icon-minus'></span></a>").removeClass("sgcollapsed").addClass("sgexpanded");
-			} else if($(this).hasClass("sgexpanded")) {
-				bfsc = true;
-				if( $.isFunction(ts.p.subGridRowColapsed)) {
-					res = $(this).parent();
-					_id = $(res).attr("id");
-					bfsc = ts.p.subGridRowColapsed.call(ts, pID+"_"+_id,_id );
-				}
-				if(bfsc===false) {return false;}
-				$(this).parent().next().remove(".ui-subgrid");
-				$(this).html("<a href='javascript:void(0);'><span class='ui-icon ui-icon-plus'></span></a>").removeClass("sgexpanded").addClass("sgcollapsed");
-			}
-			return false;
-		});
-		ts.subGridXml = function(xml,sid) {subGridXml(xml,sid);};
-		ts.subGridJson = function(json,sid) {subGridJson(json,sid);};
-	});
-},
-expandSubGridRow : function(rowid) {
-	return this.each(function () {
-		var $t = this;
-		if(!$t.grid && !rowid) {return;}
-		if($t.p.subGrid===true) {
-			var rc = $(this).jqGrid("getInd",rowid,true);
-			if(rc) {
-				var sgc = $("td.sgcollapsed",rc)[0];
-				if(sgc) {
-					$(sgc).trigger("click");
-				}
-			}
-		}
-	});
-},
-collapseSubGridRow : function(rowid) {
-	return this.each(function () {
-		var $t = this;
-		if(!$t.grid && !rowid) {return;}
-		if($t.p.subGrid===true) {
-			var rc = $(this).jqGrid("getInd",rowid,true);
-			if(rc) {
-				var sgc = $("td.sgexpanded",rc)[0];
-				if(sgc) {
-					$(sgc).trigger("click");
-				}
-			}
-		}
-	});
-},
-toggleSubGridRow : function(rowid) {
-	return this.each(function () {
-		var $t = this;
-		if(!$t.grid && !rowid) {return;}
-		if($t.p.subGrid===true) {
-			var rc = $(this).jqGrid("getInd",rowid,true);
-			if(rc) {
-				var sgc = $("td.sgcollapsed",rc)[0];
-				if(sgc) {
-					$(sgc).trigger("click");
-				} else {
-					sgc = $("td.sgexpanded",rc)[0];
-					if(sgc) {
-						$(sgc).trigger("click");
-					}
-				}
-			}
-		}
-	});
-}
-});
-})(jQuery);
diff --git a/addons/base/static/lib/jquery.jqGrid/js/grid.tbltogrid.js b/addons/base/static/lib/jquery.jqGrid/js/grid.tbltogrid.js
deleted file mode 100644
index 364d4181433..00000000000
--- a/addons/base/static/lib/jquery.jqGrid/js/grid.tbltogrid.js
+++ /dev/null
@@ -1,106 +0,0 @@
-/*
- Transform a table to a jqGrid.
- Peter Romianowski <peter.romianowski@optivo.de> 
- If the first column of the table contains checkboxes or
- radiobuttons then the jqGrid is made selectable.
-*/
-// Addition - selector can be a class or id
-function tableToGrid(selector, options) {
-jQuery(selector).each(function() {
-	if(this.grid) {return;} //Adedd from Tony Tomov
-	// This is a small "hack" to make the width of the jqGrid 100%
-	jQuery(this).width("99%");
-	var w = jQuery(this).width();
-
-	// Text whether we have single or multi select
-	var inputCheckbox = jQuery('input[type=checkbox]:first', jQuery(this));
-	var inputRadio = jQuery('input[type=radio]:first', jQuery(this));
-	var selectMultiple = inputCheckbox.length > 0;
-	var selectSingle = !selectMultiple && inputRadio.length > 0;
-	var selectable = selectMultiple || selectSingle;
-	//var inputName = inputCheckbox.attr("name") || inputRadio.attr("name");
-
-	// Build up the columnModel and the data
-	var colModel = [];
-	var colNames = [];
-	jQuery('th', jQuery(this)).each(function() {
-		if (colModel.length === 0 && selectable) {
-			colModel.push({
-				name: '__selection__',
-				index: '__selection__',
-				width: 0,
-				hidden: true
-			});
-			colNames.push('__selection__');
-		} else {
-			colModel.push({
-				name: jQuery(this).attr("id") || jQuery.trim(jQuery.jgrid.stripHtml(jQuery(this).html())).split(' ').join('_'),
-				index: jQuery(this).attr("id") || jQuery.trim(jQuery.jgrid.stripHtml(jQuery(this).html())).split(' ').join('_'),
-				width: jQuery(this).width() || 150
-			});
-			colNames.push(jQuery(this).html());
-		}
-	});
-	var data = [];
-	var rowIds = [];
-	var rowChecked = [];
-	jQuery('tbody > tr', jQuery(this)).each(function() {
-		var row = {};
-		var rowPos = 0;
-		jQuery('td', jQuery(this)).each(function() {
-			if (rowPos === 0 && selectable) {
-				var input = jQuery('input', jQuery(this));
-				var rowId = input.attr("value");
-				rowIds.push(rowId || data.length);
-				if (input.attr("checked")) {
-					rowChecked.push(rowId);
-				}
-				row[colModel[rowPos].name] = input.attr("value");
-			} else {
-				row[colModel[rowPos].name] = jQuery(this).html();
-			}
-			rowPos++;
-		});
-		if(rowPos >0) { data.push(row); }
-	});
-
-	// Clear the original HTML table
-	jQuery(this).empty();
-
-	// Mark it as jqGrid
-	jQuery(this).addClass("scroll");
-
-	jQuery(this).jqGrid(jQuery.extend({
-		datatype: "local",
-		width: w,
-		colNames: colNames,
-		colModel: colModel,
-		multiselect: selectMultiple
-		//inputName: inputName,
-		//inputValueCol: imputName != null ? "__selection__" : null
-	}, options || {}));
-
-	// Add data
-	var a;
-	for (a = 0; a < data.length; a++) {
-		var id = null;
-		if (rowIds.length > 0) {
-			id = rowIds[a];
-			if (id && id.replace) {
-				// We have to do this since the value of a checkbox
-				// or radio button can be anything 
-				id = encodeURIComponent(id).replace(/[.\-%]/g, "_");
-			}
-		}
-		if (id === null) {
-			id = a + 1;
-		}
-		jQuery(this).jqGrid("addRowData",id, data[a]);
-	}
-
-	// Set the selection
-	for (a = 0; a < rowChecked.length; a++) {
-		jQuery(this).jqGrid("setSelection",rowChecked[a]);
-	}
-});
-};
diff --git a/addons/base/static/lib/jquery.jqGrid/js/grid.treegrid.js b/addons/base/static/lib/jquery.jqGrid/js/grid.treegrid.js
deleted file mode 100644
index 94ec770c153..00000000000
--- a/addons/base/static/lib/jquery.jqGrid/js/grid.treegrid.js
+++ /dev/null
@@ -1,490 +0,0 @@
-;(function($) {
-/*
-**
- * jqGrid extension - Tree Grid
- * Tony Tomov tony@trirand.com
- * http://trirand.com/blog/ 
- * Dual licensed under the MIT and GPL licenses:
- * http://www.opensource.org/licenses/mit-license.php
- * http://www.gnu.org/licenses/gpl.html
-**/ 
-$.jgrid.extend({
-	setTreeNode : function(rd, row){
-		return this.each(function(){
-			var $t = this;
-			if( !$t.grid || !$t.p.treeGrid ) { return; }
-			var expCol = $t.p.expColInd,
-			expanded = $t.p.treeReader.expanded_field,
-			isLeaf = $t.p.treeReader.leaf_field,
-			level = $t.p.treeReader.level_field,
-			loaded = $t.p.treeReader.loaded;
-
-			row.level = rd[level];
-			
-			if($t.p.treeGridModel == 'nested') {
-				var lft = rd[$t.p.treeReader.left_field],
-				rgt = rd[$t.p.treeReader.right_field];
-				if(!rd[isLeaf]) {
-				// NS Model
-					rd[isLeaf] = (parseInt(rgt,10) === parseInt(lft,10)+1) ? 'true' : 'false';
-				}
-			} else {
-				//row.parent_id = rd[$t.p.treeReader.parent_id_field];
-			}
-			var curLevel = parseInt(rd[level],10), ident,lftpos;
-			if($t.p.tree_root_level === 0) {
-				ident = curLevel+1;
-				lftpos = curLevel;
-			} else {
-				ident = curLevel;
-				lftpos = curLevel -1;
-			}
-			var twrap = "<div class='tree-wrap tree-wrap-"+$t.p.direction+"' style='width:"+(ident*18)+"px;'>";
-			twrap += "<div style='"+($t.p.direction=="rtl" ? "right:" : "left:")+(lftpos*18)+"px;' class='ui-icon ";
-
-			if(rd[loaded] != undefined) {
-				if(rd[loaded]=="true" || rd[loaded]===true) {
-					rd[loaded] = true;
-				} else {
-					rd[loaded] = false;
-				}
-			}
-			if(rd[isLeaf] == "true" || rd[isLeaf] === true) {
-				twrap += $t.p.treeIcons.leaf+" tree-leaf'";
-				rd[isLeaf] = true;
-				rd[expanded] = false;
-			} else {
-				if(rd[expanded] == "true" || rd[expanded] === true) {
-					twrap += $t.p.treeIcons.minus+" tree-minus treeclick'";
-					rd[expanded] = true;
-				} else {
-					twrap += $t.p.treeIcons.plus+" tree-plus treeclick'";
-					rd[expanded] = false;
-				}
-				rd[isLeaf] = false;
-			}
-			twrap += "</div></div>";
-			if(!$t.p.loadonce) {
-				rd[$t.p.localReader.id] = row.id;
-				$t.p.data.push(rd);
-				$t.p._index[row.id]=$t.p.data.length-1;
-			}
-			if(parseInt(rd[level],10) !== parseInt($t.p.tree_root_level,10)) {                
-				if(!$($t).jqGrid("isVisibleNode",rd)){ 
-					$(row).css("display","none");
-				}
-			}
-			
-			$("td:eq("+expCol+")",row).wrapInner("<span></span>").prepend(twrap);
-			$(".treeclick",row).bind("click",function(e){
-				var target = e.target || e.srcElement,
-				ind2 =$(target,$t.rows).closest("tr.jqgrow")[0].id,
-				pos = $t.p._index[ind2],
-				isLeaf = $t.p.treeReader.leaf_field,
-				expanded = $t.p.treeReader.expanded_field;
-				if(!$t.p.data[pos][isLeaf]){
-					if($t.p.data[pos][expanded]){
-						$($t).jqGrid("collapseRow",$t.p.data[pos]);
-						$($t).jqGrid("collapseNode",$t.p.data[pos]);
-					} else {
-						$($t).jqGrid("expandRow",$t.p.data[pos]);
-						$($t).jqGrid("expandNode",$t.p.data[pos]);
-					}
-				}
-				return false;
-			});
-			if($t.p.ExpandColClick === true) {
-			$("span", row).css("cursor","pointer").bind("click",function(e){
-				var target = e.target || e.srcElement,
-				ind2 =$(target,$t.rows).closest("tr.jqgrow")[0].id,
-				pos = $t.p._index[ind2],
-				isLeaf = $t.p.treeReader.leaf_field,
-				expanded = $t.p.treeReader.expanded_field;
-				if(!$t.p.data[pos][isLeaf]){
-					if($t.p.data[pos][expanded]){
-						$($t).jqGrid("collapseRow",$t.p.data[pos]);
-						$($t).jqGrid("collapseNode",$t.p.data[pos]);
-					} else {
-						$($t).jqGrid("expandRow",$t.p.data[pos]);
-						$($t).jqGrid("expandNode",$t.p.data[pos]);
-					}
-				}
-				$($t).jqGrid("setSelection",ind2);
-				return false;
-			});
-			}
-		});
-	},
-	setTreeGrid : function() {
-		return this.each(function (){
-			var $t = this, i=0, pico;
-			if(!$t.p.treeGrid) { return; }
-			if(!$t.p.treedatatype ) { $.extend($t.p,{treedatatype: $t.p.datatype}); }
-			$t.p.subGrid = false; $t.p.altRows =false;
-			$t.p.pgbuttons = false; $t.p.pginput = false;
-			$t.p.multiselect = false; $t.p.rowList = [];
-			pico = 'ui-icon-triangle-1-' + ($t.p.direction=="rtl" ? 'w' : 'e');
-			$t.p.treeIcons = $.extend({plus:pico,minus:'ui-icon-triangle-1-s',leaf:'ui-icon-radio-off'},$t.p.treeIcons || {});
-			if($t.p.treeGridModel == 'nested') {
-				$t.p.treeReader = $.extend({
-					level_field: "level",
-					left_field:"lft",
-					right_field: "rgt",
-					leaf_field: "isLeaf",
-					expanded_field: "expanded",
-					loaded: "loaded"
-				},$t.p.treeReader);
-			} else
-				if($t.p.treeGridModel == 'adjacency') {
-				$t.p.treeReader = $.extend({
-						level_field: "level",
-						parent_id_field: "parent",
-						leaf_field: "isLeaf",
-						expanded_field: "expanded",
-						loaded: "loaded"
-				},$t.p.treeReader );
-			}
-			for (var key in $t.p.colModel){
-				if($t.p.colModel.hasOwnProperty(key)) {
-					if($t.p.colModel[key].name == $t.p.ExpandColumn) {
-						$t.p.expColInd = i;
-						break;
-					}
-					i++;
-				}
-			}
-			if(!$t.p.expColInd) { $t.p.expColInd = 0; }
-			$.each($t.p.treeReader,function(i,n){
-				if(n){
-					$t.p.colNames.push(n);
-					$t.p.colModel.push({name:n,width:1,hidden:true,sortable:false,resizable:false,hidedlg:true,editable:true,search:false});
-				}
-			});			
-		});
-	},
-	expandRow: function (record){
-		this.each(function(){
-			var $t = this;
-			if(!$t.grid || !$t.p.treeGrid) { return; }
-			var childern = $($t).jqGrid("getNodeChildren",record),
-			//if ($($t).jqGrid("isVisibleNode",record)) {
-			expanded = $t.p.treeReader.expanded_field;
-			$(childern).each(function(i){
-				var id  = $.jgrid.getAccessor(this,$t.p.localReader.id);
-				$("#"+id,$t.grid.bDiv).css("display","");
-				if(this[expanded]) {
-					$($t).jqGrid("expandRow",this);
-				}
-			});
-			//}
-		});
-	},
-	collapseRow : function (record) {
-		this.each(function(){
-			var $t = this;
-			if(!$t.grid || !$t.p.treeGrid) { return; }
-			var childern = $($t).jqGrid("getNodeChildren",record),
-			expanded = $t.p.treeReader.expanded_field;
-			$(childern).each(function(i){
-				var id  = $.jgrid.getAccessor(this,$t.p.localReader.id);
-				$("#"+id,$t.grid.bDiv).css("display","none");
-				if(this[expanded]){
-					$($t).jqGrid("collapseRow",this);
-				}
-			});
-		});
-	},
-	// NS ,adjacency models
-	getRootNodes : function() {
-		var result = [];
-		this.each(function(){
-			var $t = this;
-			if(!$t.grid || !$t.p.treeGrid) { return; }
-			switch ($t.p.treeGridModel) {
-				case 'nested' :
-					var level = $t.p.treeReader.level_field;
-					$($t.p.data).each(function(i){
-						if(parseInt(this[level],10) === parseInt($t.p.tree_root_level,10)) {
-							result.push(this);
-						}
-					});
-					break;
-				case 'adjacency' :
-					var parent_id = $t.p.treeReader.parent_id_field;
-					$($t.p.data).each(function(i){
-						if(this[parent_id] === null || String(this[parent_id]).toLowerCase() == "null") {
-							result.push(this);
-						}
-					});
-					break;
-			}
-		});
-		return result;
-	},
-	getNodeDepth : function(rc) {
-		var ret = null;
-		this.each(function(){
-			if(!this.grid || !this.p.treeGrid) { return; }
-			var $t = this;
-			switch ($t.p.treeGridModel) {
-				case 'nested' :
-					var level = $t.p.treeReader.level_field;
-					ret = parseInt(rc[level],10) - parseInt($t.p.tree_root_level,10);
-					break;
-				case 'adjacency' :
-					ret = $($t).jqGrid("getNodeAncestors",rc).length;
-					break;
-			}
-		});
-		return ret;
-	},
-	getNodeParent : function(rc) {
-		var result = null;
-		this.each(function(){
-			var $t = this;
-			if(!$t.grid || !$t.p.treeGrid) { return; }
-			switch ($t.p.treeGridModel) {
-				case 'nested' :
-					var lftc = $t.p.treeReader.left_field,
-					rgtc = $t.p.treeReader.right_field,
-					levelc = $t.p.treeReader.level_field,
-					lft = parseInt(rc[lftc],10), rgt = parseInt(rc[rgtc],10), level = parseInt(rc[levelc],10);
-					$(this.p.data).each(function(){
-						if(parseInt(this[levelc],10) === level-1 && parseInt(this[lftc],10) < lft && parseInt(this[rgtc],10) > rgt) {
-							result = this;
-							return false;
-						}
-					});
-					break;
-				case 'adjacency' :
-					var parent_id = $t.p.treeReader.parent_id_field,
-					dtid = $t.p.localReader.id;
-					$(this.p.data).each(function(i,val){
-						if(this[dtid] == rc[parent_id] ) {
-							result = this;
-							return false;
-						}
-					});
-					break;
-			}
-		});
-		return result;
-	},
-	getNodeChildren : function(rc) {
-		var result = [];
-		this.each(function(){
-			var $t = this;
-			if(!$t.grid || !$t.p.treeGrid) { return; }
-			switch ($t.p.treeGridModel) {
-				case 'nested' :
-					var lftc = $t.p.treeReader.left_field,
-					rgtc = $t.p.treeReader.right_field,
-					levelc = $t.p.treeReader.level_field,
-					lft = parseInt(rc[lftc],10), rgt = parseInt(rc[rgtc],10), level = parseInt(rc[levelc],10);
-					$(this.p.data).each(function(i){
-						if(parseInt(this[levelc],10) === level+1 && parseInt(this[lftc],10) > lft && parseInt(this[rgtc],10) < rgt) {
-							result.push(this);
-						}
-					});
-					break;
-				case 'adjacency' :
-					var parent_id = $t.p.treeReader.parent_id_field,
-					dtid = $t.p.localReader.id;
-					$(this.p.data).each(function(i,val){
-						if(this[parent_id] == rc[dtid]) {
-							result.push(this);
-						}
-					});
-					break;
-			}
-		});
-		return result;
-	},
-	getFullTreeNode : function(rc) {
-		var result = [];
-		this.each(function(){
-			var $t = this, len;
-			if(!$t.grid || !$t.p.treeGrid) { return; }
-			switch ($t.p.treeGridModel) {
-				case 'nested' :
-					var lftc = $t.p.treeReader.left_field,
-					rgtc = $t.p.treeReader.right_field,
-					levelc = $t.p.treeReader.level_field,
-					lft = parseInt(rc[lftc],10), rgt = parseInt(rc[rgtc],10), level = parseInt(rc[levelc],10);
-					$(this.p.data).each(function(i){
-						if(parseInt(this[levelc],10) >= level && parseInt(this[lftc],10) >= lft && parseInt(this[lftc],10) <= rgt) {
-							result.push(this);
-						}
-					});
-					break;
-				case 'adjacency' :
-					result.push(rc);
-					var parent_id = $t.p.treeReader.parent_id_field,
-					dtid = $t.p.localReader.id;
-					$(this.p.data).each(function(i){
-						len = result.length;
-						for (i = 0; i < len; i++) {
-							if (result[i][dtid] == this[parent_id]) {
-								result.push(this);
-								break;
-							}
-						}
-					});
-					break;
-			}
-		});
-		return result;
-	},	
-	// End NS, adjacency Model
-	getNodeAncestors : function(rc) {
-		var ancestors = [];
-		this.each(function(){
-			if(!this.grid || !this.p.treeGrid) { return; }
-			var parent = $(this).jqGrid("getNodeParent",rc);
-			while (parent) {
-				ancestors.push(parent);
-				parent = $(this).jqGrid("getNodeParent",parent);	
-			}
-		});
-		return ancestors;
-	},
-	isVisibleNode : function(rc) {
-		var result = true;
-		this.each(function(){
-			var $t = this;
-			if(!$t.grid || !$t.p.treeGrid) { return; }
-			var ancestors = $($t).jqGrid("getNodeAncestors",rc),
-			expanded = $t.p.treeReader.expanded_field;
-			$(ancestors).each(function(){
-				result = result && this[expanded];
-				if(!result) {return false;}
-			});
-		});
-		return result;
-	},
-	isNodeLoaded : function(rc) {
-		var result;
-		this.each(function(){
-			var $t = this;
-			if(!$t.grid || !$t.p.treeGrid) { return; }
-			var isLeaf = $t.p.treeReader.leaf_field;
-			if(rc.loaded !== undefined) {
-				result = rc.loaded;
-			} else if( rc[isLeaf] || $($t).jqGrid("getNodeChildren",rc).length > 0){
-				result = true;
-			} else {
-				result = false;
-			}
-		});
-		return result;
-	},
-	expandNode : function(rc) {
-		return this.each(function(){
-			if(!this.grid || !this.p.treeGrid) { return; }
-			var expanded = this.p.treeReader.expanded_field;
-			if(!rc[expanded]) {
-				var id = $.jgrid.getAccessor(rc,this.p.localReader.id);
-				var rc1 = $("#"+id,this.grid.bDiv)[0];
-				var position = this.p._index[id];
-				if( $(this).jqGrid("isNodeLoaded",this.p.data[position]) ) {
-					rc[expanded] = true;
-					$("div.treeclick",rc1).removeClass(this.p.treeIcons.plus+" tree-plus").addClass(this.p.treeIcons.minus+" tree-minus");
-				} else {
-					rc[expanded] = true;
-					$("div.treeclick",rc1).removeClass(this.p.treeIcons.plus+" tree-plus").addClass(this.p.treeIcons.minus+" tree-minus");
-					this.p.treeANode = rc1.rowIndex;
-					this.p.datatype = this.p.treedatatype;
-					if(this.p.treeGridModel == 'nested') {
-						$(this).jqGrid("setGridParam",{postData:{nodeid:id,n_left:rc.lft,n_right:rc.rgt,n_level:rc.level}});
-					} else {
-						$(this).jqGrid("setGridParam",{postData:{nodeid:id,parentid:rc.parent_id,n_level:rc.level}});
-					}
-					$(this).trigger("reloadGrid");
-					if(this.p.treeGridModel == 'nested') {
-						$(this).jqGrid("setGridParam",{postData:{nodeid:'',n_left:'',n_right:'',n_level:''}});
-					} else {
-						$(this).jqGrid("setGridParam",{postData:{nodeid:'',parentid:'',n_level:''}}); 
-					}
-				}
-			}
-		});
-	},
-	collapseNode : function(rc) {
-		return this.each(function(){
-			if(!this.grid || !this.p.treeGrid) { return; }
-			if(rc.expanded) {
-				rc.expanded = false;
-				var id = $.jgrid.getAccessor(rc,this.p.localReader.id);
-				var rc1 = $("#"+id,this.grid.bDiv)[0];
-				$("div.treeclick",rc1).removeClass(this.p.treeIcons.minus+" tree-minus").addClass(this.p.treeIcons.plus+" tree-plus");
-			}
-		});
-	},
-	SortTree : function( sortname, newDir, st, datefmt) {
-		return this.each(function(){
-			if(!this.grid || !this.p.treeGrid) { return; }
-			var i, len,
-			rec, records = [], $t = this, query, roots,
-			rt = $(this).jqGrid("getRootNodes");
-			// Sorting roots
-			query = $.jgrid.from(rt);
-			query.orderBy(sortname,newDir,st, datefmt);
-			roots = query.select();
-
-			// Sorting children
-			for (i = 0, len = roots.length; i < len; i++) {
-				rec = roots[i];
-				records.push(rec);
-				$(this).jqGrid("collectChildrenSortTree",records, rec, sortname, newDir,st, datefmt);
-			}
-			$.each(records, function(index, row) {
-				var id  = $.jgrid.getAccessor(this,$t.p.localReader.id);
-				$('#'+$t.p.id+ ' tbody tr:eq('+index+')').after($('tr#'+id,$t.grid.bDiv));
-			});
-			query = null; roots=null;records=null;
-		});
-	},
-	collectChildrenSortTree : function(records, rec, sortname, newDir,st, datefmt) {
-		return this.each(function(){
-			if(!this.grid || !this.p.treeGrid) { return; }
-			var i, len,
-			child, ch, query, children;
-			ch = $(this).jqGrid("getNodeChildren",rec);
-			query = $.jgrid.from(ch);
-			query.orderBy(sortname, newDir, st, datefmt);
-			children = query.select();
-			for (i = 0, len = children.length; i < len; i++) {
-				child = children[i];
-				records.push(child);
-				$(this).jqGrid("collectChildrenSortTree",records, child, sortname, newDir, st, datefmt); 
-			}
-		});
-	},
-	// experimental 
-	setTreeRow : function(rowid, data) {
-		var success=false;
-		this.each(function(){
-			var t = this;
-			if(!t.grid || !t.p.treeGrid) { return; }
-			success = $(t).jqGrid("setRowData",rowid,data);
-		});
-		return success;
-	},
-	delTreeNode : function (rowid) {
-		return this.each(function () {
-			var $t = this;
-			if(!$t.grid || !$t.p.treeGrid) { return; }
-			var rc = $($t).jqGrid("getInd",rowid,true);
-			if (rc) {
-				var dr = $($t).jqGrid("getNodeChildren",rc);
-				if(dr.length>0){
-					for (var i=0;i<dr.length;i++){
-						$($t).jqGrid("delRowData",dr[i].id);
-					}
-				}
-				$($t).jqGrid("delRowData",rc.id);
-			}
-		});
-	}
-});
-})(jQuery);
\ No newline at end of file
diff --git a/addons/base/static/lib/jquery.jqGrid/js/i18n/grid.locale-ar.js b/addons/base/static/lib/jquery.jqGrid/js/i18n/grid.locale-ar.js
deleted file mode 100644
index 87887203970..00000000000
--- a/addons/base/static/lib/jquery.jqGrid/js/i18n/grid.locale-ar.js
+++ /dev/null
@@ -1,126 +0,0 @@
-;(function($){
-/**
- * jqGrid Arabic Translation
- * 
- * http://trirand.com/blog/ 
- * Dual licensed under the MIT and GPL licenses:
- * http://www.opensource.org/licenses/mit-license.php
- * http://www.gnu.org/licenses/gpl.html
-**/
-$.jgrid = {
-	defaults : {
-		recordtext: "تسجيل {0} - {1} على {2}",
-		emptyrecords: "لا يوجد تسجيل",
-		loadtext: "تحميل...",
-		pgtext : "ص�حة {0} على {1}"
-	},
-	search : {
-		caption: "بحث...",
-		Find: "بحث",
-		Reset: "إلغاء",
-		odata : ['يساوي', 'يختل�', 'أقل', 'أقل أو يساوي','أكبر','أكبر أو يساوي', 'يبدأ بـ','لا يبدأ بـ','est dans',"n'est pas dans",'ينته بـ','لا ينته بـ','يحتوي','لا يحتوي'],
-		groupOps: [	{ op: "مع", text: "الكل" },	{ op: "أو",  text: "لا أحد" }	],
-		matchText: " توا�ق",
-		rulesText: " قواعد"
-	},
-	edit : {
-		addCaption: "اضا�ة",
-		editCaption: "تحديث",
-		bSubmit: "تثبيث",
-		bCancel: "إلغاء",
-		bClose: "غلق",
-		saveData: "تغيرت المعطيات هل تريد التسجيل ?",
-		bYes: "نعم",
-		bNo: "لا",
-		bExit: "إلغاء",
-		msg: {
-			required: "خانة إجبارية",
-			number: "سجل رقم صحيح",
-			minValue: "يجب أن تكون القيمة أكبر أو تساوي 0",
-			maxValue: "يجب أن تكون القيمة أقل أو تساوي 0",
-			email: "بريد غير صحيح",
-			integer: "سجل عدد طبييعي صحيح",
-			url: "ليس عنوانا صحيحا. البداية الصحيحة ('http://' أو 'https://')",
-			nodefined : " ليس محدد!",
-			novalue : " قيمة الرجوع مطلوبة!",
-			customarray : "يجب على الدالة الشخصية أن تنتج جدولا",
-			customfcheck : "الدالة الشخصية مطلوبة �ي حالة التحقق الشخصي"
-		}
-	},
-	view : {
-		caption: "رأيت التسجيلات",
-		bClose: "غلق"
-	},
-	del : {
-		caption: "حذ�",
-		msg: "حذ� التسجيلات المختارة ?",
-		bSubmit: "حذ�",
-		bCancel: "إلغاء"
-	},
-	nav : {
-		edittext: " ",
-		edittitle: "تغيير التسجيل المختار",
-		addtext:" ",
-		addtitle: "إضا�ة تسجيل",
-		deltext: " ",
-		deltitle: "حذ� التسجيل المختار",
-		searchtext: " ",
-		searchtitle: "بحث عن تسجيل",
-		refreshtext: "",
-		refreshtitle: "تحديث الجدول",
-		alertcap: "تحذير",
-		alerttext: "يرجى إختيار السطر",
-		viewtext: "",
-		viewtitle: "إظهار السطر المختار"
-	},
-	col : {
-		caption: "إظهار/إخ�اء الأعمدة",
-		bSubmit: "تثبيث",
-		bCancel: "إلغاء"
-	},
-	errors : {
-		errcap : "خطأ",
-		nourl : "لا يوجد عنوان محدد",
-		norecords: "لا يوجد تسجيل للمعالجة",
-		model : "عدد العناوين (colNames) <> عدد التسجيلات (colModel)!"
-	},
-	formatter : {
-		integer : {thousandsSeparator: " ", defaultValue: '0'},
-		number : {decimalSeparator:",", thousandsSeparator: " ", decimalPlaces: 2, defaultValue: '0,00'},
-		currency : {decimalSeparator:",", thousandsSeparator: " ", decimalPlaces: 2, prefix: "", suffix:"", defaultValue: '0,00'},
-		date : {
-			dayNames:   [
-				"الأحد", "الإثنين", "الثلاثاء", "الأربعاء", "الخميس", "الجمعة", "السبت",
-				"الأحد", "الإثنين", "الثلاثاء", "الأربعاء", "الخميس", "الجمعة", "السبت"
-			],
-			monthNames: [
-				"جان�ي", "�ي�ري", "مارس", "أ�ريل", "ماي", "جوان", "جويلية", "أوت", "سبتمبر", "أكتوبر", "نو�مبر", "ديسمبر",
-				"جان�ي", "�ي�ري", "مارس", "أ�ريل", "ماي", "جوان", "جويلية", "أوت", "سبتمبر", "أكتوبر", "نو�مبر", "ديسمبر"
-			],
-			AmPm : ["صباحا","مساءا","صباحا","مساءا"],
-			S: function (j) {return j == 1 ? 'er' : 'e';},
-			srcformat: 'Y-m-d',
-			newformat: 'd/m/Y',
-			masks : {
-				ISO8601Long:"Y-m-d H:i:s",
-				ISO8601Short:"Y-m-d",
-				ShortDate: "n/j/Y",
-				LongDate: "l, F d, Y",
-				FullDateTime: "l, F d, Y g:i:s A",
-				MonthDay: "F d",
-				ShortTime: "g:i A",
-				LongTime: "g:i:s A",
-				SortableDateTime: "Y-m-d\\TH:i:s",
-				UniversalSortableDateTime: "Y-m-d H:i:sO",
-				YearMonth: "F, Y"
-			},
-			reformatAfterEdit : false
-		},
-		baseLinkUrl: '',
-		showAction: '',
-		target: '',
-		checkbox : {disabled:true},
-		idName : 'id'
-	}
-};
-})(jQuery);
diff --git a/addons/base/static/lib/jquery.jqGrid/js/i18n/grid.locale-bg.js b/addons/base/static/lib/jquery.jqGrid/js/i18n/grid.locale-bg.js
deleted file mode 100644
index 15038269091..00000000000
--- a/addons/base/static/lib/jquery.jqGrid/js/i18n/grid.locale-bg.js
+++ /dev/null
@@ -1,132 +0,0 @@
-;(function($){
-/**
- * jqGrid Bulgarian Translation 
- * Tony Tomov tony@trirand.com
- * http://trirand.com/blog/ 
- * Dual licensed under the MIT and GPL licenses:
- * http://www.opensource.org/licenses/mit-license.php
- * http://www.gnu.org/licenses/gpl.html
-**/
-$.jgrid = {
-	defaults : {
-		recordtext: "{0} - {1} от {2}",
-		emptyrecords: "��ма запи�(и)",
-		loadtext: "Зареждам...",
-		pgtext : "Стр. {0} от {1}"
-	},
-	search : {
-		caption: "Тър�ене...",
-		Find: "�амери",
-		Reset: "Изчи�ти",
-		odata : ['равно', 'различно', 'по-малко', 'по-малко или=','по-гол�мо','по-гол�мо или =', 'започва �','не започва �','�е намира в','не �е намира в','завършва �','не завършава �','�ъдържа', 'не �ъдържа' ],
-	    groupOps: [	{ op: "AND", text: "&nbsp;И " },	{ op: "OR",  text: "ИЛИ" }	],
-		matchText: " включи",
-		rulesText: " клауза"
-	},
-	edit : {
-		addCaption: "�ов Запи�",
-		editCaption: "Редакци� Запи�",
-		bSubmit: "Запиши",
-		bCancel: "Изход",
-		bClose: "Затвори",
-		saveData: "Данните �а променени! Да �ъхран� ли промените?",
-		bYes : "Да",
-		bNo : "�е",
-		bExit : "Отказ",
-		msg: {
-			required:"Полето е задължително",
-			number:"Въведете валидно чи�ло!",
-			minValue:"�тойно�тта тр�бва да е по-гол�ма или равна от",
-			maxValue:"�тойно�тта тр�бва да е по-малка или равна от",
-			email: "не е валиден ел. адре�",
-			integer: "Въведете валидно ц�ло чи�ло",
-			date: "Въведете валидна дата",
-			url: "e невалиден URL. Изи�кава �е префик�('http://' или 'https://')",
-			nodefined : " е недефинирана!",
-			novalue : " изи�ква връщане на �тойно�т!",
-			customarray : "Потреб. Функци� тр�бва да върне ма�ив!",
-			customfcheck : "Потребител�ка функци� е задължителна при този тип елемент!"
-		}
-	},
-	view : {
-		caption: "Преглед запи�",
-		bClose: "Затвори"
-	},
-	del : {
-		caption: "Изтриване",
-		msg: "Да изтри� ли избрани�т запи�?",
-		bSubmit: "Изтрий",
-		bCancel: "Отказ"
-	},
-	nav : {
-		edittext: " ",
-		edittitle: "Редакци� избран запи�",
-		addtext:" ",
-		addtitle: "Добав�не нов запи�",
-		deltext: " ",
-		deltitle: "Изтриване избран запи�",
-		searchtext: " ",
-		searchtitle: "Тър�ене запи�(и)",
-		refreshtext: "",
-		refreshtitle: "Обнови таблица",
-		alertcap: "Предупреждение",
-		alerttext: "Мол�, изберете запи�",
-		viewtext: "",
-		viewtitle: "Преглед избран запи�"
-	},
-	col : {
-		caption: "Избери колони",
-		bSubmit: "Ок",
-		bCancel: "Изход"	
-	},
-	errors : {
-		errcap : "Грешка",
-		nourl : "��ма по�очен url адре�",
-		norecords: "��ма запи� за обработка",
-		model : "Модела не �ъответ�тва на имената!"	
-	},
-	formatter : {
-		integer : {thousandsSeparator: " ", defaultValue: '0'},
-		number : {decimalSeparator:".", thousandsSeparator: " ", decimalPlaces: 2, defaultValue: '0.00'},
-		currency : {decimalSeparator:".", thousandsSeparator: " ", decimalPlaces: 2, prefix: "", suffix:" лв.", defaultValue: '0.00'},
-		date : {
-			dayNames:   [
-				"�ед", "Пон", "Вт", "Ср", "Чет", "Пет", "Съб",
-				"�едел�", "Понеделник", "Вторник", "Ср�да", "Четвъртък", "Петък", "Събота"
-			],
-			monthNames: [
-				"Яну", "Фев", "Мар", "�пр", "Май", "Юни", "Юли", "�вг", "Сеп", "Окт", "�ов", "Дек",
-				"Януари", "Февруари", "Март", "�прил", "Май", "Юни", "Юли", "�вгу�т", "Септември", "Октомври", "�оември", "Декември"
-			],
-			AmPm : ["","","",""],
-			S: function (j) {
-				if(j==7 || j==8 || j== 27 || j== 28) {
-					return 'ми';
-				}
-				return ['ви', 'ри', 'ти'][Math.min((j - 1) % 10, 2)];
-			},
-			srcformat: 'Y-m-d',
-			newformat: 'd/m/Y',
-			masks : {
-				ISO8601Long:"Y-m-d H:i:s",
-				ISO8601Short:"Y-m-d",
-				ShortDate: "n/j/Y",
-				LongDate: "l, F d, Y",
-				FullDateTime: "l, F d, Y g:i:s A",
-				MonthDay: "F d",
-				ShortTime: "g:i A",
-				LongTime: "g:i:s A",
-				SortableDateTime: "Y-m-d\\TH:i:s",
-				UniversalSortableDateTime: "Y-m-d H:i:sO",
-				YearMonth: "F, Y"
-			},
-			reformatAfterEdit : false
-		},
-		baseLinkUrl: '',
-		showAction: '',
-		target: '',
-		checkbox : {disabled:true},
-		idName : 'id'
-	}
-};
-})(jQuery);
diff --git a/addons/base/static/lib/jquery.jqGrid/js/i18n/grid.locale-bg1251.js b/addons/base/static/lib/jquery.jqGrid/js/i18n/grid.locale-bg1251.js
deleted file mode 100644
index 935ce938a21..00000000000
--- a/addons/base/static/lib/jquery.jqGrid/js/i18n/grid.locale-bg1251.js
+++ /dev/null
@@ -1,132 +0,0 @@
-;(function($){
-/**
- * jqGrid Bulgarian Translation 
- * Tony Tomov tony@trirand.com
- * http://trirand.com/blog/ 
- * Dual licensed under the MIT and GPL licenses:
- * http://www.opensource.org/licenses/mit-license.php
- * http://www.gnu.org/licenses/gpl.html
-**/
-$.jgrid = {
-	defaults : {
-		recordtext: "{0} - {1} îò {2}",
-		emptyrecords: "Íÿìà çàïèñ(è)",
-		loadtext: "Çàðåæäàì...",
-		pgtext : "Ñòð. {0} îò {1}"
-	},
-	search : {
-		caption: "Òúðñåíå...",
-		Find: "Íàìåðè",
-		Reset: "Èç÷èñòè",
-		odata : ['ðàâíî', 'ðàçëè÷íî', 'ïî-ìàëêî', 'ïî-ìàëêî èëè=','ïî-ãîëÿìî','ïî-ãîëÿìî èëè =', 'çàïî÷âà ñ','íå çàïî÷âà ñ','ñå íàìèðà â','íå ñå íàìèðà â','çàâúðøâà ñ','íå çàâúðøàâà ñ','ñúäúðæà', 'íå ñúäúðæà' ],
-	    groupOps: [	{ op: "AND", text: " È " },	{ op: "OR",  text: "ÈËÈ" }	],
-		matchText: " âêëþ÷è",
-		rulesText: " êëàóçà"
-	},
-	edit : {
-		addCaption: "Íîâ Çàïèñ",
-		editCaption: "Ðåäàêöèÿ Çàïèñ",
-		bSubmit: "Çàïèøè",
-		bCancel: "Èçõîä",
-		bClose: "Çàòâîðè",
-		saveData: "Äàííèòå ñà ïðîìåíåíè! Äà ñúõðàíÿ ëè ïðîìåíèòå?",
-		bYes : "Äà",
-		bNo : "Íå",
-		bExit : "Îòêàç",
-		msg: {
-		    required:"Ïîëåòî å çàäúëæèòåëíî",
-		    number:"Âúâåäåòå âàëèäíî ÷èñëî!",
-		    minValue:"ñòîéíîñòòà òðÿáâà äà å ïî-ãîëÿìà èëè ðàâíà îò",
-		    maxValue:"ñòîéíîñòòà òðÿáâà äà å ïî-ìàëêà èëè ðàâíà îò",
-		    email: "íå å âàëèäåí åë. àäðåñ",
-		    integer: "Âúâåäåòå âàëèäíî öÿëî ÷èñëî",
-			date: "Âúâåäåòå âàëèäíà äàòà",
-			url: "e íåâàëèäåí URL. Èçèñêàâà ñå ïðåôèêñ('http://' èëè 'https://')",
-			nodefined : " å íåäåôèíèðàíà!",
-			novalue : " èçèñêâà âðúùàíå íà ñòîéíîñò!",
-			customarray : "Ïîòðåá. Ôóíêöèÿ òðÿáâà äà âúðíå ìàñèâ!",
-			customfcheck : "Ïîòðåáèòåëñêà ôóíêöèÿ å çàäúëæèòåëíà ïðè òîçè òèï åëåìåíò!"
-		}
-	},
-	view : {
-	    caption: "Ïðåãëåä çàïèñ",
-	    bClose: "Çàòâîðè"
-	},
-	del : {
-		caption: "Èçòðèâàíå",
-		msg: "Äà èçòðèÿ ëè èçáðàíèÿò çàïèñ?",
-		bSubmit: "Èçòðèé",
-		bCancel: "Îòêàç"
-	},
-	nav : {
-		edittext: " ",
-		edittitle: "Ðåäàêöèÿ èçáðàí çàïèñ",
-		addtext:" ",
-		addtitle: "Äîáàâÿíå íîâ çàïèñ",
-		deltext: " ",
-		deltitle: "Èçòðèâàíå èçáðàí çàïèñ",
-		searchtext: " ",
-		searchtitle: "Òúðñåíå çàïèñ(è)",
-		refreshtext: "",
-		refreshtitle: "Îáíîâè òàáëèöà",
-		alertcap: "Ïðåäóïðåæäåíèå",
-		alerttext: "Ìîëÿ, èçáåðåòå çàïèñ",
-		viewtext: "",
-		viewtitle: "Ïðåãëåä èçáðàí çàïèñ"
-	},
-	col : {
-		caption: "Èçáîð êîëîíè",
-		bSubmit: "Îê",
-		bCancel: "Èçõîä"	
-	},
-	errors : {
-		errcap : "Ãðåøêà",
-		nourl : "Íÿìà ïîñî÷åí url àäðåñ",
-		norecords: "Íÿìà çàïèñ çà îáðàáîòêà",
-		model : "Ìîäåëà íå ñúîòâåòñòâà íà èìåíàòà!"	
-	},
-	formatter : {
-		integer : {thousandsSeparator: " ", defaultValue: '0'},
-		number : {decimalSeparator:".", thousandsSeparator: " ", decimalPlaces: 2, defaultValue: '0.00'},
-		currency : {decimalSeparator:".", thousandsSeparator: " ", decimalPlaces: 2, prefix: "", suffix:" ëâ.", defaultValue: '0.00'},
-		date : {
-			dayNames:   [
-				"Íåä", "Ïîí", "Âò", "Ñð", "×åò", "Ïåò", "Ñúá",
-				"Íåäåëÿ", "Ïîíåäåëíèê", "Âòîðíèê", "Ñðÿäà", "×åòâúðòúê", "Ïåòúê", "Ñúáîòà"
-			],
-			monthNames: [
-				"ßíó", "Ôåâ", "Ìàð", "Àïð", "Ìàé", "Þíè", "Þëè", "Àâã", "Ñåï", "Îêò", "Íîâ", "Äåê",
-				"ßíóàðè", "Ôåâðóàðè", "Ìàðò", "Àïðèë", "Ìàé", "Þíè", "Þëè", "Àâãóñò", "Ñåïòåìâðè", "Îêòîìâðè", "Íîåìâðè", "Äåêåìâðè"
-			],
-			AmPm : ["","","",""],
-			S: function (j) {
-				if(j==7 || j==8 || j== 27 || j== 28) {
-					return 'ìè';
-				}
-				return ['âè', 'ðè', 'òè'][Math.min((j - 1) % 10, 2)];
-			},
-			srcformat: 'Y-m-d',
-			newformat: 'd/m/Y',
-			masks : {
-		        ISO8601Long:"Y-m-d H:i:s",
-		        ISO8601Short:"Y-m-d",
-		        ShortDate: "n/j/Y",
-		        LongDate: "l, F d, Y",
-		        FullDateTime: "l, F d, Y g:i:s A",
-		        MonthDay: "F d",
-		        ShortTime: "g:i A",
-		        LongTime: "g:i:s A",
-		        SortableDateTime: "Y-m-d\\TH:i:s",
-		        UniversalSortableDateTime: "Y-m-d H:i:sO",
-		        YearMonth: "F, Y"
-		    },
-		    reformatAfterEdit : false
-		},
-		baseLinkUrl: '',
-		showAction: '',
-		target: '',
-		checkbox : {disabled:true},
-		idName : 'id'
-	}
-};
-})(jQuery);
diff --git a/addons/base/static/lib/jquery.jqGrid/js/i18n/grid.locale-cat.js b/addons/base/static/lib/jquery.jqGrid/js/i18n/grid.locale-cat.js
deleted file mode 100644
index a0ea13c69e4..00000000000
--- a/addons/base/static/lib/jquery.jqGrid/js/i18n/grid.locale-cat.js
+++ /dev/null
@@ -1,128 +0,0 @@
-;(function($){
-/**
- * jqGrid Catalan Translation
- * Traducció jqGrid en Catatà per Faserline, S.L.
- * http://www.faserline.com
- * Dual licensed under the MIT and GPL licenses:
- * http://www.opensource.org/licenses/mit-license.php
- * http://www.gnu.org/licenses/gpl.html
-**/
-$.jgrid = {
-	defaults : {
-		recordtext: "Mostrant {0} - {1} de {2}",
-	    emptyrecords: "Sense registres que mostrar",
-		loadtext: "Carregant...",
-		pgtext : "Pàgina {0} de {1}"
-	},
-	search : {
-		caption: "Cerca...",
-		Find: "Cercar",
-		Reset: "Buidar",
-	    odata : ['equal', 'not equal', 'less', 'less or equal','greater','greater or equal', 'begins with','does not begin with','is in','is not in','ends with','does not end with','contains','does not contain'],
-	    groupOps: [	{ op: "AND", text: "tot" },	{ op: "OR",  text: "qualsevol" }	],
-		matchText: " match",
-		rulesText: " rules"
-	},
-	edit : {
-		addCaption: "Afegir registre",
-		editCaption: "Modificar registre",
-		bSubmit: "Guardar",
-		bCancel: "Cancelar",
-		bClose: "Tancar",
-		saveData: "Les dades han canviat. Guardar canvis?",
-		bYes : "Yes",
-		bNo : "No",
-		bExit : "Cancel",
-		msg: {
-		    required:"Camp obligatori",
-		    number:"Introdueixi un nombre",
-		    minValue:"El valor ha de ser major o igual que ",
-		    maxValue:"El valor ha de ser menor o igual a ",
-		    email: "no és una direcció de correu vàlida",
-		    integer: "Introdueixi un valor enter",
-			date: "Introdueixi una data correcta ",
-			url: "no és una URL vàlida. Prefix requerit ('http://' or 'https://')",
-			nodefined : " is not defined!",
-			novalue : " return value is required!",
-			customarray : "Custom function should return array!",
-			customfcheck : "Custom function should be present in case of custom checking!"
-		}
-	},
-	view : {
-		caption: "Veure registre",
-		bClose: "Tancar"
-	},
-	del : {
-		caption: "Eliminar",
-		msg: "¿Desitja eliminar els registres seleccionats?",
-		bSubmit: "Eliminar",
-		bCancel: "Cancelar"
-	},
-	nav : {
-		edittext: " ",
-		edittitle: "Modificar fila seleccionada",
-		addtext:" ",
-		addtitle: "Agregar nova fila",
-		deltext: " ",
-		deltitle: "Eliminar fila seleccionada",
-		searchtext: " ",
-		searchtitle: "Cercar informació",
-		refreshtext: "",
-		refreshtitle: "Refrescar taula",
-		alertcap: "Avís",
-		alerttext: "Seleccioni una fila",
-		viewtext: " ",
-		viewtitle: "Veure fila seleccionada"
-	},
-// setcolumns module
-	col : {
-		caption: "Mostrar/ocultar columnes",
-		bSubmit: "Enviar",
-		bCancel: "Cancelar"	
-	},
-	errors : {
-		errcap : "Error",
-		nourl : "No s'ha especificat una URL",
-		norecords: "No hi ha dades per processar",
-		model : "Les columnes de noms són diferents de les columnes del model"
-	},
-	formatter : {
-		integer : {thousandsSeparator: ".", defaultValue: '0'},
-		number : {decimalSeparator:",", thousandsSeparator: ".", decimalPlaces: 2, defaultValue: '0,00'},
-		currency : {decimalSeparator:",", thousandsSeparator: ".", decimalPlaces: 2, prefix: "", suffix:"", defaultValue: '0,00'},
-		date : {
-			dayNames:   [
-				"Dg", "Dl", "Dt", "Dc", "Dj", "Dv", "Ds",
-				"Diumenge", "Dilluns", "Dimarts", "Dimecres", "Dijous", "Divendres", "Dissabte"
-			],
-			monthNames: [
-				"Gen", "Febr", "Març", "Abr", "Maig", "Juny", "Jul", "Ag", "Set", "Oct", "Nov", "Des",
-				"Gener", "Febrer", "Març", "Abril", "Maig", "Juny", "Juliol", "Agost", "Setembre", "Octubre", "Novembre", "Desembre"
-			],
-			AmPm : ["am","pm","AM","PM"],
-			S: function (j) {return j < 11 || j > 13 ? ['st', 'nd', 'rd', 'th'][Math.min((j - 1) % 10, 3)] : 'th'},
-			srcformat: 'Y-m-d',
-			newformat: 'd-m-Y',
-			masks : {
-		        ISO8601Long:"Y-m-d H:i:s",
-		        ISO8601Short:"Y-m-d",
-		        ShortDate: "n/j/Y",
-		        LongDate: "l, F d, Y",
-		        FullDateTime: "l, F d, Y g:i:s A",
-		        MonthDay: "F d",
-		        ShortTime: "g:i A",
-		        LongTime: "g:i:s A",
-		        SortableDateTime: "Y-m-d\\TH:i:s",
-		        UniversalSortableDateTime: "Y-m-d H:i:sO",
-		        YearMonth: "F, Y"
-		    },
-		    reformatAfterEdit : false
-		},
-		baseLinkUrl: '',
-		showAction: 'show',
-	    target: '',
-	    checkbox : {disabled:true},
-		idName : 'id'
-	}
-};
-})(jQuery);
diff --git a/addons/base/static/lib/jquery.jqGrid/js/i18n/grid.locale-cn.js b/addons/base/static/lib/jquery.jqGrid/js/i18n/grid.locale-cn.js
deleted file mode 100644
index d5d2513dbbf..00000000000
--- a/addons/base/static/lib/jquery.jqGrid/js/i18n/grid.locale-cn.js
+++ /dev/null
@@ -1,132 +0,0 @@
-;(function($){
-/**
- * jqGrid Chinese Translation for v3.6
- * waiting 2010.01.18
- * http://waiting.javaeye.com/
- * Dual licensed under the MIT and GPL licenses:
- * http://www.opensource.org/licenses/mit-license.php
- * http://www.gnu.org/licenses/gpl.html
- * 
- * update 2010.05.04
- *		add double u3000 SPACE for search:odata to fix SEARCH box display err when narrow width from only use of eq/ne/cn/in/lt/gt operator under IE6/7
-**/
-$.jgrid = {
-	defaults : {
-		recordtext: "{0} - {1}\u3000共 {2} �",	// 共字�是全角空格
-		emptyrecords: "无数�显示",
-		loadtext: "读�中...",
-		pgtext : " {0} 共 {1} 页"
-	},
-	search : {
-		caption: "�索...",
-		Find: "查找",
-		Reset: "�置",
-		odata : ['等于\u3000\u3000', '�等\u3000\u3000', '�于\u3000\u3000', '�于等于','大于\u3000\u3000','大于等于', 
-			'开始于','�开始于','属于\u3000\u3000','�属于','结�于','�结�于','包�\u3000\u3000','�包�'],
-		groupOps: [	{ op: "AND", text: "所有" },	{ op: "OR",  text: "任一" }	],
-		matchText: " 匹�",
-		rulesText: " 规则"
-	},
-	edit : {
-		addCaption: "添加记录",
-		editCaption: "编辑记录",
-		bSubmit: "�交",
-		bCancel: "�消",
-		bClose: "关闭",
-		saveData: "数�已改�，是��存？",
-		bYes : "是",
-		bNo : "�",
-		bExit : "�消",
-		msg: {
-			required:"此字段必需",
-			number:"请输入有效数字",
-			minValue:"输值必须大于等于 ",
-			maxValue:"输值必须�于等于 ",
-			email: "这�是有效的e-mail地�",
-			integer: "请输入有效整数",
-			date: "请输入有效时间",
-			url: "无效网�。�缀必须为 ('http://' 或 'https://')",
-			nodefined : " 未定义�",
-			novalue : " 需�返回值�",
-			customarray : "自定义函数需�返回数组�",
-			customfcheck : "Custom function should be present in case of custom checking!"
-			
-		}
-	},
-	view : {
-		caption: "查看记录",
-		bClose: "关闭"
-	},
-	del : {
-		caption: "删除",
-		msg: "删除所选记录？",
-		bSubmit: "删除",
-		bCancel: "�消"
-	},
-	nav : {
-		edittext: "",
-		edittitle: "编辑所选记录",
-		addtext:"",
-		addtitle: "添加新记录",
-		deltext: "",
-		deltitle: "删除所选记录",
-		searchtext: "",
-		searchtitle: "查找",
-		refreshtext: "",
-		refreshtitle: "刷新表格",
-		alertcap: "注�",
-		alerttext: "请选择记录",
-		viewtext: "",
-		viewtitle: "查看所选记录"
-	},
-	col : {
-		caption: "选择列",
-		bSubmit: "确定",
-		bCancel: "�消"
-	},
-	errors : {
-		errcap : "错误",
-		nourl : "没有设置url",
-		norecords: "没有�处�的记录",
-		model : "colNames 和 colModel 长度�等�"
-	},
-	formatter : {
-		integer : {thousandsSeparator: " ", defaultValue: '0'},
-		number : {decimalSeparator:".", thousandsSeparator: " ", decimalPlaces: 2, defaultValue: '0.00'},
-		currency : {decimalSeparator:".", thousandsSeparator: " ", decimalPlaces: 2, prefix: "", suffix:"", defaultValue: '0.00'},
-		date : {
-			dayNames:   [
-				"Sun", "Mon", "Tue", "Wed", "Thr", "Fri", "Sat",
-		         "Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday"
-			],
-			monthNames: [
-				"Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec",
-				"January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December"
-			],
-			AmPm : ["am","pm","AM","PM"],
-			S: function (j) {return j < 11 || j > 13 ? ['st', 'nd', 'rd', 'th'][Math.min((j - 1) % 10, 3)] : 'th'},
-			srcformat: 'Y-m-d',
-			newformat: 'm-d-Y',
-			masks : {
-				ISO8601Long:"Y-m-d H:i:s",
-				ISO8601Short:"Y-m-d",
-				ShortDate: "Y/j/n",
-				LongDate: "l, F d, Y",
-				FullDateTime: "l, F d, Y g:i:s A",
-				MonthDay: "F d",
-				ShortTime: "g:i A",
-				LongTime: "g:i:s A",
-				SortableDateTime: "Y-m-d\\TH:i:s",
-				UniversalSortableDateTime: "Y-m-d H:i:sO",
-				YearMonth: "F, Y"
-			},
-			reformatAfterEdit : false
-		},
-		baseLinkUrl: '',
-		showAction: '',
-		target: '',
-		checkbox : {disabled:true},
-		idName : 'id'
-	}
-};
-})(jQuery);
diff --git a/addons/base/static/lib/jquery.jqGrid/js/i18n/grid.locale-cs.js b/addons/base/static/lib/jquery.jqGrid/js/i18n/grid.locale-cs.js
deleted file mode 100644
index 81bf13baf01..00000000000
--- a/addons/base/static/lib/jquery.jqGrid/js/i18n/grid.locale-cs.js
+++ /dev/null
@@ -1,128 +0,0 @@
-;(function($){
-/**
- * jqGrid Czech Translation
- * Pavel Jirak pavel.jirak@jipas.cz
- * doplnil Thomas Wagner xwagne01@stud.fit.vutbr.cz
- * http://trirand.com/blog/ 
- * Dual licensed under the MIT and GPL licenses:
- * http://www.opensource.org/licenses/mit-license.php
- * http://www.gnu.org/licenses/gpl.html
-**/
-$.jgrid = {
-	defaults : {
-		recordtext: "Zobrazeno {0} - {1} z {2} záznamů",
-	    emptyrecords: "Nenalezeny žádné záznamy",
-		loadtext: "Na�ítám...",
-		pgtext : "Strana {0} z {1}"
-	},
-	search : {
-		caption: "Vyhledávám...",
-		Find: "Hledat",
-		Reset: "Reset",
-	    odata : ['rovno', 'nerovono', 'menší', 'menší nebo rovno','větší', 'větší nebo rovno', 'za�íná s', 'neza�íná s', 'je v', 'není v', 'kon�í s', 'nekon�í s', 'obahuje', 'neobsahuje'],
-	    groupOps: [	{ op: "AND", text: "všech" },	{ op: "OR",  text: "některého z" }	],
-		matchText: " hledat podle",
-		rulesText: " pravidel"
-	},
-	edit : {
-		addCaption: "Přidat záznam",
-		editCaption: "Editace záznamu",
-		bSubmit: "Uložit",
-		bCancel: "Storno",
-		bClose: "Zavřít",
-		saveData: "Data byla změněna! Uložit změny?",
-		bYes : "Ano",
-		bNo : "Ne",
-		bExit : "Zrušit",
-		msg: {
-		    required:"Pole je vyžadováno",
-		    number:"Prosím, vložte validní �íslo",
-		    minValue:"hodnota musí být větší než nebo rovná ",
-		    maxValue:"hodnota musí být menší než nebo rovná ",
-		    email: "není validní e-mail",
-		    integer: "Prosím, vložte celé �íslo",
-			date: "Prosím, vložte validní datum",
-			url: "není platnou URL. Vyžadován prefix ('http://' or 'https://')",
-			nodefined : " není definován!",
-			novalue : " je vyžadována návratová hodnota!",
-			customarray : "Custom function mělá vrátit pole!",
-			customfcheck : "Custom function by měla být přítomna v případě custom checking!"
-		}
-	},
-	view : {
-	    caption: "Zobrazit záznam",
-	    bClose: "Zavřít"
-	},
-	del : {
-		caption: "Smazat",
-		msg: "Smazat vybraný(é) záznam(y)?",
-		bSubmit: "Smazat",
-		bCancel: "Storno"
-	},
-	nav : {
-		edittext: " ",
-		edittitle: "Editovat vybraný řádek",
-		addtext:" ",
-		addtitle: "Přidat nový řádek",
-		deltext: " ",
-		deltitle: "Smazat vybraný záznam ",
-		searchtext: " ",
-		searchtitle: "Najít záznamy",
-		refreshtext: "",
-		refreshtitle: "Obnovit tabulku",
-		alertcap: "Varování",
-		alerttext: "Prosím, vyberte řádek",
-		viewtext: "",
-		viewtitle: "Zobrazit vybraný řádek"
-	},
-	col : {
-		caption: "Zobrazit/Skrýt sloupce",
-		bSubmit: "Uložit",
-		bCancel: "Storno"	
-	},
-	errors : {
-		errcap : "Chyba",
-		nourl : "Není nastavena url",
-		norecords: "Žádné záznamy ke zpracování",
-		model : "Délka colNames <> colModel!"
-	},
-	formatter : {
-		integer : {thousandsSeparator: " ", defaultValue: '0'},
-		number : {decimalSeparator:".", thousandsSeparator: " ", decimalPlaces: 2, defaultValue: '0.00'},
-		currency : {decimalSeparator:".", thousandsSeparator: " ", decimalPlaces: 2, prefix: "", suffix:"", defaultValue: '0.00'},
-		date : {
-			dayNames:   [
-				"Ne", "Po", "Út", "St", "Čt", "Pá", "So",
-				"Neděle", "Pondělí", "Úterý", "Středa", "Čtvrtek", "Pátek", "Sobota"
-			],
-			monthNames: [
-				"Led", "Úno", "Bře", "Dub", "Kvě", "Čer", "Čvc", "Srp", "Zář", "Říj", "Lis", "Pro",
-				"Leden", "Únor", "Březen", "Duben", "Květen", "Červen", "Červenec", "Srpen", "Září", "Říjen", "Listopad", "Prosinec"
-			],
-			AmPm : ["do","od","DO","OD"],
-			S: function (j) {return j < 11 || j > 13 ? ['st', 'nd', 'rd', 'th'][Math.min((j - 1) % 10, 3)] : 'th'},
-			srcformat: 'Y-m-d',
-			newformat: 'd/m/Y',
-			masks : {
-		        ISO8601Long:"Y-m-d H:i:s",
-		        ISO8601Short:"Y-m-d",
-		        ShortDate: "n/j/Y",
-		        LongDate: "l, F d, Y",
-		        FullDateTime: "l, F d, Y g:i:s A",
-		        MonthDay: "F d",
-		        ShortTime: "g:i A",
-		        LongTime: "g:i:s A",
-		        SortableDateTime: "Y-m-d\\TH:i:s",
-		        UniversalSortableDateTime: "Y-m-d H:i:sO",
-		        YearMonth: "F, Y"
-		    },
-		    reformatAfterEdit : false
-		},
-		baseLinkUrl: '',
-		showAction: '',
-	    target: '',
-	    checkbox : {disabled:true},
-		idName : 'id'
-	}
-};
-})(jQuery);
diff --git a/addons/base/static/lib/jquery.jqGrid/js/i18n/grid.locale-da.js b/addons/base/static/lib/jquery.jqGrid/js/i18n/grid.locale-da.js
deleted file mode 100644
index fba251db849..00000000000
--- a/addons/base/static/lib/jquery.jqGrid/js/i18n/grid.locale-da.js
+++ /dev/null
@@ -1,128 +0,0 @@
-;(function($){
-/**
- * jqGrid Danish Translation
- * Aesiras A/S
- * http://www.aesiras.dk
- * Dual licensed under the MIT and GPL licenses:
- * http://www.opensource.org/licenses/mit-license.php
- * http://www.gnu.org/licenses/gpl.html
-**/
-$.jgrid = {
-	defaults : {
-		recordtext: "Vis {0} - {1} of {2}",
-	    emptyrecords: "Ingen linjer fundet",
-		loadtext: "Henter...",
-		pgtext : "Side {0} af {1}"
-	},
-	search : {
-	    caption: "Søg...",
-	    Find: "Find",
-	    Reset: "Nulstil",
-	    odata : ['lig', 'forskellige fra', 'mindre', 'mindre eller lig','større','større eller lig', 'begynder med','begynder ikke med','findes i','findes ikke i','ender med','ender ikke med','indeholder','indeholder ikke'],
-	    groupOps: [	{ op: "AND", text: "all" },	{ op: "OR",  text: "any" }	],
-		matchText: " lig",
-		rulesText: " regler"
-	},
-	edit : {
-	    addCaption: "Tilføj",
-	    editCaption: "Ret",
-	    bSubmit: "Send",
-	    bCancel: "Annuller",
-		bClose: "Luk",
-		saveData: "Data er ændret. Gem data?",
-		bYes : "Ja",
-		bNo : "Nej",
-		bExit : "Fortryd",
-	    msg: {
-	        required:"Felt er nødvendigt",
-	        number:"Indtast venligst et validt tal",
-	        minValue:"værdi skal være større end eller lig med",
-	        maxValue:"værdi skal være mindre end eller lig med",
-	        email: "er ikke en gyldig email",
-	        integer: "Indtast venligst et gyldigt heltal",
-			date: "Indtast venligst en gyldig datoværdi",
-			url: "er ugyldig URL. Prefix mangler ('http://' or 'https://')",
-			nodefined : " er ikke defineret!",
-			novalue : " returværdi kræves!",
-			customarray : "Custom function should return array!",
-			customfcheck : "Custom function should be present in case of custom checking!"
-		}
-	},
-	view : {
-	    caption: "Vis linje",
-	    bClose: "Luk"
-	},
-	del : {
-	    caption: "Slet",
-	    msg: "Slet valgte linje(r)?",
-	    bSubmit: "Slet",
-	    bCancel: "Fortryd"
-	},
-	nav : {
-		edittext: " ",
-	    edittitle: "Rediger valgte linje",
-		addtext:" ",
-	    addtitle: "Tilføj ny linje",
-	    deltext: " ",
-	    deltitle: "Slet valgte linje",
-	    searchtext: " ",
-	    searchtitle: "Find linjer",
-	    refreshtext: "",
-	    refreshtitle: "Indlæs igen",
-	    alertcap: "Advarsel",
-	    alerttext: "Vælg venligst linje",
-		viewtext: "",
-		viewtitle: "Vis valgte linje"
-	},
-	col : {
-	    caption: "Vis/skjul kolonner",
-	    bSubmit: "Opdatere",
-	    bCancel: "Fortryd"
-	},
-	errors : {
-		errcap : "Fejl",
-		nourl : "Ingen url valgt",
-		norecords: "Ingen linjer at behandle",
-	    model : "colNames og colModel har ikke samme længde!"
-	},
-	formatter : {
-		integer : {thousandsSeparator: " ", defaultValue: '0'},
-		number : {decimalSeparator:",", thousandsSeparator: " ", decimalPlaces: 2, defaultValue: '0,00'},
-		currency : {decimalSeparator:",", thousandsSeparator: " ", decimalPlaces: 2, prefix: "", suffix:"", defaultValue: '0,00'},
-		date : {
-			dayNames:   [
-				"Søn", "Man", "Tir", "Ons", "Tor", "Fre", "Lør",
-				"Søndag", "Mandag", "Tirsdag", "Onsdag", "Torsdag", "Fredag", "Lørdag"
-			],
-			monthNames: [
-				"Jan", "Feb", "Mar", "Apr", "Maj", "Jun", "Jul", "Aug", "Sep", "Okt", "Nov", "Dec",
-				"Januar", "Februar", "Marts", "April", "Maj", "Juni", "Juli", "August", "September", "Oktober", "November", "December"
-			],
-			AmPm : ["","","",""],
-			S: function (j) {return '.'},
-			srcformat: 'Y-m-d',
-			newformat: 'd/m/Y',
-			masks : {
-	            ISO8601Long:"Y-m-d H:i:s",
-	            ISO8601Short:"Y-m-d",
-	            ShortDate: "j/n/Y",
-	            LongDate: "l d. F Y",
-	            FullDateTime: "l d F Y G:i:s",
-	            MonthDay: "d. F",
-	            ShortTime: "G:i",
-	            LongTime: "G:i:s",
-	            SortableDateTime: "Y-m-d\\TH:i:s",
-	            UniversalSortableDateTime: "Y-m-d H:i:sO",
-	            YearMonth: "F Y"
-	        },
-	        reformatAfterEdit : false
-		},
-		baseLinkUrl: '',
-		showAction: '',
-	    target: '',
-	    checkbox : {disabled:true},
-		idName : 'id'
-	}
-};
-// DA
-})(jQuery);
diff --git a/addons/base/static/lib/jquery.jqGrid/js/i18n/grid.locale-de.js b/addons/base/static/lib/jquery.jqGrid/js/i18n/grid.locale-de.js
deleted file mode 100644
index 39474eedc87..00000000000
--- a/addons/base/static/lib/jquery.jqGrid/js/i18n/grid.locale-de.js
+++ /dev/null
@@ -1,133 +0,0 @@
-;(function($){
-/**
- * jqGrid German Translation
- * Version 1.0.0 (developed for jQuery Grid 3.3.1)
- * Olaf Klöppel opensource@blue-hit.de
- * http://blue-hit.de/ 
- *
- * Updated for jqGrid 3.8
- * Andreas Flack
- * http://www.contentcontrol-berlin.de
- *
- * Dual licensed under the MIT and GPL licenses:
- * http://www.opensource.org/licenses/mit-license.php
- * http://www.gnu.org/licenses/gpl.html
-**/
-$.jgrid = {
-	defaults : {
-		recordtext: "Zeige {0} - {1} von {2}",
-	    emptyrecords: "Keine Datensätze vorhanden",
-		loadtext: "Lädt...",
-		pgtext : "Seite {0} von {1}"
-	},
-	search : {
-		caption: "Suche...",
-		Find: "Suchen",
-		Reset: "Zurücksetzen",
-	    odata : ['gleich', 'ungleich', 'kleiner', 'kleiner gleich','größer','größer gleich', 'beginnt mit','beginnt nicht mit','ist in','ist nicht in','endet mit','endet nicht mit','enthält','enthält nicht'],
-	    groupOps: [	{ op: "AND", text: "alle" },	{ op: "OR",  text: "mindestens eine" }	],
-		matchText: " erfülle",
-		rulesText: " Bedingung(en)"
-	},
-	edit : {
-		addCaption: "Datensatz hinzufügen",
-		editCaption: "Datensatz bearbeiten",
-		bSubmit: "Speichern",
-		bCancel: "Abbrechen",
-		bClose: "Schließen",
-		saveData: "Daten wurden geändert! Änderungen speichern?",
-		bYes : "ja",
-		bNo : "nein",
-		bExit : "abbrechen",
-		msg: {
-		    required:"Feld ist erforderlich",
-		    number: "Bitte geben Sie eine Zahl ein",
-		    minValue:"Wert muss größer oder gleich sein, als ",
-		    maxValue:"Wert muss kleiner oder gleich sein, als ",
-		    email: "ist keine gültige E-Mail-Adresse",
-		    integer: "Bitte geben Sie eine Ganzzahl ein",
-			date: "Bitte geben Sie ein gültiges Datum ein",
-			url: "ist keine gültige URL. Präfix muss eingegeben werden ('http://' oder 'https://')",
-			nodefined : " ist nicht definiert!",
-			novalue : " Rückgabewert ist erforderlich!",
-			customarray : "Benutzerdefinierte Funktion sollte ein Array zurückgeben!",
-			customfcheck : "Benutzerdefinierte Funktion sollte im Falle der benutzerdefinierten Überprüfung vorhanden sein!"
-		}
-	},
-	view : {
-	    caption: "Datensatz anzeigen",
-	    bClose: "Schließen"
-	},
-	del : {
-		caption: "Löschen",
-		msg: "Ausgewählte Datensätze löschen?",
-		bSubmit: "Löschen",
-		bCancel: "Abbrechen"
-	},
-	nav : {
-		edittext: " ",
-	    edittitle: "Ausgewählte Zeile editieren",
-		addtext:" ",
-	    addtitle: "Neue Zeile einfügen",
-	    deltext: " ",
-	    deltitle: "Ausgewählte Zeile löschen",
-	    searchtext: " ",
-	    searchtitle: "Datensatz suchen",
-	    refreshtext: "",
-	    refreshtitle: "Tabelle neu laden",
-	    alertcap: "Warnung",
-	    alerttext: "Bitte Zeile auswählen",
-		viewtext: "",
-		viewtitle: "Ausgewählte Zeile anzeigen"
-	},
-	col : {
-		caption: "Spalten auswählen",
-		bSubmit: "Speichern",
-		bCancel: "Abbrechen"	
-	},
-	errors : {
-		errcap : "Fehler",
-		nourl : "Keine URL angegeben",
-		norecords: "Keine Datensätze zu bearbeiten",
-		model : "colNames und colModel sind unterschiedlich lang!"
-	},
-	formatter : {
-		integer : {thousandsSeparator: ".", defaultValue: '0'},
-		number : {decimalSeparator:",", thousandsSeparator: ".", decimalPlaces: 2, defaultValue: '0,00'},
-		currency : {decimalSeparator:",", thousandsSeparator: ".", decimalPlaces: 2, prefix: "", suffix:" €", defaultValue: '0,00'},
-		date : {
-			dayNames:   [
-				"So", "Mo", "Di", "Mi", "Do", "Fr", "Sa",
-				"Sonntag", "Montag", "Dienstag", "Mittwoch", "Donnerstag", "Freitag", "Samstag"
-			],
-			monthNames: [
-				"Jan", "Feb", "Mar", "Apr", "Mai", "Jun", "Jul", "Aug", "Sep", "Okt", "Nov", "Dez",
-				"Januar", "Februar", "März", "April", "Mai", "Juni", "Juli", "August", "September", "Oktober", "November", "Dezember"
-			],
-			AmPm : ["am","pm","AM","PM"],
-			S: function (j) {return 'ter'},
-			srcformat: 'Y-m-d',
-			newformat: 'd.m.Y',
-			masks : {
-		        ISO8601Long: "Y-m-d H:i:s",
-		        ISO8601Short: "Y-m-d",
-		        ShortDate: "j.n.Y",
-		        LongDate: "l, j. F Y",
-		        FullDateTime: "l, d. F Y G:i:s",
-		        MonthDay: "d. F",
-		        ShortTime: "G:i",
-		        LongTime: "G:i:s",
-		        SortableDateTime: "Y-m-d\\TH:i:s",
-		        UniversalSortableDateTime: "Y-m-d H:i:sO",
-		        YearMonth: "F Y"
-		    },
-		    reformatAfterEdit : false
-		},
-		baseLinkUrl: '',
-		showAction: '',
-	    target: '',
-	    checkbox : {disabled:true},
-		idName : 'id'
-	}
-};
-})(jQuery);
\ No newline at end of file
diff --git a/addons/base/static/lib/jquery.jqGrid/js/i18n/grid.locale-el.js b/addons/base/static/lib/jquery.jqGrid/js/i18n/grid.locale-el.js
deleted file mode 100644
index 5e49ddbdb4a..00000000000
--- a/addons/base/static/lib/jquery.jqGrid/js/i18n/grid.locale-el.js
+++ /dev/null
@@ -1,126 +0,0 @@
-;(function($){
-/**
- * jqGrid Greek (el) Translation
- * Alex Cicovic
- * http://www.alexcicovic.com
- * Dual licensed under the MIT and GPL licenses:
- * http://www.opensource.org/licenses/mit-license.php
- * http://www.gnu.org/licenses/gpl.html
-**/
-$.jgrid = {
-	defaults : {
-		recordtext: "View {0} - {1} of {2}",
-	    emptyrecords: "No records to view",
-		loadtext: "Φό�τωση...",
-		pgtext : "Page {0} of {1}"
-	},
-	search : {
-	    caption: "Αναζήτηση...",
-	    Find: "Ε��εση",
-	    Reset: "Επαναφο�ά",
-	    odata : ['equal', 'not equal', 'less', 'less or equal','greater','greater or equal', 'begins with','does not begin with','is in','is not in','ends with','does not end with','contains','does not contain'],
-	    groupOps: [	{ op: "AND", text: "all" },	{ op: "OR",  text: "any" }	],
-		matchText: " match",
-		rulesText: " rules"
-	},
-	edit : {
-	    addCaption: "Εισαγωγή Εγγ�αφής",
-	    editCaption: "Επεξε�γασία Εγγ�αφής",
-	    bSubmit: "Καταχώ�ηση",
-	    bCancel: "Άκυ�ο",
-		bClose: "Κλείσιμο",
-		saveData: "Data has been changed! Save changes?",
-		bYes : "Yes",
-		bNo : "No",
-		bExit : "Cancel",
-	    msg: {
-	        required:"Το πεδίο είναι απα�αίτητο",
-	        number:"Το πεδίο δέχεται μόνο α�ιθμο�ς",
-	        minValue:"Η τιμή π�έπει να είναι μεγαλ�τε�η ή ίση του ",
-	        maxValue:"Η τιμή π�έπει να είναι μικ�ότε�η ή ίση του ",
-	        email: "Η διε�θυνση e-mail δεν είναι έγκυ�η",
-	        integer: "Το πεδίο δέχεται μόνο ακέ�αιους α�ιθμο�ς",
-			url: "is not a valid URL. Prefix required ('http://' or 'https://')",
-			nodefined : " is not defined!",
-			novalue : " return value is required!",
-			customarray : "Custom function should return array!",
-			customfcheck : "Custom function should be present in case of custom checking!"
-		}
-	},
-	view : {
-	    caption: "View Record",
-	    bClose: "Close"
-	},
-	del : {
-	    caption: "Διαγ�αφή",
-	    msg: "Διαγ�αφή των επιλεγμένων εγγ�αφών;",
-	    bSubmit: "�αι",
-	    bCancel: "Άκυ�ο"
-	},
-	nav : {
-		edittext: " ",
-	    edittitle: "Επεξε�γασία επιλεγμένης εγγ�αφής",
-		addtext:" ",
-	    addtitle: "Εισαγωγή νέας εγγ�αφής",
-	    deltext: " ",
-	    deltitle: "Διαγ�αφή επιλεγμένης εγγ�αφής",
-	    searchtext: " ",
-	    searchtitle: "Ε��εση Εγγ�αφών",
-	    refreshtext: "",
-	    refreshtitle: "Ανανέωση Πίνακα",
-	    alertcap: "Π�οσοχή",
-	    alerttext: "Δεν έχετε επιλέξει εγγ�αφή",
-		viewtext: "",
-		viewtitle: "View selected row"
-	},
-	col : {
-	    caption: "Εμφάνιση / Απόκ�υψη Στηλών",
-	    bSubmit: "ΟΚ",
-	    bCancel: "Άκυ�ο"
-	},
-	errors : {
-		errcap : "Σφάλμα",
-		nourl : "Δεν έχει δοθεί διε�θυνση χει�ισμο� για τη συγκεκ�ιμένη ενέ�γεια",
-		norecords: "Δεν υπά�χουν εγγ�αφές π�ος επεξε�γασία",
-		model : "Άνισος α�ιθμός πεδίων colNames/colModel!"
-	},
-	formatter : {
-		integer : {thousandsSeparator: " ", defaultValue: '0'},
-		number : {decimalSeparator:".", thousandsSeparator: " ", decimalPlaces: 2, defaultValue: '0.00'},
-		currency : {decimalSeparator:".", thousandsSeparator: " ", decimalPlaces: 2, prefix: "", suffix:"", defaultValue: '0.00'},
-		date : {
-			dayNames:   [
-				"Κυ�", "Δευ", "Τ�ι", "Τετ", "Πεμ", "Πα�", "Σαβ",
-				"Κυ�ιακή", "Δευτέ�α", "Τ�ίτη", "Τετά�τη", "Πέμπτη", "Πα�ασκευή", "Σάββατο"
-			],
-			monthNames: [
-				"Ιαν", "Φεβ", "Μα�", "Απ�", "Μαι", "Ιουν", "Ιουλ", "Αυγ", "Σεπ", "Οκτ", "�οε", "Δεκ",
-				"Ιανουά�ιος", "Φεβ�ουά�ιος", "Μά�τιος", "Απ�ίλιος", "Μάιος", "Ιο�νιος", "Ιο�λιος", "Α�γουστος", "Σεπτέμβ�ιος", "Οκτώβ�ιος", "�οέμβ�ιος", "Δεκέμβ�ιος"
-			],
-			AmPm : ["πμ","μμ","ΠΜ","ΜΜ"],
-			S: function (j) {return j == 1 || j > 1 ? ['η'][Math.min((j - 1) % 10, 3)] : ''},
-			srcformat: 'Y-m-d',
-			newformat: 'd/m/Y',
-			masks : {
-	            ISO8601Long:"Y-m-d H:i:s",
-	            ISO8601Short:"Y-m-d",
-	            ShortDate: "n/j/Y",
-	            LongDate: "l, F d, Y",
-	            FullDateTime: "l, F d, Y g:i:s A",
-	            MonthDay: "F d",
-	            ShortTime: "g:i A",
-	            LongTime: "g:i:s A",
-	            SortableDateTime: "Y-m-d\\TH:i:s",
-	            UniversalSortableDateTime: "Y-m-d H:i:sO",
-	            YearMonth: "F, Y"
-	        },
-	        reformatAfterEdit : false
-		},
-		baseLinkUrl: '',
-		showAction: '',
-	    target: '',
-	    checkbox : {disabled:true},
-		idName : 'id'
-	}
-};
-})(jQuery);
diff --git a/addons/base/static/lib/jquery.jqGrid/js/i18n/grid.locale-en.js b/addons/base/static/lib/jquery.jqGrid/js/i18n/grid.locale-en.js
deleted file mode 100644
index 19f50a3207d..00000000000
--- a/addons/base/static/lib/jquery.jqGrid/js/i18n/grid.locale-en.js
+++ /dev/null
@@ -1,128 +0,0 @@
-;(function($){
-/**
- * jqGrid English Translation
- * Tony Tomov tony@trirand.com
- * http://trirand.com/blog/ 
- * Dual licensed under the MIT and GPL licenses:
- * http://www.opensource.org/licenses/mit-license.php
- * http://www.gnu.org/licenses/gpl.html
-**/
-$.jgrid = {
-	defaults : {
-		recordtext: "View {0} - {1} of {2}",
-		emptyrecords: "No records to view",
-		loadtext: "Loading...",
-		pgtext : "Page {0} of {1}"
-	},
-	search : {
-		caption: "Search...",
-		Find: "Find",
-		Reset: "Reset",
-		odata : ['equal', 'not equal', 'less', 'less or equal','greater','greater or equal', 'begins with','does not begin with','is in','is not in','ends with','does not end with','contains','does not contain'],
-		groupOps: [	{ op: "AND", text: "all" },	{ op: "OR",  text: "any" }	],
-		matchText: " match",
-		rulesText: " rules"
-	},
-	edit : {
-		addCaption: "Add Record",
-		editCaption: "Edit Record",
-		bSubmit: "Submit",
-		bCancel: "Cancel",
-		bClose: "Close",
-		saveData: "Data has been changed! Save changes?",
-		bYes : "Yes",
-		bNo : "No",
-		bExit : "Cancel",
-		msg: {
-			required:"Field is required",
-			number:"Please, enter valid number",
-			minValue:"value must be greater than or equal to ",
-			maxValue:"value must be less than or equal to",
-			email: "is not a valid e-mail",
-			integer: "Please, enter valid integer value",
-			date: "Please, enter valid date value",
-			url: "is not a valid URL. Prefix required ('http://' or 'https://')",
-			nodefined : " is not defined!",
-			novalue : " return value is required!",
-			customarray : "Custom function should return array!",
-			customfcheck : "Custom function should be present in case of custom checking!"
-			
-		}
-	},
-	view : {
-		caption: "View Record",
-		bClose: "Close"
-	},
-	del : {
-		caption: "Delete",
-		msg: "Delete selected record(s)?",
-		bSubmit: "Delete",
-		bCancel: "Cancel"
-	},
-	nav : {
-		edittext: "",
-		edittitle: "Edit selected row",
-		addtext:"",
-		addtitle: "Add new row",
-		deltext: "",
-		deltitle: "Delete selected row",
-		searchtext: "",
-		searchtitle: "Find records",
-		refreshtext: "",
-		refreshtitle: "Reload Grid",
-		alertcap: "Warning",
-		alerttext: "Please, select row",
-		viewtext: "",
-		viewtitle: "View selected row"
-	},
-	col : {
-		caption: "Select columns",
-		bSubmit: "Ok",
-		bCancel: "Cancel"
-	},
-	errors : {
-		errcap : "Error",
-		nourl : "No url is set",
-		norecords: "No records to process",
-		model : "Length of colNames <> colModel!"
-	},
-	formatter : {
-		integer : {thousandsSeparator: " ", defaultValue: '0'},
-		number : {decimalSeparator:".", thousandsSeparator: " ", decimalPlaces: 2, defaultValue: '0.00'},
-		currency : {decimalSeparator:".", thousandsSeparator: " ", decimalPlaces: 2, prefix: "", suffix:"", defaultValue: '0.00'},
-		date : {
-			dayNames:   [
-				"Sun", "Mon", "Tue", "Wed", "Thr", "Fri", "Sat",
-				"Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday"
-			],
-			monthNames: [
-				"Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec",
-				"January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December"
-			],
-			AmPm : ["am","pm","AM","PM"],
-			S: function (j) {return j < 11 || j > 13 ? ['st', 'nd', 'rd', 'th'][Math.min((j - 1) % 10, 3)] : 'th'},
-			srcformat: 'Y-m-d',
-			newformat: 'd/m/Y',
-			masks : {
-				ISO8601Long:"Y-m-d H:i:s",
-				ISO8601Short:"Y-m-d",
-				ShortDate: "n/j/Y",
-				LongDate: "l, F d, Y",
-				FullDateTime: "l, F d, Y g:i:s A",
-				MonthDay: "F d",
-				ShortTime: "g:i A",
-				LongTime: "g:i:s A",
-				SortableDateTime: "Y-m-d\\TH:i:s",
-				UniversalSortableDateTime: "Y-m-d H:i:sO",
-				YearMonth: "F, Y"
-			},
-			reformatAfterEdit : false
-		},
-		baseLinkUrl: '',
-		showAction: '',
-		target: '',
-		checkbox : {disabled:true},
-		idName : 'id'
-	}
-};
-})(jQuery);
diff --git a/addons/base/static/lib/jquery.jqGrid/js/i18n/grid.locale-es.js b/addons/base/static/lib/jquery.jqGrid/js/i18n/grid.locale-es.js
deleted file mode 100644
index 9cf5753e4fe..00000000000
--- a/addons/base/static/lib/jquery.jqGrid/js/i18n/grid.locale-es.js
+++ /dev/null
@@ -1,128 +0,0 @@
-;(function($){
-/**
- * jqGrid Spanish Translation
- * Traduccion jqGrid en Español por Yamil Bracho
- * Traduccion corregida y ampliada por Faserline, S.L. 
- * http://www.faserline.com
- * Dual licensed under the MIT and GPL licenses:
- * http://www.opensource.org/licenses/mit-license.php
- * http://www.gnu.org/licenses/gpl.html
-**/
-$.jgrid = {
-	defaults : {
-		recordtext: "Mostrando {0} - {1} de {2}",
-	    emptyrecords: "Sin registros que mostrar",
-		loadtext: "Cargando...",
-		pgtext : "Página {0} de {1}"
-	},
-	search : {
-	    caption: "Búsqueda...",
-	    Find: "Buscar",
-	    Reset: "Limpiar",
-	    odata : ['igual ', 'no igual a', 'menor que', 'menor o igual que','mayor que','mayor o igual a', 'empiece por','no empiece por','está en','no está en','termina por','no termina por','contiene','no contiene'],
-	    groupOps: [	{ op: "AND", text: "todo" },	{ op: "OR",  text: "cualquier" }	],
-		matchText: " match",
-		rulesText: " reglas"
-	},
-	edit : {
-	    addCaption: "Agregar registro",
-	    editCaption: "Modificar registro",
-	    bSubmit: "Guardar",
-	    bCancel: "Cancelar",
-		bClose: "Cerrar",
-		saveData: "Se han modificado los datos, ¿guardar cambios?",
-		bYes : "Si",
-		bNo : "No",
-		bExit : "Cancelar",
-	    msg: {
-	        required:"Campo obligatorio",
-	        number:"Introduzca un número",
-	        minValue:"El valor debe ser mayor o igual a ",
-	        maxValue:"El valor debe ser menor o igual a ",
-	        email: "no es una dirección de correo válida",
-	        integer: "Introduzca un valor entero",
-			date: "Introduza una fecha correcta ",
-			url: "no es una URL válida. Prefijo requerido ('http://' or 'https://')",
-			nodefined : " no está definido.",
-			novalue : " valor de retorno es requerido.",
-			customarray : "La función personalizada debe devolver un array.",
-			customfcheck : "La función personalizada debe estar presente en el caso de validación personalizada."
-		}
-	},
-	view : {
-	    caption: "Consultar registro",
-	    bClose: "Cerrar"
-	},
-	del : {
-	    caption: "Eliminar",
-	    msg: "¿Desea eliminar los registros seleccionados?",
-	    bSubmit: "Eliminar",
-	    bCancel: "Cancelar"
-	},
-	nav : {
-		edittext: " ",
-	    edittitle: "Modificar fila seleccionada",
-		addtext:" ",
-	    addtitle: "Agregar nueva fila",
-	    deltext: " ",
-	    deltitle: "Eliminar fila seleccionada",
-	    searchtext: " ",
-	    searchtitle: "Buscar información",
-	    refreshtext: "",
-	    refreshtitle: "Recargar datos",
-	    alertcap: "Aviso",
-	    alerttext: "Seleccione una fila",
-		viewtext: "",
-		viewtitle: "Ver fila seleccionada"
-	},
-	col : {
-	    caption: "Mostrar/ocultar columnas",
-	    bSubmit: "Enviar",
-	    bCancel: "Cancelar"	
-	},
-	errors : {
-		errcap : "Error",
-		nourl : "No se ha especificado una URL",
-		norecords: "No hay datos para procesar",
-	    model : "Las columnas de nombres son diferentes de las columnas de modelo"
-	},
-	formatter : {
-		integer : {thousandsSeparator: ".", defaultValue: '0'},
-		number : {decimalSeparator:",", thousandsSeparator: ".", decimalPlaces: 2, defaultValue: '0,00'},
-		currency : {decimalSeparator:",", thousandsSeparator: ".", decimalPlaces: 2, prefix: "", suffix:"", defaultValue: '0,00'},
-		date : {
-			dayNames:   [
-				"Do", "Lu", "Ma", "Mi", "Ju", "Vi", "Sa",
-				"Domingo", "Lunes", "Martes", "Miercoles", "Jueves", "Viernes", "Sabado"
-			],
-			monthNames: [
-				"Ene", "Feb", "Mar", "Abr", "May", "Jun", "Jul", "Ago", "Sep", "Oct", "Nov", "Dic",
-				"Enero", "Febrero", "Marzo", "Abril", "Mayo", "Junio", "Julio", "Agosto", "Septiembre", "Octubre", "Noviembre", "Diciembre"
-			],
-			AmPm : ["am","pm","AM","PM"],
-			S: function (j) {return j < 11 || j > 13 ? ['st', 'nd', 'rd', 'th'][Math.min((j - 1) % 10, 3)] : 'th'},
-			srcformat: 'Y-m-d',
-			newformat: 'd-m-Y',
-			masks : {
-	            ISO8601Long:"Y-m-d H:i:s",
-	            ISO8601Short:"Y-m-d",
-	            ShortDate: "n/j/Y",
-	            LongDate: "l, F d, Y",
-	            FullDateTime: "l, F d, Y g:i:s A",
-	            MonthDay: "F d",
-	            ShortTime: "g:i A",
-	            LongTime: "g:i:s A",
-	            SortableDateTime: "Y-m-d\\TH:i:s",
-	            UniversalSortableDateTime: "Y-m-d H:i:sO",
-	            YearMonth: "F, Y"
-	        },
-	        reformatAfterEdit : false
-		},
-		baseLinkUrl: '',
-		showAction: '',
-	    target: '',
-	    checkbox : {disabled:true},
-		idName : 'id'
-	}
-};
-})(jQuery);
diff --git a/addons/base/static/lib/jquery.jqGrid/js/i18n/grid.locale-fa.js b/addons/base/static/lib/jquery.jqGrid/js/i18n/grid.locale-fa.js
deleted file mode 100644
index 3c233de6b31..00000000000
--- a/addons/base/static/lib/jquery.jqGrid/js/i18n/grid.locale-fa.js
+++ /dev/null
@@ -1,145 +0,0 @@
-;(function ($) {
-/**
- * jqGrid Persian Translation
- * Dual licensed under the MIT and GPL licenses:
- * http://www.opensource.org/licenses/mit-license.php
- * http://www.gnu.org/licenses/gpl.html
-**/
-	$.jgrid = {
-        defaults: {
-            recordtext: "نمابش {0} - {1} از {2}",
-            emptyrecords: "رکوردی یا�ت نشد",
-            loadtext: "بارگزاري...",
-            pgtext: "ص�حه {0} از {1}"
-        },
-        search: {
-            caption: "جستجو...",
-            Find: "يا�ته ها",
-            Reset: "از نو",
-            odata: ['برابر', 'نا برابر', 'به', 'کوچکتر', 'از', 'بزرگتر', 'شروع با', 'شروع نشود با', 'نباشد', 'عضو این نباشد', 'اتمام با', 'تمام نشود با', 'حاوی', 'نباشد حاوی'],
-            groupOps: [{
-                op: "AND",
-                text: "Ú©Ù„"
-            },
-            {
-                op: "OR",
-                text: "مجموع"
-            }],
-            matchText: " حاوی",
-            rulesText: " اطلاعات"
-        },
-        edit: {
-            addCaption: "اضا�ه کردن رکورد",
-            editCaption: "ويرايش رکورد",
-            bSubmit: "ثبت",
-            bCancel: "انصرا�",
-            bClose: "بستن",
-            saveData: "دیتا تعییر کرد! ذخیره شود؟",
-            bYes: "بله",
-            bNo: "خیر",
-            bExit: "انصرا�",
-            msg: {
-                required: "�يلدها بايد ختما پر شوند",
-                number: "لط�ا عدد وعتبر وارد کنيد",
-                minValue: "مقدار وارد شده بايد بزرگتر يا مساوي با",
-                maxValue: "مقدار وارد شده بايد کوچکتر يا مساوي",
-                email: "پست الکترونيک وارد شده معتبر نيست",
-                integer: "لط�ا يک عدد صحيح وارد کنيد",
-                date: "لط�ا يک تاريخ معتبر وارد کنيد",
-                url: "این آدرس صحیح نمی باشد. پیشوند نیاز است ('http://' یا 'https://')",
-                nodefined: " تعری� نشده!",
-                novalue: " مقدار برگشتی اجباری است!",
-                customarray: "تابع شما باید مقدار آرایه داشته باشد!",
-                customfcheck: "برای داشتن متد دلخواه شما باید سطون با چکینگ دلخواه داشته باشید!"
-            }
-        },
-        view: {
-            caption: "نمایش رکورد",
-            bClose: "بستن"
-        },
-        del: {
-            caption: "حذ�",
-            msg: "از حذ� گزينه هاي انتخاب شده مطمئن هستيد؟",
-            bSubmit: "حذ�",
-            bCancel: "ابطال"
-        },
-        nav: {
-            edittext: " ",
-            edittitle: "ويرايش ردي� هاي انتخاب شده",
-            addtext: " ",
-            addtitle: "ا�زودن ردي� جديد",
-            deltext: " ",
-            deltitle: "حذ� ردب� هاي انتخاب شده",
-            searchtext: " ",
-            searchtitle: "جستجوي ردي�",
-            refreshtext: "",
-            refreshtitle: "بازيابي مجدد ص�حه",
-            alertcap: "اخطار",
-            alerttext: "لط�ا يک ردي� انتخاب کنيد",
-            viewtext: "",
-            viewtitle: "نمایش رکورد های انتخاب شده"
-        },
-        col: {
-            caption: "نمايش/عدم نمايش ستون",
-            bSubmit: "ثبت",
-            bCancel: "انصرا�"
-        },
-        errors: {
-            errcap: "خطا",
-            nourl: "هيچ آدرسي تنظيم نشده است",
-            norecords: "هيچ رکوردي براي پردازش موجود نيست",
-            model: "طول نام ستون ها محال� ستون هاي مدل مي باشد!"
-        },
-        formatter: {
-            integer: {
-                thousandsSeparator: " ",
-                defaultValue: "0"
-            },
-            number: {
-                decimalSeparator: ".",
-                thousandsSeparator: " ",
-                decimalPlaces: 2,
-                defaultValue: "0.00"
-            },
-            currency: {
-                decimalSeparator: ".",
-                thousandsSeparator: " ",
-                decimalPlaces: 2,
-                prefix: "",
-                suffix: "",
-                defaultValue: "0"
-            },
-            date: {
-                dayNames: ["يک", "دو", "سه", "چهار", "پنج", "جمع", "شنب", "يکشنبه", "دوشنبه", "سه شنبه", "چهارشنبه", "پنجشنبه", "جمعه", "شنبه"],
-                monthNames: ["Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec", "ژانويه", "�وريه", "مارس", "آوريل", "مه", "ژوئن", "ژوئيه", "اوت", "سپتامبر", "اکتبر", "نوامبر", "December"],
-                AmPm: ["ب.ظ", "ب.ظ", "ق.ظ", "ق.ظ"],
-                S: function (b) {
-                    return b < 11 || b > 13 ? ["st", "nd", "rd", "th"][Math.min((b - 1) % 10, 3)] : "th"
-                },
-                srcformat: "Y-m-d",
-                newformat: "d/m/Y",
-                masks: {
-                    ISO8601Long: "Y-m-d H:i:s",
-                    ISO8601Short: "Y-m-d",
-                    ShortDate: "n/j/Y",
-                    LongDate: "l, F d, Y",
-                    FullDateTime: "l, F d, Y g:i:s A",
-                    MonthDay: "F d",
-                    ShortTime: "g:i A",
-                    LongTime: "g:i:s A",
-                    SortableDateTime: "Y-m-d\\TH:i:s",
-                    UniversalSortableDateTime: "Y-m-d H:i:sO",
-                    YearMonth: "F, Y"
-                },
-                reformatAfterEdit: false
-            },
-            baseLinkUrl: "",
-            showAction: "نمايش",
-            target: "",
-            checkbox: {
-                disabled: true
-            },
-            idName: "id"
-        }
-    }
-})(jQuery);
\ No newline at end of file
diff --git a/addons/base/static/lib/jquery.jqGrid/js/i18n/grid.locale-fi.js b/addons/base/static/lib/jquery.jqGrid/js/i18n/grid.locale-fi.js
deleted file mode 100644
index f6d9175e1e4..00000000000
--- a/addons/base/static/lib/jquery.jqGrid/js/i18n/grid.locale-fi.js
+++ /dev/null
@@ -1,128 +0,0 @@
-;(function($){
-/**
- * jqGrid (fi) Finnish Translation
- * Jukka Inkeri  awot.fi  2010-05-19 Version
- * http://awot.fi
- * Dual licensed under the MIT and GPL licenses:
- * http://www.opensource.org/licenses/mit-license.php
- * http://www.gnu.org/licenses/gpl.html
-**/
-$.jgrid = {
-	defaults: {
-		recordtext: "Rivit {0} - {1} / {2}",
-	    emptyrecords: "Ei n&auml;ytett&auml;vi&auml;",
-		loadtext: "Haetaan...",
-		pgtext: "Sivu {0} / {1}"
-	},
-	search: {
-	    caption: "Etsi...",
-	    Find: "Etsi",
-	    Reset: "Tyhj&auml;&auml;",
-	    odata: ['=', '<>', '<', '<=','>','>=', 'alkaa','ei ala','joukossa','ei joukossa','loppuu','ei lopu','sis&auml;lt&auml;&auml;','ei sis&auml;ll&auml;'],
-	    groupOps: [	{ op: "AND", text: "kaikki" }, { op: "OR", text: "mik&auml; tahansa" }	],
-		matchText: "&nbsp;&nbsp;t&auml;yt&auml; ehdot:",
-		rulesText: ""
-	},
-	edit: {
-	    addCaption: "Uusi rivi",
-	    editCaption: "Muokkaa rivi&auml;",
-	    bSubmit: "OK",
-	    bCancel: "Peru",
-		bClose: "Sulje",
-		saveData: "Tietoja muutettu! Tallennetaanko?",
-		bYes: "K",
-		bNo: "E",
-		bExit: "Peru",
-	    msg: {
-	        required: "pakollinen",
-	        number: "Anna kelvollinen nro",
-	        minValue: "arvo oltava >= ",
-	        maxValue: "arvo oltava <= ",
-	        email: "virheellinen sposti ",
-	        integer: "Anna kelvollinen kokonaisluku",
-			date: "Anna kelvollinen pvm",
-			url: "Ei ole sopiva linkki(URL). Alku oltava ('http://' tai 'https://')",
-			nodefined: " ei ole m&auml;&auml;ritelty!",
-			novalue: " paluuarvo vaaditaan!",
-			customarray: "Custom function should return array!",
-			customfcheck: "Custom function should be present in case of custom checking!"
-		}
-	},
-	view: {
-	    caption: "N&auml;yt&auml; rivi",
-	    bClose: "Sulje"
-	},
-	del: {
-	    caption: "Poista",
-	    msg: "Poista valitut rivit?",
-	    bSubmit: "Poista",
-	    bCancel: "Peru"
-	},
-	nav: {
-		edittext: " ",
-	    edittitle: "Muokkaa valittu rivi",
-		addtext: " ",
-	    addtitle: "Uusi rivi",
-	    deltext: " ",
-	    deltitle: "Poista valittu rivi",
-	    searchtext: " ",
-	    searchtitle: "Etsi tietoja",
-	    refreshtext: "",
-	    refreshtitle: "Lataa uudelleen",
-	    alertcap: "Varoitus",
-	    alerttext: "Valitse rivi",
-		viewtext: "",
-		viewtitle: "N&auml;yta valitut rivit"
-	},
-	col: {
-	    caption: "N&auml;yta/Piilota sarakkeet",
-	    bSubmit: "OK",
-	    bCancel: "Peru"	
-	},
-	errors : {
-		errcap: "Virhe",
-		nourl: "url asettamatta",
-		norecords: "Ei muokattavia tietoja",
-	    model: "Pituus colNames <> colModel!"
-	},
-	formatter: {
-		integer: {thousandsSeparator: "", defaultValue: '0'},
-		number: {decimalSeparator:",", thousandsSeparator: "", decimalPlaces: 2, defaultValue: '0,00'},
-		currency: {decimalSeparator:",", thousandsSeparator: "", decimalPlaces: 2, prefix: "", suffix:"", defaultValue: '0,00'},
-		date: {
-			dayNames:   [
-				"Su", "Ma", "Ti", "Ke", "To", "Pe", "La",
-				"Sunnuntai", "Maanantai", "Tiistai", "Keskiviikko", "Torstai", "Perjantai", "Lauantai"
-			],
-			monthNames: [
-				"Tam", "Hel", "Maa", "Huh", "Tou", "Kes", "Hei", "Elo", "Syy", "Lok", "Mar", "Jou",
-				"Tammikuu", "Helmikuu", "Maaliskuu", "Huhtikuu", "Toukokuu", "Kes&auml;kuu", "Hein&auml;kuu", "Elokuu", "Syyskuu", "Lokakuu", "Marraskuu", "Joulukuu"
-			],
-			AmPm: ["am","pm","AM","PM"],
-			S: function (j) {return j < 11 || j > 13 ? ['st', 'nd', 'rd', 'th'][Math.min((j - 1) % 10, 3)] : 'th'},
-			srcformat: 'Y-m-d',
-			newformat: 'd/m/Y',
-			masks: {
-	            ISO8601Long:"Y-m-d H:i:s",
-	            ISO8601Short:"Y-m-d",
-	            ShortDate: "d.m.Y",
-	            LongDate: "l, F d, Y",
-	            FullDateTime: "l, F d, Y g:i:s A",
-	            MonthDay: "F d",
-	            ShortTime: "g:i A",
-	            LongTime: "g:i:s A",
-	            SortableDateTime: "Y-m-d\\TH:i:s",
-	            UniversalSortableDateTime: "Y-m-d H:i:sO",
-	            YearMonth: "F, Y"
-	        },
-	        reformatAfterEdit : false
-		},
-		baseLinkUrl: '',
-		showAction: '',
-	    target: '',
-	    checkbox: {disabled:true},
-		idName: 'id'
-	}
-};
-// FI
-})(jQuery);
diff --git a/addons/base/static/lib/jquery.jqGrid/js/i18n/grid.locale-fr.js b/addons/base/static/lib/jquery.jqGrid/js/i18n/grid.locale-fr.js
deleted file mode 100644
index a7d22abe7fd..00000000000
--- a/addons/base/static/lib/jquery.jqGrid/js/i18n/grid.locale-fr.js
+++ /dev/null
@@ -1,126 +0,0 @@
-;(function($){
-/**
- * jqGrid French Translation
- * Tony Tomov tony@trirand.com
- * http://trirand.com/blog/ 
- * Dual licensed under the MIT and GPL licenses:
- * http://www.opensource.org/licenses/mit-license.php
- * http://www.gnu.org/licenses/gpl.html
-**/
-$.jgrid = {
-	defaults : {
-		recordtext: "Enregistrements {0} - {1} sur {2}",
-		emptyrecords: "Aucun enregistrement à afficher",
-		loadtext: "Chargement...",
-		pgtext : "Page {0} sur {1}"
-	},
-	search : {
-		caption: "Recherche...",
-		Find: "Chercher",
-		Reset: "Annuler",
-		odata : ['égal', 'différent', 'inférieur', 'inférieur ou égal','supérieur','supérieur ou égal', 'commence par','ne commence pas par','est dans',"n'est pas dans",'finit par','ne finit pas par','contient','ne contient pas'],
-		groupOps: [	{ op: "AND", text: "tous" },	{ op: "OR",  text: "aucun" }	],
-		matchText: " correspondance",
-		rulesText: " règles"
-	},
-	edit : {
-		addCaption: "Ajouter",
-		editCaption: "Editer",
-		bSubmit: "Valider",
-		bCancel: "Annuler",
-		bClose: "Fermer",
-		saveData: "Les données ont changé ! Enregistrer les modifications ?",
-		bYes: "Oui",
-		bNo: "Non",
-		bExit: "Annuler",
-		msg: {
-			required: "Champ obligatoire",
-			number: "Saisissez un nombre correct",
-			minValue: "La valeur doit être supérieure ou égale à",
-			maxValue: "La valeur doit être inférieure ou égale à",
-			email: "n'est pas un email correct",
-			integer: "Saisissez un entier correct",
-			url: "n'est pas une adresse correcte. Préfixe requis ('http://' or 'https://')",
-			nodefined : " n'est pas défini!",
-			novalue : " la valeur de retour est requise!",
-			customarray : "Une fonction personnalisée devrait retourner un tableau (array)!",
-			customfcheck : "Une fonction personnalisée devrait être présente dans le cas d'une vérification personnalisée!"
-		}
-	},
-	view : {
-		caption: "Voir les enregistrement",
-		bClose: "Fermer"
-	},
-	del : {
-		caption: "Supprimer",
-		msg: "Supprimer les enregistrements sélectionnés ?",
-		bSubmit: "Supprimer",
-		bCancel: "Annuler"
-	},
-	nav : {
-		edittext: " ",
-		edittitle: "Editer la ligne sélectionnée",
-		addtext:" ",
-		addtitle: "Ajouter une ligne",
-		deltext: " ",
-		deltitle: "Supprimer la ligne sélectionnée",
-		searchtext: " ",
-		searchtitle: "Chercher un enregistrement",
-		refreshtext: "",
-		refreshtitle: "Recharger le tableau",
-		alertcap: "Avertissement",
-		alerttext: "Veuillez sélectionner une ligne",
-		viewtext: "",
-		viewtitle: "Afficher la ligne sélectionnée"
-	},
-	col : {
-		caption: "Afficher/Masquer les colonnes",
-		bSubmit: "Valider",
-		bCancel: "Annuler"
-	},
-	errors : {
-		errcap : "Erreur",
-		nourl : "Aucune adresse n'est paramétrée",
-		norecords: "Aucun enregistrement à traiter",
-		model : "Nombre de titres (colNames) <> Nombre de données (colModel)!"
-	},
-	formatter : {
-		integer : {thousandsSeparator: " ", defaultValue: '0'},
-		number : {decimalSeparator:",", thousandsSeparator: " ", decimalPlaces: 2, defaultValue: '0,00'},
-		currency : {decimalSeparator:",", thousandsSeparator: " ", decimalPlaces: 2, prefix: "", suffix:"", defaultValue: '0,00'},
-		date : {
-			dayNames:   [
-				"Dim", "Lun", "Mar", "Mer", "Jeu", "Ven", "Sam",
-				"Dimanche", "Lundi", "Mardi", "Mercredi", "Jeudi", "Vendredi", "Samedi"
-			],
-			monthNames: [
-				"Jan", "Fév", "Mar", "Avr", "Mai", "Jui", "Jul", "Aou", "Sep", "Oct", "Nov", "Déc",
-				"Janvier", "Février", "Mars", "Avril", "Mai", "Juin", "Juillet", "Aout", "Septembre", "Octobre", "Novembre", "Décembre"
-			],
-			AmPm : ["am","pm","AM","PM"],
-			S: function (j) {return j == 1 ? 'er' : 'e';},
-			srcformat: 'Y-m-d',
-			newformat: 'd/m/Y',
-			masks : {
-				ISO8601Long:"Y-m-d H:i:s",
-				ISO8601Short:"Y-m-d",
-				ShortDate: "n/j/Y",
-				LongDate: "l, F d, Y",
-				FullDateTime: "l, F d, Y g:i:s A",
-				MonthDay: "F d",
-				ShortTime: "g:i A",
-				LongTime: "g:i:s A",
-				SortableDateTime: "Y-m-d\\TH:i:s",
-				UniversalSortableDateTime: "Y-m-d H:i:sO",
-				YearMonth: "F, Y"
-			},
-			reformatAfterEdit : false
-		},
-		baseLinkUrl: '',
-		showAction: '',
-		target: '',
-		checkbox : {disabled:true},
-		idName : 'id'
-	}
-};
-})(jQuery);
diff --git a/addons/base/static/lib/jquery.jqGrid/js/i18n/grid.locale-gl.js b/addons/base/static/lib/jquery.jqGrid/js/i18n/grid.locale-gl.js
deleted file mode 100644
index 7b7f5a666f8..00000000000
--- a/addons/base/static/lib/jquery.jqGrid/js/i18n/grid.locale-gl.js
+++ /dev/null
@@ -1,126 +0,0 @@
-;(function($){
-/**
- * jqGrid Galician Translation
- * Translated by Jorge Barreiro <yortx.barry@gmail.com>
- * Dual licensed under the MIT and GPL licenses:
- * http://www.opensource.org/licenses/mit-license.php
- * http://www.gnu.org/licenses/gpl.html
-**/
-$.jgrid = {
-	defaults : {
-		recordtext: "Amosando {0} - {1} de {2}",
-	    emptyrecords: "Sen rexistros que amosar",
-		loadtext: "Cargando...",
-		pgtext : "Páxina {0} de {1}"
-	},
-	search : {
-	    caption: "Búsqueda...",
-	    Find: "Buscar",
-	    Reset: "Limpar",
-	    odata : ['igual ', 'diferente a', 'menor que', 'menor ou igual que','maior que','maior ou igual a', 'empece por','non empece por','está en','non está en','termina por','non termina por','contén','non contén'],
-	    groupOps: [	{ op: "AND", text: "todo" },	{ op: "OR",  text: "calquera" }	],
-		matchText: " match",
-		rulesText: " regras"
-	},
-	edit : {
-	    addCaption: "Engadir rexistro",
-	    editCaption: "Modificar rexistro",
-	    bSubmit: "Gardar",
-	    bCancel: "Cancelar",
-		bClose: "Pechar",
-		saveData: "Modificáronse os datos, quere gardar os cambios?",
-		bYes : "Si",
-		bNo : "Non",
-		bExit : "Cancelar",
-	    msg: {
-	        required:"Campo obrigatorio",
-	        number:"Introduza un número",
-	        minValue:"O valor debe ser maior ou igual a ",
-	        maxValue:"O valor debe ser menor ou igual a ",
-	        email: "non é un enderezo de correo válido",
-	        integer: "Introduza un valor enteiro",
-			date: "Introduza unha data correcta ",
-			url: "non é unha URL válida. Prefixo requerido ('http://' ou 'https://')",
-			nodefined : " non está definido.",
-			novalue : " o valor de retorno é obrigatorio.",
-			customarray : "A función persoalizada debe devolver un array.",
-			customfcheck : "A función persoalizada debe estar presente no caso de ter validación persoalizada."
-		}
-	},
-	view : {
-	    caption: "Consultar rexistro",
-	    bClose: "Pechar"
-	},
-	del : {
-	    caption: "Eliminar",
-	    msg: "Desexa eliminar os rexistros seleccionados?",
-	    bSubmit: "Eliminar",
-	    bCancel: "Cancelar"
-	},
-	nav : {
-		edittext: " ",
-	    edittitle: "Modificar a fila seleccionada",
-		addtext:" ",
-	    addtitle: "Engadir unha nova fila",
-	    deltext: " ",
-	    deltitle: "Eliminar a fila seleccionada",
-	    searchtext: " ",
-	    searchtitle: "Buscar información",
-	    refreshtext: "",
-	    refreshtitle: "Recargar datos",
-	    alertcap: "Aviso",
-	    alerttext: "Seleccione unha fila",
-		viewtext: "",
-		viewtitle: "Ver fila seleccionada"
-	},
-	col : {
-	    caption: "Mostrar/ocultar columnas",
-	    bSubmit: "Enviar",
-	    bCancel: "Cancelar"	
-	},
-	errors : {
-		errcap : "Erro",
-		nourl : "Non especificou unha URL",
-		norecords: "Non hai datos para procesar",
-	    model : "As columnas de nomes son diferentes das columnas de modelo"
-	},
-	formatter : {
-		integer : {thousandsSeparator: ".", defaultValue: '0'},
-		number : {decimalSeparator:",", thousandsSeparator: ".", decimalPlaces: 2, defaultValue: '0,00'},
-		currency : {decimalSeparator:",", thousandsSeparator: ".", decimalPlaces: 2, prefix: "", suffix:"", defaultValue: '0,00'},
-		date : {
-			dayNames:   [
-				"Do", "Lu", "Ma", "Me", "Xo", "Ve", "Sa",
-				"Domingo", "Luns", "Martes", "Mércoles", "Xoves", "Vernes", "Sábado"
-			],
-			monthNames: [
-				"Xan", "Feb", "Mar", "Abr", "Mai", "Xuñ", "Xul", "Ago", "Set", "Out", "Nov", "Dec",
-				"Xaneiro", "Febreiro", "Marzo", "Abril", "Maio", "Xuño", "Xullo", "Agosto", "Setembro", "Outubro", "Novembro", "Decembro"
-			],
-			AmPm : ["am","pm","AM","PM"],
-			S: function (j) {return j < 11 || j > 13 ? ['st', 'nd', 'rd', 'th'][Math.min((j - 1) % 10, 3)] : 'th'},
-			srcformat: 'Y-m-d',
-			newformat: 'd-m-Y',
-			masks : {
-	            ISO8601Long:"Y-m-d H:i:s",
-	            ISO8601Short:"Y-m-d",
-	            ShortDate: "n/j/Y",
-	            LongDate: "l, F d, Y",
-	            FullDateTime: "l, F d, Y g:i:s A",
-	            MonthDay: "F d",
-	            ShortTime: "g:i A",
-	            LongTime: "g:i:s A",
-	            SortableDateTime: "Y-m-d\\TH:i:s",
-	            UniversalSortableDateTime: "Y-m-d H:i:sO",
-	            YearMonth: "F, Y"
-	        },
-	        reformatAfterEdit : false
-		},
-		baseLinkUrl: '',
-		showAction: '',
-	    target: '',
-	    checkbox : {disabled:true},
-		idName : 'id'
-	}
-};
-})(jQuery);
diff --git a/addons/base/static/lib/jquery.jqGrid/js/i18n/grid.locale-he.js b/addons/base/static/lib/jquery.jqGrid/js/i18n/grid.locale-he.js
deleted file mode 100644
index 677bb802605..00000000000
--- a/addons/base/static/lib/jquery.jqGrid/js/i18n/grid.locale-he.js
+++ /dev/null
@@ -1,127 +0,0 @@
-;(function($){
-/**
- * jqGrid Hebrew Translation
- * Shuki Shukrun shukrun.shuki@gmail.com
- * http://trirand.com/blog/ 
- * Dual licensed under the MIT and GPL licenses:
- * http://www.opensource.org/licenses/mit-license.php
- * http://www.gnu.org/licenses/gpl.html
-**/
-$.jgrid = {
-	defaults : {
-		recordtext: "מציג {0} - {1} מתוך {2}",
-		emptyrecords: "�ין רשומות להציג",
-		loadtext: "טוען...",
-		pgtext : "דף {0} מתוך {1}"
-	},
-	search : {
-		caption: "מחפש...",
-		Find: "חפש",
-		Reset: "התחל",
-		odata : ['שווה', 'ל� שווה', 'קטן', 'קטן �ו שווה','גדול','גדול �ו שווה', 'מתחיל ב','ל� מתחיל ב','נמצ� ב','ל� נמצ� ב','מסתיי� ב','ל� מסתיי� ב','מכיל','ל� מכיל'],
-		groupOps: [	{ op: "AND", text: "הכל" },	{ op: "OR",  text: "�חד מ" }	],
-		matchText: " תו��",
-		rulesText: " חוקי�"
-	},
-	edit : {
-		addCaption: "הוסף רשומה",
-		editCaption: "ערוך רשומה",
-		bSubmit: "שלח",
-		bCancel: "בטל",
-		bClose: "סגור",
-		saveData: "נתוני� השתנו! לשמור?",
-		bYes : "כן",
-		bNo : "ל�",
-		bExit : "בטל",
-		msg: {
-			required:"שדה חובה",
-			number:"�נ�, הכנס מספר תקין",
-			minValue:"ערך צריך להיות גדול �ו שווה ל ",
-			maxValue:"ערך צריך להיות קטן �ו שווה ל ",
-			email: "הי� ל� כתובת �יימל תקינה",
-			integer: "�נ�, הכנס מספר של�",
-			date: "�נ�, הכנס ת�ריך תקין",
-			url: "הכתובת �ינה תקינה. דרושה תחילית ('http://' �ו 'https://')",
-			nodefined : " is not defined!",
-			novalue : " return value is required!",
-			customarray : "Custom function should return array!",
-			customfcheck : "Custom function should be present in case of custom checking!"
-		}
-	},
-	view : {
-		caption: "הצג רשומה",
-		bClose: "סגור"
-	},
-	del : {
-		caption: "מחק",
-		msg: "ה�� למחוק �ת הרשומה/ות המסומנות?",
-		bSubmit: "מחק",
-		bCancel: "בטל"
-	},
-	nav : {
-		edittext: "",
-		edittitle: "ערוך שורה מסומנת",
-		addtext:"",
-		addtitle: "הוסף שורה חדשה",
-		deltext: "",
-		deltitle: "מחק שורה מסומנת",
-		searchtext: "",
-		searchtitle: "חפש רשומות",
-		refreshtext: "",
-		refreshtitle: "טען גריד מחדש",
-		alertcap: "�זהרה",
-		alerttext: "�נ�, בחר שורה",
-		viewtext: "",
-		viewtitle: "הצג שורה מסומנת"
-	},
-	col : {
-		caption: "הצג/הסתר עמודות",
-		bSubmit: "שלח",
-		bCancel: "בטל"
-	},
-	errors : {
-		errcap : "שגי�ה",
-		nourl : "ל� הוגדרה כתובת url",
-		norecords: "�ין רשומות לעבד",
-		model : "�ורך של colNames <> colModel!"
-	},
-	formatter : {
-		integer : {thousandsSeparator: " ", defaultValue: '0'},
-		number : {decimalSeparator:".", thousandsSeparator: " ", decimalPlaces: 2, defaultValue: '0.00'},
-		currency : {decimalSeparator:".", thousandsSeparator: " ", decimalPlaces: 2, prefix: "", suffix:"", defaultValue: '0.00'},
-		date : {
-			dayNames:   [
-				"�", "ב", "ג", "ד", "ה", "ו", "ש",
-				"ר�שון", "שני", "שלישי", "רביעי", "חמישי", "שישי", "שבת"
-			],
-			monthNames: [
-				"ינו", "פבר", "מרץ", "�פר", "מ�י", "יונ", "יול", "�וג", "ספט", "�וק", "נוב", "דצמ",
-				"ינו�ר", "פברו�ר", "מרץ", "�פריל", "מ�י", "יוני", "יולי", "�וגוסט", "ספטמבר", "�וקטובר", "נובמבר", "דצמבר"
-			],
-			AmPm : ["לפני הצהרי�","�חר הצהרי�","לפני הצהרי�","�חר הצהרי�"],
-			S: function (j) {return j < 11 || j > 13 ? ['', '', '', ''][Math.min((j - 1) % 10, 3)] : ''},
-			srcformat: 'Y-m-d',
-			newformat: 'd/m/Y',
-			masks : {
-				ISO8601Long:"Y-m-d H:i:s",
-				ISO8601Short:"Y-m-d",
-				ShortDate: "n/j/Y",
-				LongDate: "l, F d, Y",
-				FullDateTime: "l, F d, Y g:i:s A",
-				MonthDay: "F d",
-				ShortTime: "g:i A",
-				LongTime: "g:i:s A",
-				SortableDateTime: "Y-m-d\\TH:i:s",
-				UniversalSortableDateTime: "Y-m-d H:i:sO",
-				YearMonth: "F, Y"
-			},
-			reformatAfterEdit : false
-		},
-		baseLinkUrl: '',
-		showAction: '',
-		target: '',
-		checkbox : {disabled:true},
-		idName : 'id'
-	}
-};
-})(jQuery);
diff --git a/addons/base/static/lib/jquery.jqGrid/js/i18n/grid.locale-hu.js b/addons/base/static/lib/jquery.jqGrid/js/i18n/grid.locale-hu.js
deleted file mode 100644
index fc5f96a563e..00000000000
--- a/addons/base/static/lib/jquery.jqGrid/js/i18n/grid.locale-hu.js
+++ /dev/null
@@ -1,129 +0,0 @@
-;(function($){
-/**
- * jqGrid Hungarian Translation
- * �rszigety �dám udx6bs@freemail.hu
- * http://trirand.com/blog/ 
- * Dual licensed under the MIT and GPL licenses:
- * http://www.opensource.org/licenses/mit-license.php
- * http://www.gnu.org/licenses/gpl.html
-**/
-
-$.jgrid = {
-	defaults : {
-		recordtext: "Oldal {0} - {1} / {2}",
-		emptyrecords: "Nincs találat",
-		loadtext: "Betöltés...",
-		pgtext : "Oldal {0} / {1}"
-	},
-	search : {
-		caption: "Keresés...",
-		Find: "Keres",
-		Reset: "Alapértelmezett",
-		odata : ['egyenlő', 'nem egyenlő', 'kevesebb', 'kevesebb vagy egyenlő','nagyobb','nagyobb vagy egyenlő', 'ezzel kezdődik','nem ezzel kezdődik','tartalmaz','nem tartalmaz','végződik','nem végződik','tartalmaz','nem tartalmaz'],
-		groupOps: [	{ op: "AND", text: "all" },	{ op: "OR",  text: "any" }	],
-		matchText: " match",
-		rulesText: " rules"
-	},
-	edit : {
-		addCaption: "Új tétel",
-		editCaption: "Tétel szerkesztése",
-		bSubmit: "Mentés",
-		bCancel: "Mégse",
-		bClose: "Bezárás",
-		saveData: "A tétel megváltozott! Tétel mentése?",
-		bYes : "Igen",
-		bNo : "Nem",
-		bExit : "Mégse",
-		msg: {
-			required:"Kötelező mező",
-			number:"Kérjük, adjon meg egy helyes számot",
-			minValue:"Nagyobb vagy egyenlőnek kell lenni mint ",
-			maxValue:"Kisebb vagy egyenlőnek kell lennie mint",
-			email: "hibás emailcím",
-			integer: "Kérjük adjon meg egy helyes egész számot",
-			date: "Kérjük adjon meg egy helyes dátumot",
-			url: "nem helyes cím. Előtag kötelező ('http://' vagy 'https://')",
-			nodefined : " nem definiált!",
-			novalue : " visszatérési érték kötelező!!",
-			customarray : "Custom function should return array!",
-			customfcheck : "Custom function should be present in case of custom checking!"
-			
-		}
-	},
-	view : {
-		caption: "Tétel megtekintése",
-		bClose: "Bezárás"
-	},
-	del : {
-		caption: "Törlés",
-		msg: "Kiválaztott tétel(ek) törlése?",
-		bSubmit: "Törlés",
-		bCancel: "Mégse"
-	},
-	nav : {
-		edittext: "",
-		edittitle: "Tétel szerkesztése",
-		addtext:"",
-		addtitle: "Új tétel hozzáadása",
-		deltext: "",
-		deltitle: "Tétel törlése",
-		searchtext: "",
-		searchtitle: "Keresés",
-		refreshtext: "",
-		refreshtitle: "Frissítés",
-		alertcap: "Figyelmeztetés",
-		alerttext: "Kérem válasszon tételt.",
-		viewtext: "",
-		viewtitle: "Tétel megtekintése"
-	},
-	col : {
-		caption: "Oszlopok kiválasztása",
-		bSubmit: "Ok",
-		bCancel: "Mégse"
-	},
-	errors : {
-		errcap : "Hiba",
-		nourl : "Nincs URL beállítva",
-		norecords: "Nincs feldolgozásra váró tétel",
-		model : "colNames és colModel hossza nem egyenlő!"
-	},
-	formatter : {
-		integer : {thousandsSeparator: " ", defaultValue: '0'},
-		number : {decimalSeparator:",", thousandsSeparator: " ", decimalPlaces: 2, defaultValue: '0,00'},
-		currency : {decimalSeparator:",", thousandsSeparator: " ", decimalPlaces: 2, prefix: "", suffix:"", defaultValue: '0,00'},
-		date : {
-			dayNames:   [
-				"Va", "Hé", "Ke", "Sze", "Csü", "Pé", "Szo",
-				"Vasárnap", "Hétfő", "Kedd", "Szerda", "Csütörtök", "Péntek", "Szombat"
-			],
-			monthNames: [
-				"Jan", "Feb", "Már", "�pr", "Máj", "Jún", "Júl", "Aug", "Szep", "Okt", "Nov", "Dec",
-				"Január", "Február", "Március", "�prili", "Május", "Június", "Július", "Augusztus", "Szeptember", "Október", "November", "December"
-			],
-			AmPm : ["de","du","DE","DU"],
-			S: function (j) {return '.-ik';},
-			srcformat: 'Y-m-d',
-			newformat: 'Y/m/d',
-			masks : {
-				ISO8601Long:"Y-m-d H:i:s",
-				ISO8601Short:"Y-m-d",
-				ShortDate: "Y/j/n",
-				LongDate: "Y. F hó d., l",
-				FullDateTime: "l, F d, Y g:i:s A",
-				MonthDay: "F d",
-				ShortTime: "a g:i",
-				LongTime: "a g:i:s",
-				SortableDateTime: "Y-m-d\\TH:i:s",
-				UniversalSortableDateTime: "Y-m-d H:i:sO",
-				YearMonth: "Y, F"
-			},
-			reformatAfterEdit : false
-		},
-		baseLinkUrl: '',
-		showAction: '',
-		target: '',
-		checkbox : {disabled:true},
-		idName : 'id'
-	}
-};
-})(jQuery);
diff --git a/addons/base/static/lib/jquery.jqGrid/js/i18n/grid.locale-is.js b/addons/base/static/lib/jquery.jqGrid/js/i18n/grid.locale-is.js
deleted file mode 100644
index 2f4a8ad96fe..00000000000
--- a/addons/base/static/lib/jquery.jqGrid/js/i18n/grid.locale-is.js
+++ /dev/null
@@ -1,126 +0,0 @@
-;(function($){
-/**
- * jqGrid Icelandic Translation
- * jtm@hi.is Univercity of Iceland
- * Dual licensed under the MIT and GPL licenses:
- * http://www.opensource.org/licenses/mit-license.php
- * http://www.gnu.org/licenses/gpl.html
-**/
-$.jgrid = {
-	defaults : {
-		recordtext: "View {0} - {1} of {2}",
-	    emptyrecords: "No records to view",
-		loadtext: "Hleður...",
-		pgtext : "Page {0} of {1}"
-	},
-	search : {
-	    caption: "Leita...",
-	    Find: "Leita",
-	    Reset: "Endursetja",
-	    odata : ['equal', 'not equal', 'less', 'less or equal','greater','greater or equal', 'begins with','does not begin with','is in','is not in','ends with','does not end with','contains','does not contain'],
-	    groupOps: [	{ op: "AND", text: "all" },	{ op: "OR",  text: "any" }	],
-		matchText: " match",
-		rulesText: " rules"
-	},
-	edit : {
-	    addCaption: "Add Record",
-	    editCaption: "Edit Record",
-	    bSubmit: "Vista",
-	    bCancel: "Hætta við",
-		bClose: "Loka",
-		saveData: "Data has been changed! Save changes?",
-		bYes : "Yes",
-		bNo : "No",
-		bExit : "Cancel",
-	    msg: {
-	        required:"Reitur er nauðsynlegur",
-	        number:"Vinsamlega settu inn tölu",
-	        minValue:"gildi verður að vera meira en eða jafnt og ",
-	        maxValue:"gildi verður að vera minna en eða jafnt og ",
-	        email: "er ekki löglegt email",
-	        integer: "Vinsamlega settu inn tölu",
-			date: "Please, enter valid date value",
-			url: "is not a valid URL. Prefix required ('http://' or 'https://')",
-			nodefined : " is not defined!",
-			novalue : " return value is required!",
-			customarray : "Custom function should return array!",
-			customfcheck : "Custom function should be present in case of custom checking!"
-		}
-	},
-	view : {
-	    caption: "View Record",
-	    bClose: "Close"
-	},
-	del : {
-	    caption: "Eyða",
-	    msg: "Eyða völdum færslum ?",
-	    bSubmit: "Eyða",
-	    bCancel: "Hætta við"
-	},
-	nav : {
-		edittext: " ",
-	    edittitle: "Breyta færslu",
-		addtext:" ",
-	    addtitle: "Ný færsla",
-	    deltext: " ",
-	    deltitle: "Eyða færslu",
-	    searchtext: " ",
-	    searchtitle: "Leita",
-	    refreshtext: "",
-	    refreshtitle: "Endurhlaða",
-	    alertcap: "Viðvörun",
-	    alerttext: "Vinsamlega veldu færslu",
-		viewtext: "",
-		viewtitle: "View selected row"
-	},
-	col : {
-	    caption: "Sýna / fela dálka",
-	    bSubmit: "Vista",
-	    bCancel: "Hætta við"	
-	},
-	errors : {
-		errcap : "Villa",
-		nourl : "Vantar slóð",
-		norecords: "Engar færslur valdar",
-	    model : "Length of colNames <> colModel!"
-	},
-	formatter : {
-		integer : {thousandsSeparator: " ", defaultValue: '0'},
-		number : {decimalSeparator:".", thousandsSeparator: " ", decimalPlaces: 2, defaultValue: '0.00'},
-		currency : {decimalSeparator:".", thousandsSeparator: " ", decimalPlaces: 2, prefix: "", suffix:"", defaultValue: '0.00'},
-		date : {
-			dayNames:   [
-				"Sun", "Mon", "Tue", "Wed", "Thr", "Fri", "Sat",
-				"Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday"
-			],
-			monthNames: [
-				"Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec",
-				"January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December"
-			],
-			AmPm : ["am","pm","AM","PM"],
-			S: function (j) {return j < 11 || j > 13 ? ['st', 'nd', 'rd', 'th'][Math.min((j - 1) % 10, 3)] : 'th'},
-			srcformat: 'Y-m-d',
-			newformat: 'd/m/Y',
-			masks : {
-	            ISO8601Long:"Y-m-d H:i:s",
-	            ISO8601Short:"Y-m-d",
-	            ShortDate: "n/j/Y",
-	            LongDate: "l, F d, Y",
-	            FullDateTime: "l, F d, Y g:i:s A",
-	            MonthDay: "F d",
-	            ShortTime: "g:i A",
-	            LongTime: "g:i:s A",
-	            SortableDateTime: "Y-m-d\\TH:i:s",
-	            UniversalSortableDateTime: "Y-m-d H:i:sO",
-	            YearMonth: "F, Y"
-	        },
-	        reformatAfterEdit : false
-		},
-		baseLinkUrl: '',
-		showAction: '',
-	    target: '',
-	    checkbox : {disabled:true},
-		idName : 'id'
-	}
-};
-})(jQuery);
diff --git a/addons/base/static/lib/jquery.jqGrid/js/i18n/grid.locale-it.js b/addons/base/static/lib/jquery.jqGrid/js/i18n/grid.locale-it.js
deleted file mode 100644
index fec00456e51..00000000000
--- a/addons/base/static/lib/jquery.jqGrid/js/i18n/grid.locale-it.js
+++ /dev/null
@@ -1 +0,0 @@
-(function(a){a.jgrid={defaults:{recordtext:"Visualizzati {0} - {1} di {2}",emptyrecords:"Nessun record da visualizzare",loadtext:"Caricamento...",pgtext:"Pagina {0} di {1}"},search:{caption:"Ricerca...",Find:"Cerca",Reset:"Pulisci",odata:["uguale","diverso","minore","minore o uguale","maggiore","maggiore o uguale","inizia con","non inizia con","in","non in","termina con","non termina con","contiene","non contiene"],groupOps:[{op:"AND",text:"tutto"},{op:"OR",text:"almeno uno"}],matchText:" corrisponde",rulesText:" regole"},edit:{addCaption:"Aggiungi Record",editCaption:"Modifica Record",bSubmit:"Invia",bCancel:"Chiudi",bClose:"Chiudi",saveData:"Alcuni dati modificati! Salvare i cambiamenti?",bYes:"Si",bNo:"No",bExit:"Esci",msg:{required:"Campo richiesto",number:"Per favore, inserisci un valore valido",minValue:"il valore deve essere maggiore o uguale a ",maxValue:"il valore deve essere minore o uguale a",email:"e-mail non corretta",integer:"Per favore, inserisci un numero intero valido",date:"Per favore, inserisci una data valida",url:"URL non valido. Prefisso richiesto ('http://' or 'https://')",nodefined:" non è definito!",novalue:" valore di ritorno richiesto!",customarray:"La function custon deve tornare un array!",customfcheck:"La function custom deve esistere per il custom checking!"}},view:{caption:"Visualizzazione Record",bClose:"Chiudi"},del:{caption:"Cancella",msg:"Cancellare record selezionato/i?",bSubmit:"Cancella",bCancel:"Annulla"},nav:{edittext:" ",edittitle:"Modifica record selezionato",addtext:" ",addtitle:"Aggiungi nuovo record",deltext:" ",deltitle:"Cancella record selezionato",searchtext:" ",searchtitle:"Ricerca record",refreshtext:"",refreshtitle:"Aggiorna griglia",alertcap:"Attenzione",alerttext:"Per favore, seleziona un record",viewtext:"",viewtitle:"Visualizza riga selezionata"},col:{caption:"Mostra/Nascondi Colonne",bSubmit:"Invia",bCancel:"Annulla"},errors:{errcap:"Errore",nourl:"Url non settata",norecords:"Nessun record da elaborare",model:"Lunghezza di colNames &lt;&gt; colModel!"},formatter:{integer:{thousandsSeparator:" ",defaultValue:"0"},number:{decimalSeparator:",",thousandsSeparator:" ",decimalPlaces:2,defaultValue:"0,00"},currency:{decimalSeparator:",",thousandsSeparator:" ",decimalPlaces:2,prefix:"",suffix:"",defaultValue:"0,00"},date:{dayNames:["Dom","Lun","Mar","Mer","Gio","Ven","Sab","Domenica","Lunedì","Martedì","Mercoledì","Giovedì","Venerdì","Sabato"],monthNames:["Gen","Feb","Mar","Apr","Mag","Gui","Lug","Ago","Set","Ott","Nov","Dic","Genneio","Febbraio","Marzo","Aprile","Maggio","Giugno","Luglio","Agosto","Settembre","Ottobre","Movembre","Dicembre"],AmPm:["am","pm","AM","PM"],S:function(b){return b<11||b>13?["st","nd","rd","th"][Math.min((b-1)%10,3)]:"th"},srcformat:"Y-m-d",newformat:"d/m/Y",masks:{ISO8601Long:"Y-m-d H:i:s",ISO8601Short:"Y-m-d",ShortDate:"n/j/Y",LongDate:"l, F d, Y",FullDateTime:"l, F d, Y g:i:s A",MonthDay:"F d",ShortTime:"g:i A",LongTime:"g:i:s A",SortableDateTime:"Y-m-d\\TH:i:s",UniversalSortableDateTime:"Y-m-d H:i:sO",YearMonth:"F, Y"},reformatAfterEdit:false},baseLinkUrl:"",showAction:"",target:"",checkbox:{disabled:true},idName:"id"}}})(jQuery);
\ No newline at end of file
diff --git a/addons/base/static/lib/jquery.jqGrid/js/i18n/grid.locale-ja.js b/addons/base/static/lib/jquery.jqGrid/js/i18n/grid.locale-ja.js
deleted file mode 100644
index 8a9961d8ca4..00000000000
--- a/addons/base/static/lib/jquery.jqGrid/js/i18n/grid.locale-ja.js
+++ /dev/null
@@ -1,155 +0,0 @@
-;(function($){
-/**
- * jqGrid Japanese Translation
- * OKADA Yoshitada okada.dev@sth.jp
- * http://trirand.com/blog/ 
- * Dual licensed under the MIT and GPL licenses:
- * http://www.opensource.org/licenses/mit-license.php
- * http://www.gnu.org/licenses/gpl.html
-**/
-$.jgrid = {
-	defaults : {
-		recordtext: "{2} \u4EF6\u4E2D {0} - {1} \u3092\u8868\u793A ",
-	    emptyrecords: "\u8868\u793A\u3059\u308B\u30EC\u30B3\u30FC\u30C9\u304C\u3042\u308A\u307E\u305B\u3093",
-		loadtext: "\u8aad\u307f\u8fbc\u307f\u4e2d...",
-		pgtext : "{1} \u30DA\u30FC\u30B8\u4E2D {0} \u30DA\u30FC\u30B8\u76EE "
-	},
-	search : {
-	    caption: "\u691c\u7d22...",
-	    Find: "\u691c\u7d22",
-	    Reset: "\u30ea\u30bb\u30c3\u30c8",
-	    odata: ["\u6B21\u306B\u7B49\u3057\u3044", "\u6B21\u306B\u7B49\u3057\u304F\u306A\u3044",
-            "\u6B21\u3088\u308A\u5C0F\u3055\u3044", "\u6B21\u306B\u7B49\u3057\u3044\u304B\u5C0F\u3055\u3044",
-            "\u6B21\u3088\u308A\u5927\u304D\u3044", "\u6B21\u306B\u7B49\u3057\u3044\u304B\u5927\u304D\u3044",
-            "\u6B21\u3067\u59CB\u307E\u308B", "\u6B21\u3067\u59CB\u307E\u3089\u306A\u3044",
-            "\u6B21\u306B\u542B\u307E\u308C\u308B", "\u6B21\u306B\u542B\u307E\u308C\u306A\u3044",
-            "\u6B21\u3067\u7D42\u308F\u308B", "\u6B21\u3067\u7D42\u308F\u3089\u306A\u3044",
-            "\u6B21\u3092\u542B\u3080", "\u6B21\u3092\u542B\u307E\u306A\u3044"],
-	    groupOps: [{
-                op: "AND",
-                text: "\u3059\u3079\u3066\u306E"
-            },
-            {
-                op: "OR",
-                text: "\u3044\u305A\u308C\u304B\u306E"
-            }],
-      matchText: " \u6B21\u306E",
-      rulesText: " \u6761\u4EF6\u3092\u6E80\u305F\u3059"
-	},
-	edit : {
-	    addCaption: "\u30ec\u30b3\u30fc\u30c9\u8ffd\u52a0",
-	    editCaption: "\u30ec\u30b3\u30fc\u30c9\u7de8\u96c6",
-	    bSubmit: "\u9001\u4fe1",
-	    bCancel: "\u30ad\u30e3\u30f3\u30bb\u30eb",
-  		bClose: "\u9589\u3058\u308b",
-      saveData: "\u30C7\u30FC\u30BF\u304C\u5909\u66F4\u3055\u308C\u3066\u3044\u307E\u3059\u3002\u4FDD\u5B58\u3057\u307E\u3059\u304B\uFF1F",
-      bYes: "\u306F\u3044",
-      bNo: "\u3044\u3044\u3048",
-      bExit: "\u30AD\u30E3\u30F3\u30BB\u30EB",
-	    msg: {
-	        required:"\u3053\u306e\u9805\u76ee\u306f\u5fc5\u9808\u3067\u3059\u3002",
-	        number:"\u6b63\u3057\u3044\u6570\u5024\u3092\u5165\u529b\u3057\u3066\u4e0b\u3055\u3044\u3002",
-	        minValue:"\u6b21\u306e\u5024\u4ee5\u4e0a\u3067\u5165\u529b\u3057\u3066\u4e0b\u3055\u3044\u3002",
-	        maxValue:"\u6b21\u306e\u5024\u4ee5\u4e0b\u3067\u5165\u529b\u3057\u3066\u4e0b\u3055\u3044\u3002",
-	        email: "e-mail\u304c\u6b63\u3057\u304f\u3042\u308a\u307e\u305b\u3093\u3002",
-	        integer: "\u6b63\u3057\u3044\u6574\u6570\u5024\u3092\u5165\u529b\u3057\u3066\u4e0b\u3055\u3044\u3002",
-    			date: "\u6b63\u3057\u3044\u5024\u3092\u5165\u529b\u3057\u3066\u4e0b\u3055\u3044\u3002",
-          url: "\u306F\u6709\u52B9\u306AURL\u3067\u306F\u3042\u308A\u307E\u305B\u3093\u3002\20\u30D7\u30EC\u30D5\u30A3\u30C3\u30AF\u30B9\u304C\u5FC5\u8981\u3067\u3059\u3002 ('http://' \u307E\u305F\u306F 'https://')",
-          nodefined: " \u304C\u5B9A\u7FA9\u3055\u308C\u3066\u3044\u307E\u305B\u3093",
-          novalue: " \u623B\u308A\u5024\u304C\u5FC5\u8981\u3067\u3059",
-          customarray: "\u30AB\u30B9\u30BF\u30E0\u95A2\u6570\u306F\u914D\u5217\u3092\u8FD4\u3059\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059",
-          customfcheck: "\u30AB\u30B9\u30BF\u30E0\u691C\u8A3C\u306B\u306F\u30AB\u30B9\u30BF\u30E0\u95A2\u6570\u304C\u5FC5\u8981\u3067\u3059"
-		}
-	},
-	view : {
-      caption: "\u30EC\u30B3\u30FC\u30C9\u3092\u8868\u793A",
-      bClose: "\u9589\u3058\u308B"
-	},
-	del : {
-	    caption: "\u524a\u9664",
-	    msg: "\u9078\u629e\u3057\u305f\u30ec\u30b3\u30fc\u30c9\u3092\u524a\u9664\u3057\u307e\u3059\u304b\uff1f",
-	    bSubmit: "\u524a\u9664",
-	    bCancel: "\u30ad\u30e3\u30f3\u30bb\u30eb"
-	},
-	nav : {
-    	edittext: " ",
-	    edittitle: "\u9078\u629e\u3057\u305f\u884c\u3092\u7de8\u96c6",
-      addtext:" ",
-	    addtitle: "\u884c\u3092\u65b0\u898f\u8ffd\u52a0",
-	    deltext: " ",
-	    deltitle: "\u9078\u629e\u3057\u305f\u884c\u3092\u524a\u9664",
-	    searchtext: " ",
-	    searchtitle: "\u30ec\u30b3\u30fc\u30c9\u691c\u7d22",
-	    refreshtext: "",
-	    refreshtitle: "\u30b0\u30ea\u30c3\u30c9\u3092\u30ea\u30ed\u30fc\u30c9",
-	    alertcap: "\u8b66\u544a",
-	    alerttext: "\u884c\u3092\u9078\u629e\u3057\u3066\u4e0b\u3055\u3044\u3002",
-      viewtext: "",
-      viewtitle: "\u9078\u629E\u3057\u305F\u884C\u3092\u8868\u793A"
-	},
-	col : {
-	    caption: "\u5217\u3092\u8868\u793a\uff0f\u96a0\u3059",
-	    bSubmit: "\u9001\u4fe1",
-	    bCancel: "\u30ad\u30e3\u30f3\u30bb\u30eb"	
-	},
-	errors : {
-		errcap : "\u30a8\u30e9\u30fc",
-		nourl : "URL\u304c\u8a2d\u5b9a\u3055\u308c\u3066\u3044\u307e\u305b\u3093\u3002",
-		norecords: "\u51e6\u7406\u5bfe\u8c61\u306e\u30ec\u30b3\u30fc\u30c9\u304c\u3042\u308a\u307e\u305b\u3093\u3002",
-	    model : "colNames\u306e\u9577\u3055\u304ccolModel\u3068\u4e00\u81f4\u3057\u307e\u305b\u3093\u3002"
-	},
-	formatter : {
-            integer: {
-                thousandsSeparator: ",",
-                defaultValue: '0'
-            },
-            number: {
-                decimalSeparator: ".",
-                thousandsSeparator: ",",
-                decimalPlaces: 2,
-                defaultValue: '0.00'
-            },
-            currency: {
-                decimalSeparator: ".",
-                thousandsSeparator: ",",
-                decimalPlaces: 0,
-                prefix: "",
-                suffix: "",
-                defaultValue: '0'
-            },
-		date : {
-			dayNames:   [
-				"\u65e5", "\u6708", "\u706b", "\u6c34", "\u6728", "\u91d1", "\u571f",
-				"\u65e5", "\u6708", "\u706b", "\u6c34", "\u6728", "\u91d1", "\u571f"
-			],
-			monthNames: [
-				"1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12",
-				"1\u6708", "2\u6708", "3\u6708", "4\u6708", "5\u6708", "6\u6708", "7\u6708", "8\u6708", "9\u6708", "10\u6708", "11\u6708", "12\u6708"
-			],
-			AmPm : ["am","pm","AM","PM"],
-			S: "\u756a\u76ee",
-			srcformat: 'Y-m-d',
-			newformat: 'd/m/Y',
-			masks : {
-	            ISO8601Long:"Y-m-d H:i:s",
-	            ISO8601Short:"Y-m-d",
-	            ShortDate: "n/j/Y",
-	            LongDate: "l, F d, Y",
-	            FullDateTime: "l, F d, Y g:i:s A",
-	            MonthDay: "F d",
-	            ShortTime: "g:i A",
-	            LongTime: "g:i:s A",
-	            SortableDateTime: "Y-m-d\\TH:i:s",
-	            UniversalSortableDateTime: "Y-m-d H:i:sO",
-	            YearMonth: "F, Y"
-	        },
-	        reformatAfterEdit : false
-		},
-		baseLinkUrl: '',
-		showAction: '',
-	    target: '',
-	    checkbox : {disabled:true},
-		idName : 'id'
-	}
-};
-})(jQuery);
diff --git a/addons/base/static/lib/jquery.jqGrid/js/i18n/grid.locale-nl.js b/addons/base/static/lib/jquery.jqGrid/js/i18n/grid.locale-nl.js
deleted file mode 100644
index a6227acf5c9..00000000000
--- a/addons/base/static/lib/jquery.jqGrid/js/i18n/grid.locale-nl.js
+++ /dev/null
@@ -1,149 +0,0 @@
-(function(a) {
-    a.jgrid =
-    {
-        defaults:
-        {
-            recordtext: "regels {0} - {1} van {2}",
-            emptyrecords: "Geen data gevonden.",
-            loadtext: "laden...",
-            pgtext: "pagina  {0}  van {1}"
-        },
-        search:
-        {
-            caption: "Zoeken...",
-            Find: "Zoek",
-            Reset: "Herstellen",
-            odata: ["gelijk aan", "niet gelijk aan", "kleiner dan", "kleiner dan of gelijk aan", "groter dan", "groter dan of gelijk aan", "begint met", "begint niet met", "is in", "is niet in", "eindigd met", "eindigd niet met", "bevat", "bevat niet"],
-            groupOps: [{ op: "AND", text: "alle" }, { op: "OR", text: "een van de"}],
-            matchText: " match",
-            rulesText: " regels"
-        },
-        edit:
-        {
-            addCaption: "Nieuw",
-            editCaption: "Bewerken",
-            bSubmit: "Opslaan",
-            bCancel: "Annuleren",
-            bClose: "Sluiten",
-            saveData: "Er is data aangepast! Wijzigingen opslaan?",
-            bYes: "Ja",
-            bNo: "Nee",
-            bExit: "Sluiten",
-            msg:
-            {
-                required: "Veld is verplicht",
-                number: "Voer a.u.b. geldig nummer in",
-                minValue: "Waarde moet groter of gelijk zijn aan ",
-                maxValue: "Waarde moet kleiner of gelijks zijn aan",
-                email: "is geen geldig e-mailadres",
-                integer: "Voer a.u.b. een geldig getal in",
-                date: "Voer a.u.b. een geldige waarde in",
-                url: "is geen geldige URL. Prefix is verplicht ('http://' or 'https://')",
-                nodefined : " is not defined!",
-                novalue : " return value is required!",
-                customarray : "Custom function should return array!",
-                customfcheck : "Custom function should be present in case of custom checking!"
-            }
-        },
-        view:
-        {
-            caption: "Tonen",
-            bClose: "Sluiten"
-        },
-        del:
-        {
-            caption: "Verwijderen",
-            msg: "Verwijder geselecteerde regel(s)?",
-            bSubmit: "Verwijderen",
-            bCancel: "Annuleren"
-        },
-        nav:
-        {
-            edittext: "",
-            edittitle: "Bewerken",
-            addtext: "",
-            addtitle: "Nieuw",
-            deltext: "",
-            deltitle: "Verwijderen",
-            searchtext: "",
-            searchtitle: "Zoeken",
-            refreshtext: "",
-            refreshtitle: "Vernieuwen",
-            alertcap: "Waarschuwing",
-            alerttext: "Selecteer a.u.b. een regel",
-            viewtext: "",
-            viewtitle: "Openen"
-        },
-        col:
-        {
-            caption: "Tonen/verbergen kolommen",
-            bSubmit: "OK",
-            bCancel: "Annuleren"
-        },
-        errors:
-        {
-            errcap: "Fout",
-            nourl: "Er is geen URL gedefinieerd",
-            norecords: "Geen data om te verwerken",
-            model: "Lengte van 'colNames' is niet gelijk aan 'colModel'!"
-        },
-        formatter:
-        {
-            integer:
-            {
-                thousandsSeparator: ".",
-                defaultValue: "0"
-            },
-            number:
-            {
-                decimalSeparator: ",",
-                thousandsSeparator: ".",
-                decimalPlaces: 2,
-                defaultValue: "0.00"
-            },
-            currency:
-            {
-                decimalSeparator: ",",
-                thousandsSeparator: ".",
-                decimalPlaces: 2,
-                prefix: "EUR ",
-                suffix: "",
-                defaultValue: "0.00"
-            },
-            date:
-            {
-                dayNames: ["Zo", "Ma", "Di", "Wo", "Do", "Vr", "Za", "Zondag", "Maandag", "Dinsdag", "Woensdag", "Donderdag", "Vrijdag", "Zaterdag"],
-                monthNames: ["Jan", "Feb", "Maa", "Apr", "Mei", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec", "Januari", "Februari", "Maart", "April", "Mei", "Juni", "Juli", "Augustus", "September", "October", "November", "December"],
-                AmPm: ["am", "pm", "AM", "PM"],
-                S: function(b) {
-                    return b < 11 || b > 13 ? ["st", "nd", "rd", "th"][Math.min((b - 1) % 10, 3)] : "th"
-                },
-                srcformat: "Y-m-d",
-                newformat: "d/m/Y",
-                masks:
-                {
-                    ISO8601Long: "Y-m-d H:i:s",
-                    ISO8601Short: "Y-m-d",
-                    ShortDate: "n/j/Y",
-                    LongDate: "l, F d, Y",
-                    FullDateTime: "l d F Y G:i:s",
-                    MonthDay: "d F",
-                    ShortTime: "G:i",
-                    LongTime: "G:i:s",
-                    SortableDateTime: "Y-m-d\\TH:i:s",
-                    UniversalSortableDateTime: "Y-m-d H:i:sO",
-                    YearMonth: "F, Y"
-                },
-                reformatAfterEdit: false
-            },
-            baseLinkUrl: "",
-            showAction: "",
-            target: "",
-            checkbox:
-            {
-                disabled: true
-            },
-            idName: "id"
-        }
-    }
-})(jQuery);
\ No newline at end of file
diff --git a/addons/base/static/lib/jquery.jqGrid/js/i18n/grid.locale-no.js b/addons/base/static/lib/jquery.jqGrid/js/i18n/grid.locale-no.js
deleted file mode 100644
index a70ef6d790a..00000000000
--- a/addons/base/static/lib/jquery.jqGrid/js/i18n/grid.locale-no.js
+++ /dev/null
@@ -1 +0,0 @@
-(function(a){a.jgrid={};a.jgrid.defaults={recordtext:"Rad {0} - {1}, totalt {2}",loadtext:"Laster...",pgtext:"Side {0} av {1}"};a.jgrid.search={caption:"Søk...",Find:"Finn",Reset:"Nullstill",odata:["lik","forskjellig fra","mindre enn","mindre eller lik","større enn"," større eller lik","starter med","slutter med","inneholder"]};a.jgrid.edit={addCaption:"Ny rad",editCaption:"Rediger",bSubmit:"Send",bCancel:"Avbryt",bClose:"Lukk",processData:"Laster...",msg:{required:"Felt er obligatorisk",number:"Legg inn et gyldig tall",minValue:"verdi må være større enn eller lik",maxValue:"verdi må være mindre enn eller lik",email:"er ikke en gyldig e-post adresse",integer:"Legg inn et gyldig heltall",date:"Legg inn en gyldig dato",url:"er ikke en gyldig URL. Prefiks påkrevd ('http://' eller 'https://')",nodefined:" er ikke definert!",novalue:" returverdi er påkrevd!",customarray:"Tilpasset funksjon må returnere en tabell!",customfcheck:"Tilpasset funksjon må eksistere!"}};a.jgrid.view={caption:"Åpne post",bClose:"Lukk"};a.jgrid.del={caption:"Slett",msg:"Slett valgte rad(er)?",bSubmit:"Slett",bCancel:"Avbryt",processData:"Behandler..."};a.jgrid.nav={edittext:" ",edittitle:"Rediger valgte rad(er)",addtext:" ",addtitle:"Legg til ny rad",deltext:" ",deltitle:"Slett valgte rad(er)",searchtext:" ",searchtitle:"Søk",refreshtext:"",refreshtitle:"Oppdater tabell",alertcap:"Advarsel",alerttext:"Velg rad",viewtext:" ",viewtitle:"Åpne valgt rad"};a.jgrid.col={caption:"Vis/skjul kolonner",bSubmit:"Utfør",bCancel:"Avbryt"};a.jgrid.errors={errcap:"Feil",nourl:"Ingen url er satt",norecords:"Ingen poster å behandle",model:"colNames og colModel har forskjellig lengde!"};a.jgrid.formatter={integer:{thousandsSeparator:" ",defaulValue:0},number:{decimalSeparator:",",thousandsSeparator:" ",decimalPlaces:2,defaulValue:0},currency:{decimalSeparator:",",thousandsSeparator:" ",decimalPlaces:2,prefix:"",suffix:"",defaulValue:0},date:{dayNames:["sø.","ma.","ti.","on.","to.","fr.","lø.","Søndag","Mandag","Tirsdag","Onsdag","Torsdag","Fredag","Lørdag"],monthNames:["jan.","feb.","mars","april","mai","juni","juli","aug.","sep.","okt.","nov.","des.","januar","februar","mars","april","mai","juni","juli","august","september","oktober","november","desember"],AmPm:["","","",""],S:function(b){return"."},srcformat:"Y-m-d H:i:s",newformat:"Y-m-d H:i:s",masks:{ISO8601Long:"Y-m-d H:i:s",ISO8601Short:"Y-m-d",ShortDate:"j.n.Y",LongDate:"l j. F Y",FullDateTime:"l j. F Y kl. G.i.s",MonthDay:"j. F",ShortTime:"H:i",LongTime:"H:i:s",SortableDateTime:"Y-m-d\\TH:i:s",UniversalSortableDateTime:"Y-m-d H:i:sO",YearMonth:"F Y"},reformatAfterEdit:false},baseLinkUrl:"",showAction:"show",addParam:"",checkbox:{disabled:true}}})(jQuery);
diff --git a/addons/base/static/lib/jquery.jqGrid/js/i18n/grid.locale-pl.js b/addons/base/static/lib/jquery.jqGrid/js/i18n/grid.locale-pl.js
deleted file mode 100644
index 53757b99c87..00000000000
--- a/addons/base/static/lib/jquery.jqGrid/js/i18n/grid.locale-pl.js
+++ /dev/null
@@ -1,127 +0,0 @@
-;(function($){
-/**
- * jqGrid Polish Translation
- * �ukasz Schab
- * http://FreeTree.pl
- * Dual licensed under the MIT and GPL licenses:
- * http://www.opensource.org/licenses/mit-license.php
- * http://www.gnu.org/licenses/gpl.html
-**/
-$.jgrid = {
-	defaults : {
-		recordtext: "Pokaż {0} - {1} z {2}",
-	    emptyrecords: "Brak rekordów do pokazania",
-		loadtext: "\u0142adowanie...",
-		pgtext : "Strona {0} z {1}"
-	},
-	search : {
-	    caption: "Wyszukiwanie...",
-	    Find: "Szukaj",
-	    Reset: "Czyść",
-	    odata : ['dok\u0142adnie', 'różne od', 'mniejsze od', 'mniejsze lub równe','większe od','większe lub równe', 'zaczyna się od','nie zaczyna się od','zawiera','nie zawiera','kończy się na','nie kończy się na','zawiera','nie zawiera'],
-	    groupOps: [	{ op: "ORAZ", text: "wszystkie" },	{ op: "LUB",  text: "każdy" }	],
-		matchText: " pasuje",
-		rulesText: " regu\u0142y"
-	},
-	edit : {
-	    addCaption: "Dodaj rekord",
-	    editCaption: "Edytuj rekord",
-	    bSubmit: "Zapisz",
-	    bCancel: "Anuluj",
-		bClose: "Zamknij",
-		saveData: "Dane zosta\u0142y zmienione! Zapisać zmiany?",
-		bYes : "Tak",
-		bNo : "Nie",
-		bExit : "Anuluj",
-	    msg: {
-	        required:"Pole jest wymagane",
-	        number:"Proszę wpisać poprawną liczbę",
-	        minValue:"wartość musi być większa lub równa",
-	        maxValue:"wartość musi być mniejsza od",
-	        email: "nie jest adresem e-mail",
-	        integer: "Proszę wpisać poprawną liczbę",
-			date: "ProszÄ™ podaj poprawnÄ… datÄ™",
-			url: "jest niew\u0142aściwym adresem URL. Pamiętaj o prefiksie ('http://' lub 'https://')",
-			nodefined : " is not defined!",
-			novalue : " return value is required!",
-			customarray : "Custom function should return array!",
-			customfcheck : "Custom function should be present in case of custom checking!"
-		}
-	},
-	view : {
-	    caption: "Pokaż rekord",
-	    bClose: "Zamknij"
-	},
-	del : {
-	    caption: "Usuwanie",
-	    msg: "Czy usunąć wybrany rekord(y)?",
-	    bSubmit: "Usuń",
-	    bCancel: "Anuluj"
-	},
-	nav : {
-		edittext: " ",
-	    edittitle: "Edytuj wybrany wiersz",
-		addtext:" ",
-	    addtitle: "Dodaj nowy wiersz",
-	    deltext: " ",
-	    deltitle: "Usuń wybrany wiersz",
-	    searchtext: " ",
-	    searchtitle: "Wyszukaj rekord",
-	    refreshtext: "",
-	    refreshtitle: "Prze\u0142aduj",
-	    alertcap: "Uwaga",
-	    alerttext: "Proszę wybrać wiersz",
-		viewtext: "",
-		viewtitle: "View selected row"
-	},
-	col : {
-	    caption: "Pokaż/Ukryj kolumny",
-	    bSubmit: "Zatwierdź",
-	    bCancel: "Anuluj"	
-	},
-	errors : {
-		errcap : "B\u0142Ä…d",
-		nourl : "Brak adresu url",
-		norecords: "Brak danych",
-	    model : "D\u0142ugość colNames <> colModel!"
-	},
-	formatter : {
-		integer : {thousandsSeparator: " ", defaultValue: '0'},
-		number : {decimalSeparator:".", thousandsSeparator: " ", decimalPlaces: 2, defaultValue: '0.00'},
-		currency : {decimalSeparator:".", thousandsSeparator: " ", decimalPlaces: 2, prefix: "", suffix:"", defaultValue: '0.00'},
-		date : {
-			dayNames:   [
-				"Nie", "Pon", "Wt", "Åšr", "Cz", "Pi", "So",
-				"Niedziela", "Poniedzia\u0142ek", "Wtorek", "Åšroda", "Czwartek", "PiÄ…tek", "Sobota"
-			],
-			monthNames: [
-				"Sty", "Lu", "Mar", "Kwie", "Maj", "Cze", "Lip", "Sie", "Wrz", "Paź", "Lis", "Gru",
-				"Styczeń", "Luty", "Marzec", "Kwiecień", "Maj", "Czerwiec", "Lipiec", "Sierpień", "Wrzesień", "Październik", "Listopad", "Grudzień"
-				],
-			AmPm : ["am","pm","AM","PM"],
-			S: function (j) {return j < 11 || j > 13 ? ['', '', '', ''][Math.min((j - 1) % 10, 3)] : ''},
-			srcformat: 'Y-m-d',
-			newformat: 'd/m/Y',
-			masks : {
-			    ISO8601Long:"Y-m-d H:i:s",
-			    ISO8601Short:"Y-m-d",
-			    ShortDate: "n/j/Y",
-			    LongDate: "l, F d, Y",
-			    FullDateTime: "l, F d, Y g:i:s A",
-			    MonthDay: "F d",
-			    ShortTime: "g:i A",
-			    LongTime: "g:i:s A",
-			    SortableDateTime: "Y-m-d\\TH:i:s",
-			    UniversalSortableDateTime: "Y-m-d H:i:sO",
-			    YearMonth: "F, Y"
-			},
-			reformatAfterEdit : false
-		},	
-		baseLinkUrl: '',
-		showAction: '',
-	    target: '',
-	    checkbox : {disabled:true},
-		idName : 'id'
-	}
-};
-})(jQuery);
\ No newline at end of file
diff --git a/addons/base/static/lib/jquery.jqGrid/js/i18n/grid.locale-pt-br.js b/addons/base/static/lib/jquery.jqGrid/js/i18n/grid.locale-pt-br.js
deleted file mode 100644
index 897f5735b08..00000000000
--- a/addons/base/static/lib/jquery.jqGrid/js/i18n/grid.locale-pt-br.js
+++ /dev/null
@@ -1,127 +0,0 @@
-;(function($){
-/**
- * jqGrid Brazilian-Portuguese Translation
- * Sergio Righi sergio.righi@gmail.com
- * http://curve.com.br
- * Dual licensed under the MIT and GPL licenses:
- * http://www.opensource.org/licenses/mit-license.php
- * http://www.gnu.org/licenses/gpl.html
-**/
-$.jgrid = {
-	defaults : {
-		recordtext: "Ver {0} - {1} of {2}",
-	    emptyrecords: "Nenhum registro para visualizar",
-		loadtext: "Carregando...",
-		pgtext : "Página {0} de {1}"
-	},
-	search : {
-	    caption: "Procurar...",
-	    Find: "Procurar",
-	    Reset: "Resetar",
-	    odata : ['equal', 'not equal', 'less', 'less or equal','greater','greater or equal', 'begins with','does not begin with','is in','is not in','ends with','does not end with','contains','does not contain'],
-	    groupOps: [	{ op: "AND", text: "all" },	{ op: "OR",  text: "any" }	],
-		matchText: " iguala",
-		rulesText: " regras"
-	},
-	edit : {
-	    addCaption: "Incluir",
-	    editCaption: "Alterar",
-	    bSubmit: "Enviar",
-	    bCancel: "Cancelar",
-		bClose: "Fechar",
-		saveData: "Os dados foram alterados! Salvar alterações?",
-		bYes : "Sim",
-		bNo : "Não",
-		bExit : "Cancelar",
-	    msg: {
-	        required:"Campo obrigatório",
-	        number:"Por favor, informe um número válido",
-	        minValue:"valor deve ser igual ou maior que ",
-	        maxValue:"valor deve ser menor ou igual a",
-	        email: "este e-mail não é válido",
-	        integer: "Por favor, informe um valor inteiro",
-			date: "Por favor, informe uma data válida",
-			url: "não é uma URL válida. Prefixo obrigatório ('http://' or 'https://')",
-			nodefined : " não está definido!",
-			novalue : " um valor de retorno é obrigatório!",
-			customarray : "Função customizada deve retornar um array!",
-			customfcheck : "Função customizada deve estar presente em caso de validação customizada!"
-		}
-	},
-	view : {
-	    caption: "Ver Registro",
-	    bClose: "Fechar"
-	},
-	del : {
-    caption: "Apagar",
-	    msg: "Apagar registros selecionado(s)?",
-	    bSubmit: "Apagar",
-	    bCancel: "Cancelar"
-	},
-	nav : {
-		edittext: " ",
-	    edittitle: "Alterar registro selecionado",
-		addtext:" ",
-	    addtitle: "Incluir novo registro",
-	    deltext: " ",
-	    deltitle: "Apagar registro selecionado",
-	    searchtext: " ",
-	    searchtitle: "Procurar registros",
-	    refreshtext: "",
-	    refreshtitle: "Recarrgando Tabela",
-	    alertcap: "Aviso",
-	    alerttext: "Por favor, selecione um registro",
-		viewtext: "",
-		viewtitle: "Ver linha selecionada"
-	},
-	col : {
-	    caption: "Mostrar/Esconder Colunas",
-	    bSubmit: "Enviar",
-	    bCancel: "Cancelar"
-	},
-	errors : {
-		errcap : "Erro",
-		nourl : "Nenhuma URL defenida",
-		norecords: "Sem registros para exibir",
-	    model : "Comprimento de colNames <> colModel!"
-	},
-	formatter : {
-		integer : {thousandsSeparator: " ", defaultValue: '0'},
-		number : {decimalSeparator:",", thousandsSeparator: " ", decimalPlaces: 2, defaultValue: '0,00'},
-		currency : {decimalSeparator:",", thousandsSeparator: ".", decimalPlaces: 2, prefix: "R$ ", suffix:"", defaultValue: '0,00'},
-		date : {
-			dayNames:   [
-				"Dom", "Seg", "Ter", "Qua", "Qui", "Sex", "Sáb",
-				"Domingo", "Segunda", "Terça", "Quarta", "Quinta", "Sexta", "Sábado"
-			],
-			monthNames: [
-				"Jan", "Fev", "Mar", "Abr", "Mai", "Jun", "Jul", "Ago", "Set", "Out", "Nov", "Dez",
-				"Janeiro", "Fevereiro", "Março", "Abril", "Maio", "Junho", "Julho", "Agosto", "Setembro", "Outubro", "Novembro", "Dezembro"
-			],
-			AmPm : ["am","pm","AM","PM"],
-			S: function (j) {return j < 11 || j > 13 ? ['º', 'º', 'º', 'º'][Math.min((j - 1) % 10, 3)] : 'º'},
-			srcformat: 'Y-m-d',
-			newformat: 'd/m/Y',
-			masks : {
-	            ISO8601Long:"Y-m-d H:i:s",
-	            ISO8601Short:"Y-m-d",
-	            ShortDate: "n/j/Y",
-	            LongDate: "l, F d, Y",
-	            FullDateTime: "l, F d, Y g:i:s A",
-	            MonthDay: "F d",
-	            ShortTime: "g:i A",
-	            LongTime: "g:i:s A",
-	            SortableDateTime: "Y-m-d\\TH:i:s",
-	            UniversalSortableDateTime: "Y-m-d H:i:sO",
-	            YearMonth: "F, Y"
-	        },
-	        reformatAfterEdit : false
-		},
-		baseLinkUrl: '',
-		showAction: '',
-	    target: '',
-	    checkbox : {disabled:true},
-		idName : 'id'
-	}
-};
-})(jQuery);
diff --git a/addons/base/static/lib/jquery.jqGrid/js/i18n/grid.locale-pt.js b/addons/base/static/lib/jquery.jqGrid/js/i18n/grid.locale-pt.js
deleted file mode 100644
index c150c228447..00000000000
--- a/addons/base/static/lib/jquery.jqGrid/js/i18n/grid.locale-pt.js
+++ /dev/null
@@ -1,125 +0,0 @@
-;(function($){
-/**
- * jqGrid Portuguese Translation
-* Tradução da jqGrid em Portugues por Frederico Carvalho, http://www.eyeviewdesign.pt
- * Dual licensed under the MIT and GPL licenses:
- * http://www.opensource.org/licenses/mit-license.php
- * http://www.gnu.org/licenses/gpl.html
-**/
-$.jgrid = {
-	defaults : {
-		recordtext: "View {0} - {1} of {2}",
-	    emptyrecords: "No records to view",
-		loadtext: "A carregar...",
-		pgtext : "Page {0} of {1}"
-	},
-	search : {
-	    caption: "Busca...",
-	    Find: "Procurar",
-	    Reset: "Limpar",
-	    odata : ['equal', 'not equal', 'less', 'less or equal','greater','greater or equal', 'begins with','does not begin with','is in','is not in','ends with','does not end with','contains','does not contain'],
-	    groupOps: [	{ op: "AND", text: "all" },	{ op: "OR",  text: "any" }	],
-		matchText: " match",
-		rulesText: " rules"
-	},
-	edit : {
-	    addCaption: "Adicionar Registo",
-	    editCaption: "Modificar Registo",
-	    bSubmit: "Submeter",
-	    bCancel: "Cancelar",
-		bClose: "Fechar",
-		saveData: "Data has been changed! Save changes?",
-		bYes : "Yes",
-		bNo : "No",
-		bExit : "Cancel",
-	    msg: {
-	        required:"Campo obrigatório",
-	        number:"Por favor, introduza um numero",
-	        minValue:"O valor deve ser maior ou igual que",
-	        maxValue:"O valor deve ser menor ou igual a",
-	        email: "Não é um endereço de email válido",
-	        integer: "Por favor, introduza um numero inteiro",
-			url: "is not a valid URL. Prefix required ('http://' or 'https://')",
-			nodefined : " is not defined!",
-			novalue : " return value is required!",
-			customarray : "Custom function should return array!",
-			customfcheck : "Custom function should be present in case of custom checking!"
-		}
-	},
-	view : {
-	    caption: "View Record",
-	    bClose: "Close"
-	},
-	del : {
-	    caption: "Eliminar",
-	    msg: "Deseja eliminar o(s) registo(s) seleccionado(s)?",
-	    bSubmit: "Eliminar",
-	    bCancel: "Cancelar"
-	},
-	nav : {
-		edittext: " ",
-	    edittitle: "Modificar registo seleccionado",
-		addtext:" ",
-	    addtitle: "Adicionar novo registo",
-	    deltext: " ",
-	    deltitle: "Eliminar registo seleccionado",
-	    searchtext: " ",
-	    searchtitle: "Procurar",
-	    refreshtext: "",
-	    refreshtitle: "Actualizar",
-	    alertcap: "Aviso",
-	    alerttext: "Por favor, seleccione um registo",
-		viewtext: "",
-		viewtitle: "View selected row"
-	},
-	col : {
-	    caption: "Mostrar/Ocultar Colunas",
-	    bSubmit: "Enviar",
-	    bCancel: "Cancelar"	
-	},
-	errors : {
-		errcap : "Erro",
-		nourl : "Não especificou um url",
-		norecords: "Não existem dados para processar",
-	    model : "Tamanho do colNames <> colModel!"
-	},
-	formatter : {
-		integer : {thousandsSeparator: " ", defaultValue: '0'},
-		number : {decimalSeparator:".", thousandsSeparator: " ", decimalPlaces: 2, defaultValue: '0.00'},
-		currency : {decimalSeparator:".", thousandsSeparator: " ", decimalPlaces: 2, prefix: "", suffix:"", defaultValue: '0.00'},
-		date : {
-			dayNames:   [
-				"Dom", "Seg", "Ter", "Qua", "Qui", "Sex", "Sab",
-				"Domingo", "Segunda-Feira", "Terça-Feira", "Quarta-Feira", "Quinta-Feira", "Sexta-Feira", "Sábado"
-			],
-			monthNames: [
-				"Jan", "Fev", "Mar", "Abr", "Mai", "Jun", "Jul", "Ago", "Set", "Out", "Nov", "Dez",
-				"Janeiro", "Fevereiro", "Março", "Abril", "Maio", "Junho", "Julho", "Agosto", "Setembro", "Outubro", "Novembro", "Dezembro"
-			],
-			AmPm : ["am","pm","AM","PM"],
-			S: function (j) {return j < 11 || j > 13 ? ['º', 'º', 'º', 'º'][Math.min((j - 1) % 10, 3)] : 'º'},
-			srcformat: 'Y-m-d',
-			newformat: 'd/m/Y',
-			masks : {
-	            ISO8601Long:"Y-m-d H:i:s",
-	            ISO8601Short:"Y-m-d",
-	            ShortDate: "n/j/Y",
-	            LongDate: "l, F d, Y",
-	            FullDateTime: "l, F d, Y g:i:s A",
-	            MonthDay: "F d",
-	            ShortTime: "g:i A",
-	            LongTime: "g:i:s A",
-	            SortableDateTime: "Y-m-d\\TH:i:s",
-	            UniversalSortableDateTime: "Y-m-d H:i:sO",
-	            YearMonth: "F, Y"
-	        },
-	        reformatAfterEdit : false
-		},
-		baseLinkUrl: '',
-		showAction: '',
-	    target: '',
-	    checkbox : {disabled:true},
-		idName : 'id'
-	}
-};
-})(jQuery);
diff --git a/addons/base/static/lib/jquery.jqGrid/js/i18n/grid.locale-ro.js b/addons/base/static/lib/jquery.jqGrid/js/i18n/grid.locale-ro.js
deleted file mode 100644
index eb5ae836401..00000000000
--- a/addons/base/static/lib/jquery.jqGrid/js/i18n/grid.locale-ro.js
+++ /dev/null
@@ -1,139 +0,0 @@
-;(function($){
-/**
- * jqGrid Romanian Translation
- * Alexandru Emil Lupu contact@alecslupu.ro
- * http://www.alecslupu.ro/ 
- * Dual licensed under the MIT and GPL licenses:
- * http://www.opensource.org/licenses/mit-license.php
- * http://www.gnu.org/licenses/gpl.html
-**/
-$.jgrid = {
-	defaults : {
-		recordtext: "Vizualizare {0} - {1} din {2}",
-		emptyrecords: "Nu există înregistrări de vizualizat",
-		loadtext: "Încărcare...",
-		pgtext : "Pagina {0} din {1}"
-	},
-	search : {
-		caption: "Caută...",
-		Find: "Caută",
-		Reset: "Resetare",
-		odata : ['egal', 'diferit', 'mai mic', 'mai mic sau egal','mai mare','mai mare sau egal', 'începe cu','nu începe cu','se găsește în','nu se găsește în','se termină cu','nu se termină cu','conține',''],
-		groupOps: [	{ op: "AND", text: "toate" },	{ op: "OR",  text: "oricare" }	],
-		matchText: " găsite",
-		rulesText: " reguli"
-	},
-	edit : {
-		addCaption: "Adăugare înregistrare",
-		editCaption: "Modificare înregistrare",
-		bSubmit: "Salvează",
-		bCancel: "Anulare",
-		bClose: "ÃŽnchide",
-		saveData: "Informațiile au fost modificate! Salvați modificările?",
-		bYes : "Da",
-		bNo : "Nu",
-		bExit : "Anulare",
-		msg: {
-			required:"Câmpul este obligatoriu",
-			number:"Vă rugăm introduceți un număr valid",
-			minValue:"valoarea trebuie sa fie mai mare sau egală cu",
-			maxValue:"valoarea trebuie sa fie mai mică sau egală cu",
-			email: "nu este o adresă de e-mail validă",
-			integer: "Vă rugăm introduceți un număr valid",
-			date: "Vă rugăm să introduceți o dată validă",
-			url: "Nu este un URL valid. Prefixul  este necesar('http://' or 'https://')",
-			nodefined : " is not defined!",
-			novalue : " return value is required!",
-			customarray : "Custom function should return array!",
-			customfcheck : "Custom function should be present in case of custom checking!"
-		}
-	},
-	view : {
-		caption: "Vizualizare înregistrare",
-		bClose: "ÃŽnchidere"
-	},
-	del : {
-		caption: "Ștegere",
-		msg: "Ștergeți înregistrarea (înregistrările) selectate?",
-		bSubmit: "Șterge",
-		bCancel: "Anulare"
-	},
-	nav : {
-		edittext: "",
-		edittitle: "Modifică rândul selectat",
-		addtext:"",
-		addtitle: "Adaugă rând nou",
-		deltext: "",
-		deltitle: "Șterge rândul selectat",
-		searchtext: "",
-		searchtitle: "Căutare înregistrări",
-		refreshtext: "",
-		refreshtitle: "Reîncarcare Grid",
-		alertcap: "Avertisment",
-		alerttext: "Vă rugăm să selectați un rând",
-		viewtext: "",
-		viewtitle: "Vizualizează rândul selectat"
-	},
-	col : {
-		caption: "Arată/Ascunde coloanele",
-		bSubmit: "Salvează",
-		bCancel: "Anulare"
-	},
-	errors : {
-		errcap : "Eroare",
-		nourl : "Niciun url nu este setat",
-		norecords: "Nu sunt înregistrări de procesat",
-		model : "Lungimea colNames <> colModel!"
-	},
-	formatter : {
-		integer : {thousandsSeparator: " ", defaultValue: '0'},
-		number : {decimalSeparator:",", thousandsSeparator: " ", decimalPlaces: 2, defaultValue: '0,00'},
-		currency : {decimalSeparator:",", thousandsSeparator: " ", decimalPlaces: 2, prefix: "", suffix:"", defaultValue: '0,00'},
-		date : {
-			dayNames:   [
-				"Dum", "Lun", "Mar", "Mie", "Joi", "Vin", "Sâm",
-				"Duminică", "Luni", "Marți", "Miercuri", "Joi", "Vineri", "Sâmbătă"
-			],
-			monthNames: [
-				"Ian", "Feb", "Mar", "Apr", "Mai", "Iun", "Iul", "Aug", "Sep", "Oct", "Noi", "Dec",
-				"Ianuarie", "Februarie", "Martie", "Aprilie", "Mai", "Iunie", "Iulie", "August", "Septembrie", "Octombrie", "Noiembrie", "Decembrie"
-			],
-			AmPm : ["am","pm","AM","PM"],
-			/*
-			 Here is a problem in romanian: 
-					M	/	F
-			 1st = primul / prima
-			 2nd = Al doilea / A doua
-			 3rd = Al treilea / A treia 
-			 4th = Al patrulea/ A patra
-			 5th = Al cincilea / A cincea 
-			 6th = Al șaselea / A șasea
-			 7th = Al șaptelea / A șaptea
-			 .... 
-			 */
-			S: function (j) {return j < 11 || j > 13 ? ['st', 'nd', 'rd', 'th'][Math.min((j - 1) % 10, 3)] : 'th'},
-			srcformat: 'Y-m-d',
-			newformat: 'd/m/Y',
-			masks : {
-				ISO8601Long:"Y-m-d H:i:s",
-				ISO8601Short:"Y-m-d",
-				ShortDate: "n/j/Y",
-				LongDate: "l, F d, Y",
-				FullDateTime: "l, F d, Y g:i:s A",
-				MonthDay: "F d",
-				ShortTime: "g:i A",
-				LongTime: "g:i:s A",
-				SortableDateTime: "Y-m-d\\TH:i:s",
-				UniversalSortableDateTime: "Y-m-d H:i:sO",
-				YearMonth: "F, Y"
-			},
-			reformatAfterEdit : false
-		},
-		baseLinkUrl: '',
-		showAction: '',
-		target: '',
-		checkbox : {disabled:true},
-		idName : 'id'
-	}
-};
-})(jQuery);
diff --git a/addons/base/static/lib/jquery.jqGrid/js/i18n/grid.locale-ru.js b/addons/base/static/lib/jquery.jqGrid/js/i18n/grid.locale-ru.js
deleted file mode 100644
index 357b0ff1aee..00000000000
--- a/addons/base/static/lib/jquery.jqGrid/js/i18n/grid.locale-ru.js
+++ /dev/null
@@ -1,127 +0,0 @@
-;(function($){
-/**
- * jqGrid Russian Translation v1.0 02.07.2009 (based on translation by Alexey Kanaev v1.1 21.01.2009, http://softcore.com.ru)
- * Sergey Dyagovchenko
- * http://d.sumy.ua
- * Dual licensed under the MIT and GPL licenses:
- * http://www.opensource.org/licenses/mit-license.php
- * http://www.gnu.org/licenses/gpl.html
-**/
-$.jgrid = {
-	defaults : {
-		recordtext: "Про�мотр {0} - {1} из {2}",
-	  emptyrecords: "�ет запи�ей дл� про�мотра",
-		loadtext: "Загрузка...",
-		pgtext : "Стр. {0} из {1}"
-	},
-	search : {
-    caption: "Пои�к...",
-    Find: "�айти",
-    Reset: "Сбро�",
-    odata : ['равно', 'не равно', 'меньше', 'меньше или равно','больше','больше или равно', 'начинает�� �','не начинает�� �','находит�� в','не находит�� в','заканчивает�� на','не заканчивает�� на','�одержит','не �одержит'],
-    groupOps: [	{ op: "AND", text: "в�е" },	{ op: "OR",  text: "любой" }	],
-    matchText: " �овпадает",
-    rulesText: " правила"
-	},
-	edit : {
-    addCaption: "Добавить запи�ь",
-    editCaption: "Редактировать запи�ь",
-    bSubmit: "Сохранить",
-    bCancel: "Отмена",
-		bClose: "Закрыть",
-		saveData: "Данные были измененны! Сохранить изменени�?",
-		bYes : "Да",
-		bNo : "�ет",
-		bExit : "Отмена",
-	    msg: {
-        required:"Поле �вл�ет�� об�зательным",
-        number:"Пожалуй�та, введите правильное чи�ло",
-        minValue:"значение должно быть больше либо равно",
-        maxValue:"значение должно быть меньше либо равно",
-        email: "некорректное значение e-mail",
-        integer: "Пожалуй�та, введите целое чи�ло",
-        date: "Пожалуй�та, введите правильную дату",
-        url: "неверна� ��ылка. �еобходимо вве�ти префик� ('http://' or 'https://')",
-		nodefined : " is not defined!",
-		novalue : " return value is required!",
-		customarray : "Custom function should return array!",
-		customfcheck : "Custom function should be present in case of custom checking!"
-		}
-	},
-	view : {
-	    caption: "Про�мотр запи�и",
-	    bClose: "Закрыть"
-	},
-	del : {
-	    caption: "Удалить",
-	    msg: "Удалить выбранную запи�ь(и)?",
-	    bSubmit: "Удалить",
-	    bCancel: "Отмена"
-	},
-	nav : {
-  		edittext: " ",
-	    edittitle: "Редактировать выбранную запи�ь",
-  		addtext:" ",
-	    addtitle: "Добавить новую запи�ь",
-	    deltext: " ",
-	    deltitle: "Удалить выбранную запи�ь",
-	    searchtext: " ",
-	    searchtitle: "�айти запи�и",
-	    refreshtext: "",
-	    refreshtitle: "Обновить таблицу",
-	    alertcap: "Внимание",
-	    alerttext: "Пожалуй�та, выберите запи�ь",
-  		viewtext: "",
-  		viewtitle: "Про�мотреть выбранную запи�ь"
-	},
-	col : {
-	    caption: "Показать/�крыть �толбцы",
-	    bSubmit: "Сохранить",
-	    bCancel: "Отмена"	
-	},
-	errors : {
-		errcap : "Ошибка",
-		nourl : "URL не у�тановлен",
-		norecords: "�ет запи�ей дл� обработки",
-    model : "Чи�ло полей не �оответ�твует чи�лу �толбцов таблицы!"
-	},
-	formatter : {
-		integer : {thousandsSeparator: " ", defaultValue: '0'},
-		number : {decimalSeparator:",", thousandsSeparator: " ", decimalPlaces: 2, defaultValue: '0,00'},
-		currency : {decimalSeparator:",", thousandsSeparator: " ", decimalPlaces: 2, prefix: "", suffix:"", defaultValue: '0,00'},
-		date : {
-			dayNames:   [
-				"В�", "Пн", "Вт", "Ср", "Чт", "Пт", "Сб",
-				"Во�кре�ение", "Понедельник", "Вторник", "Среда", "Четверг", "П�тница", "Суббота"
-			],
-			monthNames: [
-				"Янв", "Фев", "Мар", "�пр", "Май", "Июн", "Июл", "�вг", "Сен", "Окт", "�о�", "Дек",
-				"Январь", "Февраль", "Март", "�прель", "Май", "Июнь", "Июль", "�вгу�т", "Сент�брь", "Окт�брь", "�о�брь", "Декабрь"
-			],
-			AmPm : ["am","pm","AM","PM"],
-			S: function (j) {return j < 11 || j > 13 ? ['st', 'nd', 'rd', 'th'][Math.min((j - 1) % 10, 3)] : 'th'},
-			srcformat: 'Y-m-d',
-			newformat: 'd.m.Y',
-			masks : {
-	            ISO8601Long:"Y-m-d H:i:s",
-	            ISO8601Short:"Y-m-d",
-	            ShortDate: "n.j.Y",
-	            LongDate: "l, F d, Y",
-	            FullDateTime: "l, F d, Y G:i:s",
-	            MonthDay: "F d",
-	            ShortTime: "G:i",
-	            LongTime: "G:i:s",
-	            SortableDateTime: "Y-m-d\\TH:i:s",
-	            UniversalSortableDateTime: "Y-m-d H:i:sO",
-	            YearMonth: "F, Y"
-	        },
-	        reformatAfterEdit : false
-		},
-		baseLinkUrl: '',
-		showAction: '',
-	  target: '',
-	  checkbox : {disabled:true},
-		idName : 'id'
-	}
-};
-})(jQuery);
diff --git a/addons/base/static/lib/jquery.jqGrid/js/i18n/grid.locale-sk.js b/addons/base/static/lib/jquery.jqGrid/js/i18n/grid.locale-sk.js
deleted file mode 100644
index 605382b19ef..00000000000
--- a/addons/base/static/lib/jquery.jqGrid/js/i18n/grid.locale-sk.js
+++ /dev/null
@@ -1,127 +0,0 @@
-;(function($){
-/**
- * jqGrid Slovak Translation
- * Milan Cibulka
- * http://trirand.com/blog/ 
- * Dual licensed under the MIT and GPL licenses:
- * http://www.opensource.org/licenses/mit-license.php
- * http://www.gnu.org/licenses/gpl.html
-**/
-$.jgrid = {
-	defaults : {
-		recordtext: "Zobrazených {0} - {1} z {2} záznamov",
-	    emptyrecords: "Neboli nájdené žiadne záznamy",
-		loadtext: "Na�ítám...",
-		pgtext : "Strana {0} z {1}"
-	},
-	search : {
-		caption: "Vyhľadávam...",
-		Find: "Hľadať",
-		Reset: "Reset",
-	    odata : ['rovná sa', 'nerovná sa', 'menšie', 'menšie alebo rovnajúce sa','vä�šie', 'vä�šie alebo rovnajúce sa', 'za�ína s', 'neza�ína s', 'je v', 'nie je v', 'kon�í s', 'nekon�í s', 'obahuje', 'neobsahuje'],
-	    groupOps: [	{ op: "AND", text: "všetkých" },	{ op: "OR",  text: "niektorého z" }	],
-		matchText: " hľadať podla",
-		rulesText: " pravidiel"
-	},
-	edit : {
-		addCaption: "Pridať záznam",
-		editCaption: "Editácia záznamov",
-		bSubmit: "Uložiť",
-		bCancel: "Storno",
-		bClose: "Zavrieť",
-		saveData: "Údaje boli zmenené! Uložiť zmeny?",
-		bYes : "Ano",
-		bNo : "Nie",
-		bExit : "Zrušiť",
-		msg: {
-		    required:"Pole je požadované",
-		    number:"Prosím, vložte valídne �íslo",
-		    minValue:"hodnota musí býť vä�šia ako alebo rovná ",
-		    maxValue:"hodnota musí býť menšia ako alebo rovná ",
-		    email: "nie je valídny e-mail",
-		    integer: "Prosím, vložte celé �íslo",
-			date: "Prosím, vložte valídny dátum",
-			url: "nie je platnou URL. Požadovaný prefix ('http://' alebo 'https://')",
-			nodefined : " nie je definovaný!",
-			novalue : " je vyžadovaná návratová hodnota!",
-			customarray : "Custom function mala vrátiť pole!",
-			customfcheck : "Custom function by mala byť prítomná v prípade custom checking!"
-		}
-	},
-	view : {
-	    caption: "Zobraziť záznam",
-	    bClose: "Zavrieť"
-	},
-	del : {
-		caption: "Zmazať",
-		msg: "Zmazať vybraný(é) záznam(y)?",
-		bSubmit: "Zmazať",
-		bCancel: "Storno"
-	},
-	nav : {
-		edittext: " ",
-		edittitle: "Editovať vybraný riadok",
-		addtext:" ",
-		addtitle: "Pridať nový riadek",
-		deltext: " ",
-		deltitle: "Zmazať vybraný záznam ",
-		searchtext: " ",
-		searchtitle: "Nájsť záznamy",
-		refreshtext: "",
-		refreshtitle: "Obnoviť tabuľku",
-		alertcap: "Varovanie",
-		alerttext: "Prosím, vyberte riadok",
-		viewtext: "",
-		viewtitle: "Zobraziť vybraný riadok"
-	},
-	col : {
-		caption: "Zobrazit/Skrýť stĺpce",
-		bSubmit: "Uložiť",
-		bCancel: "Storno"	
-	},
-	errors : {
-		errcap : "Chyba",
-		nourl : "Nie je nastavená url",
-		norecords: "Žiadne záznamy k spracovaniu",
-		model : "Dĺžka colNames <> colModel!"
-	},
-	formatter : {
-		integer : {thousandsSeparator: " ", defaultValue: '0'},
-		number : {decimalSeparator:".", thousandsSeparator: " ", decimalPlaces: 2, defaultValue: '0.00'},
-		currency : {decimalSeparator:".", thousandsSeparator: " ", decimalPlaces: 2, prefix: "", suffix:"", defaultValue: '0.00'},
-		date : {
-			dayNames:   [
-				"Ne", "Po", "Ut", "St", "Å t", "Pi", "So",
-				"Nedela", "Pondelok", "Utorok", "Streda", "Å tvrtok", "Piatek", "Sobota"
-			],
-			monthNames: [
-				"Jan", "Feb", "Mar", "Apr", "Máj", "Jún", "Júl", "Aug", "Sep", "Okt", "Nov", "Dec",
-				"Január", "Február", "Marec", "Apríl", "Máj", "Jún", "Júl", "August", "September", "Október", "November", "December"
-			],
-			AmPm : ["do","od","DO","OD"],
-			S: function (j) {return j < 11 || j > 13 ? ['st', 'nd', 'rd', 'th'][Math.min((j - 1) % 10, 3)] : 'th'},
-			srcformat: 'Y-m-d',
-			newformat: 'd/m/Y',
-			masks : {
-		        ISO8601Long:"Y-m-d H:i:s",
-		        ISO8601Short:"Y-m-d",
-		        ShortDate: "n/j/Y",
-		        LongDate: "l, F d, Y",
-		        FullDateTime: "l, F d, Y g:i:s A",
-		        MonthDay: "F d",
-		        ShortTime: "g:i A",
-		        LongTime: "g:i:s A",
-		        SortableDateTime: "Y-m-d\\TH:i:s",
-		        UniversalSortableDateTime: "Y-m-d H:i:sO",
-		        YearMonth: "F, Y"
-		    },
-		    reformatAfterEdit : false
-		},
-		baseLinkUrl: '',
-		showAction: '',
-	    target: '',
-	    checkbox : {disabled:true},
-		idName : 'id'
-	}
-};
-})(jQuery);
diff --git a/addons/base/static/lib/jquery.jqGrid/js/i18n/grid.locale-sr.js b/addons/base/static/lib/jquery.jqGrid/js/i18n/grid.locale-sr.js
deleted file mode 100644
index 305b17e2b53..00000000000
--- a/addons/base/static/lib/jquery.jqGrid/js/i18n/grid.locale-sr.js
+++ /dev/null
@@ -1,128 +0,0 @@
-;(function($){
-/**
- * jqGrid Serbian Translation
- * �лек�андар Миловац(Aleksandar Milovac) aleksandar.milovac@gmail.com
- * http://trirand.com/blog/
- * Dual licensed under the MIT and GPL licenses:
- * http://www.opensource.org/licenses/mit-license.php
- * http://www.gnu.org/licenses/gpl.html
-**/
-$.jgrid = {
-	defaults : {
-		recordtext: "Преглед {0} - {1} од {2}",
-		emptyrecords: "�е по�тоји ниједан запи�",
-		loadtext: "Учитавање...",
-		pgtext : "Страна {0} од {1}"
-	},
-	search : {
-		caption: "Тражење...",
-		Find: "Тражи",
-		Reset: "Ре�етуј",
-		odata : ['једнако', 'није једнако', 'мање', 'мање или једнако','веће','веће или једнако', 'почиње �а','не почиње �а','је у','није у','завршава �а','не завршава �а','�адржи','не �адржи'],
-		groupOps: [	{ op: "И", text: "�ви" },	{ op: "ИЛИ",  text: "�ваки" }	],
-		matchText: " match",
-		rulesText: " правила"
-	},
-	edit : {
-		addCaption: "Додај запи�",
-		editCaption: "Измени запи�",
-		bSubmit: "Пошаљи",
-		bCancel: "Оду�тани",
-		bClose: "Затвори",
-		saveData: "Податак је измењен! Сачувај измене?",
-		bYes : "Да",
-		bNo : "�е",
-		bExit : "Оду�тани",
-		msg: {
-			required:"Поље је обавезно",
-			number:"Молим, уне�ите и�праван број",
-			minValue:"вредно�т мора бити већа од или једнака �а ",
-			maxValue:"вредно�т мора бити мања од или једнака �а",
-			email: "није и�правна имејл адре�а",
-			integer: "Молим, уне�ите и�правну целобројну вредно�т ",
-			date: "Молим, уне�ите и�праван датум",
-			url: "није и�праван УРЛ. Потребан је префик� ('http://' or 'https://')",
-			nodefined : " није дефини�ан!",
-			novalue : " захтевана је повратна вредно�т!",
-			customarray : "Custom function should return array!",
-			customfcheck : "Custom function should be present in case of custom checking!"
-			
-		}
-	},
-	view : {
-		caption: "Погледај запи�",
-		bClose: "Затвори"
-	},
-	del : {
-		caption: "Избриши",
-		msg: "Избриши изабран(е) запи�(е)?",
-		bSubmit: "Ибриши",
-		bCancel: "Одбаци"
-	},
-	nav : {
-		edittext: "",
-		edittitle: "Измени изабрани ред",
-		addtext:"",
-		addtitle: "Додај нови ред",
-		deltext: "",
-		deltitle: "Избриши изабран ред",
-		searchtext: "",
-		searchtitle: "�ађи запи�е",
-		refreshtext: "",
-		refreshtitle: "Поново учитај податке",
-		alertcap: "Упозорење",
-		alerttext: "Молим, изаберите ред",
-		viewtext: "",
-		viewtitle: "Погледај изабрани ред"
-	},
-	col : {
-		caption: "Изабери колоне",
-		bSubmit: "ОК",
-		bCancel: "Одбаци"
-	},
-	errors : {
-		errcap : "Грешка",
-		nourl : "�ије по�тављен URL",
-		norecords: "�ема запи�а за обраду",
-		model : "Дужина модела colNames <> colModel!"
-	},
-	formatter : {
-		integer : {thousandsSeparator: " ", defaultValue: '0'},
-		number : {decimalSeparator:".", thousandsSeparator: " ", decimalPlaces: 2, defaultValue: '0.00'},
-		currency : {decimalSeparator:".", thousandsSeparator: " ", decimalPlaces: 2, prefix: "", suffix:"", defaultValue: '0.00'},
-		date : {
-			dayNames:   [
-				"�ед", "Пон", "Уто", "Сре", "Чет", "Пет", "Суб",
-				"�едеља", "Понедељак", "Уторак", "Среда", "Четвртак", "Петак", "Субота"
-			],
-			monthNames: [
-				"Јан", "Феб", "Мар", "�пр", "Мај", "Јун", "Јул", "�вг", "Сеп", "Окт", "�ов", "Дец",
-				"Јануар", "Фебруар", "Март", "�прил", "Мај", "Јун", "Јул", "�вгу�т", "Септембар", "Октобар", "�овембар", "Децембар"
-			],
-			AmPm : ["am","pm","AM","PM"],
-			S: function (j) {return j < 11 || j > 13 ? ['st', 'nd', 'rd', 'th'][Math.min((j - 1) % 10, 3)] : 'th'},
-			srcformat: 'Y-m-d',
-			newformat: 'd/m/Y',
-			masks : {
-				ISO8601Long:"Y-m-d H:i:s",
-				ISO8601Short:"Y-m-d",
-				ShortDate: "n/j/Y",
-				LongDate: "l, F d, Y",
-				FullDateTime: "l, F d, Y g:i:s A",
-				MonthDay: "F d",
-				ShortTime: "g:i A",
-				LongTime: "g:i:s A",
-				SortableDateTime: "Y-m-d\\TH:i:s",
-				UniversalSortableDateTime: "Y-m-d H:i:sO",
-				YearMonth: "F, Y"
-			},
-			reformatAfterEdit : false
-		},
-		baseLinkUrl: '',
-		showAction: '',
-		target: '',
-		checkbox : {disabled:true},
-		idName : 'id'
-	}
-};
-})(jQuery);
diff --git a/addons/base/static/lib/jquery.jqGrid/js/i18n/grid.locale-sv.js b/addons/base/static/lib/jquery.jqGrid/js/i18n/grid.locale-sv.js
deleted file mode 100644
index fc9fcf40902..00000000000
--- a/addons/base/static/lib/jquery.jqGrid/js/i18n/grid.locale-sv.js
+++ /dev/null
@@ -1,127 +0,0 @@
-;(function($){
-/**
- * jqGrid Swedish Translation
- * Harald Normann harald.normann@wts.se, harald.normann@gmail.com
- * http://www.worldteamsoftware.com 
- * Dual licensed under the MIT and GPL licenses:
- * http://www.opensource.org/licenses/mit-license.php
- * http://www.gnu.org/licenses/gpl.html
-**/
-$.jgrid = {
-	defaults : {
-		recordtext: "Visar {0} - {1} av {2}",
-		emptyrecords: "Det finns inga poster att visa",
-		loadtext: "Laddar...",
-		pgtext : "Sida {0} av {1}"
-	},
-	search : {
-		caption: "Sök Poster - Ange sökvillkor",
-		Find: "Sök",
-		Reset: "Nollställ Villkor",
-		odata : ['lika', 'ej lika', 'mindre', 'mindre eller lika','större','större eller lika', 'börjar med','börjar inte med','tillhör','tillhör inte','slutar med','slutar inte med','innehåller','innehåller inte'],
-		groupOps: [	{ op: "AND", text: "alla" },	{ op: "OR",  text: "eller" }	],
-		matchText: " träff",
-		rulesText: " regler"
-	},
-	edit : {
-		addCaption: "Ny Post",
-		editCaption: "Redigera Post",
-		bSubmit: "Spara",
-		bCancel: "Avbryt",
-		bClose: "Stäng",
-		saveData: "Data har ändrats! Spara förändringar?",
-		bYes : "Ja",
-		bNo : "Nej",
-		bExit : "Avbryt",
-		msg: {
-	        required:"Fältet är obligatoriskt",
-	        number:"Välj korrekt nummer",
-	        minValue:"värdet måste vara större än eller lika med",
-	        maxValue:"värdet måste vara mindre än eller lika med",
-	        email: "är inte korrekt e-post adress",
-	        integer: "Var god ange korrekt heltal",
-	        date: "Var god ange korrekt datum",
-	        url: "är inte en korrekt URL. Prefix måste anges ('http://' or 'https://')",
-	        nodefined : " är inte definierad!",
-	        novalue : " returvärde måste anges!",
-	        customarray : "Custom funktion måste returnera en vektor!",
-			customfcheck : "Custom funktion måste finnas om Custom kontroll sker!"
-		}
-	},
-	view : {
-		caption: "Visa Post",
-		bClose: "Stäng"
-	},
-	del : {
-		caption: "Radera",
-		msg: "Radera markerad(e) post(er)?",
-		bSubmit: "Radera",
-		bCancel: "Avbryt"
-	},
-	nav : {
-		edittext: "",
-		edittitle: "Redigera markerad rad",
-		addtext:"",
-		addtitle: "Skapa ny post",
-		deltext: "",
-		deltitle: "Radera markerad rad",
-		searchtext: "",
-		searchtitle: "Sök poster",
-		refreshtext: "",
-		refreshtitle: "Uppdatera data",
-		alertcap: "Varning",
-		alerttext: "Ingen rad är markerad",
-		viewtext: "",
-		viewtitle: "Visa markerad rad"
-	},
-	col : {
-		caption: "Välj Kolumner",
-		bSubmit: "OK",
-		bCancel: "Avbryt"
-	},
-	errors : {
-		errcap : "Fel",
-		nourl : "URL saknas",
-		norecords: "Det finns inga poster att bearbeta",
-		model : "Antal colNames <> colModel!"
-	},
-	formatter : {
-		integer : {thousandsSeparator: " ", defaultValue: '0'},
-		number : {decimalSeparator:",", thousandsSeparator: " ", decimalPlaces: 2, defaultValue: '0,00'},
-		currency : {decimalSeparator:",", thousandsSeparator: " ", decimalPlaces: 2, prefix: "", suffix:"Kr", defaultValue: '0,00'},
-		date : {
-			dayNames:   [
-				"Sön", "Mån", "Tis", "Ons", "Tor", "Fre", "Lör",
-				"Söndag", "Måndag", "Tisdag", "Onsdag", "Torsdag", "Fredag", "Lördag"
-			],
-			monthNames: [
-				"Jan", "Feb", "Mar", "Apr", "Maj", "Jun", "Jul", "Aug", "Sep", "Okt", "Nov", "Dec",
-				"Januari", "Februari", "Mars", "April", "Maj", "Juni", "Juli", "Augusti", "September", "Oktober", "November", "December"
-			],
-			AmPm : ["fm","em","FM","EM"],
-			S: function (j) {return j < 11 || j > 13 ? ['st', 'nd', 'rd', 'th'][Math.min((j - 1) % 10, 3)] : 'th'},
-			srcformat: 'Y-m-d',
-			newformat: 'Y-m-d',
-			masks : {
-	            ISO8601Long:"Y-m-d H:i:s",
-	            ISO8601Short:"Y-m-d",
-	            ShortDate:  "n/j/Y",
-	            LongDate: "l, F d, Y",
-	            FullDateTime: "l, F d, Y g:i:s A",
-	            MonthDay: "F d",
-	            ShortTime: "g:i A",
-	            LongTime: "g:i:s A",
-	            SortableDateTime: "Y-m-d\\TH:i:s",
-	            UniversalSortableDateTime: "Y-m-d H:i:sO",
-	            YearMonth: "F, Y"
-			},
-			reformatAfterEdit : false
-		},
-		baseLinkUrl: '',
-		showAction: '',
-		target: '',
-		checkbox : {disabled:true},
-		idName : 'id'
-	}
-};
-})(jQuery);
diff --git a/addons/base/static/lib/jquery.jqGrid/js/i18n/grid.locale-tr.js b/addons/base/static/lib/jquery.jqGrid/js/i18n/grid.locale-tr.js
deleted file mode 100644
index 6ccde274a2b..00000000000
--- a/addons/base/static/lib/jquery.jqGrid/js/i18n/grid.locale-tr.js
+++ /dev/null
@@ -1,126 +0,0 @@
-;(function($){
-/**
- * jqGrid Turkish Translation
- * Erhan Gündoğan (erhan@trposta.net)
- * http://blog.zakkum.com
- * Dual licensed under the MIT and GPL licenses:
- * http://www.opensource.org/licenses/mit-license.php
- * http://www.gnu.org/licenses/gpl.html
-**/
-$.jgrid = {
-	defaults : {
-		recordtext: "{0}-{1} listeleniyor. Toplam:{2}",
-	    emptyrecords: "Kayıt bulunamadı",
-		loadtext: "Yükleniyor...",
-		pgtext : "{0}/{1}. Sayfa"
-	},
-	search : {
-	    caption: "Arama...",
-	    Find: "Bul",
-	    Reset: "Temizle",	    
-	    odata : ['eşit', 'eşit değil', 'daha az', 'daha az veya eşit', 'daha fazla', 'daha fazla veya eşit', 'ile başlayan', 'ile başlamayan', 'içinde', 'içinde değil', 'ile biten', 'ile bitmeyen', 'içeren', 'içermeyen'],
-	    groupOps: [	{ op: "VE", text: "tüm" },	{ op: "VEYA",  text: "herhangi" }	],
-		matchText: " uyan",
-		rulesText: " kurallar"
-	},
-	edit : {
-	    addCaption: "Kayıt Ekle",
-	    editCaption: "Kayıt Düzenle",
-	    bSubmit: "Gönder",
-	    bCancel: "Ä°ptal",
-		bClose: "Kapat",
-		saveData: "Veriler değişti! Kayıt edilsin mi?",
-		bYes : "Evet",
-		bNo : "Hayıt",
-		bExit : "Ä°ptal",
-	    msg: {
-	        required:"Alan gerekli",
-	        number:"Lütfen bir numara giriniz",
-	        minValue:"girilen değer daha büyük ya da buna eşit olmalıdır",
-	        maxValue:"girilen değer daha küçük ya da buna eşit olmalıdır",
-	        email: "geçerli bir e-posta adresi değildir",
-	        integer: "Lütfen bir tamsayı giriniz",
-			url: "Geçerli bir URL değil. ('http://' or 'https://') ön eki gerekli.",
-			nodefined : " is not defined!",
-			novalue : " return value is required!",
-			customarray : "Custom function should return array!",
-			customfcheck : "Custom function should be present in case of custom checking!"
-		}
-	},
-	view : {
-	    caption: "Kayıt Görüntüle",
-	    bClose: "Kapat"
-	},
-	del : {
-	    caption: "Sil",
-	    msg: "Seçilen kayıtlar silinsin mi?",
-	    bSubmit: "Sil",
-	    bCancel: "Ä°ptal"
-	},
-	nav : {
-		edittext: " ",
-	    edittitle: "Seçili satırı düzenle",
-		addtext:" ",
-	    addtitle: "Yeni satır ekle",
-	    deltext: " ",
-	    deltitle: "Seçili satırı sil",
-	    searchtext: " ",
-	    searchtitle: "Kayıtları bul",
-	    refreshtext: "",
-	    refreshtitle: "Tabloyu yenile",
-	    alertcap: "Uyarı",
-	    alerttext: "Lütfen bir satır seçiniz",
-		viewtext: "",
-		viewtitle: "Seçilen satırı görüntüle"
-	},
-	col : {
-	    caption: "Sütunları göster/gizle",
-	    bSubmit: "Gönder",
-	    bCancel: "Ä°ptal"	
-	},
-	errors : {
-		errcap : "Hata",
-		nourl : "Bir url yapılandırılmamış",
-		norecords: "İşlem yapılacak bir kayıt yok",
-	    model : "colNames uzunluÄŸu <> colModel!"
-	},
-	formatter : {
-		integer : {thousandsSeparator: " ", defaultValue: '0'},
-		number : {decimalSeparator:".", thousandsSeparator: " ", decimalPlaces: 2, defaultValue: '0.00'},
-		currency : {decimalSeparator:".", thousandsSeparator: " ", decimalPlaces: 2, prefix: "", suffix:"", defaultValue: '0.00'},
-		date : {
-			dayNames:   [
-				"Paz", "Pts", "Sal", "Çar", "Per", "Cum", "Cts",
-				"Pazar", "Pazartesi", "Salı", "Çarşamba", "Perşembe", "Cuma", "Cumartesi"
-			],
-			monthNames: [
-				"Oca", "Åžub", "Mar", "Nis", "May", "Haz", "Tem", "AÄŸu", "Eyl", "Eki", "Kas", "Ara",
-				"Ocak", "Şubat", "Mart", "Nisan", "Mayıs", "Haziran", "Temmuz", "Ağustos", "Eylül", "Ekim", "Kasım", "Aralık"
-			],
-			AmPm : ["am","pm","AM","PM"],
-			S: function (j) {return j < 11 || j > 13 ? ['st', 'nd', 'rd', 'th'][Math.min((j - 1) % 10, 3)] : 'th'},
-			srcformat: 'Y-m-d',
-			newformat: 'd/m/Y',
-			masks : {
-	            ISO8601Long:"Y-m-d H:i:s",
-	            ISO8601Short:"Y-m-d",
-	            ShortDate: "n/j/Y",
-	            LongDate: "l, F d, Y",
-	            FullDateTime: "l, F d, Y g:i:s A",
-	            MonthDay: "F d",
-	            ShortTime: "g:i A",
-	            LongTime: "g:i:s A",
-	            SortableDateTime: "Y-m-d\\TH:i:s",
-	            UniversalSortableDateTime: "Y-m-d H:i:sO",
-	            YearMonth: "F, Y"
-	        },
-	        reformatAfterEdit : false
-		},
-		baseLinkUrl: '',
-		showAction: '',
-	    target: '',
-	    checkbox : {disabled:true},
-		idName : 'id'
-	}
-};
-})(jQuery);
diff --git a/addons/base/static/lib/jquery.jqGrid/js/i18n/grid.locale-ua.js b/addons/base/static/lib/jquery.jqGrid/js/i18n/grid.locale-ua.js
deleted file mode 100644
index ccb085c181d..00000000000
--- a/addons/base/static/lib/jquery.jqGrid/js/i18n/grid.locale-ua.js
+++ /dev/null
@@ -1,127 +0,0 @@
-;(function($){
-/**
- * jqGrid Ukrainian Translation v1.0 02.07.2009
- * Sergey Dyagovchenko
- * http://d.sumy.ua
- * Dual licensed under the MIT and GPL licenses:
- * http://www.opensource.org/licenses/mit-license.php
- * http://www.gnu.org/licenses/gpl.html
-**/
-$.jgrid = {
-	defaults : {
-		recordtext: "Перегл�д {0} - {1} з {2}",
-	  emptyrecords: "�емає запи�ів дл� перегл�ду",
-		loadtext: "Завантаженн�...",
-		pgtext : "Стор. {0} з {1}"
-	},
-	search : {
-    caption: "Пошук...",
-    Find: "Знайти",
-    Reset: "Скиданн�",
-    odata : ['рівно', 'не рівно', 'менше', 'менше або рівне','більше','більше або рівне', 'починаєть�� з','не починаєть�� з','знаходить�� в','не знаходить�� в','закінчуєть�� на','не закінчуєть�� на','мі�тить','не мі�тить'],
-    groupOps: [	{ op: "AND", text: "в�е" },	{ op: "OR",  text: "будь-�кий" }	],
-    matchText: " збігаєть��",
-    rulesText: " правила"
-	},
-	edit : {
-    addCaption: "Додати запи�",
-    editCaption: "Змінити запи�",
-    bSubmit: "Зберегти",
-    bCancel: "Відміна",
-		bClose: "Закрити",
-		saveData: "До данних були вне�ені зміни! Зберегти зміни?",
-		bYes : "Так",
-		bNo : "�і",
-		bExit : "Відміна",
-	    msg: {
-        required:"Поле є обов'�зковим",
-        number:"Будь ла�ка, введіть правильне чи�ло",
-        minValue:"значенн� повинне бути більше або дорівнює",
-        maxValue:"значенн� повинно бути менше або дорівнює",
-        email: "некоректна адре�а електронної пошти",
-        integer: "Будь ла�ка, введенн� дій�не ціле значенн�",
-        date: "Будь ла�ка, введенн� дій�не значенн� дати",
-        url: "не дій�ний URL. �еобхідна при�тавка ('http://' or 'https://')",
-		nodefined : " is not defined!",
-		novalue : " return value is required!",
-		customarray : "Custom function should return array!",
-		customfcheck : "Custom function should be present in case of custom checking!"
-		}
-	},
-	view : {
-	    caption: "Перегл�нути запи�",
-	    bClose: "Закрити"
-	},
-	del : {
-	    caption: "Видалити",
-	    msg: "Видалити обраний запи�(и)?",
-	    bSubmit: "Видалити",
-	    bCancel: "Відміна"
-	},
-	nav : {
-  		edittext: " ",
-	    edittitle: "Змінити вибраний запи�",
-  		addtext:" ",
-	    addtitle: "Додати новий запи�",
-	    deltext: " ",
-	    deltitle: "Видалити вибраний запи�",
-	    searchtext: " ",
-	    searchtitle: "Знайти запи�и",
-	    refreshtext: "",
-	    refreshtitle: "Оновити таблицю",
-	    alertcap: "Попередженн�",
-	    alerttext: "Будь ла�ка, виберіть запи�",
-  		viewtext: "",
-  		viewtitle: "Перегл�нути обраний запи�"
-	},
-	col : {
-	    caption: "Показати/Приховати �товпці",
-	    bSubmit: "Зберегти",
-	    bCancel: "Відміна"
-	},
-	errors : {
-		errcap : "Помилка",
-		nourl : "URL не задан",
-		norecords: "�емає запи�ів дл� обробки",
-    model : "Чи�ло полів не відповідає чи�лу �товпців таблиці!"
-	},
-	formatter : {
-		integer : {thousandsSeparator: " ", defaultValue: '0'},
-		number : {decimalSeparator:",", thousandsSeparator: " ", decimalPlaces: 2, defaultValue: '0,00'},
-		currency : {decimalSeparator:",", thousandsSeparator: " ", decimalPlaces: 2, prefix: "", suffix:"", defaultValue: '0,00'},
-		date : {
-			dayNames:   [
-				"�д", "Пн", "Вт", "Ср", "Чт", "Пт", "Сб",
-				"�еділ�", "Понеділок", "Вівторок", "Середа", "Четвер", "П'�тниц�", "Субота"
-			],
-			monthNames: [
-				"Січ", "Лют", "Бер", "Кві", "Тра", "Чер", "Лип", "Сер", "Вер", "Жов", "Ли�", "Гру",
-				"Січень", "Лютий", "Березень", "Квітень", "Травень", "Червень", "Липень", "Серпень", "Вере�ень", "Жовтень", "Ли�топад", "Грудень"
-			],
-			AmPm : ["am","pm","AM","PM"],
-			S: function (j) {return j < 11 || j > 13 ? ['st', 'nd', 'rd', 'th'][Math.min((j - 1) % 10, 3)] : 'th'},
-			srcformat: 'Y-m-d',
-			newformat: 'd.m.Y',
-			masks : {
-	            ISO8601Long:"Y-m-d H:i:s",
-	            ISO8601Short:"Y-m-d",
-	            ShortDate: "n.j.Y",
-	            LongDate: "l, F d, Y",
-	            FullDateTime: "l, F d, Y G:i:s",
-	            MonthDay: "F d",
-	            ShortTime: "G:i",
-	            LongTime: "G:i:s",
-	            SortableDateTime: "Y-m-d\\TH:i:s",
-	            UniversalSortableDateTime: "Y-m-d H:i:sO",
-	            YearMonth: "F, Y"
-	        },
-	        reformatAfterEdit : false
-		},
-		baseLinkUrl: '',
-		showAction: '',
-	  target: '',
-	  checkbox : {disabled:true},
-		idName : 'id'
-	}
-};
-})(jQuery);
diff --git a/addons/base/static/lib/jquery.jqGrid/js/jqDnR.js b/addons/base/static/lib/jquery.jqGrid/js/jqDnR.js
deleted file mode 100644
index 60fe2a96d0a..00000000000
--- a/addons/base/static/lib/jquery.jqGrid/js/jqDnR.js
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * jqDnR - Minimalistic Drag'n'Resize for jQuery.
- *
- * Copyright (c) 2007 Brice Burgess <bhb@iceburg.net>, http://www.iceburg.net
- * Licensed under the MIT License:
- * http://www.opensource.org/licenses/mit-license.php
- * 
- * $Version: 2007.08.19 +r2
- */
-
-(function($){
-$.fn.jqDrag=function(h){return i(this,h,'d');};
-$.fn.jqResize=function(h,ar){return i(this,h,'r',ar);};
-$.jqDnR={
-	dnr:{},
-	e:0,
-	drag:function(v){
- 		if(M.k == 'd')E.css({left:M.X+v.pageX-M.pX,top:M.Y+v.pageY-M.pY});
- 		else {
-			E.css({width:Math.max(v.pageX-M.pX+M.W,0),height:Math.max(v.pageY-M.pY+M.H,0)});
-			if(M1){E1.css({width:Math.max(v.pageX-M1.pX+M1.W,0),height:Math.max(v.pageY-M1.pY+M1.H,0)});}
-		}
-  		return false;
-  	},
-	stop:function(){
-		//E.css('opacity',M.o);
-		$(document).unbind('mousemove',J.drag).unbind('mouseup',J.stop);
-	}
-};
-var J=$.jqDnR,M=J.dnr,E=J.e,E1,
-i=function(e,h,k,aR){
-	return e.each(function(){
-		h=(h)?$(h,e):e;
- 		h.bind('mousedown',{e:e,k:k},function(v){
- 			var d=v.data,p={};E=d.e;E1 = aR ? $(aR) : false;
- 			// attempt utilization of dimensions plugin to fix IE issues
- 			if(E.css('position') != 'relative'){try{E.position(p);}catch(e){}}
- 			M={
- 				X:p.left||f('left')||0,
- 				Y:p.top||f('top')||0,
- 				W:f('width')||E[0].scrollWidth||0,
- 				H:f('height')||E[0].scrollHeight||0,
- 				pX:v.pageX,
- 				pY:v.pageY,
- 				k:d.k
- 				//o:E.css('opacity')
- 			};
-			// also resize
-			if(E1 && d.k != 'd'){
- 				M1={
-					X:p.left||f1('left')||0,
-					Y:p.top||f1('top')||0,
-					W:E1[0].offsetWidth||f1('width')||0,
-					H:E1[0].offsetHeight||f1('height')||0,
-					pX:v.pageX,
-					pY:v.pageY,
-					k:d.k
-				};
-			} else {M1 = false;}			
- 			//E.css({opacity:0.8});
-			try {$("input.hasDatepicker",E[0]).datepicker('hide');}catch (dpe){}
- 			$(document).mousemove($.jqDnR.drag).mouseup($.jqDnR.stop);
- 			return false;
- 		});
-	});
-},
-f=function(k){return parseInt(E.css(k))||false;};
-f1=function(k){	return parseInt(E1.css(k))||false;};
-})(jQuery);
\ No newline at end of file
diff --git a/addons/base/static/lib/jquery.jqGrid/js/jqModal.js b/addons/base/static/lib/jquery.jqGrid/js/jqModal.js
deleted file mode 100644
index d1e7cda78c9..00000000000
--- a/addons/base/static/lib/jquery.jqGrid/js/jqModal.js
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * jqModal - Minimalist Modaling with jQuery
- *   (http://dev.iceburg.net/jquery/jqmodal/)
- *
- * Copyright (c) 2007,2008 Brice Burgess <bhb@iceburg.net>
- * Dual licensed under the MIT and GPL licenses:
- *   http://www.opensource.org/licenses/mit-license.php
- *   http://www.gnu.org/licenses/gpl.html
- * 
- * $Version: 07/06/2008 +r13
- */
-(function($) {
-$.fn.jqm=function(o){
-var p={
-overlay: 50,
-closeoverlay : true,
-overlayClass: 'jqmOverlay',
-closeClass: 'jqmClose',
-trigger: '.jqModal',
-ajax: F,
-ajaxText: '',
-target: F,
-modal: F,
-toTop: F,
-onShow: F,
-onHide: F,
-onLoad: F
-};
-return this.each(function(){if(this._jqm)return H[this._jqm].c=$.extend({},H[this._jqm].c,o);s++;this._jqm=s;
-H[s]={c:$.extend(p,$.jqm.params,o),a:F,w:$(this).addClass('jqmID'+s),s:s};
-if(p.trigger)$(this).jqmAddTrigger(p.trigger);
-});};
-
-$.fn.jqmAddClose=function(e){return hs(this,e,'jqmHide');};
-$.fn.jqmAddTrigger=function(e){return hs(this,e,'jqmShow');};
-$.fn.jqmShow=function(t){return this.each(function(){$.jqm.open(this._jqm,t);});};
-$.fn.jqmHide=function(t){return this.each(function(){$.jqm.close(this._jqm,t)});};
-
-$.jqm = {
-hash:{},
-open:function(s,t){var h=H[s],c=h.c,cc='.'+c.closeClass,z=(parseInt(h.w.css('z-index')));z=(z>0)?z:3000;var o=$('<div></div>').css({height:'100%',width:'100%',position:'fixed',left:0,top:0,'z-index':z-1,opacity:c.overlay/100});if(h.a)return F;h.t=t;h.a=true;h.w.css('z-index',z);
- if(c.modal) {if(!A[0])setTimeout(function(){L('bind');},1);A.push(s);}
- else if(c.overlay > 0) {if(c.closeoverlay) h.w.jqmAddClose(o);}
- else o=F;
-
- h.o=(o)?o.addClass(c.overlayClass).prependTo('body'):F;
- if(ie6){$('html,body').css({height:'100%',width:'100%'});if(o){o=o.css({position:'absolute'})[0];for(var y in {Top:1,Left:1})o.style.setExpression(y.toLowerCase(),"(_=(document.documentElement.scroll"+y+" || document.body.scroll"+y+"))+'px'");}}
-
- if(c.ajax) {var r=c.target||h.w,u=c.ajax;r=(typeof r == 'string')?$(r,h.w):$(r);u=(u.substr(0,1) == '@')?$(t).attr(u.substring(1)):u;
-  r.html(c.ajaxText).load(u,function(){if(c.onLoad)c.onLoad.call(this,h);if(cc)h.w.jqmAddClose($(cc,h.w));e(h);});}
- else if(cc)h.w.jqmAddClose($(cc,h.w));
-
- if(c.toTop&&h.o)h.w.before('<span id="jqmP'+h.w[0]._jqm+'"></span>').insertAfter(h.o);	
- (c.onShow)?c.onShow(h):h.w.show();e(h);return F;
-},
-close:function(s){var h=H[s];if(!h.a)return F;h.a=F;
- if(A[0]){A.pop();if(!A[0])L('unbind');}
- if(h.c.toTop&&h.o)$('#jqmP'+h.w[0]._jqm).after(h.w).remove();
- if(h.c.onHide)h.c.onHide(h);else{h.w.hide();if(h.o)h.o.remove();} return F;
-},
-params:{}};
-var s=0,H=$.jqm.hash,A=[],ie6=$.browser.msie&&($.browser.version == "6.0"),F=false,
-e=function(h){var i=$('<iframe src="javascript:false;document.write(\'\');" class="jqm"></iframe>').css({opacity:0});if(ie6)if(h.o)h.o.html('<p style="width:100%;height:100%"/>').prepend(i);else if(!$('iframe.jqm',h.w)[0])h.w.prepend(i); f(h);},
-f=function(h){try{$(':input:visible',h.w)[0].focus();}catch(_){}},
-L=function(t){$(document)[t]("keypress",m)[t]("keydown",m)[t]("mousedown",m);},
-m=function(e){var h=H[A[A.length-1]],r=(!$(e.target).parents('.jqmID'+h.s)[0]);if(r)f(h);return !r;},
-hs=function(w,t,c){return w.each(function(){var s=this._jqm;$(t).each(function() {
- if(!this[c]){this[c]=[];$(this).click(function(){for(var i in {jqmShow:1,jqmHide:1})for(var s in this[i])if(H[this[i][s]])H[this[i][s]].w[i](this);return F;});}this[c].push(s);});});};
-})(jQuery);
\ No newline at end of file
diff --git a/addons/base/static/lib/jquery.jqGrid/js/jquery.fmatter.js b/addons/base/static/lib/jquery.jqGrid/js/jquery.fmatter.js
deleted file mode 100644
index 38314ce57eb..00000000000
--- a/addons/base/static/lib/jquery.jqGrid/js/jquery.fmatter.js
+++ /dev/null
@@ -1,568 +0,0 @@
-/*
-**
- * formatter for values but most of the values if for jqGrid
- * Some of this was inspired and based on how YUI does the table datagrid but in jQuery fashion
- * we are trying to keep it as light as possible
- * Joshua Burnett josh@9ci.com	
- * http://www.greenbill.com
- *
- * Changes from Tony Tomov tony@trirand.com
- * Dual licensed under the MIT and GPL licenses:
- * http://www.opensource.org/licenses/mit-license.php
- * http://www.gnu.org/licenses/gpl-2.0.html
- * 
-**/
-
-;(function($) {
-	$.fmatter = {};
-	//opts can be id:row id for the row, rowdata:the data for the row, colmodel:the column model for this column
-	//example {id:1234,}
-	$.extend($.fmatter,{
-		isBoolean : function(o) {
-			return typeof o === 'boolean';
-		},
-		isObject : function(o) {
-			return (o && (typeof o === 'object' || $.isFunction(o))) || false;
-		},
-		isString : function(o) {
-			return typeof o === 'string';
-		},
-		isNumber : function(o) {
-			return typeof o === 'number' && isFinite(o);
-		},
-		isNull : function(o) {
-			return o === null;
-		},
-		isUndefined : function(o) {
-			return typeof o === 'undefined';
-		},
-		isValue : function (o) {
-			return (this.isObject(o) || this.isString(o) || this.isNumber(o) || this.isBoolean(o));
-		},
-		isEmpty : function(o) {
-			if(!this.isString(o) && this.isValue(o)) {
-				return false;
-			}else if (!this.isValue(o)){
-				return true;
-			}
-			o = $.trim(o).replace(/\&nbsp\;/ig,'').replace(/\&#160\;/ig,'');
-			return o==="";	
-		}
-	});
-	$.fn.fmatter = function(formatType, cellval, opts, rwd, act) {
-		// build main options before element iteration
-		var v=cellval;
-		opts = $.extend({}, $.jgrid.formatter, opts);
-
-		if ($.fn.fmatter[formatType]){
-			v = $.fn.fmatter[formatType](cellval, opts, rwd, act);
-		}
-		return v;
-	};
-	$.fmatter.util = {
-		// Taken from YAHOO utils
-		NumberFormat : function(nData,opts) {
-			if(!$.fmatter.isNumber(nData)) {
-				nData *= 1;
-			}
-			if($.fmatter.isNumber(nData)) {
-				var bNegative = (nData < 0);
-				var sOutput = nData + "";
-				var sDecimalSeparator = (opts.decimalSeparator) ? opts.decimalSeparator : ".";
-				var nDotIndex;
-				if($.fmatter.isNumber(opts.decimalPlaces)) {
-					// Round to the correct decimal place
-					var nDecimalPlaces = opts.decimalPlaces;
-					var nDecimal = Math.pow(10, nDecimalPlaces);
-					sOutput = Math.round(nData*nDecimal)/nDecimal + "";
-					nDotIndex = sOutput.lastIndexOf(".");
-					if(nDecimalPlaces > 0) {
-					// Add the decimal separator
-						if(nDotIndex < 0) {
-							sOutput += sDecimalSeparator;
-							nDotIndex = sOutput.length-1;
-						}
-						// Replace the "."
-						else if(sDecimalSeparator !== "."){
-							sOutput = sOutput.replace(".",sDecimalSeparator);
-						}
-					// Add missing zeros
-						while((sOutput.length - 1 - nDotIndex) < nDecimalPlaces) {
-							sOutput += "0";
-						}
-					}
-				}
-				if(opts.thousandsSeparator) {
-					var sThousandsSeparator = opts.thousandsSeparator;
-					nDotIndex = sOutput.lastIndexOf(sDecimalSeparator);
-					nDotIndex = (nDotIndex > -1) ? nDotIndex : sOutput.length;
-					var sNewOutput = sOutput.substring(nDotIndex);
-					var nCount = -1;
-					for (var i=nDotIndex; i>0; i--) {
-						nCount++;
-						if ((nCount%3 === 0) && (i !== nDotIndex) && (!bNegative || (i > 1))) {
-							sNewOutput = sThousandsSeparator + sNewOutput;
-						}
-						sNewOutput = sOutput.charAt(i-1) + sNewOutput;
-					}
-					sOutput = sNewOutput;
-				}
-				// Prepend prefix
-				sOutput = (opts.prefix) ? opts.prefix + sOutput : sOutput;
-				// Append suffix
-				sOutput = (opts.suffix) ? sOutput + opts.suffix : sOutput;
-				return sOutput;
-				
-			} else {
-				return nData;
-			}
-		},
-		// Tony Tomov
-		// PHP implementation. Sorry not all options are supported.
-		// Feel free to add them if you want
-		DateFormat : function (format, date, newformat, opts)  {
-			var	token = /\\.|[dDjlNSwzWFmMntLoYyaABgGhHisueIOPTZcrU]/g,
-			timezone = /\b(?:[PMCEA][SDP]T|(?:Pacific|Mountain|Central|Eastern|Atlantic) (?:Standard|Daylight|Prevailing) Time|(?:GMT|UTC)(?:[-+]\d{4})?)\b/g,
-			timezoneClip = /[^-+\dA-Z]/g,
-			msDateRegExp = new RegExp("^\/Date\\((([-+])?[0-9]+)(([-+])([0-9]{2})([0-9]{2}))?\\)\/$"),
-			msMatch = ((typeof date === 'string') ? date.match(msDateRegExp): null),
-			pad = function (value, length) {
-				value = String(value);
-				length = parseInt(length,10) || 2;
-				while (value.length < length)  { value = '0' + value; }
-				return value;
-			},
-			ts = {m : 1, d : 1, y : 1970, h : 0, i : 0, s : 0, u:0},
-			timestamp=0, dM, k,hl,
-			dateFormat=["i18n"];
-			// Internationalization strings
-			dateFormat.i18n = {
-				dayNames: opts.dayNames,
-				monthNames: opts.monthNames
-			};
-			if( format in opts.masks ) { format = opts.masks[format]; }
-			if(date.constructor === Number) {
-				//Unix timestamp
-				if(String(format).toLowerCase() == "u") {
-					date = date*1000;
-				}
-			    timestamp = new Date(date);
-			} else if(date.constructor === Date) {
-				timestamp = date;
-				// Microsoft date format support
-			} else if( msMatch !== null ) {
-				timestamp = new Date(parseInt(msMatch[1], 10));
-				if (msMatch[3]) {
-					var offset = Number(msMatch[5]) * 60 + Number(msMatch[6]);
-					offset *= ((msMatch[4] == '-') ? 1 : -1);
-					offset -= timestamp.getTimezoneOffset();
-					timestamp.setTime(Number(Number(timestamp) + (offset * 60 * 1000)));
-				}
-			} else {
-				date = String(date).split(/[\\\/:_;.,\t\T\s-]/);
-				format = format.split(/[\\\/:_;.,\t\T\s-]/);
-				// parsing for month names
-				for(k=0,hl=format.length;k<hl;k++){
-					if(format[k] == 'M') {
-						dM = $.inArray(date[k],dateFormat.i18n.monthNames);
-						if(dM !== -1 && dM < 12){date[k] = dM+1;}
-					}
-					if(format[k] == 'F') {
-						dM = $.inArray(date[k],dateFormat.i18n.monthNames);
-						if(dM !== -1 && dM > 11){date[k] = dM+1-12;}
-					}
-					if(date[k]) {
-						ts[format[k].toLowerCase()] = parseInt(date[k],10);
-					}
-				}
-				if(ts.f) {ts.m = ts.f;}
-				if( ts.m === 0 && ts.y === 0 && ts.d === 0) {
-					return "&#160;" ;
-				}
-				ts.m = parseInt(ts.m,10)-1;
-				var ty = ts.y;
-				if (ty >= 70 && ty <= 99) {ts.y = 1900+ts.y;}
-				else if (ty >=0 && ty <=69) {ts.y= 2000+ts.y;}
-				timestamp = new Date(ts.y, ts.m, ts.d, ts.h, ts.i, ts.s, ts.u);
-			}
-			
-			if( newformat in opts.masks )  {
-				newformat = opts.masks[newformat];
-			} else if ( !newformat ) {
-				newformat = 'Y-m-d';
-			}
-			var 
-				G = timestamp.getHours(),
-				i = timestamp.getMinutes(),
-				j = timestamp.getDate(),
-				n = timestamp.getMonth() + 1,
-				o = timestamp.getTimezoneOffset(),
-				s = timestamp.getSeconds(),
-				u = timestamp.getMilliseconds(),
-				w = timestamp.getDay(),
-				Y = timestamp.getFullYear(),
-				N = (w + 6) % 7 + 1,
-				z = (new Date(Y, n - 1, j) - new Date(Y, 0, 1)) / 86400000,
-				flags = {
-					// Day
-					d: pad(j),
-					D: dateFormat.i18n.dayNames[w],
-					j: j,
-					l: dateFormat.i18n.dayNames[w + 7],
-					N: N,
-					S: opts.S(j),
-					//j < 11 || j > 13 ? ['st', 'nd', 'rd', 'th'][Math.min((j - 1) % 10, 3)] : 'th',
-					w: w,
-					z: z,
-					// Week
-					W: N < 5 ? Math.floor((z + N - 1) / 7) + 1 : Math.floor((z + N - 1) / 7) || ((new Date(Y - 1, 0, 1).getDay() + 6) % 7 < 4 ? 53 : 52),
-					// Month
-					F: dateFormat.i18n.monthNames[n - 1 + 12],
-					m: pad(n),
-					M: dateFormat.i18n.monthNames[n - 1],
-					n: n,
-					t: '?',
-					// Year
-					L: '?',
-					o: '?',
-					Y: Y,
-					y: String(Y).substring(2),
-					// Time
-					a: G < 12 ? opts.AmPm[0] : opts.AmPm[1],
-					A: G < 12 ? opts.AmPm[2] : opts.AmPm[3],
-					B: '?',
-					g: G % 12 || 12,
-					G: G,
-					h: pad(G % 12 || 12),
-					H: pad(G),
-					i: pad(i),
-					s: pad(s),
-					u: u,
-					// Timezone
-					e: '?',
-					I: '?',
-					O: (o > 0 ? "-" : "+") + pad(Math.floor(Math.abs(o) / 60) * 100 + Math.abs(o) % 60, 4),
-					P: '?',
-					T: (String(timestamp).match(timezone) || [""]).pop().replace(timezoneClip, ""),
-					Z: '?',
-					// Full Date/Time
-					c: '?',
-					r: '?',
-					U: Math.floor(timestamp / 1000)
-				};	
-			return newformat.replace(token, function ($0) {
-				return $0 in flags ? flags[$0] : $0.substring(1);
-			});			
-		}
-	};
-	$.fn.fmatter.defaultFormat = function(cellval, opts) {
-		return ($.fmatter.isValue(cellval) && cellval!=="" ) ?  cellval : opts.defaultValue ? opts.defaultValue : "&#160;";
-	};
-	$.fn.fmatter.email = function(cellval, opts) {
-		if(!$.fmatter.isEmpty(cellval)) {
-			return "<a href=\"mailto:" + cellval + "\">" + cellval + "</a>";
-		}else {
-			return $.fn.fmatter.defaultFormat(cellval,opts );
-		}
-	};
-	$.fn.fmatter.checkbox =function(cval, opts) {
-		var op = $.extend({},opts.checkbox), ds;
-		if(!$.fmatter.isUndefined(opts.colModel.formatoptions)) {
-			op = $.extend({},op,opts.colModel.formatoptions);
-		}
-		if(op.disabled===true) {ds = "disabled=\"disabled\"";} else {ds="";}
-		if($.fmatter.isEmpty(cval) || $.fmatter.isUndefined(cval) ) {cval = $.fn.fmatter.defaultFormat(cval,op);}
-		cval=cval+"";cval=cval.toLowerCase();
-		var bchk = cval.search(/(false|0|no|off)/i)<0 ? " checked='checked' " : "";
-		return "<input type=\"checkbox\" " + bchk  + " value=\""+ cval+"\" offval=\"no\" "+ds+ "/>";
-	};
-	$.fn.fmatter.link = function(cellval, opts) {
-		var op = {target:opts.target};
-		var target = "";
-		if(!$.fmatter.isUndefined(opts.colModel.formatoptions)) {
-			op = $.extend({},op,opts.colModel.formatoptions);
-		}
-		if(op.target) {target = 'target=' + op.target;}
-		if(!$.fmatter.isEmpty(cellval)) {
-			return "<a "+target+" href=\"" + cellval + "\">" + cellval + "</a>";
-		}else {
-			return $.fn.fmatter.defaultFormat(cellval,opts);
-		}
-	};
-	$.fn.fmatter.showlink = function(cellval, opts) {
-		var op = {baseLinkUrl: opts.baseLinkUrl,showAction:opts.showAction, addParam: opts.addParam || "", target: opts.target, idName: opts.idName},
-		target = "", idUrl;
-		if(!$.fmatter.isUndefined(opts.colModel.formatoptions)) {
-			op = $.extend({},op,opts.colModel.formatoptions);
-		}
-		if(op.target) {target = 'target=' + op.target;}
-		idUrl = op.baseLinkUrl+op.showAction + '?'+ op.idName+'='+opts.rowId+op.addParam;
-		if($.fmatter.isString(cellval) || $.fmatter.isNumber(cellval)) {	//add this one even if its blank string
-			return "<a "+target+" href=\"" + idUrl + "\">" + cellval + "</a>";
-		}else {
-			return $.fn.fmatter.defaultFormat(cellval,opts);
-		}
-	};
-	$.fn.fmatter.integer = function(cellval, opts) {
-		var op = $.extend({},opts.integer);
-		if(!$.fmatter.isUndefined(opts.colModel.formatoptions)) {
-			op = $.extend({},op,opts.colModel.formatoptions);
-		}
-		if($.fmatter.isEmpty(cellval)) {
-			return op.defaultValue;
-		}
-		return $.fmatter.util.NumberFormat(cellval,op);
-	};
-	$.fn.fmatter.number = function (cellval, opts) {
-		var op = $.extend({},opts.number);
-		if(!$.fmatter.isUndefined(opts.colModel.formatoptions)) {
-			op = $.extend({},op,opts.colModel.formatoptions);
-		}
-		if($.fmatter.isEmpty(cellval)) {
-			return op.defaultValue;
-		}
-		return $.fmatter.util.NumberFormat(cellval,op);
-	};
-	$.fn.fmatter.currency = function (cellval, opts) {
-		var op = $.extend({},opts.currency);
-		if(!$.fmatter.isUndefined(opts.colModel.formatoptions)) {
-			op = $.extend({},op,opts.colModel.formatoptions);
-		}
-		if($.fmatter.isEmpty(cellval)) {
-			return op.defaultValue;
-		}
-		return $.fmatter.util.NumberFormat(cellval,op);
-	};
-	$.fn.fmatter.date = function (cellval, opts, rwd, act) {
-		var op = $.extend({},opts.date);
-		if(!$.fmatter.isUndefined(opts.colModel.formatoptions)) {
-			op = $.extend({},op,opts.colModel.formatoptions);
-		}
-		if(!op.reformatAfterEdit && act=='edit'){
-			return $.fn.fmatter.defaultFormat(cellval, opts);
-		} else if(!$.fmatter.isEmpty(cellval)) {
-			return  $.fmatter.util.DateFormat(op.srcformat,cellval,op.newformat,op);
-		} else {
-			return $.fn.fmatter.defaultFormat(cellval, opts);
-		}
-	};
-	$.fn.fmatter.select = function (cellval,opts, rwd, act) {
-		// jqGrid specific
-		cellval = cellval + "";
-		var oSelect = false, ret=[];
-		if(!$.fmatter.isUndefined(opts.colModel.formatoptions)){
-			oSelect= opts.colModel.formatoptions.value;
-		} else if(!$.fmatter.isUndefined(opts.colModel.editoptions)){
-			oSelect= opts.colModel.editoptions.value;
-		}
-		if (oSelect) {
-			var	msl =  opts.colModel.editoptions.multiple === true ? true : false,
-			scell = [], sv;
-			if(msl) {scell = cellval.split(",");scell = $.map(scell,function(n){return $.trim(n);});}
-			if ($.fmatter.isString(oSelect)) {
-				// mybe here we can use some caching with care ????
-				var so = oSelect.split(";"), j=0;
-				for(var i=0; i<so.length;i++){
-					sv = so[i].split(":");
-					if(sv.length > 2 ) {
-						sv[1] = jQuery.map(sv,function(n,i){if(i>0) {return n;}}).join(":");
-					}
-					if(msl) {
-						if(jQuery.inArray(sv[0],scell)>-1) {
-							ret[j] = sv[1];
-							j++;
-						}
-					} else if($.trim(sv[0])==$.trim(cellval)) {
-						ret[0] = sv[1];
-						break;
-					}
-				}
-			} else if($.fmatter.isObject(oSelect)) {
-				// this is quicker
-				if(msl) {
-					ret = jQuery.map(scell, function(n, i){
-						return oSelect[n];
-					});
-				} else {
-					ret[0] = oSelect[cellval] || "";
-				}
-			}
-		}
-		cellval = ret.join(", ");
-		return  cellval === "" ? $.fn.fmatter.defaultFormat(cellval,opts) : cellval;
-	};
-	$.fn.fmatter.rowactions = function(rid,gid,act,pos) {
-		var op ={
-			keys:false,
-			editbutton:true,
-			delbutton:true,
-			onEdit : null, 
-			onSuccess: null, 
-			afterSave:null,
-			onError: null,
-			afterRestore: null,
-			extraparam: {oper:'edit'},
-			url: null,
-			delOptions: {}
-		},
-		cm = $('#'+gid)[0].p.colModel[pos];
-		if(!$.fmatter.isUndefined(cm.formatoptions)) {
-			op = $.extend(op,cm.formatoptions);
-		}
-		var saverow = function( rowid)	{
-			if(op.afterSave) op.afterSave(rowid);
-			$("tr#"+rid+" div.ui-inline-edit, "+"tr#"+rid+" div.ui-inline-del","#"+gid).show();
-			$("tr#"+rid+" div.ui-inline-save, "+"tr#"+rid+" div.ui-inline-cancel","#"+gid).hide();
-		},
-		restorerow = function( rowid)	{
-			if(op.afterRestore) op.afterRestore(rowid);
-			$("tr#"+rid+" div.ui-inline-edit, "+"tr#"+rid+" div.ui-inline-del","#"+gid).show();
-			$("tr#"+rid+" div.ui-inline-save, "+"tr#"+rid+" div.ui-inline-cancel","#"+gid).hide();
-		};
-
-		switch(act)
-		{
-			case 'edit':
-				$('#'+gid).jqGrid('editRow',rid, op.keys, op.onEdit, op.onSuccess, op.url, op.extraparam, saverow, op.onError,restorerow);
-				$("tr#"+rid+" div.ui-inline-edit, "+"tr#"+rid+" div.ui-inline-del","#"+gid).hide();
-				$("tr#"+rid+" div.ui-inline-save, "+"tr#"+rid+" div.ui-inline-cancel","#"+gid).show();
-				break;
-			case 'save':
-				$('#'+gid).jqGrid('saveRow',rid,  op.onSuccess,op.url, op.extraparam, saverow, op.onError,restorerow);
-				$("tr#"+rid+" div.ui-inline-edit, "+"tr#"+rid+" div.ui-inline-del","#"+gid).show();
-				$("tr#"+rid+" div.ui-inline-save, "+"tr#"+rid+" div.ui-inline-cancel","#"+gid).hide();
-				break;
-			case 'cancel' :
-				$('#'+gid).jqGrid('restoreRow',rid, restorerow);
-				$("tr#"+rid+" div.ui-inline-edit, "+"tr#"+rid+" div.ui-inline-del","#"+gid).show();
-				$("tr#"+rid+" div.ui-inline-save, "+"tr#"+rid+" div.ui-inline-cancel","#"+gid).hide();
-				break;
-			case 'del':
-				$('#'+gid).jqGrid('delGridRow',rid, op.delOptions);
-				break;
-		}
-	};
-	$.fn.fmatter.actions = function(cellval,opts, rwd) {
-		var op ={keys:false, editbutton:true, delbutton:true};
-		if(!$.fmatter.isUndefined(opts.colModel.formatoptions)) {
-			op = $.extend(op,opts.colModel.formatoptions);
-		}
-		var rowid = opts.rowId, str="",ocl;
-		if(typeof(rowid) =='undefined' || $.fmatter.isEmpty(rowid)) {return "";}
-		if(op.editbutton){
-			ocl = "onclick=$.fn.fmatter.rowactions('"+rowid+"','"+opts.gid+"','edit',"+opts.pos+");";
-			str =str+ "<div style='margin-left:8px;'><div title='"+$.jgrid.nav.edittitle+"' style='float:left;cursor:pointer;' class='ui-pg-div ui-inline-edit' "+ocl+"><span class='ui-icon ui-icon-pencil'></span></div>";
-		}
-		if(op.delbutton) {
-			ocl = "onclick=$.fn.fmatter.rowactions('"+rowid+"','"+opts.gid+"','del',"+opts.pos+");";
-			str = str+"<div title='"+$.jgrid.nav.deltitle+"' style='float:left;margin-left:5px;' class='ui-pg-div ui-inline-del' "+ocl+"><span class='ui-icon ui-icon-trash'></span></div>";
-		}
-		ocl = "onclick=$.fn.fmatter.rowactions('"+rowid+"','"+opts.gid+"','save',"+opts.pos+");";
-		str = str+"<div title='"+$.jgrid.edit.bSubmit+"' style='float:left;display:none' class='ui-pg-div ui-inline-save'><span class='ui-icon ui-icon-disk' "+ocl+"></span></div>";
-		ocl = "onclick=$.fn.fmatter.rowactions('"+rowid+"','"+opts.gid+"','cancel',"+opts.pos+");";
-		str = str+"<div title='"+$.jgrid.edit.bCancel+"' style='float:left;display:none;margin-left:5px;' class='ui-pg-div ui-inline-cancel'><span class='ui-icon ui-icon-cancel' "+ocl+"></span></div></div>";
-		return str;
-	};
-	$.unformat = function (cellval,options,pos,cnt) {
-		// specific for jqGrid only
-		var ret, formatType = options.colModel.formatter,
-		op =options.colModel.formatoptions || {}, sep,
-		re = /([\.\*\_\'\(\)\{\}\+\?\\])/g,
-		unformatFunc = options.colModel.unformat||($.fn.fmatter[formatType] && $.fn.fmatter[formatType].unformat);
-		if(typeof unformatFunc !== 'undefined' && $.isFunction(unformatFunc) ) {
-			ret = unformatFunc($(cellval).text(), options, cellval);
-		} else if(!$.fmatter.isUndefined(formatType) && $.fmatter.isString(formatType) ) {
-			var opts = $.jgrid.formatter || {}, stripTag;
-			switch(formatType) {
-				case 'integer' :
-					op = $.extend({},opts.integer,op);
-					sep = op.thousandsSeparator.replace(re,"\\$1");
-					stripTag = new RegExp(sep, "g");
-					ret = $(cellval).text().replace(stripTag,'');
-					break;
-				case 'number' :
-					op = $.extend({},opts.number,op);
-					sep = op.thousandsSeparator.replace(re,"\\$1");
-					stripTag = new RegExp(sep, "g");
-					ret = $(cellval).text().replace(stripTag,"").replace(op.decimalSeparator,'.');
-					break;
-				case 'currency':
-					op = $.extend({},opts.currency,op);
-					sep = op.thousandsSeparator.replace(re,"\\$1");
-					stripTag = new RegExp(sep, "g");
-					ret = $(cellval).text().replace(stripTag,'').replace(op.decimalSeparator,'.').replace(op.prefix,'').replace(op.suffix,'');
-					break;
-				case 'checkbox':
-					var cbv = (options.colModel.editoptions) ? options.colModel.editoptions.value.split(":") : ["Yes","No"];
-					ret = $('input',cellval).attr("checked") ? cbv[0] : cbv[1];
-					break;
-				case 'select' :
-					ret = $.unformat.select(cellval,options,pos,cnt);
-					break;
-				case 'actions':
-					return "";
-				default:
-					ret= $(cellval).text();
-			}
-		}
-		return ret ? ret : cnt===true ? $(cellval).text() : $.jgrid.htmlDecode($(cellval).html());
-	};
-	$.unformat.select = function (cellval,options,pos,cnt) {
-		// Spacial case when we have local data and perform a sort
-		// cnt is set to true only in sortDataArray
-		var ret = [];
-		var cell = $(cellval).text();
-		if(cnt===true) {return cell;}
-		var op = $.extend({},options.colModel.editoptions);
-		if(op.value){
-			var oSelect = op.value,
-			msl =  op.multiple === true ? true : false,
-			scell = [], sv;
-			if(msl) {scell = cell.split(",");scell = $.map(scell,function(n){return $.trim(n);});}
-			if ($.fmatter.isString(oSelect)) {
-				var so = oSelect.split(";"), j=0;
-				for(var i=0; i<so.length;i++){
-					sv = so[i].split(":");
-					if(sv.length > 2 ) {
-						sv[1] = jQuery.map(sv,function(n,i){if(i>0) {return n;}}).join(":");
-					}					
-					if(msl) {
-						if(jQuery.inArray(sv[1],scell)>-1) {
-							ret[j] = sv[0];
-							j++;
-						}
-					} else if($.trim(sv[1])==$.trim(cell)) {
-						ret[0] = sv[0];
-						break;
-					}
-				}
-			} else if($.fmatter.isObject(oSelect) || $.isArray(oSelect) ){
-				if(!msl) {scell[0] =  cell;}
-				ret = jQuery.map(scell, function(n){
-					var rv;
-					$.each(oSelect, function(i,val){
-						if (val == n) {
-							rv = i;
-							return false;
-						}
-					});
-					if( typeof(rv) != 'undefined' ) {return rv;}
-				});
-			}
-			return ret.join(", ");
-		} else {
-			return cell || "";
-		}
-	};
-	$.unformat.date = function (cellval, opts) {
-		var op = $.jgrid.formatter.date || {};
-		if(!$.fmatter.isUndefined(opts.formatoptions)) {
-			op = $.extend({},op,opts.formatoptions);
-		}		
-		if(!$.fmatter.isEmpty(cellval)) {
-			return  $.fmatter.util.DateFormat(op.newformat,cellval,op.srcformat,op);
-		} else {
-			return $.fn.fmatter.defaultFormat(cellval, opts);
-		}
-	};
-})(jQuery);
\ No newline at end of file
diff --git a/addons/base/static/lib/jquery.jqGrid/plugins/grid.addons.js.js b/addons/base/static/lib/jquery.jqGrid/plugins/grid.addons.js.js
deleted file mode 100644
index ecb3ece98ca..00000000000
--- a/addons/base/static/lib/jquery.jqGrid/plugins/grid.addons.js.js
+++ /dev/null
@@ -1,704 +0,0 @@
-(function($){
-/*
- * jqGrid methods without support. Use as you wish
- * Tony Tomov tony@trirand.com
- * http://trirand.com/blog/
- * Dual licensed under the MIT and GPL licenses:
- * http://www.opensource.org/licenses/mit-license.php
- * http://www.gnu.org/licenses/gpl-2.0.html
- *
- * This list of deprecated methods.
- * If you instead want to use them, please include this file after the grid main file.
- * Some methods will be then overwritten.
- *
- */
-/*global jQuery, $ */
-
-$.jgrid.extend({
-// This is the ols search Filter method used in navigator.
-	searchGrid : function (p) {
-		p = $.extend({
-			recreateFilter: false,
-			drag: true,
-			sField:'searchField',
-			sValue:'searchString',
-			sOper: 'searchOper',
-			sFilter: 'filters',
-            loadDefaults: true, // this options activates loading of default filters from grid's postData for Multipe Search only.
-			beforeShowSearch: null,
-			afterShowSearch : null,
-			onInitializeSearch: null,
-			closeAfterSearch : false,
-			closeAfterReset: false,
-			closeOnEscape : false,
-			multipleSearch : false,
-			cloneSearchRowOnAdd: true,
-			// translation
-			// if you want to change or remove the order change it in sopt
-			// ['bw','eq','ne','lt','le','gt','ge','ew','cn']
-			sopt: null,
-			// Note: stringResult is intentionally declared "undefined by default".
-			//  you are velcome to define stringResult expressly in the options you pass to searchGrid()
-			//  stringResult is a "safeguard" measure to insure we post sensible data when communicated as form-encoded
-			//  see http://github.com/tonytomov/jqGrid/issues/#issue/36
-			//
-			//  If this value is not expressly defined in the incoming options,
-			// lower in the code we will infer the value based on value of multipleSearch
-			stringResult: undefined,
-			onClose : null,
-			// useDataProxy allows ADD, EDIT and DEL code to bypass calling $.ajax
-			// directly when grid's 'dataProxy' property (grid.p.dataProxy) is a function.
-			// Used for "editGridRow" and "delGridRow" below and automatically flipped to TRUE
-			// when ajax setting's 'url' (grid's 'editurl') property is undefined.
-			// When 'useDataProxy' is true, instead of calling $.ajax.call(gridDOMobj, o, i) we call
-			// gridDOMobj.p.dataProxy.call(gridDOMobj, o, i)
-			//
-			// Behavior is extremely similar to when 'datatype' is a function, but arguments are slightly different.
-			// Normally the following is fed to datatype.call(a, b, c):
-			//   a = Pointer to grid's table DOM element, b = grid.p.postdata, c = "load_"+grid's ID
-			// In cases of "edit" and "del" the following is fed:
-			//   a = Pointer to grid's table DOM element (same),
-			//   b = extended Ajax Options including postdata in "data" property. (different object type)
-			//   c = "set_"+grid's ID in case of "edit" and "del_"+grid's ID in case of "del" (same type, different content)
-			// The major difference is that complete ajax options object, with attached "complete" and "error"
-			// callback functions is fed instead of only post data.
-			// This allows you to emulate a $.ajax call (including calling "complete"/"error"),
-			// while retrieving the data locally in the browser.
-			useDataProxy: false,
-			overlay : true
-		}, $.jgrid.search, p || {});
-		return this.each(function() {
-			var $t = this;
-			if(!$t.grid) {return;}
-			var fid = "fbox_"+$t.p.id,
-			showFrm = true;
-            function applyDefaultFilters(gridDOMobj, filterSettings) {
-				/*
-                gridDOMobj = ointer to grid DOM object ( $(#list)[0] )
-                What we need from gridDOMobj:
-                gridDOMobj.SearchFilter is the pointer to the Search box, once it's created.
-                gridDOMobj.p.postData - dictionary of post settings. These can be overriden at grid creation to
-                contain default filter settings. We will parse these and will populate the search with defaults.
-                filterSettings - same settings object you (would) pass to $().jqGrid('searchGrid', filterSettings);
-                */
-
-                // Pulling default filter settings out of postData property of grid's properties.:
-                var defaultFilters = gridDOMobj.p.postData[filterSettings.sFilter];
-                // example of what we might get: {"groupOp":"and","rules":[{"field":"amount","op":"eq","data":"100"}]}
-				// suppose we have imported this with grid import, the this is a string.
-				if(typeof(defaultFilters) == "string") {
-					defaultFilters = $.jgrid.parse(defaultFilters);
-				}
-                if (defaultFilters) {
-                    if (defaultFilters.groupOp) {
-                        gridDOMobj.SearchFilter.setGroupOp(defaultFilters.groupOp);
-                    }
-                    if (defaultFilters.rules) {
-                        var f, i = 0, li = defaultFilters.rules.length, success = false;
-                        for (; i < li; i++) {
-                            f = defaultFilters.rules[i];
-                            // we are not trying to counter all issues with filter declaration here. Just the basics to avoid lookup exceptions.
-                            if (f.field !== undefined && f.op !== undefined && f.data !== undefined) {
-                                success = gridDOMobj.SearchFilter.setFilter({
-                                    'sfref':gridDOMobj.SearchFilter.$.find(".sf:last"),
-                                    'filter':$.extend({},f)
-                                });
-								if (success) { gridDOMobj.SearchFilter.add(); }
-                            }
-                        }
-                    }
-				}
-            } // end of applyDefaultFilters
-			function hideFilter(selector) {
-				if(p.onClose){
-					var fclm = p.onClose(selector);
-					if(typeof fclm == 'boolean' && !fclm) { return; }
-				}
-				selector.hide();
-				if(p.overlay === true) {
-					$(".jqgrid-overlay:first","#gbox_"+$t.p.id).hide();
-				}
-			}
-			function showFilter(){
-				var fl = $(".ui-searchFilter").length;
-				if(fl > 1) {
-					var zI = $("#"+fid).css("zIndex");
-					$("#"+fid).css({zIndex:parseInt(zI,10)+fl});
-				}
-				$("#"+fid).show();
-				if(p.overlay === true) {
-					$(".jqgrid-overlay:first","#gbox_"+$t.p.id).show();
-				}
-				try{$(':input:visible',"#"+fid)[0].focus();}catch(_){}
-			}
-			function searchFilters(filters) {
-				var hasFilters = (filters !== undefined),
-				grid = $("#"+$t.p.id),
-				sdata={};
-				if(p.multipleSearch===false) {
-					sdata[p.sField] = filters.rules[0].field;
-					sdata[p.sValue] = filters.rules[0].data;
-					sdata[p.sOper] = filters.rules[0].op;
-					if(sdata.hasOwnProperty(p.sFilter) ) {
-						delete sdata[p.sFilter];
-					}
-				} else {
-					sdata[p.sFilter] = filters;
-					$.each([p.sField, p.sValue, p.sOper], function(i, n){
-						if(sdata.hasOwnProperty(n)) { delete sdata[n];}
-					});
-				}
-				grid[0].p.search = hasFilters;
-				$.extend(grid[0].p.postData,sdata);
-				grid.trigger("reloadGrid",[{page:1}]);
-				if(p.closeAfterSearch) { hideFilter($("#"+fid)); }
-			}
-			function resetFilters(op) {
-				var reload = op && op.hasOwnProperty("reload") ? op.reload : true,
-				grid = $("#"+$t.p.id),
-				sdata={};
-				grid[0].p.search = false;
-				if(p.multipleSearch===false) {
-					sdata[p.sField] = sdata[p.sValue] = sdata[p.sOper] = "";
-				} else {
-					sdata[p.sFilter] = "";
-				}
-				$.extend(grid[0].p.postData,sdata);
-				if(reload) {
-					grid.trigger("reloadGrid",[{page:1}]);
-				}
-				if(p.closeAfterReset) { hideFilter($("#"+fid)); }
-			}
-			if($.fn.searchFilter) {
-				if(p.recreateFilter===true) {$("#"+fid).remove();}
-				if( $("#"+fid).html() !== null ) {
-					if ( $.isFunction(p.beforeShowSearch) ) {
-						showFrm = p.beforeShowSearch($("#"+fid));
-						if(typeof(showFrm) == "undefined") {
-							showFrm = true;
-						}
-					}
-					if(showFrm === false) { return; }
-					showFilter();
-					if( $.isFunction(p.afterShowSearch) ) { p.afterShowSearch($("#"+fid)); }
-				} else {
-					var fields = [],
-					colNames = $("#"+$t.p.id).jqGrid("getGridParam","colNames"),
-					colModel = $("#"+$t.p.id).jqGrid("getGridParam","colModel"),
-					stempl = ['eq','ne','lt','le','gt','ge','bw','bn','in','ni','ew','en','cn','nc'],
-					j,pos,k,oprtr=[];
-					if (p.sopt !==null) {
-						k=0;
-						for(j=0;j<p.sopt.length;j++) {
-							if( (pos= $.inArray(p.sopt[j],stempl)) != -1 ){
-								oprtr[k] = {op:p.sopt[j],text: p.odata[pos]};
-								k++;
-							}
-						}
-					} else {
-						for(j=0;j<stempl.length;j++) {
-							oprtr[j] = {op:stempl[j],text: p.odata[j]};
-						}
-					}
-				    $.each(colModel, function(i, v) {
-				        var searchable = (typeof v.search === 'undefined') ?  true: v.search ,
-				        hidden = (v.hidden === true),
-						soptions = $.extend({}, {text: colNames[i], itemval: v.index || v.name}, this.searchoptions),
-						ignoreHiding = (soptions.searchhidden === true);
-						if(typeof soptions.sopt !== 'undefined') {
-							k=0;
-							soptions.ops =[];
-							if(soptions.sopt.length>0) {
-								for(j=0;j<soptions.sopt.length;j++) {
-									if( (pos= $.inArray(soptions.sopt[j],stempl)) != -1 ){
-										soptions.ops[k] = {op:soptions.sopt[j],text: p.odata[pos]};
-										k++;
-									}
-								}
-							}
-						}
-						if(typeof(this.stype) === 'undefined') { this.stype='text'; }
-						if(this.stype == 'select') {
-							if ( soptions.dataUrl !== undefined) {}
-							else {
-								var eov;
-								if(soptions.value) {
-									eov = soptions.value;
-								} else if(this.editoptions) {
-									eov = this.editoptions.value;
-								}
-								if(eov) {
-									soptions.dataValues =[];
-									if(typeof(eov) === 'string') {
-										var so = eov.split(";"),sv;
-										for(j=0;j<so.length;j++) {
-											sv = so[j].split(":");
-											soptions.dataValues[j] ={value:sv[0],text:sv[1]};
-										}
-									} else if (typeof(eov) === 'object') {
-										j=0;
-										for (var key in eov) {
-											if(eov.hasOwnProperty(key)) {
-												soptions.dataValues[j] ={value:key,text:eov[key]};
-												j++;
-											}
-										}
-									}
-								}
-							}
-						}
-				        if ((ignoreHiding && searchable) || (searchable && !hidden)) {
-							fields.push(soptions);
-						}
-					});
-					if(fields.length>0){
-						$("<div id='"+fid+"' role='dialog' tabindex='-1'></div>").insertBefore("#gview_"+$t.p.id);
-						// Before we create searchFilter we need to decide if we want to get back a string or a JS object.
-						//  see http://github.com/tonytomov/jqGrid/issues/#issue/36 for background on the issue.
-						// If p.stringResult is defined, it was explisitly passed to us by user. Honor the choice, whatever it is.
-						if (p.stringResult===undefined) {
-							// to provide backward compatibility, inferring stringResult value from multipleSearch
-							p.stringResult = p.multipleSearch;
-						}
-						// we preserve the return value here to retain access to .add() and other good methods of search form.
-						$t.SearchFilter = $("#"+fid).searchFilter(fields, { groupOps: p.groupOps, operators: oprtr, onClose:hideFilter, resetText: p.Reset, searchText: p.Find, windowTitle: p.caption,  rulesText:p.rulesText, matchText:p.matchText, onSearch: searchFilters, onReset: resetFilters,stringResult:p.stringResult, ajaxSelectOptions: $.extend({},$.jgrid.ajaxOptions,$t.p.ajaxSelectOptions ||{}), clone: p.cloneSearchRowOnAdd });
-						$(".ui-widget-overlay","#"+fid).remove();
-						if($t.p.direction=="rtl") { $(".ui-closer","#"+fid).css("float","left"); }
-						if (p.drag===true) {
-							$("#"+fid+" table thead tr:first td:first").css('cursor','move');
-							if(jQuery.fn.jqDrag) {
-								$("#"+fid).jqDrag($("#"+fid+" table thead tr:first td:first"));
-							} else {
-								try {
-									$("#"+fid).draggable({handle: $("#"+fid+" table thead tr:first td:first")});
-								} catch (e) {}
-							}
-						}
-						if(p.multipleSearch === false) {
-							$(".ui-del, .ui-add, .ui-del, .ui-add-last, .matchText, .rulesText", "#"+fid).hide();
-							$("select[name='groupOp']","#"+fid).hide();
-						}
-                        if (p.multipleSearch === true && p.loadDefaults === true) {
-                            applyDefaultFilters($t, p);
-                        }
-						if ( $.isFunction(p.onInitializeSearch) ) { p.onInitializeSearch( $("#"+fid) ); }
-						if ( $.isFunction(p.beforeShowSearch) ) {
-							showFrm = p.beforeShowSearch($("#"+fid));
-							if(typeof(showFrm) == "undefined") {
-								showFrm = true;
-							}
-						}
-						if(showFrm === false) { return; }
-						showFilter();
-						if( $.isFunction(p.afterShowSearch) ) { p.afterShowSearch($("#"+fid)); }
-						if(p.closeOnEscape===true){
-							$("#"+fid).keydown( function( e ) {
-								if( e.which == 27 ) {
-									hideFilter($("#"+fid));
-								}
-								if (e.which == 13) {
-									$(".ui-search", this).click();
-								}
-							});
-						}
-					}
-				}
-			}
-		});
-	},
-	// methods taken from grid.custom.
-	updateGridRows : function (data, rowidname, jsonreader) {
-		var nm, success=false, title;
-		this.each(function(){
-			var t = this, vl, ind, srow, sid;
-			if(!t.grid) {return false;}
-			if(!rowidname) { rowidname = "id"; }
-			if( data  && data.length >0 ) {
-				$(data).each(function(j){
-					srow = this;
-					ind = t.rows.namedItem(srow[rowidname]);
-					if(ind) {
-						sid = srow[rowidname];
-						if(jsonreader === true){
-							if(t.p.jsonReader.repeatitems === true) {
-								if(t.p.jsonReader.cell) {srow = srow[t.p.jsonReader.cell];}
-								for (var k=0;k<srow.length;k++) {
-									vl = t.formatter( sid, srow[k], k, srow, 'edit');
-									title = t.p.colModel[k].title ? {"title":$.jgrid.stripHtml(vl)} : {};
-									if(t.p.treeGrid===true && nm == t.p.ExpandColumn) {
-										$("td:eq("+k+") > span:first",ind).html(vl).attr(title);
-									} else {
-										$("td:eq("+k+")",ind).html(vl).attr(title);
-									}
-								}
-								success = true;
-								return true;
-							}
-						}
-						$(t.p.colModel).each(function(i){
-							nm = jsonreader===true ? this.jsonmap || this.name :this.name;
-							if( srow[nm] !== undefined) {
-								vl = t.formatter( sid, srow[nm], i, srow, 'edit');
-								title = this.title ? {"title":$.jgrid.stripHtml(vl)} : {};
-								if(t.p.treeGrid===true && nm == t.p.ExpandColumn) {
-									$("td:eq("+i+") > span:first",ind).html(vl).attr(title);
-								} else {
-									$("td:eq("+i+")",ind).html(vl).attr(title);
-								}
-								success = true;
-							}
-						});
-					}
-				});
-			}
-		});
-		return success;
-	},
-	// Form search - sorry for this method. Instead use ne jqFilter method.
-	filterGrid : function(gridid,p){
-		p = $.extend({
-			gridModel : false,
-			gridNames : false,
-			gridToolbar : false,
-			filterModel: [], // label/name/stype/defval/surl/sopt
-			formtype : "horizontal", // horizontal/vertical
-			autosearch: true, // if set to false a serch button should be enabled.
-			formclass: "filterform",
-			tableclass: "filtertable",
-			buttonclass: "filterbutton",
-			searchButton: "Search",
-			clearButton: "Clear",
-			enableSearch : false,
-			enableClear: false,
-			beforeSearch: null,
-			afterSearch: null,
-			beforeClear: null,
-			afterClear: null,
-			url : '',
-			marksearched: true
-		},p  || {});
-		return this.each(function(){
-			var self = this;
-			this.p = p;
-			if(this.p.filterModel.length === 0 && this.p.gridModel===false) { alert("No filter is set"); return;}
-			if( !gridid) {alert("No target grid is set!"); return;}
-			this.p.gridid = gridid.indexOf("#") != -1 ? gridid : "#"+gridid;
-			var gcolMod = $(this.p.gridid).jqGrid("getGridParam",'colModel');
-			if(gcolMod) {
-				if( this.p.gridModel === true) {
-					var thegrid = $(this.p.gridid)[0];
-					var sh;
-					// we should use the options search, edittype, editoptions
-					// additionally surl and defval can be added in grid colModel
-					$.each(gcolMod, function (i,n) {
-						var tmpFil = [];
-						this.search = this.search === false ? false : true;
-						if(this.editrules && this.editrules.searchhidden === true) {
-							sh = true;
-						} else {
-							if(this.hidden === true ) {
-								sh = false;
-							} else {
-								sh = true;
-							}
-						}
-						if( this.search === true && sh === true) {
-							if(self.p.gridNames===true) {
-								tmpFil.label = thegrid.p.colNames[i];
-							} else {
-								tmpFil.label = '';
-							}
-							tmpFil.name = this.name;
-							tmpFil.index = this.index || this.name;
-							// we support only text and selects, so all other to text
-							tmpFil.stype = this.edittype || 'text';
-							if(tmpFil.stype != 'select' ) {
-								tmpFil.stype = 'text';
-							}
-							tmpFil.defval = this.defval || '';
-							tmpFil.surl = this.surl || '';
-							tmpFil.sopt = this.editoptions || {};
-							tmpFil.width = this.width;
-							self.p.filterModel.push(tmpFil);
-						}
-					});
-				} else {
-					$.each(self.p.filterModel,function(i,n) {
-						for(var j=0;j<gcolMod.length;j++) {
-							if(this.name == gcolMod[j].name) {
-								this.index = gcolMod[j].index || this.name;
-								break;
-							}
-						}
-						if(!this.index) {
-							this.index = this.name;
-						}
-					});
-				}
-			} else {
-				alert("Could not get grid colModel"); return;
-			}
-			var triggerSearch = function() {
-				var sdata={}, j=0, v;
-				var gr = $(self.p.gridid)[0], nm;
-                gr.p.searchdata = {};
-				if($.isFunction(self.p.beforeSearch)){self.p.beforeSearch();}
-				$.each(self.p.filterModel,function(i,n){
-                    nm = this.index;
-					if(this.stype === 'select') {
-						v = $("select[name="+nm+"]",self).val();
-						if(v) {
-							sdata[nm] = v;
-							if(self.p.marksearched){
-								$("#jqgh_"+this.name,gr.grid.hDiv).addClass("dirty-cell");
-							}
-							j++;
-						} else {
-							if(self.p.marksearched){
-								$("#jqgh_"+this.name,gr.grid.hDiv).removeClass("dirty-cell");
-							}
-                               try {
-                                   delete gr.p.postData[this.index];
-                               } catch (e) {}
-						}
-					} else {
-						v = $("input[name="+nm+"]",self).val();
-						if(v) {
-							sdata[nm] = v;
-							if(self.p.marksearched){
-								$("#jqgh_"+this.name,gr.grid.hDiv).addClass("dirty-cell");
-							}
-							j++;
-						} else {
-							if(self.p.marksearched){
-								$("#jqgh_"+this.name,gr.grid.hDiv).removeClass("dirty-cell");
-							}
-								try {
-									delete gr.p.postData[this.index];
-                            } catch(x) {}
-						}
-					}
-				});
-				var sd =  j>0 ? true : false;
-                $.extend(gr.p.postData,sdata);
-				var saveurl;
-				if(self.p.url) {
-					saveurl = $(gr).jqGrid("getGridParam",'url');
-					$(gr).jqGrid("setGridParam",{url:self.p.url});
-				}
-			    $(gr).jqGrid("setGridParam",{search:sd}).trigger("reloadGrid",[{page:1}]);
-				if(saveurl) {$(gr).jqGrid("setGridParam",{url:saveurl});}
-				if($.isFunction(self.p.afterSearch)){self.p.afterSearch();}
-			};
-			var clearSearch = function(){
-				var sdata={}, v, j=0;
-				var gr = $(self.p.gridid)[0], nm;
-				if($.isFunction(self.p.beforeClear)){self.p.beforeClear();}
-				$.each(self.p.filterModel,function(i,n){
-                    nm = this.index;
-					v = (this.defval) ? this.defval : "";
-					if(!this.stype){this.stype='text';}
-					switch (this.stype) {
-						case 'select' :
-							var v1;
-							$("select[name="+nm+"] option",self).each(function (i){
-                                if(i===0) { this.selected = true; }
-								if ($(this).text() == v) {
-									this.selected = true;
-									v1 = $(this).val();
-									return false;
-								}
-							});
-							if(v1) {
-								// post the key and not the text
-								sdata[nm] = v1;
-								if(self.p.marksearched){
-									$("#jqgh_"+this.name,gr.grid.hDiv).addClass("dirty-cell");
-								}
-								j++;
-							} else {
-								if(self.p.marksearched){
-									$("#jqgh_"+this.name,gr.grid.hDiv).removeClass("dirty-cell");
-								}
-                                try {
-                                    delete gr.p.postData[this.index];
-                                } catch (e) {}
-							}
-							break;
-						case 'text':
-							$("input[name="+nm+"]",self).val(v);
-							if(v) {
-								sdata[nm] = v;
-								if(self.p.marksearched){
-									$("#jqgh_"+this.name,gr.grid.hDiv).addClass("dirty-cell");
-								}
-								j++;
-							} else {
-								if(self.p.marksearched){
-									$("#jqgh_"+this.name,gr.grid.hDiv).removeClass("dirty-cell");
-								}
-                                try {
-                                    delete gr.p.postData[this.index];
-                                } catch (k) {}
-							}
-                            break;
-					}
-				});
-				var sd =  j>0 ? true : false;
-                $.extend(gr.p.postData,sdata);
-				var saveurl;
-				if(self.p.url) {
-					saveurl = $(gr).jqGrid("getGridParam",'url');
-					$(gr).jqGrid("setGridParam",{url:self.p.url});
-				}
-				$(gr).jqGrid("setGridParam",{search:sd}).trigger("reloadGrid",[{page:1}]);
-				if(saveurl) {$(gr).jqGrid("setGridParam",{url:saveurl});}
-				if($.isFunction(self.p.afterClear)){self.p.afterClear();}
-			};
-			var tbl;
-			var formFill = function(){
-				var tr = document.createElement("tr");
-				var tr1, sb, cb,tl,td;
-				if(self.p.formtype=='horizontal'){
-					$(tbl).append(tr);
-				}
-				$.each(self.p.filterModel,function(i,n){
-					tl = document.createElement("td");
-					$(tl).append("<label for='"+this.name+"'>"+this.label+"</label>");
-					td = document.createElement("td");
-					var $t=this;
-					if(!this.stype) { this.stype='text';}
-					switch (this.stype)
-					{
-					case "select":
-						if(this.surl) {
-							// data returned should have already constructed html select
-							$(td).load(this.surl,function(){
-								if($t.defval) { $("select",this).val($t.defval); }
-								$("select",this).attr({name:$t.index || $t.name, id: "sg_"+$t.name});
-								if($t.sopt) { $("select",this).attr($t.sopt); }
-								if(self.p.gridToolbar===true && $t.width) {
-									$("select",this).width($t.width);
-								}
-								if(self.p.autosearch===true){
-									$("select",this).change(function(e){
-										triggerSearch();
-										return false;
-									});
-								}
-							});
-						} else {
-							// sopt to construct the values
-							if($t.sopt.value) {
-								var oSv = $t.sopt.value;
-								var elem = document.createElement("select");
-								$(elem).attr({name:$t.index || $t.name, id: "sg_"+$t.name}).attr($t.sopt);
-								var so, sv, ov;
-								if(typeof oSv === "string") {
-									so = oSv.split(";");
-									for(var k=0; k<so.length;k++){
-										sv = so[k].split(":");
-										ov = document.createElement("option");
-										ov.value = sv[0]; ov.innerHTML = sv[1];
-										if (sv[1]==$t.defval) { ov.selected ="selected"; }
-										elem.appendChild(ov);
-									}
-								} else if(typeof oSv === "object" ) {
-									for ( var key in oSv) {
-										if(oSv.hasOwnProperty(key)) {
-											i++;
-											ov = document.createElement("option");
-											ov.value = key; ov.innerHTML = oSv[key];
-											if (oSv[key]==$t.defval) { ov.selected ="selected"; }
-											elem.appendChild(ov);
-										}
-									}
-								}
-								if(self.p.gridToolbar===true && $t.width) {
-									$(elem).width($t.width);
-								}
-								$(td).append(elem);
-								if(self.p.autosearch===true){
-									$(elem).change(function(e){
-										triggerSearch();
-										return false;
-									});
-								}
-							}
-						}
-						break;
-					case 'text':
-						var df = this.defval ? this.defval: "";
-						$(td).append("<input type='text' name='"+(this.index || this.name)+"' id='sg_"+this.name+"' value='"+df+"'/>");
-						if($t.sopt) { $("input",td).attr($t.sopt); }
-						if(self.p.gridToolbar===true && $t.width) {
-							if($.browser.msie) {
-								$("input",td).width($t.width-4);
-							} else {
-								$("input",td).width($t.width-2);
-							}
-						}
-						if(self.p.autosearch===true){
-							$("input",td).keypress(function(e){
-								var key = e.charCode ? e.charCode : e.keyCode ? e.keyCode : 0;
-								if(key == 13){
-									triggerSearch();
-									return false;
-								}
-								return this;
-							});
-						}
-						break;
-					}
-					if(self.p.formtype=='horizontal'){
-						if(self.p.gridToolbar===true && self.p.gridNames===false) {
-							$(tr).append(td);
-						} else {
-							$(tr).append(tl).append(td);
-						}
-						$(tr).append(td);
-					} else {
-						tr1 = document.createElement("tr");
-						$(tr1).append(tl).append(td);
-						$(tbl).append(tr1);
-					}
-				});
-				td = document.createElement("td");
-				if(self.p.enableSearch === true){
-					sb = "<input type='button' id='sButton' class='"+self.p.buttonclass+"' value='"+self.p.searchButton+"'/>";
-					$(td).append(sb);
-					$("input#sButton",td).click(function(){
-						triggerSearch();
-						return false;
-					});
-				}
-				if(self.p.enableClear === true) {
-					cb = "<input type='button' id='cButton' class='"+self.p.buttonclass+"' value='"+self.p.clearButton+"'/>";
-					$(td).append(cb);
-					$("input#cButton",td).click(function(){
-						clearSearch();
-						return false;
-					});
-				}
-				if(self.p.enableClear === true || self.p.enableSearch === true) {
-					if(self.p.formtype=='horizontal') {
-						$(tr).append(td);
-					} else {
-						tr1 = document.createElement("tr");
-						$(tr1).append("<td>&#160;</td>").append(td);
-						$(tbl).append(tr1);
-					}
-				}
-			};
-			var frm = $("<form name='SearchForm' style=display:inline;' class='"+this.p.formclass+"'></form>");
-			tbl =$("<table class='"+this.p.tableclass+"' cellspacing='0' cellpading='0' border='0'><tbody></tbody></table>");
-			$(frm).append(tbl);
-			formFill();
-			$(this).append(frm);
-			this.triggerSearch = triggerSearch;
-			this.clearSearch = clearSearch;
-		});
-	}
-
-});
-})(jQuery);
diff --git a/addons/base/static/lib/jquery.jqGrid/plugins/grid.postext.js b/addons/base/static/lib/jquery.jqGrid/plugins/grid.postext.js
deleted file mode 100644
index 4901f808488..00000000000
--- a/addons/base/static/lib/jquery.jqGrid/plugins/grid.postext.js
+++ /dev/null
@@ -1,64 +0,0 @@
-;(function($){
-/**
- * jqGrid extension
- * Paul Tiseo ptiseo@wasteconsultants.com
- * 
- * Dual licensed under the MIT and GPL licenses:
- * http://www.opensource.org/licenses/mit-license.php
- * http://www.gnu.org/licenses/gpl-2.0.html
-**/ 
-$.jgrid.extend({
-	getPostData : function(){
-		var $t = this[0];
-		if(!$t.grid) { return; }
-		return $t.p.postData;
-	},
-	setPostData : function( newdata ) {
-		var $t = this[0];
-		if(!$t.grid) { return; }
-		// check if newdata is correct type
-		if ( typeof(newdata) === 'object' ) {
-			$t.p.postData = newdata;
-		}
-		else {
-			alert("Error: cannot add a non-object postData value. postData unchanged.");
-		}
-	},
-	appendPostData : function( newdata ) { 
-		var $t = this[0];
-		if(!$t.grid) { return; }
-		// check if newdata is correct type
-		if ( typeof(newdata) === 'object' ) {
-			$.extend($t.p.postData, newdata);
-		}
-		else {
-			alert("Error: cannot append a non-object postData value. postData unchanged.");
-		}
-	},
-	setPostDataItem : function( key, val ) {
-		var $t = this[0];
-		if(!$t.grid) { return; }
-		$t.p.postData[key] = val;
-	},
-	getPostDataItem : function( key ) {
-		var $t = this[0];
-		if(!$t.grid) { return; }
-		return $t.p.postData[key];
-	},
-	removePostDataItem : function( key ) {
-		var $t = this[0];
-		if(!$t.grid) { return; }
-		delete $t.p.postData[key];
-	},
-	getUserData : function(){
-		var $t = this[0];
-		if(!$t.grid) { return; }
-		return $t.p.userData;
-	},
-	getUserDataItem : function( key ) {
-		var $t = this[0];
-		if(!$t.grid) { return; }
-		return $t.p.userData[key];
-	}
-});
-})(jQuery);
\ No newline at end of file
diff --git a/addons/base/static/lib/jquery.jqGrid/plugins/grid.setcolumns.js b/addons/base/static/lib/jquery.jqGrid/plugins/grid.setcolumns.js
deleted file mode 100644
index 6bc8ddfdaa4..00000000000
--- a/addons/base/static/lib/jquery.jqGrid/plugins/grid.setcolumns.js
+++ /dev/null
@@ -1,126 +0,0 @@
-;(function($){
-/**
- * jqGrid extension for manipulating columns properties
- * Piotr Roznicki roznicki@o2.pl
- * http://www.roznicki.prv.pl
- * Dual licensed under the MIT and GPL licenses:
- * http://www.opensource.org/licenses/mit-license.php
- * http://www.gnu.org/licenses/gpl-2.0.html
-**/
-$.jgrid.extend({
-	setColumns : function(p) {
-		p = $.extend({
-			top : 0,
-			left: 0,
-			width: 200,
-			height: 'auto',
-			dataheight: 'auto',
-			modal: false,
-			drag: true,
-			beforeShowForm: null,
-			afterShowForm: null,
-			afterSubmitForm: null,
-			closeOnEscape : true,
-			ShrinkToFit : false,
-			jqModal : false,
-			saveicon: [true,"left","ui-icon-disk"],
-			closeicon: [true,"left","ui-icon-close"],
-			onClose : null,
-			colnameview : true,
-			closeAfterSubmit : true,
-			updateAfterCheck : false,
-			recreateForm : false
-		}, $.jgrid.col, p ||{});
-		return this.each(function(){
-			var $t = this;
-			if (!$t.grid ) { return; }
-			var onBeforeShow = typeof p.beforeShowForm === 'function' ? true: false;
-			var onAfterShow = typeof p.afterShowForm === 'function' ? true: false;
-			var onAfterSubmit = typeof p.afterSubmitForm === 'function' ? true: false;			
-			var gID = $t.p.id,
-			dtbl = "ColTbl_"+gID,
-			IDs = {themodal:'colmod'+gID,modalhead:'colhd'+gID,modalcontent:'colcnt'+gID, scrollelm: dtbl};
-			if(p.recreateForm===true && $("#"+IDs.themodal).html() != null) {
-				$("#"+IDs.themodal).remove();
-			}
-			if ( $("#"+IDs.themodal).html() != null ) {
-				if(onBeforeShow) { p.beforeShowForm($("#"+dtbl)); }
-				$.jgrid.viewModal("#"+IDs.themodal,{gbox:"#gbox_"+gID,jqm:p.jqModal, jqM:false, modal:p.modal});
-				if(onAfterShow) { p.afterShowForm($("#"+dtbl)); }
-			} else {
-				var dh = isNaN(p.dataheight) ? p.dataheight : p.dataheight+"px";
-				var formdata = "<div id='"+dtbl+"' class='formdata' style='width:100%;overflow:auto;position:relative;height:"+dh+";'>";
-				formdata += "<table class='ColTable' cellspacing='1' cellpading='2' border='0'><tbody>";
-				for(i=0;i<this.p.colNames.length;i++){
-					if(!$t.p.colModel[i].hidedlg) { // added from T. Tomov
-						formdata += "<tr><td style='white-space: pre;'><input type='checkbox' style='margin-right:5px;' id='col_" + this.p.colModel[i].name + "' class='cbox' value='T' " + 
-						((this.p.colModel[i].hidden===false)?"checked":"") + "/>" +  "<label for='col_" + this.p.colModel[i].name + "'>" + this.p.colNames[i] + ((p.colnameview) ? " (" + this.p.colModel[i].name + ")" : "" )+ "</label></td></tr>";
-					}
-				}
-				formdata += "</tbody></table></div>"
-				var bS  = !p.updateAfterCheck ? "<a href='javascript:void(0)' id='dData' class='fm-button ui-state-default ui-corner-all'>"+p.bSubmit+"</a>" : "",
-				bC  ="<a href='javascript:void(0)' id='eData' class='fm-button ui-state-default ui-corner-all'>"+p.bCancel+"</a>";
-				formdata += "<table border='0' class='EditTable' id='"+dtbl+"_2'><tbody><tr style='display:block;height:3px;'><td></td></tr><tr><td class='DataTD ui-widget-content'></td></tr><tr><td class='ColButton EditButton'>"+bS+"&#160;"+bC+"</td></tr></tbody></table>";
-				p.gbox = "#gbox_"+gID;
-				$.jgrid.createModal(IDs,formdata,p,"#gview_"+$t.p.id,$("#gview_"+$t.p.id)[0]);
-				if(p.saveicon[0]==true) {
-					$("#dData","#"+dtbl+"_2").addClass(p.saveicon[1] == "right" ? 'fm-button-icon-right' : 'fm-button-icon-left')
-					.append("<span class='ui-icon "+p.saveicon[2]+"'></span>");
-				}
-				if(p.closeicon[0]==true) {
-					$("#eData","#"+dtbl+"_2").addClass(p.closeicon[1] == "right" ? 'fm-button-icon-right' : 'fm-button-icon-left')
-					.append("<span class='ui-icon "+p.closeicon[2]+"'></span>");
-				}
-				if(!p.updateAfterCheck) {
-					$("#dData","#"+dtbl+"_2").click(function(e){
-						for(i=0;i<$t.p.colModel.length;i++){
-							if(!$t.p.colModel[i].hidedlg) { // added from T. Tomov
-								var nm = $t.p.colModel[i].name.replace(/\./g, "\\.");
-								if($("#col_" + nm,"#"+dtbl).attr("checked")) {
-									$($t).jqGrid("showCol",$t.p.colModel[i].name);
-									$("#col_" + nm,"#"+dtbl).attr("defaultChecked",true); // Added from T. Tomov IE BUG
-								} else {
-									$($t).jqGrid("hideCol",$t.p.colModel[i].name);
-									$("#col_" + nm,"#"+dtbl).attr("defaultChecked",""); // Added from T. Tomov IE BUG
-								}
-							}
-						}
-						if(p.ShrinkToFit===true) {
-							$($t).jqGrid("setGridWidth",$t.grid.width-0.001,true);
-						}
-						if(p.closeAfterSubmit) $.jgrid.hideModal("#"+IDs.themodal,{gb:"#gbox_"+gID,jqm:p.jqModal, onClose: p.onClose});
-						if (onAfterSubmit) { p.afterSubmitForm($("#"+dtbl)); }
-						return false;
-					});
-				} else {
-					$(":input","#"+dtbl).click(function(e){
-						var cn = this.id.substr(4);
-						if(cn){
-							if(this.checked) {
-								$($t).jqGrid("showCol",cn);
-							} else {
-								$($t).jqGrid("hideCol",cn);
-							}
-							if(p.ShrinkToFit===true) {
-								$($t).jqGrid("setGridWidth",$t.grid.width-0.001,true);
-							}
-						}
-						return this;
-					});
-				}
-				$("#eData", "#"+dtbl+"_2").click(function(e){
-					$.jgrid.hideModal("#"+IDs.themodal,{gb:"#gbox_"+gID,jqm:p.jqModal, onClose: p.onClose});
-					return false;
-				});
-				$("#dData, #eData","#"+dtbl+"_2").hover(
-				   function(){$(this).addClass('ui-state-hover');}, 
-				   function(){$(this).removeClass('ui-state-hover');}
-				);				
-				if(onBeforeShow) { p.beforeShowForm($("#"+dtbl)); }
-				$.jgrid.viewModal("#"+IDs.themodal,{gbox:"#gbox_"+gID,jqm:p.jqModal, jqM: true, modal:p.modal});
-				if(onAfterShow) { p.afterShowForm($("#"+dtbl)); }
-			}
-		});
-	}
-});
-})(jQuery);
\ No newline at end of file
diff --git a/addons/base/static/lib/jquery.jqGrid/plugins/jquery.contextmenu.js b/addons/base/static/lib/jquery.jqGrid/plugins/jquery.contextmenu.js
deleted file mode 100644
index 779578f5dfd..00000000000
--- a/addons/base/static/lib/jquery.jqGrid/plugins/jquery.contextmenu.js
+++ /dev/null
@@ -1,144 +0,0 @@
-/*
- * ContextMenu - jQuery plugin for right-click context menus
- *
- * Author: Chris Domigan
- * Contributors: Dan G. Switzer, II
- * Parts of this plugin are inspired by Joern Zaefferer's Tooltip plugin
- *
- * Dual licensed under the MIT and GPL licenses:
- *   http://www.opensource.org/licenses/mit-license.php
- *   http://www.gnu.org/licenses/gpl.html
- *
- * Version: r2
- * Date: 16 July 2007
- *
- * For documentation visit http://www.trendskitchens.co.nz/jquery/contextmenu/
- *
- */
-
-(function($) {
-
- 	var menu, shadow, trigger, content, hash, currentTarget;
-  var defaults = {
-    menuStyle: {
-      listStyle: 'none',
-      padding: '1px',
-      margin: '0px',
-      backgroundColor: '#fff',
-      border: '1px solid #999',
-      width: '100px'
-    },
-    itemStyle: {
-      margin: '0px',
-      color: '#000',
-      display: 'block',
-      cursor: 'default',
-      padding: '3px',
-      border: '1px solid #fff',
-      backgroundColor: 'transparent'
-    },
-    itemHoverStyle: {
-      border: '1px solid #0a246a',
-      backgroundColor: '#b6bdd2'
-    },
-    eventPosX: 'pageX',
-    eventPosY: 'pageY',
-    shadow : true,
-    onContextMenu: null,
-    onShowMenu: null
- 	};
-
-  $.fn.contextMenu = function(id, options) {
-    if (!menu) {                                      // Create singleton menu
-      menu = $('<div id="jqContextMenu"></div>')
-               .hide()
-               .css({position:'absolute', zIndex:'500'})
-               .appendTo('body')
-               .bind('click', function(e) {
-                 e.stopPropagation();
-               });
-    }
-    if (!shadow) {
-      shadow = $('<div></div>')
-                 .css({backgroundColor:'#000',position:'absolute',opacity:0.2,zIndex:499})
-                 .appendTo('body')
-                 .hide();
-    }
-    hash = hash || [];
-    hash.push({
-      id : id,
-      menuStyle: $.extend({}, defaults.menuStyle, options.menuStyle || {}),
-      itemStyle: $.extend({}, defaults.itemStyle, options.itemStyle || {}),
-      itemHoverStyle: $.extend({}, defaults.itemHoverStyle, options.itemHoverStyle || {}),
-      bindings: options.bindings || {},
-      shadow: options.shadow || options.shadow === false ? options.shadow : defaults.shadow,
-      onContextMenu: options.onContextMenu || defaults.onContextMenu,
-      onShowMenu: options.onShowMenu || defaults.onShowMenu,
-      eventPosX: options.eventPosX || defaults.eventPosX,
-      eventPosY: options.eventPosY || defaults.eventPosY
-    });
-
-    var index = hash.length - 1;
-    $(this).bind('contextmenu', function(e) {
-      // Check if onContextMenu() defined
-      var bShowContext = (!!hash[index].onContextMenu) ? hash[index].onContextMenu(e) : true;
-      if (bShowContext) display(index, this, e, options);
-      return false;
-    });
-    return this;
-  };
-
-  function display(index, trigger, e, options) {
-    var cur = hash[index];
-    content = $('#'+cur.id).find('ul:first').clone(true);
-    content.css(cur.menuStyle).find('li').css(cur.itemStyle).hover(
-      function() {
-        $(this).css(cur.itemHoverStyle);
-      },
-      function(){
-        $(this).css(cur.itemStyle);
-      }
-    ).find('img').css({verticalAlign:'middle',paddingRight:'2px'});
-
-    // Send the content to the menu
-    menu.html(content);
-
-    // if there's an onShowMenu, run it now -- must run after content has been added
-		// if you try to alter the content variable before the menu.html(), IE6 has issues
-		// updating the content
-    if (!!cur.onShowMenu) menu = cur.onShowMenu(e, menu);
-
-    $.each(cur.bindings, function(id, func) {
-      $('#'+id, menu).bind('click', function(e) {
-        hide();
-        func(trigger, currentTarget);
-      });
-    });
-
-    menu.css({'left':e[cur.eventPosX],'top':e[cur.eventPosY]}).show();
-    if (cur.shadow) shadow.css({width:menu.width(),height:menu.height(),left:e.pageX+2,top:e.pageY+2}).show();
-    $(document).one('click', hide);
-  }
-
-  function hide() {
-    menu.hide();
-    shadow.hide();
-  }
-
-  // Apply defaults
-  $.contextMenu = {
-    defaults : function(userDefaults) {
-      $.each(userDefaults, function(i, val) {
-        if (typeof val == 'object' && defaults[i]) {
-          $.extend(defaults[i], val);
-        }
-        else defaults[i] = val;
-      });
-    }
-  };
-
-})(jQuery);
-
-$(function() {
-  $('div.contextMenu').hide();
-});
\ No newline at end of file
diff --git a/addons/base/static/lib/jquery.jqGrid/plugins/jquery.searchFilter.js b/addons/base/static/lib/jquery.jqGrid/plugins/jquery.searchFilter.js
deleted file mode 100644
index 0bbb0c422b9..00000000000
--- a/addons/base/static/lib/jquery.jqGrid/plugins/jquery.searchFilter.js
+++ /dev/null
@@ -1,716 +0,0 @@
-/* Plugin:      searchFilter v1.2.9
- * Author:      Kasey Speakman (kasey@cornerspeed.com)
- * License:     Dual Licensed, MIT and GPL v2 (http://www.gnu.org/licenses/gpl-2.0.html)
- *
- * REQUIREMENTS:
- *    jQuery 1.3+           (http://jquery.com/)
- *    A Themeroller Theme   (http://jqueryui.com/themeroller/)
- *
- * SECURITY WARNING
- *    You should always implement server-side checking to ensure that
- *    the query will fail when forged/invalid data is received.
- *    Clever users can send any value they want through JavaScript and HTTP POST/GET.
- *
- * THEMES
- *    Simply include the CSS file for your Themeroller theme.
- *
- * DESCRIPTION
- *     This plugin creates a new searchFilter object in the specified container
- *
- * INPUT TYPE
- *     fields:  an array of field objects. each object has the following properties:
- *              text: a string containing the display name of the field (e.g. "Field 1")
- *              itemval: a string containing the actual field name (e.g. "field1")
- *              optional properties:
- *                  ops: an array of operators in the same format as jQuery.fn.searchFilter.defaults.operators
- *                       that is: [ { op: 'gt', text: 'greater than'}, { op:'lt', text: 'less than'}, ... ]
- *                       if not specified, the passed-in options used, and failting that, jQuery.fn.searchFilter.defaults.operators will be used
- *                  *** NOTE ***
- *                  Specifying a dataUrl or dataValues property means that a <select ...> (drop-down-list) will be generated
- *                  instead of a text input <input type='text'.../> where the user would normally type in their search data
- *                  ************
- *                  dataUrl: a url that will return the html select for this field, this url will only be called once for this field
- *                  dataValues: the possible values for this field in the form [ { text: 'Data Display Text', value: 'data_actual_value' }, { ... } ]
- *                  dataInit: a function that you can use to initialize the data field. this function is passed the jQuery-fied data element
- *                  dataEvents: list of events to apply to the data element. uses $("#id").bind(type, [data], fn) to bind events to data element
- *              *** JSON of this object could look like this: ***
- *               var fields = [
- *                 {
- *                   text: 'Field Display Name',
- *                   itemval: 'field_actual_name',
- *                   // below this are optional values
- *                   ops: [ // this format is the same as jQuery.fn.searchFilter.defaults.operators
- *                     { op: 'gt', text: 'greater than' },
- *                     { op: 'lt', text: 'less than' }
- *                   ],
- *                   dataUrl: 'http://server/path/script.php?propName=propValue', // using this creates a select for the data input instead of an input type='text'
- *                   dataValues: [ // using this creates a select for the data input instead of an input type='text'
- *                     { text: 'Data Value Display Name', value: 'data_actual_value' },
- *                     { ... }
- *                   ],
- *                   dataInit: function(jElem) { jElem.datepicker(options); },
- *                   dataEvents: [ // these are the same options that you pass to $("#id").bind(type, [data], fn)
- *                     { type: 'click', data: { i: 7 }, fn: function(e) { console.log(e.data.i); } },
- *                     { type: 'keypress', fn: function(e) { console.log('keypress'); } }
- *                   ]
- *                 },
- *                 { ... }
- *               ]
- *     options: name:value properties containing various creation options
- *              see jQuery.fn.searchFilter.defaults for the overridable options
- *
- * RETURN TYPE: This plugin returns a SearchFilter object, which has additional SearchFilter methods:
- *     Methods
- *         add:    Adds a filter. added to the end of the list unless a jQuery event object or valid row number is passed.
- *         del:    Removes a filter. removed from the end of the list unless a jQuery event object or valid row number is passed.
- *         reset:  resets filters back to original state (only one blank filter), and calls onReset
- *         search: puts the search rules into an object and calls onSearch with it
- *         close:  calls the onClose event handler
- *
- * USAGE
- *     HTML
- *         <head>
- *             ...
- *             <script src="path/to/jquery.min.js" type="text/javascript"></script>
- *             <link href="path/to/themeroller.css" rel="Stylesheet" type="text/css" />
- *             <script src="path/to/jquery.searchFilter.js" type="text/javascript"></script>
- *             <link href="path/to/jquery.searchFilter.css" rel="Stylesheet" type="text/css" />
- *             ...
- *         </head>
- *         <body>
- *             ...
- *             <div id='mySearch'></div>
- *             ...
- *         </body>
- *     JQUERY
- *         Methods
- *             initializing: $("#mySearch").searchFilter([{text: "Field 1", value: "field1"},{text: "Field 2", value: "field2"}], {onSearch: myFilterRuleReceiverFn, onReset: myFilterResetFn });
- *         Manual Methods (there's no need to call these methods unless you are trying to manipulate searchFilter with script)
- *             add:          $("#mySearch").searchFilter().add();     // appends a blank filter
- *                           $("#mySearch").searchFilter().add(0);    // copies the first filter as second
- *             del:          $("#mySearch").searchFilter().del();     // removes the bottom filter
- *                           $("#mySearch").searchFilter().del(1);    // removes the second filter
- *             search:       $("#mySearch").searchFilter().search();  // invokes onSearch, passing it a ruleGroup object
- *             reset:        $("#mySearch").searchFilter().reset();   // resets rules and invokes onReset
- *             close:        $("#mySearch").searchFilter().close();   // without an onClose handler, equivalent to $("#mySearch").hide();
- * 
- * NOTE: You can get the jQuery object back from the SearchFilter object by chaining .$
- *     Example
- *         $("#mySearch").searchFilter().add().add().reset().$.hide();
- *     Verbose Example
- *         $("#mySearch")      // gets jQuery object for the HTML element with id="mySearch"
- *             .searchFilter() // gets the SearchFilter object for an existing search filter
- *             .add()          // adds a new filter to the end of the list
- *             .add()          // adds another new filter to the end of the list
- *             .reset()        // resets filters back to original state, triggers onReset
- *             .$              // returns jQuery object for $("#mySearch")
- *             .hide();        // equivalent to $("#mySearch").hide();
- */
-
-jQuery.fn.searchFilter = function(fields, options) {
-
-    function SearchFilter(jQ, fields, options) {
-
-
-        //---------------------------------------------------------------
-        // PUBLIC VARS
-        //---------------------------------------------------------------
-
-        this.$ = jQ; // makes the jQuery object available as .$ from the return value
-
-
-        //---------------------------------------------------------------
-        // PUBLIC FUNCTIONS
-        //---------------------------------------------------------------
-
-        this.add = function(i) {
-            if (i == null) jQ.find(".ui-add-last").click();
-            else jQ.find(".sf:eq(" + i + ") .ui-add").click();
-            return this;
-        };
-
-        this.del = function(i) {
-            if (i == null) jQ.find(".sf:last .ui-del").click();
-            else jQ.find(".sf:eq(" + i + ") .ui-del").click();
-            return this;
-        };
-
-        this.search = function(e) {
-            jQ.find(".ui-search").click();
-            return this;
-        };
-
-        this.reset = function(o) {
-            if(o===undefined) o = false;
-            jQ.find(".ui-reset").trigger('click',[o]);
-            return this;
-        };
-
-        this.close = function() {
-            jQ.find(".ui-closer").click();
-            return this;
-        };
-
-
-
-        //---------------------------------------------------------------
-        // "CONSTRUCTOR" (in air quotes)
-        //---------------------------------------------------------------
-
-        if (fields != null) { // type coercion matches undefined as well as null
-
-
-            //---------------------------------------------------------------
-            // UTILITY FUNCTIONS
-            //---------------------------------------------------------------
-
-            function hover() {
-                jQuery(this).toggleClass("ui-state-hover");
-                return false;
-            }
-
-            function active(e) {
-                jQuery(this).toggleClass("ui-state-active", (e.type == "mousedown"));
-                return false;
-            }
-
-            function buildOpt(value, text) {
-                return "<option value='" + value + "'>" + text + "</option>";
-            }
-
-            function buildSel(className, options, isHidden) {
-                return "<select class='" + className + "'" + (isHidden ? " style='display:none;'" : "") + ">" + options + "</select>";
-            }
-
-            function initData(selector, fn) {
-                var jElem = jQ.find("tr.sf td.data " + selector);
-                if (jElem[0] != null)
-                    fn(jElem);
-            }
-
-            function bindDataEvents(selector, events) {
-                var jElem = jQ.find("tr.sf td.data " + selector);
-                if (jElem[0] != null) {
-                    jQuery.each(events, function() {
-                        if (this.data != null)
-                            jElem.bind(this.type, this.data, this.fn);
-                        else
-                            jElem.bind(this.type, this.fn);
-                    });
-                }
-            }
-
-
-            //---------------------------------------------------------------
-            // SUPER IMPORTANT PRIVATE VARS
-            //---------------------------------------------------------------
-
-            // copies jQuery.fn.searchFilter.defaults.options properties onto an empty object, then options onto that
-            var opts = jQuery.extend({}, jQuery.fn.searchFilter.defaults, options);
-
-            // this is keeps track of the last asynchronous setup
-            var highest_late_setup = -1;
-
-
-            //---------------------------------------------------------------
-            // CREATION PROCESS STARTS
-            //---------------------------------------------------------------
-
-            // generate the global ops
-            var gOps_html = "";
-            jQuery.each(opts.groupOps, function() { gOps_html += buildOpt(this.op, this.text); });
-            gOps_html = "<select name='groupOp'>" + gOps_html + "</select>";
-
-            /* original content - doesn't minify very well
-            jQ
-            .html("") // clear any old content
-            .addClass("ui-searchFilter") // add classes
-            .append( // add content
-            "\
-            <div class='ui-widget-overlay' style='z-index: -1'>&nbsp;</div>\
-            <table class='ui-widget-content ui-corner-all'>\
-            <thead>\
-            <tr>\
-            <td colspan='5' class='ui-widget-header ui-corner-all' style='line-height: 18px;'>\
-            <div class='ui-closer ui-state-default ui-corner-all ui-helper-clearfix' style='float: right;'>\
-            <span class='ui-icon ui-icon-close'></span>\
-            </div>\
-            " + opts.windowTitle + "\
-            </td>\
-            </tr>\
-            </thead>\
-            <tbody>\
-            <tr class='sf'>\
-            <td class='fields'></td>\
-            <td class='ops'></td>\
-            <td class='data'></td>\
-            <td><div class='ui-del ui-state-default ui-corner-all'><span class='ui-icon ui-icon-minus'></span></div></td>\
-            <td><div class='ui-add ui-state-default ui-corner-all'><span class='ui-icon ui-icon-plus'></span></div></td>\
-            </tr>\
-            <tr>\
-            <td colspan='5' class='divider'><div>&nbsp;</div></td>\
-            </tr>\
-            </tbody>\
-            <tfoot>\
-            <tr>\
-            <td colspan='3'>\
-            <span class='ui-reset ui-state-default ui-corner-all' style='display: inline-block; float: left;'><span class='ui-icon ui-icon-arrowreturnthick-1-w' style='float: left;'></span><span style='line-height: 18px; padding: 0 7px 0 3px;'>" + opts.resetText + "</span></span>\
-            <span class='ui-search ui-state-default ui-corner-all' style='display: inline-block; float: right;'><span class='ui-icon ui-icon-search' style='float: left;'></span><span style='line-height: 18px; padding: 0 7px 0 3px;'>" + opts.searchText + "</span></span>\
-            <span class='matchText'>" + opts.matchText + "</span> \
-            " + gOps_html + " \
-            <span class='rulesText'>" + opts.rulesText + "</span>\
-            </td>\
-            <td>&nbsp;</td>\
-            <td><div class='ui-add-last ui-state-default ui-corner-all'><span class='ui-icon ui-icon-plusthick'></span></div></td>\
-            </tr>\
-            </tfoot>\
-            </table>\
-            ");
-            /* end hard-to-minify code */
-            /* begin easier to minify code */
-            jQ.html("").addClass("ui-searchFilter").append("<div class='ui-widget-overlay' style='z-index: -1'>&#160;</div><table class='ui-widget-content ui-corner-all'><thead><tr><td colspan='5' class='ui-widget-header ui-corner-all' style='line-height: 18px;'><div class='ui-closer ui-state-default ui-corner-all ui-helper-clearfix' style='float: right;'><span class='ui-icon ui-icon-close'></span></div>" + opts.windowTitle + "</td></tr></thead><tbody><tr class='sf'><td class='fields'></td><td class='ops'></td><td class='data'></td><td><div class='ui-del ui-state-default ui-corner-all'><span class='ui-icon ui-icon-minus'></span></div></td><td><div class='ui-add ui-state-default ui-corner-all'><span class='ui-icon ui-icon-plus'></span></div></td></tr><tr><td colspan='5' class='divider'><hr class='ui-widget-content' style='margin:1px'/></td></tr></tbody><tfoot><tr><td colspan='3'><span class='ui-reset ui-state-default ui-corner-all' style='display: inline-block; float: left;'><span class='ui-icon ui-icon-arrowreturnthick-1-w' style='float: left;'></span><span style='line-height: 18px; padding: 0 7px 0 3px;'>" + opts.resetText + "</span></span><span class='ui-search ui-state-default ui-corner-all' style='display: inline-block; float: right;'><span class='ui-icon ui-icon-search' style='float: left;'></span><span style='line-height: 18px; padding: 0 7px 0 3px;'>" + opts.searchText + "</span></span><span class='matchText'>" + opts.matchText + "</span> " + gOps_html + " <span class='rulesText'>" + opts.rulesText + "</span></td><td>&#160;</td><td><div class='ui-add-last ui-state-default ui-corner-all'><span class='ui-icon ui-icon-plusthick'></span></div></td></tr></tfoot></table>");
-            /* end easier-to-minify code */
-
-            var jRow = jQ.find("tr.sf");
-            var jFields = jRow.find("td.fields");
-            var jOps = jRow.find("td.ops");
-            var jData = jRow.find("td.data");
-
-            // generate the defaults
-            var default_ops_html = "";
-            jQuery.each(opts.operators, function() { default_ops_html += buildOpt(this.op, this.text); });
-            default_ops_html = buildSel("default", default_ops_html, true);
-            jOps.append(default_ops_html);
-            var default_data_html = "<input type='text' class='default' style='display:none;' />";
-            jData.append(default_data_html);
-
-            // generate the field list as a string
-            var fields_html = "";
-            var has_custom_ops = false;
-            var has_custom_data = false;
-            jQuery.each(fields, function(i) {
-                var field_num = i;
-                fields_html += buildOpt(this.itemval, this.text);
-                // add custom ops if they exist
-                if (this.ops != null) {
-                    has_custom_ops = true;
-                    var custom_ops = "";
-                    jQuery.each(this.ops, function() { custom_ops += buildOpt(this.op, this.text); });
-                    custom_ops = buildSel("field" + field_num, custom_ops, true);
-                    jOps.append(custom_ops);
-                }
-                // add custom data if it is given
-                if (this.dataUrl != null) {
-                    if (i > highest_late_setup) highest_late_setup = i;
-                    has_custom_data = true;
-                    var dEvents = this.dataEvents;
-                    var iEvent = this.dataInit;
-                    var bs = this.buildSelect;
-                    jQuery.ajax(jQuery.extend({
-                        url : this.dataUrl,
-                        complete: function(data) {
-                            var $d;
-                            if(bs != null) $d =jQuery("<div />").append(bs(data));
-                            else $d = jQuery("<div />").append(data.responseText);
-                            $d.find("select").addClass("field" + field_num).hide();
-                            jData.append($d.html());
-                            if (iEvent) initData(".field" + i, iEvent);
-                            if (dEvents) bindDataEvents(".field" + i, dEvents);
-                            if (i == highest_late_setup) { // change should get called no more than twice when this searchFilter is constructed
-                                jQ.find("tr.sf td.fields select[name='field']").change();
-                            }
-                        }
-                    },opts.ajaxSelectOptions));
-                } else if (this.dataValues != null) {
-                    has_custom_data = true;
-                    var custom_data = "";
-                    jQuery.each(this.dataValues, function() { custom_data += buildOpt(this.value, this.text); });
-                    custom_data = buildSel("field" + field_num, custom_data, true);
-                    jData.append(custom_data);
-                } else if (this.dataEvents != null || this.dataInit != null) {
-                    has_custom_data = true;
-                    var custom_data = "<input type='text' class='field" + field_num + "' />";
-                    jData.append(custom_data);
-                }
-                // attach events to data if they exist
-                if (this.dataInit != null && i != highest_late_setup)
-                    initData(".field" + i, this.dataInit);
-                if (this.dataEvents != null && i != highest_late_setup)
-                    bindDataEvents(".field" + i, this.dataEvents);
-            });
-            fields_html = "<select name='field'>" + fields_html + "</select>";
-            jFields.append(fields_html);
-
-            // setup the field select with an on-change event if there are custom ops or data
-            var jFSelect = jFields.find("select[name='field']");
-            if (has_custom_ops) jFSelect.change(function(e) {
-                var index = e.target.selectedIndex;
-                var td = jQuery(e.target).parents("tr.sf").find("td.ops");
-                td.find("select").removeAttr("name").hide(); // disown and hide all elements
-                var jElem = td.find(".field" + index);
-                if (jElem[0] == null) jElem = td.find(".default"); // if there's not an element for that field, use the default one
-                jElem.attr("name", "op").show();
-                return false;
-            });
-            else jOps.find(".default").attr("name", "op").show();
-            if (has_custom_data) jFSelect.change(function(e) {
-                var index = e.target.selectedIndex;
-                var td = jQuery(e.target).parents("tr.sf").find("td.data");
-                td.find("select,input").removeClass("vdata").hide(); // disown and hide all elements
-                var jElem = td.find(".field" + index);
-                if (jElem[0] == null) jElem = td.find(".default"); // if there's not an element for that field, use the default one
-                jElem.show().addClass("vdata");
-                return false;
-            });
-            else jData.find(".default").show().addClass("vdata");
-            // go ahead and call the change event and setup the ops and data values
-            if (has_custom_ops || has_custom_data) jFSelect.change();
-
-            // bind events
-            jQ.find(".ui-state-default").hover(hover, hover).mousedown(active).mouseup(active); // add hover/active effects to all buttons
-            jQ.find(".ui-closer").click(function(e) {
-                opts.onClose(jQuery(jQ.selector));
-                return false;
-            });
-            jQ.find(".ui-del").click(function(e) {
-                var row = jQuery(e.target).parents(".sf");
-                if (row.siblings(".sf").length > 0) { // doesn't remove if there's only one filter left
-                    if (opts.datepickerFix === true && jQuery.fn.datepicker !== undefined)
-                        row.find(".hasDatepicker").datepicker("destroy"); // clean up datepicker's $.data mess
-                    row.remove(); // also unbinds
-                } else { // resets the filter if it's the last one
-                    row.find("select[name='field']")[0].selectedIndex = 0;
-                    row.find("select[name='op']")[0].selectedIndex = 0;
-                    row.find(".data input").val(""); // blank all input values
-                    row.find(".data select").each(function() { this.selectedIndex = 0; }); // select first option on all selects
-                    row.find("select[name='field']").change(function(event){event.stopPropagation();}); // trigger any change events
-                }
-                return false;
-            });
-            jQ.find(".ui-add").click(function(e) {
-                var row = jQuery(e.target).parents(".sf");
-                var newRow = row.clone(true).insertAfter(row);
-                newRow.find(".ui-state-default").removeClass("ui-state-hover ui-state-active");
-                if (opts.clone) {
-                    newRow.find("select[name='field']")[0].selectedIndex = row.find("select[name='field']")[0].selectedIndex;
-                    var stupid_browser = (newRow.find("select[name='op']")[0] == null); // true for IE6
-                    if (!stupid_browser)
-                        newRow.find("select[name='op']").focus()[0].selectedIndex = row.find("select[name='op']")[0].selectedIndex;
-                    var jElem = newRow.find("select.vdata");
-                    if (jElem[0] != null) // select doesn't copy it's selected index when cloned
-                        jElem[0].selectedIndex = row.find("select.vdata")[0].selectedIndex;
-                } else {
-                    newRow.find(".data input").val(""); // blank all input values
-                    newRow.find("select[name='field']").focus();
-                }
-                if (opts.datepickerFix === true && jQuery.fn.datepicker !== undefined) { // using $.data to associate data with document elements is Not Good
-                    row.find(".hasDatepicker").each(function() {
-                        var settings = jQuery.data(this, "datepicker").settings;
-                        newRow.find("#" + this.id).unbind().removeAttr("id").removeClass("hasDatepicker").datepicker(settings);
-                    });
-                }
-                newRow.find("select[name='field']").change(function(event){event.stopPropagation();} );
-                return false;
-            });
-            jQ.find(".ui-search").click(function(e) {
-                var ui = jQuery(jQ.selector); // pointer to search box wrapper element
-                var ruleGroup;
-                var group_op = ui.find("select[name='groupOp'] :selected").val(); // puls "AND" or "OR"
-                if (!opts.stringResult) {
-                    ruleGroup = {
-                        groupOp: group_op,
-                        rules: []
-                    };
-                } else {
-                    ruleGroup = "{\"groupOp\":\"" + group_op + "\",\"rules\":[";
-                }
-                ui.find(".sf").each(function(i) {
-                    var tField = jQuery(this).find("select[name='field'] :selected").val();
-                    var tOp = jQuery(this).find("select[name='op'] :selected").val();
-                    var tData = jQuery(this).find("input.vdata,select.vdata :selected").val();
-                    tData += "";
-                    if (!opts.stringResult) {
-                        ruleGroup.rules.push({
-                            field: tField,
-                            op: tOp,
-                            data: tData
-                        });
-                    } else {
-						tData = tData.replace(/\\/g,'\\\\').replace(/\"/g,'\\"');
-                        if (i > 0) ruleGroup += ",";
-                        ruleGroup += "{\"field\":\"" + tField + "\",";
-                        ruleGroup += "\"op\":\"" + tOp + "\",";
-                        ruleGroup += "\"data\":\"" + tData + "\"}";
-                    }
-                });
-                if (opts.stringResult) ruleGroup += "]}";
-                opts.onSearch(ruleGroup);
-                return false;
-            });
-            jQ.find(".ui-reset").click(function(e,op) {
-                var ui = jQuery(jQ.selector);
-                ui.find(".ui-del").click(); // removes all filters, resets the last one
-                ui.find("select[name='groupOp']")[0].selectedIndex = 0; // changes the op back to the default one
-                opts.onReset(op);
-                return false;
-            });
-            jQ.find(".ui-add-last").click(function() {
-                var row = jQuery(jQ.selector + " .sf:last");
-                var newRow = row.clone(true).insertAfter(row);
-                newRow.find(".ui-state-default").removeClass("ui-state-hover ui-state-active");
-                newRow.find(".data input").val(""); // blank all input values
-                newRow.find("select[name='field']").focus();
-                if (opts.datepickerFix === true && jQuery.fn.datepicker !== undefined) { // using $.data to associate data with document elements is Not Good
-                    row.find(".hasDatepicker").each(function() {
-                        var settings = jQuery.data(this, "datepicker").settings;
-                        newRow.find("#" + this.id).unbind().removeAttr("id").removeClass("hasDatepicker").datepicker(settings);
-                    });
-                }
-                newRow.find("select[name='field']").change(function(event){event.stopPropagation();});
-                return false;
-            });
-
-            this.setGroupOp = function(setting) {
-                /* a "setter" for groupping argument.
-                 *  ("AND" or "OR")
-                 *
-                 * Inputs:
-                 *  setting - a string
-                 *
-                 * Returns:
-                 *  Does not return anything. May add success / failure reporting in future versions.
-                 *
-                 *  author: Daniel Dotsenko (dotsa@hotmail.com)
-                 */
-                selDOMobj = jQ.find("select[name='groupOp']")[0];
-                var indexmap = {}, l = selDOMobj.options.length, i;
-                for (i=0; i<l; i++) {
-                    indexmap[selDOMobj.options[i].value] = i;
-                }
-                selDOMobj.selectedIndex = indexmap[setting];
-                jQuery(selDOMobj).change(function(event){event.stopPropagation();});
-            };
-
-            this.setFilter = function(settings) {
-                /* a "setter" for an arbitrary SearchFilter's filter line.
-                 * designed to abstract the DOM manipulations required to infer
-                 * a particular filter is a fit to the search box.
-                 *
-                 * Inputs:
-                 *  settings - an "object" (dictionary)
-                 *   index (optional*) (to be implemented in the future) : signed integer index (from top to bottom per DOM) of the filter line to fill.
-                 *           Negative integers (rooted in -1 and lower) denote position of the line from the bottom.
-                 *   sfref (optional*) : DOM object referencing individual '.sf' (normally a TR element) to be populated. (optional)
-                 *   filter (mandatory) : object (dictionary) of form {'field':'field_value','op':'op_value','data':'data value'}
-                 *
-                 * * It is mandatory to have either index or sfref defined.
-                 *
-                 * Returns:
-                 *  Does not return anything. May add success / failure reporting in future versions.
-                 *
-                 *  author: Daniel Dotsenko (dotsa@hotmail.com)
-                 */
-
-                var o = settings['sfref'], filter = settings['filter'];
-                
-                // setting up valueindexmap that we will need to manipulate SELECT elements.
-                var fields = [], i, j , l, lj, li,
-                    valueindexmap = {};
-                    // example of valueindexmap:
-                    // {'field1':{'index':0,'ops':{'eq':0,'ne':1}},'fieldX':{'index':1,'ops':{'eq':0,'ne':1},'data':{'true':0,'false':1}}},
-                    // if data is undefined it's a INPUT field. If defined, it's SELECT
-                selDOMobj = o.find("select[name='field']")[0];
-                for (i=0, l=selDOMobj.options.length; i<l; i++) {
-                    valueindexmap[selDOMobj.options[i].value] = {'index':i,'ops':{}};
-                    fields.push(selDOMobj.options[i].value);
-                }
-                for (i=0, li=fields.length; i < li; i++) {
-                    selDOMobj = o.find(".ops > select[class='field"+i+"']")[0];
-                    if (selDOMobj) {
-                        for (j=0, lj=selDOMobj.options.length; j<lj; j++) {
-                            valueindexmap[fields[i]]['ops'][selDOMobj.options[j].value] = j;
-                        }
-                    }
-                    selDOMobj = o.find(".data > select[class='field"+i+"']")[0];
-                    if (selDOMobj) {
-                        valueindexmap[fields[i]]['data'] = {}; // this setting is the flag that 'data' is contained in a SELECT
-                        for (j=0, lj=selDOMobj.options.length; j<lj; j++) {
-                            valueindexmap[fields[i]]['data'][selDOMobj.options[j].value] = j;
-                        }
-                    }
-                } // done populating valueindexmap
-
-                // preparsing the index values for SELECT elements.
-                var fieldvalue, fieldindex, opindex, datavalue, dataindex;
-                fieldvalue = filter['field'];
-				if (valueindexmap[fieldvalue]) {
-					fieldindex = valueindexmap[fieldvalue]['index'];
-				}
-                if (fieldindex != null) {
-                    opindex = valueindexmap[fieldvalue]['ops'][filter['op']];
-                    if(opindex === undefined) {
-                        for(i=0,li=options.operators.length; i<li;i++) {
-                            if(options.operators[i].op == filter.op ){
-                                opindex = i;
-                                break;
-                            }
-                        }
-                    }
-                    datavalue = filter['data'];
-                    if (valueindexmap[fieldvalue]['data'] == null) {
-                        dataindex = -1; // 'data' is not SELECT, Making the var 'defined'
-                    } else {
-                        dataindex = valueindexmap[fieldvalue]['data'][datavalue]; // 'undefined' may come from here.
-                    }
-                }
-                // only if values for 'field' and 'op' and 'data' are 'found' in mapping...
-                if (fieldindex != null && opindex != null && dataindex != null) {
-                    o.find("select[name='field']")[0].selectedIndex = fieldindex;
-                    o.find("select[name='field']").change();
-                    o.find("select[name='op']")[0].selectedIndex = opindex;
-                    o.find("input.vdata").val(datavalue); // if jquery does not find any INPUT, it does not set any. This means we deal with SELECT
-                    o = o.find("select.vdata")[0];
-                    if (o) {
-                        o.selectedIndex = dataindex;
-                    }
-					return true
-                } else {
-					return false
-				}
-            }; // end of this.setFilter fn
-        } // end of if fields != null
-    }
-    return new SearchFilter(this, fields, options);
-};
-
-jQuery.fn.searchFilter.version = '1.2.9';
-
-/* This property contains the default options */
-jQuery.fn.searchFilter.defaults = {
-
-    /*
-     * PROPERTY
-     * TYPE:        boolean 
-     * DESCRIPTION: clone a row if it is added from an existing row
-     *              when false, any new added rows will be blank.
-     */
-    clone: true,
-
-    /*
-     * PROPERTY
-     * TYPE:        boolean 
-     * DESCRIPTION: current version of datepicker uses a data store,
-     *              which is incompatible with $().clone(true)
-     */
-    datepickerFix: true,
-
-    /*
-     * FUNCTION
-     * DESCRIPTION: the function that will be called when the user clicks Reset
-     * INPUT TYPE:  JS object if stringResult is false, otherwise is JSON string
-     */
-    onReset: function(data) { alert("Reset Clicked. Data Returned: " + data) },
-
-    /*
-     * FUNCTION
-     * DESCRIPTION: the function that will be called when the user clicks Search
-     * INPUT TYPE:  JS object if stringResult is false, otherwise is JSON string
-     */
-    onSearch: function(data) { alert("Search Clicked. Data Returned: " + data) },
-
-    /*
-     * FUNCTION
-     * DESCRIPTION: the function that will be called when the user clicks the Closer icon
-     *              or the close() function is called
-     *              if left null, it simply does a .hide() on the searchFilter
-     * INPUT TYPE:  a jQuery object for the searchFilter
-     */
-    onClose: function(jElem) { jElem.hide(); },
-
-    /* 
-     * PROPERTY
-     * TYPE:        array of objects, each object has the properties op and text 
-     * DESCRIPTION: the selectable operators that are applied between rules
-     *              e.g. for {op:"AND", text:"all"}
-     *                  the search filter box will say: match all rules
-     *                  the server should interpret this as putting the AND op between each rule:
-     *                      rule1 AND rule2 AND rule3
-     *              text will be the option text, and op will be the option value
-     */
-    groupOps: [
-        { op: "AND", text: "all" },
-        { op: "OR",  text: "any" }
-    ],
-
-
-    /* 
-     * PROPERTY
-     * TYPE:        array of objects, each object has the properties op and text 
-     * DESCRIPTION: the operators that will appear as drop-down options
-     *              text will be the option text, and op will be the option value
-     */
-    operators: [
-        { op: "eq", text: "is equal to" },
-        { op: "ne", text: "is not equal to" },
-        { op: "lt", text: "is less than" },
-        { op: "le", text: "is less or equal to" },
-        { op: "gt", text: "is greater than" },
-        { op: "ge", text: "is greater or equal to" },
-        { op: "in", text: "is in" },
-        { op: "ni", text: "is not in" },
-        { op: "bw", text: "begins with" },
-        { op: "bn", text: "does not begin with" },
-        { op: "ew", text: "ends with" },
-        { op: "en", text: "does not end with" },
-        { op: "cn", text: "contains" },
-        { op: "nc", text: "does not contain" }
-    ],
-
-    /*
-     * PROPERTY
-     * TYPE:        string
-     * DESCRIPTION: part of the phrase: _match_ ANY/ALL rules
-     */
-    matchText: "match",
-
-    /*
-     * PROPERTY
-     * TYPE:        string
-     * DESCRIPTION: part of the phrase: match ANY/ALL _rules_
-     */
-    rulesText: "rules",
-
-    /*
-     * PROPERTY
-     * TYPE:        string
-     * DESCRIPTION: the text that will be displayed in the reset button
-     */
-    resetText: "Reset",
-    
-    /*
-     * PROPERTY
-     * TYPE:        string
-     * DESCRIPTION: the text that will be displayed in the search button
-     */
-    searchText: "Search",
-    
-    /*
-     * PROPERTY
-     * TYPE:        boolean
-     * DESCRIPTION: a flag that, when set, will make the onSearch and onReset return strings instead of objects
-     */
-    stringResult: true,    
-    
-    /*
-     * PROPERTY
-     * TYPE:        string
-     * DESCRIPTION: the title of the searchFilter window
-     */
-    windowTitle: "Search Rules",
-    /*
-     * PROPERTY
-     * TYPE:        object
-     * DESCRIPTION: options to extend the ajax request
-     */
-    ajaxSelectOptions : {}
-}; /* end of searchFilter */
\ No newline at end of file
diff --git a/addons/base/static/lib/jquery.jqGrid/plugins/jquery.tablednd.js b/addons/base/static/lib/jquery.jqGrid/plugins/jquery.tablednd.js
deleted file mode 100644
index c0e00f168d4..00000000000
--- a/addons/base/static/lib/jquery.jqGrid/plugins/jquery.tablednd.js
+++ /dev/null
@@ -1,383 +0,0 @@
-/**
- * TableDnD plug-in for JQuery, allows you to drag and drop table rows
- * You can set up various options to control how the system will work
- * Copyright (c) Denis Howlett <denish@isocra.com>
- * Licensed like jQuery, see http://docs.jquery.com/License.
- *
- * Configuration options:
- * 
- * onDragStyle
- *     This is the style that is assigned to the row during drag. There are limitations to the styles that can be
- *     associated with a row (such as you can't assign a border--well you can, but it won't be
- *     displayed). (So instead consider using onDragClass.) The CSS style to apply is specified as
- *     a map (as used in the jQuery css(...) function).
- * onDropStyle
- *     This is the style that is assigned to the row when it is dropped. As for onDragStyle, there are limitations
- *     to what you can do. Also this replaces the original style, so again consider using onDragClass which
- *     is simply added and then removed on drop.
- * onDragClass
- *     This class is added for the duration of the drag and then removed when the row is dropped. It is more
- *     flexible than using onDragStyle since it can be inherited by the row cells and other content. The default
- *     is class is tDnD_whileDrag. So to use the default, simply customise this CSS class in your
- *     stylesheet.
- * onDrop
- *     Pass a function that will be called when the row is dropped. The function takes 2 parameters: the table
- *     and the row that was dropped. You can work out the new order of the rows by using
- *     table.rows.
- * onDragStart
- *     Pass a function that will be called when the user starts dragging. The function takes 2 parameters: the
- *     table and the row which the user has started to drag.
- * onAllowDrop
- *     Pass a function that will be called as a row is over another row. If the function returns true, allow 
- *     dropping on that row, otherwise not. The function takes 2 parameters: the dragged row and the row under
- *     the cursor. It returns a boolean: true allows the drop, false doesn't allow it.
- * scrollAmount
- *     This is the number of pixels to scroll if the user moves the mouse cursor to the top or bottom of the
- *     window. The page should automatically scroll up or down as appropriate (tested in IE6, IE7, Safari, FF2,
- *     FF3 beta
- * dragHandle
- *     This is the name of a class that you assign to one or more cells in each row that is draggable. If you
- *     specify this class, then you are responsible for setting cursor: move in the CSS and only these cells
- *     will have the drag behaviour. If you do not specify a dragHandle, then you get the old behaviour where
- *     the whole row is draggable.
- * 
- * Other ways to control behaviour:
- *
- * Add class="nodrop" to any rows for which you don't want to allow dropping, and class="nodrag" to any rows
- * that you don't want to be draggable.
- *
- * Inside the onDrop method you can also call $.tableDnD.serialize() this returns a string of the form
- * <tableID>[]=<rowID1>&<tableID>[]=<rowID2> so that you can send this back to the server. The table must have
- * an ID as must all the rows.
- *
- * Other methods:
- *
- * $("...").tableDnDUpdate() 
- * Will update all the matching tables, that is it will reapply the mousedown method to the rows (or handle cells).
- * This is useful if you have updated the table rows using Ajax and you want to make the table draggable again.
- * The table maintains the original configuration (so you don't have to specify it again).
- *
- * $("...").tableDnDSerialize()
- * Will serialize and return the serialized string as above, but for each of the matching tables--so it can be
- * called from anywhere and isn't dependent on the currentTable being set up correctly before calling
- *
- * Known problems:
- * - Auto-scoll has some problems with IE7  (it scrolls even when it shouldn't), work-around: set scrollAmount to 0
- * 
- * Version 0.2: 2008-02-20 First public version
- * Version 0.3: 2008-02-07 Added onDragStart option
- *                         Made the scroll amount configurable (default is 5 as before)
- * Version 0.4: 2008-03-15 Changed the noDrag/noDrop attributes to nodrag/nodrop classes
- *                         Added onAllowDrop to control dropping
- *                         Fixed a bug which meant that you couldn't set the scroll amount in both directions
- *                         Added serialize method
- * Version 0.5: 2008-05-16 Changed so that if you specify a dragHandle class it doesn't make the whole row
- *                         draggable
- *                         Improved the serialize method to use a default (and settable) regular expression.
- *                         Added tableDnDupate() and tableDnDSerialize() to be called when you are outside the table
- */
-jQuery.tableDnD = {
-    /** Keep hold of the current table being dragged */
-    currentTable : null,
-    /** Keep hold of the current drag object if any */
-    dragObject: null,
-    /** The current mouse offset */
-    mouseOffset: null,
-    /** Remember the old value of Y so that we don't do too much processing */
-    oldY: 0,
-
-    /** Actually build the structure */
-    build: function(options) {
-        // Set up the defaults if any
-
-        this.each(function() {
-            // This is bound to each matching table, set up the defaults and override with user options
-            this.tableDnDConfig = jQuery.extend({
-                onDragStyle: null,
-                onDropStyle: null,
-				// Add in the default class for whileDragging
-				onDragClass: "tDnD_whileDrag",
-                onDrop: null,
-                onDragStart: null,
-                scrollAmount: 5,
-				serializeRegexp: /[^\-]*$/, // The regular expression to use to trim row IDs
-				serializeParamName: null, // If you want to specify another parameter name instead of the table ID
-                dragHandle: null // If you give the name of a class here, then only Cells with this class will be draggable
-            }, options || {});
-            // Now make the rows draggable
-            jQuery.tableDnD.makeDraggable(this);
-        });
-
-        // Now we need to capture the mouse up and mouse move event
-        // We can use bind so that we don't interfere with other event handlers
-        jQuery(document)
-            .bind('mousemove', jQuery.tableDnD.mousemove)
-            .bind('mouseup', jQuery.tableDnD.mouseup);
-
-        // Don't break the chain
-        return this;
-    },
-
-    /** This function makes all the rows on the table draggable apart from those marked as "NoDrag" */
-    makeDraggable: function(table) {
-        var config = table.tableDnDConfig;
-		if (table.tableDnDConfig.dragHandle) {
-			// We only need to add the event to the specified cells
-			var cells = jQuery("td."+table.tableDnDConfig.dragHandle, table);
-			cells.each(function() {
-				// The cell is bound to "this"
-                jQuery(this).mousedown(function(ev) {
-                    jQuery.tableDnD.dragObject = this.parentNode;
-                    jQuery.tableDnD.currentTable = table;
-                    jQuery.tableDnD.mouseOffset = jQuery.tableDnD.getMouseOffset(this, ev);
-                    if (config.onDragStart) {
-                        // Call the onDrop method if there is one
-                        config.onDragStart(table, this);
-                    }
-                    return false;
-                });
-			})
-		} else {
-			// For backwards compatibility, we add the event to the whole row
-	        var rows = jQuery("tr", table); // get all the rows as a wrapped set
-	        rows.each(function() {
-				// Iterate through each row, the row is bound to "this"
-				var row = jQuery(this);
-				if (! row.hasClass("nodrag")) {
-	                row.mousedown(function(ev) {
-	                    if (ev.target.tagName == "TD") {
-	                        jQuery.tableDnD.dragObject = this;
-	                        jQuery.tableDnD.currentTable = table;
-	                        jQuery.tableDnD.mouseOffset = jQuery.tableDnD.getMouseOffset(this, ev);
-	                        if (config.onDragStart) {
-	                            // Call the onDrop method if there is one
-	                            config.onDragStart(table, this);
-	                        }
-	                        return false;
-	                    }
-	                }).css("cursor", "move"); // Store the tableDnD object
-				}
-			});
-		}
-	},
-
-	updateTables: function() {
-		this.each(function() {
-			// this is now bound to each matching table
-			if (this.tableDnDConfig) {
-				jQuery.tableDnD.makeDraggable(this);
-			}
-		})
-	},
-
-    /** Get the mouse coordinates from the event (allowing for browser differences) */
-    mouseCoords: function(ev){
-        if(ev.pageX || ev.pageY){
-            return {x:ev.pageX, y:ev.pageY};
-        }
-        return {
-            x:ev.clientX + document.body.scrollLeft - document.body.clientLeft,
-            y:ev.clientY + document.body.scrollTop  - document.body.clientTop
-        };
-    },
-
-    /** Given a target element and a mouse event, get the mouse offset from that element.
-        To do this we need the element's position and the mouse position */
-    getMouseOffset: function(target, ev) {
-        ev = ev || window.event;
-
-        var docPos    = this.getPosition(target);
-        var mousePos  = this.mouseCoords(ev);
-        return {x:mousePos.x - docPos.x, y:mousePos.y - docPos.y};
-    },
-
-    /** Get the position of an element by going up the DOM tree and adding up all the offsets */
-    getPosition: function(e){
-        var left = 0;
-        var top  = 0;
-        /** Safari fix -- thanks to Luis Chato for this! */
-        if (e.offsetHeight == 0) {
-            /** Safari 2 doesn't correctly grab the offsetTop of a table row
-            this is detailed here:
-            http://jacob.peargrove.com/blog/2006/technical/table-row-offsettop-bug-in-safari/
-            the solution is likewise noted there, grab the offset of a table cell in the row - the firstChild.
-            note that firefox will return a text node as a first child, so designing a more thorough
-            solution may need to take that into account, for now this seems to work in firefox, safari, ie */
-            e = e.firstChild; // a table cell
-        }
-		if (e && e.offsetParent) {
-        	while (e.offsetParent){
-            	left += e.offsetLeft;
-            	top  += e.offsetTop;
-            	e     = e.offsetParent;
-        	}
-
-        	left += e.offsetLeft;
-        	top  += e.offsetTop;
-        }
-
-        return {x:left, y:top};
-    },
-
-    mousemove: function(ev) {
-        if (jQuery.tableDnD.dragObject == null) {
-            return;
-        }
-
-        var dragObj = jQuery(jQuery.tableDnD.dragObject);
-        var config = jQuery.tableDnD.currentTable.tableDnDConfig;
-        var mousePos = jQuery.tableDnD.mouseCoords(ev);
-        var y = mousePos.y - jQuery.tableDnD.mouseOffset.y;
-        //auto scroll the window
-	    var yOffset = window.pageYOffset;
-	 	if (document.all) {
-	        // Windows version
-	        //yOffset=document.body.scrollTop;
-	        if (typeof document.compatMode != 'undefined' &&
-	             document.compatMode != 'BackCompat') {
-	           yOffset = document.documentElement.scrollTop;
-	        }
-	        else if (typeof document.body != 'undefined') {
-	           yOffset=document.body.scrollTop;
-	        }
-
-	    }
-		    
-		if (mousePos.y-yOffset < config.scrollAmount) {
-	    	window.scrollBy(0, -config.scrollAmount);
-	    } else {
-            var windowHeight = window.innerHeight ? window.innerHeight
-                    : document.documentElement.clientHeight ? document.documentElement.clientHeight : document.body.clientHeight;
-            if (windowHeight-(mousePos.y-yOffset) < config.scrollAmount) {
-                window.scrollBy(0, config.scrollAmount);
-            }
-        }
-
-
-        if (y != jQuery.tableDnD.oldY) {
-            // work out if we're going up or down...
-            var movingDown = y > jQuery.tableDnD.oldY;
-            // update the old value
-            jQuery.tableDnD.oldY = y;
-            // update the style to show we're dragging
-			if (config.onDragClass) {
-				dragObj.addClass(config.onDragClass);
-			} else {
-	            dragObj.css(config.onDragStyle);
-			}
-            // If we're over a row then move the dragged row to there so that the user sees the
-            // effect dynamically
-            var currentRow = jQuery.tableDnD.findDropTargetRow(dragObj, y);
-            if (currentRow) {
-                // TODO worry about what happens when there are multiple TBODIES
-                if (movingDown && jQuery.tableDnD.dragObject != currentRow) {
-                    jQuery.tableDnD.dragObject.parentNode.insertBefore(jQuery.tableDnD.dragObject, currentRow.nextSibling);
-                } else if (! movingDown && jQuery.tableDnD.dragObject != currentRow) {
-                    jQuery.tableDnD.dragObject.parentNode.insertBefore(jQuery.tableDnD.dragObject, currentRow);
-                }
-            }
-        }
-
-        return false;
-    },
-
-    /** We're only worried about the y position really, because we can only move rows up and down */
-    findDropTargetRow: function(draggedRow, y) {
-        var rows = jQuery.tableDnD.currentTable.rows;
-        for (var i=0; i<rows.length; i++) {
-            var row = rows[i];
-            var rowY    = this.getPosition(row).y;
-            var rowHeight = parseInt(row.offsetHeight)/2;
-            if (row.offsetHeight == 0) {
-                rowY = this.getPosition(row.firstChild).y;
-                rowHeight = parseInt(row.firstChild.offsetHeight)/2;
-            }
-            // Because we always have to insert before, we need to offset the height a bit
-            if ((y > rowY - rowHeight) && (y < (rowY + rowHeight))) {
-                // that's the row we're over
-				// If it's the same as the current row, ignore it
-				if (row == draggedRow) {return null;}
-                var config = jQuery.tableDnD.currentTable.tableDnDConfig;
-                if (config.onAllowDrop) {
-                    if (config.onAllowDrop(draggedRow, row)) {
-                        return row;
-                    } else {
-                        return null;
-                    }
-                } else {
-					// If a row has nodrop class, then don't allow dropping (inspired by John Tarr and Famic)
-                    var nodrop = jQuery(row).hasClass("nodrop");
-                    if (! nodrop) {
-                        return row;
-                    } else {
-                        return null;
-                    }
-                }
-                return row;
-            }
-        }
-        return null;
-    },
-
-    mouseup: function(e) {
-        if (jQuery.tableDnD.currentTable && jQuery.tableDnD.dragObject) {
-            var droppedRow = jQuery.tableDnD.dragObject;
-            var config = jQuery.tableDnD.currentTable.tableDnDConfig;
-            // If we have a dragObject, then we need to release it,
-            // The row will already have been moved to the right place so we just reset stuff
-			if (config.onDragClass) {
-	            jQuery(droppedRow).removeClass(config.onDragClass);
-			} else {
-	            jQuery(droppedRow).css(config.onDropStyle);
-			}
-            jQuery.tableDnD.dragObject   = null;
-            if (config.onDrop) {
-                // Call the onDrop method if there is one
-                config.onDrop(jQuery.tableDnD.currentTable, droppedRow);
-            }
-            jQuery.tableDnD.currentTable = null; // let go of the table too
-        }
-    },
-
-    serialize: function() {
-        if (jQuery.tableDnD.currentTable) {
-            return jQuery.tableDnD.serializeTable(jQuery.tableDnD.currentTable);
-        } else {
-            return "Error: No Table id set, you need to set an id on your table and every row";
-        }
-    },
-
-	serializeTable: function(table) {
-        var result = "";
-        var tableId = table.id;
-        var rows = table.rows;
-        for (var i=0; i<rows.length; i++) {
-            if (result.length > 0) result += "&";
-            var rowId = rows[i].id;
-            if (rowId && rowId && table.tableDnDConfig && table.tableDnDConfig.serializeRegexp) {
-                rowId = rowId.match(table.tableDnDConfig.serializeRegexp)[0];
-            }
-
-            result += tableId + '[]=' + rowId;
-        }
-        return result;
-	},
-
-	serializeTables: function() {
-        var result = "";
-        this.each(function() {
-			// this is now bound to each matching table
-			result += jQuery.tableDnD.serializeTable(this);
-		});
-        return result;
-    }
-
-}
-
-jQuery.fn.extend(
-	{
-		tableDnD : jQuery.tableDnD.build,
-		tableDnDUpdate : jQuery.tableDnD.updateTables,
-		tableDnDSerialize: jQuery.tableDnD.serializeTables
-	}
-);
\ No newline at end of file
diff --git a/addons/base/static/lib/jquery.jqGrid/plugins/ui.multiselect.css b/addons/base/static/lib/jquery.jqGrid/plugins/ui.multiselect.css
deleted file mode 100644
index 8ab18ef2c7b..00000000000
--- a/addons/base/static/lib/jquery.jqGrid/plugins/ui.multiselect.css
+++ /dev/null
@@ -1,30 +0,0 @@
-/* Multiselect
-----------------------------------*/
-
-.ui-multiselect { border: solid 1px; font-size: 0.8em; }
-.ui-multiselect ul { -moz-user-select: none; }
-.ui-multiselect li { margin: 0; padding: 0; cursor: default; line-height: 20px; height: 20px; font-size: 11px; list-style: none; }
-.ui-multiselect li a { color: #999; text-decoration: none; padding: 0; display: block; float: left; cursor: pointer;}
-.ui-multiselect li.ui-draggable-dragging { padding-left: 10px; }
-
-.ui-multiselect div.selected { position: relative; padding: 0; margin: 0; border: 0; float:left; }
-.ui-multiselect ul.selected { position: relative; padding: 0; overflow: auto; overflow-x: hidden; background: #fff; margin: 0; list-style: none; border: 0; position: relative; width: 100%; }
-.ui-multiselect ul.selected li { }
-
-.ui-multiselect div.available { position: relative; padding: 0; margin: 0; border: 0; float:left; border-left: 1px solid; }
-.ui-multiselect ul.available { position: relative; padding: 0; overflow: auto; overflow-x: hidden; background: #fff; margin: 0; list-style: none; border: 0; width: 100%; }
-.ui-multiselect ul.available li { padding-left: 10px; }
- 
-.ui-multiselect .ui-state-default { border: none; margin-bottom: 1px; position: relative; padding-left: 20px;}
-.ui-multiselect .ui-state-hover { border: none; }
-.ui-multiselect .ui-widget-header {border: none; font-size: 11px; margin-bottom: 1px;}
- 
-.ui-multiselect .add-all { float: right; padding: 7px;}
-.ui-multiselect .remove-all { float: right; padding: 7px;}
-.ui-multiselect .search { float: left; padding: 4px;}
-.ui-multiselect .count { float: left; padding: 7px;}
-
-.ui-multiselect li span.ui-icon-arrowthick-2-n-s { position: absolute; left: 2px; }
-.ui-multiselect li a.action { position: absolute; right: 2px; top: 2px; }
- 
-.ui-multiselect input.search { height: 14px; padding: 1px; opacity: 0.5; margin: 4px; width: 100px; }
\ No newline at end of file
diff --git a/addons/base/static/lib/jquery.jqGrid/plugins/ui.multiselect.js b/addons/base/static/lib/jquery.jqGrid/plugins/ui.multiselect.js
deleted file mode 100644
index fcbea81a392..00000000000
--- a/addons/base/static/lib/jquery.jqGrid/plugins/ui.multiselect.js
+++ /dev/null
@@ -1,314 +0,0 @@
-/*
- * jQuery UI Multiselect
- *
- * Authors:
- *  Michael Aufreiter (quasipartikel.at)
- *  Yanick Rochon (yanick.rochon[at]gmail[dot]com)
- * 
- * Dual licensed under the MIT (MIT-LICENSE.txt)
- * and GPL (GPL-LICENSE.txt) licenses.
- * 
- * http://www.quasipartikel.at/multiselect/
- *
- * 
- * Depends:
- *	ui.core.js
- *	ui.sortable.js
- *
- * Optional:
- * localization (http://plugins.jquery.com/project/localisation)
- * scrollTo (http://plugins.jquery.com/project/ScrollTo)
- * 
- * Todo:
- *  Make batch actions faster
- *  Implement dynamic insertion through remote calls
- */
-
-
-(function($) {
-
-$.widget("ui.multiselect", {
-	_init: function() {
-		this.element.hide();
-		this.id = this.element.attr("id");
-		this.container = $('<div class="ui-multiselect ui-helper-clearfix ui-widget"></div>').insertAfter(this.element);
-		this.count = 0; // number of currently selected options
-		this.selectedContainer = $('<div class="selected"></div>').appendTo(this.container);
-		this.availableContainer = $('<div class="available"></div>').appendTo(this.container);
-		this.selectedActions = $('<div class="actions ui-widget-header ui-helper-clearfix"><span class="count">0 '+$.ui.multiselect.locale.itemsCount+'</span><a href="#" class="remove-all">'+$.ui.multiselect.locale.removeAll+'</a></div>').appendTo(this.selectedContainer);
-		this.availableActions = $('<div class="actions ui-widget-header ui-helper-clearfix"><input type="text" class="search empty ui-widget-content ui-corner-all"/><a href="#" class="add-all">'+$.ui.multiselect.locale.addAll+'</a></div>').appendTo(this.availableContainer);
-		this.selectedList = $('<ul class="selected connected-list"><li class="ui-helper-hidden-accessible"></li></ul>').bind('selectstart', function(){return false;}).appendTo(this.selectedContainer);
-		this.availableList = $('<ul class="available connected-list"><li class="ui-helper-hidden-accessible"></li></ul>').bind('selectstart', function(){return false;}).appendTo(this.availableContainer);
-		
-		var that = this;
-
-		// set dimensions
-		this.container.width(this.element.width()+1);
-		this.selectedContainer.width(Math.floor(this.element.width()*this.options.dividerLocation));
-		this.availableContainer.width(Math.floor(this.element.width()*(1-this.options.dividerLocation)));
-
-		// fix list height to match <option> depending on their individual header's heights
-		this.selectedList.height(Math.max(this.element.height()-this.selectedActions.height(),1));
-		this.availableList.height(Math.max(this.element.height()-this.availableActions.height(),1));
-		
-		if ( !this.options.animated ) {
-			this.options.show = 'show';
-			this.options.hide = 'hide';
-		}
-		
-		// init lists
-		this._populateLists(this.element.find('option'));
-		
-		// make selection sortable
-		if (this.options.sortable) {
-			$("ul.selected").sortable({
-				placeholder: 'ui-state-highlight',
-				axis: 'y',
-				update: function(event, ui) {
-					// apply the new sort order to the original selectbox
-					that.selectedList.find('li').each(function() {
-						if ($(this).data('optionLink'))
-							$(this).data('optionLink').remove().appendTo(that.element);
-					});
-				},
-				receive: function(event, ui) {
-					ui.item.data('optionLink').attr('selected', true);
-					// increment count
-					that.count += 1;
-					that._updateCount();
-					// workaround, because there's no way to reference 
-					// the new element, see http://dev.jqueryui.com/ticket/4303
-					that.selectedList.children('.ui-draggable').each(function() {
-						$(this).removeClass('ui-draggable');
-						$(this).data('optionLink', ui.item.data('optionLink'));
-						$(this).data('idx', ui.item.data('idx'));
-						that._applyItemState($(this), true);
-					});
-			
-					// workaround according to http://dev.jqueryui.com/ticket/4088
-					setTimeout(function() { ui.item.remove(); }, 1);
-				}
-			});
-		}
-		
-		// set up livesearch
-		if (this.options.searchable) {
-			this._registerSearchEvents(this.availableContainer.find('input.search'));
-		} else {
-			$('.search').hide();
-		}
-		
-		// batch actions
-		$(".remove-all").click(function() {
-			that._populateLists(that.element.find('option').removeAttr('selected'));
-			return false;
-		});
-		$(".add-all").click(function() {
-			that._populateLists(that.element.find('option').attr('selected', 'selected'));
-			return false;
-		});
-	},
-	destroy: function() {
-		this.element.show();
-		this.container.remove();
-
-		$.widget.prototype.destroy.apply(this, arguments);
-	},
-	_populateLists: function(options) {
-		this.selectedList.children('.ui-element').remove();
-		this.availableList.children('.ui-element').remove();
-		this.count = 0;
-
-		var that = this;
-		var items = $(options.map(function(i) {
-	      var item = that._getOptionNode(this).appendTo(this.selected ? that.selectedList : that.availableList).show();
-
-			if (this.selected) that.count += 1;
-			that._applyItemState(item, this.selected);
-			item.data('idx', i);
-			return item[0];
-    }));
-		
-		// update count
-		this._updateCount();
-  },
-	_updateCount: function() {
-		this.selectedContainer.find('span.count').text(this.count+" "+$.ui.multiselect.locale.itemsCount);
-	},
-	_getOptionNode: function(option) {
-		option = $(option);
-		var node = $('<li class="ui-state-default ui-element" title="'+option.text()+'"><span class="ui-icon"/>'+option.text()+'<a href="#" class="action"><span class="ui-corner-all ui-icon"/></a></li>').hide();
-		node.data('optionLink', option);
-		return node;
-	},
-	// clones an item with associated data
-	// didn't find a smarter away around this
-	_cloneWithData: function(clonee) {
-		var clone = clonee.clone();
-		clone.data('optionLink', clonee.data('optionLink'));
-		clone.data('idx', clonee.data('idx'));
-		return clone;
-	},
-	_setSelected: function(item, selected) {
-		item.data('optionLink').attr('selected', selected);
-
-		if (selected) {
-			var selectedItem = this._cloneWithData(item);
-			item[this.options.hide](this.options.animated, function() { $(this).remove(); });
-			selectedItem.appendTo(this.selectedList).hide()[this.options.show](this.options.animated);
-			
-			this._applyItemState(selectedItem, true);
-			return selectedItem;
-		} else {
-			
-			// look for successor based on initial option index
-			var items = this.availableList.find('li'), comparator = this.options.nodeComparator;
-			var succ = null, i = item.data('idx'), direction = comparator(item, $(items[i]));
-
-			// TODO: test needed for dynamic list populating
-			if ( direction ) {
-				while (i>=0 && i<items.length) {
-					direction > 0 ? i++ : i--;
-					if ( direction != comparator(item, $(items[i])) ) {
-						// going up, go back one item down, otherwise leave as is
-						succ = items[direction > 0 ? i : i+1];
-						break;
-					}
-				}
-			} else {
-				succ = items[i];
-			}
-			
-			var availableItem = this._cloneWithData(item);
-			succ ? availableItem.insertBefore($(succ)) : availableItem.appendTo(this.availableList);
-			item[this.options.hide](this.options.animated, function() { $(this).remove(); });
-			availableItem.hide()[this.options.show](this.options.animated);
-			
-			this._applyItemState(availableItem, false);
-			return availableItem;
-		}
-	},
-	_applyItemState: function(item, selected) {
-		if (selected) {
-			if (this.options.sortable)
-				item.children('span').addClass('ui-icon-arrowthick-2-n-s').removeClass('ui-helper-hidden').addClass('ui-icon');
-			else
-				item.children('span').removeClass('ui-icon-arrowthick-2-n-s').addClass('ui-helper-hidden').removeClass('ui-icon');
-			item.find('a.action span').addClass('ui-icon-minus').removeClass('ui-icon-plus');
-			this._registerRemoveEvents(item.find('a.action'));
-			
-		} else {
-			item.children('span').removeClass('ui-icon-arrowthick-2-n-s').addClass('ui-helper-hidden').removeClass('ui-icon');
-			item.find('a.action span').addClass('ui-icon-plus').removeClass('ui-icon-minus');
-			this._registerAddEvents(item.find('a.action'));
-		}
-		
-		this._registerHoverEvents(item);
-	},
-	// taken from John Resig's liveUpdate script
-	_filter: function(list) {
-		var input = $(this);
-		var rows = list.children('li'),
-			cache = rows.map(function(){
-				
-				return $(this).text().toLowerCase();
-			});
-		
-		var term = $.trim(input.val().toLowerCase()), scores = [];
-		
-		if (!term) {
-			rows.show();
-		} else {
-			rows.hide();
-
-			cache.each(function(i) {
-				if (this.indexOf(term)>-1) { scores.push(i); }
-			});
-
-			$.each(scores, function() {
-				$(rows[this]).show();
-			});
-		}
-	},
-	_registerHoverEvents: function(elements) {
-		elements.removeClass('ui-state-hover');
-		elements.mouseover(function() {
-			$(this).addClass('ui-state-hover');
-		});
-		elements.mouseout(function() {
-			$(this).removeClass('ui-state-hover');
-		});
-	},
-	_registerAddEvents: function(elements) {
-		var that = this;
-		elements.click(function() {
-			var item = that._setSelected($(this).parent(), true);
-			that.count += 1;
-			that._updateCount();
-			return false;
-		})
-		// make draggable
-		.each(function() {
-			$(this).parent().draggable({
-	      connectToSortable: 'ul.selected',
-				helper: function() {
-					var selectedItem = that._cloneWithData($(this)).width($(this).width() - 50);
-					selectedItem.width($(this).width());
-					return selectedItem;
-				},
-				appendTo: '.ui-multiselect',
-				containment: '.ui-multiselect',
-				revert: 'invalid'
-	    });
-		});
-	},
-	_registerRemoveEvents: function(elements) {
-		var that = this;
-		elements.click(function() {
-			that._setSelected($(this).parent(), false);
-			that.count -= 1;
-			that._updateCount();
-			return false;
-		});
- 	},
-	_registerSearchEvents: function(input) {
-		var that = this;
-
-		input.focus(function() {
-			$(this).addClass('ui-state-active');
-		})
-		.blur(function() {
-			$(this).removeClass('ui-state-active');
-		})
-		.keypress(function(e) {
-			if (e.keyCode == 13)
-				return false;
-		})
-		.keyup(function() {
-			that._filter.apply(this, [that.availableList]);
-		});
-	}
-});
-		
-$.extend($.ui.multiselect, {
-	defaults: {
-		sortable: true,
-		searchable: true,
-		animated: 'fast',
-		show: 'slideDown',
-		hide: 'slideUp',
-		dividerLocation: 0.6,
-		nodeComparator: function(node1,node2) {
-			var text1 = node1.text(),
-			    text2 = node2.text();
-			return text1 == text2 ? 0 : (text1 < text2 ? -1 : 1);
-		}
-	},
-	locale: {
-		addAll:'Add all',
-		removeAll:'Remove all',
-		itemsCount:'items selected'
-	}
-});
-
-})(jQuery);
diff --git a/addons/base/static/lib/qweb/qweb.js b/addons/base/static/lib/qweb/qweb.js
index cb117a2a756..05dd9d65fe2 100644
--- a/addons/base/static/lib/qweb/qweb.js
+++ b/addons/base/static/lib/qweb/qweb.js
@@ -1,4 +1,4 @@
-// vim:set noet fdm=syntax fdl=0 fdc=3 fdn=2:
+// vim:set et fdm=syntax fdl=0 fdc=3 fdn=2:
 //---------------------------------------------------------
 // QWeb javascript
 //---------------------------------------------------------
@@ -166,7 +166,9 @@ var QWeb = {
         for (var an in g_att) {
             att += " " + an + '="' + this.escape_att(g_att[an]) + '"';
         }
-        return inner.length ? "<" + e.tagName + att + ">" + inner + "</" + e.tagName + ">" : "<" + e.tagName + att + "/>";
+        // Some IE versions have problems with closed tags
+        var opentag = !!t_att['opentag'] && this.eval_bool(t_att["opentag"], v);
+        return inner.length || opentag ? "<" + e.tagName + att + ">" + inner + "</" + e.tagName + ">" : "<" + e.tagName + att + "/>";
     },
     render_att_att:function(e, t_att, g_att, v, ext, av) {
         if (ext) {
@@ -386,9 +388,9 @@ var QWeb = {
         if (e.constructor == String) {
             e = this.load_xml(e);
         }
-        var ec = e.documentElement ? e.documentElement.childNodes
-               : e.childNodes ? e.childNodes
-               : [];
+        
+        var ec = e.documentElement ? e.documentElement.childNodes : ( e.childNodes ? e.childNodes : [] );
+
         for (var i = 0; i < ec.length; i++) {
             var n = ec[i];
             if (n.nodeType == 1) {
@@ -402,7 +404,7 @@ var QWeb = {
         if (e = this.templates[name]) {
             return this.render_node(e, v);
         }
-        throw new Error("template " + name + " not found");
+        return "template " + name + " not found";
     }
 };
 
diff --git a/addons/base/static/src/base.html b/addons/base/static/src/base.html
index 6ba297eef0e..83fbfcecefc 100644
--- a/addons/base/static/src/base.html
+++ b/addons/base/static/src/base.html
@@ -3,7 +3,7 @@
 <head>
     <meta http-equiv="content-type" content="text/html; charset=utf-8" />
     <title>OpenERP</title>
-    <link rel="shortcut icon" href="/base/static/openerp/img/favicon.ico" type="image/x-icon"/>
+    <link rel="shortcut icon" href="/base/static/src/img/favicon.ico" type="image/x-icon"/>
 
     <script type="text/javascript" src="/base/static/lib/LABjs/LAB.js"></script>
     <script type="text/javascript" src="/base/static/lib/underscore/underscore.js"></script>
@@ -13,9 +13,9 @@
     <script type="text/javascript" src="/base/static/lib/jquery.ui/js/jquery-ui-1.8.9.custom.min.js"></script>
     <script type="text/javascript" src="/base/static/lib/jquery.ui/js/jquery-ui-timepicker-addon.js"></script>
     <script type="text/javascript" src="/base/static/lib/jquery.ui.notify/js/jquery.notify.js"></script>
-    <script type="text/javascript" src="/base/static/lib/jquery.jqGrid/jquery.jqGrid.js"></script>
     <script type="text/javascript" src="/base/static/lib/jquery.superfish/js/hoverIntent.js"></script>
     <script type="text/javascript" src="/base/static/lib/jquery.superfish/js/superfish.js"></script>
+    <script type="text/javascript" src="/base/static/lib/jquery.ba-bbq/jquery.ba-bbq.js"></script>
     <script type="text/javascript" src="/base/static/src/js/base.js"></script>
     <script type="text/javascript" src="/base/static/src/js/chrome.js"></script>
     <script type="text/javascript" src="/base/static/src/js/data.js"></script>
@@ -23,19 +23,12 @@
     <script type="text/javascript" src="/base/static/src/js/list.js"></script>
     <script type="text/javascript" src="/base/static/src/js/search.js"></script>
     <script type="text/javascript" src="/base/static/src/js/views.js"></script>
-    <script type="text/javascript" src="/base_gantt/static/lib/dhtmlxGantt/codebase/dhtmlxcommon.js"></script>
-    <script type="text/javascript" src="/base_gantt/static/lib/dhtmlxGantt/codebase/dhtmlxgantt.js"></script>
-    <script type="text/javascript" src="/base_gantt/static/src/gantt.js"></script>
-    <script type="text/javascript" src="/base_graph/static/lib/dhtmlxGraph/codebase/dhtmlxchart.js"></script>
-	<script type="text/javascript" src="/base_graph/static/src/graph.js"></script>
 
-    <link rel="stylesheet" type="text/css" media="screen" href="/base_gantt/static/lib/dhtmlxGantt/codebase/dhtmlxgantt.css" />
     <link rel="stylesheet" type="text/css" media="screen" href="/base/static/lib/jquery.ui/css/smoothness/jquery-ui-1.8.9.custom.css" />
     <link rel="stylesheet" type="text/css" media="screen" href="/base/static/lib/jquery.ui.notify/css/ui.notify.css" />
-    <link rel="stylesheet" type="text/css" media="screen" href="/base/static/lib/jquery.jqGrid/css/ui.jqgrid.css" />
     <link rel="stylesheet" type="text/css" href="/base/static/lib/jquery.superfish/css/superfish.css" media="screen">
+
     <link rel="stylesheet" href="/base/static/src/css/base.css" type="text/css"/>
-	<link rel="stylesheet" type="text/css" media="screen" href="/base_graph/static/lib/dhtmlxGraph/codebase/dhtmlxchart.css"/>
 
     <script type="text/javascript">
         $(function() {
@@ -47,3 +40,5 @@
 <body id="oe" class="openerp">
 </body>
 </html>
+
+
diff --git a/addons/base/static/src/css/base.css b/addons/base/static/src/css/base.css
index 7b686f53fb4..cf6d0beabd4 100644
--- a/addons/base/static/src/css/base.css
+++ b/addons/base/static/src/css/base.css
@@ -35,7 +35,7 @@ body.openerp {
 /* Loading */
 .openerp .loading {
     display: none;
-    z-index: 1000;
+    z-index: 100;
     position: fixed;
     top: 0;
     right: 50%;
@@ -62,7 +62,7 @@ body.openerp {
 .openerp .login {
     display: none;
     padding: 6px;
-    z-index: 100;
+    z-index: 1002;
     width: 34%;
     position: fixed;
     top: 0;
@@ -172,7 +172,10 @@ body.openerp {
     padding: 0 0 2px;
     border: none;
     background: none;
-    padding-left: 20px;
+    padding-left: 10px;
+}
+.openerp .secondary_menu h3 span, .openerp .secondary_menu h4 span {
+    left: 0 !important;
 }
 .openerp .secondary_menu a {
     display: block;
@@ -201,6 +204,9 @@ body.openerp {
     text-shadow: #fff 0 1px 0;
     border: none !important;
 }
+.openerp div.submenu_accordion div.menu_content a span {
+    padding-left: 20px;
+}
 
 /* Header */
 .openerp .header {
@@ -305,16 +311,39 @@ body.openerp {
 }
 
 /* Footer */
-.openerp .footer {
+.openerp div.oe_footer {
+    background: none repeat scroll 0 0 #CCCCCC;
+    overflow: hidden;
+    padding: 5px 0;
+    position: relative;
+    -moz-box-shadow: inset 0px 3px 5px rgba(0, 0, 0, 0.4);
+    -webkit-box-shadow: inset 0px 3px 5px rgba(0, 0, 0, 0.4);
+    box-shadow: inset 0px 3px 5px rgba(0, 0, 0, 0.4);
+}
+.openerp div.oe_footer p.oe_footer_powered {
+    left: 50%;
+    margin: 0;
+    padding: 0 15px;
+    color: #666666;
+    font-weight: bold;
+    font-size: 0.8em;
+    font-family: Ubuntu, Helvetica, sans-serif;
     text-align: center;
 }
+.openerp div.oe_footer p.oe_footer_powered a {
+    text-decoration: none;
+    color: #666666;
+}
 
 /* Main Application */
 .openerp .application {
-    padding: 6px;
+    padding: 0px;
 }
 
 .openerp h2.oe_view_title {
+    font-size: 175%;
+    font-weight: normal;
+    font-family: Ubuntu, Helvetica, sans-serif;
     margin: 2px 0;
     color: #252424;
     text-shadow: white 0 1px 0;
@@ -415,7 +444,126 @@ body.openerp {
 }
 
 
+.openerp .oe-searchview-render-line {
+    width:100%;
+}
+
+.openerp .searchview_extended_group {
+    border: #696969 solid 1px;
+    padding: 3px;
+    margin: 2px;
+}
+
+.openerp .searchview_extended_add_proposition, .openerp .searchview_extended_add_group {
+    background: url(../img/icons/gtk-add.png) repeat-y;
+    padding-left: 18px;
+}
+
+.openerp .searchview_extended_delete_group, .openerp .searchview_extended_delete_prop {
+    background: url(../img/icons/gtk-remove.png) repeat-y;
+    padding-left: 18px;
+}
+/* List */
+.openerp .oe-listview table {
+    clear: right;
+    width: 100%;
+    border-spacing: 0;
+    border: 1px solid silver;
+}
+
+.openerp .oe-listview tr.odd {
+    background-color: #f3f3f3;
+}
+.openerp .oe-listview tbody tr:hover {
+    background-color: #ecebf2;
+}
+.openerp .oe-listview tbody tr:hover {
+    background-color: #eae9f0;
+}
+
+.openerp .oe-listview td,
+.openerp .oe-listview th {
+    vertical-align: middle;
+}
+
+.openerp .oe-listview .oe-field-cell button {
+    padding: 0;
+    border: none;
+    background: none;
+}
+.openerp .oe-listview .oe-field-cell button:active {
+    opacity: 0.5;
+}
+
+.openerp .oe-listview th.oe-actions {
+    text-align: left;
+}
+.openerp .oe-listview th.oe-list-pager {
+    text-align: right;
+}
+
+/** list rounded corners
+
+    rounded corners are a pain on tables: need to round not only table, but
+    also on the first and last children of the first and last row
+ */
+.openerp .oe-listview table {
+    -webkit-border-radius: 7px;
+    -moz-border-radius: 7px;
+    border-radius: 7px;
+}
+.openerp .oe-listview table thead tr:first-child th:first-child {
+    -webkit-border-top-left-radius: 7px;
+    -moz-border-radius-topleft: 7px;
+    border-top-left-radius: 7px;
+}
+.openerp .oe-listview table thead tr:first-child th:last-child {
+    -webkit-border-top-right-radius: 7px;
+    -moz-border-radius-topright: 7px;
+    border-top-right-radius: 7px;
+}
+.openerp .oe-listview table tbody tr:last-child th:first-child {
+    -webkit-border-bottom-left-radius: 7px;
+    -moz-border-radius-bottomleft: 7px;
+    border-bottom-left-radius: 7px;
+}
+.openerp .oe-listview table tbody tr:last-child td:last-child {
+    -webkit-border-bottom-right-radius: 7px;
+    -moz-border-radius-bottomright: 7px;
+    border-bottom-right-radius: 7px;
+}
+
+/* Notebook */
+.openerp .oe_form_notebook {
+    padding: 0px;
+    background: none;
+    border-width: 0px;
+}
+.openerp .oe_form_notebook ul.ui-tabs-nav {
+    padding-left: 0px;
+    background: transparent;
+    border-width: 0px 0px 1px 0px;
+    border-radius: 0px;
+    -moz-border-radius: 0px;
+    -webkit-border-radius: 0px;
+    line-height: 0.5em;
+}
+.openerp .oe_form_notebook ul.ui-tabs-nav li {
+    font-weight: bold;
+}
+.openerp .oe_form_notebook .ui-tabs-panel {
+    background: #f9f9f9;
+    border-width: 0px 1px 1px 1px;
+}
+.openerp .oe_form_notebook .ui-tabs-selected {
+    background: #f9f9f9;
+}
+
 /* Form */
+.openerp table.oe_frame td {
+    color: #4c4c4c;
+    font-weight: 80%;
+}
 .openerp .required.error {
     border: 1px solid #900;
 }
@@ -426,6 +574,22 @@ body.openerp {
     float: right;
 }
 
+.openerp label.oe_form_label_help {
+    cursor: help;
+}
+.openerp label.oe_form_label, .openerp label.oe_form_label_help {
+    display: block;
+    text-align: right;
+}
+.openerp label.oe_form_label_help span {
+    font-size: 80%;
+    color: darkgreen;
+    vertical-align:top;
+    position: relative;
+    top: -4px;
+    padding: 0 2px;
+}
+
 /* Inputs */
 .openerp input[type="text"], .openerp input[type="password"], .openerp select, .openerp textarea {
     -moz-box-sizing: border-box;
@@ -438,11 +602,14 @@ body.openerp {
     -webkit-border-radius: 3px;
     border-radius: 3px;
     background: white;
+    min-width: 90px;
+    color: #1f1f1f;
 }
 .openerp input[type="text"], .openerp input[type="password"], .openerp select, .openerp .button {
     height: 22px;
 }
 .openerp .button {
+    color: #4c4c4c;
     white-space: nowrap;
 }
 .openerp .button span {
@@ -478,37 +645,131 @@ body.openerp {
 .openerp .ui-widget {
     font-size: 1em;
 }
+.openerp .oe_form_field_progressbar .ui-progressbar {
+    height: 22px;
+    font-size: 10px;
+    -moz-box-sizing: border-box;
+    -webkit-box-sizing: border-box;
+    -ms-box-sizing: border-box;
+    box-sizing: border-box;
+    border: 1px solid #999;
+    -moz-border-radius: 3px;
+    -webkit-border-radius: 3px;
+    border-radius: 3px;
+    background: white;
+    min-width: 90px;
+}
 
 /* Sidebar */
 .openerp .view-manager-main-table {
+    margin: 0;
     width:100%;
+    border-collapse:collapse;
+    height:100%;
 }
-.openerp .view-manager-main-sidebar {
+
+.openerp .view-manager-main-table tbody {
     vertical-align: top;
+}
+
+.openerp .view-manager-main-content {
+    padding: 6px;
+}
+
+.openerp .view-manager-main-sidebar {
     width:0;
     padding:0;
     margin:0;
 }
 
-.openerp .view-manager-main-sidebar .sidebar-main-div {
-    padding:0;
-    margin:0;
+.openerp .sidebar-main-div {
+    height:100%;
 }
 
-.openerp .view-manager-main-sidebar .sidebar-sub-div {
-    border: solid 1px #1F1F1F;
-    border-bottom-width: 0;
+.openerp .sidebar-sub-div {
+    padding:0;
+    margin:0;
+    width:180px;
+    border-left-color: #D2CFCF;
+    border-left-style: solid;
+    border-left-width: 1px;
+    height:100%;
+    font-family: Ubuntu, Helvetica, sans-serif;
+    font-size: 0.9em;
+}
+
+.openerp .closed-sidebar .sidebar-sub-div {
+    width:22px;
+}
+
+.openerp .closed-sidebar .sidebar-displaying-div {
+    display:none;
+}
+
+.openerp .sidebar-main-div a {
+    color: #555;
+    text-decoration: none;
+}
+
+.openerp .sidebar-main-div a:hover {
+    color: black;
+}
+
+.openerp .view-manager-main-sidebar h2 {
+    margin:0;
+    font-family: Ubuntu, Helvetica, sans-serif;
+    font-size: 1.15em;
+    color: #8E8E8E;
+    text-shadow: white 0px 1px 0px;
+    padding-left: 10px;
+    padding-right: 21px;
+    height: 21px;
+    background: url(../img/sideheader-a-bg.png) repeat-x;
+    border-color: #D2CFCF;
+    border-style: solid;
+    border-top-width: 1px;
+    border-bottom-width: 1px;
+    border-left-width: 0;
+    border-right-width: 0;
 }
 
 .openerp .view-manager-main-sidebar ul {
     list-style-type: none;
     margin: 0;
     padding: 0;
-    width: 120px;
-    border-bottom: solid 1px #1F1F1F;
+    display: block;
 }
 
 .openerp .view-manager-main-sidebar li {
-    padding: 3px;
+    display: block;
+    padding: 3px 3px 3px 10px;
+}
+
+.openerp .toggle-sidebar {
+    border-color: #D2CFCF;
+    border-style: solid;
+    border-width: 1px;
+    display: block;
+    background: url(../img/toggle-a-bg.png);
+    width: 21px;
+    height: 21px;
+    position: absolute;
+    z-index: 10;
+}
+.openerp .open-sidebar .toggle-sidebar {
+    margin-left: 158px;
+    background-position: 21px 0;
+}
+
+.openerp .kitten-mode-activated {
+    background: url(http://placekitten.com/g/1500/800) repeat;
+}
+
+.openerp .kitten-mode-activated .header {
+    background: url(http://placekitten.com/g/211/65) repeat;
+}
+
+.openerp .kitten-mode-activated .secondary_menu {
+    background: url(http://placekitten.com/g/212/100) repeat;
 }
 
diff --git a/addons/base/static/src/img/sideheader-a-bg.png b/addons/base/static/src/img/sideheader-a-bg.png
new file mode 100644
index 00000000000..ca9b64b8b01
Binary files /dev/null and b/addons/base/static/src/img/sideheader-a-bg.png differ
diff --git a/addons/base/static/src/img/toggle-a-bg.png b/addons/base/static/src/img/toggle-a-bg.png
new file mode 100644
index 00000000000..b9837ab233e
Binary files /dev/null and b/addons/base/static/src/img/toggle-a-bg.png differ
diff --git a/addons/base/static/src/js/base.js b/addons/base/static/src/js/base.js
index 5757c606e66..2e2c94e75ea 100644
--- a/addons/base/static/src/js/base.js
+++ b/addons/base/static/src/js/base.js
@@ -76,6 +76,10 @@
 
     /** @lends openerp */
     var openerp = this.openerp =  {
+        /**
+         * Debug flag turns on logging
+         */
+        debug: true,
         // element_ids registry linked to all controllers on the page
         // TODO rename to elements, or keep gtk naming?
         screen: {},
@@ -122,8 +126,6 @@ openerp.base = function(instance) {
     openerp.base.search(instance);
     openerp.base.list(instance);
     openerp.base.form(instance);
-    openerp.base.gantt(instance);
-    openerp.base.graph(instance);
 };
 
 // vim:et fdc=0 fdl=0 foldnestmax=3 fdm=syntax:
diff --git a/addons/base/static/src/js/chrome.js b/addons/base/static/src/js/chrome.js
index db2db6b91e5..4391fcf6f4e 100644
--- a/addons/base/static/src/js/chrome.js
+++ b/addons/base/static/src/js/chrome.js
@@ -193,8 +193,6 @@ openerp.base.BasicController = Class.extend( /** @lends openerp.base.BasicContro
         // try to call deferred methods on this return value.
         return $.Deferred().done().promise();
     },
-    on_ready: function() {
-    },
     stop: function() {
     },
     log: function() {
@@ -206,20 +204,55 @@ openerp.base.BasicController = Class.extend( /** @lends openerp.base.BasicContro
         this.on_log.apply(this,args);
     },
     on_log: function() {
-        if(true || window.openerp.debug || (window.location.search.indexOf('?debug') !== -1)) {
+        if(window.openerp.debug || (window.location.search.indexOf('?debug') !== -1)) {
+            var notify = false;
+            var body = false;
             if(window.console) {
                 console.log(arguments);
             } else {
-                $.each(arguments, function(i,v) {
-                    v = v==null ? "null" : v;
-                    $('<pre></pre>').text(v.toString()).appendTo($('body'));
-                });
+                body = true;
+            }
+            var a = Array.prototype.slice.call(arguments, 0);
+            for(var i = 0; i < a.length; i++) {
+                var v = a[i]==null ? "null" : a[i].toString();
+                if(i==0) {
+                    notify = v.match(/^not/);
+                    body = v.match(/^bod/);
+                }
+                if(body) {
+                    $('<pre></pre>').text(v).appendTo($('body'));
+                }
+                if(notify && this.notification) {
+                    this.notification.notify("Logging:",v);
+                }
             }
         }
 
     }
 });
 
+openerp.base.Notification =  openerp.base.BasicController.extend({
+    init: function(element_id) {
+        this._super(element_id);
+        this.$element.notify({
+            speed: 500,
+            expires: 1500
+        });
+    },
+    notify: function(title, text) {
+        this.$element.notify('create', {
+            title: title,
+            text: text
+        });
+    },
+    warn: function(title, text) {
+        this.$element.notify('create', 'oe_notification_alert', {
+            title: title,
+            text: text
+        });
+    }
+});
+
 openerp.base.Session = openerp.base.BasicController.extend( /** @lends openerp.base.Session# */{
     /**
      * @constructs
@@ -283,7 +316,13 @@ openerp.base.Session = openerp.base.BasicController.extend( /** @lends openerp.b
     rpc_ajax: function(url, payload, success_callback, error_callback) {
         var self = this;
         this.on_rpc_request();
-        return $.ajax({
+        // url can be an $.ajax option object
+        if (_.isString(url)) {
+            url = {
+                url: url
+            }
+        }
+        var ajax = _.extend({
             type: "POST",
             url: url,
             dataType: 'json',
@@ -314,7 +353,8 @@ openerp.base.Session = openerp.base.BasicController.extend( /** @lends openerp.b
                 };
                 error_callback(error);
             }
-        });
+        }, url);
+        return $.ajax(ajax);
     },
     on_rpc_request: function() {
     },
@@ -410,10 +450,21 @@ openerp.base.Session = openerp.base.BasicController.extend( /** @lends openerp.b
         var self = this;
         this.rpc('/base/session/modules', {}, function(result) {
             self.module_list = result['modules'];
-            self.rpc('/base/session/jslist', {"mods": self.module_list.join(',')}, self.debug ? self.do_load_modules_debug : self.do_load_modules_prod);
+            var modules = self.module_list.join(',');
+            self.rpc('/base/session/csslist', {mods: modules}, self.do_load_css);
+            self.rpc('/base/session/jslist', {"mods": modules}, self.debug ? self.do_load_modules_debug : self.do_load_modules_prod);
             openerp._modules_loaded = true;
         });
     },
+    do_load_css: function (result) {
+        _.each(result.files, function (file) {
+            $('head').append($('<link>', {
+                'href': file,
+                'rel': 'stylesheet',
+                'type': 'text/css'
+            }));
+        });
+    },
     do_load_modules_debug: function(result) {
         $LAB.setOptions({AlwaysPreserveOrder: true})
             .script(result.files)
@@ -426,31 +477,103 @@ openerp.base.Session = openerp.base.BasicController.extend( /** @lends openerp.b
         // use $.getScript(‘your_3rd_party-script.js’); ? i want to keep lineno !
     },
     on_modules_loaded: function() {
-        var self = this;
-        for(var j=0; j<self.module_list.length; j++) {
-            var mod = self.module_list[j];
-            if(self.module_loaded[mod])
+        for(var j=0; j<this.module_list.length; j++) {
+            var mod = this.module_list[j];
+            if(this.module_loaded[mod])
                 continue;
             openerp[mod] = {};
             // init module mod
-            openerp._openerp[mod](openerp);
-            self.module_loaded[mod] = true;
+            if(openerp._openerp[mod] != undefined) {
+                openerp._openerp[mod](openerp);
+                this.module_loaded[mod] = true;
+            }
         }
     }
 });
 
+// A controller takes an already existing element
+// new()
+// start()
 openerp.base.Controller = openerp.base.BasicController.extend( /** @lends openerp.base.Controller# */{
+    /**
+     * Controller manifest used to declare standard controller attributes
+     */
+    controller_manifest: {
+        register: null,
+        template: "",
+        element_post_prefix: false
+    },
+    /**
+     * Controller registry, 
+     */
+    controller_registry: {
+    },
+    /**
+     * Add a new child controller
+     */
+    controller_get: function(key) {
+        return this.controller_registry[key];
+        // OR should contrustct it ? setting parent correctly ?
+        // function construct(constructor, args) {
+        //     function F() {
+        //         return constructor.apply(this, args);
+        //     }
+        //     F.prototype = constructor.prototype;
+        //     return new F();
+        // }
+        // var obj = this.controller_registry[key];
+        // if(obj) {
+        //     return construct(obj, Array.prototype.slice.call(arguments, 1));
+        // }
+    },
+    controller_new: function(key) {
+        var self;
+        // OR should contrustct it ? setting parent correctly ?
+        function construct(constructor, args) {
+            function F() {
+                return constructor.apply(this, args);
+            }
+            F.prototype = constructor.prototype;
+            return new F();
+        }
+        var obj = this.controller_registry[key];
+        if(obj) {
+            // TODO Prepend parent
+            return construct(obj, Array.prototype.slice.call(arguments, 1));
+        }
+    },
     /**
      * @constructs
      * @extends openerp.base.BasicController
      */
-    init: function(session, element_id) {
+    init: function(parent_or_session, element_id) {
         this._super(element_id);
-        this.session = session;
-    },
-    on_log: function() {
-        if(this.session)
-            this.session.log.apply(this.session,arguments);
+        this.controller_parent = null;
+        this.controller_children = [];
+        if(parent_or_session) {
+            if(parent_or_session.session) {
+                this.parent = parent_or_session;
+                this.session = this.parent.session;
+                if(this.parent.children) {
+                    this.parent.children.push(this);
+                }
+            } else {
+                // TODO remove Backward compatilbility
+                this.session = parent_or_session;
+            }
+        }
+        // Apply manifest options
+        if(this.controller_manifest) {
+            var register = this.controller_manifest.register;
+            // TODO accept a simple string
+            if(register) {
+                for(var i=0; i<register.length; i++) {
+                    this.controller_registry[register[i]] = this;
+                }
+            }
+            // TODO if post prefix
+            //this.element_id = _.uniqueId(_.toArray(arguments).join('_'));
+        };
     },
     /**
      * Performs a JSON-RPC call
@@ -467,6 +590,105 @@ openerp.base.Controller = openerp.base.BasicController.extend( /** @lends opener
     }
 });
 
+// A widget is a controller that doesnt take an element_id
+// it render its own html that you should insert into the dom
+// and bind it a start()
+//
+// new()
+// render() and insert it place it where you want
+// start()
+openerp.base.BaseWidget = openerp.base.Controller.extend({
+    /**
+     * The name of the QWeb template that will be used for rendering. Must be
+     * redefined in subclasses or the render() method can not be used.
+     * 
+     * @type string
+     */
+    template: null,
+    /**
+     * The prefix used to generate an id automatically. Should be redefined in
+     * subclasses. If it is not defined, a default identifier will be used.
+     * 
+     * @type string
+     */
+    identifier_prefix: 'generic-identifier',
+    /**
+     * Base class for widgets. Handle rendering (based on a QWeb template),
+     * identifier generation, parenting and destruction of the widget.
+     * Also initialize the identifier.
+     *
+     * @constructs
+     * @params {openerp.base.search.BaseWidget} parent The parent widget.
+     */
+    init: function (parent, session) {
+        this._super(session);
+        this.children = [];
+        this.parent = null;
+        this.set_parent(parent);
+        this.make_id(this.identifier_prefix);
+    },
+    /**
+     * Sets and returns a globally unique identifier for the widget.
+     *
+     * If a prefix is appended, the identifier will be appended to it.
+     *
+     * @params sections prefix sections, empty/falsy sections will be removed
+     */
+    make_id: function () {
+        this.element_id = _.uniqueId(_.toArray(arguments).join('_'));
+        return this.element_id;
+    },
+    /**
+     * "Starts" the widgets. Called at the end of the rendering, this allows
+     * to get a jQuery object referring to the DOM ($element attribute).
+     */
+    start: function () {
+        this._super();
+        var tmp = document.getElementById(this.element_id);
+        this.$element = tmp ? $(tmp) : null;
+    },
+    /**
+     * "Stops" the widgets. Called when the view destroys itself, this
+     * lets the widgets clean up after themselves.
+     */
+    stop: function () {
+        var tmp_children = this.children;
+        this.children = [];
+        _.each(tmp_children, function(x) {
+            x.stop();
+        });
+        if(this.$element != null) {
+            this.$element.remove();
+        }
+        this.set_parent(null);
+        this._super();
+    },
+    /**
+     * Set the parent of this component, also un-register the previous parent
+     * if there was one.
+     * 
+     * @param {openerp.base.BaseWidget} parent The new parent.
+     */
+    set_parent: function(parent) {
+        if(this.parent) {
+            this.parent.children = _.without(this.parent.children, this);
+        }
+        this.parent = parent;
+        if(this.parent) {
+            parent.children.push(this);
+        }
+    },
+    /**
+     * Render the widget. This.template must be defined.
+     * The content of the current object is passed as context to the template.
+     * 
+     * @param {object} additional Additional context arguments to pass to the template.
+     */
+    render: function (additional) {
+        return QWeb.render(this.template, _.extend({}, this, additional != null ? additional : {}));
+    }
+});
+
 openerp.base.CrashManager = openerp.base.Controller.extend({
     init: function(session, element_id) {
         this._super(session, element_id);
@@ -488,11 +710,10 @@ openerp.base.CrashManager = openerp.base.Controller.extend({
     }
 });
 
-openerp.base.Database = openerp.base.Controller.extend({
-// Non Session Controller to manage databases
-});
-
 openerp.base.Loading =  openerp.base.Controller.extend({
+    controller_manifest: {
+        register: ["Loading"]
+    },
     init: function(session, element_id) {
         this._super(session, element_id);
         this.count = 0;
@@ -511,25 +732,7 @@ openerp.base.Loading =  openerp.base.Controller.extend({
     }
 });
 
-openerp.base.Notification =  openerp.base.Controller.extend({
-    init: function(session, element_id) {
-        this._super(session, element_id);
-        this.$element.notify({
-            speed: 500
-        });
-    },
-    'default': function(title, text) {
-        this.$element.notify('create', {
-            title: title,
-            text: text
-        });
-    },
-    alert: function(title, text) {
-        this.$element.notify('create', 'oe_notification_alert', {
-            title: title,
-            text: text
-        });
-    }
+openerp.base.Database = openerp.base.Controller.extend({
 });
 
 openerp.base.Login =  openerp.base.Controller.extend({
@@ -587,6 +790,10 @@ openerp.base.Header =  openerp.base.Controller.extend({
         this.do_update();
     },
     do_update: function() {
+        if(jQuery.param != undefined &&
+                jQuery.deparam(jQuery.param.querystring()).kitten != undefined) {
+            this.kitten = 1;
+        }
         this.$element.html(QWeb.render("Header", this));
     }
 });
@@ -622,7 +829,6 @@ openerp.base.Menu =  openerp.base.Controller.extend({
         });
 
         this.$element.add(this.$secondary_menu).find("a").click(this.on_menu_click);
-        this.on_ready();
     },
     on_menu_click: function(ev, id) {
         id = id || 0;
@@ -688,14 +894,19 @@ openerp.base.WebClient = openerp.base.Controller.extend({
         this._super(null, element_id);
 
         QWeb.add_template("xml/base.xml");
-        this.$element.html(QWeb.render("Interface", {}));
+        var params = {};
+        if(jQuery.param != undefined &&
+                jQuery.deparam(jQuery.param.querystring()).kitten != undefined) {
+            params = {kitten:1};
+        }
+        this.$element.html(QWeb.render("Interface", params));
 
         this.session = new openerp.base.Session("oe_errors");
         this.loading = new openerp.base.Loading(this.session, "oe_loading");
         this.crashmanager =  new openerp.base.CrashManager(this.session);
 
         // Do you autorize this ?
-        openerp.base.Controller.prototype.notification = new openerp.base.Notification(this.session, "oe_notification");
+        openerp.base.Controller.prototype.notification = new openerp.base.Notification("oe_notification");
 
         this.header = new openerp.base.Header(this.session, "oe_header");
         this.login = new openerp.base.Login(this.session, "oe_login");
@@ -712,14 +923,24 @@ openerp.base.WebClient = openerp.base.Controller.extend({
         this.header.start();
         this.login.start();
         this.menu.start();
-        this.notification['default']("OpenERP Client", "The openerp client has been initialized.");
+        this.notification.notify("OpenERP Client", "The openerp client has been initialized.");
     },
     on_logged: function() {
-        this.action =  new openerp.base.ActionManager(this.session, "oe_app");
-        this.action.start();
+        this.action_manager =  new openerp.base.ActionManager(this.session, "oe_app");
+        this.action_manager.start();
+        
+        // if using saved actions, load the action and give it to action manager
+        var parameters = jQuery.deparam(jQuery.param.querystring());
+        if(parameters["s_action"] != undefined) {
+            var key = parseInt(parameters["s_action"]);
+            var self = this;
+            this.rpc("/base/session/get_session_action", {key:key}, function(action) {
+                self.action_manager.do_action(action);
+            });
+        }
     },
     on_menu_action: function(action) {
-        this.action.do_action(action);
+        this.action_manager.do_action(action);
     },
     do_about: function() {
     }
@@ -731,6 +952,7 @@ openerp.base.webclient = function(element_id) {
     client.start();
     return client;
 };
+
 };
 
 // vim:et fdc=0 fdl=0 foldnestmax=3 fdm=syntax:
diff --git a/addons/base/static/src/js/data.js b/addons/base/static/src/js/data.js
index c0187e77684..5ed21be533c 100644
--- a/addons/base/static/src/js/data.js
+++ b/addons/base/static/src/js/data.js
@@ -83,34 +83,42 @@ openerp.base.DataSet =  openerp.base.Controller.extend( /** @lends openerp.base.
         }
     },
     default_get: function(fields, callback) {
-        this.rpc('/base/dataset/default_get', {
+        return this.rpc('/base/dataset/default_get', {
             model: this.model,
             fields: fields,
             context: this.context
         }, callback);
     },
-    create: function() {
+    create: function(data, callback) {
+        return this.rpc('/base/dataset/create', {
+            model: this.model,
+            data: data,
+            context: this.context
+        }, callback);
     },
     write: function (id, data, callback) {
-        this.rpc('/base/dataset/save', {
+        return this.rpc('/base/dataset/save', {
             model: this.model,
             id: id,
             data: data,
             context: this.context
         }, callback);
     },
-    unlink: function() {
+    unlink: function(ids) {
+        this.notification.notify("Unlink", ids);
     },
     call: function (method, ids, args, callback) {
+        this.notification.notify(
+            "Calling", this.model + '#' + method + '(' + ids + ')');
         ids = ids || [];
         args = args || [];
-        this.rpc('/base/dataset/call', {
+        return this.rpc('/base/dataset/call', {
             model: this.model,
             method: method,
             ids: ids,
             args: args
         }, callback);
-    },
+    }
 });
 
 openerp.base.DataSetStatic =  openerp.base.DataSet.extend({
@@ -122,7 +130,7 @@ openerp.base.DataSetStatic =  openerp.base.DataSet.extend({
     },
     read_slice: function (fields, offset, limit, callback) {
         this.read_ids(this.ids.slice(offset, offset + limit));
-    },
+    }
 });
 
 openerp.base.DataSetSearch =  openerp.base.DataSet.extend({
@@ -162,7 +170,10 @@ openerp.base.DataSetSearch =  openerp.base.DataSet.extend({
             }
             callback(records);
         });
-    },
+    }
+});
+
+openerp.base.DataSetRelational =  openerp.base.DataSet.extend( /** @lends openerp.base.DataSet# */{
 });
 
 };
diff --git a/addons/base/static/src/js/form.js b/addons/base/static/src/js/form.js
index 9bb1eda6ca3..85cdb9b8368 100644
--- a/addons/base/static/src/js/form.js
+++ b/addons/base/static/src/js/form.js
@@ -27,10 +27,13 @@ openerp.base.FormView =  openerp.base.Controller.extend( /** @lends openerp.base
         this.fields = {};
         this.datarecord = {};
         this.ready = false;
+        this.show_invalid = true;
+        this.touched = false;
     },
     start: function() {
         //this.log('Starting FormView '+this.model+this.view_id)
-        return this.rpc("/base/formview/load", {"model": this.model, "view_id": this.view_id}, this.on_loaded);
+        return this.rpc("/base/formview/load", {"model": this.model, "view_id": this.view_id,
+            toolbar:!!this.view_manager.sidebar}, this.on_loaded);
     },
     on_loaded: function(data) {
         var self = this;
@@ -47,46 +50,55 @@ openerp.base.FormView =  openerp.base.Controller.extend( /** @lends openerp.base
             self.on_pager_action(action);
         });
 
-        this.$element.find('div.oe_form_buttons button.oe_form_button_save').click(this.do_save);
-        this.$element.find('div.oe_form_buttons button.oe_form_button_save_edit').click(this.do_save_edit);
-        this.$element.find('div.oe_form_buttons button.oe_form_button_cancel').click(this.do_cancel);
-        this.$element.find('div.oe_form_buttons button.oe_form_button_new').click(this.on_button_new);
+        this.$element.find('#' + this.element_id + '_header button.oe_form_button_save').click(this.do_save);
+        this.$element.find('#' + this.element_id + '_header button.oe_form_button_save_edit').click(this.do_save_edit);
+        this.$element.find('#' + this.element_id + '_header button.oe_form_button_cancel').click(this.do_cancel);
+        this.$element.find('#' + this.element_id + '_header button.oe_form_button_new').click(this.on_button_new);
 
         // sidebar stuff
         if (this.view_manager.sidebar) {
-            this.view_manager.sidebar.load_multi_actions();
+            this.view_manager.sidebar.set_toolbar(data.fields_view.toolbar);
         }
     },
     do_show: function () {
-        // this should not append as start return a deferred resolved when fields_view is known
-        if(this.fields_view && this.fields_view.fields)
+        var self = this;
+        this.do_update_pager.add(function() {
+            self.$element.show();
+        });
+        if (this.dataset.index === null) {
+            // null index means we should start a new record
+            this.on_button_new();
+        } else {
             this.dataset.read_index(_.keys(this.fields_view.fields), this.on_record_loaded);
-        this.$element.show();
+        }
     },
     do_hide: function () {
         this.$element.hide();
     },
     on_record_loaded: function(record) {
+        this.touched = false;
         if (record) {
             this.datarecord = record;
             for (var f in this.fields) {
-                this.fields[f].set_value(this.datarecord[f]);
+                var field = this.fields[f];
+                field.set_value(this.datarecord[f] || false);
+                field.validate();
+                field.touched = false;
             }
             if (!record.id) {
-                // Second pass in order to trigger the onchanges in case of new record
-                for (var f in this.fields) {
-                    var field = this.fields[f];
-                    if (field.node.attrs.on_change) {
-                        this.do_onchange(field);
-                    }
+                // New record: Second pass in order to trigger the onchanges
+                this.touched = true;
+                this.show_invalid = false;
+                for (var f in record) {
+                    this.on_form_changed(this.fields[f]);
                 }
             }
             this.on_form_changed();
-            this.ready = true;
+            this.show_invalid = this.ready = true;
         } else {
             this.log("No record received");
         }
-        this.do_update_pager();
+        this.do_update_pager(record.id == null);
     },
     on_form_changed: function(widget) {
         if (widget && widget.node.attrs.on_change) {
@@ -114,16 +126,16 @@ openerp.base.FormView =  openerp.base.Controller.extend( /** @lends openerp.base
                 this.dataset.index = this.dataset.ids.length - 1;
                 break;
         }
-        this.dataset.read_index(_.keys(this.fields_view.fields), this.on_record_loaded);
+        this.reload();
     },
-    do_update_pager: function() {
-        var $pager = this.$element.find('div.oe_form_pager');
-        $pager.find("button[data-pager-action='first'], button[data-pager-action='previous']").attr('disabled', this.dataset.index == 0);
-        $pager.find("button[data-pager-action='next'], button[data-pager-action='last']").attr('disabled', this.dataset.index == this.dataset.ids.length - 1);
-        this.$element.find('span.oe_pager_index').html(this.dataset.index + 1);
-        this.$element.find('span.oe_pager_count').html(this.dataset.count);
+    do_update_pager: function(hide_index) {
+        var $pager = this.$element.find('#' + this.element_id + '_header div.oe_form_pager');
+        var index = hide_index ? '-' : this.dataset.index + 1;
+        $pager.find('span.oe_pager_index').html(index);
+        $pager.find('span.oe_pager_count').html(this.dataset.count);
     },
-    do_onchange: function(widget) {
+    do_onchange: function(widget, processed) {
+        processed = processed || [];
         if (widget.node.attrs.on_change) {
             var self = this;
             this.ready = false;
@@ -141,25 +153,36 @@ openerp.base.FormView =  openerp.base.Controller.extend( /** @lends openerp.base
                         this.log("warning : on_change can't find field " + field, onchange);
                     }
                 });
-                console.info("Calling onchange :", onchange);
-                // TODO: no async for onchange
-                this.dataset.call(method, (this.datarecord.id == null ? [] : [this.datarecord.id]), args, this.on_processed_onchange);
+                var ajax = {
+                    url: '/base/dataset/call',
+                    async: false
+                };
+                return this.rpc(ajax, {
+                    model: this.dataset.model,
+                    method: method,
+                    ids: (this.datarecord.id == null ? [] : [this.datarecord.id]),
+                    args: args
+                }, function(response) {
+                    self.on_processed_onchange(response, processed);
+                });
             } else {
                 this.log("Wrong on_change format", on_change);
             }
         }
     },
-    on_processed_onchange: function(response) {
-        console.log("onchange result :", response);
+    on_processed_onchange: function(response, processed) {
         var result = response.result;
         if (result.value) {
             for (var f in result.value) {
                 var field = this.fields[f];
                 if (field) {
                     var value = result.value[f];
+                    processed.push(field.name);
                     if (field.value != value) {
                         field.set_value(value);
-                        this.do_onchange(field);
+                        if (_.indexOf(processed, field.name) < 0) {
+                            this.do_onchange(field, processed);
+                        }
                     }
                 } else {
                     this.log("warning : on_processed_onchange can't find field " + field, result);
@@ -188,7 +211,8 @@ openerp.base.FormView =  openerp.base.Controller.extend( /** @lends openerp.base
             self.on_record_loaded(result.result);
         });
     },
-    do_save: function() {
+    do_save: function(success) {
+        var self = this;
         if (!this.ready) {
             return false;
         }
@@ -198,21 +222,31 @@ openerp.base.FormView =  openerp.base.Controller.extend( /** @lends openerp.base
             f = this.fields[f];
             if (f.invalid) {
                 invalid = true;
+                f.update_dom();
             } else if (f.touched) {
                 values[f.name] = f.get_value();
             }
         }
         if (invalid) {
             this.on_invalid();
+            return false;
         } else {
-            this.log("About to save", values)
-            this.dataset.write(this.datarecord.id, values, this.on_saved);
+            this.log("About to save", values);
+            if (!this.datarecord.id) {
+                this.dataset.create(values, function(r) {
+                    self.on_created(r, success);
+                });
+            } else {
+                this.dataset.write(this.datarecord.id, values, function(r) {
+                    self.on_saved(r, success);
+                });
+            }
+            return true;
         }
     },
     do_save_edit: function() {
-        if (this.do_save()) {
-            this.switch_readonly();
-        }
+        this.do_save();
+        //this.switch_readonly(); Use promises
     },
     switch_readonly: function() {
     },
@@ -226,25 +260,112 @@ openerp.base.FormView =  openerp.base.Controller.extend( /** @lends openerp.base
             }
         });
         msg += "</ul>";
-        this.notification.alert("The following fields are invalid :", msg);
+        this.notification.warn("The following fields are invalid :", msg);
     },
-    on_saved: function(r) {
+    on_saved: function(r, success) {
         if (!r.result) {
-            this.log("Record was not saved");
+            this.notification.warn("Record not saved", "Problem while saving record.");
         } else {
-            // Check response for exceptions, display error
-            this.notification['default']("Record saved", "The record #" + this.datarecord.id + " has been saved.");
+            this.notification.notify("Record saved", "The record #" + this.datarecord.id + " has been saved.");
+            if (success) {
+                success(r);
+            }
+        }
+    },
+    on_created: function(r, success) {
+        if (!r.result) {
+            this.notification.warn("Record not created", "Problem while creating record.");
+        } else {
+            this.datarecord.id = arguments[0].result;
+            this.dataset.ids.push(this.datarecord.id);
+            this.dataset.index = this.dataset.ids.length - 1;
+            this.dataset.count++;
+            this.do_update_pager();
+            this.notification.notify("Record created", "The record has been created with id #" + this.datarecord.id);
+            if (success) {
+                success(r);
+            }
         }
     },
     do_search: function (domains, contexts, groupbys) {
+        this.notification.notify("Searching form");
     },
     on_action: function (action) {
+        this.notification.notify('Executing action ' + action);
+    },
+    do_cancel: function () {
+        this.notification.notify("Cancelling form");
+    },
+    reload: function() {
+        if (this.datarecord.id) {
+            this.dataset.read_index(_.keys(this.fields_view.fields), this.on_record_loaded);
+        } else {
+            this.on_button_new();
+        }
     }
 });
 
 /** @namespace */
 openerp.base.form = {};
 
+openerp.base.form.compute_domain = function(expr, fields) {
+    var stack = [];
+    for (var i = expr.length - 1; i >= 0; i--) {
+        var ex = expr[i];
+        if (ex.length == 1) {
+            var top = stack.pop();
+            switch (ex[0]) {
+                case '|':
+                    stack.push(stack.pop() || top);
+                    continue;
+                case '&':
+                    stack.push(stack.pop() && top);
+                    continue;
+                case '!':
+                    stack.push(!top);
+                    continue;
+                default:
+                    throw new Error('Unknown domain operator ' + ex[0]);
+            }
+        }
+
+        var field = fields[ex[0]].value;
+        var op = ex[1];
+        var val = ex[2];
+
+        switch (op.toLowerCase()) {
+            case '=':
+            case '==':
+                stack.push(field == val);
+                break;
+            case '!=':
+            case '<>':
+                stack.push(field != val);
+                break;
+            case '<':
+                stack.push(field < val);
+                break;
+            case '>':
+                stack.push(field > val);
+                break;
+            case '<=':
+                stack.push(field <= val);
+                break;
+            case '>=':
+                stack.push(field >= val);
+                break;
+            case 'in':
+                stack.push(_.indexOf(val, field) > -1);
+                break;
+            case 'not in':
+                stack.push(_.indexOf(val, field) == -1);
+                break;
+            default:
+                this.log("Unsupported operator in attrs :", op);
+        }
+    }
+    return _.indexOf(stack, false) == -1;
+},
 openerp.base.form.Widget = openerp.base.Controller.extend({
     init: function(view, node) {
         this.view = view;
@@ -269,69 +390,11 @@ openerp.base.form.Widget = openerp.base.Controller.extend({
         this.$element = $('#' + this.element_id);
     },
     process_attrs: function() {
+        var compute_domain = openerp.base.form.compute_domain;
         for (var a in this.attrs) {
-            this[a] = this.eval_attrs(this.attrs[a]);
+            this[a] = compute_domain(this.attrs[a], this.view.fields);
         }
     },
-    eval_attrs: function(expr) {
-        var stack = [];
-        for (var i = 0; i < expr.length; i++) {
-            var ex = expr[i];
-            if (ex.length == 1) {
-                stack.push(ex[0]);
-                continue;
-            }
-
-            var field = this.view.fields[ex[0]].value;
-            var op = ex[1];
-            var val = ex[2];
-
-            switch (op.toLowerCase()) {
-                case '=':
-                case '==':
-                    stack.push(field == val);
-                    break;
-                case '!=':
-                case '<>':
-                    stack.push(field != val);
-                    break;
-                case '<':
-                    stack.push(field < val);
-                    break;
-                case '>':
-                    stack.push(field > val);
-                    break;
-                case '<=':
-                    stack.push(field <= val);
-                    break;
-                case '>=':
-                    stack.push(field >= val);
-                    break;
-                case 'in':
-                    stack.push(_.indexOf(val, field) > -1);
-                    break;
-                case 'not in':
-                    stack.push(_.indexOf(val, field) == -1);
-                    break;
-                default:
-                    this.log("Unsupported operator in attrs :", op);
-            }
-        }
-
-        for (var j = stack.length-1; j >- 1; j--) {
-            switch (stack[j]) {
-                case '|':
-                    var result = stack[j + 1] || stack[j + 2];
-                    stack.splice(j, 3, result);
-                    break;
-                case '&':
-                    var result = stack[j + 1] && stack[j + 2];
-                    stack.splice(j, 3, result);
-                    break;
-            }
-        }
-        return _.indexOf(stack, false) == -1;
-    },
     update_dom: function() {
         this.$element.toggle(!this.invisible);
     },
@@ -383,12 +446,12 @@ openerp.base.form.WidgetFrame = openerp.base.form.Widget.extend({
             }
         }
     },
-    handle_node: function(n) {
-        var type = this.view.fields_view.fields[n.attrs.name] || {};
-        var widget_type = n.attrs.widget || type.type || n.tag;
-        var widget = new (openerp.base.form.widgets.get_object(widget_type)) (this.view, n);
-        if (n.tag == 'field' && n.attrs.nolabel != '1') {
-            var label = new (openerp.base.form.widgets.get_object('label')) (this.view, n);
+    handle_node: function(node) {
+        var type = this.view.fields_view.fields[node.attrs.name] || {};
+        var widget_type = node.attrs.widget || type.type || node.tag;
+        var widget = new (openerp.base.form.widgets.get_object(widget_type)) (this.view, node);
+        if (node.tag == 'field' && node.attrs.nolabel != '1') {
+            var label = new (openerp.base.form.widgets.get_object('label')) (this.view, node);
             label["for"] = widget;
             this.add_widget(label);
         }
@@ -437,6 +500,63 @@ openerp.base.form.WidgetButton = openerp.base.form.Widget.extend({
     init: function(view, node) {
         this._super(view, node);
         this.template = "WidgetButton";
+    },
+    start: function() {
+        this._super.apply(this, arguments);
+        this.$element.click(this.on_click);
+    },
+    on_click: function(saved) {
+        var self = this;
+        if (!this.node.attrs.special && this.view.touched && saved !== true) {
+            this.view.do_save(function() {
+                self.on_click(true);
+            });
+        } else {
+            if (this.node.attrs.confirm) {
+                var dialog = $('<div>' + this.node.attrs.confirm + '</div>').dialog({
+                    title: 'Confirm',
+                    modal: true,
+                    buttons: {
+                        Ok: function() {
+                            self.on_confirmed();
+                            $(this).dialog("close");
+                        },
+                        Cancel: function() {
+                            $(this).dialog("close");
+                        }
+                    }
+                });
+            } else {
+                this.on_confirmed();
+            }
+        }
+    },
+    on_confirmed: function() {
+        var attrs = this.node.attrs;
+        if (attrs.special) {
+            this.on_button_object({
+                result : { type: 'ir.actions.act_window_close' }
+            });
+        } else {
+            var type = attrs.type || 'workflow';
+            var context = _.extend({}, this.view.dataset.context, attrs.context || {});
+            switch(type) {
+                case 'object':
+                    return this.view.dataset.call(attrs.name, [this.view.datarecord.id], [context], this.on_button_object);
+                    break;
+                default:
+                    this.log(_.sprintf("Unsupported button type : %s", type));
+            }
+        }
+    },
+    on_button_object: function(r) {
+        if (r.result === false) {
+            this.log("Button object returns false");
+        } else if (r.result.constructor == Object) {
+            this.session.action_manager.do_action(r.result);
+        } else {
+            this.view.reload();
+        }
     }
 });
 
@@ -472,12 +592,13 @@ openerp.base.form.Field = openerp.base.form.Widget.extend({
         if (node.attrs.nolabel != '1' && this.colspan > 1) {
             this.colspan--;
         }
-        this.field = view.fields_view.fields[node.attrs.name];
+        this.field = view.fields_view.fields[node.attrs.name] || {};
         this.string = node.attrs.string || this.field.string;
         this.help = node.attrs.help || this.field.help;
-        this.nolabel = (node.attrs.nolabel == '1');
-        this.readonly = (node.attrs.readonly == '1');
-        this.required = (node.attrs.required == '1');
+        this.invisible = (this.invisible || this.field.invisible == '1');
+        this.nolabel = (this.field.nolabel || node.attrs.nolabel) == '1';
+        this.readonly = (this.field.readonly || node.attrs.readonly) == '1';
+        this.required = (this.field.required || node.attrs.required) == '1';
         this.invalid = false;
         this.touched = false;
     },
@@ -486,6 +607,9 @@ openerp.base.form.Field = openerp.base.form.Widget.extend({
         this.invalid = false;
         this.update_dom();
     },
+    set_value_from_ui: function() {
+        this.value = undefined;
+    },
     get_value: function() {
         return this.value;
     },
@@ -493,10 +617,17 @@ openerp.base.form.Field = openerp.base.form.Widget.extend({
         this._super.apply(this, arguments);
         this.$element.toggleClass('disabled', this.readonly);
         this.$element.toggleClass('required', this.required);
-        this.$element.toggleClass('invalid', this.invalid);
+        if (this.view.show_invalid) {
+            this.$element.toggleClass('invalid', this.invalid);
+        }
     },
     on_ui_change: function() {
-        this.touched = true;
+        this.touched = this.view.touched = true;
+        this.set_value_from_ui();
+        this.validate();
+        this.view.on_form_changed(this);
+    },
+    validate: function() {
     }
 });
 
@@ -518,31 +649,41 @@ openerp.base.form.FieldChar = openerp.base.form.Field.extend({
         this._super.apply(this, arguments);
         this.$element.find('input').attr('disabled', this.readonly);
     },
-    on_ui_change: function() {
-        this._super.apply(this, arguments);
+    set_value_from_ui: function() {
         this.value = this.$element.find('input').val();
-        this.invalid = this.required && this.value == "";
-        this.view.on_form_changed(this);
+    },
+    validate: function() {
+        this.invalid = false;
+        if (this.value === false || this.value === "") {
+            this.invalid = this.required;
+        } else if (this.validation_regex) {
+            this.invalid = !this.validation_regex.test(this.value);
+        }
     }
 });
 
 openerp.base.form.FieldEmail = openerp.base.form.FieldChar.extend({
+    init: function(view, node) {
+        this._super(view, node);
+        this.validation_regex = /@/;
+    }
 });
 
 openerp.base.form.FieldUrl = openerp.base.form.FieldChar.extend({
 });
 
 openerp.base.form.FieldFloat = openerp.base.form.FieldChar.extend({
+    init: function(view, node) {
+        this._super(view, node);
+        this.validation_regex = /^\d+(\.\d+)?$/;
+    },
     set_value: function(value) {
         this._super.apply(this, arguments);
         var show_value = (value != null && value !== false) ? value.toFixed(2) : '';
-        this.$element.find('input').val(value);
+        this.$element.find('input').val(show_value);
     },
-    on_ui_change: function() {
-        this._super.apply(this, arguments);
+    set_value_from_ui: function() {
         this.value = this.$element.find('input').val().replace(/,/g, '.');
-        this.invalid = (this.required && this.value == "") || !this.value.match(/^\d+(\.\d+)?$/) ;
-        this.view.on_form_changed(this);
     }
 });
 
@@ -550,23 +691,13 @@ openerp.base.form.FieldDate = openerp.base.form.FieldChar.extend({
     init: function(view, node) {
         this._super(view, node);
         this.template = "FieldDate";
+        this.validation_regex = /^\d+-\d+-\d+$/;
     },
     start: function() {
         this._super.apply(this, arguments);
         this.$element.find('input').change(this.on_ui_change).datepicker({
             dateFormat: 'yy-mm-dd'
         });
-    },
-    set_value: function(value) {
-        this._super.apply(this, arguments);
-        var show_value = (value != null && value !== false) ? value : '';
-        this.$element.find('input').val(show_value);
-    },
-    on_ui_change: function() {
-        this._super.apply(this, arguments);
-        this.value = this.$element.find('input').val();
-        this.invalid = this.required && this.value == "";
-        this.view.on_form_changed(this);
     }
 });
 
@@ -574,6 +705,7 @@ openerp.base.form.FieldDatetime = openerp.base.form.FieldChar.extend({
     init: function(view, node) {
         this._super(view, node);
         this.template = "FieldDatetime";
+        this.validation_regex = /^\d+-\d+-\d+( \d+:\d+(:\d+)?)?$/;
     },
     start: function() {
         this._super.apply(this, arguments);
@@ -581,17 +713,6 @@ openerp.base.form.FieldDatetime = openerp.base.form.FieldChar.extend({
             dateFormat: 'yy-mm-dd',
             timeFormat: 'hh:mm:ss'
         });
-    },
-    set_value: function(value) {
-        this._super.apply(this, arguments);
-        var show_value = (value != null && value !== false) ? value : '';
-        this.$element.find('input').val(show_value);
-    },
-    on_ui_change: function() {
-        this._super.apply(this, arguments);
-        this.value = this.$element.find('input').val();
-        this.invalid = this.required && this.value == "";
-        this.view.on_form_changed(this);
     }
 });
 
@@ -599,6 +720,7 @@ openerp.base.form.FieldText = openerp.base.form.Field.extend({
     init: function(view, node) {
         this._super(view, node);
         this.template = "FieldText";
+        this.validation_regex = null;
     },
     start: function() {
         this._super.apply(this, arguments);
@@ -613,11 +735,16 @@ openerp.base.form.FieldText = openerp.base.form.Field.extend({
         this._super.apply(this, arguments);
         this.$element.find('textarea').attr('disabled', this.readonly);
     },
-    on_ui_change: function() {
-        this._super.apply(this, arguments);
+    set_value_from_ui: function() {
         this.value = this.$element.find('textarea').val();
-        this.invalid = this.required && this.value == "";
-        this.view.on_form_changed(this);
+    },
+    validate: function() {
+        this.invalid = false;
+        if (this.value === false || this.value === "") {
+            this.invalid = this.required;
+        } else if (this.validation_regex) {
+            this.invalid = !this.validation_regex.test(this.value);
+        }
     }
 });
 
@@ -639,15 +766,29 @@ openerp.base.form.FieldBoolean = openerp.base.form.Field.extend({
         this._super.apply(this, arguments);
         this.$element.find('input')[0].checked = value;
     },
+    set_value_from_ui: function() {
+        this.value = this.$element.find('input').is(':checked');
+    },
     update_dom: function() {
         this._super.apply(this, arguments);
-        this.$element.find('textarea').attr('disabled', this.readonly);
+        this.$element.find('input').attr('disabled', this.readonly);
     },
-    on_ui_change: function() {
-        this._super.apply(this, arguments);
-        this.value = this.$element.find('input').is(':checked');
+    validate: function() {
         this.invalid = this.required && !this.value;
-        this.view.on_form_changed(this);
+    }
+});
+
+openerp.base.form.FieldProgressBar = openerp.base.form.Field.extend({
+    init: function(view, node) {
+        this._super(view, node);
+        this.template = "FieldProgressBar";
+    },
+    start: function() {
+        this._super.apply(this, arguments);
+        this.$element.find('div').progressbar({
+            value: this.value,
+            disabled: this.readonly
+        });
     }
 });
 
@@ -672,15 +813,15 @@ openerp.base.form.FieldSelection = openerp.base.form.Field.extend({
             this.$element.find('select')[0].selectedIndex = 0;
         }
     },
+    set_value_from_ui: function() {
+        this.value = this.$element.find('select').val();
+    },
     update_dom: function() {
         this._super.apply(this, arguments);
         this.$element.find('select').attr('disabled', this.readonly);
     },
-    on_ui_change: function() {
-        this._super.apply(this, arguments);
-        this.value = this.$element.find('select').val();
-        this.invalid = this.required && this.value == "";
-        this.view.on_form_changed(this);
+    validate: function() {
+        this.invalid = this.required && this.value === "";
     }
 });
 
@@ -691,7 +832,7 @@ openerp.base.form.FieldMany2One = openerp.base.form.Field.extend({
     },
     set_value: function(value) {
         this._super.apply(this, arguments);
-        var show_value = ''
+        var show_value = '';
         if (value != null && value !== false) {
             show_value = value[1];
             this.value = value[0];
@@ -706,17 +847,15 @@ openerp.base.form.FieldOne2ManyDatasSet = openerp.base.DataSetStatic.extend({
     write: function (id, data, callback) {
         this._super(id, data, callback);
     },
-    write: function (id, data, callback) {
-        this._super(id, data, callback);
-    },
     unlink: function() {
+        this.notification.notify('Unlinking o2m ' + this.ids);
     }
 });
 
 openerp.base.form.FieldOne2ManyViewManager = openerp.base.ViewManager.extend({
     init: function(session, element_id, dataset, views) {
         this._super(session, element_id, dataset, views);
-    },
+    }
 });
 
 openerp.base.form.FieldOne2Many = openerp.base.form.Field.extend({
@@ -733,12 +872,14 @@ openerp.base.form.FieldOne2Many = openerp.base.form.Field.extend({
         this.viewmanager = new openerp.base.form.FieldOne2ManyViewManager(this.view.session, this.element_id, this.dataset, views);
         this.viewmanager.start();
     },
-    set_value_CASSEEEEEEEEEEEEEEEEE: function(value) {
+    set_value: function(value) {
         this.value = value;
-        this.log("o2m.set_value",value);
-        this.viewmanager.dataset.ids = value;
-        this.viewmanager.dataset.ids.count = value.length;
-        this.viewmanager.views.list.controller.do_update();
+        if (value != false) {
+            this.log("o2m.set_value",value);
+            this.viewmanager.dataset.ids = value;
+            this.viewmanager.dataset.count = value.length;
+            this.viewmanager.views.list.controller.do_update();
+        }
     },
     get_value: function(value) {
         return this.operations;
@@ -779,6 +920,7 @@ openerp.base.form.widgets = new openerp.base.Registry({
     'email' : 'openerp.base.form.FieldEmail',
     'url' : 'openerp.base.form.FieldUrl',
     'text' : 'openerp.base.form.FieldText',
+    'text_wiki' : 'openerp.base.form.FieldText',
     'date' : 'openerp.base.form.FieldDate',
     'datetime' : 'openerp.base.form.FieldDatetime',
     'selection' : 'openerp.base.form.FieldSelection',
@@ -788,7 +930,10 @@ openerp.base.form.widgets = new openerp.base.Registry({
     'one2many_list' : 'openerp.base.form.FieldOne2Many',
     'reference' : 'openerp.base.form.FieldReference',
     'boolean' : 'openerp.base.form.FieldBoolean',
-    'float' : 'openerp.base.form.FieldFloat'
+    'float' : 'openerp.base.form.FieldFloat',
+    'integer': 'openerp.base.form.FieldFloat',
+    'progressbar': 'openerp.base.form.FieldProgressBar',
+    'float_time': 'openerp.base.form.FieldFloat'
 });
 
 };
diff --git a/addons/base/static/src/js/list.js b/addons/base/static/src/js/list.js
index 1f5a6eec044..5a08b96ac14 100644
--- a/addons/base/static/src/js/list.js
+++ b/addons/base/static/src/js/list.js
@@ -1,91 +1,254 @@
-
 openerp.base.list = function (openerp) {
-
 openerp.base.views.add('list', 'openerp.base.ListView');
-openerp.base.ListView = openerp.base.Controller.extend({
-    init: function(view_manager, session, element_id, dataset, view_id) {
+openerp.base.ListView = openerp.base.Controller.extend(
+    /** @lends openerp.base.ListView# */ {
+    defaults: {
+        // records can be selected one by one
+        'selectable': true,
+        // list rows can be deleted
+        'deletable': true,
+        // whether the column headers should be displayed
+        'header': true,
+        // display addition button, with that label
+        'addable': "New"
+    },
+    /**
+     * @constructs
+     * @param view_manager
+     * @param session An OpenERP session object
+     * @param element_id the id of the DOM elements this view should link itself to
+     * @param {openerp.base.DataSet} dataset the dataset the view should work with
+     * @param {String} view_id the listview's identifier, if any
+     * @param {Object} options A set of options used to configure the view
+     * @param {Boolean} [options.selectable=true] determines whether view rows are selectable (e.g. via a checkbox)
+     * @param {Boolean} [options.header=true] should the list's header be displayed
+     * @param {Boolean} [options.deletable=true] are the list rows deletable
+     * @param {null|String} [options.addable="New"] should the new-record button be displayed, and what should its label be. Use ``null`` to hide the button.
+     */
+    init: function(view_manager, session, element_id, dataset, view_id, options) {
         this._super(session, element_id);
         this.view_manager = view_manager;
         this.dataset = dataset;
         this.model = dataset.model;
         this.view_id = view_id;
-        this.name = "";
-        // TODO: default to action.limit
-        // TODO: decide if limit is a property of DataSet and thus global to all views (calendar ?)
-        this.limit = 80;
 
-        this.cols = [];
+        this.columns = [];
+        this.rows = [];
 
-        this.$table = null;
-        this.colnames = [];
-        this.colmodel = [];
-
-        this.event_loading = false; // TODO in the future prevent abusive click by masking
+        this.options = _.extend({}, this.defaults, options || {});
     },
     start: function() {
-        //this.log('Starting ListView '+this.model+this.view_id)
-        return this.rpc("/base/listview/load", {"model": this.model, "view_id":this.view_id}, this.on_loaded);
+        this.$element.addClass('oe-listview');
+        return this.rpc("/base/listview/load", {"model": this.model, "view_id":this.view_id,
+            toolbar:!!this.view_manager.sidebar}, this.on_loaded);
     },
     on_loaded: function(data) {
+        var self = this;
         this.fields_view = data.fields_view;
         //this.log(this.fields_view);
         this.name = "" + this.fields_view.arch.attrs.string;
-        this.$element.html(QWeb.render("ListView", {"fields_view": this.fields_view}));
-        this.$table = this.$element.find("table");
-        this.cols = [];
-        this.colnames = [];
-        this.colmodel = [];
-        // TODO uss a object for each col, fill it with view and fallback to dataset.model_field
-        var tree = this.fields_view.arch.children;
-        for(var i = 0; i < tree.length; i++)  {
-            var col = tree[i];
-            if(col.tag == "field") {
-                this.cols.push(col.attrs.name);
-                this.colnames.push(col.attrs.name);
-                this.colmodel.push({ name: col.attrs.name, index: col.attrs.name });
-            }
-        }
-        this.dataset.fields = this.cols;
 
-        var width = this.$element.width();
-        this.$table.jqGrid({
-            datatype: "local",
-            height: "100%",
-            rowNum: 100,
-            //rowList: [10,20,30],
-            colNames: this.colnames,
-            colModel: this.colmodel,
-            //pager: "#plist47",
-            viewrecords: true,
-            caption: this.name
-        }).setGridWidth(width);
+        var fields = this.fields_view.fields;
+        var domain_computer = openerp.base.form.compute_domain;
+        this.columns = _(this.fields_view.arch.children).chain()
+            .map(function (field) {
+                var name = field.attrs.name;
+                var column = _.extend({id: name, tag: field.tag},
+                                      field.attrs, fields[name]);
+                // attrs computer
+                if (column.attrs) {
+                    var attrs = eval('(' + column.attrs + ')');
+                    column.attrs_for = function (fields) {
+                        var result = {};
+                        for (var attr in attrs) {
+                            result[attr] = domain_computer(attrs[attr], fields);
+                        }
+                        return result;
+                    };
+                } else {
+                    column.attrs_for = function () { return {}; };
+                }
+                return column;
+            }).value();
+
+        this.visible_columns = _.filter(this.columns, function (column) {
+            return column.invisible !== '1';
+        });
+        this.$element.html(QWeb.render("ListView", this));
+
+        // Head hook
+        this.$element.find('#oe-list-add').click(this.do_add_record);
+        this.$element.find('#oe-list-delete')
+                .hide()
+                .click(this.do_delete_selected);
+
+        var $table = this.$element.find('table');
+        // Cell events
+        $table.delegate(
+            'th.oe-record-selector', 'click', function (e) {
+                // TODO: ~linear performances, would a simple counter work?
+                if ($table.find('th.oe-record-selector input:checked').length) {
+                    $table.find('#oe-list-delete').show();
+                } else {
+                    $table.find('#oe-list-delete').hide();
+                }
+                // A click in the selection cell should not activate the
+                // linking feature
+                e.stopImmediatePropagation();
+        });
+        $table.delegate(
+            'td.oe-field-cell button', 'click', function (e) {
+                var $cell = $(e.currentTarget).closest('td');
+                var col_index = $cell.prevAll('td').length;
+                var field = self.visible_columns[col_index];
+                var action = field.name;
+
+                var $row = $cell.parent('tr');
+                var row = self.rows[$row.prevAll().length];
+
+                var context = _.extend(
+                        {}, self.dataset.context, field.context || {});
+                self.dataset.call(action, [row.data.id.value], [context],
+                                  self.do_reload);
+                e.stopImmediatePropagation();
+            });
+        $table.delegate(
+                'td.oe-record-delete button', 'click', this.do_delete);
+
+        // Global rows handlers
+        $table.delegate(
+                'tr', 'click', this.on_select_row);
 
-        var self = this;
-        $(window).bind('resize', function() {
-            self.$element.children().hide();
-            self.$table.setGridWidth(self.$element.width());
-            self.$element.children().show();
-        }).trigger('resize');
-        
         // sidebar stuff
-        if (this.view_manager.sidebar)
-            this.view_manager.sidebar.load_multi_actions();
+        if (this.view_manager.sidebar) {
+            this.view_manager.sidebar.set_toolbar(data.fields_view.toolbar);
+        }
     },
+    /**
+     * Fills the table with the provided records after emptying it
+     *
+     * @param {Array} records the records to fill the list view with
+     * @returns {Promise} promise to the end of view rendering (list views are asynchronously filled for improved responsiveness)
+     */
     do_fill_table: function(records) {
-        this.$table
-            .clearGridData()
-            .addRowData('id', records);
+        var $table = this.$element.find('table');
+        this.rows = records;
+
+        // Keep current selected record, if it's still in our new search
+        var current_record_id = this.dataset.ids[this.dataset.index];
+        this.dataset.ids = _(records).chain().map(function (record) {
+            return record.data.id.value;
+        }).value();
+        this.dataset.index = _.indexOf(this.dataset.ids, current_record_id);
+        if (this.dataset.index < 0) {
+            this.dataset.index = 0;
+        }
+        
+        this.dataset.count = this.dataset.ids.length;
+        var results = this.rows.length;
+        $table.find('.oe-pager-last').text(results);
+        $table.find('.oe-pager-total').text(results);
+
+
+        // remove all data lines
+        var $old_body = $table.find('tbody');
+
+        // add new content
+        var columns = this.columns,
+            rows = this.rows,
+            options = this.options;
+
+        // Paginate by groups of 50 for rendering
+        var PAGE_SIZE = 50,
+            bodies_count = Math.ceil(this.rows.length / PAGE_SIZE),
+            body = 0,
+            $body = $('<tbody class="ui-widget-content">').appendTo($table);
+
+        var rendered = $.Deferred();
+        var render_body = function () {
+            setTimeout(function () {
+                $body.append(
+                    QWeb.render("ListView.rows", {
+                        columns: columns,
+                        rows: rows.slice(body*PAGE_SIZE, (body+1)*PAGE_SIZE),
+                        options: options
+                }));
+                ++body;
+                if (body < bodies_count) {
+                    render_body();
+                } else {
+                    rendered.resolve();
+                }
+            }, 0);
+        };
+        render_body();
+
+        return rendered.promise().then(function () {
+            $old_body.remove();
+        });
     },
+    /**
+     * Asks the view manager to switch to a different view, using the provided
+     * record index (within the current dataset).
+     *
+     * If the index is null, ``switch_to_record`` asks for the creation of a
+     * new record.
+     *
+     * @param {Number|null} index the record index (in the current dataset) to switch to
+     * @param {String} [view="form"] the view to switch to
+     */
+    switch_to_record:function (index, view) {
+        view = view || 'form';
+        this.dataset.index = index;
+        _.delay(_.bind(function () {
+            this.view_manager.on_mode_switch(view);
+        }, this));
+    },
+    on_select_row: function (event) {
+        var $target = $(event.currentTarget);
+        if (!$target.parent().is('tbody')) {
+            return;
+        }
+        // count number of preceding siblings to line clicked
+        var row = this.rows[$target.prevAll().length];
+
+        var index = _.indexOf(this.dataset.ids, row.data.id.value);
+        if (index == undefined || index === -1) {
+            return;
+        }
+            this.switch_to_record(index);
+        },
     do_show: function () {
-        // TODO: re-trigger search
         this.$element.show();
+        if (this.hidden) {
+            this.do_reload();
+            this.hidden = false;
+        }
     },
     do_hide: function () {
         this.$element.hide();
+        this.hidden = true;
+    },
+    /**
+     * Reloads the search view based on the current settings (dataset & al)
+     */
+    do_reload: function () {
+        // TODO: need to do 5 billion tons of pre-processing, bypass
+        // DataSet for now
+        //self.dataset.read_slice(self.dataset.fields, 0, self.limit,
+        // self.do_fill_table);
+        this.dataset.offset = 0;
+        this.dataset.limit = false;
+        return this.rpc('/base/listview/fill', {
+            'model': this.dataset.model,
+            'id': this.view_id,
+            'context': this.dataset.context,
+            'domain': this.dataset.domain
+        }, this.do_fill_table);
     },
     do_search: function (domains, contexts, groupbys) {
         var self = this;
-        this.rpc('/base/session/eval_domain_and_context', {
+        return this.rpc('/base/session/eval_domain_and_context', {
             domains: domains,
             contexts: contexts,
             group_by_seq: groupbys
@@ -93,12 +256,56 @@ openerp.base.ListView = openerp.base.Controller.extend({
             // TODO: handle non-empty results.group_by with read_group
             self.dataset.context = results.context;
             self.dataset.domain = results.domain;
-            self.dataset.read_slice(self.dataset.fields, 0, self.limit, self.do_fill_table);
+            return self.do_reload();
         });
     },
     do_update: function () {
         var self = this;
-        self.dataset.read_ids(self.dataset.ids, self.dataset.fields, self.do_fill_table);
+        //self.dataset.read_ids(self.dataset.ids, self.dataset.fields, self.do_fill_table);
+    },
+    /**
+     * Handles the signal to delete a line from the DOM
+     *
+     * @param e
+     */
+    do_delete: function (e) {
+        // don't link to forms
+        e.stopImmediatePropagation();
+        this.dataset.unlink(
+            [this.rows[$(e.currentTarget).closest('tr').prevAll().length].data.id.value]);
+    },
+    /**
+     * Handles signal for the addition of a new record (can be a creation,
+     * can be the addition from a remote source, ...)
+     *
+     * The default implementation is to switch to a new record on the form view
+     */
+    do_add_record: function () {
+        this.notification.notify('Add', "New record");
+        this.switch_to_record(null);
+    },
+    /**
+     * Handles deletion of all selected lines
+     */
+    do_delete_selected: function () {
+        var selection = this.get_selection();
+        if (selection.length) {
+            this.dataset.unlink(selection);
+        }
+    },
+    /**
+     * Gets the ids of all currently selected records, if any
+     * @returns a list of ids, empty if no record is selected (or the list view is not selectable
+     */
+    get_selection: function () {
+        if (!this.options.selectable) {
+            return [];
+        }
+        var rows = this.rows;
+        return this.$element.find('th.oe-record-selector input:checked')
+                .closest('tr').map(function () {
+            return rows[$(this).prevAll().length].data.id.value;
+        }).get();
     }
 });
 
diff --git a/addons/base/static/src/js/search.js b/addons/base/static/src/js/search.js
index 3d3bb016a82..0f4ab8585b8 100644
--- a/addons/base/static/src/js/search.js
+++ b/addons/base/static/src/js/search.js
@@ -12,6 +12,8 @@ openerp.base.SearchView = openerp.base.Controller.extend({
 
         this.inputs = [];
         this.enabled_filters = [];
+
+        this.has_focus = false;
     },
     start: function() {
         //this.log('Starting SearchView '+this.model+this.view_id)
@@ -47,6 +49,10 @@ openerp.base.SearchView = openerp.base.Controller.extend({
                 row = [];
                 rows.push(row);
             } else if (item.tag === 'filter') {
+                if (!this.has_focus) {
+                    item.attrs.default_focus = '1';
+                    this.has_focus = true;
+                }
                 filters.push(
                     new openerp.base.search.Filter(
                         item, this));
@@ -59,6 +65,10 @@ openerp.base.SearchView = openerp.base.Controller.extend({
                         new openerp.base.search.Group(
                             item, this, fields));
                 } else if (item.tag === 'field') {
+                    if (!this.has_focus) {
+                        item.attrs.default_focus = '1';
+                        this.has_focus = true;
+                    }
                     row.push(
                         this.make_field(
                             item, fields[item['attrs'].name]));
@@ -113,6 +123,7 @@ openerp.base.SearchView = openerp.base.Controller.extend({
         });
         this.$element.html(render);
 
+        var f = this.$element.find('form');
         this.$element.find('form')
                 .submit(this.do_search)
                 .bind('reset', this.do_clear);
@@ -134,9 +145,12 @@ openerp.base.SearchView = openerp.base.Controller.extend({
      */
     do_search: function (e) {
         if (e && e.preventDefault) { e.preventDefault(); }
+
+        //debugger;
         var domains = [], contexts = [];
 
         var errors = [];
+
         _.each(this.inputs, function (input) {
             try {
                 var domain = input.get_domain();
@@ -187,7 +201,8 @@ openerp.base.SearchView = openerp.base.Controller.extend({
      * @param {Array} contexts an array of literal contexts or context refs
      * @param {Array} groupbys ordered contexts which may or may not have group_by keys
      */
-    on_search: function (domains, contexts, groupbys) { },
+    on_search: function (domains, contexts, groupbys) {
+    },
     /**
      * Triggered after a validation error in the SearchView fields.
      *
@@ -199,7 +214,9 @@ openerp.base.SearchView = openerp.base.Controller.extend({
      * @event
      * @param {Array} errors a never-empty array of error objects
      */
-    on_invalid: function (errors) { },
+    on_invalid: function (errors) {
+        this.notification.notify("Invalid Search", "triggered from search view");
+    },
     do_clear: function (e) {
         if (e && e.preventDefault) { e.preventDefault(); }
         this.on_clear();
@@ -800,24 +817,27 @@ openerp.base.search.ExtendedSearchProposition = openerp.base.BaseWidget.extend({
             return;
         }
 
+        var type = field.type;
         try {
-            this.value = new (openerp.base.search.custom_filters.get_object(field.type))
-                              (this);
-            _.each(this.value.operators, function(operator) {
-                var option = jQuery('<option>', {value: operator.value})
-                    .text(operator.text)
-                    .appendTo(_this.$element.find('.searchview_extended_prop_op'));
-            });
-            this.$element.find('.searchview_extended_prop_value').html(
-                this.value.render({}));
-            this.value.start();
+            openerp.base.search.custom_filters.get_object(type);
         } catch (e) {
             if (! e instanceof openerp.base.KeyNotFound) {
                 throw e;
             }
-            this.attrs.selected = null;
+            var type = "char";
             this.log('Unknow field type ' + e.key);
         }
+        this.value = new (openerp.base.search.custom_filters.get_object(type))
+                          (this);
+        _.each(this.value.operators, function(operator) {
+            var option = jQuery('<option>', {value: operator.value})
+                .text(operator.text)
+                .appendTo(_this.$element.find('.searchview_extended_prop_op'));
+        });
+        this.$element.find('.searchview_extended_prop_value').html(
+            this.value.render({}));
+        this.value.start();
+        
     },
     get_proposition: function() {
         if ( this.attrs.selected == null)
diff --git a/addons/base/static/src/js/views.js b/addons/base/static/src/js/views.js
index fff4224274a..f79d0e611eb 100644
--- a/addons/base/static/src/js/views.js
+++ b/addons/base/static/src/js/views.js
@@ -9,19 +9,51 @@ openerp.base.ActionManager = openerp.base.Controller.extend({
     init: function(session, element_id) {
         this._super(session, element_id);
         this.viewmanager = null;
+        this.dialog_stack = []
+        // Temporary linking view_manager to session.
+        // Will use controller_parent to find it when implementation will be done.
+        session.action_manager = this;
     },
     /**
      * Process an action
      * Supported actions: act_window
      */
     do_action: function(action) {
+        this.log(action);
+        var self = this;
         // instantiate the right controllers by understanding the action
-        if(action.type == "ir.actions.act_window") {
-            if (this.viewmanager) {
-                this.viewmanager.stop();
-            }
-            this.viewmanager = new openerp.base.ViewManagerAction(this.session,this.element_id, action, false);
-            this.viewmanager.start();
+        switch (action.type) {
+            case 'ir.actions.act_window':
+                if (action.target == 'new') {
+                    var element_id = _.uniqueId("act_window_dialog");
+                    var dialog = $('<div id="'+element_id+'"></div>');
+                    dialog.dialog({
+                        title: action.name,
+                        modal: true,
+                        width: '50%',
+                        height: 'auto'
+                    }).bind('dialogclose', function(event) {
+                        // When dialog is closed with ESC key or close manually, branch to act_window_close logic
+                        self.do_action({ type: 'ir.actions.act_window_close' });
+                    });
+                    var viewmanager = new openerp.base.ViewManagerAction(this.session ,element_id, action, false);
+                    viewmanager.start();
+                    this.dialog_stack.push(viewmanager);
+                } else if (action.target == "current") {
+                    if (this.viewmanager) {
+                        this.viewmanager.stop();
+                    }
+                    this.viewmanager = new openerp.base.ViewManagerAction(this.session,this.element_id, action, true);
+                    this.viewmanager.start();
+                }
+                break;
+            case 'ir.actions.act_window_close':
+                var dialog = this.dialog_stack.pop();
+                dialog.$element.dialog('destroy');
+                dialog.stop();
+                break;
+            default:
+                console.log(_.sprintf("Action manager can't handle action of type %s", action.type), action);
         }
     }
 });
@@ -93,7 +125,7 @@ openerp.base.ViewManager =  openerp.base.Controller.extend({
         for (var i in this.views) {
             if (this.views[i].controller) {
                 if (i === view_type) {
-                    this.views[i].controller.do_show();
+                    $.when(view_promise).then(this.views[i].controller.do_show);
                 } else {
                     this.views[i].controller.do_hide();
                 }
@@ -113,8 +145,10 @@ openerp.base.ViewManager =  openerp.base.Controller.extend({
             this.searchview.stop();
         }
         this.searchview = new openerp.base.SearchView(this, this.session, this.element_id + "_search", this.dataset, view_id, search_defaults);
-        this.searchview.on_search.add(function() {
-            self.views[self.active_view].controller.do_search.apply(self, arguments);
+        this.searchview.on_search.add(function(domains, contexts, groupbys) {
+            self.views[self.active_view].controller.do_search.call(
+                self, domains.concat(self.domains()),
+                      contexts.concat(self.contexts()), groupbys);
         });
         return this.searchview.start();
     },
@@ -128,6 +162,23 @@ openerp.base.ViewManager =  openerp.base.Controller.extend({
     on_remove: function() {
     },
     on_edit: function() {
+    },
+    /**
+     * Domains added on searches by the view manager, to override in subsequent
+     * view manager in order to add new pieces of domains to searches
+     *
+     * @returns an empty list
+     */
+    domains: function () {
+        return [];
+    },
+    /**
+     * Contexts added on searches by the view manager.
+     *
+     * @returns an empty list
+     */
+    contexts: function () {
+        return [];
     }
 });
 
@@ -141,7 +192,6 @@ openerp.base.ViewManagerAction = openerp.base.ViewManager.extend({
             this.sidebar = new openerp.base.Sidebar(null, this);
     },
     start: function() {
-        var self = this;
         var inital_view_loaded = this._super();
 
         // init sidebar
@@ -150,8 +200,6 @@ openerp.base.ViewManagerAction = openerp.base.ViewManager.extend({
             this.sidebar.start();
         }
 
-        // init search view
-        var view_id = this.action.search_view_id ? this.action.search_view_id[0] || false : false;
         var search_defaults = {};
         _.each(this.action.context, function (value, key) {
             var match = /^search_default_(.*)$/.exec(key);
@@ -159,10 +207,15 @@ openerp.base.ViewManagerAction = openerp.base.ViewManager.extend({
                 search_defaults[match[1]] = value;
             }
         });
-        var searchview_loaded = this.setup_search_view(view_id,search_defaults);
+
+        // init search view
+        var searchview_id = this.action.search_view_id && this.action.search_view_id[0];
+
+        var searchview_loaded = this.setup_search_view(
+                searchview_id || false, search_defaults);
 
         // schedule auto_search
-        if (this.action['auto_search']) {
+        if (searchview_loaded != null && this.action['auto_search']) {
             $.when(searchview_loaded, inital_view_loaded)
                 .then(this.searchview.do_search);
         }
@@ -174,96 +227,27 @@ openerp.base.ViewManagerAction = openerp.base.ViewManager.extend({
         }
         this._super();
     },
-});
-
-openerp.base.BaseWidget = openerp.base.Controller.extend({
     /**
-     * The name of the QWeb template that will be used for rendering. Must be redifined
-     * in subclasses or the render() method can not be used.
-     * 
-     * @type string
-     */
-    template: null,
-    /**
-     * The prefix used to generate an id automatically. Should be redifined in subclasses.
-     * If it is not defined, a default identifier will be used.
-     * 
-     * @type string
-     */
-    identifier_prefix: 'generic-identifier',
-    /**
-     * Base class for widgets. Handle rendering (based on a QWeb template), identifier
-     * generation, parenting and destruction of the widget.
-     * Contructor. Also initialize the identifier.
-     * 
-     * @params {openerp.base.search.BaseWidget} parent The parent widget.
-     */
-    init: function (parent, session) {
-        this._super(session);
-        this.children = [];
-        this.parent = null;
-        this.set_parent(parent);
-        this.make_id(this.identifier_prefix);
-    },
-    /**
-     * Sets and returns a globally unique identifier for the widget.
+     * adds action domain to the search domains
      *
-     * If a prefix is appended, the identifier will be appended to it.
+     * @returns the action's domain
+     */
+    domains: function () {
+        if (!this.action.domain) {
+            return [];
+        }
+        return [this.action.domain];
+    },
+    /**
+     * adds action context to the search contexts
      *
-     * @params sections prefix sections, empty/falsy sections will be removed
+     * @returns the action's context
      */
-    make_id: function () {
-        this.element_id = _.uniqueId(_.toArray(arguments).join('_'));
-        return this.element_id;
-    },
-    /**
-     * "Starts" the widgets. Called at the end of the rendering, this allows
-     * to get a jQuery object referring to the DOM ($element attribute).
-     */
-    start: function () {
-        this._super();
-        var tmp = document.getElementById(this.element_id);
-        this.$element = tmp ? $(tmp) : null;
-    },
-    /**
-     * "Stops" the widgets. Called when the view destroys itself, this
-     * lets the widgets clean up after themselves.
-     */
-    stop: function () {
-        var tmp_children = this.children;
-        this.children = [];
-        _.each(tmp_children, function(x) {
-            x.stop();
-        });
-        if(this.$element != null) {
-            this.$element.remove();
+    contexts: function () {
+        if (!this.action.context) {
+            return [];
         }
-        this.set_parent(null);
-        this._super();
-    },
-    /**
-     * Set the parent of this component, also unregister the previous parent if there
-     * was one.
-     * 
-     * @param {openerp.base.BaseWidget} parent The new parent.
-     */
-    set_parent: function(parent) {
-        if(this.parent) {
-            this.parent.children = _.without(this.parent.children, this);
-        }
-        this.parent = parent;
-        if(this.parent) {
-            parent.children.push(this);
-        }
-    },
-    /**
-     * Render the widget. This.template must be defined.
-     * The content of the current object is passed as context to the template.
-     * 
-     * @param {object} additional Additional context arguments to pass to the template.
-     */
-    render: function (additional) {
-        return QWeb.render(this.template, _.extend({}, this, additional != null ? additional : {}));
+        return [this.action.context];
     }
 });
 
@@ -274,27 +258,31 @@ openerp.base.Sidebar = openerp.base.BaseWidget.extend({
         this.view_manager = view_manager;
         this.sections = [];
     },
-    load_multi_actions: function() {
-        if (_.detect(this.sections, function(x) {return x.type=="multi_actions";}) != undefined)
-            return;
+    set_toolbar: function(toolbar) {
+        this.sections = [];
         var self = this;
-        this.rpc("/base/sidebar/get_actions",
-                {"model": this.view_manager.dataset.model}, function(result) {
-            self.sections.push({type: "multi_actions", elements:
-            _.map(result, function(x) {return {text:x[2].name, action:x}; })});
-            self.refresh();
+        _.each([["print", "Reports"], ["action", "Actions"], ["relate", "Links"]], function(type) {
+            if (toolbar[type[0]].length == 0)
+                return;
+            var section = {elements:toolbar[type[0]], label:type[1]};
+            self.sections.push(section);
         });
+        this.refresh();
     },
     refresh: function() {
         this.$element.html(QWeb.render("ViewManager.sidebar.internal", _.extend({_:_}, this)));
         var self = this;
+        this.$element.find(".toggle-sidebar").click(function(e) {
+            self.$element.toggleClass('open-sidebar closed-sidebar');
+            e.stopPropagation();
+            e.preventDefault();
+        });
         this.$element.find("a").click(function(e) {
-            $this = jQuery(this);
+            var $this = jQuery(this);
             var i = $this.attr("data-i");
-            var j = $this.attr("data-i");
+            var j = $this.attr("data-j");
             var action = self.sections[i].elements[j];
-            // I know this doesn't work, one day it will
-            new openerp.base.ActionManager(this.view_manager, null).do_action(action);
+            (new openerp.base.ExternalActionManager(self.view_manager.session, null)) .handle_action(action);
             e.stopPropagation();
             e.preventDefault();
         });
@@ -305,6 +293,31 @@ openerp.base.Sidebar = openerp.base.BaseWidget.extend({
     }
 });
 
+openerp.base.ExternalActionManager = openerp.base.Controller.extend({
+    handle_action: function(action) {
+        if(action.type=="ir.actions.act_window") {
+            if(action.target=="new") {
+                var element_id = _.uniqueId("act_window_dialog");
+                var dialog = $('<div id="'+element_id+'"></div>');
+                dialog.dialog({
+                    title: action.name
+                });
+                var viewmanager = new openerp.base.ViewManagerAction(this.session ,element_id, action, false);
+                viewmanager.start();
+            } else if (action.target == "current") {
+                this.rpc("/base/session/save_session_action", {the_action:action}, function(key) {
+                    var url = window.location.protocol + "//" + window.location.host +
+                            window.location.pathname + "?" + jQuery.param({s_action:""+key});
+                    window.open(url);
+                });
+            }
+        }
+        // TODO: show an error like "not implemented" here
+        // since we don't currently have any way to handle errors do you have any better idea
+        // than using todos?
+    }
+});
+
 openerp.base.views.add('calendar', 'openerp.base.CalendarView');
 openerp.base.CalendarView = openerp.base.Controller.extend({
     start: function () {
diff --git a/addons/base/static/src/xml/base.xml b/addons/base/static/src/xml/base.xml
index 06930985429..a74766af525 100644
--- a/addons/base/static/src/xml/base.xml
+++ b/addons/base/static/src/xml/base.xml
@@ -21,7 +21,8 @@
     <div style="position: absolute; right: 2px; top: 38px;">
         <button onclick="QWeb.add_template('base.xml'); $('body').css('background-color', '#FFFF9C'); setTimeout(function() { $('body').css('background-color', '#FFF'); }, 500);">Reload QWEB</button>
     </div>
-    <table border="0" cellpadding="0" cellspacing="0" width="100%" height="100%" class="main_table">
+    <table border="0" cellpadding="0" cellspacing="0" width="100%" height="100%"
+        t-att-class="'main_table' + (typeof kitten == 'undefined' ? '' : ' kitten-mode-activated')">
     <tr>
         <td colspan="2">
             <div id="oe_header" class="header"></div>
@@ -40,8 +41,8 @@
     </tr>
     <tr>
         <td colspan="2">
-            <div id="oe_footer" class="footer">
-                Powered by OpenERP.
+            <div id="oe_footer" class="oe_footer">
+                <p class="oe_footer_powered">Powered by <a href="http://www.openerp.com">openerp.com</a>.</p>
             </div>
         </td>
     </tr>
@@ -60,7 +61,8 @@
 </t>
 <t t-name="Header">
     <a href="/" class="company_logo_link">
-        <img src="/base/static/src/img/logo.png" border="0" class="company_logo"/>
+        <img t-att-src="typeof kitten == 'undefined' ? '/base/static/src/img/logo.png' :
+            'http://placekitten.com/g/179/46'" border="0" class="company_logo"/>
     </a>
     <h1 class="header_title" t-if="session.session_is_valid()">
         <span class="company">$company</span> - (<span class="database">$database</span>)<br/>
@@ -152,43 +154,86 @@
 	</tr>
     </table>
 </t>
-<t t-name="ListView">
-    <!--
-    <h3><t t-esc="fields_view.arch['@string']"/></h3>
-    -->
-    <div class="oe_list_header">
-        <div class="oe_list_buttons">
-            <!--<button type="button" class="oe_list_button_new">New</button>-->
-        </div>
-        <div class="oe_list_pager">
-            <button type="button" data-pager-action="first">First</button>
-            <button type="button" data-pager-action="previous">&lt;&lt;</button>
+<table t-name="ListView">
+    <t t-set="columns_count" t-value="visible_columns.length + (options.selectable ? 1 : 0) + (options.deletable ? 1 : 0)"/>
+    <t t-set="actions_span" t-value="Math.floor((options.deletable or options.addable) ? columns_count/2 : 0)"/>
+    <thead class="ui-widget-header">
+        <tr t-if="options.selectable">
+            <th t-if="actions_span" t-att-colspan="actions_span"
+                class="oe-actions">
+                <button type="button" id="oe-list-add"
+                        t-if="options.addable">
+                    <t t-esc="options.addable"/>
+                </button>
+                <button type="button" id="oe-list-delete"
+                        t-if="options.deletable">
+                    Delete
+                </button>
+            </th>
+            <th t-att-colspan="columns_count - actions_span"
+                class="oe-list-pager">
+                <button type="button" data-pager-action="first">First</button>
+                <button type="button" data-pager-action="previous"
+                        >&lt;&lt;</button>
 
-            <span class="oe_pager_index">0</span> / <span class="oe_pager_count">0</span>
+                <span class="oe-pager-first">1</span>
+                to <span class="oe-pager-last">1</span>
+                of <span class="oe-pager-total">1</span>
 
-            <button type="button" data-pager-action="next">&gt;&gt;</button>
-            <button type="button" data-pager-action="last">Last</button>
-        </div>
-    </div>
-    <br style="clear: both;"/>
-    <table id="todo_use_unique_id" class="jqGrid"></table>
-</t>
-<t t-name="GanttView">
-	<h3 class="title"><t t-esc="view.fields_view.arch.attrs.string"/></h3>
-	<table class="gantt-view" width="100%" height="100%" cellspacing="0" cellpadding="0">
-		<tr>
-			<td style="width:85%">
-				<div style="width:100%;height:300px;position:relative" id="GanttDiv"></div>
-			</td>
-			<td valign = "top">
-				<div id="gantt-sidebar"></div>
-			</td>
-		</tr>
-	</table>
+                <button type="button" data-pager-action="next">&gt;&gt;</button>
+                <button type="button" data-pager-action="last">Last</button>
+            </th>
+        </tr>
+        <tr t-if="options.header">
+            <th t-if="options.selectable"/>
+            <t t-foreach="columns" t-as="column">
+                <th t-if="column.invisible !== '1'">
+                    <t t-if="column.tag !== 'button'">
+                        <t t-esc="column.string"/>
+                    </t>
+                </th>
+            </t>
+            <th t-if="options.deletable"/>
+        </tr>
+    </thead>
+</table>
+<t t-name="ListView.rows" t-foreach="rows" t-as="row">
+    <t t-call="ListView.row">
+        <t t-set="style" t-value="null"/>
+        <t-if test="row.color">
+            <t t-set="style" t-value="'color: ' + row.color"/>
+        </t-if>
+    </t>
 </t>
+<tr t-name="ListView.row" t-att-style="style" t-att-class="row_parity">
+    <th t-if="options.selectable" class="oe-record-selector">
+        <input type="checkbox"/>
+    </th>
+    <t t-foreach="columns" t-as="column">
+        <t t-set="attrs" t-value="column.attrs_for(row.data)"/>
+        <td t-if="column.invisible !== '1'" t-att-title="column.help"
+            class="oe-field-cell">
+            <t t-if="!attrs.invisible">
+                <t t-set="is_button" t-value="column.tag === 'button'"/>
+                <!-- TODO: get correct widget from form -->
+                <t t-if="!is_button and row['data'][column.id].value">
+                    <t t-esc="row['data'][column.id].value"/>
+                </t>
+                <button type="button" t-att-title="column.help"
+                        t-if="is_button">
+                    <img t-att-src="'/base/static/src/img/icons/' + column.icon + '.png'"
+                         t-att-alt="column.string"/>
+                </button>
+            </t>
+        </td>
+    </t>
+    <td t-if="options.deletable" class='oe-record-delete'>
+        <button type="button" name="delete">â™»</button>
+    </td>
+</tr>
 <t t-name="FormView">
     <h2 class="oe_view_title"><t t-esc="view.fields_view.arch.attrs.string"/></h2>
-    <div class="oe_form_header">
+    <div class="oe_form_header" t-att-id="view.element_id + '_header'">
         <div class="oe_form_buttons">
             <!--<button type="button" class="oe_form_button_save">Save</button>-->
             <button type="button" class="oe_form_button_save_edit">Save &amp; Edit</button>
@@ -259,11 +304,13 @@
     </div>
 </t>
 <t t-name="WidgetLabel">
-    <label t-att-for="widget.element_id + '_field'" t-att-title="widget.help" style="display: block; text-align: right;"
+    <label t-att-for="widget.element_id + '_field'"
+           t-att-class="'oe_form_label' + (widget.help ? '_help' : '')"
+           t-att-title="widget.help"
            t-att-ondblclick="'console.log(\'' + widget.element_id + '\', openerp.screen.' + widget.element_id + ')'">
         <t t-esc="widget.string"/>
         <span t-if="widget.help">?</span>
-        :
+        <t t-if="widget.string">:</t>
     </label>
 </t>
 <t t-name="FieldChar">
@@ -333,6 +380,9 @@
         t-att-id="widget.element_id + '_field'"
         t-att-class="'field_' + widget.type"/>
 </t>
+<t t-name="FieldProgressBar">
+    <div t-opentag="true"></div>
+</t>
 <t t-name="WidgetButton">
     <button type="button"
         t-att-id="widget.element_id + '_button'"
@@ -353,7 +403,7 @@
     </form>
 </t>
 <t t-name="SearchView.render_lines">
-    <table border="0" cellspacing="0" cellpadding="0"
+    <table class="oe-searchview-render-line" border="0" cellspacing="0" cellpadding="0"
            t-foreach="lines" t-as="line">
         <tr>
             <td t-foreach="line" t-as="widget">
@@ -365,7 +415,8 @@
 <button t-name="SearchView.filter" type="button"
         t-att-id="element_id"
         t-att-title="attrs.help"
-        t-att-class="classes.join(' ')">
+        t-att-class="classes.join(' ')"
+        t-att-autofocus="attrs.default_focus === '1' ? 'autofocus' : undefined">
     <img t-if="attrs.icon" t-att-src="'/base/static/src/img/icons/' + attrs.icon + '.png'" width="16" height="16"/>
     <br t-if="attrs.icon and attrs.string"/>
     <t t-esc="attrs.string"/>
@@ -382,6 +433,7 @@
     </label>
     <div style="white-space: nowrap;">
         <input type="text" t-att-name="attrs.name"
+               t-att-autofocus="attrs.default_focus === '1' ? 'autofocus' : undefined"
                t-att-id="element_id"
                t-att-value="defaults[attrs.name] || ''"/>
         <t t-if="filters.length" t-raw="filters.render(defaults)"/>
@@ -395,7 +447,8 @@
     </label>
     <div style="white-space: nowrap;" t-att-id="element_id">
         <input t-att-name="attrs.name" type="text" class="field_date"
-               t-att-value="defaults[attrs.name] || ''"/>
+               t-att-value="defaults[attrs.name] || ''"
+               t-att-autofocus="attrs.default_focus === '1' ? 'autofocus' : undefined"/>
         to
         <input t-att-name="attrs.name" type="text" class="field_date"
                t-att-value="defaults[attrs.name] || ''"/>
@@ -409,7 +462,8 @@
         <span t-if="attrs.help">(?)</span>
     </label>
     <div style="white-space: nowrap;">
-        <select t-att-name="attrs.name" t-att-id="element_id">
+        <select t-att-name="attrs.name" t-att-id="element_id"
+                t-att-autofocus="attrs.default_focus === '1' || undefined">
             <option/>
             <t t-foreach="attrs.selection" t-as="option">
                 <t t-set="selected" t-value="defaults[attrs.name] === option[0]"/>
@@ -448,7 +502,7 @@
 <t t-name="SearchView.extended_search">
     <t t-call="SearchView.util.expand">
         <t t-set="expand" t-value="false"/>
-        <t t-set="label" t-value="'Extended Filters'"/>
+        <t t-set="label" t-value="'Custom Filters'"/>
         <t t-set="content">
             <div class="searchview_extended_groups_list"/>
             <button class="searchview_extended_add_group"
@@ -457,18 +511,17 @@
     </t>
 </t>
 <t t-name="SearchView.extended_search.group">
-    <div t-att-id="element_id">
+    <div t-att-id="element_id" class="searchview_extended_group">
         <select class="searchview_extended_group_choice">
-            <option value="all">All</option>
-            <option value="any">Any</option>
-            <option value="none">None</option>
+            <option value="all">All the following conditions must match</option>
+            <option value="any">Any of the following conditions must match</option>
+            <option value="none">None of the following conditions must match</option>
         </select>
+        <button class="searchview_extended_delete_group"
+                type="button">Delete this group of conditions</button>
         <div class="searchview_extended_propositions_list">
         </div>
-        <button class="searchview_extended_add_proposition"
-                type="button">Add condition</button>
-        <button class="searchview_extended_delete_group"
-                type="button">Delete this group</button>
+        <button class="searchview_extended_add_proposition" type="button">Add condition</button>
     </div>
 </t>
 <t t-name="SearchView.extended_search.proposition">
@@ -491,27 +544,33 @@
     <input t-att-id="element_id"/>
 </t>
 <t t-name="ViewManager.sidebar">
-    <div t-att-id="element_id" class="sidebar-main-div">
+    <div t-att-id="element_id" class="sidebar-main-div open-sidebar">
 
     </div>
 </t>
 <t t-name="ViewManager.sidebar.internal">
-    <t t-if="sections.length &gt; 0 &amp;&amp; _.detect(sections, function(x) {return x.elements.length &gt; 0;}) != undefined">
-    <div t-att-id="element_id" class="sidebar-sub-div">
-        <t t-set="i" t-value="0"/>
-        <t t-foreach="sections" t-as="section">
-        <t t-if="section.elements.length &gt; 0">
-        <ul>
-            <t t-set="j" t-value="0"/>
-            <t t-foreach="section.elements" t-as="element">
-                <li><a t-att-data-i="i" t-att-data-j="j" href="#"><t t-esc="element.text"/></a></li>
-                <t t-set="j+1" t-value="0"/>
-            </t>
-        </ul>
-        </t>
-        <t t-set="i" t-value="i+1"/>
-        </t>
-    </div>
+    <t t-set="the_condition" t-value="sections.length &gt; 0 &amp;&amp; _.detect(sections, function(x)
+        {return x.elements.length &gt; 0;}) != undefined"/>
+    <t t-if="the_condition">
+        <a class="toggle-sidebar"></a>
+        <div t-att-id="element_id" class="sidebar-sub-div">
+            <div class="sidebar-displaying-div">
+                <t t-set="i" t-value="0"/>
+                <t t-foreach="sections" t-as="section">
+                    <t t-if="section.elements.length &gt; 0">
+                    <h2><t t-esc="section.label"/></h2>
+                    <ul>
+                        <t t-set="j" t-value="0"/>
+                        <t t-foreach="section.elements" t-as="element">
+                            <li><a t-att-data-i="i" t-att-data-j="j" href="#"><t t-esc="element.name"/></a></li>
+                            <t t-set="j" t-value="j+1"/>
+                        </t>
+                    </ul>
+                    </t>
+                    <t t-set="i" t-value="i+1"/>
+                </t>
+            </div>
+        </div>
     </t>
 </t>
 <t t-name="DialogWarning">
diff --git a/addons/base/static/test/form.js b/addons/base/static/test/form.js
new file mode 100644
index 00000000000..6ae1719f620
--- /dev/null
+++ b/addons/base/static/test/form.js
@@ -0,0 +1,56 @@
+$(document).ready(function () {
+    var openerp;
+    module("form.widget", {
+        setup: function () {
+            openerp = window.openerp.init(true);
+            window.openerp.base.chrome(openerp);
+            // views loader stuff
+            window.openerp.base.data(openerp);
+            window.openerp.base.views(openerp);
+            window.openerp.base.form(openerp);
+        }
+    });
+    test("compute_domain", function () {
+        var fields = {
+            'a': {value: 3},
+            'group_method': {value: 'line'},
+            'select1': {value: 'day'},
+            'rrule_type': {value: 'monthly'}
+        };
+        ok(openerp.base.form.compute_domain(
+            [['a', '=', 3]], fields));
+        ok(openerp.base.form.compute_domain(
+            [['group_method','!=','count']], fields));
+        ok(openerp.base.form.compute_domain(
+            [['select1','=','day'], ['rrule_type','=','monthly']], fields));
+    });
+    test("compute_domain or", function () {
+        var base = {
+            'section_id': {value: null},
+            'user_id': {value: null},
+            'member_ids': {value: null}
+        };
+
+        var domain = ['|', ['section_id', '=', 42],
+                      '|', ['user_id','=',3],
+                           ['member_ids', 'in', [3]]];
+
+        ok(openerp.base.form.compute_domain(domain, _.extend(
+            {}, base, {'section_id': {value: 42}})));
+        ok(openerp.base.form.compute_domain(domain, _.extend(
+            {}, base, {'user_id': {value: 3}})));
+
+        ok(openerp.base.form.compute_domain(domain, _.extend(
+            {}, base, {'member_ids': {value: 3}})));
+    });
+    test("compute_domain not", function () {
+        var fields = {
+            'a': {value: 5},
+            'group_method': {value: 'line'}
+        };
+        ok(openerp.base.form.compute_domain(
+            ['!', ['a', '=', 3]], fields));
+        ok(openerp.base.form.compute_domain(
+            ['!', ['group_method','=','count']], fields));
+    });
+});
diff --git a/addons/base/static/test/list.js b/addons/base/static/test/list.js
new file mode 100644
index 00000000000..c0a34aa71be
--- /dev/null
+++ b/addons/base/static/test/list.js
@@ -0,0 +1,152 @@
+$(document).ready(function () {
+    /**
+     * Tests a jQuery collection against a selector ("ands" the .is() of each
+     * member of the collection, instead of "or"-ing them)
+     *
+     * @param {jQuery} $c a jQuery collection object
+     * @param {String} selector the selector to test the collection against
+     */
+    var are = function ($c, selector) {
+        return ($c.filter(function () { return $(this).is(selector); }).length
+                === $c.length);
+    };
+
+    var fvg = {fields_view: {
+        'fields': [],
+        'arch': {
+            'attrs': {string: ''}
+        }
+    }};
+
+    var openerp;
+    module("ListView", {
+        setup: function () {
+            openerp = window.openerp.init(true);
+            window.openerp.base.chrome(openerp);
+            // views loader stuff
+            window.openerp.base.data(openerp);
+            window.openerp.base.views(openerp);
+            window.openerp.base.form(openerp);
+            window.openerp.base.list(openerp);
+        }
+    });
+
+    asyncTest('render selection checkboxes', 2, function () {
+        var listview = new openerp.base.ListView(
+                {}, null,
+                'qunit-fixture', {model: null});
+
+        listview.on_loaded(fvg);
+
+        listview.do_fill_table([
+                {data: {id: {value: null}}},
+                {data: {id: {value: null}}},
+                {data: {id: {value: null}}}
+        ]).then(function () {
+            ok(are(listview.$element.find('tbody th'),
+                   '.oe-record-selector'));
+            ok(are(listview.$element.find('tbody th input'),
+                   ':checkbox:not([name])'));
+            start();
+        });
+    });
+    asyncTest('render no checkbox if selectable=false', 1, function () {
+        var listview = new openerp.base.ListView(
+                {}, null,
+                'qunit-fixture', {model: null}, false,
+                {selectable: false});
+
+        listview.on_loaded(fvg);
+
+        listview.do_fill_table([
+                {data: {id: {value: null}}},
+                {data: {id: {value: null}}},
+                {data: {id: {value: null}}}
+        ]).then(function () {
+            equal(listview.$element.find('tbody th').length, 0);
+            start();
+        });
+    });
+    asyncTest('select a bunch of records', 2, function () {
+        var listview = new openerp.base.ListView(
+                {}, null, 'qunit-fixture', {model: null});
+        listview.on_loaded(fvg);
+
+        listview.do_fill_table([
+                {data: {id: {value: 1}}},
+                {data: {id: {value: 2}}},
+                {data: {id: {value: 3}}}
+        ]).then(function () {
+            listview.$element.find('tbody th input:eq(2)')
+                             .attr('checked', true);
+            deepEqual(listview.get_selection(), [3]);
+            listview.$element.find('tbody th input:eq(1)')
+                             .attr('checked', true);
+            deepEqual(listview.get_selection(), [2, 3]);
+            start();
+        });
+    });
+    asyncTest('render deletion button if list is deletable', 1, function () {
+        var listview = new openerp.base.ListView(
+                {}, null, 'qunit-fixture', {model: null});
+
+        listview.on_loaded(fvg);
+
+        listview.do_fill_table([
+                {data: {id: {value: null}}},
+                {data: {id: {value: null}}},
+                {data: {id: {value: null}}}
+        ]).then(function () {
+            equal(
+                listview.$element.find('tbody tr td.oe-record-delete button').length,
+                3);
+            start();
+        });
+    });
+    asyncTest('deletion button should lead on deletion in the dataset',
+              2, function () {
+        var deleted;
+        var listview = new openerp.base.ListView(
+                {}, null, 'qunit-fixture', {model: null, unlink: function (ids) {
+            deleted = ids;
+        }});
+
+        listview.on_loaded(fvg);
+
+        listview.do_fill_table([
+                {data: {id: {value: 1}}},
+                {data: {id: {value: 2}}},
+                {data: {id: {value: 3}}}
+        ]).then(function () {
+            listview.$element.find('tbody td.oe-record-delete:eq(2) button').click();
+            deepEqual(deleted, [3]);
+            listview.$element.find('tbody td.oe-record-delete:eq(0) button').click();
+            deepEqual(deleted, [1]);
+            start();
+        });
+    });
+    asyncTest('multiple records deletion', 1, function () {
+        var deleted;
+        var listview = new openerp.base.ListView(
+                {}, null, 'qunit-fixture', {model: null, unlink: function (ids) {
+            deleted = ids;
+        }});
+
+        listview.on_loaded(fvg);
+
+        listview.do_fill_table([
+                {data: {id: {value: 1}}},
+                {data: {id: {value: 2}}},
+                {data: {id: {value: 3}}}
+        ]).then(function () {
+            listview.$element.find('tbody th input:eq(2)')
+                             .attr('checked', true);
+            listview.$element.find('tbody th input:eq(1)')
+                             .attr('checked', true);
+
+            listview.$element.find('#oe-list-delete').click();
+            deepEqual(deleted, [2, 3]);
+            start();
+        });
+    });
+});
diff --git a/addons/base/static/test/qunit-doc.js b/addons/base/static/test/qunit-doc.js
new file mode 100644
index 00000000000..3667cc3eb40
--- /dev/null
+++ b/addons/base/static/test/qunit-doc.js
@@ -0,0 +1,143 @@
+/**
+ * Defines a module scope (which lasts until the next call to module).
+ *
+ * This module scopes implies setup and teardown callbacks running for each test.
+ *
+ * @function
+ * @param {String} name the name of the module
+ * @param {Object} [lifecycle] callbacks to run before and after each test of the module
+ * @param {Function} lifecycle.setup function running before each test of this module
+ * @param {Function} lifecycle.teardown function running after each test of this module
+ */
+var module;
+/**
+ * Defines a given test to run. Runs all the assertions present in the test
+ *
+ * @function
+ * @param {String} name the name of the test
+ * @param {Number} [expected] number of assertions expected to run in this test (useful for asynchronous tests)
+ * @param {Function} test the testing code to run, holding a sequence of assertions (at least one)
+ */
+var test;
+/**
+ * Defines an asynchronous test: equivalent to calling stop() at the start of
+ * a normal test().
+ *
+ * The test code needs to restart the test runner via start()
+ *
+ * @function
+ * @param {String} name the name of the test
+ * @param {Number} [expected] number of assertions expected to run in this test (useful for asynchronous tests)
+ * @param {Function} test the testing code to run, holding a sequence of assertions (at least one)
+ */
+var asyncTest;
+/**
+ * The most basic boolean assertion (~assertTrue or assert).
+ *
+ * Passes if its argument is truthy
+ *
+ * @function
+ * @param {Boolean} state an arbitrary expression, evaluated in a boolean context
+ * @param {String} [message] the message to output with the assertion result
+ */
+var ok;
+/**
+ * Equality assertion (~assertEqual)
+ *
+ * Passes if both arguments are equal (via <code>==</code>)
+ *
+ * @function
+ * @param {Object} actual the object to check for correctness (processing result)
+ * @param {Object} expected the object to check against
+ * @param {String} [message] message output with the assertion result
+ */
+var equal;
+/**
+ * Inequality assertion (~assertNotEqual)
+ *
+ * Passes if the arguments are different (via <code>!=</code>)
+ *
+ * @function
+ * @param {Object} actual the object to check for correctness (processing result)
+ * @param {Object} expected the object to check against
+ * @param {String} [message] message output with the assertion result
+ */
+var notEqual;
+/**
+ * Recursive equality assertion.
+ *
+ * Works on primitive types using <code>===</code> and traversing through
+ * Objects and Arrays as well checking their components
+ *
+ * @function
+ * @param {Object} actual the object to check for correctness (processing result)
+ * @param {Object} expected the object to check against
+ * @param {String} [message] message output with the assertion result
+ */
+var deepEqual;
+/**
+ * Recursive inequality assertion.
+ *
+ * Works on primitive types using <code>!==</code> and traversing through
+ * Objects and Arrays as well checking their components
+ *
+ * @function
+ * @param {Object} actual the object to check for correctness (processing result)
+ * @param {Object} expected the object to check against
+ * @param {String} [message] message output with the assertion result
+ */
+var notDeepEqual;
+/**
+ * Strict equality assertion (~assertEqual)
+ *
+ * Passes if both arguments are identical (via <code>===</code>)
+ *
+ * @function
+ * @param {Object} actual the object to check for correctness (processing result)
+ * @param {Object} expected the object to check against
+ * @param {String} [message] message output with the assertion result
+ */
+var strictEqual;
+/**
+ * Strict inequality assertion (~assertNotEqual)
+ *
+ * Passes if both arguments are identical (via <code>!==</code>)
+ *
+ * @function
+ * @param {Object} actual the object to check for correctness (processing result)
+ * @param {Object} expected the object to check against
+ * @param {String} [message] message output with the assertion result
+ */
+var notStrictEqual;
+/**
+ * Passes if the provided block raised an exception.
+ *
+ * The <code>expect</code> argument can be provided to perform further assertion checks on the exception itself:
+ * * If it's a <code>RegExp</code> test the exception against the regexp (message?)
+ * * If it's a constructor, check if the exception is an instance of it
+ * * If it's an other type of function, call it with the exception as first parameter
+ *   - If the function returns true, the assertion validates
+ *   - Otherwise it fails
+ *
+ * @function
+ * @param {Function} block function which should raise an exception when called
+ * @param {Object} [expect] a RegExp, a constructor or a Function
+ * @param {String} [message] message output with the assertion result
+ */
+var raises;
+/**
+ * Starts running the test runner again from the point where it was
+ * <code>stop</code>ped.
+ *
+ * Used to resume testing after a callback.
+ *
+ * @function
+ */
+var start;
+/**
+ * Stops the test runner in order to wait for an asynchronous test to run
+ *
+ * @function
+ * @param {Number} [timeout] fails the test after the timeout triggers, only for debugging tests
+ */
+var stop;
diff --git a/addons/base/static/test/test.html b/addons/base/static/test/test.html
index 9681be8e389..5fcf4f4c594 100644
--- a/addons/base/static/test/test.html
+++ b/addons/base/static/test/test.html
@@ -21,6 +21,8 @@
     <script src="/base/static/src/js/data.js"></script>
     <script src="/base/static/src/js/views.js"></script>
     <script src="/base/static/src/js/search.js"></script>
+    <script src="/base/static/src/js/form.js"></script>
+    <script src="/base/static/src/js/list.js"></script>
     <script type="text/javascript">
         QWeb.add_template('/base/static/src/xml/base.xml');
     </script>
@@ -35,4 +37,6 @@
     </body>
     <script type="text/javascript" src="/base/static/test/registry.js"></script>
     <script type="text/javascript" src="/base/static/test/search-date.js"></script>
+    <script type="text/javascript" src="/base/static/test/form.js"></script>
+    <script type="text/javascript" src="/base/static/test/list.js"></script>
 </html>
diff --git a/addons/base/test/test_dataset.py b/addons/base/test/test_dataset.py
index 80d1e52561b..702c63b0899 100644
--- a/addons/base/test/test_dataset.py
+++ b/addons/base/test/test_dataset.py
@@ -14,14 +14,15 @@ class TestDataSetController(unittest2.TestCase):
         self.search.return_value = []
         self.read.return_value = []
 
-        self.assertFalse(self.dataset.do_find(self.request, 'fake.model'))
-        self.read.assert_called_once_with([], False)
+        self.assertFalse(self.dataset.do_search_read(self.request, 'fake.model'))
+        self.read.assert_called_once_with([], False, self.request.context)
 
     def test_regular_find(self):
         self.search.return_value = [1, 2, 3]
 
-        self.dataset.do_find(self.request, 'fake.model')
-        self.read.assert_called_once_with([1, 2, 3], False)
+        self.dataset.do_search_read(self.request, 'fake.model')
+        self.read.assert_called_once_with([1, 2, 3], False,
+                                          self.request.context)
 
     def test_ids_shortcut(self):
         self.search.return_value = [1, 2, 3]
@@ -32,7 +33,7 @@ class TestDataSetController(unittest2.TestCase):
         ]
 
         self.assertEqual(
-            self.dataset.do_find(self.request, 'fake.model', ['id']),
+            self.dataset.do_search_read(self.request, 'fake.model', ['id']),
             [{'id': 1}, {'id': 2}, {'id': 3}])
         self.assertFalse(self.read.called)
 
@@ -46,7 +47,7 @@ class TestDataSetController(unittest2.TestCase):
         result = self.dataset.do_get(
             self.request, 'fake.model', [3, 2, 1])
         self.read.assert_called_once_with(
-            [3, 2, 1])
+            [3, 2, 1], False)
         self.assertFalse(self.search.called)
 
         self.assertEqual(
diff --git a/addons/base/test/test_view.py b/addons/base/test/test_view.py
index e5c6162dae0..0070ea11cf4 100644
--- a/addons/base/test/test_view.py
+++ b/addons/base/test/test_view.py
@@ -1,34 +1,23 @@
+import copy
 import xml.etree.ElementTree
 import mock
 
 import unittest2
+import simplejson
 
 import base.controllers.main
 import openerpweb.nonliterals
 import openerpweb.openerpweb
 
+def field_attrs(fields_view_get, fieldname):
+    (field,) =  filter(lambda f: f['attrs'].get('name') == fieldname,
+                       fields_view_get['arch']['children'])
+    return field['attrs']
+
 #noinspection PyCompatibility
-class ViewTest(unittest2.TestCase):
+class DomainsAndContextsTest(unittest2.TestCase):
     def setUp(self):
         self.view = base.controllers.main.View()
-    def test_identity(self):
-        base_view = """
-            <form string="Title">
-                <group>
-                    <field name="some_field"/>
-                    <field name="some_other_field"/>
-                </group>
-                <field name="stuff"/>
-            </form>
-        """
-
-        pristine = xml.etree.ElementTree.fromstring(base_view)
-        transformed = self.view.transform_view(base_view, None)
-
-        self.assertEqual(
-             xml.etree.ElementTree.tostring(transformed),
-             xml.etree.ElementTree.tostring(pristine)
-        )
 
     def test_convert_literal_domain(self):
         e = xml.etree.ElementTree.Element(
@@ -115,3 +104,137 @@ class ViewTest(unittest2.TestCase):
             openerpweb.nonliterals.Context(
                 session, key=e.get('context').key).get_context_string(),
             context_string)
+
+class AttrsNormalizationTest(unittest2.TestCase):
+    def setUp(self):
+        self.view = base.controllers.main.View()
+
+    def test_identity(self):
+        base_view = """
+            <form string="Title">
+                <group>
+                    <field name="some_field"/>
+                    <field name="some_other_field"/>
+                </group>
+                <field name="stuff"/>
+            </form>
+        """
+
+        pristine = xml.etree.ElementTree.fromstring(base_view)
+        transformed = self.view.transform_view(base_view, None)
+
+        self.assertEqual(
+             xml.etree.ElementTree.tostring(transformed),
+             xml.etree.ElementTree.tostring(pristine)
+        )
+    def test_transform_states(self):
+        element = xml.etree.ElementTree.Element(
+            'field', states="open,closed")
+        self.view.normalize_attrs(element, {})
+
+        self.assertIsNone(element.get('states'))
+        self.assertEqual(
+            simplejson.loads(element.get('attrs')),
+            {'invisible': [['state', 'not in', ['open', 'closed']]]})
+
+    def test_transform_invisible(self):
+        element = xml.etree.ElementTree.Element(
+            'field', invisible="context.get('invisible_country', False)")
+
+        empty_context = copy.deepcopy(element)
+        self.view.normalize_attrs(empty_context, {})
+        self.assertEqual(empty_context.get('invisible'), None)
+
+        full_context = copy.deepcopy(element)
+        self.view.normalize_attrs(full_context, {'invisible_country': True})
+        self.assertEqual(full_context.get('invisible'), '1')
+
+    def test_transform_invisible_list_column(self):
+        req = mock.Mock()
+        req.context =  {'set_editable':True, 'set_visible':True,
+                        'gtd_visible':True, 'user_invisible':True}
+        req.session.evaluation_context = \
+            openerpweb.openerpweb.OpenERPSession().evaluation_context
+        req.session.model('project.task').fields_view_get.return_value = {
+            'arch': '''
+            <tree colors="grey:state in ('cancelled','done');blue:state == 'pending';red:date_deadline and (date_deadline&lt;current_date) and (state in ('draft','pending','open'))" string="Tasks">
+                <field name="sequence" invisible="not context.get('seq_visible', False)"/>
+                <field name="user_id" invisible="context.get('user_invisible', False)"/>
+                <field name="delegated_user_id" invisible="context.get('show_delegated', True)"/>
+                <field name="total_hours" invisible="1"/>
+                <field name="date_deadline" invisible="context.get('deadline_visible',True)"/>
+                <field name="type_id" invisible="context.get('set_visible',False)"/>
+            </tree>
+        '''}
+        parsed_view = base.controllers.main.View().fields_view_get(
+            req, 'project.task', 42, 'tree')
+
+        self.assertTrue(field_attrs(parsed_view, 'sequence')['invisible'])
+        self.assertTrue(field_attrs(parsed_view, 'user_id')['invisible'])
+        self.assertTrue(
+            field_attrs(parsed_view, 'delegated_user_id')['invisible'])
+        self.assertTrue(field_attrs(parsed_view, 'total_hours')['invisible'])
+        self.assertTrue(
+            field_attrs(parsed_view, 'date_deadline')['invisible'])
+        self.assertTrue(field_attrs(parsed_view, 'type_id')['invisible'])
+
+class ListViewTest(unittest2.TestCase):
+    def setUp(self):
+        self.view = base.controllers.main.ListView()
+        self.request = mock.Mock()
+        self.request.context = {'set_editable': True}
+    def test_no_editable_editable_context(self):
+        self.request.session.model('fake').fields_view_get.return_value = \
+            {'arch': '<tree><field name="foo"/></tree>'}
+        view = self.view.fields_view_get(self.request, 'fake', False)
+
+        self.assertEqual(view['arch']['attrs']['editable'],
+                         'bottom')
+    def test_editable_top_editable_context(self):
+        self.request.session.model('fake').fields_view_get.return_value = \
+            {'arch': '<tree editable="top"><field name="foo"/></tree>'}
+        view = self.view.fields_view_get(self.request, 'fake', False)
+
+        self.assertEqual(view['arch']['attrs']['editable'],
+                         'top')
+
+    def test_editable_bottom_editable_context(self):
+        self.request.session.model('fake').fields_view_get.return_value = \
+            {'arch': '<tree editable="bottom"><field name="foo"/></tree>'}
+        view = self.view.fields_view_get(self.request, 'fake', False)
+
+        self.assertEqual(view['arch']['attrs']['editable'],
+                         'bottom')
+
+    def test_color_nocolor(self):
+        self.assertEqual(
+            self.view.process_colors(
+                {'arch': {'attrs': {}, 'children': []}}, {}, {}),
+            None)
+    def test_color_literal(self):
+        self.assertEqual(
+            self.view.process_colors(
+                {'arch': {'attrs': {'colors': 'black:1'}}, 'children': []},
+                {}, {}),
+            'black')
+    def test_color_miss(self):
+        self.assertEqual(
+            self.view.process_colors(
+                {'arch': {'attrs': {'colors': "grey:state in ('cancelled','done');blue:state in ('pending')"}},
+                 'children': []
+                }, {'state': 'open'}, {}),
+            None)
+    def test_color_compute(self):
+        self.assertEqual(
+            self.view.process_colors(
+                {'arch': {'attrs': {'colors': "grey:state in ('cancelled','done');blue:state in ('pending')"}},
+                 'children': []
+                }, {'state': 'done'}, {}),
+            'grey')
+    def test_color_multiple(self):
+        self.assertEqual(
+            self.view.process_colors(
+                {'arch': {'attrs': {'colors': "grey:state in ('cancelled','done');blue:state in ('done')"}},
+                 'children': []
+                }, {'state': 'done'}, {}),
+            'maroon')
diff --git a/addons/base_calendar/__init__.py b/addons/base_calendar/__init__.py
index 013e4b7ec4e..4a64491e6bb 100644
--- a/addons/base_calendar/__init__.py
+++ b/addons/base_calendar/__init__.py
@@ -1 +1,2 @@
 #!/usr/bin/python
+import controllers
diff --git a/addons/base_calendar/__openerp__.py b/addons/base_calendar/__openerp__.py
index e77da6a5629..5688c0e05b5 100644
--- a/addons/base_calendar/__openerp__.py
+++ b/addons/base_calendar/__openerp__.py
@@ -1,57 +1,11 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License 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
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
 {
-    "name" : "Basic Calendar Functionality",
-    "version" : "1.0",
-    "depends" : ["base"],
-    'description': """
-This is a full-featured calendar system.
-========================================
-
-It supports:
-    - Calendar of events
-    - Alerts (create requests)
-    - Recurring events
-    - Invitations to people""",
-    "author" : "OpenERP SA",
-    'category': 'Tools',
-    'website': 'http://www.openerp.com',
-    "init_xml" : [
-        'base_calendar_data.xml'
+    "name": "Base calendar",
+    "version": "2.0",
+    "depends": ['base'],
+    "js": [
+        'static/lib/dhtmlxScheduler/codebase/dhtmlxscheduler.js',
+        'static/src/js/calendar.js'
     ],
-    "demo_xml" : [],
-    "update_xml" : [
-        'security/calendar_security.xml',
-        'security/ir.model.access.csv',
-        'wizard/calendar_event_edit_all_view.xml',
-        'wizard/base_calendar_invite_attendee_view.xml',
-        'wizard/base_calendar_set_exrule_view.xml',
-        'base_calendar_view.xml'
-    ],
-    "test" : ['test/base_calendar_test.yml'],
-    "installable" : True,
-    "active" : False,
-    "certificate" : "00694071962960352821",
-    'images': ['images/base_calendar1.jpeg','images/base_calendar2.jpeg','images/base_calendar3.jpeg','images/base_calendar4.jpeg',],
+    "css": ['static/lib/dhtmlxScheduler/codebase/dhtmlxscheduler.css'],
+    'active': True
 }
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/base_calendar/controllers/__init__.py b/addons/base_calendar/controllers/__init__.py
new file mode 100644
index 00000000000..039d9715fab
--- /dev/null
+++ b/addons/base_calendar/controllers/__init__.py
@@ -0,0 +1 @@
+import main
\ No newline at end of file
diff --git a/addons/base_calendar/controllers/main.py b/addons/base_calendar/controllers/main.py
new file mode 100644
index 00000000000..a54d75c5b9b
--- /dev/null
+++ b/addons/base_calendar/controllers/main.py
@@ -0,0 +1,356 @@
+from base.controllers.main import View
+import openerpweb, time, math, re, datetime as DT, pytz
+
+COLOR_PALETTE = ['#f57900', '#cc0000', '#d400a8', '#75507b', '#3465a4', '#73d216', '#c17d11', '#edd400',
+                 '#fcaf3e', '#ef2929', '#ff00c9', '#ad7fa8', '#729fcf', '#8ae234', '#e9b96e', '#fce94f',
+                 '#ff8e00', '#ff0000', '#b0008c', '#9000ff', '#0078ff', '#00ff00', '#e6ff00', '#ffff00',
+                 '#905000', '#9b0000', '#840067', '#510090', '#0000c9', '#009b00', '#9abe00', '#ffc900', ]
+
+_colorline = ['#%02x%02x%02x' % (25 + ((r + 10) % 11) * 23, 5 + ((g + 1) % 11) * 20, 25 + ((b + 4) % 11) * 23) for r in range(11) for g in range(11) for b in range(11) ]
+
+DT_SERVER_FORMATS = {
+  'datetime' : '%Y-%m-%d %H:%M:%S',
+  'date' : '%Y-%m-%d',
+  'time' : '%H:%M:%S'
+}
+
+DT_FORMAT_INFO = {'datetime' : ('%Y-%m-%d %H:%M:%S', DT.datetime, 0, 6),
+                  'date': ('%Y-%m-%d', DT.date, 0, 3),
+                  'time': ('%H:%M:%S', DT.time, 3, 6)}
+
+def choice_colors(n):
+        if n > len(COLOR_PALETTE):
+            return _colorline[0:-1:len(_colorline) / (n + 1)]
+        elif n:
+            return COLOR_PALETTE[:n]
+        return []
+
+class CalendarView(View):
+    _cp_path = "/base_calendar/calendarview"
+    
+    mode = 'month'
+    date_start = None
+    date_delay = None
+    date_stop = None
+    color_field = None
+    day_length = 8
+    use_search = False
+    selected_day = None
+    date_format = '%Y-%m-%d'
+    info_fields = []
+    fields = {}
+    events = []
+
+    colors = {}
+    color_values = []
+
+    remote_timezone = 'utc'
+    client_timezone = False
+    
+    calendar_fields = {}
+    concurrency_info = None
+
+    ids = []
+    model = ''
+    domain = []
+    context = {}
+    
+    @openerpweb.jsonrequest
+    def load(self, req, model, view_id):
+        fields_view = self.fields_view_get(req, model, view_id, 'calendar')
+        return {'fields_view':fields_view}
+    
+    def convert(self, event):
+        fields = [self.date_start]
+        if self.date_stop:
+            fields.append(self.date_stop)
+            
+        for fld in fields:
+            fld_type = self.fields[fld]['type']
+            fmt = DT_SERVER_FORMATS[fld_type]
+            if event[fld] and fmt:
+                event[fld] = time.strptime(event[fld], fmt)
+            
+            # default start/stop time is 9:00 AM / 5:00 PM
+            if fld_type == 'date' and event[fld]:
+                ds = list(event[fld])
+                if fld == self.date_start:
+                    ds[3] = 9
+                elif fld == self.date_stop:
+                    ds[3] = 17
+                event[fld] = tuple(ds)
+             
+    
+    @openerpweb.jsonrequest
+    def schedule_events(self, req, **kw):
+        self.model = kw['model']
+        self.mode = kw.get('mode') or self.mode or 'month'
+        self.fields = kw['fields']
+        self.color_field = kw.get('color_field') or self.color_field or None
+        self.colors = kw.get('colors') or {}
+        self.calendar_fields = kw['calendar_fields']
+        self.info_fields = kw['info_fields']
+        self.date_start = self.calendar_fields['date_start']['name']
+        self.domain = kw.get('domain') or []
+        
+        self.remote_timezone = req.session.remote_timezone
+        self.client_timezone = req.session.client_timezone
+        
+        if self.calendar_fields.get('date_stop'):
+            self.date_stop = self.calendar_fields['date_stop']['name']
+        
+        if self.calendar_fields.get('date_delay'):
+            self.date_delay = self.calendar_fields['date_delay']['name']
+            
+        model = req.session.model(self.model)
+        event_ids = model.search(self.domain)
+        
+        self.events = model.read(event_ids, self.fields.keys())
+        result = []
+        self.date_format = req.session._lang and req.session._lang['date_format']
+        
+        if self.color_field:
+            for evt in self.events:
+                key = evt[self.color_field]
+                name = key
+                value = key
+                if isinstance(key, list): # M2O, XMLRPC returns List instead of Tuple
+                    name = key[0]
+                    value = key[-1]
+                    evt[self.color_field] = key = key[-1]
+                if isinstance(key, tuple): # M2O
+                    value, name = key
+                self.colors[key] = (name, value, None)
+            
+            colors = choice_colors(len(self.colors))
+            for i, (key, value) in enumerate(self.colors.items()):
+                self.colors[key] = [value[0], value[1], colors[i]]
+        
+        for evt in self.events:
+            self.convert(evt)
+            a = self.get_event_widget(evt)
+            result.append(a)
+            
+        return {'result':result,'sidebar':self.colors}
+    
+    def parsedatetime(self, string):
+        
+        kind = 'datetime'
+
+        if '-' in string and ':' in string:
+            kind = 'datetime'
+        elif '-' in string:
+            kind = 'date'
+        elif ':' in string:
+            kind = 'time'
+        
+        fmt, obj, i, j = DT_FORMAT_INFO[kind]
+        return obj(*time.strptime(string, fmt)[i:j])
+    
+    def parse_datetime(self, value, kind="datetime", as_timetuple=False):
+        server_format = DT_SERVER_FORMATS[kind]
+        local_format = self.date_format
+        if not value:
+            return False
+
+        if isinstance(value, (time.struct_time, tuple)):
+            value = time.strftime(local_format, value)
+
+        try:
+            value = time.strptime(value, local_format)
+        except ValueError:
+            try:
+                # might be in server format already (e.g. filter domain)
+                value = time.strptime(value, server_format)
+            except ValueError:
+                try:
+                    dt = list(time.localtime())
+                    dt[2] = int(value)
+                    value = tuple(dt)
+                except:
+                    return False
+    
+        if kind == "datetime":
+            try:
+                value = self.tz_convert(value, 'parse')
+            except Exception,e:
+                print "*******************Error in timezone parsing *********",e
+    
+        if as_timetuple:
+            return value
+        
+        return time.strftime(server_format, value)
+
+    
+    @openerpweb.jsonrequest
+    def edit_events(self, req,**kw):
+        data = {}
+        ds = self.parsedatetime(kw['start_date'])
+        de = self.parsedatetime(kw['end_date'])
+        data[kw['calendar_fields']['date_start']['name']] = self.parse_datetime(ds.timetuple())
+        
+        if 'date_stop' in kw['calendar_fields']:
+            data[kw['calendar_fields']['date_stop']['name']] = self.parse_datetime(de.timetuple())
+        elif 'date_delay' in kw['calendar_fields']:
+            day_length = kw['calendar_fields']['day_length']
+            
+            tds = time.mktime(ds.timetuple())
+            tde = time.mktime(de.timetuple())
+            
+            n = (tde - tds) / (60 * 60)
+
+            if n > day_length:
+                d = math.floor(n / 24)
+                h = n % 24
+
+                n = d * day_length + h
+
+            data[kw['calendar_fields']['date_delay']['name']] = n
+        error = None
+        try:
+            req.session.model(kw['model']).write([int(kw['id'])], data)
+        except Exception, e:
+            error = e
+        return error
+    
+    def tz_convert(self, struct_time, action):
+        # if no client timezone is configured, consider the client is in the same
+        # timezone as the server
+        lzone = pytz.timezone(self.client_timezone or self.remote_timezone)
+        szone = pytz.timezone(self.remote_timezone)
+        dt = DT.datetime.fromtimestamp(time.mktime(struct_time))
+    
+        if action == 'parse':
+            fromzone = lzone
+            tozone = szone
+        elif action == 'format':
+            fromzone = szone
+            tozone = lzone
+        else:
+            raise Exception("_tz_convert action should be 'parse' or 'format'. Not '%s'" % (action, ))
+    
+        localized_original_datetime = fromzone.localize(dt, is_dst=True)
+        destination_datetime = localized_original_datetime.astimezone(tozone)
+        return destination_datetime.timetuple()
+    
+    def format_datetime(self, value, kind="datetime", as_timetuple=False):
+        """Convert date value to the local datetime considering timezone info.
+    
+        @param value: the date value
+        @param kind: type of the date value (date, time or datetime)
+        @param as_timetuple: return timetuple
+    
+        @type value: basestring or time.time_tuple)
+    
+        @return: string or timetuple
+        """
+    
+        server_format = DT_SERVER_FORMATS[kind]
+        local_format = self.date_format
+    
+        if not value:
+            return ''
+    
+        if isinstance(value, (time.struct_time, tuple)):
+            value = time.strftime(server_format, value)
+    
+        if isinstance(value, DT.datetime):
+            value = value
+            try:
+                value = DT.datetime.strptime(value[:10], server_format)
+                return value.strftime(local_format)
+            except:
+                return ''
+    
+        value = value.strip()
+    
+        # remove trailing miliseconds
+        value = re.sub("(.*?)(\s+\d{2}:\d{2}:\d{2})(\.\d+)?$", "\g<1>\g<2>", value)
+    
+        # add time part in value if missing
+        if kind == 'datetime' and not re.search('\s+\d{2}:\d{2}:\d{2}?$', value):
+            value += ' 00:00:00'
+    
+        # remove time part from value
+        elif kind == 'date':
+            value = re.sub('\s+\d{2}:\d{2}:\d{2}(\.\d+)?$', '', value)
+    
+        value = time.strptime(value, server_format)
+    
+        if kind == "datetime":
+            try:
+                value = self.tz_convert(value, 'format')
+            except Exception, e:
+                print "\n\n\n************ Error in timezone formatting", e
+    
+        if as_timetuple:
+            return value
+    
+        return time.strftime(local_format, value)
+    
+    def get_event_widget(self, event):
+        title = ''       # the title
+        description = [] # the description
+        
+        if self.info_fields:
+
+            f = self.info_fields[0]
+            s = event[f]
+            
+            if isinstance(s, (tuple, list)): s = s[-1]
+            
+            title = s
+            for f in self.info_fields[1:]:
+                s = event[f]
+                if isinstance(s, (tuple, list)):
+                    s = s[-1]
+                if s:
+                    description.append(str(s))
+        
+        starts = event.get(self.date_start)
+        ends = event.get(self.date_delay) or 1.0
+        span = 0
+        
+        if starts and ends:
+
+            n = 0
+            h = ends
+
+            if ends == self.day_length:
+                span = 1
+
+            elif ends > self.day_length:
+                n = ends / self.day_length
+                h = ends % self.day_length
+
+                n = int(math.floor(n))
+                
+                if h > 0:
+                    span = n + 1
+                else:
+                    span = n
+            ends = time.localtime(time.mktime(starts) + (h * 60 * 60) + (n * 24 * 60 * 60))
+            
+        if starts and self.date_stop:
+
+            ends = event.get(self.date_stop)
+            if not ends:
+                ends = time.localtime(time.mktime(starts) + 60 * 60)
+
+            tds = time.mktime(starts)
+            tde = time.mktime(ends)
+
+            if tds >= tde:
+                tde = tds + 60 * 60
+                ends = time.localtime(tde)
+
+            n = (tde - tds) / (60 * 60)
+
+            if n >= self.day_length:
+                span = math.ceil(n / 24)
+        
+        starts = self.format_datetime(starts, "datetime", True)
+        ends = self.format_datetime(ends, "datetime", True)
+        title = title.strip()
+        description = ', '.join(description).strip()
+        return {'id': event['id'], 'start_date': str(DT.datetime(*starts[:6])), 'end_date': str(DT.datetime(*ends[:6])), 'text': title, 'title': description, 'color': self.colors[event[self.color_field]][-1]}
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/License_GPL.html b/addons/base_calendar/static/lib/dhtmlxScheduler/License_GPL.html
new file mode 100644
index 00000000000..afe2ef33f0b
--- /dev/null
+++ b/addons/base_calendar/static/lib/dhtmlxScheduler/License_GPL.html
@@ -0,0 +1,73 @@
+<h1>GNU GENERAL PUBLIC LICENSE</h1>
+Version 2, June 1991 </p>
+</p>
+<p>Copyright (C) 1989, 1991 Free Software Foundation, Inc.  </p>
+<p>59 Temple Place - Suite 330, Boston, MA  02111-1307, USA</p>
+</p>
+<p>Everyone is permitted to copy and distribute verbatim copies</p>
+<p>of this license document, but changing it is not allowed.</p>
+</p>
+</p>
+<p>TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION</p>
+<p>0. This License applies to any program or other work which contains a notice placed by the copyright holder saying it may be distributed under the terms of this General Public License. The "Program", below, refers to any such program or work, and a "work based on the Program" means either the Program or any derivative work under copyright law: that is to say, a work containing the Program or a portion of it, either verbatim or with modifications and/or translated into another language. (Hereinafter, translation is included without limitation in the term "modification".) Each licensee is addressed as "you". </p>
+</p>
+<p>Activities other than copying, distribution and modification are not covered by this License; they are outside its scope. The act of running the Program is not restricted, and the output from the Program is covered only if its contents constitute a work based on the Program (independent of having been made by running the Program). Whether that is true depends on what the Program does. </p>
+</p>
+<p>1. You may copy and distribute verbatim copies of the Program's source code as you receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an appropriate copyright notice and disclaimer of warranty; keep intact all the notices that refer to this License and to the absence of any warranty; and give any other recipients of the Program a copy of this License along with the Program. </p>
+</p>
+<p>You may charge a fee for the physical act of transferring a copy, and you may at your option offer warranty protection in exchange for a fee. </p>
+</p>
+<p>2. You may modify your copy or copies of the Program or any portion of it, thus forming a work based on the Program, and copy and distribute such modifications or work under the terms of Section 1 above, provided that you also meet all of these conditions: </p>
+</p>
+</p>
+<p>a) You must cause the modified files to carry prominent notices stating that you changed the files and the date of any change. </p>
+</p>
+<p>b) You must cause any work that you distribute or publish, that in whole or in part contains or is derived from the Program or any part thereof, to be licensed as a whole at no charge to all third parties under the terms of this License. </p>
+</p>
+<p>c) If the modified program normally reads commands interactively when run, you must cause it, when started running for such interactive use in the most ordinary way, to print or display an announcement including an appropriate copyright notice and a notice that there is no warranty (or else, saying that you provide a warranty) and that users may redistribute the program under these conditions, and telling the user how to view a copy of this License. (Exception: if the Program itself is interactive but does not normally print such an announcement, your work based on the Program is not required to print an announcement.) </p>
+<p>These requirements apply to the modified work as a whole. If identifiable sections of that work are not derived from the Program, and can be reasonably considered independent and separate works in themselves, then this License, and its terms, do not apply to those sections when you distribute them as separate works. But when you distribute the same sections as part of a whole which is a work based on the Program, the distribution of the whole must be on the terms of this License, whose permissions for other licensees extend to the entire whole, and thus to each and every part regardless of who wrote it. </p>
+</p>
+<p>Thus, it is not the intent of this section to claim rights or contest your rights to work written entirely by you; rather, the intent is to exercise the right to control the distribution of derivative or collective works based on the Program. </p>
+</p>
+<p>In addition, mere aggregation of another work not based on the Program with the Program (or with a work based on the Program) on a volume of a storage or distribution medium does not bring the other work under the scope of this License. </p>
+</p>
+<p>3. You may copy and distribute the Program (or a work based on it, under Section 2) in object code or executable form under the terms of Sections 1 and 2 above provided that you also do one of the following: </p>
+</p>
+<p>a) Accompany it with the complete corresponding machine-readable source code, which must be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange; or, </p>
+</p>
+<p>b) Accompany it with a written offer, valid for at least three years, to give any third party, for a charge no more than your cost of physically performing source distribution, a complete machine-readable copy of the corresponding source code, to be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange; or, </p>
+</p>
+<p>c) Accompany it with the information you received as to the offer to distribute corresponding source code. (This alternative is allowed only for noncommercial distribution and only if you received the program in object code or executable form with such an offer, in accord with Subsection b above.) </p>
+<p>The source code for a work means the preferred form of the work for making modifications to it. For an executable work, complete source code means all the source code for all modules it contains, plus any associated interface definition files, plus the scripts used to control compilation and installation of the executable. However, as a special exception, the source code distributed need not include anything that is normally distributed (in either source or binary form) with the major components (compiler, kernel, and so on) of the operating system on which the executable runs, unless that component itself accompanies the executable. </p>
+</p>
+<p>If distribution of executable or object code is made by offering access to copy from a designated place, then offering equivalent access to copy the source code from the same place counts as distribution of the source code, even though third parties are not compelled to copy the source along with the object code. </p>
+</p>
+<p>4. You may not copy, modify, sublicense, or distribute the Program except as expressly provided under this License. Any attempt otherwise to copy, modify, sublicense or distribute the Program is void, and will automatically terminate your rights under this License. However, parties who have received copies, or rights, from you under this License will not have their licenses terminated so long as such parties remain in full compliance. </p>
+</p>
+<p>5. You are not required to accept this License, since you have not signed it. However, nothing else grants you permission to modify or distribute the Program or its derivative works. These actions are prohibited by law if you do not accept this License. Therefore, by modifying or distributing the Program (or any work based on the Program), you indicate your acceptance of this License to do so, and all its terms and conditions for copying, distributing or modifying the Program or works based on it. </p>
+</p>
+<p>6. Each time you redistribute the Program (or any work based on the Program), the recipient automatically receives a license from the original licensor to copy, distribute or modify the Program subject to these terms and conditions. You may not impose any further restrictions on the recipients' exercise of the rights granted herein. You are not responsible for enforcing compliance by third parties to this License. </p>
+</p>
+<p>7. If, as a consequence of a court judgment or allegation of patent infringement or for any other reason (not limited to patent issues), conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not excuse you from the conditions of this License. If you cannot distribute so as to satisfy simultaneously your obligations under this License and any other pertinent obligations, then as a consequence you may not distribute the Program at all. For example, if a patent license would not permit royalty-free redistribution of the Program by all those who receive copies directly or indirectly through you, then the only way you could satisfy both it and this License would be to refrain entirely from distribution of the Program. </p>
+</p>
+<p>If any portion of this section is held invalid or unenforceable under any particular circumstance, the balance of the section is intended to apply and the section as a whole is intended to apply in other circumstances. </p>
+</p>
+<p>It is not the purpose of this section to induce you to infringe any patents or other property right claims or to contest validity of any such claims; this section has the sole purpose of protecting the integrity of the free software distribution system, which is implemented by public license practices. Many people have made generous contributions to the wide range of software distributed through that system in reliance on consistent application of that system; it is up to the author/donor to decide if he or she is willing to distribute software through any other system and a licensee cannot impose that choice. </p>
+</p>
+<p>This section is intended to make thoroughly clear what is believed to be a consequence of the rest of this License. </p>
+</p>
+<p>8. If the distribution and/or use of the Program is restricted in certain countries either by patents or by copyrighted interfaces, the original copyright holder who places the Program under this License may add an explicit geographical distribution limitation excluding those countries, so that distribution is permitted only in or among countries not thus excluded. In such case, this License incorporates the limitation as if written in the body of this License. </p>
+</p>
+<p>9. The Free Software Foundation may publish revised and/or new versions of the General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns. </p>
+</p>
+<p>Each version is given a distinguishing version number. If the Program specifies a version number of this License which applies to it and "any later version", you have the option of following the terms and conditions either of that version or of any later version published by the Free Software Foundation. If the Program does not specify a version number of this License, you may choose any version ever published by the Free Software Foundation. </p>
+</p>
+<p>10. If you wish to incorporate parts of the Program into other free programs whose distribution conditions are different, write to the author to ask for permission. For software which is copyrighted by the Free Software Foundation, write to the Free Software Foundation; we sometimes make exceptions for this. Our decision will be guided by the two goals of preserving the free status of all derivatives of our free software and of promoting the sharing and reuse of software generally. </p>
+</p>
+<p>NO WARRANTY</p>
+</p>
+<p>11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. </p>
+</p>
+<p>12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. </p>
+</p>
+<p>
\ No newline at end of file
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/codebase/dhtmlxscheduler.css b/addons/base_calendar/static/lib/dhtmlxScheduler/codebase/dhtmlxscheduler.css
new file mode 100644
index 00000000000..d3cd78ec9bc
--- /dev/null
+++ b/addons/base_calendar/static/lib/dhtmlxScheduler/codebase/dhtmlxscheduler.css
@@ -0,0 +1,525 @@
+.dhx_cal_container {
+	background-color:#C2D5FC;
+	font-family:Tahoma;
+	font-size:8pt;
+	position:relative;
+	overflow:hidden;
+}
+
+.dhx_cal_container div {
+	-moz-user-select:none;
+	-moz-user-select:-moz-none;
+}
+
+.dhx_cal_navline {
+	height:20px;
+	position:absolute;
+	z-index:3;
+	width:750px;
+	color:#2F3A48;
+}
+
+.dhx_cal_navline div {
+	position:absolute;
+	top:2px;
+	white-space:nowrap;
+}
+
+.dhx_cal_navline .dhx_cal_date {
+	font-weight:600;
+	left:210px;
+}
+
+.dhx_cal_button .dhx_left_bg {
+	width:1px;
+	overflow:hidden;
+	height:17px;
+	z-index:20;
+	top:0;
+}
+
+.dhx_cal_prev_button {
+	background-image:url(imgs/buttons.png);
+	background-position:0 0;
+	width:29px;
+	height:17px;
+	left:50px;
+	cursor:pointer;
+}
+
+.dhx_cal_next_button{
+	background-image:url(imgs/buttons.png);
+	background-position:-30px 0;
+	width:29px;
+	height:17px;
+	left:80px;
+	cursor:pointer;
+}
+
+.dhx_cal_today_button{
+	background-image:url(imgs/buttons.png);
+	background-position:-60px 0;
+	width:75px;
+	height:17px;
+	left:112px;
+	cursor:pointer;
+	text-align:center;
+	text-decoration:underline;
+}
+
+.dhx_cal_tab {
+	background-image:url(imgs/white_tab.png);
+	width:61px;
+	height:19px;
+	text-align:center;
+	text-decoration:underline;
+	padding-top:3px;
+	cursor:pointer;
+}
+
+.dhx_cal_tab.active {
+	background-image:url(imgs/blue_tab.png);
+	text-decoration:none;
+	height:20px;
+	padding-top:2px;
+	cursor:default;
+	font-weight:bold;
+}
+
+.dhx_cal_header {
+	position:absolute;
+	left:10px;
+	top:23px;
+	width:750px;
+	border-top:1px dotted #8894A3;
+	border-right:1px dotted #8894A3;
+	z-index:2;
+	overflow:hidden;
+	color:#2F3A48;
+}
+
+.dhx_cal_data {
+	border-top:1px dotted #8894A3;
+	position:absolute;
+	top:44px;
+	width:600px;
+	overflow-y:auto;
+	overflow-x:hidden;
+}
+
+.dhx_scale_bar {
+	position:absolute;
+	text-align:center;
+	background-color:#C2D5FC;
+	padding-top:3px;
+	border-left:1px dotted #586A7E;
+}
+
+.dhx_scale_holder {
+	position:absolute;
+	border-right:1px dotted #586A7E;
+	background-image:url(imgs/databg.png);
+}
+
+.dhx_scale_holder_now {
+	position:absolute;
+	border-right:1px dotted #586A7E;
+	background-image:url(imgs/databg_now.png);
+}
+
+.dhx_scale_hour {
+	height:41px;
+	width:50px;
+	border-bottom:1px dotted #8894A3;
+	background-color:#C2D5FC;
+	text-align:center;
+	line-height:40px;
+	color:#586A7E;
+	overflow:hidden;
+}
+
+.dhx_month_head {
+	background-color:#EBEFF4;
+	color:#2F3A48;
+	border-right:1px dotted #586A7E;
+	height:18px;
+	padding-right:5px;
+	padding-top:3px;
+	text-align:right;
+}
+
+.dhx_month_body {
+	border-right:1px dotted #586A7E;
+	border-bottom:1px dotted #586A7E;
+	background-color:#FFF;
+}
+
+.dhx_now .dhx_month_body {
+	background-color:#E2EDFF;
+}
+
+.dhx_after .dhx_month_body,.dhx_before .dhx_month_body {
+	background-color:#ECECEC;
+}
+
+.dhx_after .dhx_month_head,.dhx_before .dhx_month_head {
+	background-color:#E2E3E6;
+	color:#94A6BB;
+}
+
+.dhx_now .dhx_month_head {
+	background-color:#D1DEF4;
+	font-weight:bold;
+}
+
+.dhx_cal_drag {
+	position:absolute;
+	z-index:9999;
+	background-color:#FFE763;
+	border:1px solid #B7A543;
+	opacity:.5;
+	filter:alpha(opacity=50);
+}
+
+.dhx_loading {
+	position:absolute;
+	width:128px;
+	height:15px;
+	background-image:url(imgs/loading.gif);
+	z-index:9999;
+}
+
+.dhx_multi_day_icon,.dhx_multi_day {
+	position:absolute;
+	background-color:#E1E6FF;
+	background-repeat:no-repeat;
+	border-bottom:1px dotted #8894A3;
+	border-left:1px dotted #8894A3;
+}
+
+.dhx_multi_day_icon {
+	background-image:url(imgs/clock_big.gif);
+}
+
+.dhx_multi_day_icon_small {
+	background-image:url(imgs/clock_small.gif);
+}
+
+.dhx_multi_day_icon,.dhx_multi_day_icon_small {
+	background-position:center center;
+	position:absolute;
+	background-color:#E1E6FF;
+	background-repeat:no-repeat;
+	border-bottom:1px dotted #8894A3;
+	border-left:1px dotted #8894A3;
+}
+
+.dhtmlxLayoutPolyContainer_dhx_skyblue .dhx_cal_container {
+	background-color:#d0e5ff;
+}
+
+.dhx_cal_event div {
+	background-color:#FFE763;
+	border:1px solid #B7A543;
+	color:#887A2E;
+	overflow:hidden;width:100%;
+	font-family:Tahoma;
+	font-size:8pt;
+}
+
+/*event in day or week or month view*/
+
+.dhx_cal_event.purple div,
+.dhx_cal_event_line.purple {
+	background-color:purple !important; 
+	color:white !important;
+}
+
+.dhx_move_denied .dhx_cal_event .dhx_header,.dhx_move_denied .dhx_cal_event .dhx_title {
+	cursor:default;
+}
+
+.dhx_cal_event .dhx_header {
+	height:1px;
+	margin-left:1px;
+	border-width:1px 1px 0 1px;
+	cursor:pointer;
+}
+
+.dhx_cal_event .dhx_title {
+	height:12px;
+	border-width:0 1px 1px 1px;
+	border-bottom-style:dotted;
+	font-size:7pt;
+	font-weight:bold;
+	text-align:center;
+	background-position:right;
+	background-repeat:no-repeat;
+	cursor:pointer;
+}
+
+.dhx_cal_event .dhx_body {
+	border-width:0 1px 1px 1px;
+	padding:5px;
+}
+
+.dhx_resize_denied .dhx_cal_event .dhx_footer {
+	cursor:default;
+}
+
+.dhx_cal_event .dhx_footer {
+	height:1px;
+	margin-left:2px;
+	border-width:0 1px 1px 1px;
+	cursor:s-resize;
+}
+
+.dhx_cal_event_line {
+	background-color:#FFE763;
+	border:1px solid #B7A543;
+	font-family:Tahoma;
+	font-size:8pt;
+	height:13px;
+	padding-left:10px;
+	color:#887A2E;
+	cursor:pointer;
+	overflow:hidden;
+}
+
+.dhx_cal_event_clear {
+	font-family:Tahoma;
+	font-size:8pt;
+	height:13px;
+	padding-left:2px;
+	color:#887A2E;
+	white-space:nowrap;
+	overflow:hidden;
+	cursor:pointer;
+}
+
+.dhx_in_move {
+	background-color:#FFFF80;
+}
+
+div.dhx_cal_editor {
+	background-color:#FFE763;
+	border:1px solid #B7A543;
+	border-top-style:dotted;
+	z-index:999;
+	position:absolute;
+	overflow:hidden;
+}
+
+textarea.dhx_cal_editor {
+	width:100%;
+	height:100%;
+	border:0 solid black;
+	margin:none;
+	padding:none;
+	overflow:auto;
+}
+
+div.dhx_menu_head {
+	background-image:url(imgs/controls.gif);
+	background-position:0 -43px;
+	width:10px;
+	height:10px;
+	margin-left:5px;
+	margin-top:1px;
+	border:none;
+	cursor:default;
+}
+
+div.dhx_menu_icon {
+	background-image:url(imgs/controls.gif);
+	width:20px;
+	height:20px;
+	margin-left:-5px;
+	margin-top:0;
+	border:none;
+	cursor:pointer;
+}
+
+div.icon_details {
+	background-position:0 0;
+}
+
+div.icon_edit {
+	background-position:-22px 0;
+}
+
+div.icon_save {
+	background-position:-84px -1px;
+}
+
+div.icon_cancel {
+	background-position:-62px 0;
+}
+
+div.icon_delete {
+	background-position:-42px 0;
+}
+
+.dhx_cal_light {
+	height:400px;
+	light:300px;
+	background-color:#FFE763;
+	font-family:Tahoma;
+	font-size:8pt;
+	border:1px solid #B7A64B;
+	color:#887A2E;
+	position:absolute;
+	z-index:10001;
+	width:580px;
+	height:300px;
+}
+
+.dhx_mark {
+	position:relative;
+	top:3px;
+	background-image:url('./imgs/controls.gif');
+	background-position:0 -43px;
+	padding-left:10px;
+}
+
+.dhx_ie6 .dhx_mark {
+	background-position:6px -41px;
+}
+
+.dhx_cal_light select {
+	font-family:Tahoma;
+	font-size:8pt;
+	color:#887A2E;
+	padding:2px;
+	margin:0;
+}
+
+.dhx_cal_ltitle {
+	padding:2px 0 2px 5px;
+	overflow:hidden;
+	white-space:nowrap;
+}
+
+.dhx_cal_ltitle span {
+	white-space:nowrap;
+}
+
+.dhx_cal_lsection {
+	background-color:#DBCF8C;
+	color:#FFF4B5;
+	font-size:18pt;
+	font-weight:bold;
+	padding:5px 0 3px 10px;
+}
+
+.dhx_cal_ltext {
+	padding:2px 0 2px 10px;
+	height:130px;
+	height=140px;
+	overflow:hidden;
+}
+
+.dhx_cal_ltext textarea {
+	background-color:transparent;
+	overflow:auto;
+	border:none;
+	color:#887A2E;
+	height:100%;
+	width:100%;
+	outline:none!important;
+}
+
+.dhx_time {
+	font-weight:bold;
+}
+
+.dhx_cal_light .dhx_title {
+	padding-left:10px;
+}
+
+.dhx_cal_larea {
+	border:1px solid #DCC43E;
+	background-color:#FFF4B5;
+	overflow:hidden;
+	margin-left:3px;
+	width:572px;
+	height:1px;
+}
+
+.dhx_btn_set {
+	padding:5px 10px 0 10px;
+	float:left;
+}
+
+.dhx_btn_set div {
+	float:left;
+	height:21px;
+	line-height:21px;
+	vertical-align:middle;
+	cursor:pointer;
+}
+
+.dhx_save_btn {
+	background-image:url('./imgs/controls.gif');
+	background-position:-84px 0;
+	width:21px;
+}
+
+.dhx_cancel_btn {
+	background-image:url('./imgs/controls.gif');
+	background-position:-63px 0;
+	width:20px;
+}
+
+.dhx_delete_btn {
+	background-image:url('./imgs/controls.gif');
+	background-position:-42px 0;
+	width:20px;
+}
+
+.dhx_cal_cover {
+	width:100%;
+	height:100%;
+	position:absolute;
+	z-index:10000;
+	top:0;
+	left:0;
+	background-color:black;
+	opacity:.1;
+	filter:alpha(opacity=10);
+}
+
+.dhx_custom_button {
+	padding:0 3px 0 3px;
+	color:#887A2E;
+	font-family:Tahoma;
+	font-size:8pt;
+	background-color:#FFE763;
+	font-weight:normal;
+	margin-right:5px;
+	margin-top:5px;
+	cursor:pointer;
+}
+
+.dhx_custom_button div {
+	cursor:pointer;
+	float:left;
+	height:21px;
+	line-height:21px;
+	vertical-align:middle;
+}
+
+.dhx_fullday_checkbox {
+	padding-top:5px;
+	float:right;
+}
+
+.dhx_fullday_checkbox input {
+	vertical-align:middle;
+}
+
+.dhx_fullday_checkbox label {
+	font-size:12pt;
+	font-weight:bold;
+	vertical-align:middle;
+}
\ No newline at end of file
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/codebase/dhtmlxscheduler.js b/addons/base_calendar/static/lib/dhtmlxScheduler/codebase/dhtmlxscheduler.js
new file mode 100644
index 00000000000..2413d122573
--- /dev/null
+++ b/addons/base_calendar/static/lib/dhtmlxScheduler/codebase/dhtmlxscheduler.js
@@ -0,0 +1,3735 @@
+/*
+dhtmlxScheduler v.2.3
+
+This software is allowed to use under GPL or you need to obtain Commercial or Enterise License
+to use it in not GPL project. Please contact sales@dhtmlx.com for details
+
+(c) DHTMLX Ltd.
+*/
+dhtmlx = function (B) {
+    for (var A in B) {
+        dhtmlx[A] = B[A]
+    }
+    return dhtmlx
+};
+dhtmlx.extend_api = function (A, D, C) {
+    var B = window[A];
+    if (!B) {
+        return
+    }
+    window[A] = function (G) {
+        if (G && typeof G == "object" && !G.tagName && !(G instanceof Array)) {
+            var F = B.apply(this, (D._init ? D._init(G) : arguments));
+            for (var E in dhtmlx) {
+                if (D[E]) {
+                    this[D[E]](dhtmlx[E])
+                }
+            }
+            for (var E in G) {
+                if (D[E]) {
+                    this[D[E]](G[E])
+                } else {
+                    if (E.indexOf("on") == 0) {
+                        this.attachEvent(E, G[E])
+                    }
+                }
+            }
+        } else {
+            var F = B.apply(this, arguments)
+        }
+        if (D._patch) {
+            D._patch(this)
+        }
+        return F || this
+    };
+    window[A].prototype = B.prototype;
+    if (C) {
+        dhtmlXHeir(window[A].prototype, C)
+    }
+};
+dhtmlxAjax = {
+    get: function (A, C) {
+        var B = new dtmlXMLLoaderObject(true);
+        B.async = (arguments.length < 3);
+        B.waitCall = C;
+        B.loadXML(A);
+        return B
+    },
+    post: function (A, C, D) {
+        var B = new dtmlXMLLoaderObject(true);
+        B.async = (arguments.length < 4);
+        B.waitCall = D;
+        B.loadXML(A, true, C);
+        return B
+    },
+    getSync: function (A) {
+        return this.get(A, null, true)
+    },
+    postSync: function (A, B) {
+        return this.post(A, B, null, true)
+    }
+};
+
+function dtmlXMLLoaderObject(B, D, C, A) {
+    this.xmlDoc = "";
+    if (typeof(C) != "undefined") {
+        this.async = C
+    } else {
+        this.async = true
+    }
+    this.onloadAction = B || null;
+    this.mainObject = D || null;
+    this.waitCall = null;
+    this.rSeed = A || false;
+    return this
+}
+dtmlXMLLoaderObject.prototype.waitLoadFunction = function (B) {
+    var A = true;
+    this.check = function () {
+        if ((B) && (B.onloadAction != null)) {
+            if ((!B.xmlDoc.readyState) || (B.xmlDoc.readyState == 4)) {
+                if (!A) {
+                    return
+                }
+                A = false;
+                if (typeof B.onloadAction == "function") {
+                    B.onloadAction(B.mainObject, null, null, null, B)
+                }
+                if (B.waitCall) {
+                    B.waitCall.call(this, B);
+                    B.waitCall = null
+                }
+            }
+        }
+    };
+    return this.check
+};
+dtmlXMLLoaderObject.prototype.getXMLTopNode = function (C, A) {
+    if (this.xmlDoc.responseXML) {
+        var B = this.xmlDoc.responseXML.getElementsByTagName(C);
+        if (B.length == 0 && C.indexOf(":") != -1) {
+            var B = this.xmlDoc.responseXML.getElementsByTagName((C.split(":"))[1])
+        }
+        var E = B[0]
+    } else {
+        var E = this.xmlDoc.documentElement
+    }
+    if (E) {
+        this._retry = false;
+        return E
+    }
+    if ((_isIE) && (!this._retry)) {
+        var D = this.xmlDoc.responseText;
+        var A = this.xmlDoc;
+        this._retry = true;
+        this.xmlDoc = new ActiveXObject("Microsoft.XMLDOM");
+        this.xmlDoc.async = false;
+        this.xmlDoc.loadXML(D);
+        return this.getXMLTopNode(C, A)
+    }
+    dhtmlxError.throwError("LoadXML", "Incorrect XML", [(A || this.xmlDoc), this.mainObject]);
+    return document.createElement("DIV")
+};
+dtmlXMLLoaderObject.prototype.loadXMLString = function (B) {
+    try {
+        var C = new DOMParser();
+        this.xmlDoc = C.parseFromString(B, "text/xml")
+    } catch (A) {
+        this.xmlDoc = new ActiveXObject("Microsoft.XMLDOM");
+        this.xmlDoc.async = this.async;
+        this.xmlDoc.loadXML(B)
+    }
+    this.onloadAction(this.mainObject, null, null, null, this);
+    if (this.waitCall) {
+        this.waitCall();
+        this.waitCall = null
+    }
+};
+dtmlXMLLoaderObject.prototype.loadXML = function (C, B, A, D) {
+    if (this.rSeed) {
+        C += ((C.indexOf("?") != -1) ? "&" : "?") + "a_dhx_rSeed=" + (new Date()).valueOf()
+    }
+    this.filePath = C;
+    if ((!_isIE) && (window.XMLHttpRequest)) {
+        this.xmlDoc = new XMLHttpRequest()
+    } else {
+        this.xmlDoc = new ActiveXObject("Microsoft.XMLHTTP")
+    }
+    if (this.async) {
+        this.xmlDoc.onreadystatechange = new this.waitLoadFunction(this)
+    }
+    this.xmlDoc.open(B ? "POST" : "GET", C, this.async);
+    if (D) {
+        this.xmlDoc.setRequestHeader("User-Agent", "dhtmlxRPC v0.1 (" + navigator.userAgent + ")");
+        this.xmlDoc.setRequestHeader("Content-type", "text/xml")
+    } else {
+        if (B) {
+            this.xmlDoc.setRequestHeader("Content-type", "application/x-www-form-urlencoded")
+        }
+    }
+    this.xmlDoc.setRequestHeader("X-Requested-With", "XMLHttpRequest");
+    this.xmlDoc.send(null || A);
+    if (!this.async) {
+        (new this.waitLoadFunction(this))()
+    }
+};
+dtmlXMLLoaderObject.prototype.destructor = function () {
+    this.onloadAction = null;
+    this.mainObject = null;
+    this.xmlDoc = null;
+    return null
+};
+dtmlXMLLoaderObject.prototype.xmlNodeToJSON = function (D) {
+    var C = {};
+    for (var B = 0; B < D.attributes.length; B++) {
+        C[D.attributes[B].name] = D.attributes[B].value
+    }
+    C._tagvalue = D.firstChild ? D.firstChild.nodeValue : "";
+    for (var B = 0; B < D.childNodes.length; B++) {
+        var A = D.childNodes[B].tagName;
+        if (A) {
+            if (!C[A]) {
+                C[A] = []
+            }
+            C[A].push(this.xmlNodeToJSON(D.childNodes[B]))
+        }
+    }
+    return C
+};
+
+function callerFunction(A, B) {
+    this.handler = function (C) {
+        if (!C) {
+            C = window.event
+        }
+        A(C, B);
+        return true
+    };
+    return this.handler
+}
+function getAbsoluteLeft(A) {
+    return getOffset(A).left
+}
+function getAbsoluteTop(A) {
+    return getOffset(A).top
+}
+function getOffsetSum(A) {
+    var C = 0,
+        B = 0;
+    while (A) {
+        C = C + parseInt(A.offsetTop);
+        B = B + parseInt(A.offsetLeft);
+        A = A.offsetParent
+    }
+    return {
+        top: C,
+        left: B
+    }
+}
+function getOffsetRect(D) {
+    var G = D.getBoundingClientRect();
+    var H = document.body;
+    var B = document.documentElement;
+    var A = window.pageYOffset || B.scrollTop || H.scrollTop;
+    var E = window.pageXOffset || B.scrollLeft || H.scrollLeft;
+    var F = B.clientTop || H.clientTop || 0;
+    var I = B.clientLeft || H.clientLeft || 0;
+    var J = G.top + A - F;
+    var C = G.left + E - I;
+    return {
+        top: Math.round(J),
+        left: Math.round(C)
+    }
+}
+function getOffset(A) {
+    if (A.getBoundingClientRect && !_isChrome) {
+        return getOffsetRect(A)
+    } else {
+        return getOffsetSum(A)
+    }
+}
+function convertStringToBoolean(A) {
+    if (typeof(A) == "string") {
+        A = A.toLowerCase()
+    }
+    switch (A) {
+    case "1":
+    case "true":
+    case "yes":
+    case "y":
+    case 1:
+    case true:
+        return true;
+        break;
+    default:
+        return false
+    }
+}
+function getUrlSymbol(A) {
+    if (A.indexOf("?") != -1) {
+        return "&"
+    } else {
+        return "?"
+    }
+}
+function dhtmlDragAndDropObject() {
+    if (window.dhtmlDragAndDrop) {
+        return window.dhtmlDragAndDrop
+    }
+    this.lastLanding = 0;
+    this.dragNode = 0;
+    this.dragStartNode = 0;
+    this.dragStartObject = 0;
+    this.tempDOMU = null;
+    this.tempDOMM = null;
+    this.waitDrag = 0;
+    window.dhtmlDragAndDrop = this;
+    return this
+}
+dhtmlDragAndDropObject.prototype.removeDraggableItem = function (A) {
+    A.onmousedown = null;
+    A.dragStarter = null;
+    A.dragLanding = null
+};
+dhtmlDragAndDropObject.prototype.addDraggableItem = function (A, B) {
+    A.onmousedown = this.preCreateDragCopy;
+    A.dragStarter = B;
+    this.addDragLanding(A, B)
+};
+dhtmlDragAndDropObject.prototype.addDragLanding = function (A, B) {
+    A.dragLanding = B
+};
+dhtmlDragAndDropObject.prototype.preCreateDragCopy = function (A) {
+    if ((A || event) && (A || event).button == 2) {
+        return
+    }
+    if (window.dhtmlDragAndDrop.waitDrag) {
+        window.dhtmlDragAndDrop.waitDrag = 0;
+        document.body.onmouseup = window.dhtmlDragAndDrop.tempDOMU;
+        document.body.onmousemove = window.dhtmlDragAndDrop.tempDOMM;
+        return false
+    }
+    window.dhtmlDragAndDrop.waitDrag = 1;
+    window.dhtmlDragAndDrop.tempDOMU = document.body.onmouseup;
+    window.dhtmlDragAndDrop.tempDOMM = document.body.onmousemove;
+    window.dhtmlDragAndDrop.dragStartNode = this;
+    window.dhtmlDragAndDrop.dragStartObject = this.dragStarter;
+    document.body.onmouseup = window.dhtmlDragAndDrop.preCreateDragCopy;
+    document.body.onmousemove = window.dhtmlDragAndDrop.callDrag;
+    window.dhtmlDragAndDrop.downtime = new Date().valueOf();
+    if ((A) && (A.preventDefault)) {
+        A.preventDefault();
+        return false
+    }
+    return false
+};
+dhtmlDragAndDropObject.prototype.callDrag = function (C) {
+    if (!C) {
+        C = window.event
+    }
+    dragger = window.dhtmlDragAndDrop;
+    if ((new Date()).valueOf() - dragger.downtime < 100) {
+        return
+    }
+    if ((C.button == 0) && (_isIE)) {
+        return dragger.stopDrag()
+    }
+    if (!dragger.dragNode && dragger.waitDrag) {
+        dragger.dragNode = dragger.dragStartObject._createDragNode(dragger.dragStartNode, C);
+        if (!dragger.dragNode) {
+            return dragger.stopDrag()
+        }
+        dragger.dragNode.onselectstart = function () {
+            return false
+        };
+        dragger.gldragNode = dragger.dragNode;
+        document.body.appendChild(dragger.dragNode);
+        document.body.onmouseup = dragger.stopDrag;
+        dragger.waitDrag = 0;
+        dragger.dragNode.pWindow = window;
+        dragger.initFrameRoute()
+    }
+    if (dragger.dragNode.parentNode != window.document.body) {
+        var A = dragger.gldragNode;
+        if (dragger.gldragNode.old) {
+            A = dragger.gldragNode.old
+        }
+        A.parentNode.removeChild(A);
+        var B = dragger.dragNode.pWindow;
+        if (_isIE) {
+            var E = document.createElement("Div");
+            E.innerHTML = dragger.dragNode.outerHTML;
+            dragger.dragNode = E.childNodes[0]
+        } else {
+            dragger.dragNode = dragger.dragNode.cloneNode(true)
+        }
+        dragger.dragNode.pWindow = window;
+        dragger.gldragNode.old = dragger.dragNode;
+        document.body.appendChild(dragger.dragNode);
+        B.dhtmlDragAndDrop.dragNode = dragger.dragNode
+    }
+    dragger.dragNode.style.left = C.clientX + 15 + (dragger.fx ? dragger.fx * (-1) : 0) + (document.body.scrollLeft || document.documentElement.scrollLeft) + "px";
+    dragger.dragNode.style.top = C.clientY + 3 + (dragger.fy ? dragger.fy * (-1) : 0) + (document.body.scrollTop || document.documentElement.scrollTop) + "px";
+    if (!C.srcElement) {
+        var D = C.target
+    } else {
+        D = C.srcElement
+    }
+    dragger.checkLanding(D, C)
+};
+dhtmlDragAndDropObject.prototype.calculateFramePosition = function (E) {
+    if (window.name) {
+        var C = parent.frames[window.name].frameElement.offsetParent;
+        var D = 0;
+        var B = 0;
+        while (C) {
+            D += C.offsetLeft;
+            B += C.offsetTop;
+            C = C.offsetParent
+        }
+        if ((parent.dhtmlDragAndDrop)) {
+            var A = parent.dhtmlDragAndDrop.calculateFramePosition(1);
+            D += A.split("_")[0] * 1;
+            B += A.split("_")[1] * 1
+        }
+        if (E) {
+            return D + "_" + B
+        } else {
+            this.fx = D
+        }
+        this.fy = B
+    }
+    return "0_0"
+};
+dhtmlDragAndDropObject.prototype.checkLanding = function (B, A) {
+    if ((B) && (B.dragLanding)) {
+        if (this.lastLanding) {
+            this.lastLanding.dragLanding._dragOut(this.lastLanding)
+        }
+        this.lastLanding = B;
+        this.lastLanding = this.lastLanding.dragLanding._dragIn(this.lastLanding, this.dragStartNode, A.clientX, A.clientY, A);
+        this.lastLanding_scr = (_isIE ? A.srcElement : A.target)
+    } else {
+        if ((B) && (B.tagName != "BODY")) {
+            this.checkLanding(B.parentNode, A)
+        } else {
+            if (this.lastLanding) {
+                this.lastLanding.dragLanding._dragOut(this.lastLanding, A.clientX, A.clientY, A)
+            }
+            this.lastLanding = 0;
+            if (this._onNotFound) {
+                this._onNotFound()
+            }
+        }
+    }
+};
+dhtmlDragAndDropObject.prototype.stopDrag = function (B, C) {
+    dragger = window.dhtmlDragAndDrop;
+    if (!C) {
+        dragger.stopFrameRoute();
+        var A = dragger.lastLanding;
+        dragger.lastLanding = null;
+        if (A) {
+            A.dragLanding._drag(dragger.dragStartNode, dragger.dragStartObject, A, (_isIE ? event.srcElement : B.target))
+        }
+    }
+    dragger.lastLanding = null;
+    if ((dragger.dragNode) && (dragger.dragNode.parentNode == document.body)) {
+        dragger.dragNode.parentNode.removeChild(dragger.dragNode)
+    }
+    dragger.dragNode = 0;
+    dragger.gldragNode = 0;
+    dragger.fx = 0;
+    dragger.fy = 0;
+    dragger.dragStartNode = 0;
+    dragger.dragStartObject = 0;
+    document.body.onmouseup = dragger.tempDOMU;
+    document.body.onmousemove = dragger.tempDOMM;
+    dragger.tempDOMU = null;
+    dragger.tempDOMM = null;
+    dragger.waitDrag = 0
+};
+dhtmlDragAndDropObject.prototype.stopFrameRoute = function (C) {
+    if (C) {
+        window.dhtmlDragAndDrop.stopDrag(1, 1)
+    }
+    for (var A = 0; A < window.frames.length; A++) {
+        try {
+            if ((window.frames[A] != C) && (window.frames[A].dhtmlDragAndDrop)) {
+                window.frames[A].dhtmlDragAndDrop.stopFrameRoute(window)
+            }
+        } catch (B) {}
+    }
+    try {
+        if ((parent.dhtmlDragAndDrop) && (parent != window) && (parent != C)) {
+            parent.dhtmlDragAndDrop.stopFrameRoute(window)
+        }
+    } catch (B) {}
+};
+dhtmlDragAndDropObject.prototype.initFrameRoute = function (C, D) {
+    if (C) {
+        window.dhtmlDragAndDrop.preCreateDragCopy({});
+        window.dhtmlDragAndDrop.dragStartNode = C.dhtmlDragAndDrop.dragStartNode;
+        window.dhtmlDragAndDrop.dragStartObject = C.dhtmlDragAndDrop.dragStartObject;
+        window.dhtmlDragAndDrop.dragNode = C.dhtmlDragAndDrop.dragNode;
+        window.dhtmlDragAndDrop.gldragNode = C.dhtmlDragAndDrop.dragNode;
+        window.document.body.onmouseup = window.dhtmlDragAndDrop.stopDrag;
+        window.waitDrag = 0;
+        if (((!_isIE) && (D)) && ((!_isFF) || (_FFrv < 1.8))) {
+            window.dhtmlDragAndDrop.calculateFramePosition()
+        }
+    }
+    try {
+        if ((parent.dhtmlDragAndDrop) && (parent != window) && (parent != C)) {
+            parent.dhtmlDragAndDrop.initFrameRoute(window)
+        }
+    } catch (B) {}
+    for (var A = 0; A < window.frames.length; A++) {
+        try {
+            if ((window.frames[A] != C) && (window.frames[A].dhtmlDragAndDrop)) {
+                window.frames[A].dhtmlDragAndDrop.initFrameRoute(window, ((!C || D) ? 1 : 0))
+            }
+        } catch (B) {}
+    }
+};
+var _isFF = false;
+var _isIE = false;
+var _isOpera = false;
+var _isKHTML = false;
+var _isMacOS = false;
+var _isChrome = false;
+if (navigator.userAgent.indexOf("Macintosh") != -1) {
+    _isMacOS = true
+}
+if (navigator.userAgent.toLowerCase().indexOf("chrome") > -1) {
+    _isChrome = true
+}
+if ((navigator.userAgent.indexOf("Safari") != -1) || (navigator.userAgent.indexOf("Konqueror") != -1)) {
+    var _KHTMLrv = parseFloat(navigator.userAgent.substr(navigator.userAgent.indexOf("Safari") + 7, 5));
+    if (_KHTMLrv > 525) {
+        _isFF = true;
+        var _FFrv = 1.9
+    } else {
+        _isKHTML = true
+    }
+} else {
+    if (navigator.userAgent.indexOf("Opera") != -1) {
+        _isOpera = true;
+        _OperaRv = parseFloat(navigator.userAgent.substr(navigator.userAgent.indexOf("Opera") + 6, 3))
+    } else {
+        if (navigator.appName.indexOf("Microsoft") != -1) {
+            _isIE = true;
+            if (navigator.appVersion.indexOf("MSIE 8.0") != -1 && document.compatMode != "BackCompat") {
+                _isIE = 8
+            }
+        } else {
+            _isFF = true;
+            var _FFrv = parseFloat(navigator.userAgent.split("rv:")[1])
+        }
+    }
+}
+dtmlXMLLoaderObject.prototype.doXPath = function (C, E, D, I) {
+    if (_isKHTML || (!_isIE && !window.XPathResult)) {
+        return this.doXPathOpera(C, E)
+    }
+    if (_isIE) {
+        if (!E) {
+            if (!this.xmlDoc.nodeName) {
+                E = this.xmlDoc.responseXML
+            } else {
+                E = this.xmlDoc
+            }
+        }
+        if (!E) {
+            dhtmlxError.throwError("LoadXML", "Incorrect XML", [(E || this.xmlDoc), this.mainObject])
+        }
+        if (D != null) {
+            E.setProperty("SelectionNamespaces", "xmlns:xsl='" + D + "'")
+        }
+        if (I == "single") {
+            return E.selectSingleNode(C)
+        } else {
+            return E.selectNodes(C) || new Array(0)
+        }
+    } else {
+        var A = E;
+        if (!E) {
+            if (!this.xmlDoc.nodeName) {
+                E = this.xmlDoc.responseXML
+            } else {
+                E = this.xmlDoc
+            }
+        }
+        if (!E) {
+            dhtmlxError.throwError("LoadXML", "Incorrect XML", [(E || this.xmlDoc), this.mainObject])
+        }
+        if (E.nodeName.indexOf("document") != -1) {
+            A = E
+        } else {
+            A = E;
+            E = E.ownerDocument
+        }
+        var G = XPathResult.ANY_TYPE;
+        if (I == "single") {
+            G = XPathResult.FIRST_ORDERED_NODE_TYPE
+        }
+        var F = new Array();
+        var B = E.evaluate(C, A, function (J) {
+            return D
+        }, G, null);
+        if (G == XPathResult.FIRST_ORDERED_NODE_TYPE) {
+            return B.singleNodeValue
+        }
+        var H = B.iterateNext();
+        while (H) {
+            F[F.length] = H;
+            H = B.iterateNext()
+        }
+        return F
+    }
+};
+
+function _dhtmlxError(B, A, C) {
+    if (!this.catches) {
+        this.catches = new Array()
+    }
+    return this
+}
+_dhtmlxError.prototype.catchError = function (B, A) {
+    this.catches[B] = A
+};
+_dhtmlxError.prototype.throwError = function (B, A, C) {
+    if (this.catches[B]) {
+        return this.catches[B](B, A, C)
+    }
+    if (this.catches.ALL) {
+        return this.catches.ALL(B, A, C)
+    }
+    alert("Error type: " + arguments[0] + "\nDescription: " + arguments[1]);
+    return null
+};
+window.dhtmlxError = new _dhtmlxError();
+dtmlXMLLoaderObject.prototype.doXPathOpera = function (C, A) {
+    var E = C.replace(/[\/]+/gi, "/").split("/");
+    var D = null;
+    var B = 1;
+    if (!E.length) {
+        return []
+    }
+    if (E[0] == ".") {
+        D = [A]
+    } else {
+        if (E[0] == "") {
+            D = (this.xmlDoc.responseXML || this.xmlDoc).getElementsByTagName(E[B].replace(/\[[^\]]*\]/g, ""));
+            B++
+        } else {
+            return []
+        }
+    }
+    for (B; B < E.length; B++) {
+        D = this._getAllNamedChilds(D, E[B])
+    }
+    if (E[B - 1].indexOf("[") != -1) {
+        D = this._filterXPath(D, E[B - 1])
+    }
+    return D
+};
+dtmlXMLLoaderObject.prototype._filterXPath = function (B, A) {
+    var D = new Array();
+    var A = A.replace(/[^\[]*\[\@/g, "").replace(/[\[\]\@]*/g, "");
+    for (var C = 0; C < B.length; C++) {
+        if (B[C].getAttribute(A)) {
+            D[D.length] = B[C]
+        }
+    }
+    return D
+};
+dtmlXMLLoaderObject.prototype._getAllNamedChilds = function (B, A) {
+    var E = new Array();
+    if (_isKHTML) {
+        A = A.toUpperCase()
+    }
+    for (var D = 0; D < B.length; D++) {
+        for (var C = 0; C < B[D].childNodes.length; C++) {
+            if (_isKHTML) {
+                if (B[D].childNodes[C].tagName && B[D].childNodes[C].tagName.toUpperCase() == A) {
+                    E[E.length] = B[D].childNodes[C]
+                }
+            } else {
+                if (B[D].childNodes[C].tagName == A) {
+                    E[E.length] = B[D].childNodes[C]
+                }
+            }
+        }
+    }
+    return E
+};
+
+function dhtmlXHeir(B, A) {
+    for (var C in A) {
+        if (typeof(A[C]) == "function") {
+            B[C] = A[C]
+        }
+    }
+    return B
+}
+function dhtmlxEvent(B, C, A) {
+    if (B.addEventListener) {
+        B.addEventListener(C, A, false)
+    } else {
+        if (B.attachEvent) {
+            B.attachEvent("on" + C, A)
+        }
+    }
+}
+dtmlXMLLoaderObject.prototype.xslDoc = null;
+dtmlXMLLoaderObject.prototype.setXSLParamValue = function (B, C, D) {
+    if (!D) {
+        D = this.xslDoc
+    }
+    if (D.responseXML) {
+        D = D.responseXML
+    }
+    var A = this.doXPath("/xsl:stylesheet/xsl:variable[@name='" + B + "']", D, "http://www.w3.org/1999/XSL/Transform", "single");
+    if (A != null) {
+        A.firstChild.nodeValue = C
+    }
+};
+dtmlXMLLoaderObject.prototype.doXSLTransToObject = function (D, B) {
+    if (!D) {
+        D = this.xslDoc
+    }
+    if (D.responseXML) {
+        D = D.responseXML
+    }
+    if (!B) {
+        B = this.xmlDoc
+    }
+    if (B.responseXML) {
+        B = B.responseXML
+    }
+    if (!_isIE) {
+        if (!this.XSLProcessor) {
+            this.XSLProcessor = new XSLTProcessor();
+            this.XSLProcessor.importStylesheet(D)
+        }
+        var A = this.XSLProcessor.transformToDocument(B)
+    } else {
+        var A = new ActiveXObject("Msxml2.DOMDocument.3.0");
+        try {
+            B.transformNodeToObject(D, A)
+        } catch (C) {
+            A = B.transformNode(D)
+        }
+    }
+    return A
+};
+dtmlXMLLoaderObject.prototype.doXSLTransToString = function (C, B) {
+    var A = this.doXSLTransToObject(C, B);
+    if (typeof(A) == "string") {
+        return A
+    }
+    return this.doSerialization(A)
+};
+dtmlXMLLoaderObject.prototype.doSerialization = function (B) {
+    if (!B) {
+        B = this.xmlDoc
+    }
+    if (B.responseXML) {
+        B = B.responseXML
+    }
+    if (!_isIE) {
+        var A = new XMLSerializer();
+        return A.serializeToString(B)
+    } else {
+        return B.xml
+    }
+};
+dhtmlxEventable = function (obj) {
+    obj.dhx_SeverCatcherPath = "";
+    obj.attachEvent = function (name, catcher, callObj) {
+        name = "ev_" + name.toLowerCase();
+        if (!this[name]) {
+            this[name] = new this.eventCatcher(callObj || this)
+        }
+        return (name + ":" + this[name].addEvent(catcher))
+    };
+    obj.callEvent = function (name, arg0) {
+        name = "ev_" + name.toLowerCase();
+        if (this[name]) {
+            return this[name].apply(this, arg0)
+        }
+        return true
+    };
+    obj.checkEvent = function (name) {
+        return ( !! this["ev_" + name.toLowerCase()])
+    };
+    obj.eventCatcher = function (obj) {
+        var dhx_catch = [];
+        var z = function () {
+            var res = true;
+            for (var i = 0; i < dhx_catch.length; i++) {
+                if (dhx_catch[i] != null) {
+                    var zr = dhx_catch[i].apply(obj, arguments);
+                    res = res && zr
+                }
+            }
+            return res
+        };
+        z.addEvent = function (ev) {
+            if (typeof(ev) != "function") {
+                ev = eval(ev)
+            }
+            if (ev) {
+                return dhx_catch.push(ev) - 1
+            }
+            return false
+        };
+        z.removeEvent = function (id) {
+            dhx_catch[id] = null
+        };
+        return z
+    };
+    obj.detachEvent = function (id) {
+        if (id != false) {
+            var list = id.split(":");
+            this[list[0]].removeEvent(list[1])
+        }
+    }
+};
+
+function dataProcessor(A) {
+    this.serverProcessor = A;
+    this.action_param = "!nativeeditor_status";
+    this.object = null;
+    this.updatedRows = [];
+    this.autoUpdate = true;
+    this.updateMode = "cell";
+    this._tMode = "GET";
+    this.post_delim = "_";
+    this._waitMode = 0;
+    this._in_progress = {};
+    this._invalid = {};
+    this.mandatoryFields = [];
+    this.messages = [];
+    this.styles = {
+        updated: "font-weight:bold;",
+        inserted: "font-weight:bold;",
+        deleted: "text-decoration : line-through;",
+        invalid: "background-color:FFE0E0;",
+        invalid_cell: "border-bottom:2px solid red;",
+        error: "color:red;",
+        clear: "font-weight:normal;text-decoration:none;"
+    };
+    this.enableUTFencoding(true);
+    dhtmlxEventable(this);
+    return this
+}
+dataProcessor.prototype = {
+    setTransactionMode: function (B, A) {
+        this._tMode = B;
+        this._tSend = A
+    },
+    escape: function (A) {
+        if (this._utf) {
+            return encodeURIComponent(A)
+        } else {
+            return escape(A)
+        }
+    },
+    enableUTFencoding: function (A) {
+        this._utf = convertStringToBoolean(A)
+    },
+    setDataColumns: function (A) {
+        this._columns = (typeof A == "string") ? A.split(",") : A
+    },
+    getSyncState: function () {
+        return !this.updatedRows.length
+    },
+    enableDataNames: function (A) {
+        this._endnm = convertStringToBoolean(A)
+    },
+    enablePartialDataSend: function (A) {
+        this._changed = convertStringToBoolean(A)
+    },
+    setUpdateMode: function (B, A) {
+        this.autoUpdate = (B == "cell");
+        this.updateMode = B;
+        this.dnd = A
+    },
+    ignore: function (B, A) {
+        this._silent_mode = true;
+        B.call(A || window);
+        this._silent_mode = false
+    },
+    setUpdated: function (D, C, E) {
+        if (this._silent_mode) {
+            return
+        }
+        var B = this.findRow(D);
+        E = E || "updated";
+        var A = this.obj.getUserData(D, this.action_param);
+        if (A && E == "updated") {
+            E = A
+        }
+        if (C) {
+            this.set_invalid(D, false);
+            this.updatedRows[B] = D;
+            this.obj.setUserData(D, this.action_param, E);
+            if (this._in_progress[D]) {
+                this._in_progress[D] = "wait"
+            }
+        } else {
+            if (!this.is_invalid(D)) {
+                this.updatedRows.splice(B, 1);
+                this.obj.setUserData(D, this.action_param, "")
+            }
+        }
+        if (!C) {
+            this._clearUpdateFlag(D)
+        }
+        this.markRow(D, C, E);
+        if (C && this.autoUpdate) {
+            this.sendData(D)
+        }
+    },
+    _clearUpdateFlag: function (A) {},
+    markRow: function (F, C, E) {
+        var D = "";
+        var B = this.is_invalid(F);
+        if (B) {
+            D = this.styles[B];
+            C = true
+        }
+        if (this.callEvent("onRowMark", [F, C, E, B])) {
+            D = this.styles[C ? E : "clear"] + D;
+            this.obj[this._methods[0]](F, D);
+            if (B && B.details) {
+                D += this.styles[B + "_cell"];
+                for (var A = 0; A < B.details.length; A++) {
+                    if (B.details[A]) {
+                        this.obj[this._methods[1]](F, A, D)
+                    }
+                }
+            }
+        }
+    },
+    getState: function (A) {
+        return this.obj.getUserData(A, this.action_param)
+    },
+    is_invalid: function (A) {
+        return this._invalid[A]
+    },
+    set_invalid: function (C, B, A) {
+        if (A) {
+            B = {
+                value: B,
+                details: A,
+                toString: function () {
+                    return this.value.toString()
+                }
+            }
+        }
+        this._invalid[C] = B
+    },
+    checkBeforeUpdate: function (A) {
+        return true
+    },
+    sendData: function (A) {
+        if (this._waitMode && (this.obj.mytype == "tree" || this.obj._h2)) {
+            return
+        }
+        if (this.obj.editStop) {
+            this.obj.editStop()
+        }
+        if (typeof A == "undefined" || this._tSend) {
+            return this.sendAllData()
+        }
+        if (this._in_progress[A]) {
+            return false
+        }
+        this.messages = [];
+        if (!this.checkBeforeUpdate(A) && this.callEvent("onValidatationError", [A, this.messages])) {
+            return false
+        }
+        this._beforeSendData(this._getRowData(A), A)
+    },
+    _beforeSendData: function (A, B) {
+        if (!this.callEvent("onBeforeUpdate", [B, this.getState(B), A])) {
+            return false
+        }
+        this._sendData(A, B)
+    },
+    serialize: function (D, E) {
+        if (typeof D == "string") {
+            return D
+        }
+        if (typeof E != "undefined") {
+            return this.serialize_one(D, "")
+        } else {
+            var A = [];
+            var C = [];
+            for (var B in D) {
+                if (D.hasOwnProperty(B)) {
+                    A.push(this.serialize_one(D[B], B + this.post_delim));
+                    C.push(B)
+                }
+            }
+            A.push("ids=" + this.escape(C.join(",")));
+            return A.join("&")
+        }
+    },
+    serialize_one: function (D, B) {
+        if (typeof D == "string") {
+            return D
+        }
+        var A = [];
+        for (var C in D) {
+            if (D.hasOwnProperty(C)) {
+                A.push(this.escape((B || "") + C) + "=" + this.escape(D[C]))
+            }
+        }
+        return A.join("&")
+    },
+    _sendData: function (B, C) {
+        if (!B) {
+            return
+        }
+        if (!this.callEvent("onBeforeDataSending", C ? [C, this.getState(C), B] : [null, null, B])) {
+            return false
+        }
+        if (C) {
+            this._in_progress[C] = (new Date()).valueOf()
+        }
+        var A = new dtmlXMLLoaderObject(this.afterUpdate, this, true);
+        var D = this.serverProcessor + (this._user ? (getUrlSymbol(this.serverProcessor) + ["dhx_user=" + this._user, "dhx_version=" + this.obj.getUserData(0, "version")].join("&")) : "");
+        if (this._tMode != "POST") {
+            A.loadXML(D + ((D.indexOf("?") != -1) ? "&" : "?") + this.serialize(B, C))
+        } else {
+            A.loadXML(D, true, this.serialize(B, C))
+        }
+        this._waitMode++
+    },
+    sendAllData: function () {
+        if (!this.updatedRows.length) {
+            return
+        }
+        this.messages = [];
+        var B = true;
+        for (var A = 0; A < this.updatedRows.length; A++) {
+            B &= this.checkBeforeUpdate(this.updatedRows[A])
+        }
+        if (!B && !this.callEvent("onValidatationError", ["", this.messages])) {
+            return false
+        }
+        if (this._tSend) {
+            this._sendData(this._getAllData())
+        } else {
+            for (var A = 0; A < this.updatedRows.length; A++) {
+                if (!this._in_progress[this.updatedRows[A]]) {
+                    if (this.is_invalid(this.updatedRows[A])) {
+                        continue
+                    }
+                    this._beforeSendData(this._getRowData(this.updatedRows[A]), this.updatedRows[A]);
+                    if (this._waitMode && (this.obj.mytype == "tree" || this.obj._h2)) {
+                        return
+                    }
+                }
+            }
+        }
+    },
+    _getAllData: function (D) {
+        var B = {};
+        var A = false;
+        for (var C = 0; C < this.updatedRows.length; C++) {
+            var E = this.updatedRows[C];
+            if (this._in_progress[E] || this.is_invalid(E)) {
+                continue
+            }
+            if (!this.callEvent("onBeforeUpdate", [E, this.getState(E)])) {
+                continue
+            }
+            B[E] = this._getRowData(E, E + this.post_delim);
+            A = true;
+            this._in_progress[E] = (new Date()).valueOf()
+        }
+        return A ? B : null
+    },
+    setVerificator: function (B, A) {
+        this.mandatoryFields[B] = A || (function (C) {
+            return (C != "")
+        })
+    },
+    clearVerificator: function (A) {
+        this.mandatoryFields[A] = false
+    },
+    findRow: function (B) {
+        var A = 0;
+        for (A = 0; A < this.updatedRows.length; A++) {
+            if (B == this.updatedRows[A]) {
+                break
+            }
+        }
+        return A
+    },
+    defineAction: function (A, B) {
+        if (!this._uActions) {
+            this._uActions = []
+        }
+        this._uActions[A] = B
+    },
+    afterUpdateCallback: function (B, G, F, E) {
+        var A = B;
+        var D = (F != "error" && F != "invalid");
+        if (!D) {
+            this.set_invalid(B, F)
+        }
+        if ((this._uActions) && (this._uActions[F]) && (!this._uActions[F](E))) {
+            return (delete this._in_progress[A])
+        }
+        if (this._in_progress[A] != "wait") {
+            this.setUpdated(B, false)
+        }
+        var C = B;
+        switch (F) {
+        case "inserted":
+        case "insert":
+            if (G != B) {
+                this.obj[this._methods[2]](B, G);
+                B = G
+            }
+            break;
+        case "delete":
+        case "deleted":
+            this.obj.setUserData(B, this.action_param, "true_deleted");
+            this.obj[this._methods[3]](B);
+            delete this._in_progress[A];
+            return this.callEvent("onAfterUpdate", [B, F, G, E]);
+            break
+        }
+        if (this._in_progress[A] != "wait") {
+            if (D) {
+                this.obj.setUserData(B, this.action_param, "")
+            }
+            delete this._in_progress[A]
+        } else {
+            delete this._in_progress[A];
+            this.setUpdated(G, true, this.obj.getUserData(B, this.action_param))
+        }
+        this.callEvent("onAfterUpdate", [B, F, G, E])
+    },
+    afterUpdate: function (G, K, I, H, F) {
+        F.getXMLTopNode("data");
+        if (!F.xmlDoc.responseXML) {
+            return
+        }
+        var J = F.doXPath("//data/action");
+        for (var D = 0; D < J.length; D++) {
+            var E = J[D];
+            var C = E.getAttribute("type");
+            var A = E.getAttribute("sid");
+            var B = E.getAttribute("tid");
+            G.afterUpdateCallback(A, B, C, E)
+        }
+        G.finalizeUpdate()
+    },
+    finalizeUpdate: function () {
+        if (this._waitMode) {
+            this._waitMode--
+        }
+        if ((this.obj.mytype == "tree" || this.obj._h2) && this.updatedRows.length) {
+            this.sendData()
+        }
+        this.callEvent("onAfterUpdateFinish", []);
+        if (!this.updatedRows.length) {
+            this.callEvent("onFullSync", [])
+        }
+    },
+    init: function (A) {
+        this.obj = A;
+        if (this.obj._dp_init) {
+            this.obj._dp_init(this)
+        }
+    },
+    setOnAfterUpdate: function (A) {
+        this.attachEvent("onAfterUpdate", A)
+    },
+    enableDebug: function (A) {},
+    setOnBeforeUpdateHandler: function (A) {
+        this.attachEvent("onBeforeDataSending", A)
+    },
+/* starts autoupdate mode
+		@param interval
+			time interval for sending update requests
+	*/
+    setAutoUpdate: function (C, B) {
+        C = C || 2000;
+        this._user = B || (new Date()).valueOf();
+        this._need_update = false;
+        this._loader = null;
+        this._update_busy = false;
+        this.attachEvent("onAfterUpdate", function (D, F, G, E) {
+            this.afterAutoUpdate(D, F, G, E)
+        });
+        this.attachEvent("onFullSync", function () {
+            this.fullSync()
+        });
+        var A = this;
+        window.setInterval(function () {
+            A.loadUpdate()
+        }, C)
+    },
+/* process updating request answer
+		if status == collision version is depricated
+		set flag for autoupdating immidiatly
+	*/
+    afterAutoUpdate: function (A, C, D, B) {
+        if (C == "collision") {
+            this._need_update = true;
+            return false
+        } else {
+            return true
+        }
+    },
+/* callback function for onFillSync event
+		call update function if it's need
+	*/
+    fullSync: function () {
+        if (this._need_update == true) {
+            this._need_update = false;
+            this.loadUpdate()
+        }
+        return true
+    },
+/* sends query to the server and call callback function
+	*/
+    getUpdates: function (A, B) {
+        if (this._update_busy) {
+            return false
+        } else {
+            this._update_busy = true
+        }
+        this._loader = this._loader || new dtmlXMLLoaderObject(true);
+        this._loader.async = true;
+        this._loader.waitCall = B;
+        this._loader.loadXML(A)
+    },
+/* returns xml node value
+		@param node
+			xml node
+	*/
+    _v: function (A) {
+        if (A.firstChild) {
+            return A.firstChild.nodeValue
+        }
+        return ""
+    },
+/* returns values array of xml nodes array
+		@param arr
+			array of xml nodes
+	*/
+    _a: function (A) {
+        var C = [];
+        for (var B = 0; B < A.length; B++) {
+            C[B] = this._v(A[B])
+        }
+        return C
+    },
+/* loads updates and processes them
+	*/
+    loadUpdate: function () {
+        var B = this;
+        var A = this.obj.getUserData(0, "version");
+        var C = this.serverProcessor + getUrlSymbol(this.serverProcessor) + ["dhx_user=" + this._user, "dhx_version=" + A].join("&");
+        C = C.replace("editing=true&", "");
+        this.getUpdates(C, function () {
+            var F = B._loader.doXPath("//userdata");
+            B.obj.setUserData(0, "version", B._v(F[0]));
+            var D = B._loader.doXPath("//update");
+            if (D.length) {
+                B._silent_mode = true;
+                for (var G = 0; G < D.length; G++) {
+                    var E = D[G].getAttribute("status");
+                    var I = D[G].getAttribute("id");
+                    var H = D[G].getAttribute("parent");
+                    switch (E) {
+                    case "inserted":
+                        B.callEvent("insertCallback", [D[G], I, H]);
+                        break;
+                    case "updated":
+                        B.callEvent("updateCallback", [D[G], I, H]);
+                        break;
+                    case "deleted":
+                        B.callEvent("deleteCallback", [D[G], I, H]);
+                        break
+                    }
+                }
+                B._silent_mode = false
+            }
+            B._update_busy = false;
+            B = null
+        })
+    }
+};
+if (window.dhtmlXGridObject) {
+    dhtmlXGridObject.prototype._init_point_connector = dhtmlXGridObject.prototype._init_point;
+    dhtmlXGridObject.prototype._init_point = function () {
+        var A = function (E) {
+            E = E.replace(/(\?|\&)connector[^\f]*/g, "");
+            return E + (E.indexOf("?") != -1 ? "&" : "?") + "connector=true" + (mygrid.hdr.rows.length > 0 ? "&dhx_no_header=1" : "")
+        };
+        var D = function (E) {
+            return A(E) + (this._connector_sorting || "") + (this._connector_filter || "")
+        };
+        var C = function (F, G, E) {
+            this._connector_sorting = "&dhx_sort[" + G + "]=" + E;
+            return D.call(this, F)
+        };
+        var B = function (F, E, H) {
+            for (var G = 0; G < E.length; G++) {
+                E[G] = "dhx_filter[" + E[G] + "]=" + encodeURIComponent(H[G])
+            }
+            this._connector_filter = "&" + E.join("&");
+            return D.call(this, F)
+        };
+        this.attachEvent("onCollectValues", function (E) {
+            if (this._con_f_used[E]) {
+                if (typeof(this._con_f_used[E]) == "object") {
+                    return this._con_f_used[E]
+                } else {
+                    return false
+                }
+            }
+            return true
+        });
+        this.attachEvent("onDynXLS", function () {
+            this.xmlFileUrl = D.call(this, this.xmlFileUrl);
+            return true
+        });
+        this.attachEvent("onBeforeSorting", function (H, G, F) {
+            if (G == "connector") {
+                var E = this;
+                this.clearAndLoad(C.call(this, this.xmlFileUrl, H, F), function () {
+                    E.setSortImgState(true, H, F)
+                });
+                return false
+            }
+            return true
+        });
+        this.attachEvent("onFilterStart", function (F, E) {
+            if (this._con_f_used.length) {
+                this.clearAndLoad(B.call(this, this.xmlFileUrl, F, E));
+                return false
+            }
+            return true
+        });
+        this.attachEvent("onXLE", function (F, E, H, G) {
+            if (!G) {
+                return
+            }
+        });
+        if (this._init_point_connector) {
+            this._init_point_connector()
+        }
+    };
+    dhtmlXGridObject.prototype._con_f_used = [];
+    dhtmlXGridObject.prototype._in_header_connector_text_filter = function (B, A) {
+        if (!this._con_f_used[A]) {
+            this._con_f_used[A] = 1
+        }
+        return this._in_header_text_filter(B, A)
+    };
+    dhtmlXGridObject.prototype._in_header_connector_select_filter = function (B, A) {
+        if (!this._con_f_used[A]) {
+            this._con_f_used[A] = 2
+        }
+        return this._in_header_select_filter(B, A)
+    };
+    dhtmlXGridObject.prototype.load_connector = dhtmlXGridObject.prototype.load;
+    dhtmlXGridObject.prototype.load = function (B, E, D) {
+        if (!this._colls_loaded && this.cellType) {
+            var A = [];
+            for (var C = 0; C < this.cellType.length; C++) {
+                if (this.cellType[C].indexOf("co") == 0 || this._con_f_used[C] == 2) {
+                    A.push(C)
+                }
+            }
+            if (A.length) {
+                arguments[0] += (arguments[0].indexOf("?") != -1 ? "&" : "?") + "connector=true&dhx_colls=" + A.join(",")
+            }
+        }
+        return this.load_connector.apply(this, arguments)
+    };
+    dhtmlXGridObject.prototype._parseHead_connector = dhtmlXGridObject.prototype._parseHead;
+    dhtmlXGridObject.prototype._parseHead = function (A, L, I) {
+        this._parseHead_connector.apply(this, arguments);
+        if (!this._colls_loaded) {
+            var J = this.xmlLoader.doXPath("./coll_options", arguments[0]);
+            for (var F = 0; F < J.length; F++) {
+                var H = J[F].getAttribute("for");
+                var K = [];
+                var C = null;
+                if (this.cellType[H] == "combo") {
+                    C = this.getColumnCombo(H)
+                }
+                if (this.cellType[H].indexOf("co") == 0) {
+                    C = this.getCombo(H)
+                }
+                var E = this.xmlLoader.doXPath("./item", J[F]);
+                for (var D = 0; D < E.length; D++) {
+                    var B = E[D].getAttribute("value");
+                    if (C) {
+                        var G = E[D].getAttribute("label") || B;
+                        if (C.addOption) {
+                            C.addOption([
+                                [B, G]
+                            ])
+                        } else {
+                            C.put(B, G)
+                        }
+                        K[K.length] = G
+                    } else {
+                        K[K.length] = B
+                    }
+                }
+                if (this._con_f_used[H * 1]) {
+                    this._con_f_used[H * 1] = K
+                }
+            }
+            this._colls_loaded = true
+        }
+    }
+}
+if (window.dataProcessor) {
+    dataProcessor.prototype.init_original = dataProcessor.prototype.init;
+    dataProcessor.prototype.init = function (A) {
+        this.init_original(A);
+        A._dataprocessor = this;
+        this.setTransactionMode("POST", true);
+        this.serverProcessor += (this.serverProcessor.indexOf("?") != -1 ? "&" : "?") + "editing=true"
+    }
+}
+dhtmlxError.catchError("LoadXML", function (B, A, C) {
+    alert(C[0].responseText)
+});
+window.dhtmlXScheduler = window.scheduler = {
+    version: 2.2
+};
+dhtmlxEventable(scheduler);
+scheduler.init = function (C, A, B) {
+    A = A || (new Date());
+    B = B || "week";
+    this._obj = (typeof C == "string") ? document.getElementById(C) : C;
+    this._els = [];
+    this._scroll = true;
+    this._quirks = (_isIE && document.compatMode == "BackCompat");
+    this._quirks7 = (_isIE && navigator.appVersion.indexOf("MSIE 8") == -1);
+    this.get_elements();
+    this.init_templates();
+    this.set_actions();
+    dhtmlxEvent(window, "resize", function () {
+        window.clearTimeout(scheduler._resize_timer);
+        scheduler._resize_timer = window.setTimeout(function () {
+            if (scheduler.callEvent("onSchedulerResize", [])) {
+                scheduler.update_view()
+            }
+        }, 100)
+    });
+    this.set_sizes();
+    this.setCurrentView(A, B)
+};
+scheduler.xy = {
+    nav_height: 22,
+    min_event_height: 40,
+    scale_width: 50,
+    bar_height: 20,
+    scroll_width: 18,
+    scale_height: 20,
+    month_scale_height: 20,
+    menu_width: 25,
+    margin_top: 0,
+    margin_left: 0,
+    editor_width: 140
+};
+scheduler.keys = {
+    edit_save: 13,
+    edit_cancel: 27
+};
+scheduler.set_sizes = function () {
+    var B = this._x = this._obj.clientWidth - this.xy.margin_left;
+    var D = this._y = this._obj.clientHeight - this.xy.margin_top;
+    var E = this._table_view ? 0 : (this.xy.scale_width + this.xy.scroll_width);
+    var A = this._table_view ? -1 : this.xy.scale_width;
+    this.set_xy(this._els.dhx_cal_navline[0], B, this.xy.nav_height, 0, 0);
+    this.set_xy(this._els.dhx_cal_header[0], B - E, this.xy.scale_height, A, this.xy.nav_height + (this._quirks ? -1 : 1));
+    var F = this._els.dhx_cal_navline[0].offsetHeight;
+    if (F > 0) {
+        this.xy.nav_height = F
+    }
+    var C = this.xy.scale_height + this.xy.nav_height + (this._quirks ? -2 : 0);
+    this.set_xy(this._els.dhx_cal_data[0], B, D - (C + 2), 0, C + 2)
+};
+scheduler.set_xy = function (D, B, C, A, E) {
+    D.style.width = Math.max(0, B) + "px";
+    D.style.height = Math.max(0, C) + "px";
+    if (arguments.length > 3) {
+        D.style.left = A + "px";
+        D.style.top = E + "px"
+    }
+};
+scheduler.get_elements = function () {
+    var D = this._obj.getElementsByTagName("DIV");
+    for (var C = 0; C < D.length; C++) {
+        var A = D[C].className;
+        if (!this._els[A]) {
+            this._els[A] = []
+        }
+        this._els[A].push(D[C]);
+        var B = scheduler.locale.labels[D[C].getAttribute("name") || A];
+        if (B) {
+            D[C].innerHTML = B
+        }
+    }
+};
+scheduler.set_actions = function () {
+    for (var A in this._els) {
+        if (this._click[A]) {
+            for (var B = 0; B < this._els[A].length; B++) {
+                this._els[A][B].onclick = scheduler._click[A]
+            }
+        }
+    }
+    this._obj.onselectstart = function (C) {
+        return false
+    };
+    this._obj.onmousemove = function (C) {
+        scheduler._on_mouse_move(C || event)
+    };
+    this._obj.onmousedown = function (C) {
+        scheduler._on_mouse_down(C || event)
+    };
+    this._obj.onmouseup = function (C) {
+        scheduler._on_mouse_up(C || event)
+    };
+    this._obj.ondblclick = function (C) {
+        scheduler._on_dbl_click(C || event)
+    }
+};
+scheduler.select = function (A) {
+    if (this._table_view || !this.getEvent(A)._timed) {
+        return
+    }
+    if (this._select_id == A) {
+        return
+    }
+    this.editStop(false);
+    this.unselect();
+    this._select_id = A;
+    this.updateEvent(A)
+};
+scheduler.unselect = function (B) {
+    if (B && B != this._select_id) {
+        return
+    }
+    var A = this._select_id;
+    this._select_id = null;
+    if (A) {
+        this.updateEvent(A)
+    }
+};
+scheduler.getState = function () {
+    return {
+        mode: this._mode,
+        date: this._date,
+        min_date: this._min_date,
+        max_date: this._max_date,
+        editor_id: this._edit_id,
+        lightbox_id: this._lightbox_id
+    }
+};
+scheduler._click = {
+    dhx_cal_data: function (C) {
+        var B = C ? C.target : event.srcElement;
+        var D = scheduler._locate_event(B);
+        C = C || event;
+        if ((D && !scheduler.callEvent("onClick", [D, C])) || scheduler.config.readonly) {
+            return
+        }
+        if (D) {
+            scheduler.select(D);
+            var A = B.className;
+            if (A.indexOf("_icon") != -1) {
+                scheduler._click.buttons[A.split(" ")[1].replace("icon_", "")](D)
+            }
+        } else {
+            scheduler._close_not_saved()
+        }
+    },
+    dhx_cal_prev_button: function () {
+        scheduler._click.dhx_cal_next_button(0, -1)
+    },
+    dhx_cal_next_button: function (B, A) {
+        scheduler.setCurrentView(scheduler.date.add(scheduler.date[scheduler._mode + "_start"](scheduler._date), (A || 1), scheduler._mode))
+    },
+    dhx_cal_today_button: function () {
+        scheduler.setCurrentView(new Date())
+    },
+    dhx_cal_tab: function () {
+        var A = this.getAttribute("name").split("_")[0];
+        scheduler.setCurrentView(scheduler._date, A)
+    },
+    buttons: {
+        "delete": function (B) {
+            var A = scheduler.locale.labels.confirm_deleting;
+            if (!A || confirm(A)) {
+                scheduler.deleteEvent(B)
+            }
+        },
+        edit: function (A) {
+            scheduler.edit(A)
+        },
+        save: function (A) {
+            scheduler.editStop(true)
+        },
+        details: function (A) {
+            scheduler.showLightbox(A)
+        },
+        cancel: function (A) {
+            scheduler.editStop(false)
+        }
+    }
+};
+scheduler.addEventNow = function (G, B, D) {
+    var C = {};
+    if (typeof G == "object") {
+        C = G;
+        G = null
+    }
+    var E = (this.config.event_duration || this.config.time_step) * 60000;
+    if (!G) {
+        G = Math.round((new Date()).valueOf() / E) * E
+    }
+    var A = new Date(G);
+    if (!B) {
+        var F = this.config.first_hour;
+        if (F > A.getHours()) {
+            A.setHours(F);
+            G = A.valueOf()
+        }
+        B = G + E
+    }
+    C.start_date = C.start_date || A;
+    C.end_date = C.end_date || new Date(B);
+    C.text = C.text || this.locale.labels.new_event;
+    C.id = this._drag_id = this.uid();
+    this._drag_mode = "new-size";
+    this._loading = true;
+    this.addEvent(C);
+    this.callEvent("onEventCreated", [this._drag_id, D]);
+    this._loading = false;
+    this._drag_event = {};
+    this._on_mouse_up(D)
+};
+scheduler._on_dbl_click = function (C, D) {
+    D = D || (C.target || C.srcElement);
+    if (this.config.readonly) {
+        return
+    }
+    var A = D.className.split(" ")[0];
+    switch (A) {
+    case "dhx_scale_holder":
+    case "dhx_scale_holder_now":
+    case "dhx_month_body":
+        if (!scheduler.config.dblclick_create) {
+            break
+        }
+        var G = this._mouse_coords(C);
+        var F = this._min_date.valueOf() + (G.y * this.config.time_step + (this._table_view ? 0 : G.x) * 24 * 60) * 60000;
+        F = this._correct_shift(F);
+        this.addEventNow(F, null, C);
+        break;
+    case "dhx_body":
+    case "dhx_cal_event_line":
+    case "dhx_cal_event_clear":
+        var E = this._locate_event(D);
+        if (!this.callEvent("onDblClick", [E, C])) {
+            return
+        }
+        if (this.config.details_on_dblclick || this._table_view || !this.getEvent(E)._timed) {
+            this.showLightbox(E)
+        } else {
+            this.edit(E)
+        }
+        break;
+    case "":
+        if (D.parentNode) {
+            return scheduler._on_dbl_click(C, D.parentNode)
+        }
+    default:
+        var B = this["dblclick_" + A];
+        if (B) {
+            B.call(this, C)
+        }
+        break
+    }
+};
+scheduler._mouse_coords = function (D) {
+    var F;
+    var A = document.body;
+    var E = document.documentElement;
+    if (D.pageX || D.pageY) {
+        F = {
+            x: D.pageX,
+            y: D.pageY
+        }
+    } else {
+        F = {
+            x: D.clientX + (A.scrollLeft || E.scrollLeft || 0) - A.clientLeft,
+            y: D.clientY + (A.scrollTop || E.scrollTop || 0) - A.clientTop
+        }
+    }
+    F.x -= getAbsoluteLeft(this._obj) + (this._table_view ? 0 : this.xy.scale_width);
+    F.y -= getAbsoluteTop(this._obj) + this.xy.nav_height + (this._dy_shift || 0) + this.xy.scale_height - this._els.dhx_cal_data[0].scrollTop;
+    F.ev = D;
+    var C = this["mouse_" + this._mode];
+    if (C) {
+        return C.call(this, F)
+    }
+    if (!this._table_view) {
+        F.x = Math.max(0, Math.ceil(F.x / this._cols[0]) - 1);
+        F.y = Math.max(0, Math.ceil(F.y * 60 / (this.config.time_step * this.config.hour_size_px)) - 1) + this.config.first_hour * (60 / this.config.time_step)
+    } else {
+        var B = 0;
+        for (B = 1; B < this._colsS.heights.length; B++) {
+            if (this._colsS.heights[B] > F.y) {
+                break
+            }
+        }
+        F.y = (Math.max(0, Math.ceil(F.x / this._cols[0]) - 1) + Math.max(0, B - 1) * 7) * 24 * 60 / this.config.time_step;
+        F.x = 0
+    }
+    return F
+};
+scheduler._close_not_saved = function () {
+    if (new Date().valueOf() - (scheduler._new_event || 0) > 500 && scheduler._edit_id) {
+        var A = scheduler.locale.labels.confirm_closing;
+        if (!A || confirm(A)) {
+            scheduler.editStop(scheduler.config.positive_closing)
+        }
+    }
+};
+scheduler._correct_shift = function (B, A) {
+    return B -= ((new Date(scheduler._min_date)).getTimezoneOffset() - (new Date(B)).getTimezoneOffset()) * 60000 * (A ? -1 : 1)
+};
+scheduler._on_mouse_move = function (F) {
+    if (this._drag_mode) {
+        var G = this._mouse_coords(F);
+        if (!this._drag_pos || this._drag_pos.x != G.x || this._drag_pos.y != G.y) {
+            if (this._edit_id != this._drag_id) {
+                this._close_not_saved()
+            }
+            this._drag_pos = G;
+            if (this._drag_mode == "create") {
+                this._close_not_saved();
+                this._loading = true;
+                var B = this._min_date.valueOf() + (G.y * this.config.time_step + (this._table_view ? 0 : G.x) * 24 * 60) * 60000;
+                B = this._correct_shift(B);
+                if (!this._drag_start) {
+                    this._drag_start = B;
+                    return
+                }
+                var E = B;
+                if (E == this._drag_start) {
+                    return
+                }
+                this._drag_id = this.uid();
+                this.addEvent(new Date(this._drag_start), new Date(E), this.locale.labels.new_event, this._drag_id, G.fields);
+                this.callEvent("onEventCreated", [this._drag_id, F]);
+                this._loading = false;
+                this._drag_mode = "new-size"
+            }
+            var H = this.getEvent(this._drag_id);
+            var B, E;
+            if (this._drag_mode == "move") {
+                B = this._min_date.valueOf() + (G.y * this.config.time_step + G.x * 24 * 60) * 60000;
+                if (!G.custom && this._table_view) {
+                    B += this.date.time_part(H.start_date) * 1000
+                }
+                B = this._correct_shift(B);
+                E = H.end_date.valueOf() - (H.start_date.valueOf() - B)
+            } else {
+                B = H.start_date.valueOf();
+                if (this._table_view) {
+                    E = this._min_date.valueOf() + G.y * this.config.time_step * 60000 + (G.custom ? 0 : 24 * 60 * 60000)
+                } else {
+                    E = this.date.date_part(new Date(H.end_date)).valueOf() + G.y * this.config.time_step * 60000;
+                    this._els.dhx_cal_data[0].style.cursor = "s-resize";
+                    if (this._mode == "week" || this._mode == "day") {
+                        E = this._correct_shift(E)
+                    }
+                }
+                if (this._drag_mode == "new-size") {
+                    if (E <= this._drag_start) {
+                        var D = G.shift || ((this._table_view && !G.custom) ? 24 * 60 * 60000 : 0);
+                        B = E - D;
+                        E = this._drag_start + (D || (this.config.time_step * 60000))
+                    } else {
+                        B = this._drag_start
+                    }
+                } else {
+                    if (E <= B) {
+                        E = B + this.config.time_step * 60000
+                    }
+                }
+            }
+            var I = new Date(E - 1);
+            var C = new Date(B);
+            if (this._table_view || (I.getDate() == C.getDate() && I.getHours() < this.config.last_hour)) {
+                H.start_date = C;
+                H.end_date = new Date(E);
+                if (this.config.update_render) {
+                    this.update_view()
+                } else {
+                    this.updateEvent(this._drag_id)
+                }
+            }
+            if (this._table_view) {
+                this.for_rendered(this._drag_id, function (J) {
+                    J.className += " dhx_in_move"
+                })
+            }
+        }
+    } else {
+        if (scheduler.checkEvent("onMouseMove")) {
+            var A = this._locate_event(F.target || F.srcElement);
+            this.callEvent("onMouseMove", [A, F])
+        }
+    }
+};
+scheduler._on_mouse_context = function (A, B) {
+    return this.callEvent("onContextMenu", [this._locate_event(B), A])
+};
+scheduler._on_mouse_down = function (A, B) {
+    if (this.config.readonly || this._drag_mode) {
+        return
+    }
+    B = B || (A.target || A.srcElement);
+    if (A.button == 2 || A.ctrlKey) {
+        return this._on_mouse_context(A, B)
+    }
+    switch (B.className.split(" ")[0]) {
+    case "dhx_cal_event_line":
+    case "dhx_cal_event_clear":
+        if (this._table_view) {
+            this._drag_mode = "move"
+        }
+        break;
+    case "dhx_header":
+    case "dhx_title":
+        this._drag_mode = "move";
+        break;
+    case "dhx_footer":
+        this._drag_mode = "resize";
+        break;
+    case "dhx_scale_holder":
+    case "dhx_scale_holder_now":
+    case "dhx_month_body":
+    case "dhx_matrix_cell":
+        this._drag_mode = "create";
+        break;
+    case "":
+        if (B.parentNode) {
+            return scheduler._on_mouse_down(A, B.parentNode)
+        }
+    default:
+        this._drag_mode = null;
+        this._drag_id = null
+    }
+    if (this._drag_mode) {
+        var C = this._locate_event(B);
+        if (!this.config["drag_" + this._drag_mode] || !this.callEvent("onBeforeDrag", [C, this._drag_mode, A])) {
+            this._drag_mode = this._drag_id = 0
+        } else {
+            this._drag_id = C;
+            this._drag_event = this._copy_event(this.getEvent(this._drag_id) || {})
+        }
+    }
+    this._drag_start = null
+};
+scheduler._on_mouse_up = function (B) {
+    if (this._drag_mode && this._drag_id) {
+        this._els.dhx_cal_data[0].style.cursor = "default";
+        var A = this.getEvent(this._drag_id);
+        if (this._drag_event._dhx_changed || !this._drag_event.start_date || A.start_date.valueOf() != this._drag_event.start_date.valueOf() || A.end_date.valueOf() != this._drag_event.end_date.valueOf()) {
+            var C = (this._drag_mode == "new-size");
+            if (!this.callEvent("onBeforeEventChanged", [A, B, C])) {
+                if (C) {
+                    this.deleteEvent(A.id, true)
+                } else {
+                    A.start_date = this._drag_event.start_date;
+                    A.end_date = this._drag_event.end_date;
+                    this.updateEvent(A.id)
+                }
+            } else {
+                if (C && this.config.edit_on_create) {
+                    this.unselect();
+                    this._new_event = new Date();
+                    if (this._table_view || this.config.details_on_create) {
+                        this._drag_mode = null;
+                        return this.showLightbox(this._drag_id)
+                    }
+                    this._drag_pos = true;
+                    this._select_id = this._edit_id = this._drag_id
+                } else {
+                    if (!this._new_event) {
+                        this.callEvent(C ? "onEventAdded" : "onEventChanged", [this._drag_id, this.getEvent(this._drag_id)])
+                    }
+                }
+            }
+        }
+        if (this._drag_pos) {
+            this.render_view_data()
+        }
+    }
+    this._drag_mode = null;
+    this._drag_pos = null
+};
+scheduler.update_view = function () {
+    this._reset_scale();
+    if (this._load_mode && this._load()) {
+        return this._render_wait = true
+    }
+    this.render_view_data()
+};
+scheduler.setCurrentView = function (B, E) {
+    if (!this.callEvent("onBeforeViewChange", [this._mode, this._date, E, B])) {
+        return
+    }
+    if (this[this._mode + "_view"] && E && this._mode != E) {
+        this[this._mode + "_view"](false)
+    }
+    this._close_not_saved();
+    this._mode = E || this._mode;
+    this._date = B;
+    this._table_view = (this._mode == "month");
+    var D = this._els.dhx_cal_tab;
+    for (var C = 0; C < D.length; C++) {
+        D[C].className = "dhx_cal_tab" + ((D[C].getAttribute("name") == this._mode + "_tab") ? " active" : "")
+    }
+    var A = this[this._mode + "_view"];
+    A ? A(true) : this.update_view();
+    this.callEvent("onViewChange", [this._mode, this._date])
+};
+scheduler._render_x_header = function (B, D, E, C) {
+    var A = document.createElement("DIV");
+    A.className = "dhx_scale_bar";
+    this.set_xy(A, this._cols[B] - 1, this.xy.scale_height - 2, D, 0);
+    A.innerHTML = this.templates[this._mode + "_scale_date"](E, this._mode);
+    C.appendChild(A)
+};
+scheduler._reset_scale = function () {
+    if (!this.templates[this._mode + "_date"]) {
+        return
+    }
+    var M = this._els.dhx_cal_header[0];
+    var R = this._els.dhx_cal_data[0];
+    var P = this.config;
+    M.innerHTML = "";
+    R.scrollTop = 0;
+    R.innerHTML = "";
+    var K = ((P.readonly || (!P.drag_resize)) ? " dhx_resize_denied" : "") + ((P.readonly || (!P.drag_move)) ? " dhx_move_denied" : "");
+    if (K) {
+        R.className = "dhx_cal_data" + K
+    }
+    this._cols = [];
+    this._colsS = {
+        height: 0
+    };
+    this._dy_shift = 0;
+    this.set_sizes();
+    var I = parseInt(M.style.width);
+    var C = 0;
+    var O, Q, A, N;
+    Q = this.date[this._mode + "_start"](new Date(this._date.valueOf()));
+    O = A = this._table_view ? scheduler.date.week_start(Q) : Q;
+    N = this.date.date_part(new Date());
+    var D = scheduler.date.add(Q, 1, this._mode);
+    var E = 7;
+    if (!this._table_view) {
+        var G = this.date["get_" + this._mode + "_end"];
+        if (G) {
+            D = G(Q)
+        }
+        E = Math.round((D.valueOf() - Q.valueOf()) / (1000 * 60 * 60 * 24))
+    }
+    this._min_date = O;
+    this._els.dhx_cal_date[0].innerHTML = this.templates[this._mode + "_date"](Q, D, this._mode);
+    for (var L = 0; L < E; L++) {
+        this._cols[L] = Math.floor(I / (E - L));
+        this._render_x_header(L, C, O, M);
+        if (!this._table_view) {
+            var F = document.createElement("DIV");
+            var B = "dhx_scale_holder";
+            if (O.valueOf() == N.valueOf()) {
+                B = "dhx_scale_holder_now"
+            }
+            F.className = B + " " + this.templates.week_date_class(O, N);
+            this.set_xy(F, this._cols[L] - 1, P.hour_size_px * (P.last_hour - P.first_hour), C + this.xy.scale_width + 1, 0);
+            R.appendChild(F)
+        }
+        O = this.date.add(O, 1, "day");
+        I -= this._cols[L];
+        C += this._cols[L];
+        this._colsS[L] = (this._cols[L - 1] || 0) + (this._colsS[L - 1] || (this._table_view ? 0 : this.xy.scale_width + 2))
+    }
+    this._max_date = O;
+    this._colsS[E] = this._cols[E - 1] + this._colsS[E - 1];
+    if (this._table_view) {
+        this._reset_month_scale(R, Q, A)
+    } else {
+        this._reset_hours_scale(R, Q, A);
+        if (P.multi_day) {
+            var J = document.createElement("DIV");
+            J.className = "dhx_multi_day";
+            J.style.visibility = "hidden";
+            this.set_xy(J, parseInt(M.style.width), 0, this.xy.scale_width, 0);
+            R.appendChild(J);
+            var H = J.cloneNode(true);
+            H.className = "dhx_multi_day_icon";
+            H.style.visibility = "hidden";
+            this.set_xy(H, this.xy.scale_width - 1, 0, 0, 0);
+            R.appendChild(H);
+            this._els.dhx_multi_day = [J, H]
+        }
+    }
+};
+scheduler._reset_hours_scale = function (B, A, E) {
+    var G = document.createElement("DIV");
+    G.className = "dhx_scale_holder";
+    var C = new Date(1980, 1, 1, this.config.first_hour, 0, 0);
+    for (var D = this.config.first_hour * 1; D < this.config.last_hour; D++) {
+        var F = document.createElement("DIV");
+        F.className = "dhx_scale_hour";
+        F.style.height = this.config.hour_size_px - (this._quirks ? 0 : 1) + "px";
+        F.style.width = this.xy.scale_width + "px";
+        F.innerHTML = scheduler.templates.hour_scale(C);
+        G.appendChild(F);
+        C = this.date.add(C, 1, "hour")
+    }
+    B.appendChild(G);
+    if (this.config.scroll_hour) {
+        B.scrollTop = this.config.hour_size_px * (this.config.scroll_hour - this.config.first_hour)
+    }
+};
+scheduler._reset_month_scale = function (J, K, I) {
+    var H = scheduler.date.add(K, 1, "month");
+    var A = new Date();
+    this.date.date_part(A);
+    this.date.date_part(I);
+    var N = Math.ceil((H.valueOf() - I.valueOf()) / (60 * 60 * 24 * 1000 * 7));
+    var B = [];
+    var L = (Math.floor(J.clientHeight / N) - 22);
+    this._colsS.height = L + 22;
+    var G = this._colsS.heights = [];
+    for (var E = 0; E <= 7; E++) {
+        B[E] = " style='height:" + L + "px; width:" + ((this._cols[E] || 0) - 1) + "px;' "
+    }
+    var D = 0;
+    this._min_date = I;
+    var F = "<table cellpadding='0' cellspacing='0'>";
+    for (var E = 0; E < N; E++) {
+        F += "<tr>";
+        for (var C = 0; C < 7; C++) {
+            F += "<td";
+            var M = "";
+            if (I < K) {
+                M = "dhx_before"
+            } else {
+                if (I >= H) {
+                    M = "dhx_after"
+                } else {
+                    if (I.valueOf() == A.valueOf()) {
+                        M = "dhx_now"
+                    }
+                }
+            }
+            F += " class='" + M + " " + this.templates.month_date_class(I, A) + "' ";
+            F += "><div class='dhx_month_head'>" + this.templates.month_day(I) + "</div><div class='dhx_month_body' " + B[C] + "></div></td>";
+            I = this.date.add(I, 1, "day")
+        }
+        F += "</tr>";
+        G[E] = D;
+        D += this._colsS.height
+    }
+    F += "</table>";
+    this._max_date = I;
+    J.innerHTML = F;
+    return I
+};
+scheduler.getLabel = function (E, D) {
+    var F = this.config.lightbox.sections;
+    for (var C = 0; C < F.length; C++) {
+        if (F[C].map_to == E) {
+            var B = F[C].options;
+            for (var A = 0; A < B.length; A++) {
+                if (B[A].key == D) {
+                    return B[A].label
+                }
+            }
+        }
+    }
+    return ""
+};
+scheduler.date = {
+    date_part: function (A) {
+        A.setHours(0);
+        A.setMinutes(0);
+        A.setSeconds(0);
+        A.setMilliseconds(0);
+        return A
+    },
+    time_part: function (A) {
+        return (A.valueOf() / 1000 - A.getTimezoneOffset() * 60) % 86400
+    },
+    week_start: function (B) {
+        var A = B.getDay();
+        if (scheduler.config.start_on_monday) {
+            if (A == 0) {
+                A = 6
+            } else {
+                A--
+            }
+        }
+        return this.date_part(this.add(B, -1 * A, "day"))
+    },
+    month_start: function (A) {
+        A.setDate(1);
+        return this.date_part(A)
+    },
+    year_start: function (A) {
+        A.setMonth(0);
+        return this.month_start(A)
+    },
+    day_start: function (A) {
+        return this.date_part(A)
+    },
+    add: function (B, C, D) {
+        var A = new Date(B.valueOf());
+        switch (D) {
+        case "day":
+            A.setDate(A.getDate() + C);
+            break;
+        case "week":
+            A.setDate(A.getDate() + 7 * C);
+            break;
+        case "month":
+            A.setMonth(A.getMonth() + C);
+            break;
+        case "year":
+            A.setYear(A.getFullYear() + C);
+            break;
+        case "hour":
+            A.setHours(A.getHours() + C);
+            break;
+        case "minute":
+            A.setMinutes(A.getMinutes() + C);
+            break;
+        default:
+            return scheduler.date["add_" + D](B, C, D)
+        }
+        return A
+    },
+    to_fixed: function (A) {
+        if (A < 10) {
+            return "0" + A
+        }
+        return A
+    },
+    copy: function (A) {
+        return new Date(A.valueOf())
+    },
+    date_to_str: function (B, A) {
+        B = B.replace(/%[a-zA-Z]/g, function (C) {
+            switch (C) {
+            case "%d":
+                return '"+scheduler.date.to_fixed(date.getDate())+"';
+            case "%m":
+                return '"+scheduler.date.to_fixed((date.getMonth()+1))+"';
+            case "%j":
+                return '"+date.getDate()+"';
+            case "%n":
+                return '"+(date.getMonth()+1)+"';
+            case "%y":
+                return '"+scheduler.date.to_fixed(date.getFullYear()%100)+"';
+            case "%Y":
+                return '"+date.getFullYear()+"';
+            case "%D":
+                return '"+scheduler.locale.date.day_short[date.getDay()]+"';
+            case "%l":
+                return '"+scheduler.locale.date.day_full[date.getDay()]+"';
+            case "%M":
+                return '"+scheduler.locale.date.month_short[date.getMonth()]+"';
+            case "%F":
+                return '"+scheduler.locale.date.month_full[date.getMonth()]+"';
+            case "%h":
+                return '"+scheduler.date.to_fixed((date.getHours()+11)%12+1)+"';
+            case "%g":
+                return '"+((date.getHours()+11)%12+1)+"';
+            case "%G":
+                return '"+date.getHours()+"';
+            case "%H":
+                return '"+scheduler.date.to_fixed(date.getHours())+"';
+            case "%i":
+                return '"+scheduler.date.to_fixed(date.getMinutes())+"';
+            case "%a":
+                return '"+(date.getHours()>11?"pm":"am")+"';
+            case "%A":
+                return '"+(date.getHours()>11?"PM":"AM")+"';
+            case "%s":
+                return '"+scheduler.date.to_fixed(date.getSeconds())+"';
+            case "%W":
+                return '"+scheduler.date.to_fixed(scheduler.date.getISOWeek(date))+"';
+            default:
+                return C
+            }
+        });
+        if (A) {
+            B = B.replace(/date\.get/g, "date.getUTC")
+        }
+        return new Function("date", 'return "' + B + '";')
+    },
+    str_to_date: function (E, C) {
+        var F = "var temp=date.split(/[^0-9a-zA-Z]+/g);";
+        var A = E.match(/%[a-zA-Z]/g);
+        for (var B = 0; B < A.length; B++) {
+            switch (A[B]) {
+            case "%j":
+            case "%d":
+                F += "set[2]=temp[" + B + "]||1;";
+                break;
+            case "%n":
+            case "%m":
+                F += "set[1]=(temp[" + B + "]||1)-1;";
+                break;
+            case "%y":
+                F += "set[0]=temp[" + B + "]*1+(temp[" + B + "]>50?1900:2000);";
+                break;
+            case "%g":
+            case "%G":
+            case "%h":
+            case "%H":
+                F += "set[3]=temp[" + B + "]||0;";
+                break;
+            case "%i":
+                F += "set[4]=temp[" + B + "]||0;";
+                break;
+            case "%Y":
+                F += "set[0]=temp[" + B + "]||0;";
+                break;
+            case "%a":
+            case "%A":
+                F += "set[3]=set[3]%12+((temp[" + B + "]||'').toLowerCase()=='am'?0:12);";
+                break;
+            case "%s":
+                F += "set[5]=temp[" + B + "]||0;";
+                break
+            }
+        }
+        var D = "set[0],set[1],set[2],set[3],set[4],set[5]";
+        if (C) {
+            D = " Date.UTC(" + D + ")"
+        }
+        return new Function("date", "var set=[0,0,1,0,0,0]; " + F + " return new Date(" + D + ");")
+    },
+    getISOWeek: function (C) {
+        if (!C) {
+            return false
+        }
+        var B = C.getDay();
+        if (B == 0) {
+            B = 7
+        }
+        var D = new Date(C.valueOf());
+        D.setDate(C.getDate() + (4 - B));
+        var A = D.getFullYear();
+        var F = Math.floor((D.getTime() - new Date(A, 0, 1).getTime()) / 86400000);
+        var E = 1 + Math.floor(F / 7);
+        return E
+    },
+    getUTCISOWeek: function (A) {
+        return this.getISOWeek(A)
+    }
+};
+scheduler.locale = {
+    date: {
+        month_full: ["January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December"],
+        month_short: ["Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"],
+        day_full: ["Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday"],
+        day_short: ["Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"]
+    },
+    labels: {
+        dhx_cal_today_button: "Today",
+        day_tab: "Day",
+        week_tab: "Week",
+        month_tab: "Month",
+        new_event: "New event",
+        icon_save: "Save",
+        icon_cancel: "Cancel",
+        icon_details: "Details",
+        icon_edit: "Edit",
+        icon_delete: "Delete",
+        confirm_closing: "",
+        confirm_deleting: "Event will be deleted permanently, are you sure?",
+        section_description: "Description",
+        section_time: "Time period",
+        full_day: "Full day",
+        confirm_recurring: "Do you want to edit the whole set of repeated events?",
+        section_recurring: "Repeat event",
+        button_recurring: "Disabled",
+        button_recurring_open: "Enabled",
+        agenda_tab: "Agenda",
+        date: "Date",
+        description: "Description",
+        year_tab: "Year"
+    }
+};
+scheduler.config = {
+    default_date: "%j %M %Y",
+    month_date: "%F %Y",
+    load_date: "%Y-%m-%d",
+    week_date: "%l",
+    day_date: "%D, %F %j",
+    hour_date: "%H:%i",
+    month_day: "%d",
+    xml_date: "%m/%d/%Y %H:%i",
+    api_date: "%d-%m-%Y %H:%i",
+    hour_size_px: 42,
+    time_step: 5,
+    start_on_monday: 1,
+    first_hour: 0,
+    last_hour: 24,
+    readonly: false,
+    drag_resize: 1,
+    drag_move: 1,
+    drag_create: 1,
+    dblclick_create: 1,
+    edit_on_create: 1,
+    details_on_create: 0,
+    click_form_details: 0,
+    server_utc: false,
+    positive_closing: false,
+    icons_edit: ["icon_save", "icon_cancel"],
+    icons_select: ["icon_details", "icon_edit", "icon_delete"],
+    lightbox: {
+        sections: [{
+            name: "description",
+            height: 200,
+            map_to: "text",
+            type: "textarea",
+            focus: true
+        }, {
+            name: "time",
+            height: 72,
+            type: "time",
+            map_to: "auto"
+        }]
+    }
+};
+scheduler.templates = {};
+scheduler.init_templates = function () {
+    var B = scheduler.date.date_to_str;
+    var C = scheduler.config;
+    var A = function (E, D) {
+        for (var F in D) {
+            if (!E[F]) {
+                E[F] = D[F]
+            }
+        }
+    };
+    A(scheduler.templates, {
+        day_date: B(C.default_date),
+        month_date: B(C.month_date),
+        week_date: function (E, D) {
+            return scheduler.templates.day_date(E) + " &ndash; " + scheduler.templates.day_date(scheduler.date.add(D, -1, "day"))
+        },
+        day_scale_date: B(C.default_date),
+        month_scale_date: B(C.week_date),
+        week_scale_date: B(C.day_date),
+        hour_scale: B(C.hour_date),
+        time_picker: B(C.hour_date),
+        event_date: B(C.hour_date),
+        month_day: B(C.month_day),
+        xml_date: scheduler.date.str_to_date(C.xml_date, C.server_utc),
+        load_format: B(C.load_date, C.server_utc),
+        xml_format: B(C.xml_date, C.server_utc),
+        api_date: scheduler.date.str_to_date(C.api_date),
+        event_header: function (F, D, E) {
+            return scheduler.templates.event_date(F) + " - " + scheduler.templates.event_date(D)
+        },
+        event_text: function (F, D, E) {
+            return E.text
+        },
+        event_class: function (F, D, E) {
+            return ""
+        },
+        month_date_class: function (D) {
+            return ""
+        },
+        week_date_class: function (D) {
+            return ""
+        },
+        event_bar_date: function (F, D, E) {
+            return scheduler.templates.event_date(F) + " "
+        },
+        event_bar_text: function (F, D, E) {
+            return E.text
+        }
+    });
+    this.callEvent("onTemplatesReady", [])
+};
+scheduler.uid = function () {
+    if (!this._seed) {
+        this._seed = (new Date).valueOf()
+    }
+    return this._seed++
+};
+scheduler._events = {};
+scheduler.clearAll = function () {
+    this._events = {};
+    this._loaded = {};
+    this.clear_view()
+};
+scheduler.addEvent = function (A, G, D, F, B) {
+    var C = A;
+    if (arguments.length != 1) {
+        C = B || {};
+        C.start_date = A;
+        C.end_date = G;
+        C.text = D;
+        C.id = F
+    }
+    C.id = C.id || scheduler.uid();
+    C.text = C.text || "";
+    if (typeof C.start_date == "string") {
+        C.start_date = this.templates.api_date(C.start_date)
+    }
+    if (typeof C.end_date == "string") {
+        C.end_date = this.templates.api_date(C.end_date)
+    }
+    C._timed = this.is_one_day_event(C);
+    var E = !this._events[C.id];
+    this._events[C.id] = C;
+    this.event_updated(C);
+    if (!this._loading) {
+        this.callEvent(E ? "onEventAdded" : "onEventChanged", [C.id, C])
+    }
+};
+scheduler.deleteEvent = function (C, A) {
+    var B = this._events[C];
+    if (!A && !this.callEvent("onBeforeEventDelete", [C, B])) {
+        return
+    }
+    if (B) {
+        delete this._events[C];
+        this.unselect(C);
+        this.event_updated(B)
+    }
+};
+scheduler.getEvent = function (A) {
+    return this._events[A]
+};
+scheduler.setEvent = function (B, A) {
+    this._events[B] = A
+};
+scheduler.for_rendered = function (C, B) {
+    for (var A = this._rendered.length - 1; A >= 0; A--) {
+        if (this._rendered[A].getAttribute("event_id") == C) {
+            B(this._rendered[A], A)
+        }
+    }
+};
+scheduler.changeEventId = function (C, A) {
+    if (C == A) {
+        return
+    }
+    var B = this._events[C];
+    if (B) {
+        B.id = A;
+        this._events[A] = B;
+        delete this._events[C]
+    }
+    this.for_rendered(C, function (D) {
+        D.setAttribute("event_id", A)
+    });
+    if (this._select_id == C) {
+        this._select_id = A
+    }
+    if (this._edit_id == C) {
+        this._edit_id = A
+    }
+    this.callEvent("onEventIdChange", [C, A])
+};
+(function () {
+    var A = ["text", "Text", "start_date", "StartDate", "end_date", "EndDate"];
+    var C = function (E) {
+        return function (F) {
+            return (scheduler.getEvent(F))[E]
+        }
+    };
+    var D = function (E) {
+        return function (H, G) {
+            var F = scheduler.getEvent(H);
+            F[E] = G;
+            F._changed = true;
+            F._timed = this.is_one_day_event(F);
+            scheduler.event_updated(F, true)
+        }
+    };
+    for (var B = 0; B < A.length; B += 2) {
+        scheduler["getEvent" + A[B + 1]] = C(A[B]);
+        scheduler["setEvent" + A[B + 1]] = D(A[B])
+    }
+})();
+scheduler.event_updated = function (A, B) {
+    if (this.is_visible_events(A)) {
+        this.render_view_data()
+    } else {
+        this.clear_event(A.id)
+    }
+};
+scheduler.is_visible_events = function (A) {
+    if (A.start_date < this._max_date && this._min_date < A.end_date) {
+        return true
+    }
+    return false
+};
+scheduler.is_one_day_event = function (A) {
+    var B = A.end_date.getDate() - A.start_date.getDate();
+    if (!B) {
+        return A.start_date.getMonth() == A.end_date.getMonth() && A.start_date.getFullYear() == A.end_date.getFullYear()
+    } else {
+        if (B < 0) {
+            B = Math.ceil((A.end_date.valueOf() - A.start_date.valueOf()) / (24 * 60 * 60 * 1000))
+        }
+        return (B == 1 && !A.end_date.getHours() && !A.end_date.getMinutes() && (A.start_date.getHours() || A.start_date.getMinutes()))
+    }
+};
+scheduler.get_visible_events = function () {
+    var A = [];
+    var B = this["filter_" + this._mode];
+    for (var C in this._events) {
+        if (this.is_visible_events(this._events[C])) {
+            if (this._table_view || this.config.multi_day || this._events[C]._timed) {
+                if (!B || B(C, this._events[C])) {
+                    A.push(this._events[C])
+                }
+            }
+        }
+    }
+    return A
+};
+scheduler.render_view_data = function () {
+    if (this._not_render) {
+        this._render_wait = true;
+        return
+    }
+    this._render_wait = false;
+    this.clear_view();
+    var B = this.get_visible_events();
+    if (this.config.multi_day && !this._table_view) {
+        var D = [];
+        var A = [];
+        for (var C = 0; C < B.length; C++) {
+            if (B[C]._timed) {
+                D.push(B[C])
+            } else {
+                A.push(B[C])
+            }
+        }
+        this._table_view = true;
+        this.render_data(A);
+        this._table_view = false;
+        this.render_data(D)
+    } else {
+        this.render_data(B)
+    }
+};
+scheduler.render_data = function (A, C) {
+    A = this._pre_render_events(A, C);
+    for (var B = 0; B < A.length; B++) {
+        if (this._table_view) {
+            this.render_event_bar(A[B])
+        } else {
+            this.render_event(A[B])
+        }
+    }
+};
+scheduler._pre_render_events = function (M, A) {
+    var G = this.xy.bar_height;
+    var D = this._colsS.heights;
+    var F = this._colsS.heights = [0, 0, 0, 0, 0, 0, 0];
+    if (!this._table_view) {
+        M = this._pre_render_events_line(M, A)
+    } else {
+        M = this._pre_render_events_table(M, A)
+    }
+    if (this._table_view) {
+        if (A) {
+            this._colsS.heights = D
+        } else {
+            var B = this._els.dhx_cal_data[0].firstChild;
+            if (B.rows) {
+                for (var E = 0; E < B.rows.length; E++) {
+                    F[E]++;
+                    if ((F[E]) * G > this._colsS.height - 22) {
+                        var N = B.rows[E].cells;
+                        for (var C = 0; C < N.length; C++) {
+                            N[C].childNodes[1].style.height = F[E] * G + "px"
+                        }
+                        F[E] = (F[E - 1] || 0) + N[0].offsetHeight
+                    }
+                    F[E] = (F[E - 1] || 0) + B.rows[E].cells[0].offsetHeight
+                }
+                F.unshift(0);
+                if (B.parentNode.offsetHeight < B.parentNode.scrollHeight && !B._h_fix) {
+                    for (var E = 0; E < B.rows.length; E++) {
+                        var L = B.rows[E].cells[6].childNodes[0];
+                        var J = L.offsetWidth - scheduler.xy.scroll_width + "px";
+                        L.style.width = J;
+                        L.nextSibling.style.width = J
+                    }
+                    B._h_fix = true
+                }
+            } else {
+                if (!M.length && this._els.dhx_multi_day[0].style.visibility == "visible") {
+                    F[0] = -1
+                }
+                if (M.length || F[0] == -1) {
+                    var H = B.parentNode.childNodes;
+                    var I = (F[0] + 1) * G + "px";
+                    for (var E = 0; E < H.length; E++) {
+                        if (this._colsS[E]) {
+                            H[E].style.top = I
+                        }
+                    }
+                    var K = this._els.dhx_multi_day[0];
+                    K.style.top = "0px";
+                    K.style.height = I;
+                    K.style.visibility = (F[0] == -1 ? "hidden" : "visible");
+                    K = this._els.dhx_multi_day[1];
+                    K.style.height = I;
+                    K.style.visibility = (F[0] == -1 ? "hidden" : "visible");
+                    K.className = F[0] ? "dhx_multi_day_icon" : "dhx_multi_day_icon_small";
+                    this._dy_shift = (F[0] + 1) * G;
+                    F[0] = 0
+                }
+            }
+        }
+    }
+    return M
+};
+scheduler._get_event_sday = function (A) {
+    return Math.floor((A.start_date.valueOf() - this._min_date.valueOf()) / (24 * 60 * 60 * 1000))
+};
+scheduler._pre_render_events_line = function (H, A) {
+    H.sort(function (K, J) {
+        return K.start_date > J.start_date ? 1 : -1
+    });
+    var G = [];
+    var I = [];
+    for (var C = 0; C < H.length; C++) {
+        var F = H[C];
+        var D = F.start_date.getHours();
+        var B = F.end_date.getHours();
+        F._sday = this._get_event_sday(F);
+        if (!G[F._sday]) {
+            G[F._sday] = []
+        }
+        if (!A) {
+            F._inner = false;
+            var E = G[F._sday];
+            while (E.length && E[E.length - 1].end_date <= F.start_date) {
+                E.splice(E.length - 1, 1)
+            }
+            if (E.length) {
+                E[E.length - 1]._inner = true
+            }
+            F._sorder = E.length;
+            E.push(F);
+            if (E.length > (E.max_count || 0)) {
+                E.max_count = E.length
+            }
+        }
+        if (D < this.config.first_hour || B >= this.config.last_hour) {
+            I.push(F);
+            H[C] = F = this._copy_event(F);
+            if (D < this.config.first_hour) {
+                F.start_date.setHours(this.config.first_hour);
+                F.start_date.setMinutes(0)
+            }
+            if (B >= this.config.last_hour) {
+                F.end_date.setMinutes(0);
+                F.end_date.setHours(this.config.last_hour)
+            }
+            if (F.start_date > F.end_date || D == this.config.last_hour) {
+                H.splice(C, 1);
+                C--;
+                continue
+            }
+        }
+    }
+    if (!A) {
+        for (var C = 0; C < H.length; C++) {
+            H[C]._count = G[H[C]._sday].max_count
+        }
+        for (var C = 0; C < I.length; C++) {
+            I[C]._count = G[I[C]._sday].max_count
+        }
+    }
+    return H
+};
+scheduler._time_order = function (A) {
+    A.sort(function (C, B) {
+        if (C.start_date.valueOf() == B.start_date.valueOf()) {
+            if (C._timed && !B._timed) {
+                return 1
+            }
+            if (!C._timed && B._timed) {
+                return -1
+            }
+            return 0
+        }
+        return C.start_date > B.start_date ? 1 : -1
+    })
+};
+scheduler._pre_render_events_table = function (P, C) {
+    this._time_order(P);
+    var F = [];
+    var A = [
+        [],
+        [],
+        [],
+        [],
+        [],
+        [],
+        []
+    ];
+    var N = this._colsS.heights;
+    var I;
+    var M = this._cols.length;
+    for (var G = 0; G < P.length; G++) {
+        var L = P[G];
+        var J = (I || L.start_date);
+        var H = L.end_date;
+        if (J < this._min_date) {
+            J = this._min_date
+        }
+        if (H > this._max_date) {
+            H = this._max_date
+        }
+        var E = this.locate_holder_day(J, false, L);
+        L._sday = E % M;
+        var O = this.locate_holder_day(H, true, L) || M;
+        L._eday = (O % M) || M;
+        L._length = O - E;
+        L._sweek = Math.floor((this._correct_shift(J.valueOf(), 1) - this._min_date.valueOf()) / (60 * 60 * 1000 * 24 * M));
+        var K = A[L._sweek];
+        var D;
+        for (D = 0; D < K.length; D++) {
+            if (K[D]._eday <= L._sday) {
+                break
+            }
+        }
+        L._sorder = D;
+        if (L._sday + L._length <= M) {
+            I = null;
+            F.push(L);
+            K[D] = L;
+            N[L._sweek] = K.length - 1
+        } else {
+            var B = this._copy_event(L);
+            B._length = M - L._sday;
+            B._eday = M;
+            B._sday = L._sday;
+            B._sweek = L._sweek;
+            B._sorder = L._sorder;
+            B.end_date = this.date.add(J, B._length, "day");
+            F.push(B);
+            K[D] = B;
+            I = B.end_date;
+            N[L._sweek] = K.length - 1;
+            G--;
+            continue
+        }
+    }
+    return F
+};
+scheduler._copy_dummy = function () {
+    this.start_date = new Date(this.start_date);
+    this.end_date = new Date(this.end_date)
+};
+scheduler._copy_event = function (A) {
+    this._copy_dummy.prototype = A;
+    return new this._copy_dummy()
+};
+scheduler._rendered = [];
+scheduler.clear_view = function () {
+    for (var A = 0; A < this._rendered.length; A++) {
+        var B = this._rendered[A];
+        if (B.parentNode) {
+            B.parentNode.removeChild(B)
+        }
+    }
+    this._rendered = []
+};
+scheduler.updateEvent = function (B) {
+    var A = this.getEvent(B);
+    this.clear_event(B);
+    if (A && this.is_visible_events(A)) {
+        this.render_data([A], true)
+    }
+};
+scheduler.clear_event = function (A) {
+    this.for_rendered(A, function (C, B) {
+        if (C.parentNode) {
+            C.parentNode.removeChild(C)
+        }
+        scheduler._rendered.splice(B, 1)
+    })
+};
+scheduler.render_event = function (L) {
+    var D = scheduler.xy.menu_width;
+    if (L._sday < 0) {
+        return
+    }
+    var M = scheduler.locate_holder(L._sday);
+    if (!M) {
+        return
+    }
+    var F = L.start_date.getHours() * 60 + L.start_date.getMinutes();
+    var C = (L.end_date.getHours() * 60 + L.end_date.getMinutes()) || (scheduler.config.last_hour * 60);
+    var K = (Math.round((F * 60 * 1000 - this.config.first_hour * 60 * 60 * 1000) * this.config.hour_size_px / (60 * 60 * 1000))) % (this.config.hour_size_px * 24) + 1;
+    var O = Math.max(scheduler.xy.min_event_height, (C - F) * this.config.hour_size_px / 60) + 1;
+    var B = Math.floor((M.clientWidth - D) / L._count);
+    var E = L._sorder * B + 1;
+    if (!L._inner) {
+        B = B * (L._count - L._sorder)
+    }
+    var J = this._render_v_bar(L.id, D + E, K, B, O, L._text_style, scheduler.templates.event_header(L.start_date, L.end_date, L), scheduler.templates.event_text(L.start_date, L.end_date, L));
+    this._rendered.push(J);
+    M.appendChild(J);
+    E = E + parseInt(M.style.left, 10) + D;
+    K += this._dy_shift;
+    if (this._edit_id == L.id) {
+        J.style.zIndex = 1;
+        B = Math.max(B - 4, scheduler.xy.editor_width);
+        var J = document.createElement("DIV");
+        J.setAttribute("event_id", L.id);
+        this.set_xy(J, B, O - 20, E, K + 14);
+        J.className = "dhx_cal_editor";
+        var A = document.createElement("DIV");
+        this.set_xy(A, B - 6, O - 26);
+        A.style.cssText += ";margin:2px 2px 2px 2px;overflow:hidden;";
+        J.appendChild(A);
+        this._els.dhx_cal_data[0].appendChild(J);
+        this._rendered.push(J);
+        A.innerHTML = "<textarea class='dhx_cal_editor'>" + L.text + "</textarea>";
+        if (this._quirks7) {
+            A.firstChild.style.height = O - 12 + "px"
+        }
+        this._editor = A.firstChild;
+        this._editor.onkeypress = function (Q) {
+            if ((Q || event).shiftKey) {
+                return true
+            }
+            var P = (Q || event).keyCode;
+            if (P == scheduler.keys.edit_save) {
+                scheduler.editStop(true)
+            }
+            if (P == scheduler.keys.edit_cancel) {
+                scheduler.editStop(false)
+            }
+        };
+        this._editor.onselectstart = function (P) {
+            return (P || event).cancelBubble = true
+        };
+        A.firstChild.focus();
+        this._els.dhx_cal_data[0].scrollLeft = 0;
+        A.firstChild.select()
+    }
+    if (this._select_id == L.id) {
+        var N = this.config["icons_" + ((this._edit_id == L.id) ? "edit" : "select")];
+        var I = "";
+        for (var H = 0; H < N.length; H++) {
+            I += "<div class='dhx_menu_icon " + N[H] + "' title='" + this.locale.labels[N[H]] + "'></div>"
+        }
+        var G = this._render_v_bar(L.id, E - D + 1, K, D, N.length * 20 + 26, "", "<div class='dhx_menu_head'></div>", I, true);
+        G.style.left = E - D + 1;
+        this._els.dhx_cal_data[0].appendChild(G);
+        this._rendered.push(G)
+    }
+};
+scheduler._render_v_bar = function (D, M, L, N, H, B, F, E, A) {
+    var J = document.createElement("DIV");
+    var K = this.getEvent(D);
+    var I = "dhx_cal_event";
+    var C = scheduler.templates.event_class(K.start_date, K.end_date, K);
+    if (C) {
+        I = I + " " + C
+    }
+	var G = jQuery('<div>',
+					{
+						'event_id': D,
+						'class': I
+					}).css({
+						'position':'absolute',
+						'top': L,
+						'left': M,
+						'width': (N - 4),
+						'height': H
+					}).append(
+						jQuery('<div>', {
+							'class': 'dhx_header',
+							'width': (N - 6)
+						}),
+						jQuery('<div>', {
+							'class': 'dhx_title'
+						}).html(F),
+						jQuery('<div>', {
+							'class': 'dhx_body',
+							'width': (N - (this._quirks ? 4 : 14)),
+							'height': (H - (this._quirks ? 20 : 30))
+							
+						}).html(E),
+						jQuery('<div>', {
+							'class': 'dhx_footer',
+							'width': (N - 8),
+							'margin-top': A ? 1 : '' 
+						})
+					)
+		if(K.color) {
+			jQuery('div', G).css({'background': K.color, 'color': '#FFFFFF'})
+		}
+	jQuery(J).html(G);
+    return J.firstChild
+};
+scheduler.locate_holder = function (A) {
+    if (this._mode == "day") {
+        return this._els.dhx_cal_data[0].firstChild
+    }
+    return this._els.dhx_cal_data[0].childNodes[A]
+};
+scheduler.locate_holder_day = function (B, C) {
+    var A = Math.floor((this._correct_shift(B, 1) - this._min_date) / (60 * 60 * 24 * 1000));
+    if (C && this.date.time_part(B)) {
+        A++
+    }
+    return A
+};
+scheduler.render_event_bar = function (H) {
+    var J = this._els.dhx_cal_data[0];
+    var I = this._colsS[H._sday];
+    var A = this._colsS[H._eday];
+    if (A == I) {
+        A = this._colsS[H._eday + 1]
+    }
+    var D = this.xy.bar_height;
+    var G = this._colsS.heights[H._sweek] + (this._colsS.height ? (this.xy.month_scale_height + 2) : 2) + H._sorder * D;
+    var F = document.createElement("DIV");
+    var E = H._timed ? "dhx_cal_event_clear" : "dhx_cal_event_line";
+    var B = scheduler.templates.event_class(H.start_date, H.end_date, H);
+    if (B) {
+        E = E + " " + B
+    }
+	
+	var c_innerHTML = " ";
+	var C = jQuery('<div>',
+					{
+						'event_id': H.id, 
+						'class': E
+					}).css({
+						'position': 'absolute',
+						'top': G,
+						'left': I,
+						'width': (A - I - 15)
+					})
+    if (H._timed) {
+		c_innerHTML = scheduler.templates.event_bar_date(H.start_date, H.end_date, H)
+    }
+	
+	C.html(c_innerHTML + scheduler.templates.event_bar_text(H.start_date, H.end_date, H))
+	jQuery(F).html(C);
+	
+	if (H.color) {
+		if (H._length) {
+			C.css({'background-color':H.color, 'color': '#FFFFFF'});
+		} else {
+			C.css('color',H.color);;
+		}
+	}
+	
+	if(H.title) {
+		C.attr('title',H.title);
+	}
+	
+    this._rendered.push(F.firstChild);
+    J.appendChild(F.firstChild)
+};
+
+scheduler._locate_event = function (A) {
+    var B = null;
+    while (A && !B && A.getAttribute) {
+        B = A.getAttribute("event_id");
+        A = A.parentNode
+    }
+    return B
+};
+scheduler.edit = function (A) {
+    if (this._edit_id == A) {
+        return
+    }
+    this.editStop(false, A);
+    this._edit_id = A;
+    this.updateEvent(A)
+};
+scheduler.editStop = function (B, C) {
+    if (C && this._edit_id == C) {
+        return
+    }
+    var A = this.getEvent(this._edit_id);
+    if (A) {
+        if (B) {
+            A.text = this._editor.value
+        }
+        this._edit_id = null;
+        this._editor = null;
+        this.updateEvent(A.id);
+        this._edit_stop_event(A, B)
+    }
+};
+scheduler._edit_stop_event = function (A, B) {
+    if (this._new_event) {
+        if (!B) {
+            this.deleteEvent(A.id, true)
+        } else {
+            this.callEvent("onEventAdded", [A.id, A])
+        }
+        this._new_event = null
+    } else {
+        if (B) {
+            this.callEvent("onEventChanged", [A.id, A])
+        }
+    }
+};
+scheduler.getEvents = function (E, D) {
+    var A = [];
+    for (var B in this._events) {
+        var C = this._events[B];
+        if (C && C.start_date < D && C.end_date > E) {
+            A.push(C)
+        }
+    }
+    return A
+};
+scheduler._loaded = {};
+scheduler._load = function (C, F) {
+    C = C || this._load_url;
+    C += (C.indexOf("?") == -1 ? "?" : "&") + "timeshift=" + (new Date()).getTimezoneOffset();
+    if (this.config.prevent_cache) {
+        C += "&uid=" + this.uid()
+    }
+    var E;
+    F = F || this._date;
+    if (this._load_mode) {
+        var B = this.templates.load_format;
+        F = this.date[this._load_mode + "_start"](new Date(F.valueOf()));
+        while (F > this._min_date) {
+            F = this.date.add(F, -1, this._load_mode)
+        }
+        E = F;
+        var D = true;
+        while (E < this._max_date) {
+            E = this.date.add(E, 1, this._load_mode);
+            if (this._loaded[B(F)] && D) {
+                F = this.date.add(F, 1, this._load_mode)
+            } else {
+                D = false
+            }
+        }
+        var A = E;
+        do {
+            E = A;
+            A = this.date.add(E, -1, this._load_mode)
+        } while (A > F && this._loaded[B(A)]);
+        if (E <= F) {
+            return false
+        }
+        dhtmlxAjax.get(C + "&from=" + B(F) + "&to=" + B(E), function (G) {
+            scheduler.on_load(G)
+        });
+        while (F < E) {
+            this._loaded[B(F)] = true;
+            F = this.date.add(F, 1, this._load_mode)
+        }
+    } else {
+        dhtmlxAjax.get(C, function (G) {
+            scheduler.on_load(G)
+        })
+    }
+    this.callEvent("onXLS", []);
+    return true
+};
+scheduler.on_load = function (A) {
+    this._loading = true;
+    if (this._process) {
+        var B = this[this._process].parse(A.xmlDoc.responseText)
+    } else {
+        var B = this._magic_parser(A)
+    }
+    this._not_render = true;
+    for (var C = 0; C < B.length; C++) {
+        if (!this.callEvent("onEventLoading", [B[C]])) {
+            continue
+        }
+        this.addEvent(B[C])
+    }
+    this._not_render = false;
+    if (this._render_wait) {
+        this.render_view_data()
+    }
+    if (this._after_call) {
+        this._after_call()
+    }
+    this._after_call = null;
+    this._loading = false;
+    this.callEvent("onXLE", [])
+};
+scheduler.json = {};
+scheduler.json.parse = function (data) {
+    if (typeof data == "string") {
+        eval("scheduler._temp = " + data + ";");
+        data = scheduler._temp
+    }
+    var evs = [];
+    for (var i = 0; i < data.length; i++) {
+        data[i].start_date = scheduler.templates.xml_date(data[i].start_date);
+        data[i].end_date = scheduler.templates.xml_date(data[i].end_date);
+        evs.push(data[i])
+    }
+    return evs
+};
+scheduler.parse = function (B, A) {
+    this._process = A;
+    this.on_load({
+        xmlDoc: {
+            responseText: B
+        }
+    })
+};
+scheduler.load = function (A, B) {
+    if (typeof B == "string") {
+        this._process = B;
+        B = arguments[2]
+    }
+    this._load_url = A;
+    this._after_call = B;
+    this._load(A, this._date)
+};
+scheduler.setLoadMode = function (A) {
+    if (A == "all") {
+        A = ""
+    }
+    this._load_mode = A
+};
+scheduler.refresh = function (A) {
+    alert("not implemented")
+};
+scheduler.serverList = function (A) {
+    return this.serverList[A] = (this.serverList[A] || [])
+};
+scheduler._userdata = {};
+scheduler._magic_parser = function (I) {
+    if (!I.getXMLTopNode) {
+        var B = I.xmlDoc.responseText;
+        I = new dtmlXMLLoaderObject(function () {});
+        I.loadXMLString(B)
+    }
+    var F = I.getXMLTopNode("data");
+    if (F.tagName != "data") {
+        return []
+    }
+    var A = I.doXPath("//coll_options");
+    for (var E = 0; E < A.length; E++) {
+        var H = A[E].getAttribute("for");
+        var G = this.serverList[H];
+        if (!G) {
+            continue
+        }
+        G.splice(0, G.length);
+        var K = I.doXPath(".//item", A[E]);
+        for (var C = 0; C < K.length; C++) {
+            G.push({
+                key: K[C].getAttribute("value"),
+                label: K[C].getAttribute("label")
+            })
+        }
+    }
+    if (A.length) {
+        scheduler.callEvent("onOptionsLoad", [])
+    }
+    var L = I.doXPath("//userdata");
+    for (var E = 0; E < L.length; E++) {
+        var D = this.xmlNodeToJSON(L[E]);
+        this._userdata[D.name] = D.text
+    }
+    var J = [];
+    var F = I.doXPath("//event");
+    for (var E = 0; E < F.length; E++) {
+        J[E] = this.xmlNodeToJSON(F[E]);
+        J[E].text = J[E].text || J[E]._tagvalue;
+        J[E].start_date = this.templates.xml_date(J[E].start_date);
+        J[E].end_date = this.templates.xml_date(J[E].end_date)
+    }
+    return J
+};
+scheduler.xmlNodeToJSON = function (C) {
+    var B = {};
+    for (var A = 0; A < C.attributes.length; A++) {
+        B[C.attributes[A].name] = C.attributes[A].value
+    }
+    for (var A = 0; A < C.childNodes.length; A++) {
+        var D = C.childNodes[A];
+        if (D.nodeType == 1) {
+            B[D.tagName] = D.firstChild ? D.firstChild.nodeValue : ""
+        }
+    }
+    if (!B.text) {
+        B.text = C.firstChild ? C.firstChild.nodeValue : ""
+    }
+    return B
+};
+scheduler.attachEvent("onXLS", function () {
+    if (this.config.show_loading === true) {
+        var A;
+        A = this.config.show_loading = document.createElement("DIV");
+        A.className = "dhx_loading";
+        A.style.left = Math.round((this._x - 128) / 2) + "px";
+        A.style.top = Math.round((this._y - 15) / 2) + "px";
+        this._obj.appendChild(A)
+    }
+});
+scheduler.attachEvent("onXLE", function () {
+    var A;
+    if (A = this.config.show_loading) {
+        if (typeof A == "object") {
+            this._obj.removeChild(A);
+            this.config.show_loading = true
+        }
+    }
+});
+scheduler.ical = {
+    parse: function (H) {
+        var E = H.match(RegExp(this.c_start + "[^\f]*" + this.c_end, ""));
+        if (!E.length) {
+            return
+        }
+        E[0] = E[0].replace(/[\r\n]+(?=[a-z \t])/g, " ");
+        E[0] = E[0].replace(/\;[^:\r\n]*/g, "");
+        var B = [];
+        var D;
+        var C = RegExp("(?:" + this.e_start + ")([^\f]*?)(?:" + this.e_end + ")", "g");
+        while (D = C.exec(E)) {
+            var F = {};
+            var G;
+            var A = /[^\r\n]+[\r\n]+/g;
+            while (G = A.exec(D[1])) {
+                this.parse_param(G.toString(), F)
+            }
+            if (F.uid && !F.id) {
+                F.id = F.uid
+            }
+            B.push(F)
+        }
+        return B
+    },
+    parse_param: function (E, C) {
+        var D = E.indexOf(":");
+        if (D == -1) {
+            return
+        }
+        var A = E.substr(0, D).toLowerCase();
+        var B = E.substr(D + 1).replace(/\\\,/g, ",").replace(/[\r\n]+$/, "");
+        if (A == "summary") {
+            A = "text"
+        } else {
+            if (A == "dtstart") {
+                A = "start_date";
+                B = this.parse_date(B, 0, 0)
+            } else {
+                if (A == "dtend") {
+                    A = "end_date";
+                    if (C.start_date && C.start_date.getHours() == 0) {
+                        B = this.parse_date(B, 24, 0)
+                    } else {
+                        B = this.parse_date(B, 23, 59)
+                    }
+                }
+            }
+        }
+        C[A] = B
+    },
+    parse_date: function (G, F, D) {
+        var E = G.split("T");
+        if (E[1]) {
+            F = E[1].substr(0, 2);
+            D = E[1].substr(2, 2)
+        }
+        var C = E[0].substr(0, 4);
+        var B = parseInt(E[0].substr(4, 2), 10) - 1;
+        var A = E[0].substr(6, 2);
+        if (scheduler.config.server_utc && !E[1]) {
+            return new Date(Date.UTC(C, B, A, F, D))
+        }
+        return new Date(C, B, A, F, D)
+    },
+    c_start: "BEGIN:VCALENDAR",
+    e_start: "BEGIN:VEVENT",
+    e_end: "END:VEVENT",
+    c_end: "END:VCALENDAR"
+};
+scheduler.form_blocks = {
+    textarea: {
+        render: function (B) {
+            var A = (B.height || "130") + "px";
+            return "<div class='dhx_cal_ltext' style='height:" + A + ";'><textarea></textarea></div>"
+        },
+        set_value: function (B, C, A) {
+            B.firstChild.value = C || ""
+        },
+        get_value: function (B, A) {
+            return B.firstChild.value
+        },
+        focus: function (B) {
+            var A = B.firstChild;
+            A.select();
+            A.focus()
+        }
+    },
+    select: {
+        render: function (D) {
+            var A = (D.height || "23") + "px";
+            var C = "<div class='dhx_cal_ltext' style='height:" + A + ";'><select style='width:552px;'>";
+            for (var B = 0; B < D.options.length; B++) {
+                C += "<option value='" + D.options[B].key + "'>" + D.options[B].label + "</option>"
+            }
+            C += "</select></div>";
+            return C
+        },
+        set_value: function (B, C, A) {
+            if (typeof C == "undefined") {
+                C = (B.firstChild.options[0] || {}).value
+            }
+            B.firstChild.value = C || ""
+        },
+        get_value: function (B, A) {
+            return B.firstChild.value
+        },
+        focus: function (B) {
+            var A = B.firstChild;
+            if (A.select) {
+                A.select()
+            }
+            A.focus()
+        }
+    },
+    time: {
+        render: function () {
+            var A = scheduler.config;
+            var E = this.date.date_part(new Date());
+            var D = 24 * 60,
+                G = 0;
+            if (scheduler.config.limit_time_select) {
+                D = 60 * A.last_hour + 1;
+                G = 60 * A.first_hour;
+                E.setHours(A.first_hour)
+            }
+            var C = "<select>";
+            for (var B = G; B < D; B += this.config.time_step * 1) {
+                var F = this.templates.time_picker(E);
+                C += "<option value='" + B + "'>" + F + "</option>";
+                E = this.date.add(E, this.config.time_step, "minute")
+            }
+            C += "</select> <select>";
+            for (var B = 1; B < 32; B++) {
+                C += "<option value='" + B + "'>" + B + "</option>"
+            }
+            C += "</select> <select>";
+            for (var B = 0; B < 12; B++) {
+                C += "<option value='" + B + "'>" + this.locale.date.month_full[B] + "</option>"
+            }
+            C += "</select> <select>";
+            E = E.getFullYear() - 5;
+            for (var B = 0; B < 10; B++) {
+                C += "<option value='" + (E + B) + "'>" + (E + B) + "</option>"
+            }
+            C += "</select> ";
+            return "<div style='height:30px; padding-top:0px; font-size:inherit;' class='dhx_cal_lsection dhx_section_time'>" + C + "<span style='font-weight:normal; font-size:10pt;'> &nbsp;&ndash;&nbsp; </span>" + C + "</div>"
+        },
+        set_value: function (A, I, G) {
+            var J = A.getElementsByTagName("select");
+            if (scheduler.config.full_day) {
+                if (!A._full_day) {
+                    A.previousSibling.innerHTML += "<div class='dhx_fullday_checkbox'><label><input type='checkbox' name='full_day' value='true'> " + scheduler.locale.labels.full_day + "&nbsp;</label></input></div>";
+                    A._full_day = true
+                }
+                var H = A.previousSibling.getElementsByTagName("input")[0];
+                var F = (scheduler.date.time_part(G.start_date) == 0 && scheduler.date.time_part(G.end_date) == 0 && G.end_date.valueOf() - G.start_date.valueOf() < 2 * 24 * 60 * 60 * 1000);
+                H.checked = F;
+                for (var B in J) {
+                    J[B].disabled = H.checked
+                }
+                H.onclick = function () {
+                    if (H.checked) {
+                        var K = new Date(G.start_date);
+                        var M = new Date(G.end_date);
+                        scheduler.date.date_part(K);
+                        M = scheduler.date.add(K, 1, "day")
+                    }
+                    for (var L in J) {
+                        J[L].disabled = H.checked
+                    }
+                    C(J, 0, K || G.start_date);
+                    C(J, 4, M || G.end_date)
+                }
+            }
+            if (scheduler.config.auto_end_date && scheduler.config.event_duration) {
+                function E() {
+                    G.start_date = new Date(J[3].value, J[2].value, J[1].value, 0, J[0].value);
+                    G.end_date.setTime(G.start_date.getTime() + (scheduler.config.event_duration * 60 * 1000));
+                    C(J, 4, G.end_date)
+                }
+                for (var D = 0; D < 4; D++) {
+                    J[D].onchange = E
+                }
+            }
+            function C(L, K, M) {
+                L[K + 0].value = Math.round((M.getHours() * 60 + M.getMinutes()) / scheduler.config.time_step) * scheduler.config.time_step;
+                L[K + 1].value = M.getDate();
+                L[K + 2].value = M.getMonth();
+                L[K + 3].value = M.getFullYear()
+            }
+            C(J, 0, G.start_date);
+            C(J, 4, G.end_date)
+        },
+        get_value: function (B, A) {
+            s = B.getElementsByTagName("select");
+            A.start_date = new Date(s[3].value, s[2].value, s[1].value, 0, s[0].value);
+            A.end_date = new Date(s[7].value, s[6].value, s[5].value, 0, s[4].value);
+            if (A.end_date <= A.start_date) {
+                A.end_date = scheduler.date.add(A.start_date, scheduler.config.time_step, "minute")
+            }
+        },
+        focus: function (A) {
+            A.getElementsByTagName("select")[0].focus()
+        }
+    }
+};
+scheduler.showCover = function (A) {
+    this.show_cover();
+    if (A) {
+        A.style.display = "block";
+        var B = getOffset(this._obj);
+        A.style.top = Math.round(B.top + (this._obj.offsetHeight - A.offsetHeight) / 2) + "px";
+        A.style.left = Math.round(B.left + (this._obj.offsetWidth - A.offsetWidth) / 2) + "px"
+    }
+};
+scheduler.showLightbox = function (B) {
+    if (!B) {
+        return
+    }
+    if (!this.callEvent("onBeforeLightbox", [B])) {
+        return
+    }
+    var A = this._get_lightbox();
+    this.showCover(A);
+    this._fill_lightbox(B, A);
+    this.callEvent("onLightbox", [B])
+};
+scheduler._fill_lightbox = function (H, E) {
+    var D = this.getEvent(H);
+    var B = E.getElementsByTagName("span");
+    if (scheduler.templates.lightbox_header) {
+        B[1].innerHTML = "";
+        B[2].innerHTML = scheduler.templates.lightbox_header(D.start_date, D.end_date, D)
+    } else {
+        B[1].innerHTML = this.templates.event_header(D.start_date, D.end_date, D);
+        B[2].innerHTML = (this.templates.event_bar_text(D.start_date, D.end_date, D) || "").substr(0, 70)
+    }
+    var F = this.config.lightbox.sections;
+    for (var A = 0; A < F.length; A++) {
+        var C = document.getElementById(F[A].id).nextSibling;
+        var G = this.form_blocks[F[A].type];
+        G.set_value.call(this, C, D[F[A].map_to], D, F[A]);
+        if (F[A].focus) {
+            G.focus.call(this, C)
+        }
+    }
+    scheduler._lightbox_id = H
+};
+scheduler._lightbox_out = function (D) {
+    var E = this.config.lightbox.sections;
+    for (var B = 0; B < E.length; B++) {
+        var C = document.getElementById(E[B].id).nextSibling;
+        var F = this.form_blocks[E[B].type];
+        var A = F.get_value.call(this, C, D, E[B]);
+        if (E[B].map_to != "auto") {
+            D[E[B].map_to] = A
+        }
+    }
+    return D
+};
+scheduler._empty_lightbox = function () {
+    var C = scheduler._lightbox_id;
+    var B = this.getEvent(C);
+    var A = this._get_lightbox();
+    this._lightbox_out(B);
+    B._timed = this.is_one_day_event(B);
+    this.setEvent(B.id, B);
+    this._edit_stop_event(B, true);
+    this.render_view_data()
+};
+scheduler.hide_lightbox = function (A) {
+    this.hideCover(this._get_lightbox());
+    this._lightbox_id = null;
+    this.callEvent("onAfterLightbox", [])
+};
+scheduler.hideCover = function (A) {
+    if (A) {
+        A.style.display = "none"
+    }
+    this.hide_cover()
+};
+scheduler.hide_cover = function () {
+    if (this._cover) {
+        this._cover.parentNode.removeChild(this._cover)
+    }
+    this._cover = null
+};
+scheduler.show_cover = function () {
+    this._cover = document.createElement("DIV");
+    this._cover.className = "dhx_cal_cover";
+    document.body.appendChild(this._cover)
+};
+scheduler.save_lightbox = function () {
+    if (this.checkEvent("onEventSave") && !this.callEvent("onEventSave", [this._lightbox_id, this._lightbox_out({
+        id: this._lightbox_id
+    }), this._new_event])) {
+        return
+    }
+    this._empty_lightbox();
+    this.hide_lightbox()
+};
+scheduler.startLightbox = function (B, A) {
+    this._lightbox_id = B;
+    this.showCover(A)
+};
+scheduler.endLightbox = function (B, A) {
+    this._edit_stop_event(scheduler.getEvent(this._lightbox_id), B);
+    if (B) {
+        scheduler.render_view_data()
+    }
+    this.hideCover(A)
+};
+scheduler.resetLightbox = function () {
+    scheduler._lightbox = null
+};
+scheduler.cancel_lightbox = function () {
+    this.callEvent("onEventCancel", [this._lightbox_id, this._new_event]);
+    this.endLightbox(false);
+    this.hide_lightbox()
+};
+scheduler._init_lightbox_events = function () {
+    this._get_lightbox().onclick = function (C) {
+        var E = C ? C.target : event.srcElement;
+        if (!E.className) {
+            E = E.previousSibling
+        }
+        if (E && E.className) {
+            switch (E.className) {
+            case "dhx_save_btn":
+                scheduler.save_lightbox();
+                break;
+            case "dhx_delete_btn":
+                var F = scheduler.locale.labels.confirm_deleting;
+                if (!F || confirm(F)) {
+                    scheduler.deleteEvent(scheduler._lightbox_id);
+                    scheduler._new_event = null;
+                    scheduler.hide_lightbox()
+                }
+                break;
+            case "dhx_cancel_btn":
+                scheduler.cancel_lightbox();
+                break;
+            default:
+                if (E.className.indexOf("dhx_custom_button_") != -1) {
+                    var A = E.parentNode.getAttribute("index");
+                    var D = scheduler.form_blocks[scheduler.config.lightbox.sections[A].type];
+                    var B = E.parentNode.parentNode;
+                    D.button_click(A, E, B, B.nextSibling)
+                }
+            }
+        }
+    };
+    this._get_lightbox().onkeypress = function (A) {
+        switch ((A || event).keyCode) {
+        case scheduler.keys.edit_save:
+            if ((A || event).shiftKey) {
+                return
+            }
+            scheduler.save_lightbox();
+            break;
+        case scheduler.keys.edit_cancel:
+            scheduler.cancel_lightbox();
+            break
+        }
+    }
+};
+scheduler.setLightboxSize = function () {
+    var B = this._lightbox;
+    if (!B) {
+        return
+    }
+    var A = B.childNodes[1];
+    A.style.height = "0px";
+    A.style.height = A.scrollHeight + "px";
+    B.style.height = A.scrollHeight + 50 + "px";
+    A.style.height = A.scrollHeight + "px"
+};
+scheduler._get_lightbox = function () {
+    if (!this._lightbox) {
+        var G = document.createElement("DIV");
+        G.className = "dhx_cal_light";
+        if (/msie|MSIE 6/.test(navigator.userAgent)) {
+            G.className += " dhx_ie6"
+        }
+        G.style.visibility = "hidden";
+        G.innerHTML = this._lightbox_template;
+        document.body.insertBefore(G, document.body.firstChild);
+        this._lightbox = G;
+        var E = this.config.lightbox.sections;
+        var C = "";
+        for (var B = 0; B < E.length; B++) {
+            var F = this.form_blocks[E[B].type];
+            if (!F) {
+                continue
+            }
+            E[B].id = "area_" + this.uid();
+            var A = "";
+            if (E[B].button) {
+                A = "<div style='float:right;' class='dhx_custom_button' index='" + B + "'><div class='dhx_custom_button_" + E[B].name + "'></div><div>" + this.locale.labels["button_" + E[B].button] + "</div></div>"
+            }
+            C += "<div id='" + E[B].id + "' class='dhx_cal_lsection'>" + A + this.locale.labels["section_" + E[B].name] + "</div>" + F.render.call(this, E[B])
+        }
+        var D = G.getElementsByTagName("div");
+        D[4].innerHTML = scheduler.locale.labels.icon_save;
+        D[7].innerHTML = scheduler.locale.labels.icon_cancel;
+        D[10].innerHTML = scheduler.locale.labels.icon_delete;
+        D[1].innerHTML = C;
+        this.setLightboxSize();
+        this._init_lightbox_events(this);
+        G.style.display = "none";
+        G.style.visibility = "visible"
+    }
+    return this._lightbox
+};
+scheduler._lightbox_template = "<div class='dhx_cal_ltitle'><span class='dhx_mark'>&nbsp;</span><span class='dhx_time'></span><span class='dhx_title'></span></div><div class='dhx_cal_larea'></div><div class='dhx_btn_set'><div class='dhx_save_btn'></div><div>&nbsp;</div></div><div class='dhx_btn_set'><div class='dhx_cancel_btn'></div><div>&nbsp;</div></div><div class='dhx_btn_set' style='float:right;'><div class='dhx_delete_btn'></div><div>&nbsp;</div></div>";
+scheduler._dp_init = function (A) {
+    A._methods = ["setEventTextStyle", "", "changeEventId", "deleteEvent"];
+    this.attachEvent("onEventAdded", function (B) {
+        if (!this._loading && this.validId(B)) {
+            A.setUpdated(B, true, "inserted")
+        }
+    });
+    this.attachEvent("onBeforeEventDelete", function (C) {
+        if (!this.validId(C)) {
+            return
+        }
+        var B = A.getState(C);
+        if (B == "inserted" || this._new_event) {
+            A.setUpdated(C, false);
+            return true
+        }
+        if (B == "deleted") {
+            return false
+        }
+        if (B == "true_deleted") {
+            return true
+        }
+        A.setUpdated(C, true, "deleted");
+        return false
+    });
+    this.attachEvent("onEventChanged", function (B) {
+        if (!this._loading && this.validId(B)) {
+            A.setUpdated(B, true, "updated")
+        }
+    });
+    A._getRowData = function (F, B) {
+        var D = this.obj.getEvent(F);
+        var E = {};
+        for (var C in D) {
+            if (C.indexOf("_") == 0) {
+                continue
+            }
+            if (D[C] && D[C].getUTCFullYear) {
+                E[C] = this.obj.templates.xml_format(D[C])
+            } else {
+                E[C] = D[C]
+            }
+        }
+        return E
+    };
+    A._clearUpdateFlag = function () {};
+    A.attachEvent("insertCallback", scheduler._update_callback);
+    A.attachEvent("updateCallback", scheduler._update_callback);
+    A.attachEvent("deleteCallback", function (B, C) {
+        this.obj.setUserData(C, this.action_param, "true_deleted");
+        this.obj.deleteEvent(C)
+    })
+};
+scheduler.setUserData = function (C, A, B) {
+    if (C) {
+        this.getEvent(C)[A] = B
+    } else {
+        this._userdata[A] = B
+    }
+};
+scheduler.getUserData = function (B, A) {
+    return B ? this.getEvent(B)[A] : this._userdata[A]
+};
+scheduler.setEventTextStyle = function (C, A) {
+    this.for_rendered(C, function (D) {
+        D.style.cssText += ";" + A
+    });
+    var B = this.getEvent(C);
+    B._text_style = A;
+    this.event_updated(B)
+};
+scheduler.validId = function (A) {
+    return true
+};
+scheduler._update_callback = function (B, C) {
+    var A = scheduler.xmlNodeToJSON(B.firstChild);
+    A.text = A.text || A._tagvalue;
+    A.start_date = scheduler.templates.xml_date(A.start_date);
+    A.end_date = scheduler.templates.xml_date(A.end_date);
+    scheduler.addEvent(A)
+};
+
+/*
+dhtmlxScheduler v.2.3
+
+This software is allowed to use under GPL or you need to obtain Commercial or Enterise License
+to use it in not GPL project. Please contact sales@dhtmlx.com for details
+
+(c) DHTMLX Ltd.
+*/
\ No newline at end of file
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/codebase/dhtmlxscheduler_debug.js b/addons/base_calendar/static/lib/dhtmlxScheduler/codebase/dhtmlxscheduler_debug.js
new file mode 100644
index 00000000000..7270bd4e27f
--- /dev/null
+++ b/addons/base_calendar/static/lib/dhtmlxScheduler/codebase/dhtmlxscheduler_debug.js
@@ -0,0 +1,3931 @@
+/*
+dhtmlxScheduler v.2.3
+
+This software is allowed to use under GPL or you need to obtain Commercial or Enterise License
+to use it in not GPL project. Please contact sales@dhtmlx.com for details
+
+(c) DHTMLX Ltd.
+*/
+
+dhtmlx=function(obj){
+	for (var a in obj) dhtmlx[a]=obj[a];
+	return dhtmlx; //simple singleton
+};
+dhtmlx.extend_api=function(name,map,ext){
+	var t = window[name];
+	if (!t) return; //component not defined
+	window[name]=function(obj){
+		if (obj && typeof obj == "object" && !obj.tagName && !(obj instanceof Array)){
+			var that = t.apply(this,(map._init?map._init(obj):arguments));
+			//global settings
+			for (var a in dhtmlx)
+				if (map[a]) this[map[a]](dhtmlx[a]);			
+			//local settings
+			for (var a in obj){
+				if (map[a]) this[map[a]](obj[a]);
+				else if (a.indexOf("on")==0){
+					this.attachEvent(a,obj[a]);
+				}
+			}
+		} else
+			var that = t.apply(this,arguments);
+		if (map._patch) map._patch(this);
+		return that||this;
+	};
+	window[name].prototype=t.prototype;
+	if (ext)
+		dhtmlXHeir(window[name].prototype,ext);
+};
+
+dhtmlxAjax={
+	get:function(url,callback){
+		var t=new dtmlXMLLoaderObject(true);
+		t.async=(arguments.length<3);
+		t.waitCall=callback;
+		t.loadXML(url)
+		return t;
+	},
+	post:function(url,post,callback){
+		var t=new dtmlXMLLoaderObject(true);
+		t.async=(arguments.length<4);
+		t.waitCall=callback;
+		t.loadXML(url,true,post)
+		return t;
+	},
+	getSync:function(url){
+		return this.get(url,null,true)
+	},
+	postSync:function(url,post){
+		return this.post(url,post,null,true);		
+	}
+}
+
+/**
+  *     @desc: xmlLoader object
+  *     @type: private
+  *     @param: funcObject - xml parser function
+  *     @param: object - jsControl object
+  *     @param: async - sync/async mode (async by default)
+  *     @param: rSeed - enable/disable random seed ( prevent IE caching)
+  *     @topic: 0
+  */
+function dtmlXMLLoaderObject(funcObject, dhtmlObject, async, rSeed){
+	this.xmlDoc="";
+
+	if (typeof (async) != "undefined")
+		this.async=async;
+	else
+		this.async=true;
+
+	this.onloadAction=funcObject||null;
+	this.mainObject=dhtmlObject||null;
+	this.waitCall=null;
+	this.rSeed=rSeed||false;
+	return this;
+};
+/**
+  *     @desc: xml loading handler
+  *     @type: private
+  *     @param: dtmlObject - xmlLoader object
+  *     @topic: 0
+  */
+dtmlXMLLoaderObject.prototype.waitLoadFunction=function(dhtmlObject){
+	var once = true;
+	this.check=function (){
+		if ((dhtmlObject)&&(dhtmlObject.onloadAction != null)){
+			if ((!dhtmlObject.xmlDoc.readyState)||(dhtmlObject.xmlDoc.readyState == 4)){
+				if (!once)
+					return;
+
+				once=false; //IE 5 fix
+				if (typeof dhtmlObject.onloadAction == "function")
+					dhtmlObject.onloadAction(dhtmlObject.mainObject, null, null, null, dhtmlObject);
+
+				if (dhtmlObject.waitCall){
+					dhtmlObject.waitCall.call(this,dhtmlObject);
+					dhtmlObject.waitCall=null;
+				}
+			}
+		}
+	};
+	return this.check;
+};
+
+/**
+  *     @desc: return XML top node
+  *     @param: tagName - top XML node tag name (not used in IE, required for Safari and Mozilla)
+  *     @type: private
+  *     @returns: top XML node
+  *     @topic: 0  
+  */
+dtmlXMLLoaderObject.prototype.getXMLTopNode=function(tagName, oldObj){
+	if (this.xmlDoc.responseXML){
+		var temp = this.xmlDoc.responseXML.getElementsByTagName(tagName);
+		if(temp.length==0 && tagName.indexOf(":")!=-1)
+			var temp = this.xmlDoc.responseXML.getElementsByTagName((tagName.split(":"))[1]);
+		var z = temp[0];
+	} else
+		var z = this.xmlDoc.documentElement;
+
+	if (z){
+		this._retry=false;
+		return z;
+	}
+
+	if ((_isIE)&&(!this._retry)){
+		//fall back to MS.XMLDOM
+		var xmlString = this.xmlDoc.responseText;
+		var oldObj = this.xmlDoc;
+		this._retry=true;
+		this.xmlDoc=new ActiveXObject("Microsoft.XMLDOM");
+		this.xmlDoc.async=false;
+		this.xmlDoc["loadXM"+"L"](xmlString);
+
+		return this.getXMLTopNode(tagName, oldObj);
+	}
+	dhtmlxError.throwError("LoadXML", "Incorrect XML", [
+		(oldObj||this.xmlDoc),
+		this.mainObject
+	]);
+
+	return document.createElement("DIV");
+};
+
+/**
+  *     @desc: load XML from string
+  *     @type: private
+  *     @param: xmlString - xml string
+  *     @topic: 0  
+  */
+dtmlXMLLoaderObject.prototype.loadXMLString=function(xmlString){
+	{
+		try{
+			var parser = new DOMParser();
+			this.xmlDoc=parser.parseFromString(xmlString, "text/xml");
+		}
+		catch (e){
+			this.xmlDoc=new ActiveXObject("Microsoft.XMLDOM");
+			this.xmlDoc.async=this.async;
+			this.xmlDoc["loadXM"+"L"](xmlString);
+		}
+	}
+
+	this.onloadAction(this.mainObject, null, null, null, this);
+
+	if (this.waitCall){
+		this.waitCall();
+		this.waitCall=null;
+	}
+}
+/**
+  *     @desc: load XML
+  *     @type: private
+  *     @param: filePath - xml file path
+  *     @param: postMode - send POST request
+  *     @param: postVars - list of vars for post request
+  *     @topic: 0
+  */
+dtmlXMLLoaderObject.prototype.loadXML=function(filePath, postMode, postVars, rpc){
+	if (this.rSeed)
+		filePath+=((filePath.indexOf("?") != -1) ? "&" : "?")+"a_dhx_rSeed="+(new Date()).valueOf();
+	this.filePath=filePath;
+	if ((!_isIE)&&(window.XMLHttpRequest))
+		this.xmlDoc=new XMLHttpRequest();
+	else {
+		this.xmlDoc=new ActiveXObject("Microsoft.XMLHTTP");
+	}
+
+	if (this.async)
+		this.xmlDoc.onreadystatechange=new this.waitLoadFunction(this);
+	this.xmlDoc.open(postMode ? "POST" : "GET", filePath, this.async);
+
+	if (rpc){
+		this.xmlDoc.setRequestHeader("User-Agent", "dhtmlxRPC v0.1 ("+navigator.userAgent+")");
+		this.xmlDoc.setRequestHeader("Content-type", "text/xml");
+	}
+
+	else if (postMode)
+		this.xmlDoc.setRequestHeader('Content-type', 'application/x-www-form-urlencoded');
+		
+	this.xmlDoc.setRequestHeader("X-Requested-With","XMLHttpRequest");
+	this.xmlDoc.send(null||postVars);
+
+	if (!this.async)
+		(new this.waitLoadFunction(this))();
+};
+/**
+  *     @desc: destructor, cleans used memory
+  *     @type: private
+  *     @topic: 0
+  */
+dtmlXMLLoaderObject.prototype.destructor=function(){
+	this.onloadAction=null;
+	this.mainObject=null;
+	this.xmlDoc=null;
+	return null;
+}
+
+dtmlXMLLoaderObject.prototype.xmlNodeToJSON = function(node){
+        var t={};
+        for (var i=0; i<node.attributes.length; i++)
+            t[node.attributes[i].name]=node.attributes[i].value;
+        t["_tagvalue"]=node.firstChild?node.firstChild.nodeValue:"";
+        for (var i=0; i<node.childNodes.length; i++){
+            var name=node.childNodes[i].tagName;
+            if (name){
+                if (!t[name]) t[name]=[];
+                t[name].push(this.xmlNodeToJSON(node.childNodes[i]));
+            }            
+        }        
+        return t;
+    }
+
+/**  
+  *     @desc: Call wrapper
+  *     @type: private
+  *     @param: funcObject - action handler
+  *     @param: dhtmlObject - user data
+  *     @returns: function handler
+  *     @topic: 0  
+  */
+function callerFunction(funcObject, dhtmlObject){
+	this.handler=function(e){
+		if (!e)
+			e=window.event;
+		funcObject(e, dhtmlObject);
+		return true;
+	};
+	return this.handler;
+};
+
+/**  
+  *     @desc: Calculate absolute position of html object
+  *     @type: private
+  *     @param: htmlObject - html object
+  *     @topic: 0  
+  */
+function getAbsoluteLeft(htmlObject){
+	return getOffset(htmlObject).left;
+}
+/**
+  *     @desc: Calculate absolute position of html object
+  *     @type: private
+  *     @param: htmlObject - html object
+  *     @topic: 0  
+  */
+function getAbsoluteTop(htmlObject){
+	return getOffset(htmlObject).top;
+}
+
+function getOffsetSum(elem) {
+	var top=0, left=0;
+	while(elem) {
+		top = top + parseInt(elem.offsetTop);
+		left = left + parseInt(elem.offsetLeft);
+		elem = elem.offsetParent;
+	}
+	return {top: top, left: left};
+}
+function getOffsetRect(elem) {
+	var box = elem.getBoundingClientRect();
+	var body = document.body;
+	var docElem = document.documentElement;
+	var scrollTop = window.pageYOffset || docElem.scrollTop || body.scrollTop;
+	var scrollLeft = window.pageXOffset || docElem.scrollLeft || body.scrollLeft;
+	var clientTop = docElem.clientTop || body.clientTop || 0;
+	var clientLeft = docElem.clientLeft || body.clientLeft || 0;
+	var top  = box.top +  scrollTop - clientTop;
+	var left = box.left + scrollLeft - clientLeft;
+	return { top: Math.round(top), left: Math.round(left) };
+}
+function getOffset(elem) {
+	if (elem.getBoundingClientRect && !_isChrome) {
+		return getOffsetRect(elem);
+	} else {
+		return getOffsetSum(elem);
+	}
+}
+
+/**  
+*     @desc: Convert string to it boolean representation
+*     @type: private
+*     @param: inputString - string for covertion
+*     @topic: 0
+*/
+function convertStringToBoolean(inputString){
+	if (typeof (inputString) == "string")
+		inputString=inputString.toLowerCase();
+
+	switch (inputString){
+		case "1":
+		case "true":
+		case "yes":
+		case "y":
+		case 1:
+		case true:
+			return true;
+			break;
+
+		default: return false;
+	}
+}
+
+/**  
+*     @desc: find out what symbol to use as url param delimiters in further params
+*     @type: private
+*     @param: str - current url string
+*     @topic: 0  
+*/
+function getUrlSymbol(str){
+	if (str.indexOf("?") != -1)
+		return "&"
+	else
+		return "?"
+}
+
+function dhtmlDragAndDropObject(){
+	if (window.dhtmlDragAndDrop)
+		return window.dhtmlDragAndDrop;
+
+	this.lastLanding=0;
+	this.dragNode=0;
+	this.dragStartNode=0;
+	this.dragStartObject=0;
+	this.tempDOMU=null;
+	this.tempDOMM=null;
+	this.waitDrag=0;
+	window.dhtmlDragAndDrop=this;
+
+	return this;
+};
+
+dhtmlDragAndDropObject.prototype.removeDraggableItem=function(htmlNode){
+	htmlNode.onmousedown=null;
+	htmlNode.dragStarter=null;
+	htmlNode.dragLanding=null;
+}
+dhtmlDragAndDropObject.prototype.addDraggableItem=function(htmlNode, dhtmlObject){
+	htmlNode.onmousedown=this.preCreateDragCopy;
+	htmlNode.dragStarter=dhtmlObject;
+	this.addDragLanding(htmlNode, dhtmlObject);
+}
+dhtmlDragAndDropObject.prototype.addDragLanding=function(htmlNode, dhtmlObject){
+	htmlNode.dragLanding=dhtmlObject;
+}
+dhtmlDragAndDropObject.prototype.preCreateDragCopy=function(e){
+	if ((e||event) && (e||event).button == 2)
+		return;
+
+	if (window.dhtmlDragAndDrop.waitDrag){
+		window.dhtmlDragAndDrop.waitDrag=0;
+		document.body.onmouseup=window.dhtmlDragAndDrop.tempDOMU;
+		document.body.onmousemove=window.dhtmlDragAndDrop.tempDOMM;
+		return false;
+	}
+
+	window.dhtmlDragAndDrop.waitDrag=1;
+	window.dhtmlDragAndDrop.tempDOMU=document.body.onmouseup;
+	window.dhtmlDragAndDrop.tempDOMM=document.body.onmousemove;
+	window.dhtmlDragAndDrop.dragStartNode=this;
+	window.dhtmlDragAndDrop.dragStartObject=this.dragStarter;
+	document.body.onmouseup=window.dhtmlDragAndDrop.preCreateDragCopy;
+	document.body.onmousemove=window.dhtmlDragAndDrop.callDrag;
+	window.dhtmlDragAndDrop.downtime = new Date().valueOf();
+	
+
+	if ((e)&&(e.preventDefault)){
+		e.preventDefault();
+		return false;
+	}
+	return false;
+};
+dhtmlDragAndDropObject.prototype.callDrag=function(e){
+	if (!e)
+		e=window.event;
+	dragger=window.dhtmlDragAndDrop;
+	if ((new Date()).valueOf()-dragger.downtime<100) return;
+
+	if ((e.button == 0)&&(_isIE))
+		return dragger.stopDrag();
+
+	if (!dragger.dragNode&&dragger.waitDrag){
+		dragger.dragNode=dragger.dragStartObject._createDragNode(dragger.dragStartNode, e);
+
+		if (!dragger.dragNode)
+			return dragger.stopDrag();
+
+		dragger.dragNode.onselectstart=function(){return false;}
+		dragger.gldragNode=dragger.dragNode;
+		document.body.appendChild(dragger.dragNode);
+		document.body.onmouseup=dragger.stopDrag;
+		dragger.waitDrag=0;
+		dragger.dragNode.pWindow=window;
+		dragger.initFrameRoute();
+	}
+
+	if (dragger.dragNode.parentNode != window.document.body){
+		var grd = dragger.gldragNode;
+
+		if (dragger.gldragNode.old)
+			grd=dragger.gldragNode.old;
+
+		//if (!document.all) dragger.calculateFramePosition();
+		grd.parentNode.removeChild(grd);
+		var oldBody = dragger.dragNode.pWindow;
+
+		//		var oldp=dragger.dragNode.parentObject;
+		if (_isIE){
+			var div = document.createElement("Div");
+			div.innerHTML=dragger.dragNode.outerHTML;
+			dragger.dragNode=div.childNodes[0];
+		} else
+			dragger.dragNode=dragger.dragNode.cloneNode(true);
+
+		dragger.dragNode.pWindow=window;
+		//		dragger.dragNode.parentObject=oldp;
+
+		dragger.gldragNode.old=dragger.dragNode;
+		document.body.appendChild(dragger.dragNode);
+		oldBody.dhtmlDragAndDrop.dragNode=dragger.dragNode;
+	}
+
+	dragger.dragNode.style.left=e.clientX+15+(dragger.fx
+		? dragger.fx*(-1)
+		: 0)
+		+(document.body.scrollLeft||document.documentElement.scrollLeft)+"px";
+	dragger.dragNode.style.top=e.clientY+3+(dragger.fy
+		? dragger.fy*(-1)
+		: 0)
+		+(document.body.scrollTop||document.documentElement.scrollTop)+"px";
+
+	if (!e.srcElement)
+		var z = e.target;
+	else
+		z=e.srcElement;
+	dragger.checkLanding(z, e);
+}
+
+dhtmlDragAndDropObject.prototype.calculateFramePosition=function(n){
+	//this.fx = 0, this.fy = 0;
+	if (window.name){
+		var el = parent.frames[window.name].frameElement.offsetParent;
+		var fx = 0;
+		var fy = 0;
+
+		while (el){
+			fx+=el.offsetLeft;
+			fy+=el.offsetTop;
+			el=el.offsetParent;
+		}
+
+		if ((parent.dhtmlDragAndDrop)){
+			var ls = parent.dhtmlDragAndDrop.calculateFramePosition(1);
+			fx+=ls.split('_')[0]*1;
+			fy+=ls.split('_')[1]*1;
+		}
+
+		if (n)
+			return fx+"_"+fy;
+		else
+			this.fx=fx;
+		this.fy=fy;
+	}
+	return "0_0";
+}
+dhtmlDragAndDropObject.prototype.checkLanding=function(htmlObject, e){
+	if ((htmlObject)&&(htmlObject.dragLanding)){
+		if (this.lastLanding)
+			this.lastLanding.dragLanding._dragOut(this.lastLanding);
+		this.lastLanding=htmlObject;
+		this.lastLanding=this.lastLanding.dragLanding._dragIn(this.lastLanding, this.dragStartNode, e.clientX,
+			e.clientY, e);
+		this.lastLanding_scr=(_isIE ? e.srcElement : e.target);
+	} else {
+		if ((htmlObject)&&(htmlObject.tagName != "BODY"))
+			this.checkLanding(htmlObject.parentNode, e);
+		else {
+			if (this.lastLanding)
+				this.lastLanding.dragLanding._dragOut(this.lastLanding, e.clientX, e.clientY, e);
+			this.lastLanding=0;
+
+			if (this._onNotFound)
+				this._onNotFound();
+		}
+	}
+}
+dhtmlDragAndDropObject.prototype.stopDrag=function(e, mode){
+	dragger=window.dhtmlDragAndDrop;
+
+	if (!mode){
+		dragger.stopFrameRoute();
+		var temp = dragger.lastLanding;
+		dragger.lastLanding=null;
+
+		if (temp)
+			temp.dragLanding._drag(dragger.dragStartNode, dragger.dragStartObject, temp, (_isIE
+				? event.srcElement
+				: e.target));
+	}
+	dragger.lastLanding=null;
+
+	if ((dragger.dragNode)&&(dragger.dragNode.parentNode == document.body))
+		dragger.dragNode.parentNode.removeChild(dragger.dragNode);
+	dragger.dragNode=0;
+	dragger.gldragNode=0;
+	dragger.fx=0;
+	dragger.fy=0;
+	dragger.dragStartNode=0;
+	dragger.dragStartObject=0;
+	document.body.onmouseup=dragger.tempDOMU;
+	document.body.onmousemove=dragger.tempDOMM;
+	dragger.tempDOMU=null;
+	dragger.tempDOMM=null;
+	dragger.waitDrag=0;
+}
+
+dhtmlDragAndDropObject.prototype.stopFrameRoute=function(win){
+	if (win)
+		window.dhtmlDragAndDrop.stopDrag(1, 1);
+
+	for (var i = 0; i < window.frames.length; i++){
+		try{
+		if ((window.frames[i] != win)&&(window.frames[i].dhtmlDragAndDrop))
+			window.frames[i].dhtmlDragAndDrop.stopFrameRoute(window);
+		} catch(e){}
+	}
+
+	try{
+	if ((parent.dhtmlDragAndDrop)&&(parent != window)&&(parent != win))
+		parent.dhtmlDragAndDrop.stopFrameRoute(window);
+	} catch(e){}
+}
+dhtmlDragAndDropObject.prototype.initFrameRoute=function(win, mode){
+	if (win){
+		window.dhtmlDragAndDrop.preCreateDragCopy({});
+		window.dhtmlDragAndDrop.dragStartNode=win.dhtmlDragAndDrop.dragStartNode;
+		window.dhtmlDragAndDrop.dragStartObject=win.dhtmlDragAndDrop.dragStartObject;
+		window.dhtmlDragAndDrop.dragNode=win.dhtmlDragAndDrop.dragNode;
+		window.dhtmlDragAndDrop.gldragNode=win.dhtmlDragAndDrop.dragNode;
+		window.document.body.onmouseup=window.dhtmlDragAndDrop.stopDrag;
+		window.waitDrag=0;
+
+		if (((!_isIE)&&(mode))&&((!_isFF)||(_FFrv < 1.8)))
+			window.dhtmlDragAndDrop.calculateFramePosition();
+	}
+	try{
+	if ((parent.dhtmlDragAndDrop)&&(parent != window)&&(parent != win))
+		parent.dhtmlDragAndDrop.initFrameRoute(window);
+	}catch(e){}
+
+	for (var i = 0; i < window.frames.length; i++){
+		try{
+		if ((window.frames[i] != win)&&(window.frames[i].dhtmlDragAndDrop))
+			window.frames[i].dhtmlDragAndDrop.initFrameRoute(window, ((!win||mode) ? 1 : 0));
+		} catch(e){}
+	}
+}
+
+var _isFF = false;
+var _isIE = false;
+var _isOpera = false;
+var _isKHTML = false;
+var _isMacOS = false;
+var _isChrome = false;
+
+if (navigator.userAgent.indexOf('Macintosh') != -1)
+	_isMacOS=true;
+
+
+if (navigator.userAgent.toLowerCase().indexOf('chrome')>-1)
+	_isChrome=true;
+
+if ((navigator.userAgent.indexOf('Safari') != -1)||(navigator.userAgent.indexOf('Konqueror') != -1)){
+	var _KHTMLrv = parseFloat(navigator.userAgent.substr(navigator.userAgent.indexOf('Safari')+7, 5));
+
+	if (_KHTMLrv > 525){ //mimic FF behavior for Safari 3.1+
+		_isFF=true;
+		var _FFrv = 1.9;
+	} else
+		_isKHTML=true;
+} else if (navigator.userAgent.indexOf('Opera') != -1){
+	_isOpera=true;
+	_OperaRv=parseFloat(navigator.userAgent.substr(navigator.userAgent.indexOf('Opera')+6, 3));
+}
+
+
+else if (navigator.appName.indexOf("Microsoft") != -1){
+	_isIE=true;
+	if (navigator.appVersion.indexOf("MSIE 8.0")!= -1 && document.compatMode != "BackCompat") _isIE=8;
+} else {
+	_isFF=true;
+	var _FFrv = parseFloat(navigator.userAgent.split("rv:")[1])
+}
+
+
+//multibrowser Xpath processor
+dtmlXMLLoaderObject.prototype.doXPath=function(xpathExp, docObj, namespace, result_type){
+	if (_isKHTML || (!_isIE && !window.XPathResult))
+		return this.doXPathOpera(xpathExp, docObj);
+
+	if (_isIE){ //IE
+		if (!docObj)
+			if (!this.xmlDoc.nodeName)
+				docObj=this.xmlDoc.responseXML
+			else
+				docObj=this.xmlDoc;
+
+		if (!docObj)
+			dhtmlxError.throwError("LoadXML", "Incorrect XML", [
+				(docObj||this.xmlDoc),
+				this.mainObject
+			]);
+
+		if (namespace != null)
+			docObj.setProperty("SelectionNamespaces", "xmlns:xsl='"+namespace+"'"); //
+
+		if (result_type == 'single'){
+			return docObj.selectSingleNode(xpathExp);
+		}
+		else {
+			return docObj.selectNodes(xpathExp)||new Array(0);
+		}
+	} else { //Mozilla
+		var nodeObj = docObj;
+
+		if (!docObj){
+			if (!this.xmlDoc.nodeName){
+				docObj=this.xmlDoc.responseXML
+			}
+			else {
+				docObj=this.xmlDoc;
+			}
+		}
+
+		if (!docObj)
+			dhtmlxError.throwError("LoadXML", "Incorrect XML", [
+				(docObj||this.xmlDoc),
+				this.mainObject
+			]);
+
+		if (docObj.nodeName.indexOf("document") != -1){
+			nodeObj=docObj;
+		}
+		else {
+			nodeObj=docObj;
+			docObj=docObj.ownerDocument;
+		}
+		var retType = XPathResult.ANY_TYPE;
+
+		if (result_type == 'single')
+			retType=XPathResult.FIRST_ORDERED_NODE_TYPE
+		var rowsCol = new Array();
+		var col = docObj.evaluate(xpathExp, nodeObj, function(pref){
+			return namespace
+		}, retType, null);
+
+		if (retType == XPathResult.FIRST_ORDERED_NODE_TYPE){
+			return col.singleNodeValue;
+		}
+		var thisColMemb = col.iterateNext();
+
+		while (thisColMemb){
+			rowsCol[rowsCol.length]=thisColMemb;
+			thisColMemb=col.iterateNext();
+		}
+		return rowsCol;
+	}
+}
+
+function _dhtmlxError(type, name, params){
+	if (!this.catches)
+		this.catches=new Array();
+
+	return this;
+}
+
+_dhtmlxError.prototype.catchError=function(type, func_name){
+	this.catches[type]=func_name;
+}
+_dhtmlxError.prototype.throwError=function(type, name, params){
+	if (this.catches[type])
+		return this.catches[type](type, name, params);
+
+	if (this.catches["ALL"])
+		return this.catches["ALL"](type, name, params);
+
+	alert("Error type: "+arguments[0]+"\nDescription: "+arguments[1]);
+	return null;
+}
+
+window.dhtmlxError=new _dhtmlxError();
+
+
+//opera fake, while 9.0 not released
+//multibrowser Xpath processor
+dtmlXMLLoaderObject.prototype.doXPathOpera=function(xpathExp, docObj){
+	//this is fake for Opera
+	var z = xpathExp.replace(/[\/]+/gi, "/").split('/');
+	var obj = null;
+	var i = 1;
+
+	if (!z.length)
+		return [];
+
+	if (z[0] == ".")
+		obj=[docObj]; else if (z[0] == ""){
+		obj=(this.xmlDoc.responseXML||this.xmlDoc).getElementsByTagName(z[i].replace(/\[[^\]]*\]/g, ""));
+		i++;
+	} else
+		return [];
+
+	for (i; i < z.length; i++)obj=this._getAllNamedChilds(obj, z[i]);
+
+	if (z[i-1].indexOf("[") != -1)
+		obj=this._filterXPath(obj, z[i-1]);
+	return obj;
+}
+
+dtmlXMLLoaderObject.prototype._filterXPath=function(a, b){
+	var c = new Array();
+	var b = b.replace(/[^\[]*\[\@/g, "").replace(/[\[\]\@]*/g, "");
+
+	for (var i = 0; i < a.length; i++)
+		if (a[i].getAttribute(b))
+			c[c.length]=a[i];
+
+	return c;
+}
+dtmlXMLLoaderObject.prototype._getAllNamedChilds=function(a, b){
+	var c = new Array();
+
+	if (_isKHTML)
+		b=b.toUpperCase();
+
+	for (var i = 0; i < a.length; i++)for (var j = 0; j < a[i].childNodes.length; j++){
+		if (_isKHTML){
+			if (a[i].childNodes[j].tagName&&a[i].childNodes[j].tagName.toUpperCase() == b)
+				c[c.length]=a[i].childNodes[j];
+		}
+
+		else if (a[i].childNodes[j].tagName == b)
+			c[c.length]=a[i].childNodes[j];
+	}
+
+	return c;
+}
+
+function dhtmlXHeir(a, b){
+	for (var c in b)
+		if (typeof (b[c]) == "function")
+			a[c]=b[c];
+	return a;
+}
+
+function dhtmlxEvent(el, event, handler){
+	if (el.addEventListener)
+		el.addEventListener(event, handler, false);
+
+	else if (el.attachEvent)
+		el.attachEvent("on"+event, handler);
+}
+
+//============= XSL Extension ===================================
+
+dtmlXMLLoaderObject.prototype.xslDoc=null;
+dtmlXMLLoaderObject.prototype.setXSLParamValue=function(paramName, paramValue, xslDoc){
+	if (!xslDoc)
+		xslDoc=this.xslDoc
+
+	if (xslDoc.responseXML)
+		xslDoc=xslDoc.responseXML;
+	var item =
+		this.doXPath("/xsl:stylesheet/xsl:variable[@name='"+paramName+"']", xslDoc,
+			"http:/\/www.w3.org/1999/XSL/Transform", "single");
+
+	if (item != null)
+		item.firstChild.nodeValue=paramValue
+}
+dtmlXMLLoaderObject.prototype.doXSLTransToObject=function(xslDoc, xmlDoc){
+	if (!xslDoc)
+		xslDoc=this.xslDoc;
+
+	if (xslDoc.responseXML)
+		xslDoc=xslDoc.responseXML
+
+	if (!xmlDoc)
+		xmlDoc=this.xmlDoc;
+
+	if (xmlDoc.responseXML)
+		xmlDoc=xmlDoc.responseXML
+
+	//MOzilla
+	if (!_isIE){
+		if (!this.XSLProcessor){
+			this.XSLProcessor=new XSLTProcessor();
+			this.XSLProcessor.importStylesheet(xslDoc);
+		}
+		var result = this.XSLProcessor.transformToDocument(xmlDoc);
+	} else {
+		var result = new ActiveXObject("Msxml2.DOMDocument.3.0");
+		try{
+			xmlDoc.transformNodeToObject(xslDoc, result);
+		}catch(e){
+			result = xmlDoc.transformNode(xslDoc);
+		}
+	}
+	return result;
+}
+
+dtmlXMLLoaderObject.prototype.doXSLTransToString=function(xslDoc, xmlDoc){
+	var res = this.doXSLTransToObject(xslDoc, xmlDoc);
+	if(typeof(res)=="string")
+		return res;
+	return this.doSerialization(res);
+}
+
+dtmlXMLLoaderObject.prototype.doSerialization=function(xmlDoc){
+	if (!xmlDoc)
+			xmlDoc=this.xmlDoc;
+	if (xmlDoc.responseXML)
+			xmlDoc=xmlDoc.responseXML
+	if (!_isIE){
+		var xmlSerializer = new XMLSerializer();
+		return xmlSerializer.serializeToString(xmlDoc);
+	} else
+		return xmlDoc.xml;
+}
+
+/**
+*   @desc: 
+*   @type: private
+*/
+dhtmlxEventable=function(obj){
+		obj.dhx_SeverCatcherPath="";
+		obj.attachEvent=function(name, catcher, callObj){
+			name='ev_'+name.toLowerCase();
+			if (!this[name])
+				this[name]=new this.eventCatcher(callObj||this);
+				
+			return(name+':'+this[name].addEvent(catcher)); //return ID (event name & event ID)
+		}
+		obj.callEvent=function(name, arg0){ 
+			name='ev_'+name.toLowerCase();
+			if (this[name])
+				return this[name].apply(this, arg0);
+			return true;
+		}
+		obj.checkEvent=function(name){
+			return (!!this['ev_'+name.toLowerCase()])
+		}
+		obj.eventCatcher=function(obj){
+			var dhx_catch = [];
+			var z = function(){
+				var res = true;
+				for (var i = 0; i < dhx_catch.length; i++){
+					if (dhx_catch[i] != null){
+						var zr = dhx_catch[i].apply(obj, arguments);
+						res=res&&zr;
+					}
+				}
+				return res;
+			}
+			z.addEvent=function(ev){
+				if (typeof (ev) != "function")
+					ev=eval(ev);
+				if (ev)
+					return dhx_catch.push(ev)-1;
+				return false;
+			}
+			z.removeEvent=function(id){
+				dhx_catch[id]=null;
+			}
+			return z;
+		}
+		obj.detachEvent=function(id){
+			if (id != false){
+				var list = id.split(':');           //get EventName and ID
+				this[list[0]].removeEvent(list[1]); //remove event
+			}
+		}
+}
+
+/**
+	* 	@desc: constructor, data processor object 
+	*	@param: serverProcessorURL - url used for update
+	*	@type: public
+	*/
+function dataProcessor(serverProcessorURL){
+    this.serverProcessor = serverProcessorURL;
+    this.action_param="!nativeeditor_status";
+    
+	this.object = null;
+	this.updatedRows = []; //ids of updated rows
+	
+	this.autoUpdate = true;
+	this.updateMode = "cell";
+	this._tMode="GET"; 
+	this.post_delim = "_";
+	
+    this._waitMode=0;
+    this._in_progress={};//?
+    this._invalid={};
+    this.mandatoryFields=[];
+    this.messages=[];
+    
+    this.styles={
+    	updated:"font-weight:bold;",
+    	inserted:"font-weight:bold;",
+    	deleted:"text-decoration : line-through;",
+    	invalid:"background-color:FFE0E0;",
+    	invalid_cell:"border-bottom:2px solid red;",
+    	error:"color:red;",
+    	clear:"font-weight:normal;text-decoration:none;"
+    };
+    
+    this.enableUTFencoding(true);
+    dhtmlxEventable(this);
+
+    return this;
+    }
+
+dataProcessor.prototype={
+	/**
+	* 	@desc: select GET or POST transaction model
+	*	@param: mode - GET/POST
+	*	@param: total - true/false - send records row by row or all at once (for grid only)
+	*	@type: public
+	*/
+	setTransactionMode:function(mode,total){
+        this._tMode=mode;
+		this._tSend=total;
+    },
+    escape:function(data){
+    	if (this._utf)
+    		return encodeURIComponent(data);
+    	else
+        	return escape(data);
+	},
+    /**
+	* 	@desc: allows to set escaping mode
+	*	@param: true - utf based escaping, simple - use current page encoding
+	*	@type: public
+	*/	
+	enableUTFencoding:function(mode){
+        this._utf=convertStringToBoolean(mode);
+    },
+    /**
+	* 	@desc: allows to define, which column may trigger update
+	*	@param: val - array or list of true/false values
+	*	@type: public
+	*/
+	setDataColumns:function(val){
+		this._columns=(typeof val == "string")?val.split(","):val;
+    },
+    /**
+	* 	@desc: get state of updating
+	*	@returns:   true - all in sync with server, false - some items not updated yet.
+	*	@type: public
+	*/
+	getSyncState:function(){
+		return !this.updatedRows.length;
+	},
+	/**
+	* 	@desc: enable/disable named field for data syncing, will use column ids for grid
+	*	@param:   mode - true/false
+	*	@type: public
+	*/
+	enableDataNames:function(mode){
+		this._endnm=convertStringToBoolean(mode);
+	},
+	/**
+	* 	@desc: enable/disable mode , when only changed fields and row id send to the server side, instead of all fields in default mode
+	*	@param:   mode - true/false
+	*	@type: public
+	*/
+	enablePartialDataSend:function(mode){
+		this._changed=convertStringToBoolean(mode);
+	},
+	/**
+	* 	@desc: set if rows should be send to server automaticaly
+	*	@param: mode - "row" - based on row selection changed, "cell" - based on cell editing finished, "off" - manual data sending
+	*	@type: public
+	*/
+	setUpdateMode:function(mode,dnd){
+		this.autoUpdate = (mode=="cell");
+		this.updateMode = mode;
+		this.dnd=dnd;
+	},
+	ignore:function(code,master){
+		this._silent_mode=true;
+		code.call(master||window);
+		this._silent_mode=false;
+	},
+	/**
+	* 	@desc: mark row as updated/normal. check mandatory fields,initiate autoupdate (if turned on)
+	*	@param: rowId - id of row to set update-status for
+	*	@param: state - true for "updated", false for "not updated"
+	*	@param: mode - update mode name
+	*	@type: public
+	*/
+	setUpdated:function(rowId,state,mode){
+		if (this._silent_mode) return;
+		var ind=this.findRow(rowId);
+		
+		mode=mode||"updated";
+		var existing = this.obj.getUserData(rowId,this.action_param);
+		if (existing && mode == "updated") mode=existing;
+		if (state){
+			this.set_invalid(rowId,false); //clear previous error flag
+			this.updatedRows[ind]=rowId;
+			this.obj.setUserData(rowId,this.action_param,mode);
+			if (this._in_progress[rowId]) 
+				this._in_progress[rowId]="wait";
+		} else{
+			if (!this.is_invalid(rowId)){
+				this.updatedRows.splice(ind,1);
+				this.obj.setUserData(rowId,this.action_param,"");
+			}
+		}
+
+		//clear changed flag
+		if (!state)
+			this._clearUpdateFlag(rowId);
+     			
+		this.markRow(rowId,state,mode);
+		if (state && this.autoUpdate) this.sendData(rowId);
+	},
+	_clearUpdateFlag:function(id){},
+	markRow:function(id,state,mode){ 
+		var str="";
+		var invalid=this.is_invalid(id);
+		if (invalid){
+        	str=this.styles[invalid];
+        	state=true;
+    	}
+		if (this.callEvent("onRowMark",[id,state,mode,invalid])){
+			//default logic
+			str=this.styles[state?mode:"clear"]+str;
+			
+        	this.obj[this._methods[0]](id,str);
+
+			if (invalid && invalid.details){
+				str+=this.styles[invalid+"_cell"];
+				for (var i=0; i < invalid.details.length; i++)
+					if (invalid.details[i])
+        				this.obj[this._methods[1]](id,i,str);
+			}
+		}
+	},
+	getState:function(id){
+		return this.obj.getUserData(id,this.action_param);
+	},
+	is_invalid:function(id){
+		return this._invalid[id];
+	},
+	set_invalid:function(id,mode,details){ 
+		if (details) mode={value:mode, details:details, toString:function(){ return this.value.toString(); }};
+		this._invalid[id]=mode;
+	},
+	/**
+	* 	@desc: check mandatory fields and varify values of cells, initiate update (if specified)
+	*	@param: rowId - id of row to set update-status for
+	*	@type: public
+	*/
+	checkBeforeUpdate:function(rowId){ 
+		return true;
+	},
+	/**
+	* 	@desc: send row(s) values to server
+	*	@param: rowId - id of row which data to send. If not specified, then all "updated" rows will be send
+	*	@type: public
+	*/
+	sendData:function(rowId){
+		if (this._waitMode && (this.obj.mytype=="tree" || this.obj._h2)) return;
+		if (this.obj.editStop) this.obj.editStop();
+	
+		
+		if(typeof rowId == "undefined" || this._tSend) return this.sendAllData();
+		if (this._in_progress[rowId]) return false;
+		
+		this.messages=[];
+		if (!this.checkBeforeUpdate(rowId) && this.callEvent("onValidatationError",[rowId,this.messages])) return false;
+		this._beforeSendData(this._getRowData(rowId),rowId);
+    },
+    _beforeSendData:function(data,rowId){
+    	if (!this.callEvent("onBeforeUpdate",[rowId,this.getState(rowId),data])) return false;	
+		this._sendData(data,rowId);
+    },
+    serialize:function(data, id){
+    	if (typeof data == "string")
+    		return data;
+    	if (typeof id != "undefined")
+    		return this.serialize_one(data,"");
+    	else{
+    		var stack = [];
+    		var keys = [];
+    		for (var key in data)
+    			if (data.hasOwnProperty(key)){
+    				stack.push(this.serialize_one(data[key],key+this.post_delim));
+    				keys.push(key);
+				}
+    		stack.push("ids="+this.escape(keys.join(",")));
+    		return stack.join("&");
+    	}
+    },
+    serialize_one:function(data, pref){
+    	if (typeof data == "string")
+    		return data;
+    	var stack = [];
+    	for (var key in data)
+    		if (data.hasOwnProperty(key))
+    			stack.push(this.escape((pref||"")+key)+"="+this.escape(data[key]));
+		return stack.join("&");
+    },
+    _sendData:function(a1,rowId){
+    	if (!a1) return; //nothing to send
+		if (!this.callEvent("onBeforeDataSending",rowId?[rowId,this.getState(rowId),a1]:[null, null, a1])) return false;				
+		
+    	if (rowId)
+			this._in_progress[rowId]=(new Date()).valueOf();
+		var a2=new dtmlXMLLoaderObject(this.afterUpdate,this,true);
+		
+		var a3 = this.serverProcessor+(this._user?(getUrlSymbol(this.serverProcessor)+["dhx_user="+this._user,"dhx_version="+this.obj.getUserData(0,"version")].join("&")):"");
+
+		if (this._tMode!="POST")
+        	a2.loadXML(a3+((a3.indexOf("?")!=-1)?"&":"?")+this.serialize(a1,rowId));
+		else
+        	a2.loadXML(a3,true,this.serialize(a1,rowId));
+
+		this._waitMode++;
+    },
+	sendAllData:function(){
+		if (!this.updatedRows.length) return;			
+
+		this.messages=[]; var valid=true;
+		for (var i=0; i<this.updatedRows.length; i++)
+			valid&=this.checkBeforeUpdate(this.updatedRows[i]);
+		if (!valid && !this.callEvent("onValidatationError",["",this.messages])) return false;
+	
+		if (this._tSend) 
+			this._sendData(this._getAllData());
+		else
+			for (var i=0; i<this.updatedRows.length; i++)
+				if (!this._in_progress[this.updatedRows[i]]){
+					if (this.is_invalid(this.updatedRows[i])) continue;
+					this._beforeSendData(this._getRowData(this.updatedRows[i]),this.updatedRows[i]);
+					if (this._waitMode && (this.obj.mytype=="tree" || this.obj._h2)) return; //block send all for tree
+				}
+	},
+    
+	
+	
+	
+	
+	
+	
+	
+	_getAllData:function(rowId){
+		var out={};
+		var has_one = false;
+		for(var i=0;i<this.updatedRows.length;i++){
+			var id=this.updatedRows[i];
+			if (this._in_progress[id] || this.is_invalid(id)) continue;
+			if (!this.callEvent("onBeforeUpdate",[id,this.getState(id)])) continue;	
+			out[id]=this._getRowData(id,id+this.post_delim);
+			has_one = true;
+			this._in_progress[id]=(new Date()).valueOf();
+		}
+		return has_one?out:null;
+	},
+	
+	
+	/**
+	* 	@desc: specify column which value should be varified before sending to server
+	*	@param: ind - column index (0 based)
+	*	@param: verifFunction - function (object) which should verify cell value (if not specified, then value will be compared to empty string). Two arguments will be passed into it: value and column name
+	*	@type: public
+	*/
+	setVerificator:function(ind,verifFunction){
+		this.mandatoryFields[ind] = verifFunction||(function(value){return (value!="");});
+	},
+	/**
+	* 	@desc: remove column from list of those which should be verified
+	*	@param: ind - column Index (0 based)
+	*	@type: public
+	*/
+	clearVerificator:function(ind){
+		this.mandatoryFields[ind] = false;
+	},
+	
+	
+	
+	
+	
+	findRow:function(pattern){
+		var i=0;
+    	for(i=0;i<this.updatedRows.length;i++)
+		    if(pattern==this.updatedRows[i]) break;
+	    return i;
+    },
+
+   
+	
+
+
+    
+
+
+
+
+
+	/**
+	* 	@desc: define custom actions
+	*	@param: name - name of action, same as value of action attribute
+	*	@param: handler - custom function, which receives a XMl response content for action
+	*	@type: private
+	*/
+	defineAction:function(name,handler){
+        if (!this._uActions) this._uActions=[];
+            this._uActions[name]=handler;
+	},
+
+
+
+
+	/**
+*     @desc: used in combination with setOnBeforeUpdateHandler to create custom client-server transport system
+*     @param: sid - id of item before update
+*     @param: tid - id of item after up0ate
+*     @param: action - action name
+*     @type: public
+*     @topic: 0
+*/
+	afterUpdateCallback:function(sid, tid, action, btag) {
+		var marker = sid;
+		var correct=(action!="error" && action!="invalid");
+		if (!correct) this.set_invalid(sid,action);
+		if ((this._uActions)&&(this._uActions[action])&&(!this._uActions[action](btag))) 
+			return (delete this._in_progress[marker]);
+			
+		if (this._in_progress[marker]!="wait")
+	    	this.setUpdated(sid, false);
+	    	
+	    var soid = sid;
+	
+	    switch (action) {
+	    case "inserted":
+	    case "insert":
+	        if (tid != sid) {
+	            this.obj[this._methods[2]](sid, tid);
+	            sid = tid;
+	        }
+	        break;
+	    case "delete":
+	    case "deleted":
+	    	this.obj.setUserData(sid, this.action_param, "true_deleted");
+	        this.obj[this._methods[3]](sid);
+	        delete this._in_progress[marker];
+	        return this.callEvent("onAfterUpdate", [sid, action, tid, btag]);
+	        break;
+	    }
+	    
+	    if (this._in_progress[marker]!="wait"){
+	    	if (correct) this.obj.setUserData(sid, this.action_param,'');
+	    	delete this._in_progress[marker];
+    	} else {
+    		delete this._in_progress[marker];
+    		this.setUpdated(tid,true,this.obj.getUserData(sid,this.action_param));
+		}
+	    
+	    this.callEvent("onAfterUpdate", [sid, action, tid, btag]);
+	},
+
+	/**
+	* 	@desc: response from server
+	*	@param: xml - XMLLoader object with response XML
+	*	@type: private
+	*/
+	afterUpdate:function(that,b,c,d,xml){
+		xml.getXMLTopNode("data"); //fix incorrect content type in IE
+		if (!xml.xmlDoc.responseXML) return;
+		var atag=xml.doXPath("//data/action");
+		for (var i=0; i<atag.length; i++){
+        	var btag=atag[i];
+			var action = btag.getAttribute("type");
+			var sid = btag.getAttribute("sid");
+			var tid = btag.getAttribute("tid");
+			
+			that.afterUpdateCallback(sid,tid,action,btag);
+		}
+		that.finalizeUpdate();
+	},
+	finalizeUpdate:function(){
+		if (this._waitMode) this._waitMode--;
+		
+		if ((this.obj.mytype=="tree" || this.obj._h2) && this.updatedRows.length) 
+			this.sendData();
+		this.callEvent("onAfterUpdateFinish",[]);
+		if (!this.updatedRows.length)
+			this.callEvent("onFullSync",[]);
+	},
+
+
+
+
+	
+	/**
+	* 	@desc: initializes data-processor
+	*	@param: anObj - dhtmlxGrid object to attach this data-processor to
+	*	@type: public
+	*/
+	init:function(anObj){
+		this.obj = anObj;
+		if (this.obj._dp_init) 
+			this.obj._dp_init(this);
+	},
+	
+	
+	setOnAfterUpdate:function(ev){
+		this.attachEvent("onAfterUpdate",ev);
+	},
+	enableDebug:function(mode){
+	},
+	setOnBeforeUpdateHandler:function(func){  
+		this.attachEvent("onBeforeDataSending",func);
+	},
+
+
+
+	/*! starts autoupdate mode
+		@param interval
+			time interval for sending update requests
+	*/
+	setAutoUpdate: function(interval, user) {
+		interval = interval || 2000;
+		
+		this._user = user || (new Date()).valueOf();
+		this._need_update = false;
+		this._loader = null;
+		this._update_busy = false;
+		
+		this.attachEvent("onAfterUpdate",function(sid,action,tid,xml_node){
+			this.afterAutoUpdate(sid, action, tid, xml_node);
+		});
+		this.attachEvent("onFullSync",function(){
+			this.fullSync();
+		});
+		
+		var self = this;
+		window.setInterval(function(){
+			self.loadUpdate();
+		}, interval);
+	},
+
+
+	/*! process updating request answer
+		if status == collision version is depricated
+		set flag for autoupdating immidiatly
+	*/
+	afterAutoUpdate: function(sid, action, tid, xml_node) {
+		if (action == 'collision') {
+			this._need_update = true;
+			return false;
+		} else {
+			return true;
+		}
+	},
+
+
+	/*! callback function for onFillSync event
+		call update function if it's need
+	*/
+	fullSync: function() {
+		if (this._need_update == true) {
+			this._need_update = false;
+			this.loadUpdate();
+		}
+		return true;
+	},
+
+
+	/*! sends query to the server and call callback function
+	*/
+	getUpdates: function(url,callback){
+		if (this._update_busy) 
+			return false;
+		else
+			this._update_busy = true;
+		
+		this._loader = this._loader || new dtmlXMLLoaderObject(true);
+		
+		this._loader.async=true;
+		this._loader.waitCall=callback;
+		this._loader.loadXML(url);
+	},
+
+
+	/*! returns xml node value
+		@param node
+			xml node
+	*/
+	_v: function(node) {
+		if (node.firstChild) return node.firstChild.nodeValue;
+		return "";
+	},
+
+
+	/*! returns values array of xml nodes array
+		@param arr
+			array of xml nodes
+	*/
+	_a: function(arr) {
+		var res = [];
+		for (var i=0; i < arr.length; i++) {
+			res[i]=this._v(arr[i]);
+		};
+		return res;
+	},
+
+
+	/*! loads updates and processes them
+	*/
+	loadUpdate: function(){
+		var self = this;
+		var version = this.obj.getUserData(0,"version");
+		var url = this.serverProcessor+getUrlSymbol(this.serverProcessor)+["dhx_user="+this._user,"dhx_version="+version].join("&");
+		url = url.replace("editing=true&","");
+		this.getUpdates(url, function(){
+			var vers = self._loader.doXPath("//userdata");
+			self.obj.setUserData(0,"version",self._v(vers[0]));
+			
+			var upds = self._loader.doXPath("//update");
+			if (upds.length){
+				self._silent_mode = true;
+				
+				for (var i=0; i<upds.length; i++) {
+					var status = upds[i].getAttribute('status');
+					var id = upds[i].getAttribute('id');
+					var parent = upds[i].getAttribute('parent');
+					switch (status) {
+						case 'inserted':
+							self.callEvent("insertCallback",[upds[i], id, parent]);
+							break;
+						case 'updated':
+							self.callEvent("updateCallback",[upds[i], id, parent]);
+							break;
+						case 'deleted':
+							self.callEvent("deleteCallback",[upds[i], id, parent]);
+							break;
+					}
+				}
+				
+				self._silent_mode = false;
+			}
+			
+			self._update_busy = false;
+			self = null;
+		});
+	}
+
+};
+
+//(c)dhtmlx ltd. www.dhtmlx.com
+dataProcessor.prototype._o_init = dataProcessor.prototype.init;
+dataProcessor.prototype.init=function(obj){
+    this._console=this._console||this._createConsole();
+    this.attachEvent("onValidatationError",function(rowId){
+    	this._log("Validation error for ID="+(rowId||"[multiple]"));
+    	return true;
+	});
+    return this._o_init(obj);
+}
+
+dataProcessor.prototype._createConsole=function(){
+    var c=document.createElement("DIV");
+    c.style.cssText='width:450px; height:420px; overflow:auto; position:absolute; z-index:99999; background-color:white; top:0px; right:0px; border:1px dashed black; font-family:Tahoma; Font-size:10pt;';
+    c.innerHTML="<div style='width:100%; background-color:gray; font-weight:bold; color:white;'><span style='cursor:pointer;float:right;' onclick='this.parentNode.parentNode.style.display=\"none\"'><sup>[close]&nbsp;</sup></span><span style='cursor:pointer;float:right;' onclick='this.parentNode.parentNode.childNodes[2].innerHTML=\"\"'><sup>[clear]&nbsp;</sup></span>&nbsp;DataProcessor</div><div style='width:100%; height:200px; overflow-Y:scroll;'>&nbsp;Current state</div><div style='width:100%; height:200px; overflow-Y:scroll;'>&nbsp;Log:</div>";
+    if (document.body) document.body.insertBefore(c,document.body.firstChild);
+    else dhtmlxEvent(window,"load",function(){
+        document.body.insertBefore(c,document.body.firstChild);
+    })    
+    dhtmlxEvent(window,"dblclick",function(){ 
+        c.style.display='';
+    })    
+    return c;
+}
+
+dataProcessor.prototype._error=function(data){
+	this._log("<span style='color:red'>"+data+"</span>");
+}
+dataProcessor.prototype._log=function(data){
+	var div=document.createElement("DIV");
+	div.innerHTML = data;
+	var parent=this._console.childNodes[2];
+    parent.appendChild(div);
+    parent.scrollTop=parent.scrollHeight;
+    
+    if (window.console && window.console.log)
+    	window.console.log("DataProcessor :: "+data.replace("&nbsp;"," ").replace("<b>","").replace("</b>",""));
+    
+}
+dataProcessor.prototype._updateStat=function(data){
+    var data=["&nbsp;Current state"];
+    for(var i=0;i<this.updatedRows.length;i++)
+	    data.push("&nbsp;ID:"+this.updatedRows[i]+" Status: "+(this.obj.getUserData(this.updatedRows[i],"!nativeeditor_status")||"updated")+", "+(this.is_invalid(this.updatedRows[i])||"valid"))
+	this._console.childNodes[1].innerHTML=data.join("<br/>")+"<hr/>Current mode: "+this.updateMode;
+}
+dataProcessor.prototype.xml_analize=function(xml){
+	if (_isFF){
+		if (!xml.xmlDoc.responseXML)
+			this._error("Not an XML, probably incorrect content type specified ( must be text/xml ), or some text output was started before XML data");
+		else if (xml.xmlDoc.responseXML.firstChild.tagName=="parsererror")
+			this._error(xml.xmlDoc.responseXML.firstChild.textContent);
+		else return true;
+	} else if (_isIE){
+		if (xml.xmlDoc.responseXML.parseError.errorCode)
+			this._error("XML error : "+xml.xmlDoc.responseXML.parseError.reason);
+		else if (!xml.xmlDoc.responseXML.documentElement) 
+			this._error("Not an XML, probably incorrect content type specified ( must be text/xml ), or some text output was started before XML data");
+		else return true;
+	}
+	return false;
+}
+
+dataProcessor.wrap=function(name,before,after){
+	var d=dataProcessor.prototype;
+	if (!d._wrap) d._wrap={};
+	d._wrap[name]=d[name];
+	d[name]=function(){
+		if (before) before.apply(this,arguments);
+		var res=d._wrap[name].apply(this,arguments);
+		if (after) after.apply(this,[arguments,res]);
+		return res;
+	}
+};
+
+dataProcessor.wrap("setUpdated",function(rowId,state,mode){
+	this._log("&nbsp;row <b>"+rowId+"</b> "+(state?"marked":"unmarked")+" ["+(mode||"updated")+","+(this.is_invalid(rowId)||"valid")+"]");
+},function(){
+	this._updateStat();
+});
+
+
+
+dataProcessor.wrap("sendData",function(rowId){
+	if (rowId){
+		this._log("&nbsp;Initiating data sending for <b>"+rowId+"</b>");
+		if (this.obj.mytype=="tree"){
+        	if (!this.obj._idpull[rowId])
+	    		this._log("&nbsp;Error! item with such ID not exists <b>"+rowId+"</b>");
+		} else {
+			if (!this.obj.rowsAr[rowId])
+	        	this._log("&nbsp;Error! row with such ID not exists <b>"+rowId+"</b>");
+        }
+	}
+},function(){
+	
+});
+
+dataProcessor.wrap("sendAllData",function(){
+	this._log("&nbsp;Initiating data sending for <b>all</b> rows ");
+},function(){
+	
+});
+dataProcessor.logSingle=function(data,id){
+	var tdata = {};
+	if (id)
+		tdata[id] = data;
+	else
+		tdata = data;
+		
+	var url = [];
+	for (var key in tdata) {
+		url.push("<fieldset><legend>"+key+"</legend>");
+		var suburl = [];
+		
+		for (var ikey in tdata[key])
+			suburl.push(ikey+" = "+tdata[key][ikey]);
+
+		url.push(suburl.join("<br>"));
+		url.push("</fieldset>");
+	}
+	return url.join("");
+}
+dataProcessor.wrap("_sendData",function(data,rowId){
+	if (rowId)
+		this._log("&nbsp;Sending in one-by-one mode, current ID = "+rowId);
+	else
+		this._log("&nbsp;Sending all data at once");
+	this._log("&nbsp;Server url: "+this.serverProcessor+" <a onclick='this.parentNode.nextSibling.firstChild.style.display=\"block\"' href='#'>parameters</a>");
+	var url = [];
+	this._log("<blockquote style='display:none;'>"+dataProcessor.logSingle(data,rowId)+"<blockquote>");
+},function(){
+	
+});
+
+
+dataProcessor.wrap("afterUpdate",function(that,b,c,d,xml){
+	that._log("&nbsp;Server response received <a onclick='this.nextSibling.style.display=\"block\"' href='#'>details</a><blockquote style='display:none'><code>"+(xml.xmlDoc.responseText||"").replace(/\&/g,"&amp;").replace(/</g,"&lt;").replace(/>/g,"&gt;")+"</code></blockquote>");			
+	if (!that.xml_analize(xml)) return;
+	var atag=xml.doXPath("//data/action");
+	if (!atag){
+		that._log("&nbsp;No actions found");
+		var atag=xml.getXMLTopNode("data");
+		if (!atag) that._log("&nbsp;XML not valid");
+		else that._log("&nbsp;Incorrect content type - need to be text/xml"); 
+	}
+},function(){
+	
+});
+
+dataProcessor.wrap("afterUpdateCallback",function(sid,tid,action){
+	if (this.obj.mytype=="tree"){
+		if (!this.obj._idpull[sid]) this._log("Incorrect SID, item with such ID not exists in grid");
+	} else {
+		if (!this.obj.rowsAr[sid]) this._log("Incorrect SID, row with such ID not exists in grid");
+	}
+	this._log("&nbsp;Action: "+action+" SID:"+sid+" TID:"+tid);
+},function(){
+	
+});
+
+
+
+
+
+
+
+/*
+	dhx_sort[index]=direction
+	dhx_filter[index]=mask
+*/
+if (window.dhtmlXGridObject){
+	dhtmlXGridObject.prototype._init_point_connector=dhtmlXGridObject.prototype._init_point;
+	dhtmlXGridObject.prototype._init_point=function(){
+		var clear_url=function(url){
+			url=url.replace(/(\?|\&)connector[^\f]*/g,"");
+			return url+(url.indexOf("?")!=-1?"&":"?")+"connector=true"+(mygrid.hdr.rows.length > 0 ? "&dhx_no_header=1":"");
+		};
+		var combine_urls=function(url){
+			return clear_url(url)+(this._connector_sorting||"")+(this._connector_filter||"");
+		};
+		var sorting_url=function(url,ind,dir){
+			this._connector_sorting="&dhx_sort["+ind+"]="+dir;
+			return combine_urls.call(this,url);
+		};
+		var filtering_url=function(url,inds,vals){
+			for (var i=0; i<inds.length; i++)
+				inds[i]="dhx_filter["+inds[i]+"]="+encodeURIComponent(vals[i]);
+			this._connector_filter="&"+inds.join("&");
+			return combine_urls.call(this,url);
+		};
+		this.attachEvent("onCollectValues",function(ind){
+			if (this._con_f_used[ind]){
+				if (typeof(this._con_f_used[ind]) == "object")
+					return this._con_f_used[ind];
+				else
+					return false;
+			}
+			return true;
+		});	
+		this.attachEvent("onDynXLS",function(){
+				this.xmlFileUrl=combine_urls.call(this,this.xmlFileUrl);
+				return true;
+		});				
+		this.attachEvent("onBeforeSorting",function(ind,type,dir){
+			if (type=="connector"){
+				var self=this;
+				this.clearAndLoad(sorting_url.call(this,this.xmlFileUrl,ind,dir),function(){
+					self.setSortImgState(true,ind,dir);
+				});
+				return false;
+			}
+			return true;
+		});
+		this.attachEvent("onFilterStart",function(a,b){
+			if (this._con_f_used.length){
+				this.clearAndLoad(filtering_url.call(this,this.xmlFileUrl,a,b));
+				return false;
+			}
+			return true;
+		});
+		this.attachEvent("onXLE",function(a,b,c,xml){
+			if (!xml) return;
+		});
+		
+		if (this._init_point_connector) this._init_point_connector();
+	};
+	dhtmlXGridObject.prototype._con_f_used=[];
+	dhtmlXGridObject.prototype._in_header_connector_text_filter=function(t,i){
+		if (!this._con_f_used[i])
+			this._con_f_used[i]=1;
+		return this._in_header_text_filter(t,i);
+	};
+	dhtmlXGridObject.prototype._in_header_connector_select_filter=function(t,i){
+		if (!this._con_f_used[i])
+			this._con_f_used[i]=2;
+		return this._in_header_select_filter(t,i);
+	};
+	dhtmlXGridObject.prototype.load_connector=dhtmlXGridObject.prototype.load;
+	dhtmlXGridObject.prototype.load=function(url, call, type){
+		if (!this._colls_loaded && this.cellType){
+			var ar=[];
+			for (var i=0; i < this.cellType.length; i++)
+				if (this.cellType[i].indexOf("co")==0 || this._con_f_used[i]==2) ar.push(i);
+			if (ar.length)
+				arguments[0]+=(arguments[0].indexOf("?")!=-1?"&":"?")+"connector=true&dhx_colls="+ar.join(",");
+		}
+		return this.load_connector.apply(this,arguments);
+	};
+	dhtmlXGridObject.prototype._parseHead_connector=dhtmlXGridObject.prototype._parseHead;
+	dhtmlXGridObject.prototype._parseHead=function(url, call, type){
+		this._parseHead_connector.apply(this,arguments);
+		if (!this._colls_loaded){
+			var cols = this.xmlLoader.doXPath("./coll_options", arguments[0]);
+			for (var i=0; i < cols.length; i++){
+				var f = cols[i].getAttribute("for");
+				var v = [];
+				var combo=null;
+				if (this.cellType[f] == "combo")
+					combo = this.getColumnCombo(f);
+				if (this.cellType[f].indexOf("co")==0)
+					combo=this.getCombo(f);
+					
+				var os = this.xmlLoader.doXPath("./item",cols[i]);
+				for (var j=0; j<os.length; j++){
+					var val=os[j].getAttribute("value");
+					
+					if (combo){
+						var lab=os[j].getAttribute("label")||val;
+						
+						if (combo.addOption)
+							combo.addOption([[val, lab]]);
+						else
+							combo.put(val,lab);
+							
+						v[v.length]=lab;
+					} else
+						v[v.length]=val;
+				}
+				if (this._con_f_used[f*1])
+					this._con_f_used[f*1]=v;
+			};
+			this._colls_loaded=true;
+		}
+	};	
+	
+	
+	
+
+}
+
+if (window.dataProcessor){
+	dataProcessor.prototype.init_original=dataProcessor.prototype.init;
+	dataProcessor.prototype.init=function(obj){
+		this.init_original(obj);
+		obj._dataprocessor=this;
+		
+		this.setTransactionMode("POST",true);
+		this.serverProcessor+=(this.serverProcessor.indexOf("?")!=-1?"&":"?")+"editing=true";
+	};
+};
+dhtmlxError.catchError("LoadXML",function(a,b,c){
+	alert(c[0].responseText);
+});
+
+window.dhtmlXScheduler=window.scheduler={version:2.2};
+dhtmlxEventable(scheduler);
+scheduler.init=function(id,date,mode){
+	date=date||(new Date());
+	mode=mode||"week";
+	
+	this._obj=(typeof id == "string")?document.getElementById(id):id;
+	this._els=[];
+	this._scroll=true;
+	this._quirks=(_isIE && document.compatMode == "BackCompat");
+	this._quirks7=(_isIE && navigator.appVersion.indexOf("MSIE 8")==-1);
+	
+	this.get_elements();
+	this.init_templates();
+	this.set_actions();
+	dhtmlxEvent(window,"resize",function(){
+		window.clearTimeout(scheduler._resize_timer);
+		scheduler._resize_timer=window.setTimeout(function(){
+			if (scheduler.callEvent("onSchedulerResize",[]))
+				scheduler.update_view();
+		}, 100);
+	})
+	
+	this.set_sizes();
+	this.setCurrentView(date,mode);
+};
+scheduler.xy={
+	nav_height:22,
+	min_event_height:40,
+	scale_width:50,
+	bar_height:20,
+	scroll_width:18,
+	scale_height:20,
+	month_scale_height:20,
+	menu_width:25,
+	margin_top:0,
+	margin_left:0,
+	editor_width:140
+};
+scheduler.keys={
+	edit_save:13,
+	edit_cancel:27
+};
+scheduler.set_sizes=function(){
+	var w = this._x = this._obj.clientWidth-this.xy.margin_left;
+	var h = this._y = this._obj.clientHeight-this.xy.margin_top;
+	
+	//not-table mode always has scroll - need to be fixed in future
+	var scale_x=this._table_view?0:(this.xy.scale_width+this.xy.scroll_width);
+	var scale_s=this._table_view?-1:this.xy.scale_width;
+	
+	this.set_xy(this._els["dhx_cal_navline"][0],w,this.xy.nav_height,0,0);
+	this.set_xy(this._els["dhx_cal_header"][0],w-scale_x,this.xy.scale_height,scale_s,this.xy.nav_height+(this._quirks?-1:1));
+	//to support alter-skin, we need a way to alter height directly from css
+	var actual_height = this._els["dhx_cal_navline"][0].offsetHeight;
+	if (actual_height > 0) this.xy.nav_height = actual_height;
+	
+	var data_y=this.xy.scale_height+this.xy.nav_height+(this._quirks?-2:0);
+	this.set_xy(this._els["dhx_cal_data"][0],w,h-(data_y+2),0,data_y+2);
+}
+scheduler.set_xy=function(node,w,h,x,y){
+	node.style.width=Math.max(0,w)+"px";
+	node.style.height=Math.max(0,h)+"px";
+	if (arguments.length>3){
+		node.style.left=x+"px";
+		node.style.top=y+"px";	
+	}
+}
+scheduler.get_elements=function(){
+	//get all child elements as named hash
+	var els=this._obj.getElementsByTagName("DIV");
+	for (var i=0; i < els.length; i++){
+		var name=els[i].className;
+		if (!this._els[name]) this._els[name]=[];
+		this._els[name].push(els[i]);
+		
+		//check if name need to be changed
+		var t=scheduler.locale.labels[els[i].getAttribute("name")||name];
+		if (t) els[i].innerHTML=t;
+	}
+}
+scheduler.set_actions=function(){
+	for (var a in this._els)
+		if (this._click[a])
+			for (var i=0; i < this._els[a].length; i++)
+				this._els[a][i].onclick=scheduler._click[a];
+	this._obj.onselectstart=function(e){ return false; }
+	this._obj.onmousemove=function(e){
+		scheduler._on_mouse_move(e||event);
+	}
+	this._obj.onmousedown=function(e){
+		scheduler._on_mouse_down(e||event);
+	}
+	this._obj.onmouseup=function(e){
+		scheduler._on_mouse_up(e||event);
+	}
+	this._obj.ondblclick=function(e){
+		scheduler._on_dbl_click(e||event);
+	}
+}
+scheduler.select=function(id){
+	if (this._table_view || !this.getEvent(id)._timed) return; //temporary block
+	if (this._select_id==id) return;
+	this.editStop(false);
+	this.unselect();
+	this._select_id = id;
+	this.updateEvent(id);
+}
+scheduler.unselect=function(id){
+	if (id && id!=this._select_id) return;
+	var t=this._select_id;
+	this._select_id = null;
+	if (t) this.updateEvent(t);
+}
+scheduler.getState=function(){
+	return {
+		mode: this._mode,
+		date: this._date,
+		min_date: this._min_date,
+		max_date: this._max_date,
+		editor_id: this._edit_id,
+		lightbox_id: this._lightbox_id
+	};
+}
+scheduler._click={
+	dhx_cal_data:function(e){
+		var trg = e?e.target:event.srcElement;
+		var id = scheduler._locate_event(trg);
+		
+		e = e || event;
+		if ((id && !scheduler.callEvent("onClick",[id,e])) ||scheduler.config.readonly) return;
+		
+		if (id) {		
+			scheduler.select(id);
+			var mask = trg.className;
+			if (mask.indexOf("_icon")!=-1)
+				scheduler._click.buttons[mask.split(" ")[1].replace("icon_","")](id);
+		} else
+			scheduler._close_not_saved();
+	},
+	dhx_cal_prev_button:function(){
+		scheduler._click.dhx_cal_next_button(0,-1);
+	},
+	dhx_cal_next_button:function(dummy,step){
+		scheduler.setCurrentView(scheduler.date.add( //next line changes scheduler._date , but seems it has not side-effects
+			scheduler.date[scheduler._mode+"_start"](scheduler._date),(step||1),scheduler._mode));
+	},
+	dhx_cal_today_button:function(){
+		scheduler.setCurrentView(new Date());
+	},
+	dhx_cal_tab:function(){
+		var mode = this.getAttribute("name").split("_")[0];
+		scheduler.setCurrentView(scheduler._date,mode);
+	},
+	buttons:{
+		"delete":function(id){ var c=scheduler.locale.labels.confirm_deleting; if (!c||confirm(c)) scheduler.deleteEvent(id); },
+		edit:function(id){ scheduler.edit(id); },
+		save:function(id){ scheduler.editStop(true); },
+		details:function(id){ scheduler.showLightbox(id); },
+		cancel:function(id){ scheduler.editStop(false); }
+	}
+}
+
+scheduler.addEventNow=function(start,end,e){
+	var base = {};
+	if (typeof start == "object"){
+		base = start;
+		start = null;
+	}
+	
+	var d = (this.config.event_duration||this.config.time_step)*60000;
+	if (!start) start = Math.round((new Date()).valueOf()/d)*d;
+	var start_date = new Date(start);
+	if (!end){
+		var start_hour = this.config.first_hour;
+		if (start_hour > start_date.getHours()){
+			start_date.setHours(start_hour);
+			start = start_date.valueOf();
+		}
+		end = start+d;
+	}
+	
+	
+	base.start_date = base.start_date||start_date;
+	base.end_date =  base.end_date||new Date(end);
+	base.text = base.text||this.locale.labels.new_event;
+	base.id = this._drag_id = this.uid();
+	this._drag_mode="new-size";
+	
+	this._loading=true;
+	this.addEvent(base);
+	this.callEvent("onEventCreated",[this._drag_id,e]);
+	this._loading=false;
+	
+	this._drag_event={}; //dummy , to trigger correct event updating logic
+	this._on_mouse_up(e);	
+}
+scheduler._on_dbl_click=function(e,src){
+	src = src||(e.target||e.srcElement);
+	if (this.config.readonly) return;
+	var name = src.className.split(" ")[0];
+	switch(name){
+		case "dhx_scale_holder":
+		case "dhx_scale_holder_now":
+		case "dhx_month_body":
+			if (!scheduler.config.dblclick_create) break;
+			var pos=this._mouse_coords(e);
+			var start=this._min_date.valueOf()+(pos.y*this.config.time_step+(this._table_view?0:pos.x)*24*60)*60000;
+			start = this._correct_shift(start);
+			this.addEventNow(start,null,e);
+			break;
+		case "dhx_body":
+		case "dhx_cal_event_line":
+		case "dhx_cal_event_clear":
+			var id = this._locate_event(src);
+			if (!this.callEvent("onDblClick",[id,e])) return;
+			if (this.config.details_on_dblclick || this._table_view || !this.getEvent(id)._timed)
+				this.showLightbox(id);
+			else
+				this.edit(id);
+			break;
+		case "":
+			if (src.parentNode)
+				return scheduler._on_dbl_click(e,src.parentNode);			
+		default:
+			var t = this["dblclick_"+name];
+			if (t) t.call(this,e);
+			break;
+	}
+}
+
+scheduler._mouse_coords=function(ev){
+	var pos;
+	var b=document.body;
+	var d = document.documentElement;
+	if(ev.pageX || ev.pageY)
+	    pos={x:ev.pageX, y:ev.pageY};
+	else pos={
+	    x:ev.clientX + (b.scrollLeft||d.scrollLeft||0) - b.clientLeft,
+	    y:ev.clientY + (b.scrollTop||d.scrollTop||0) - b.clientTop
+	}
+
+	//apply layout
+	pos.x-=getAbsoluteLeft(this._obj)+(this._table_view?0:this.xy.scale_width);
+	pos.y-=getAbsoluteTop(this._obj)+this.xy.nav_height+(this._dy_shift||0)+this.xy.scale_height-this._els["dhx_cal_data"][0].scrollTop;
+	pos.ev = ev;
+	
+	var handler = this["mouse_"+this._mode];
+	if (handler)
+		return handler.call(this,pos);
+		
+	//transform to date
+	if (!this._table_view){
+		pos.x=Math.max(0,Math.ceil(pos.x/this._cols[0])-1);
+		pos.y=Math.max(0,Math.ceil(pos.y*60/(this.config.time_step*this.config.hour_size_px))-1)+this.config.first_hour*(60/this.config.time_step);
+	} else {
+		var dy=0;
+		for (dy=1; dy < this._colsS.heights.length; dy++)
+			if (this._colsS.heights[dy]>pos.y) break;
+
+		pos.y=(Math.max(0,Math.ceil(pos.x/this._cols[0])-1)+Math.max(0,dy-1)*7)*24*60/this.config.time_step; 
+		pos.x=0;
+	}
+
+	return pos;
+}
+scheduler._close_not_saved=function(){
+	if (new Date().valueOf()-(scheduler._new_event||0) > 500 && scheduler._edit_id){
+		var c=scheduler.locale.labels.confirm_closing;
+		if (!c || confirm(c))
+			scheduler.editStop(scheduler.config.positive_closing);
+	}
+}
+scheduler._correct_shift=function(start, back){
+	return start-=((new Date(scheduler._min_date)).getTimezoneOffset()-(new Date(start)).getTimezoneOffset())*60000*(back?-1:1);	
+}
+scheduler._on_mouse_move=function(e){
+	if (this._drag_mode){
+		var pos=this._mouse_coords(e);
+		if (!this._drag_pos || this._drag_pos.x!=pos.x || this._drag_pos.y!=pos.y){
+			
+			if (this._edit_id!=this._drag_id)
+				this._close_not_saved();
+				
+			this._drag_pos=pos;
+			
+			if (this._drag_mode=="create"){
+				this._close_not_saved();
+				this._loading=true; //will be ignored by dataprocessor
+				
+				var start=this._min_date.valueOf()+(pos.y*this.config.time_step+(this._table_view?0:pos.x)*24*60)*60000;
+				//if (this._mode != "week" && this._mode != "day")
+				start = this._correct_shift(start);
+				
+				if (!this._drag_start){
+					this._drag_start=start; return; 
+				}
+				var end = start;
+				if (end==this._drag_start) return;
+				
+				this._drag_id=this.uid();
+				this.addEvent(new Date(this._drag_start), new Date(end),this.locale.labels.new_event,this._drag_id, pos.fields);
+				
+				this.callEvent("onEventCreated",[this._drag_id,e]);
+				this._loading=false;
+				this._drag_mode="new-size";
+				
+			} 
+
+			var ev=this.getEvent(this._drag_id);
+			var start,end;
+			if (this._drag_mode=="move"){
+				start = this._min_date.valueOf()+(pos.y*this.config.time_step+pos.x*24*60)*60000;
+				if (!pos.custom && this._table_view) start+=this.date.time_part(ev.start_date)*1000;
+				start = this._correct_shift(start);
+				end = ev.end_date.valueOf()-(ev.start_date.valueOf()-start);
+			} else {
+				start = ev.start_date.valueOf();
+				if (this._table_view)
+					end = this._min_date.valueOf()+pos.y*this.config.time_step*60000 + (pos.custom?0:24*60*60000);
+				else{
+					end = this.date.date_part(new Date(ev.end_date)).valueOf()+pos.y*this.config.time_step*60000;
+					this._els["dhx_cal_data"][0].style.cursor="s-resize";
+					if (this._mode == "week" || this._mode == "day")
+						end = this._correct_shift(end);
+				}
+				if (this._drag_mode == "new-size"){ 
+					if (end <= this._drag_start){
+						var shift = pos.shift||((this._table_view && !pos.custom)?24*60*60000:0);
+						start = end-shift;
+						end = this._drag_start+(shift||(this.config.time_step*60000));
+					} else {
+						start = this._drag_start;
+					}
+					
+				} else if (end<=start) 
+					end=start+this.config.time_step*60000;
+			}
+			var new_end = new Date(end-1);			
+			var new_start = new Date(start);
+			//prevent out-of-borders situation for day|week view
+			if (this._table_view || (new_end.getDate()==new_start.getDate() && new_end.getHours()<this.config.last_hour)){
+				ev.start_date=new_start;
+				ev.end_date=new Date(end);
+				if (this.config.update_render)
+					this.update_view();
+				else
+					this.updateEvent(this._drag_id);
+			}
+			if (this._table_view)
+				this.for_rendered(this._drag_id,function(r){
+					r.className+=" dhx_in_move";
+				})
+		}
+	}  else {
+		if (scheduler.checkEvent("onMouseMove")){
+			var id = this._locate_event(e.target||e.srcElement);
+			this.callEvent("onMouseMove",[id,e]);
+		}
+	}
+}
+scheduler._on_mouse_context=function(e,src){
+	return this.callEvent("onContextMenu",[this._locate_event(src),e]);
+}
+scheduler._on_mouse_down=function(e,src){
+	if (this.config.readonly || this._drag_mode) return;
+	src = src||(e.target||e.srcElement);
+	if (e.button==2||e.ctrlKey) return this._on_mouse_context(e,src);
+		switch(src.className.split(" ")[0]){
+		case "dhx_cal_event_line":
+		case "dhx_cal_event_clear":
+			if (this._table_view)
+				this._drag_mode="move"; //item in table mode
+			break;
+		case "dhx_header":
+		case "dhx_title":
+			this._drag_mode="move"; //item in table mode
+			break;
+		case "dhx_footer":
+			this._drag_mode="resize"; //item in table mode
+			break;
+		case "dhx_scale_holder":
+		case "dhx_scale_holder_now":
+		case "dhx_month_body":
+		case "dhx_matrix_cell":
+			this._drag_mode="create";
+			break;
+		case "":
+			if (src.parentNode)
+				return scheduler._on_mouse_down(e,src.parentNode);
+		default:
+			this._drag_mode=null;
+			this._drag_id=null;
+	}
+	if (this._drag_mode){
+		var id = this._locate_event(src);
+		if (!this.config["drag_"+this._drag_mode] || !this.callEvent("onBeforeDrag",[id, this._drag_mode, e]))
+			this._drag_mode=this._drag_id=0;
+		else {
+			this._drag_id= id;
+			this._drag_event=this._copy_event(this.getEvent(this._drag_id)||{});
+		}
+	}
+	this._drag_start=null;
+}
+scheduler._on_mouse_up=function(e){
+	if (this._drag_mode && this._drag_id){
+		this._els["dhx_cal_data"][0].style.cursor="default";
+		//drop
+		var ev=this.getEvent(this._drag_id);
+		if (this._drag_event._dhx_changed || !this._drag_event.start_date || ev.start_date.valueOf()!=this._drag_event.start_date.valueOf() || ev.end_date.valueOf()!=this._drag_event.end_date.valueOf()){
+			var is_new=(this._drag_mode=="new-size");
+			if (!this.callEvent("onBeforeEventChanged",[ev,e,is_new])){
+				if (is_new) 
+					this.deleteEvent(ev.id, true);
+				else {
+					ev.start_date = this._drag_event.start_date;
+					ev.end_date = this._drag_event.end_date;
+					this.updateEvent(ev.id);
+				}
+			} else {
+				if (is_new && this.config.edit_on_create){
+					this.unselect();
+					this._new_event=new Date();//timestamp of creation
+					if (this._table_view || this.config.details_on_create) {
+						this._drag_mode=null;
+						return this.showLightbox(this._drag_id);
+					}
+					this._drag_pos=true; //set flag to trigger full redraw
+					this._select_id=this._edit_id=this._drag_id;
+				} else if (!this._new_event)
+					this.callEvent(is_new?"onEventAdded":"onEventChanged",[this._drag_id,this.getEvent(this._drag_id)]);
+			}
+		}
+		if (this._drag_pos) this.render_view_data(); //redraw even if there is no real changes - necessary for correct positioning item after drag
+	}
+	this._drag_mode=null;
+	this._drag_pos=null;
+}	
+scheduler.update_view=function(){
+	//this.set_sizes();
+	this._reset_scale();
+	if (this._load_mode && this._load()) return this._render_wait = true;
+	this.render_view_data();
+}
+scheduler.setCurrentView=function(date,mode){
+	
+	if (!this.callEvent("onBeforeViewChange",[this._mode,this._date,mode,date])) return;
+	//hide old custom view
+	if (this[this._mode+"_view"] && mode && this._mode!=mode)
+		this[this._mode+"_view"](false);
+		
+	this._close_not_saved();
+	
+	this._mode=mode||this._mode;
+	this._date=date;
+	this._table_view=(this._mode=="month");
+	
+	var tabs=this._els["dhx_cal_tab"];
+	for (var i=0; i < tabs.length; i++) {
+		tabs[i].className="dhx_cal_tab"+((tabs[i].getAttribute("name")==this._mode+"_tab")?" active":"");
+	};
+	
+	//show new view
+	var view=this[this._mode+"_view"];
+	view?view(true):this.update_view();
+	
+	this.callEvent("onViewChange",[this._mode,this._date]);
+}
+scheduler._render_x_header = function(i,left,d,h){
+	//header scale	
+	var head=document.createElement("DIV"); head.className="dhx_scale_bar";
+	this.set_xy(head,this._cols[i]-1,this.xy.scale_height-2,left,0);//-1 for border
+	head.innerHTML=this.templates[this._mode+"_scale_date"](d,this._mode); //TODO - move in separate method
+	h.appendChild(head);
+}
+scheduler._reset_scale=function(){
+	//current mode doesn't support scales
+	//we mustn't call reset_scale for such modes, so it just to be sure
+	if (!this.templates[this._mode+"_date"]) return;
+	
+	var h=this._els["dhx_cal_header"][0];
+	var b=this._els["dhx_cal_data"][0];
+	var c = this.config;
+	
+	h.innerHTML="";
+	b.scrollTop=0; //fix flickering in FF
+	b.innerHTML="";
+	
+	
+	var str=((c.readonly||(!c.drag_resize))?" dhx_resize_denied":"")+((c.readonly||(!c.drag_move))?" dhx_move_denied":"");
+	if (str) b.className = "dhx_cal_data"+str;
+		
+		
+	this._cols=[];	//store for data section
+	this._colsS={height:0};
+	this._dy_shift=0;
+	
+	this.set_sizes();
+	var summ=parseInt(h.style.width); //border delta
+	var left=0;
+	
+	var d,dd,sd,today;
+	dd=this.date[this._mode+"_start"](new Date(this._date.valueOf()));
+	d=sd=this._table_view?scheduler.date.week_start(dd):dd;
+	today=this.date.date_part(new Date());
+	
+	//reset date in header
+	var ed=scheduler.date.add(dd,1,this._mode);
+	var count = 7;
+	
+	if (!this._table_view){
+		var count_n = this.date["get_"+this._mode+"_end"];
+		if (count_n) ed = count_n(dd);
+		count = Math.round((ed.valueOf()-dd.valueOf())/(1000*60*60*24));
+	}
+	
+	this._min_date=d;
+	this._els["dhx_cal_date"][0].innerHTML=this.templates[this._mode+"_date"](dd,ed,this._mode);
+	
+	
+	for (var i=0; i<count; i++){
+		this._cols[i]=Math.floor(summ/(count-i));
+	
+		this._render_x_header(i,left,d,h);
+		if (!this._table_view){
+			var scales=document.createElement("DIV");
+			var cls = "dhx_scale_holder"
+			if (d.valueOf()==today.valueOf()) cls = "dhx_scale_holder_now";
+			scales.className=cls+" "+this.templates.week_date_class(d,today);
+			this.set_xy(scales,this._cols[i]-1,c.hour_size_px*(c.last_hour-c.first_hour),left+this.xy.scale_width+1,0);//-1 for border
+			b.appendChild(scales);
+		}
+		
+		d=this.date.add(d,1,"day")
+		summ-=this._cols[i];
+		left+=this._cols[i];
+		this._colsS[i]=(this._cols[i-1]||0)+(this._colsS[i-1]||(this._table_view?0:this.xy.scale_width+2));
+	}
+	this._max_date=d;
+	this._colsS[count]=this._cols[count-1]+this._colsS[count-1];
+	
+	if (this._table_view)
+		this._reset_month_scale(b,dd,sd);
+	else{
+		this._reset_hours_scale(b,dd,sd);
+		if (c.multi_day){
+			var c1 = document.createElement("DIV");
+			c1.className="dhx_multi_day";
+			c1.style.visibility="hidden";
+			this.set_xy(c1,parseInt(h.style.width),0,this.xy.scale_width,0);
+			b.appendChild(c1);
+			var c2 = c1.cloneNode(true);
+			c2.className="dhx_multi_day_icon";
+			c2.style.visibility="hidden";
+			this.set_xy(c2,this.xy.scale_width-1,0,0,0);
+			b.appendChild(c2);
+			
+			this._els["dhx_multi_day"]=[c1,c2];
+		}
+	}
+}
+scheduler._reset_hours_scale=function(b,dd,sd){
+	var c=document.createElement("DIV");
+	c.className="dhx_scale_holder";
+	
+	var date = new Date(1980,1,1,this.config.first_hour,0,0);
+	for (var i=this.config.first_hour*1; i < this.config.last_hour; i++) {
+		var cc=document.createElement("DIV");
+		cc.className="dhx_scale_hour";
+		cc.style.height=this.config.hour_size_px-(this._quirks?0:1)+"px";
+		cc.style.width=this.xy.scale_width+"px";
+		cc.innerHTML=scheduler.templates.hour_scale(date);
+		
+		c.appendChild(cc);
+		date=this.date.add(date,1,"hour");
+	};
+	b.appendChild(c);
+	if (this.config.scroll_hour)
+		b.scrollTop = this.config.hour_size_px*(this.config.scroll_hour-this.config.first_hour);
+}
+scheduler._reset_month_scale=function(b,dd,sd){
+	var ed=scheduler.date.add(dd,1,"month");
+	
+	//trim time part for comparation reasons
+	var cd=new Date();
+	this.date.date_part(cd);
+	this.date.date_part(sd);
+	
+	var rows=Math.ceil((ed.valueOf()-sd.valueOf())/(60*60*24*1000*7));
+	var tdcss=[];
+	var height=(Math.floor(b.clientHeight/rows)-22);
+	
+	this._colsS.height=height+22;
+	var h = this._colsS.heights = [];
+	for (var i=0; i<=7; i++)
+		tdcss[i]=" style='height:"+height+"px; width:"+((this._cols[i]||0)-1)+"px;' "
+
+	
+	
+	var cellheight = 0;
+	this._min_date=sd;
+	var html="<table cellpadding='0' cellspacing='0'>";
+	for (var i=0; i<rows; i++){
+		html+="<tr>";
+			for (var j=0; j<7; j++){
+				html+="<td";
+				var cls = "";
+				if (sd<dd)
+					cls='dhx_before';
+				else if (sd>=ed)
+					cls='dhx_after';
+				else if (sd.valueOf()==cd.valueOf())
+					cls='dhx_now';
+				html+=" class='"+cls+" "+this.templates.month_date_class(sd,cd)+"' ";
+				html+="><div class='dhx_month_head'>"+this.templates.month_day(sd)+"</div><div class='dhx_month_body' "+tdcss[j]+"></div></td>"
+				sd=this.date.add(sd,1,"day");
+			}
+		html+="</tr>";
+		h[i] = cellheight;
+		cellheight+=this._colsS.height;
+	}
+	html+="</table>";
+	this._max_date=sd;
+	
+	b.innerHTML=html;	
+	return sd;
+}
+scheduler.getLabel = function(property, key) {
+	var sections = this.config.lightbox.sections;
+	for (var i=0; i<sections.length; i++) {
+		if(sections[i].map_to == property) {
+			var options = sections[i].options;
+			for (var j=0; j<options.length; j++) {
+				if(options[j].key == key) {
+					return options[j].label;
+				}
+			}
+		}
+	}
+	return "";
+};
+scheduler.date={
+	date_part:function(date){
+		date.setHours(0);
+		date.setMinutes(0);
+		date.setSeconds(0);
+		date.setMilliseconds(0);	
+		return date;
+	},
+	time_part:function(date){
+		return (date.valueOf()/1000 - date.getTimezoneOffset()*60)%86400;
+	},
+	week_start:function(date){
+			var shift=date.getDay();
+			if (scheduler.config.start_on_monday){
+				if (shift==0) shift=6
+				else shift--;
+			}
+			return this.date_part(this.add(date,-1*shift,"day"));
+	},
+	month_start:function(date){
+		date.setDate(1);
+		return this.date_part(date);
+	},
+	year_start:function(date){
+		date.setMonth(0);
+		return this.month_start(date);
+	},
+	day_start:function(date){
+			return this.date_part(date);
+	},
+	add:function(date,inc,mode){
+		var ndate=new Date(date.valueOf());
+		switch(mode){
+			case "day": ndate.setDate(ndate.getDate()+inc); break;
+			case "week": ndate.setDate(ndate.getDate()+7*inc); break;
+			case "month": ndate.setMonth(ndate.getMonth()+inc); break;
+			case "year": ndate.setYear(ndate.getFullYear()+inc); break;
+			case "hour": ndate.setHours(ndate.getHours()+inc); break;
+			case "minute": ndate.setMinutes(ndate.getMinutes()+inc); break;
+			default:
+				return scheduler.date["add_"+mode](date,inc,mode);
+		}
+		return ndate;
+	},
+	to_fixed:function(num){
+		if (num<10)	return "0"+num;
+		return num;
+	},
+	copy:function(date){
+		return new Date(date.valueOf());
+	},
+	date_to_str:function(format,utc){
+		format=format.replace(/%[a-zA-Z]/g,function(a){
+			switch(a){
+				case "%d": return "\"+scheduler.date.to_fixed(date.getDate())+\"";
+				case "%m": return "\"+scheduler.date.to_fixed((date.getMonth()+1))+\"";
+				case "%j": return "\"+date.getDate()+\"";
+				case "%n": return "\"+(date.getMonth()+1)+\"";
+				case "%y": return "\"+scheduler.date.to_fixed(date.getFullYear()%100)+\""; 
+				case "%Y": return "\"+date.getFullYear()+\"";
+				case "%D": return "\"+scheduler.locale.date.day_short[date.getDay()]+\"";
+				case "%l": return "\"+scheduler.locale.date.day_full[date.getDay()]+\"";
+				case "%M": return "\"+scheduler.locale.date.month_short[date.getMonth()]+\"";
+				case "%F": return "\"+scheduler.locale.date.month_full[date.getMonth()]+\"";
+				case "%h": return "\"+scheduler.date.to_fixed((date.getHours()+11)%12+1)+\"";
+				case "%g": return "\"+((date.getHours()+11)%12+1)+\"";
+				case "%G": return "\"+date.getHours()+\"";
+				case "%H": return "\"+scheduler.date.to_fixed(date.getHours())+\"";
+				case "%i": return "\"+scheduler.date.to_fixed(date.getMinutes())+\"";
+				case "%a": return "\"+(date.getHours()>11?\"pm\":\"am\")+\"";
+				case "%A": return "\"+(date.getHours()>11?\"PM\":\"AM\")+\"";
+				case "%s": return "\"+scheduler.date.to_fixed(date.getSeconds())+\"";
+				case "%W": return "\"+scheduler.date.to_fixed(scheduler.date.getISOWeek(date))+\"";
+				default: return a;
+			}
+		})
+		if (utc) format=format.replace(/date\.get/g,"date.getUTC");
+		return new Function("date","return \""+format+"\";");
+	},
+	str_to_date:function(format,utc){
+		var splt="var temp=date.split(/[^0-9a-zA-Z]+/g);";
+		var mask=format.match(/%[a-zA-Z]/g);
+		for (var i=0; i<mask.length; i++){
+			switch(mask[i]){
+				case "%j":
+				case "%d": splt+="set[2]=temp["+i+"]||1;";
+					break;
+				case "%n":
+				case "%m": splt+="set[1]=(temp["+i+"]||1)-1;";
+					break;
+				case "%y": splt+="set[0]=temp["+i+"]*1+(temp["+i+"]>50?1900:2000);";
+					break;
+				case "%g":
+				case "%G":
+				case "%h": 
+				case "%H":
+							splt+="set[3]=temp["+i+"]||0;";
+					break;
+				case "%i":
+							splt+="set[4]=temp["+i+"]||0;";
+					break;
+				case "%Y":  splt+="set[0]=temp["+i+"]||0;";
+					break;
+				case "%a":					
+				case "%A":  splt+="set[3]=set[3]%12+((temp["+i+"]||'').toLowerCase()=='am'?0:12);";
+					break;					
+				case "%s":  splt+="set[5]=temp["+i+"]||0;";
+					break;
+			}
+		}
+		var code ="set[0],set[1],set[2],set[3],set[4],set[5]";
+		if (utc) code =" Date.UTC("+code+")";
+		return new Function("date","var set=[0,0,1,0,0,0]; "+splt+" return new Date("+code+");");
+	},
+		
+	getISOWeek: function(ndate) {
+		if(!ndate) return false;
+		var nday = ndate.getDay();
+		if (nday == 0) {
+			nday = 7;
+		}
+		var first_thursday = new Date(ndate.valueOf());
+		first_thursday.setDate(ndate.getDate() + (4 - nday));
+		var year_number = first_thursday.getFullYear(); // year of the first Thursday
+		var ordinal_date = Math.floor( (first_thursday.getTime() - new Date(year_number, 0, 1).getTime()) / 86400000); //ordinal date of the first Thursday - 1 (so not really ordinal date)
+		var week_number = 1 + Math.floor( ordinal_date / 7);	
+		return week_number;
+	},
+	
+	getUTCISOWeek: function(ndate){
+   	return this.getISOWeek(ndate);
+   }
+}
+
+scheduler.locale={
+	date:{
+		month_full:["January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December"],
+		month_short:["Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"],
+		day_full:["Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday"],
+    	day_short:["Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"]
+    },
+    labels:{
+    	dhx_cal_today_button:"Today",
+    	day_tab:"Day",
+    	week_tab:"Week",
+    	month_tab:"Month",
+    	new_event:"New event",
+		icon_save:"Save",
+		icon_cancel:"Cancel",
+		icon_details:"Details",
+		icon_edit:"Edit",
+		icon_delete:"Delete",
+		confirm_closing:"",//Your changes will be lost, are your sure ?
+		confirm_deleting:"Event will be deleted permanently, are you sure?",
+		section_description:"Description",
+		section_time:"Time period",
+		full_day:"Full day",
+		
+		/*recurring events*/
+		confirm_recurring:"Do you want to edit the whole set of repeated events?",
+		section_recurring:"Repeat event",
+		button_recurring:"Disabled",
+		button_recurring_open:"Enabled",
+		
+		/*agenda view extension*/
+		agenda_tab:"Agenda",
+		date:"Date",
+		description:"Description",
+		
+		/*year view extension*/
+		year_tab:"Year"
+    }
+}
+
+
+/*
+%e	Day of the month without leading zeros (01..31)
+%d	Day of the month, 2 digits with leading zeros (01..31)
+%j	Day of the year, 3 digits with leading zeros (001..366)
+%a	A textual representation of a day, two letters
+%W	A full textual representation of the day of the week
+
+%c	Numeric representation of a month, without leading zeros (0..12)
+%m	Numeric representation of a month, with leading zeros (00..12)
+%b	A short textual representation of a month, three letters (Jan..Dec)
+%M	A full textual representation of a month, such as January or March (January..December)
+
+%y	A two digit representation of a year (93..03)
+%Y	A full numeric representation of a year, 4 digits (1993..03)
+*/
+
+scheduler.config={
+	default_date: "%j %M %Y",
+	month_date: "%F %Y",
+	load_date: "%Y-%m-%d",
+	week_date: "%l",
+	day_date: "%D, %F %j",
+	hour_date: "%H:%i",
+	month_day : "%d",
+	xml_date:"%m/%d/%Y %H:%i",
+	api_date:"%d-%m-%Y %H:%i",
+
+	hour_size_px:42,
+	time_step:5,
+
+	start_on_monday:1,
+	first_hour:0,
+	last_hour:24,
+	readonly:false,
+	drag_resize:1,
+	drag_move:1,
+	drag_create:1,
+	dblclick_create:1,
+	edit_on_create:1,
+	details_on_create:0,
+	click_form_details:0,
+	
+	server_utc:false,
+
+	positive_closing:false,
+
+	icons_edit:["icon_save","icon_cancel"],
+	icons_select:["icon_details","icon_edit","icon_delete"],
+	
+	lightbox:{
+		sections:[	{name:"description", height:200, map_to:"text", type:"textarea" , focus:true},
+					{name:"time", height:72, type:"time", map_to:"auto"}	]
+	}
+};
+scheduler.templates={}
+scheduler.init_templates=function(){
+	var d=scheduler.date.date_to_str;
+	var c=scheduler.config;
+	var f = function(a,b){
+		for (var c in b)
+			if (!a[c]) a[c]=b[c];
+	}
+	f(scheduler.templates,{
+		day_date:d(c.default_date),
+		month_date:d(c.month_date),
+		week_date:function(d1,d2){
+			return scheduler.templates.day_date(d1)+" &ndash; "+scheduler.templates.day_date(scheduler.date.add(d2,-1,"day"));
+		},
+		day_scale_date:d(c.default_date),
+		month_scale_date:d(c.week_date),
+		week_scale_date:d(c.day_date),
+		hour_scale:d(c.hour_date),
+		time_picker:d(c.hour_date),
+		event_date:d(c.hour_date),
+		month_day:d(c.month_day),
+		xml_date:scheduler.date.str_to_date(c.xml_date,c.server_utc),
+		load_format:d(c.load_date,c.server_utc),
+		xml_format:d(c.xml_date,c.server_utc),
+		api_date:scheduler.date.str_to_date(c.api_date),
+		event_header:function(start,end,ev){
+			return scheduler.templates.event_date(start)+" - "+scheduler.templates.event_date(end);
+		},
+		event_text:function(start,end,ev){
+			return ev.text;
+		},
+		event_class:function(start,end,ev){
+			return "";
+		},
+		month_date_class:function(d){
+			return "";
+		},
+		week_date_class:function(d){
+			return "";
+		},
+		event_bar_date:function(start,end,ev){
+			return scheduler.templates.event_date(start)+" ";
+		},
+		event_bar_text:function(start,end,ev){
+			return ev.text;
+		}
+	});
+	this.callEvent("onTemplatesReady",[])
+}
+
+
+
+scheduler.uid=function(){
+	if (!this._seed) this._seed=(new Date).valueOf();
+	return this._seed++;
+};
+scheduler._events={};
+scheduler.clearAll=function(){
+	this._events={};
+	this._loaded={};
+	this.clear_view();
+};
+scheduler.addEvent=function(start_date,end_date,text,id,extra_data){
+	var ev=start_date;
+	if (arguments.length!=1){
+		ev=extra_data||{};
+		ev.start_date=start_date;
+		ev.end_date=end_date;
+		ev.text=text;
+		ev.id=id;
+	};
+	ev.id = ev.id||scheduler.uid();
+	ev.text = ev.text||"";
+	
+	if (typeof ev.start_date == "string")  ev.start_date=this.templates.api_date(ev.start_date);
+	if (typeof ev.end_date == "string")  ev.end_date=this.templates.api_date(ev.end_date);
+	ev._timed=this.is_one_day_event(ev);
+
+	var is_new=!this._events[ev.id];
+	this._events[ev.id]=ev;
+	this.event_updated(ev);
+	if (!this._loading)
+		this.callEvent(is_new?"onEventAdded":"onEventChanged",[ev.id,ev]);
+};
+scheduler.deleteEvent=function(id,silent){ 
+	var ev=this._events[id];
+	if (!silent && !this.callEvent("onBeforeEventDelete",[id,ev])) return;
+	
+	if (ev){
+		delete this._events[id];
+		this.unselect(id);
+		this.event_updated(ev);
+	}
+};
+scheduler.getEvent=function(id){
+	return this._events[id];
+};
+scheduler.setEvent=function(id,hash){
+	this._events[id]=hash;
+};
+scheduler.for_rendered=function(id,method){
+	for (var i=this._rendered.length-1; i>=0; i--)
+		if (this._rendered[i].getAttribute("event_id")==id)
+			method(this._rendered[i],i);
+};
+scheduler.changeEventId=function(id,new_id){
+	if (id == new_id) return;
+	var ev=this._events[id];
+	if (ev){
+		ev.id=new_id;
+		this._events[new_id]=ev;
+		delete this._events[id];
+	}
+	this.for_rendered(id,function(r){
+		r.setAttribute("event_id",new_id);
+	});
+	if (this._select_id==id) this._select_id=new_id;
+	if (this._edit_id==id) this._edit_id=new_id;
+	this.callEvent("onEventIdChange",[id,new_id]);
+};
+
+(function(){
+	var attrs=["text","Text","start_date","StartDate","end_date","EndDate"];
+	var create_getter=function(name){
+		return function(id){ return (scheduler.getEvent(id))[name]; };
+	};
+	var create_setter=function(name){
+		return function(id,value){ 
+			var ev=scheduler.getEvent(id); ev[name]=value; 
+			ev._changed=true; 
+			ev._timed=this.is_one_day_event(ev);
+			scheduler.event_updated(ev,true); 
+		};
+	};
+	for (var i=0; i<attrs.length; i+=2){
+		scheduler["getEvent"+attrs[i+1]]=create_getter(attrs[i]);
+		scheduler["setEvent"+attrs[i+1]]=create_setter(attrs[i]);
+	}
+})();
+
+scheduler.event_updated=function(ev,force){
+	if (this.is_visible_events(ev))
+		this.render_view_data();
+	else this.clear_event(ev.id);
+};
+scheduler.is_visible_events=function(ev){
+	if (ev.start_date<this._max_date && this._min_date<ev.end_date) return true;
+	return false;
+};
+scheduler.is_one_day_event=function(ev){
+	var delta = ev.end_date.getDate()-ev.start_date.getDate();
+	
+	if (!delta)
+		return ev.start_date.getMonth()==ev.end_date.getMonth() && ev.start_date.getFullYear()==ev.end_date.getFullYear();
+	else {
+		if (delta < 0)  delta = Math.ceil((ev.end_date.valueOf()-ev.start_date.valueOf())/(24*60*60*1000));
+		return (delta == 1 && !ev.end_date.getHours() && !ev.end_date.getMinutes() && (ev.start_date.getHours() || ev.start_date.getMinutes() ));
+	}
+		
+};
+scheduler.get_visible_events=function(){
+	//not the best strategy for sure
+	var stack=[];
+	var filter = this["filter_"+this._mode];
+	
+	for( var id in this._events)
+		if (this.is_visible_events(this._events[id]))
+			if (this._table_view || this.config.multi_day || this._events[id]._timed)
+				if (!filter || filter(id,this._events[id]))
+					stack.push(this._events[id]);
+				
+	return stack;
+};
+scheduler.render_view_data=function(){
+	if (this._not_render) {
+		this._render_wait=true;
+		return;
+	}
+	this._render_wait=false;
+	
+	this.clear_view();
+	var evs=this.get_visible_events();
+	
+	if (this.config.multi_day && !this._table_view){
+		var tvs = [];
+		var tvd = [];
+		for (var i=0; i < evs.length; i++){
+			if (evs[i]._timed)
+				tvs.push(evs[i]);
+			else
+				tvd.push(evs[i]);
+		};
+		this._table_view=true;
+		this.render_data(tvd);
+		this._table_view=false;		
+		this.render_data(tvs);
+	} else 
+		this.render_data(evs);	
+};
+scheduler.render_data=function(evs,hold){
+	evs=this._pre_render_events(evs,hold);
+	for (var i=0; i<evs.length; i++)
+		if (this._table_view)
+			this.render_event_bar(evs[i]);
+		else
+			this.render_event(evs[i]);
+};
+scheduler._pre_render_events=function(evs,hold){
+	var hb = this.xy.bar_height;
+	var h_old = this._colsS.heights;	
+	var h=this._colsS.heights=[0,0,0,0,0,0,0];
+	
+	if (!this._table_view) evs=this._pre_render_events_line(evs,hold); //ignore long events for now
+	else evs=this._pre_render_events_table(evs,hold);
+	
+	if (this._table_view){
+		if (hold)
+			this._colsS.heights = h_old;
+		else {
+			var evl = this._els["dhx_cal_data"][0].firstChild;
+			if (evl.rows){
+				for (var i=0; i<evl.rows.length; i++){
+					h[i]++;
+					if ((h[i])*hb > this._colsS.height-22){ // 22 - height of cell's header
+						//we have overflow, update heights
+						var cells = evl.rows[i].cells;
+						for (var j=0; j < cells.length; j++) {
+							cells[j].childNodes[1].style.height = h[i]*hb+"px";
+						}
+						h[i]=(h[i-1]||0)+cells[0].offsetHeight;
+					}
+					h[i]=(h[i-1]||0)+evl.rows[i].cells[0].offsetHeight;
+				}	
+				h.unshift(0);
+				if (evl.parentNode.offsetHeight<evl.parentNode.scrollHeight && !evl._h_fix){
+					//we have v-scroll, decrease last day cell
+					for (var i=0; i<evl.rows.length; i++){
+						var cell = evl.rows[i].cells[6].childNodes[0];
+						var w = cell.offsetWidth-scheduler.xy.scroll_width+"px";
+						cell.style.width = w;
+						cell.nextSibling.style.width = w;
+					}		
+					evl._h_fix=true;
+				}
+			} else{
+				
+				if (!evs.length && this._els["dhx_multi_day"][0].style.visibility == "visible")
+					h[0]=-1;
+				if (evs.length || h[0]==-1){
+					//shift days to have space for multiday events
+					var childs = evl.parentNode.childNodes;
+					var dh = (h[0]+1)*hb+"px";
+					for (var i=0; i<childs.length; i++)
+						if (this._colsS[i])
+							childs[i].style.top=dh;
+					var last = this._els["dhx_multi_day"][0];
+					last.style.top = "0px";
+					last.style.height=dh;
+					last.style.visibility=(h[0]==-1?"hidden":"visible");
+					last=this._els["dhx_multi_day"][1];
+					last.style.height=dh;
+					last.style.visibility=(h[0]==-1?"hidden":"visible");
+					last.className=h[0]?"dhx_multi_day_icon":"dhx_multi_day_icon_small";
+					
+					this._dy_shift=(h[0]+1)*hb;
+					h[0] = 0;
+				}				
+				
+			}
+		}
+	}
+	
+	return evs;
+};
+scheduler._get_event_sday=function(ev){
+	return Math.floor((ev.start_date.valueOf()-this._min_date.valueOf())/(24*60*60*1000));
+};
+scheduler._pre_render_events_line=function(evs,hold){
+	evs.sort(function(a,b){ return a.start_date>b.start_date?1:-1; });
+	var days=[]; //events by weeks
+	var evs_originals = [];
+	for (var i=0; i < evs.length; i++) {
+		var ev=evs[i];
+
+		//check scale overflow
+		var sh = ev.start_date.getHours();
+		var eh = ev.end_date.getHours();
+		
+		ev._sday=this._get_event_sday(ev);
+		if (!days[ev._sday]) days[ev._sday]=[];
+		
+		if (!hold){
+			ev._inner=false;
+			var stack=days[ev._sday];
+			while (stack.length && stack[stack.length-1].end_date<=ev.start_date)
+				stack.splice(stack.length-1,1);
+			if (stack.length) stack[stack.length-1]._inner=true;
+			ev._sorder=stack.length; stack.push(ev);
+			if (stack.length>(stack.max_count||0)) stack.max_count=stack.length;
+		}
+		
+		if (sh < this.config.first_hour || eh >= this.config.last_hour){
+			evs_originals.push(ev);
+			evs[i]=ev=this._copy_event(ev);
+			if (sh < this.config.first_hour){
+				ev.start_date.setHours(this.config.first_hour);
+				ev.start_date.setMinutes(0);
+			}
+			if (eh >= this.config.last_hour){
+				ev.end_date.setMinutes(0);
+				ev.end_date.setHours(this.config.last_hour);
+			}
+			if (ev.start_date>ev.end_date || sh==this.config.last_hour) {
+				evs.splice(i,1); i--; continue;
+			}
+		}
+				
+	}
+	if (!hold){
+		for (var i=0; i < evs.length; i++) 
+			evs[i]._count=days[evs[i]._sday].max_count;
+		for (var i=0; i < evs_originals.length; i++) 
+			evs_originals[i]._count=days[evs_originals[i]._sday].max_count;
+	}
+	
+	return evs;
+};
+scheduler._time_order=function(evs){
+	evs.sort(function(a,b){ 
+		if (a.start_date.valueOf()==b.start_date.valueOf()){
+			if (a._timed && !b._timed) return 1;
+			if (!a._timed && b._timed) return -1;
+			return 0;
+		}
+		return a.start_date>b.start_date?1:-1;
+	});
+};
+scheduler._pre_render_events_table=function(evs,hold){ // max - max height of week slot
+	this._time_order(evs);
+	
+	var out=[];
+	var weeks=[[],[],[],[],[],[],[]]; //events by weeks
+	var max = this._colsS.heights;
+	var start_date;
+	var cols = this._cols.length;
+	
+	for (var i=0; i < evs.length; i++) {
+		var ev=evs[i];
+		var sd = (start_date||ev.start_date);
+		var ed = ev.end_date;
+		//trim events which are crossing through current view
+		if (sd<this._min_date) sd=this._min_date;
+		if (ed>this._max_date) ed=this._max_date;
+		
+		var locate_s = this.locate_holder_day(sd,false,ev);
+		ev._sday=locate_s%cols;
+		var locate_e = this.locate_holder_day(ed,true,ev)||cols;
+		ev._eday=(locate_e%cols)||cols; //cols used to fill full week, when event end on monday
+		ev._length=locate_e-locate_s;
+		
+		//3600000 - compensate 1 hour during winter|summer time shift
+		ev._sweek=Math.floor((this._correct_shift(sd.valueOf(),1)-this._min_date.valueOf())/(60*60*1000*24*cols)); 	
+		
+		//current slot
+		var stack=weeks[ev._sweek];
+		//check order position
+		var stack_line;
+		
+		for (stack_line=0; stack_line<stack.length; stack_line++)
+			if (stack[stack_line]._eday<=ev._sday)
+				break;
+		ev._sorder=stack_line; 
+		
+		
+		if (ev._sday+ev._length<=cols){
+			start_date=null;
+			out.push(ev);
+			stack[stack_line]=ev;
+			//get max height of slot
+			max[ev._sweek]=stack.length-1;
+		} else{ // split long event in chunks
+			var copy=this._copy_event(ev);
+			copy._length=cols-ev._sday;
+			copy._eday=cols; copy._sday=ev._sday;
+			copy._sweek=ev._sweek; copy._sorder=ev._sorder;
+			copy.end_date=this.date.add(sd,copy._length,"day");
+			
+			out.push(copy);
+			stack[stack_line]=copy;
+			start_date=copy.end_date;
+			//get max height of slot
+			max[ev._sweek]=stack.length-1;
+			i--; continue;  //repeat same step
+		}
+	};
+	
+	return out;
+};
+scheduler._copy_dummy=function(){ 
+	this.start_date=new Date(this.start_date);
+	this.end_date=new Date(this.end_date);
+};
+scheduler._copy_event=function(ev){
+	this._copy_dummy.prototype = ev;
+	return new this._copy_dummy();
+	//return {start_date:ev.start_date, end_date:ev.end_date, text:ev.text, id:ev.id}
+};
+scheduler._rendered=[];
+scheduler.clear_view=function(){
+	for (var i=0; i<this._rendered.length; i++){
+		var obj=this._rendered[i];
+		if (obj.parentNode) obj.parentNode.removeChild(obj);		
+	}
+	this._rendered=[];
+};
+scheduler.updateEvent=function(id){
+	var ev=this.getEvent(id);
+	this.clear_event(id);
+	if (ev && this.is_visible_events(ev)) 
+		this.render_data([ev],true);
+};
+scheduler.clear_event=function(id){
+	this.for_rendered(id,function(node,i){
+		if (node.parentNode)
+			node.parentNode.removeChild(node);
+		scheduler._rendered.splice(i,1);
+	});
+};
+scheduler.render_event=function(ev){
+	var menu = scheduler.xy.menu_width;
+	if (ev._sday<0) return; //can occur in case of recurring event during time shift
+	var parent=scheduler.locate_holder(ev._sday);	
+	if (!parent) return; //attempt to render non-visible event
+	var sm = ev.start_date.getHours()*60+ev.start_date.getMinutes();
+	var em = (ev.end_date.getHours()*60+ev.end_date.getMinutes())||(scheduler.config.last_hour*60);
+	
+	var top = (Math.round((sm*60*1000-this.config.first_hour*60*60*1000)*this.config.hour_size_px/(60*60*1000)))%(this.config.hour_size_px*24)+1; //42px/hour
+	var height = Math.max(scheduler.xy.min_event_height,(em-sm)*this.config.hour_size_px/60)+1; //42px/hour
+	//var height = Math.max(25,Math.round((ev.end_date.valueOf()-ev.start_date.valueOf())*(this.config.hour_size_px+(this._quirks?1:0))/(60*60*1000))); //42px/hour
+	var width=Math.floor((parent.clientWidth-menu)/ev._count);
+	var left=ev._sorder*width+1;
+	if (!ev._inner) width=width*(ev._count-ev._sorder);
+	
+	
+	
+	var d=this._render_v_bar(ev.id,menu+left,top,width,height,ev._text_style,scheduler.templates.event_header(ev.start_date,ev.end_date,ev),scheduler.templates.event_text(ev.start_date,ev.end_date,ev));
+		
+	this._rendered.push(d);
+	parent.appendChild(d);
+	
+	left=left+parseInt(parent.style.left,10)+menu;
+	
+	top+=this._dy_shift; //corrupt top, to include possible multi-day shift
+	if (this._edit_id==ev.id){
+		d.style.zIndex = 1; //fix overlapping issue
+		width=Math.max(width-4,scheduler.xy.editor_width);
+		var d=document.createElement("DIV");
+		d.setAttribute("event_id",ev.id);
+		this.set_xy(d,width,height-20,left,top+14);
+		d.className="dhx_cal_editor";
+			
+		var d2=document.createElement("DIV");
+		this.set_xy(d2,width-6,height-26);
+		d2.style.cssText+=";margin:2px 2px 2px 2px;overflow:hidden;";
+		
+		d.appendChild(d2);
+		this._els["dhx_cal_data"][0].appendChild(d);
+		this._rendered.push(d);
+	
+		d2.innerHTML="<textarea class='dhx_cal_editor'>"+ev.text+"</textarea>";
+		if (this._quirks7) d2.firstChild.style.height=height-12+"px"; //IEFIX
+		this._editor=d2.firstChild;
+		this._editor.onkeypress=function(e){ 
+			if ((e||event).shiftKey) return true;
+			var code=(e||event).keyCode; 
+			if (code==scheduler.keys.edit_save) scheduler.editStop(true); 
+			if (code==scheduler.keys.edit_cancel) scheduler.editStop(false); 
+		};
+		this._editor.onselectstart=function(e){ return (e||event).cancelBubble=true; };
+		d2.firstChild.focus();
+		//IE and opera can add x-scroll during focusing
+		this._els["dhx_cal_data"][0].scrollLeft=0;
+		d2.firstChild.select();
+	}
+	
+	if (this._select_id==ev.id){
+		//d.style.zIndex = 1; //fix overlapping issue
+		var icons=this.config["icons_"+((this._edit_id==ev.id)?"edit":"select")];
+		var icons_str="";
+		for (var i=0; i<icons.length; i++)
+			icons_str+="<div class='dhx_menu_icon "+icons[i]+"' title='"+this.locale.labels[icons[i]]+"'></div>";
+		var obj = this._render_v_bar(ev.id,left-menu+1,top,menu,icons.length*20+26,"","<div class='dhx_menu_head'></div>",icons_str,true);
+		obj.style.left=left-menu+1;
+		this._els["dhx_cal_data"][0].appendChild(obj);
+		this._rendered.push(obj);
+	}
+};
+scheduler._render_v_bar=function(id,x,y,w,h,style,contentA,contentB,bottom){
+	var d=document.createElement("DIV");
+	
+	var ev = this.getEvent(id);
+	var cs = "dhx_cal_event";
+	var cse = scheduler.templates.event_class(ev.start_date,ev.end_date,ev);
+	if (cse) cs=cs+" "+cse;
+	
+	var html='<div event_id="'+id+'" class="'+cs+'" style="position:absolute; top:'+y+'px; left:'+x+'px; width:'+(w-4)+'px; height:'+h+'px;'+(style||"")+'">';
+	html+='<div class="dhx_header" style=" width:'+(w-6)+'px;" >&nbsp;</div>';
+	html+='<div class="dhx_title">'+contentA+'</div>';
+	html+='<div class="dhx_body" style=" width:'+(w-(this._quirks?4:14))+'px; height:'+(h-(this._quirks?20:30))+'px;">'+contentB+'</div>';
+	html+='<div class="dhx_footer" style=" width:'+(w-8)+'px;'+(bottom?' margin-top:-1px;':'')+'" ></div></div>';
+	
+	d.innerHTML=html;
+	return d.firstChild;
+};
+scheduler.locate_holder=function(day){
+	if (this._mode=="day") return this._els["dhx_cal_data"][0].firstChild; //dirty
+	return this._els["dhx_cal_data"][0].childNodes[day];
+};
+scheduler.locate_holder_day=function(date,past){
+	var day = Math.floor((this._correct_shift(date,1)-this._min_date)/(60*60*24*1000));
+	//when locating end data of event , we need to use next day if time part was defined
+	if (past && this.date.time_part(date)) day++;
+	return day;
+};
+scheduler.render_event_bar=function(ev){
+	var parent=this._els["dhx_cal_data"][0];
+
+	var x=this._colsS[ev._sday];
+	var x2=this._colsS[ev._eday];
+	if (x2==x) x2=this._colsS[ev._eday+1];
+	var hb = this.xy.bar_height;
+	
+	var y=this._colsS.heights[ev._sweek]+(this._colsS.height?(this.xy.month_scale_height+2):2)+ev._sorder*hb; 
+			
+	var d=document.createElement("DIV");
+	var cs = ev._timed?"dhx_cal_event_clear":"dhx_cal_event_line";
+	var cse = scheduler.templates.event_class(ev.start_date,ev.end_date,ev);
+	if (cse) cs=cs+" "+cse; 
+	
+	var html='<div event_id="'+ev.id+'" class="'+cs+'" style="position:absolute; top:'+y+'px; left:'+x+'px; width:'+(x2-x-15)+'px;'+(ev._text_style||"")+'">';
+		
+	if (ev._timed)
+		html+=scheduler.templates.event_bar_date(ev.start_date,ev.end_date,ev);
+	html+=scheduler.templates.event_bar_text(ev.start_date,ev.end_date,ev)+'</div>';
+	html+='</div>';
+	
+	d.innerHTML=html;
+	
+	this._rendered.push(d.firstChild);
+	parent.appendChild(d.firstChild);
+};
+
+scheduler._locate_event=function(node){
+	var id=null;
+	while (node && !id && node.getAttribute){
+		id=node.getAttribute("event_id"); 
+		node=node.parentNode;
+	}
+	return id;
+};
+
+
+scheduler.edit=function(id){
+	if (this._edit_id==id) return;
+	this.editStop(false,id);
+	this._edit_id=id;
+	this.updateEvent(id);
+};
+scheduler.editStop=function(mode,id){
+	if (id && this._edit_id==id) return;
+	var ev=this.getEvent(this._edit_id);
+	if (ev){
+		if (mode) ev.text=this._editor.value;
+		this._edit_id=null;
+		this._editor=null;	
+		this.updateEvent(ev.id);
+		this._edit_stop_event(ev,mode);
+	}
+};
+scheduler._edit_stop_event=function(ev,mode){
+	if (this._new_event){
+		if (!mode) this.deleteEvent(ev.id,true);		
+		else this.callEvent("onEventAdded",[ev.id,ev]);
+		this._new_event=null;
+	} else
+		if (mode) this.callEvent("onEventChanged",[ev.id,ev]);
+};
+
+scheduler.getEvents = function(from,to){
+	var result = [];
+	for (var a in this._events){
+		var ev = this._events[a];
+		if (ev && ev.start_date<to && ev.end_date>from)
+			result.push(ev);
+	}
+	return result;
+};
+scheduler._loaded={};
+scheduler._load=function(url,from){
+	url=url||this._load_url;
+	url+=(url.indexOf("?")==-1?"?":"&")+"timeshift="+(new Date()).getTimezoneOffset();
+	if (this.config.prevent_cache)	url+="&uid="+this.uid();
+	var to;
+	from=from||this._date;
+	
+	if (this._load_mode){
+		var lf = this.templates.load_format;
+		
+		from = this.date[this._load_mode+"_start"](new Date(from.valueOf()));
+		while (from>this._min_date) from=this.date.add(from,-1,this._load_mode);
+		to = from;
+		
+		var cache_line = true;
+		while (to<this._max_date){
+			to=this.date.add(to,1,this._load_mode);	
+			if (this._loaded[lf(from)] && cache_line) 
+				from=this.date.add(from,1,this._load_mode);	
+			else cache_line = false;
+		}
+		
+		var temp_to=to;
+		do {
+			to = temp_to;
+			temp_to=this.date.add(to,-1,this._load_mode);
+		} while (temp_to>from && this._loaded[lf(temp_to)]);
+			
+		if (to<=from) 
+			return false; //already loaded
+		dhtmlxAjax.get(url+"&from="+lf(from)+"&to="+lf(to),function(l){scheduler.on_load(l);});
+		while(from<to){
+			this._loaded[lf(from)]=true;
+			from=this.date.add(from,1,this._load_mode);	
+		}
+	} else
+		dhtmlxAjax.get(url,function(l){scheduler.on_load(l);});
+	this.callEvent("onXLS",[]);
+	return true;
+}
+scheduler.on_load=function(loader){
+	this._loading=true;
+	if (this._process)
+		var evs=this[this._process].parse(loader.xmlDoc.responseText);
+	else
+		var evs=this._magic_parser(loader);
+	
+	this._not_render=true;
+	for (var i=0; i<evs.length; i++){
+		if (!this.callEvent("onEventLoading",[evs[i]])) continue;
+		this.addEvent(evs[i]);
+	}
+	this._not_render=false;
+	if (this._render_wait) this.render_view_data();
+	
+	if (this._after_call) this._after_call();
+	this._after_call=null;
+	this._loading=false;
+	this.callEvent("onXLE",[]);
+}
+scheduler.json={};
+scheduler.json.parse = function(data){
+	if (typeof data == "string"){
+		eval("scheduler._temp = "+data+";");
+		data = scheduler._temp;
+	}
+	var evs = [];
+	for (var i=0; i < data.length; i++){
+		data[i].start_date = scheduler.templates.xml_date(data[i].start_date);
+		data[i].end_date = scheduler.templates.xml_date(data[i].end_date);
+		evs.push(data[i]);
+	}
+	return evs;
+}
+scheduler.parse=function(data,type){
+	this._process=type;
+	this.on_load({xmlDoc:{responseText:data}});
+}
+scheduler.load=function(url,call){
+	if (typeof call == "string"){
+		this._process=call;
+		call = arguments[2];
+	}
+	
+	this._load_url=url;
+	this._after_call=call;
+	this._load(url,this._date);
+};
+//possible values - day,week,month,year,all
+scheduler.setLoadMode=function(mode){
+	if (mode=="all") mode="";
+	this._load_mode=mode;
+};
+
+//current view by default, or all data if "true" as parameter provided
+scheduler.refresh=function(refresh_all){
+	alert("not implemented");
+	/*
+	this._loaded={};
+	this._load();
+	*/
+}
+scheduler.serverList=function(name){
+	return this.serverList[name] = (this.serverList[name]||[]);
+}
+
+scheduler._userdata={};
+scheduler._magic_parser=function(loader){
+	if (!loader.getXMLTopNode){ //from a string
+		var xml_string = loader.xmlDoc.responseText;
+		loader = new dtmlXMLLoaderObject(function(){});
+		loader.loadXMLString(xml_string);
+	}
+	
+	var xml=loader.getXMLTopNode("data");
+	if (xml.tagName!="data") return [];//not an xml
+	
+	var opts = loader.doXPath("//coll_options");
+	for (var i=0; i < opts.length; i++) {
+		var bind = opts[i].getAttribute("for");
+		var arr = this.serverList[bind];
+		if (!arr) continue;
+		arr.splice(0,arr.length);	//clear old options
+		var itms = loader.doXPath(".//item",opts[i]);
+		for (var j=0; j < itms.length; j++)
+			arr.push({ key:itms[j].getAttribute("value"), label:itms[j].getAttribute("label")});
+	}
+	if (opts.length)
+		scheduler.callEvent("onOptionsLoad",[]);
+	
+	var ud=loader.doXPath("//userdata");	
+	for (var i=0; i < ud.length; i++) {
+		var udx = this.xmlNodeToJSON(ud[i]);
+		this._userdata[udx.name]=udx.text;
+	};
+	
+	var evs=[];
+	var xml=loader.doXPath("//event");
+	
+	
+	for (var i=0; i < xml.length; i++) {
+		evs[i]=this.xmlNodeToJSON(xml[i])
+		
+		evs[i].text=evs[i].text||evs[i]._tagvalue;
+		evs[i].start_date=this.templates.xml_date(evs[i].start_date);
+		evs[i].end_date=this.templates.xml_date(evs[i].end_date);
+	}
+	return evs;
+}
+scheduler.xmlNodeToJSON = function(node){
+        var t={};
+        for (var i=0; i<node.attributes.length; i++)
+            t[node.attributes[i].name]=node.attributes[i].value;
+        
+        for (var i=0; i<node.childNodes.length; i++){
+        	var child=node.childNodes[i];
+            if (child.nodeType==1)
+                t[child.tagName]=child.firstChild?child.firstChild.nodeValue:"";
+        }
+                 
+        if (!t.text) t.text=node.firstChild?node.firstChild.nodeValue:"";
+        
+        return t;
+}
+
+scheduler.attachEvent("onXLS",function(){
+	if (this.config.show_loading===true){
+		var t;
+		t=this.config.show_loading=document.createElement("DIV");
+		t.className='dhx_loading';
+		t.style.left = Math.round((this._x-128)/2)+"px";
+		t.style.top = Math.round((this._y-15)/2)+"px";
+		this._obj.appendChild(t);
+	}
+});
+scheduler.attachEvent("onXLE",function(){
+	var t;
+	if (t=this.config.show_loading)
+		if (typeof t == "object"){
+		this._obj.removeChild(t);
+		this.config.show_loading=true;
+	}
+});
+
+scheduler.ical={
+	parse:function(str){
+		var data = str.match(RegExp(this.c_start+"[^\f]*"+this.c_end,""));
+		if (!data.length) return;
+		
+		//unfolding 
+		data[0]=data[0].replace(/[\r\n]+(?=[a-z \t])/g," ");
+		//drop property
+		data[0]=data[0].replace(/\;[^:\r\n]*/g,"");
+		
+		
+		var incoming=[];
+		var match;
+		var event_r = RegExp("(?:"+this.e_start+")([^\f]*?)(?:"+this.e_end+")","g");
+		while (match=event_r.exec(data)){
+			var e={};
+			var param;
+			var param_r = /[^\r\n]+[\r\n]+/g;
+			while (param=param_r.exec(match[1]))
+				this.parse_param(param.toString(),e);
+			if (e.uid && !e.id) e.id = e.uid; //fallback to UID, when ID is not defined
+			incoming.push(e);	
+		}
+		return incoming;
+	},
+	parse_param:function(str,obj){
+		var d = str.indexOf(":"); 
+			if (d==-1) return;
+		
+		var name = str.substr(0,d).toLowerCase();
+		var value = str.substr(d+1).replace(/\\\,/g,",").replace(/[\r\n]+$/,"");
+		if (name=="summary")
+			name="text";
+		else if (name=="dtstart"){
+			name = "start_date";
+			value = this.parse_date(value,0,0);
+		}
+		else if (name=="dtend"){
+			name = "end_date";
+			if (obj.start_date && obj.start_date.getHours()==0)
+				value = this.parse_date(value,24,00);
+			else
+				value = this.parse_date(value,23,59);
+		}
+		obj[name]=value;
+	},
+	parse_date:function(value,dh,dm){
+		var t = value.split("T");	
+		if (t[1]){
+			dh=t[1].substr(0,2);
+			dm=t[1].substr(2,2);
+		}
+		var dy = t[0].substr(0,4);
+		var dn = parseInt(t[0].substr(4,2),10)-1;
+		var dd = t[0].substr(6,2);
+		if (scheduler.config.server_utc && !t[1]) { // if no hours/minutes were specified == full day event
+			return new Date(Date.UTC(dy,dn,dd,dh,dm)) ;
+		}
+		return new Date(dy,dn,dd,dh,dm);
+	},
+	c_start:"BEGIN:VCALENDAR",
+	e_start:"BEGIN:VEVENT",
+	e_end:"END:VEVENT",
+	c_end:"END:VCALENDAR"	
+};
+scheduler.form_blocks={
+	textarea:{
+		render:function(sns){
+			var height=(sns.height||"130")+"px";
+			return "<div class='dhx_cal_ltext' style='height:"+height+";'><textarea></textarea></div>";
+		},
+		set_value:function(node,value,ev){
+			node.firstChild.value=value||"";
+		},
+		get_value:function(node,ev){
+			return node.firstChild.value;
+		},
+		focus:function(node){
+			var a=node.firstChild; a.select(); a.focus(); 
+		}
+	},
+	select:{
+		render:function(sns){
+			var height=(sns.height||"23")+"px";
+			var html="<div class='dhx_cal_ltext' style='height:"+height+";'><select style='width:552px;'>";
+			for (var i=0; i < sns.options.length; i++)
+				html+="<option value='"+sns.options[i].key+"'>"+sns.options[i].label+"</option>";
+			html+="</select></div>";
+			return html;
+		},
+		set_value:function(node,value,ev){
+			if (typeof value == "undefined")
+				value = (node.firstChild.options[0]||{}).value;
+			node.firstChild.value=value||"";
+		},
+		get_value:function(node,ev){
+			return node.firstChild.value;
+		},
+		focus:function(node){
+			var a=node.firstChild; if (a.select) a.select(); a.focus(); 
+		}
+	},	
+	time:{
+		render:function(){
+			//hours
+			var cfg = scheduler.config;
+			var dt = this.date.date_part(new Date());
+			var last = 24*60, first = 0;
+			if(scheduler.config.limit_time_select){
+				last = 60*cfg.last_hour+1;
+				first = 60*cfg.first_hour;
+				dt.setHours(cfg.first_hour);
+			}
+				
+			var html="<select>";
+			for (var i=first; i<last; i+=this.config.time_step*1){
+				var time=this.templates.time_picker(dt);
+				html+="<option value='"+i+"'>"+time+"</option>";
+				dt=this.date.add(dt,this.config.time_step,"minute");
+			}
+			
+			//days
+			html+="</select> <select>";
+			for (var i=1; i < 32; i++) 
+				html+="<option value='"+i+"'>"+i+"</option>";
+			
+			//month
+			html+="</select> <select>";
+			for (var i=0; i < 12; i++) 
+				html+="<option value='"+i+"'>"+this.locale.date.month_full[i]+"</option>";
+			
+			//year
+			html+="</select> <select>";
+			dt = dt.getFullYear()-5; //maybe take from config?
+			for (var i=0; i < 10; i++) 
+				html+="<option value='"+(dt+i)+"'>"+(dt+i)+"</option>";
+			html+="</select> ";
+			
+			return "<div style='height:30px; padding-top:0px; font-size:inherit;' class='dhx_cal_lsection dhx_section_time'>"+html+"<span style='font-weight:normal; font-size:10pt;'> &nbsp;&ndash;&nbsp; </span>"+html+"</div>";			
+
+		},
+		set_value:function(node,value,ev){
+
+			var s=node.getElementsByTagName("select");
+
+			if(scheduler.config.full_day) {
+				if (!node._full_day){
+					node.previousSibling.innerHTML+="<div class='dhx_fullday_checkbox'><label><input type='checkbox' name='full_day' value='true'> "+scheduler.locale.labels.full_day+"&nbsp;</label></input></div>";
+					node._full_day=true;
+				}
+				var input=node.previousSibling.getElementsByTagName("input")[0];
+				var isFulldayEvent = (scheduler.date.time_part(ev.start_date)==0 && scheduler.date.time_part(ev.end_date)==0 && ev.end_date.valueOf()-ev.start_date.valueOf() < 2*24*60*60*1000);
+				input.checked = isFulldayEvent;
+				
+				for(var k in s)
+					s[k].disabled=input.checked;
+
+				input.onclick = function(){ 
+					if(input.checked) {
+						var start_date = new Date(ev.start_date);
+						var end_date = new Date(ev.end_date);
+						
+						scheduler.date.date_part(start_date);
+						end_date = scheduler.date.add(start_date, 1, "day")
+					} 
+					for(var i in s)
+						s[i].disabled=input.checked;
+					
+					_fill_lightbox_select(s,0,start_date||ev.start_date);
+					_fill_lightbox_select(s,4,end_date||ev.end_date);
+				}
+			}
+			
+			if(scheduler.config.auto_end_date && scheduler.config.event_duration) {
+				function _update_lightbox_select() {
+					ev.start_date=new Date(s[3].value,s[2].value,s[1].value,0,s[0].value);
+					ev.end_date.setTime(ev.start_date.getTime() + (scheduler.config.event_duration * 60 * 1000));
+					_fill_lightbox_select(s,4,ev.end_date);
+				}
+				for(var i=0; i<4; i++) {
+					s[i].onchange = _update_lightbox_select;
+				}
+			}
+			
+			function _fill_lightbox_select(s,i,d){
+				s[i+0].value=Math.round((d.getHours()*60+d.getMinutes())/scheduler.config.time_step)*scheduler.config.time_step;	
+				s[i+1].value=d.getDate();
+				s[i+2].value=d.getMonth();
+				s[i+3].value=d.getFullYear();
+			}
+			
+			_fill_lightbox_select(s,0,ev.start_date);
+			_fill_lightbox_select(s,4,ev.end_date);
+		},
+		get_value:function(node,ev){
+			s=node.getElementsByTagName("select");
+			ev.start_date=new Date(s[3].value,s[2].value,s[1].value,0,s[0].value);
+			ev.end_date=new Date(s[7].value,s[6].value,s[5].value,0,s[4].value);
+			if (ev.end_date<=ev.start_date) 
+				ev.end_date=scheduler.date.add(ev.start_date,scheduler.config.time_step,"minute");
+		},
+		focus:function(node){
+			node.getElementsByTagName("select")[0].focus(); 
+		}
+	}
+}
+scheduler.showCover=function(box){
+	this.show_cover();
+	if (box){
+		box.style.display="block";
+		var pos = getOffset(this._obj);
+		box.style.top=Math.round(pos.top+(this._obj.offsetHeight-box.offsetHeight)/2)+"px";
+		box.style.left=Math.round(pos.left+(this._obj.offsetWidth-box.offsetWidth)/2)+"px";	
+	}
+}
+scheduler.showLightbox=function(id){
+	if (!id) return;
+	if (!this.callEvent("onBeforeLightbox",[id])) return;
+	var box = this._get_lightbox();
+	this.showCover(box);
+	this._fill_lightbox(id,box);
+	this.callEvent("onLightbox",[id]);
+}
+scheduler._fill_lightbox=function(id,box){ 
+	var ev=this.getEvent(id);
+	var s=box.getElementsByTagName("span");
+	if (scheduler.templates.lightbox_header){
+		s[1].innerHTML="";
+		s[2].innerHTML=scheduler.templates.lightbox_header(ev.start_date,ev.end_date,ev);
+	} else {
+		s[1].innerHTML=this.templates.event_header(ev.start_date,ev.end_date,ev);
+		s[2].innerHTML=(this.templates.event_bar_text(ev.start_date,ev.end_date,ev)||"").substr(0,70); //IE6 fix	
+	}
+	
+	
+	var sns = this.config.lightbox.sections;	
+	for (var i=0; i < sns.length; i++) {
+		var node=document.getElementById(sns[i].id).nextSibling;
+		var block=this.form_blocks[sns[i].type];
+		block.set_value.call(this,node,ev[sns[i].map_to],ev, sns[i])
+		if (sns[i].focus)
+			block.focus.call(this,node);
+	};
+	
+	scheduler._lightbox_id=id;
+}
+scheduler._lightbox_out=function(ev){
+	var sns = this.config.lightbox.sections;	
+	for (var i=0; i < sns.length; i++) {
+		var node=document.getElementById(sns[i].id).nextSibling;
+		var block=this.form_blocks[sns[i].type];
+		var res=block.get_value.call(this,node,ev, sns[i]);
+		if (sns[i].map_to!="auto")
+			ev[sns[i].map_to]=res;
+	}
+	return ev;
+}
+scheduler._empty_lightbox=function(){
+	var id=scheduler._lightbox_id;
+	var ev=this.getEvent(id);
+	var box=this._get_lightbox();
+	
+	this._lightbox_out(ev);
+	
+	ev._timed=this.is_one_day_event(ev);
+	this.setEvent(ev.id,ev);
+	this._edit_stop_event(ev,true)
+	this.render_view_data();
+}
+scheduler.hide_lightbox=function(id){
+	this.hideCover(this._get_lightbox());
+	this._lightbox_id=null;
+	this.callEvent("onAfterLightbox",[]);
+}
+scheduler.hideCover=function(box){
+	if (box) box.style.display="none";
+	this.hide_cover();
+}
+scheduler.hide_cover=function(){
+	if (this._cover) 
+		this._cover.parentNode.removeChild(this._cover);
+	this._cover=null;
+}
+scheduler.show_cover=function(){
+	this._cover=document.createElement("DIV");
+	this._cover.className="dhx_cal_cover";
+	document.body.appendChild(this._cover);
+}
+scheduler.save_lightbox=function(){
+	if (this.checkEvent("onEventSave") && 						!this.callEvent("onEventSave",[this._lightbox_id,this._lightbox_out({ id: this._lightbox_id}), this._new_event]))
+		return;
+	this._empty_lightbox()
+	this.hide_lightbox();
+};
+scheduler.startLightbox = function(id, box){
+	this._lightbox_id=id;
+	this.showCover(box);
+}
+scheduler.endLightbox = function(mode, box){
+	this._edit_stop_event(scheduler.getEvent(this._lightbox_id),mode);
+	if (mode)
+		scheduler.render_view_data();
+	this.hideCover(box);
+};
+scheduler.resetLightbox = function(){
+	scheduler._lightbox = null;
+};
+scheduler.cancel_lightbox=function(){
+	this.callEvent("onEventCancel",[this._lightbox_id, this._new_event]);
+	this.endLightbox(false);
+	this.hide_lightbox();
+};
+scheduler._init_lightbox_events=function(){
+	this._get_lightbox().onclick=function(e){
+		var src=e?e.target:event.srcElement;
+		if (!src.className) src=src.previousSibling;
+		if (src && src.className)
+			switch(src.className){
+				case "dhx_save_btn":
+					scheduler.save_lightbox();
+					break;
+				case "dhx_delete_btn":
+					var c=scheduler.locale.labels.confirm_deleting; 
+					if (!c||confirm(c)) {
+						scheduler.deleteEvent(scheduler._lightbox_id);
+						scheduler._new_event = null; //clear flag, if it was unsaved event
+						scheduler.hide_lightbox();
+					}
+					break;
+				case "dhx_cancel_btn":
+					scheduler.cancel_lightbox();
+					break;
+					
+				default:
+					if (src.className.indexOf("dhx_custom_button_")!=-1){
+						var index = src.parentNode.getAttribute("index");
+						var block=scheduler.form_blocks[scheduler.config.lightbox.sections[index].type];
+						var sec = src.parentNode.parentNode;
+						block.button_click(index,src,sec,sec.nextSibling);	
+					}
+			}
+	};
+	this._get_lightbox().onkeypress=function(e){
+		switch((e||event).keyCode){
+			case scheduler.keys.edit_save:
+				if ((e||event).shiftKey) return;
+				scheduler.save_lightbox();
+				break;
+			case scheduler.keys.edit_cancel:
+				scheduler.cancel_lightbox();
+				break;
+		}
+	}
+}
+scheduler.setLightboxSize=function(){
+	var d = this._lightbox;
+	if (!d) return;
+	
+	var con = d.childNodes[1];
+	con.style.height="0px";
+	con.style.height=con.scrollHeight+"px";		
+	d.style.height=con.scrollHeight+50+"px";		
+	con.style.height=con.scrollHeight+"px";		 //it is incredible , how ugly IE can be 	
+}
+
+scheduler._get_lightbox=function(){
+	if (!this._lightbox){
+		var d=document.createElement("DIV");
+		d.className="dhx_cal_light";
+		if (/msie|MSIE 6/.test(navigator.userAgent))
+			d.className+=" dhx_ie6";
+		d.style.visibility="hidden";
+		d.innerHTML=this._lightbox_template;
+		document.body.insertBefore(d,document.body.firstChild);
+		this._lightbox=d;
+		
+		var sns=this.config.lightbox.sections;
+		var html="";
+		for (var i=0; i < sns.length; i++) {
+			var block=this.form_blocks[sns[i].type];
+			if (!block) continue; //ignore incorrect blocks
+			sns[i].id="area_"+this.uid();
+			var button = "";
+			if (sns[i].button) button = "<div style='float:right;' class='dhx_custom_button' index='"+i+"'><div class='dhx_custom_button_"+sns[i].name+"'></div><div>"+this.locale.labels["button_"+sns[i].button]+"</div></div>";
+			html+="<div id='"+sns[i].id+"' class='dhx_cal_lsection'>"+button+this.locale.labels["section_"+sns[i].name]+"</div>"+block.render.call(this,sns[i]);
+		};
+		
+	
+		//localization
+		var ds=d.getElementsByTagName("div");
+		ds[4].innerHTML=scheduler.locale.labels.icon_save;
+		ds[7].innerHTML=scheduler.locale.labels.icon_cancel;
+		ds[10].innerHTML=scheduler.locale.labels.icon_delete;
+		//sections
+		ds[1].innerHTML=html;
+		//sizes
+		this.setLightboxSize();
+	
+		this._init_lightbox_events(this);
+		d.style.display="none";
+		d.style.visibility="visible";
+	}
+	return this._lightbox;
+}
+scheduler._lightbox_template="<div class='dhx_cal_ltitle'><span class='dhx_mark'>&nbsp;</span><span class='dhx_time'></span><span class='dhx_title'></span></div><div class='dhx_cal_larea'></div><div class='dhx_btn_set'><div class='dhx_save_btn'></div><div>&nbsp;</div></div><div class='dhx_btn_set'><div class='dhx_cancel_btn'></div><div>&nbsp;</div></div><div class='dhx_btn_set' style='float:right;'><div class='dhx_delete_btn'></div><div>&nbsp;</div></div>";
+scheduler._dp_init=function(dp){
+	dp._methods=["setEventTextStyle","","changeEventId","deleteEvent"];
+	
+	this.attachEvent("onEventAdded",function(id){
+		if (!this._loading && this.validId(id))
+			dp.setUpdated(id,true,"inserted");
+	});
+	this.attachEvent("onBeforeEventDelete",function(id){
+		if (!this.validId(id)) return;
+        var z=dp.getState(id);
+        
+		if (z=="inserted" || this._new_event) {  dp.setUpdated(id,false);		return true; }
+		if (z=="deleted")  return false;
+    	if (z=="true_deleted")  return true;
+    	
+		dp.setUpdated(id,true,"deleted");
+      	return false;
+	});
+	this.attachEvent("onEventChanged",function(id){
+		if (!this._loading && this.validId(id))
+			dp.setUpdated(id,true,"updated");
+	});
+	
+	dp._getRowData=function(id,pref){
+		var ev=this.obj.getEvent(id);
+		var data = {};
+		
+		for (var a in ev){
+			if (a.indexOf("_")==0) continue;
+			if (ev[a] && ev[a].getUTCFullYear) //not very good, but will work
+				data[a] = this.obj.templates.xml_format(ev[a]);
+			else
+				data[a] = ev[a];
+		}
+		
+		return data;
+	};
+	dp._clearUpdateFlag=function(){};
+	
+	dp.attachEvent("insertCallback", scheduler._update_callback);
+	dp.attachEvent("updateCallback", scheduler._update_callback);
+	dp.attachEvent("deleteCallback", function(upd, id) {
+		this.obj.setUserData(id, this.action_param, "true_deleted");
+		this.obj.deleteEvent(id);
+	});
+		
+};
+
+
+scheduler.setUserData=function(id,name,value){
+	if (id)
+		this.getEvent(id)[name]=value;
+	else
+		this._userdata[name]=value;
+};
+scheduler.getUserData=function(id,name){
+	return id?this.getEvent(id)[name]:this._userdata[name];
+};
+scheduler.setEventTextStyle=function(id,style){
+	this.for_rendered(id,function(r){
+		r.style.cssText+=";"+style;
+	});
+	var ev = this.getEvent(id);
+	ev["_text_style"]=style;
+	this.event_updated(ev);
+};
+scheduler.validId=function(id){
+	return true;
+};
+
+scheduler._update_callback = function(upd,id){
+	var data		=	scheduler.xmlNodeToJSON(upd.firstChild);
+	data.text		=	data.text||data._tagvalue;
+	data.start_date	=	scheduler.templates.xml_date(data.start_date);
+	data.end_date	=	scheduler.templates.xml_date(data.end_date);
+	
+	scheduler.addEvent(data);
+};
\ No newline at end of file
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/codebase/ext/dhtmlxscheduler_active_links.js b/addons/base_calendar/static/lib/dhtmlxScheduler/codebase/ext/dhtmlxscheduler_active_links.js
new file mode 100644
index 00000000000..d7889307153
--- /dev/null
+++ b/addons/base_calendar/static/lib/dhtmlxScheduler/codebase/ext/dhtmlxscheduler_active_links.js
@@ -0,0 +1,9 @@
+/*
+dhtmlxScheduler v.2.3
+
+This software is allowed to use under GPL or you need to obtain Commercial or Enterise License
+to use it in not GPL project. Please contact sales@dhtmlx.com for details
+
+(c) DHTMLX Ltd.
+*/
+scheduler.attachEvent("onTemplatesReady",function(){var B=scheduler.date.str_to_date(scheduler.config.api_date);var C=scheduler.date.date_to_str(scheduler.config.api_date);var D=scheduler.templates.month_day;scheduler.templates.month_day=function(E){return"<a jump_to='"+C(E)+"' href='#'>"+D(E)+"</a>"};var A=scheduler.templates.week_scale_date;scheduler.templates.week_scale_date=function(E){return"<a jump_to='"+C(E)+"' href='#'>"+A(E)+"</a>"};dhtmlxEvent(this._obj,"click",function(E){var G=E.target||event.srcElement;var F=G.getAttribute("jump_to");if(F){scheduler.setCurrentView(B(F),"day")}})});
\ No newline at end of file
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/codebase/ext/dhtmlxscheduler_agenda_view.js b/addons/base_calendar/static/lib/dhtmlxScheduler/codebase/ext/dhtmlxscheduler_agenda_view.js
new file mode 100644
index 00000000000..c0293e8a2a8
--- /dev/null
+++ b/addons/base_calendar/static/lib/dhtmlxScheduler/codebase/ext/dhtmlxscheduler_agenda_view.js
@@ -0,0 +1,9 @@
+/*
+dhtmlxScheduler v.2.3
+
+This software is allowed to use under GPL or you need to obtain Commercial or Enterise License
+to use it in not GPL project. Please contact sales@dhtmlx.com for details
+
+(c) DHTMLX Ltd.
+*/
+scheduler.date.add_agenda=function(A){return(new Date(A.valueOf()))};scheduler.dblclick_dhx_agenda_area=function(){if(!this.config.readonly&&this.config.dblclick_create){this.addEventNow()}};scheduler.templates.agenda_time=function(C,A,B){if(B._timed){return this.day_date(B.start_date,B.end_date,B)+" "+this.event_date(C)}else{return scheduler.templates.day_date(C)+" &ndash; "+scheduler.templates.day_date(A)}};scheduler.templates.agenda_text=function(A){return A.text};scheduler.date.agenda_start=function(A){return A};scheduler.attachEvent("onTemplatesReady",function(){scheduler.attachEvent("onSchedulerResize",function(){if(this._mode=="agenda"){this.agenda_view(true);return false}return true});var A=scheduler.render_data;scheduler.render_data=function(D){if(this._mode=="agenda"){B()}else{return A.apply(this,arguments)}};function C(E){if(E){var D=scheduler.locale.labels;scheduler._els.dhx_cal_header[0].innerHTML="<div class='dhx_agenda_line'><div>"+D.date+"</div><span style='padding-left:25px'>"+D.description+"</span></div>";scheduler._table_view=true;scheduler.set_sizes()}}function B(){var D=scheduler._date;var H=scheduler.get_visible_events();H.sort(function(J,I){return J.start_date>I.start_date?1:-1});var G="<div class='dhx_agenda_area'>";for(var F=0;F<H.length;F++){G+="<div class='dhx_agenda_line' event_id='"+H[F].id+"' style='"+(H[F]._text_style||"")+"'><div>"+scheduler.templates.agenda_time(H[F].start_date,H[F].end_date,H[F])+"</div>";G+="<div class='dhx_event_icon icon_details'>&nbsp</div>";G+="<span>"+scheduler.templates.agenda_text(H[F])+"</span></div>"}G+="<div class='dhx_v_border'></div></div>";scheduler._els.dhx_cal_data[0].scrollTop=0;scheduler._els.dhx_cal_data[0].innerHTML=G;var E=scheduler._els.dhx_cal_data[0].firstChild.childNodes;scheduler._els.dhx_cal_date[0].innerHTML="";scheduler._rendered=[];for(var F=0;F<E.length-1;F++){scheduler._rendered[F]=E[F]}}scheduler.agenda_view=function(D){scheduler._min_date=scheduler.config.agenda_start||(new Date());scheduler._max_date=scheduler.config.agenda_end||(new Date(9999,1,1));scheduler._table_view=true;C(D);if(D){B()}else{}}});
\ No newline at end of file
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/codebase/ext/dhtmlxscheduler_collision.js b/addons/base_calendar/static/lib/dhtmlxScheduler/codebase/ext/dhtmlxscheduler_collision.js
new file mode 100644
index 00000000000..c57a07d1456
--- /dev/null
+++ b/addons/base_calendar/static/lib/dhtmlxScheduler/codebase/ext/dhtmlxscheduler_collision.js
@@ -0,0 +1 @@
+(function(){var C,D;var B;scheduler.config.collision_limit=1;scheduler.attachEvent("onBeforeDrag",function(I){var H=scheduler._props?scheduler._props[this._mode]:null;var F=scheduler.matrix?scheduler.matrix[this._mode]:null;var G=H||F;if(H){var E=G.map_to}if(F){var E=G.y_property}if((G)&&I){C=this.getEvent(I)[E];D=this.getEvent(I).start_date}return true});scheduler.attachEvent("onBeforeLightbox",function(F){var E=scheduler.getEvent(F);B=[E.start_date,E.end_date];return true});scheduler.attachEvent("onEventChanged",function(F){if(!F){return true}var E=scheduler.getEvent(F);if(!A(E)){if(!B){return false}E.start_date=B[0];E.end_date=B[1];E._timed=this.is_one_day_event(E)}return true});scheduler.attachEvent("onBeforeEventChanged",function(E,F,G){return A(E)});scheduler.attachEvent("onEventSave",function(F,E){if(E.rec_type){scheduler._roll_back_dates(E)}return A(E)});function A(N){var Q=[];if(N.rec_type){var F=scheduler.getRecDates(N);for(var I=0;I<F.length;I++){var M=scheduler.getEvents(F[I].start_date,F[I].end_date);for(var J=0;J<M.length;J++){if((M[J].event_pid||M[J].id)!=N.id){Q.push(M[J])}}}Q.push(N)}else{Q=scheduler.getEvents(N.start_date,N.end_date)}var E=scheduler._props?scheduler._props[scheduler._mode]:null;var O=scheduler.matrix?scheduler.matrix[scheduler._mode]:null;var H=E||O;if(E){var G=H.map_to}if(O){var G=H.y_property}var P=true;if(H){var L=0;for(var K=0;K<Q.length;K++){if(Q[K][G]==N[G]){L++}}if(L>scheduler.config.collision_limit){scheduler._drag_event.start_date=D;N[G]=C;P=false}}else{if(Q.length>scheduler.config.collision_limit){P=false}}if(!P){return !scheduler.callEvent("onEventCollision",[N,Q])}return P}})();
\ No newline at end of file
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/codebase/ext/dhtmlxscheduler_cookie.js b/addons/base_calendar/static/lib/dhtmlxScheduler/codebase/ext/dhtmlxscheduler_cookie.js
new file mode 100644
index 00000000000..0e58357f735
--- /dev/null
+++ b/addons/base_calendar/static/lib/dhtmlxScheduler/codebase/ext/dhtmlxscheduler_cookie.js
@@ -0,0 +1,9 @@
+/*
+dhtmlxScheduler v.2.3
+
+This software is allowed to use under GPL or you need to obtain Commercial or Enterise License
+to use it in not GPL project. Please contact sales@dhtmlx.com for details
+
+(c) DHTMLX Ltd.
+*/
+(function(){function B(E,D,F){var G=E+"="+F+(D?("; "+D):"");document.cookie=G}function A(E){var F=E+"=";if(document.cookie.length>0){var G=document.cookie.indexOf(F);if(G!=-1){G+=F.length;var D=document.cookie.indexOf(";",G);if(D==-1){D=document.cookie.length}return document.cookie.substring(G,D)}}return""}var C=true;scheduler.attachEvent("onBeforeViewChange",function(F,E,D,I){if(C){C=false;var G=A("scheduler_settings");if(G){G=G.split("@");G[0]=this.templates.xml_date(G[0]);this.setCurrentView(G[0],G[1]);return false}}var H=this.templates.xml_format(I||E)+"@"+(D||F);B("scheduler_settings","expires=Sun, 31 Jan 9999 22:00:00 GMT",H);return true})})();
\ No newline at end of file
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/codebase/ext/dhtmlxscheduler_editors.js b/addons/base_calendar/static/lib/dhtmlxScheduler/codebase/ext/dhtmlxscheduler_editors.js
new file mode 100644
index 00000000000..ad4d85b0a8e
--- /dev/null
+++ b/addons/base_calendar/static/lib/dhtmlxScheduler/codebase/ext/dhtmlxscheduler_editors.js
@@ -0,0 +1,9 @@
+/*
+dhtmlxScheduler v.2.3
+
+This software is allowed to use under GPL or you need to obtain Commercial or Enterise License
+to use it in not GPL project. Please contact sales@dhtmlx.com for details
+
+(c) DHTMLX Ltd.
+*/
+scheduler.form_blocks.combo={render:function(B){var A="";A+="<div class='"+B.type+"' style='height:"+(B.height||20)+"px;' ></div>";return A},set_value:function(F,H,E,C){if(F._combo){F._combo.destructor()}window.dhx_globalImgPath=C.image_path||"/";F._combo=new dhtmlXCombo(F,C.name,F.offsetWidth-8);F._combo.enableFilteringMode(!!C.filtering,C.script_path||null,!!C.cache);if(!C.script_path){var G=[];for(var D=0;D<C.options.length;D++){var A=[];A.push(C.options[D].key);A.push(C.options[D].label);G.push(A)}F._combo.addOption(G);if(E[C.map_to]){var B=F._combo.getIndexByValue(E[C.map_to]);F._combo.selectOption(B)}}else{F._combo.setComboValue(E[C.map_to]||null)}},get_value:function(D,C,A){var B=D._combo.getSelectedValue();return B},focus:function(A){}};scheduler.form_blocks.radio={render:function(C){var B="";B+="<div class='"+C.type+"' style='height:"+C.height+"px;' >";for(var A=0;A<C.options.length;A++){var D=scheduler.uid();B+="<input id='"+D+"' type='radio' name='"+C.name+"' value='"+C.options[A].key+"'><label for='"+D+"'> "+C.options[A].label+"</label>";if(C.vertical){B+="<br/>"}}B+="</div>";return B},set_value:function(D,F,C,A){var E=D.getElementsByTagName("input");for(var B=0;B<E.length;B++){E[B].checked=false;if(E[B].value==C[A.map_to]){E[B].checked=true}}},get_value:function(D,C,A){var E=D.getElementsByTagName("input");for(var B=0;B<E.length;B++){if(E[B].checked){return E[B].value}}},focus:function(A){}};scheduler.form_blocks.checkbox={render:function(A){return""},set_value:function(C,D,B,A){var F=scheduler.uid();var E=false;if(typeof A.checked_value!="undefined"&&B[A.map_to]==A.checked_value){E=true}C.previousSibling.className+=" dhx_cal_checkbox";C.previousSibling.innerHTML="<input id='"+F+"' type='checkbox' value='true' name='"+A.name+"'"+((E)?"checked='true'":"")+"'><label for='"+F+"'>"+(scheduler.locale.labels["section_"+A.name]||A.name)+"</label>"},get_value:function(C,B,A){var D=C.previousSibling.getElementsByTagName("input")[0];return(D.checked)?(A.checked_value||true):(A.unchecked_value||false)},focus:function(A){}};
\ No newline at end of file
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/codebase/ext/dhtmlxscheduler_expand.js b/addons/base_calendar/static/lib/dhtmlxScheduler/codebase/ext/dhtmlxscheduler_expand.js
new file mode 100644
index 00000000000..e05c11401d7
--- /dev/null
+++ b/addons/base_calendar/static/lib/dhtmlxScheduler/codebase/ext/dhtmlxscheduler_expand.js
@@ -0,0 +1,9 @@
+/*
+dhtmlxScheduler v.2.3
+
+This software is allowed to use under GPL or you need to obtain Commercial or Enterise License
+to use it in not GPL project. Please contact sales@dhtmlx.com for details
+
+(c) DHTMLX Ltd.
+*/
+scheduler.expand=function(){var A=scheduler._obj;do{A._position=A.style.position||"";A.style.position="static"}while((A=A.parentNode)&&A.style);A=scheduler._obj;A.style.position="absolute";A._width=A.style.width;A._height=A.style.height;A.style.width=A.style.height="100%";A.style.top=A.style.left="0px";var B=document.body;B.scrollTop=0;B=B.parentNode;if(B){B.scrollTop=0}document.body._overflow=document.body.style.overflow||"";document.body.style.overflow="hidden";scheduler._maximize()};scheduler.collapse=function(){var A=scheduler._obj;do{A.style.position=A._position}while((A=A.parentNode)&&A.style);A=scheduler._obj;A.style.width=A._width;A.style.height=A._height;document.body.style.overflow=document.body._overflow;scheduler._maximize()};scheduler.attachEvent("onTemplatesReady",function(){var A=document.createElement("DIV");A.className="dhx_expand_icon";scheduler.toggleIcon=A;scheduler._obj.appendChild(A);A.onclick=function(){if(!scheduler.expanded){scheduler.expand()}else{scheduler.collapse()}}});scheduler._maximize=function(){this.expanded=!this.expanded;this.toggleIcon.style.backgroundPosition="0px "+(this._expand?"0":"18")+"px";if(scheduler.callEvent("onSchedulerResize",[])){scheduler.update_view()}};
\ No newline at end of file
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/codebase/ext/dhtmlxscheduler_ext.css b/addons/base_calendar/static/lib/dhtmlxScheduler/codebase/ext/dhtmlxscheduler_ext.css
new file mode 100644
index 00000000000..3df5faaf9a0
--- /dev/null
+++ b/addons/base_calendar/static/lib/dhtmlxScheduler/codebase/ext/dhtmlxscheduler_ext.css
@@ -0,0 +1 @@
+.dhx_expand_icon{position:absolute;top:0;right:0;background-image:url(../imgs/colapce-expand-icon.gif);width:18px;height:18px;cursor:pointer;background-position:0 18px;z-index:16;}.dhx_agenda_area{width:100%;height:100%;overflow-y:auto;background-image:url(../imgs/databg.png);}.dhx_agenda_line{height:21px;clear:both;overflow:hidden;}.dhx_agenda_line div{float:left;width:188px;border-right:1px dotted #8894A3;text-align:center;line-height:21px;overflow:hidden;}.dhx_agenda_area .dhx_agenda_line div{border-right:0 dotted #8894A3;}.dhx_v_border{position:absolute;left:186px;top:0;border-right:1px dotted #8894A3;width:1px;height:100%;}.dhx_agenda_line .dhx_event_icon{width:20px;border-width:0;background:url(../imgs/icon.png) no-repeat;background-position:5px 4px;cursor:pointer;}.dhx_agenda_line span{padding-left:5px;line-height:21px;}.dhx_year_body{border-left:1px dotted #586A7E;}.dhx_year_week{height:20px;position:relative;}.dhx_scale_bar_last{border-right:1px dotted #586A7E;}.dhx_year_month{height:18px;padding-top:3px;border:1px dotted #586A7E;text-align:center;vertical-align:middle;}.dhx_year_body .dhx_before .dhx_month_head,.dhx_year_body .dhx_after .dhx_month_head,.dhx_year_body .dhx_before .dhx_month_head a,.dhx_year_body .dhx_after .dhx_month_head a{color:#E2E3E6!important;}.dhx_year_body .dhx_month_body{height:0;overflow:hidden;}.dhx_month_head.dhx_year_event{background-color:#FFE763;}.dhx_year_body .dhx_before .dhx_month_head,.dhx_year_body .dhx_after .dhx_month_head{cursor:default;}.dhx_tooltip{border:1px solid #BBB;background-image:url(../imgs/databg.png);position:absolute;z-index:9998;width:300px;height:auto;font-family:Tahoma;font-size:8pt;overflow:hidden;}.dhx_tooltip_line{line-height:20px;height:20px;overflow:hidden;}.dhx_tooltip_line .dhx_event_icon{width:20px;height:20px;padding-right:10px;float:left;border-width:0;position:relative;background:url(../imgs/icon.png) no-repeat;background-position:5px 4px;cursor:pointer;}.dhx_tooltip_date{float:left;width:auto;padding-left:5px;text-align:center;}.dhx_text_disabled{color:#887A2E;font-family:Tahoma;font-size:8pt;}.dhx_mini_calendar{-moz-box-shadow:5px 5px 5px #888;-khtml-box-shadow:5px 5px 5px #888;}.dhx_mini_calendar .dhx_month_head{cursor:pointer;}.dhx_mini_calendar .dhx_calendar_click{background-color:#C2D5FC;}.dhx_cal_navline div.dhx_minical_icon{width:18px;height:18px;left:190px;top:1px;cursor:pointer;background-image:url(../imgs/calendar.gif);}.dhx_matrix_cell,.dhx_matrix_scell{overflow:hidden;text-align:center;vertical-align:middle;border-bottom:1px dotted #8894A3;border-right:1px dotted #8894A3;}.dhx_matrix_cell{background-color:white;}.dhx_matrix_cell div,.dhx_matrix_scell div{overflow:hidden;text-align:center;width:100%;height:auto;}.dhx_cal_lsection .dhx_readonly{font-size:9pt;font-size:8pt;padding:2px;color:#887A2E;}.dhx_matrix_scell.folder,.dhx_data_table.folder .dhx_matrix_cell{background-color:#969394;cursor:pointer;}.dhx_matrix_scell .dhx_scell_level0{padding-left:5px;}.dhx_matrix_scell .dhx_scell_level1{padding-left:20px;}.dhx_matrix_scell .dhx_scell_level2{padding-left:35px;}.dhx_matrix_scell.folder{font-weight:bold;text-align:left;}.dhx_matrix_scell.folder .dhx_scell_expand{float:left;width:10px;padding-right:3px;}.dhx_matrix_scell.folder .dhx_scell_name{float:left;width:auto;}.dhx_matrix_scell.item .dhx_scell_name{padding-left:15px;text-align:left;}.dhx_section_timeline{overflow:hidden;padding:4px 0 2px 10px;}.dhx_section_timeline select{width:552px;}.dhx_map_area{width:100%;height:100%;overflow-y:auto;overflow-x:hidden;background-image:url(../imgs/databg.png);}.dhx_map_line .dhx_event_icon{width:20px;border-width:0;background:url(../imgs/icon.png) no-repeat;background-position:5px 4px;cursor:pointer;}.dhx_map_line{height:21px;clear:both;overflow:hidden;}.dhx_map{position:absolute;}.dhx_map_line div{float:left;border-right:1px dotted #8894A3;text-align:center;line-height:21px;overflow:hidden;}.dhx_map_line .headline_description{float:left;border-right:1px dotted #8894A3;text-align:center;line-height:21px;overflow:hidden;}.dhx_map_line .dhx_map_description{float:left;border-right:0 dotted #8894A3;text-align:center;line-height:21px;overflow:hidden;}.dhx_map_line .line_description{float:left;border-right:1px dotted #8894A3;text-align:left;padding-left:5px;line-height:21px;overflow:hidden;}.dhx_map_line.highlight{background-color:#C4C5CC;}.dhx_map_area .dhx_map_line div{border-right:0 dotted #8894A3;}.dhtmlXTooltip.tooltip{-moz-box-shadow:3px 3px 3px #888;-khtml-box-shadow:3px 3px 3px #888;background-color:white;border-left:1px dotted #887A2E;border-top:1px dotted #887A2E;color:#887A2E;cursor:default;padding:10px;position:absolute;z-index:500;}.dhx_cal_checkbox label{padding-left:5px;}.dhx_cal_light .radio{padding:2px 0 2px 10px;}.dhx_cal_light .radio input,.dhx_cal_light .radio label{line-height:15px;}.dhx_cal_light .radio input{vertical-align:middle;margin:0;padding:0;}.dhx_cal_light .radio label{vertical-align:middle;padding-right:10px;}.dhx_cal_light .combo{padding:4px;}
\ No newline at end of file
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/codebase/ext/dhtmlxscheduler_html_templates.js b/addons/base_calendar/static/lib/dhtmlxScheduler/codebase/ext/dhtmlxscheduler_html_templates.js
new file mode 100644
index 00000000000..2cdd254cae0
--- /dev/null
+++ b/addons/base_calendar/static/lib/dhtmlxScheduler/codebase/ext/dhtmlxscheduler_html_templates.js
@@ -0,0 +1,9 @@
+/*
+dhtmlxScheduler v.2.3
+
+This software is allowed to use under GPL or you need to obtain Commercial or Enterise License
+to use it in not GPL project. Please contact sales@dhtmlx.com for details
+
+(c) DHTMLX Ltd.
+*/
+scheduler.attachEvent("onTemplatesReady",function(){var B=document.body.getElementsByTagName("DIV");for(var A=0;A<B.length;A++){var C=B[A].className||"";C=C.split(":");if(C.length==2&&C[0]=="template"){var D='return "'+(B[A].innerHTML||"").replace(/\"/g,'\\"').replace(/[\n\r]+/g,"")+'";';D=unescape(D).replace(/\{event\.([a-z]+)\}/g,function(F,E){return'"+ev.'+E+'+"'});scheduler.templates[C[1]]=Function("start","end","ev",D);B[A].style.display="none"}}});
\ No newline at end of file
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/codebase/ext/dhtmlxscheduler_key_nav.js b/addons/base_calendar/static/lib/dhtmlxScheduler/codebase/ext/dhtmlxscheduler_key_nav.js
new file mode 100644
index 00000000000..fe30f87b7c0
--- /dev/null
+++ b/addons/base_calendar/static/lib/dhtmlxScheduler/codebase/ext/dhtmlxscheduler_key_nav.js
@@ -0,0 +1,9 @@
+/*
+dhtmlxScheduler v.2.3
+
+This software is allowed to use under GPL or you need to obtain Commercial or Enterise License
+to use it in not GPL project. Please contact sales@dhtmlx.com for details
+
+(c) DHTMLX Ltd.
+*/
+(function(){var A=false;scheduler.attachEvent("onBeforeLightbox",function(){A=true;return true});scheduler.attachEvent("onAfterLightbox",function(){A=false;return true});dhtmlxEvent(document,(_isOpera?"keypress":"keydown"),function(D){D=D||event;if(!A){if(D.keyCode==37||D.keyCode==39){D.cancelBubble=true;var B=scheduler.date.add(scheduler._date,(D.keyCode==37?-1:1),scheduler._mode);scheduler.setCurrentView(B);return true}else{if(D.ctrlKey&&D.keyCode==67){scheduler._copy_id=scheduler._select_id}else{if(D.ctrlKey&&D.keyCode==86){var C=scheduler.getEvent(scheduler._copy_id);if(C){var E=scheduler._copy_event(C);E.id=scheduler.uid();scheduler.addEvent(E)}}}}}})})();
\ No newline at end of file
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/codebase/ext/dhtmlxscheduler_limit.js b/addons/base_calendar/static/lib/dhtmlxScheduler/codebase/ext/dhtmlxscheduler_limit.js
new file mode 100644
index 00000000000..abb51472c55
--- /dev/null
+++ b/addons/base_calendar/static/lib/dhtmlxScheduler/codebase/ext/dhtmlxscheduler_limit.js
@@ -0,0 +1,9 @@
+/*
+dhtmlxScheduler v.2.3
+
+This software is allowed to use under GPL or you need to obtain Commercial or Enterise License
+to use it in not GPL project. Please contact sales@dhtmlx.com for details
+
+(c) DHTMLX Ltd.
+*/
+scheduler.config.limit_start=new Date(-3999,0,0);scheduler.config.limit_end=new Date(3999,0,0);scheduler.config.limit_view=false;(function(){var B=null;scheduler.attachEvent("onBeforeViewChange",function(E,D,C,F){F=F||D;C=C||E;if(scheduler.config.limit_view){if(F.valueOf()>scheduler.config.limit_end.valueOf()||this.date.add(F,1,C)<=scheduler.config.limit_start.valueOf()){setTimeout(function(){scheduler.setCurrentView(scheduler._date,C)},1);return false}}return true});var A=function(D){var E=scheduler.config;var C=(D.start_date.valueOf()>=E.limit_start.valueOf()&&D.end_date.valueOf()<=E.limit_end.valueOf());if(!C){scheduler._drag_id=null;scheduler._drag_mode=null;scheduler.callEvent("onLimitViolation",[D.id,D])}return C};scheduler.attachEvent("onBeforeDrag",function(C){if(!C){return true}return A(scheduler.getEvent(C))});scheduler.attachEvent("onClick",function(D,C){return A(scheduler.getEvent(D))});scheduler.attachEvent("onBeforeLightbox",function(D){var C=scheduler.getEvent(D);B=[C.start_date,C.end_date];return A(C)});scheduler.attachEvent("onEventAdded",function(D){if(!D){return true}var C=scheduler.getEvent(D);if(!A(C)){if(C.start_date<scheduler.config.limit_start){C.start_date=new Date(scheduler.config.limit_start)}if(C.end_date>scheduler.config.limit_end){C.end_date=new Date(scheduler.config.limit_end);C._timed=this.is_one_day_event(C)}if(C.start_date>C.end_date){C.end_date=this.date.add(C.start_date,(this.config.event_duration||this.config.time_step),"minute")}}return true});scheduler.attachEvent("onEventChanged",function(D){if(!D){return true}var C=scheduler.getEvent(D);if(!A(C)){if(!B){return false}C.start_date=B[0];C.end_date=B[1];C._timed=this.is_one_day_event(C)}return true});scheduler.attachEvent("onBeforeEventChanged",function(D,C,E){return A(D)})})();
\ No newline at end of file
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/codebase/ext/dhtmlxscheduler_map_view.js b/addons/base_calendar/static/lib/dhtmlxScheduler/codebase/ext/dhtmlxscheduler_map_view.js
new file mode 100644
index 00000000000..4404ea13eb4
--- /dev/null
+++ b/addons/base_calendar/static/lib/dhtmlxScheduler/codebase/ext/dhtmlxscheduler_map_view.js
@@ -0,0 +1,9 @@
+/*
+dhtmlxScheduler v.2.3
+
+This software is allowed to use under GPL or you need to obtain Commercial or Enterise License
+to use it in not GPL project. Please contact sales@dhtmlx.com for details
+
+(c) DHTMLX Ltd.
+*/
+scheduler.xy.map_date_width=188;scheduler.xy.map_description_width=400;scheduler.config.map_resolve_event_location=true;scheduler.config.map_resolve_user_location=true;scheduler.config.map_initial_position=new google.maps.LatLng(48.724,8.215);scheduler.config.map_error_position=new google.maps.LatLng(15,15);scheduler.config.map_infowindow_max_width=300;scheduler.config.map_type=google.maps.MapTypeId.ROADMAP;scheduler.config.map_zoom_after_resolve=15;scheduler.locale.labels.marker_geo_success="It seems you are here.";scheduler.locale.labels.marker_geo_fail="Sorry, could not get your current position using geolocation.";scheduler.templates.marker_date=scheduler.date.date_to_str("%Y-%m-%d %H:%i");scheduler.templates.marker_text=function(C,A,B){return"<div><b>"+B.text+"</b><br/><br/>"+(B.event_location||"")+"<br/><br/>"+scheduler.templates.marker_date(C)+" - "+scheduler.templates.marker_date(A)+"</div>"};scheduler.dblclick_dhx_map_area=function(){if(!this.config.readonly&&this.config.dblclick_create){this.addEventNow()}};scheduler.templates.map_time=function(C,A,B){if(B._timed){return this.day_date(B.start_date,B.end_date,B)+" "+this.event_date(C)}else{return scheduler.templates.day_date(C)+" &ndash; "+scheduler.templates.day_date(A)}};scheduler.templates.map_text=function(A){return A.text};scheduler.date.map_start=function(A){return A};scheduler.attachEvent("onTemplatesReady",function(){function D(){_isPositionSet=false;var H=document.createElement("div");H.className="dhx_map";H.id="dhx_gmap";H.style.dispay="none";node=document.getElementById("scheduler_here");node.appendChild(H);scheduler._els.dhx_gmap=[];scheduler._els.dhx_gmap.push(H);C("dhx_gmap");var G={zoom:scheduler.config.map_inital_zoom||10,center:scheduler.config.map_initial_position,mapTypeId:scheduler.config.map_type||google.maps.MapTypeId.ROADMAP};map=new google.maps.Map(document.getElementById("dhx_gmap"),G);map.disableDefaultUI=false;map.disableDoubleClickZoom=true;google.maps.event.addListener(map,"dblclick",function(J){if(!scheduler.config.readonly&&scheduler.config.dblclick_create){point=J.latLng;geocoder.geocode({latLng:point},function(L,K){if(K==google.maps.GeocoderStatus.OK){point=L[0].geometry.location;scheduler.addEventNow({lat:point.lat(),lng:point.lng(),event_location:L[0].formatted_address})}})}});var I={content:""};if(scheduler.config.map_infowindow_max_width){I.maxWidth=scheduler.config.map_infowindow_max_width}scheduler.map={_points:[],_markers:[],_infowindow:new google.maps.InfoWindow(I),_infowindows_content:[],_initialization_count:-1};geocoder=new google.maps.Geocoder();if(scheduler.config.map_resolve_user_location){if(navigator.geolocation){if(!_isPositionSet){navigator.geolocation.getCurrentPosition(function(J){var K=new google.maps.LatLng(J.coords.latitude,J.coords.longitude);map.setCenter(K);map.setZoom(scheduler.config.map_zoom_after_resolve||10);scheduler.map._infowindow.setContent(scheduler.locale.labels.marker_geo_success);scheduler.map._infowindow.position=map.getCenter();scheduler.map._infowindow.open(map);_isPositionSet=true},function(){scheduler.map._infowindow.setContent(scheduler.locale.labels.marker_geo_fail);scheduler.map._infowindow.setPosition(map.getCenter());scheduler.map._infowindow.open(map);_isPositionSet=true})}}}google.maps.event.addListener(map,"resize",function(J){H.style.zIndex="5";map.setZoom(map.getZoom())});google.maps.event.addListener(map,"tilesloaded",function(J){H.style.zIndex="5"})}D();scheduler.attachEvent("onSchedulerResize",function(){if(this._mode=="map"){this.map_view(true)}});var A=scheduler.render_data;scheduler.render_data=function(G,J){if(this._mode=="map"){E();var I=scheduler.get_visible_events();for(var H=0;H<I.length;H++){if(!scheduler.map._markers[I[H].id]){B(I[H],false,false)}}}else{return A.apply(this,arguments)}};function F(H){if(H){var G=scheduler.locale.labels;scheduler._els.dhx_cal_header[0].innerHTML="<div class='dhx_map_line' style='width: "+(scheduler.xy.map_date_width+scheduler.xy.map_description_width+2)+"px;' ><div style='width: "+scheduler.xy.map_date_width+"px;'>"+G.date+"</div><div class='headline_description' style='width: "+scheduler.xy.map_description_width+"px;'>"+G.description+"</div></div>";scheduler._table_view=true;scheduler.set_sizes()}}function E(){var H=scheduler._date;var L=scheduler.get_visible_events();L.sort(function(N,M){return N.start_date>M.start_date?1:-1});var K="<div class='dhx_map_area'>";for(var J=0;J<L.length;J++){var G=(L[J].id==scheduler._selected_event_id)?"dhx_map_line highlight":"dhx_map_line";K+="<div class='"+G+"' event_id='"+L[J].id+"' style='"+(L[J]._text_style||"")+" width: "+(scheduler.xy.map_date_width+scheduler.xy.map_description_width+2)+"px;'><div style='width: "+scheduler.xy.map_date_width+"px;' >"+scheduler.templates.map_time(L[J].start_date,L[J].end_date,L[J])+"</div>";K+="<div class='dhx_event_icon icon_details'>&nbsp</div>";K+="<div class='line_description' style='width:"+(scheduler.xy.map_description_width-25)+"px;'>"+scheduler.templates.map_text(L[J])+"</div></div>"}K+="<div class='dhx_v_border' style='left: "+(scheduler.xy.map_date_width-2)+"px;'></div><div class='dhx_v_border_description'></div></div>";scheduler._els.dhx_cal_data[0].scrollTop=0;scheduler._els.dhx_cal_data[0].innerHTML=K;scheduler._els.dhx_cal_data[0].style.width=(scheduler.xy.map_date_width+scheduler.xy.map_description_width+1)+"px";var I=scheduler._els.dhx_cal_data[0].firstChild.childNodes;scheduler._els.dhx_cal_date[0].innerHTML="";scheduler._rendered=[];for(var J=0;J<I.length-2;J++){scheduler._rendered[J]=I[J]}}function C(G){var H=document.getElementById(G);H.style.height=(scheduler._y-scheduler.xy.nav_height)+"px";H.style.width=(scheduler._x-scheduler.xy.map_date_width-scheduler.xy.map_description_width-1)+"px";H.style.marginLeft=(scheduler.xy.map_date_width+scheduler.xy.map_description_width+1)+"px";H.style.marginTop=(scheduler.xy.nav_height+2)+"px"}scheduler.map_view=function(J){scheduler.map._initialization_count++;var I=scheduler._els.dhx_gmap[0];scheduler._els.dhx_cal_data[0].style.width=(scheduler.xy.map_date_width+scheduler.xy.map_description_width+1)+"px";scheduler._min_date=scheduler.config.map_start||(new Date());scheduler._max_date=scheduler.config.map_end||(new Date(9999,1,1));scheduler._table_view=true;F(J);if(J){E();I.style.display="block";C("dhx_gmap");var H=scheduler.get_visible_events();for(var G=0;G<H.length;G++){if(!scheduler.map._markers[H[G].id]){B(H[G])}}}else{I.style.display="none"}google.maps.event.trigger(map,"resize");if(scheduler.map._initialization_count===0){map.setCenter(scheduler.config.map_initial_position)}};function B(K,H,I){if(K.lat&&K.lng){var G=new google.maps.LatLng(K.lat,K.lng)}else{var G=scheduler.config.map_error_position}var J=scheduler.templates.marker_text(K.start_date,K.end_date,K);if(!scheduler._new_event){scheduler.map._markers[K.id]=new google.maps.Marker({position:G,map:map});scheduler.map._infowindows_content[K.id]=J;google.maps.event.addListener(scheduler.map._markers[K.id],"click",function(){scheduler.map._infowindow.setContent(scheduler.map._infowindows_content[K.id]);scheduler.map._infowindow.open(map,scheduler.map._markers[K.id]);scheduler._selected_event_id=K.id;scheduler.render_data()});scheduler.map._points[K.id]=G;if(H){map.setCenter(scheduler.map._points[K.id])}if(I){scheduler.callEvent("onClick",[K.id])}}}scheduler.attachEvent("onClick",function(I,G){if(this._mode=="map"){scheduler._selected_event_id=I;for(var H=0;H<scheduler._rendered.length;H++){scheduler._rendered[H].className="dhx_map_line";if(scheduler._rendered[H].getAttribute("event_id")==I){scheduler._rendered[H].className+=" highlight"}}if(scheduler.map._points[I]&&scheduler.map._markers[I]){map.panTo(scheduler.map._points[I]);google.maps.event.trigger(scheduler.map._markers[I],"click")}}return true});_displayEventOnMap=function(G){if(G.event_location&&geocoder){geocoder.geocode({address:G.event_location},function(J,I){var H={};if(I!=google.maps.GeocoderStatus.OK){H=scheduler.callEvent("onLocationError",[G.id]);if(!H||H===true){H=scheduler.config.map_error_position}}else{H=J[0].geometry.location}G.lat=H.lat();G.lng=H.lng();scheduler._selected_event_id=G.id;B(G,true,true);dp.setUpdated(G.id,true,"updated")})}else{B(G,true,true)}};_updateEventLocation=function(G){if(G.event_location&&geocoder){geocoder.geocode({address:G.event_location},function(J,I){var H={};if(I!=google.maps.GeocoderStatus.OK){H=scheduler.callEvent("onLocationError",[G.id]);if(!H||H===true){H=scheduler.config.map_error_position}}else{H=J[0].geometry.location}G.lat=H.lat();G.lng=H.lng();dp.setUpdated(G.id,true,"updated")})}};_delay=function(J,H,I,G){setTimeout(function(){var K=J.apply(H,I);J=obj=I=null;return K},G||1000)};scheduler.attachEvent("onEventChanged",function(H,I){if(scheduler.is_visible_events(scheduler.getEvent(H))){scheduler.map._markers[H].setMap(null);var G=scheduler.getEvent(H);_displayEventOnMap(G)}else{scheduler.map._infowindow.close();scheduler.map._markers[H].setMap(null)}return true});scheduler.attachEvent("onEventIdChange",function(H,G){if(scheduler.is_visible_events(scheduler.getEvent(G))){if(scheduler.map._markers[H]){scheduler.map._markers[H].setMap(null)}var I=scheduler.getEvent(G);_displayEventOnMap(I)}return true});scheduler.attachEvent("onBeforeEventDelete",function(G,H){if(scheduler.map._markers[G]){scheduler.map._markers[G].setMap(null)}scheduler.map._infowindow.close();return true});scheduler._event_resolve_delay=500;scheduler.attachEvent("onEventLoading",function(G){if(scheduler.config.map_resolve_event_location&&G.event_location&&!G.lat&&!G.lng){scheduler._event_resolve_delay+=500;_delay(_updateEventLocation,this,[G],scheduler._event_resolve_delay)}return true});scheduler.attachEvent("onEventCancel",function(G,H){if(H){if(scheduler.map._markers[G]){scheduler.map._markers[G].setMap(null)}scheduler.map._infowindow.close()}return true})});
\ No newline at end of file
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/codebase/ext/dhtmlxscheduler_minical.js b/addons/base_calendar/static/lib/dhtmlxScheduler/codebase/ext/dhtmlxscheduler_minical.js
new file mode 100644
index 00000000000..99289260210
--- /dev/null
+++ b/addons/base_calendar/static/lib/dhtmlxScheduler/codebase/ext/dhtmlxscheduler_minical.js
@@ -0,0 +1,9 @@
+/*
+dhtmlxScheduler v.2.3
+
+This software is allowed to use under GPL or you need to obtain Commercial or Enterise License
+to use it in not GPL project. Please contact sales@dhtmlx.com for details
+
+(c) DHTMLX Ltd.
+*/
+scheduler.templates.calendar_month=scheduler.date.date_to_str("%F %Y");scheduler.templates.calendar_scale_date=scheduler.date.date_to_str("%D");scheduler.templates.calendar_date=scheduler.date.date_to_str("%d");scheduler.renderCalendar=function(G,A){var B=null;var D=G.date||(new Date());if(typeof D=="string"){D=this.templates.api_date(D)}if(!A){var M=G.container;var K=G.position;if(typeof M=="string"){M=document.getElementById(M)}if(typeof K=="string"){K=document.getElementById(K)}if(K&&(typeof K.left=="undefined")){var H=getOffset(K);K={top:H.top+K.offsetHeight,left:H.left}}if(!M){M=scheduler._get_def_cont(K)}B=this._render_calendar(M,D,G);B.onclick=function(P){P=P||event;var Q=P.target||P.srcElement;if(Q.className.indexOf("dhx_month_head")!=-1){var O=Q.parentNode.className;if(O.indexOf("dhx_after")==-1&&O.indexOf("dhx_before")==-1){var N=scheduler.templates.xml_date(this.getAttribute("date"));N.setDate(parseInt(Q.innerHTML,10));scheduler.unmarkCalendar(this);scheduler.markCalendar(this,N,"dhx_calendar_click");this._last_date=N;if(this.conf.handler){this.conf.handler.call(scheduler,N,this)}}}}}else{B=this._render_calendar(A.parentNode,D,G,A);scheduler.unmarkCalendar(B)}var C=scheduler.date.month_start(D);var E=scheduler.date.add(C,1,"month");var L=this.getEvents(C,E);for(var F=0;F<L.length;F++){var J=L[F];var I=J.start_date;if(I.valueOf()<C.valueOf()){I=C}while(I<=J.end_date){this.markCalendar(B,I,"dhx_year_event");I=this.date.add(I,1,"day");if(I.valueOf()>=E.valueOf()){break}}}B.conf=G;return B};scheduler._get_def_cont=function(A){if(!this._def_count){this._def_count=document.createElement("DIV");this._def_count.style.cssText="position:absolute;z-index:10100;width:251px; height:175px;";this._def_count.onclick=function(B){(B||event).cancelBubble=true};document.body.appendChild(this._def_count)}this._def_count.style.left=A.left+"px";this._def_count.style.top=A.top+"px";this._def_count._created=new Date();return this._def_count};scheduler._locateCalendar=function(C,A){var B=C.childNodes[2].childNodes[0];if(typeof A=="string"){A=scheduler.templates.api_date(A)}var D=C.week_start+A.getDate()-1;return B.rows[Math.floor(D/7)].cells[D%7].firstChild};scheduler.markCalendar=function(C,A,B){this._locateCalendar(C,A).className+=" "+B};scheduler.unmarkCalendar=function(D,A,B){A=A||D._last_date;B=B||"dhx_calendar_click";if(!A){return }var C=this._locateCalendar(D,A);C.className=(C.className||"").replace(RegExp(B,"g"))};scheduler._week_template=function(B){var F=(B||250);var E=0;var C=document.createElement("div");var D=this.date.week_start(new Date());for(var A=0;A<7;A++){this._cols[A]=Math.floor(F/(7-A));this._render_x_header(A,E,D,C);D=this.date.add(D,1,"day");F-=this._cols[A];E+=this._cols[A]}C.lastChild.className+=" dhx_scale_bar_last";return C};scheduler.updateCalendar=function(B,A){B.conf.date=A;this.renderCalendar(B.conf,B)};scheduler._mini_cal_arrows=["&nbsp","&nbsp"];scheduler._render_calendar=function(G,A,F,D){var B=scheduler.templates;var K=this._cols;this._cols=[];var S=this._mode;this._mode="calendar";var R=this._colsS;this._colsS={height:0};var Q=new Date(this._min_date);var O=new Date(this._max_date);var N=new Date(scheduler._date);var L=B.month_day;B.month_day=B.calendar_date;A=this.date.month_start(A);var E=this._week_template(G.offsetWidth-1);var M;if(D){M=D}else{var M=document.createElement("DIV");M.className="dhx_cal_container dhx_mini_calendar"}M.setAttribute("date",this.templates.xml_format(A));M.innerHTML="<div class='dhx_year_month'></div><div class='dhx_year_week'>"+E.innerHTML+"</div><div class='dhx_year_body'></div>";M.childNodes[0].innerHTML=this.templates.calendar_month(A);if(F.navigation){var C=document.createElement("DIV");C.className="dhx_cal_prev_button";C.style.cssText="left:1px;top:2px;position:absolute;";C.innerHTML=this._mini_cal_arrows[0];M.firstChild.appendChild(C);C.onclick=function(){scheduler.updateCalendar(M,scheduler.date.add(M._date,-1,"month"))};C=document.createElement("DIV");C.className="dhx_cal_next_button";C.style.cssText="left:auto; right:1px;top:2px;position:absolute;";C.innerHTML=this._mini_cal_arrows[1];M.firstChild.appendChild(C);C.onclick=function(){scheduler.updateCalendar(M,scheduler.date.add(M._date,1,"month"))};M._date=new Date(A)}M.week_start=(A.getDay()-(this.config.start_on_monday?1:0)+7)%7;var P=this.date.week_start(A);this._reset_month_scale(M.childNodes[2],A,P);var I=M.childNodes[2].firstChild.rows;for(var J=I.length;J<6;J++){I[0].parentNode.appendChild(I[0].cloneNode(true));for(var H=0;H<I[J].childNodes.length;H++){I[J].childNodes[H].className="dhx_after"}}if(!D){G.appendChild(M)}this._cols=K;this._mode=S;this._colsS=R;this._min_date=Q;this._max_date=O;scheduler._date=N;B.month_day=L;return M};scheduler.destroyCalendar=function(B,A){if(!B&&this._def_count&&this._def_count.firstChild){if(A||(new Date()).valueOf()-this._def_count._created.valueOf()>500){B=this._def_count.firstChild}}if(!B){return }B.onclick=null;B.innerHTML="";if(B.parentNode){B.parentNode.removeChild(B)}if(this._def_count){this._def_count.style.top="-1000px"}};scheduler.isCalendarVisible=function(){if(this._def_count&&parseInt(this._def_count.style.top,10)>0){return this._def_count}return false};scheduler.attachEvent("onTemplatesReady",function(){dhtmlxEvent(document.body,"click",function(){scheduler.destroyCalendar()})});scheduler.templates.calendar_time=scheduler.date.date_to_str("%d-%m-%Y");scheduler.form_blocks.calendar_time={render:function(){var D="<input class='dhx_readonly' type='text' readonly='true'>";var B=scheduler.config;var E=this.date.date_part(new Date());if(B.first_hour){E.setHours(B.first_hour)}D+=" <select>";for(var C=60*B.first_hour;C<60*B.last_hour;C+=this.config.time_step*1){var F=this.templates.time_picker(E);D+="<option value='"+C+"'>"+F+"</option>";E=this.date.add(E,this.config.time_step,"minute")}D+="</select>";var A=scheduler.config.full_day;return"<div style='height:30px; padding-top:0px; font-size:inherit;' class='dhx_cal_lsection dhx_section_time'>"+D+"<span style='font-weight:normal; font-size:10pt;'> &nbsp;&ndash;&nbsp; </span>"+D+"</div>"},set_value:function(B,K,H){var D=B.getElementsByTagName("input");var F=B.getElementsByTagName("select");var A=function(N,L,M){N.onclick=function(){scheduler.destroyCalendar(null,true);scheduler.renderCalendar({position:N,date:new Date(this._date),navigation:true,handler:function(O){N.value=scheduler.templates.calendar_time(O);N._date=new Date(O);scheduler.destroyCalendar();if(scheduler.config.event_duration&&M==0){J()}}})}};if(scheduler.config.full_day){if(!B._full_day){B.previousSibling.innerHTML+="<div class='dhx_fullday_checkbox'><label><input type='checkbox' name='full_day' value='true'> "+scheduler.locale.labels.full_day+"&nbsp;</label></input></div>";B._full_day=true}var I=B.previousSibling.getElementsByTagName("input")[0];var E=(scheduler.date.time_part(H.start_date)==0&&scheduler.date.time_part(H.end_date)==0&&H.end_date.valueOf()-H.start_date.valueOf()<2*24*60*60*1000);I.checked=E;for(var C in F){F[C].disabled=I.checked}for(var C=0;C<D.length-1;C++){D[C].disabled=I.checked}I.onclick=function(){if(I.checked==true){var M=new Date(H.start_date);var P=new Date(H.end_date);scheduler.date.date_part(M);P=scheduler.date.add(M,1,"day")}var O=M||H.start_date;var L=P||H.end_date;G(D[0],O);G(D[1],L);F[0].value=O.getHours()*60+O.getMinutes();F[1].value=L.getHours()*60+L.getMinutes();for(var N in F){F[N].disabled=I.checked}for(var N=0;N<D.length-1;N++){D[N].disabled=I.checked}}}if(scheduler.config.event_duration){function J(){H.start_date=scheduler.date.add(D[0]._date,F[0].value,"minute");H.end_date.setTime(H.start_date.getTime()+(scheduler.config.event_duration*60*1000));D[1].value=scheduler.templates.calendar_time(H.end_date);D[1]._date=scheduler.date.date_part(new Date(H.end_date));F[1].value=H.end_date.getHours()*60+H.end_date.getMinutes()}for(var C in F){F[C].onchange=J}}function G(N,L,M){A(N,L,M);N.value=scheduler.templates.calendar_time(L);N._date=scheduler.date.date_part(new Date(L))}G(D[0],H.start_date,0);G(D[1],H.end_date,1);A=function(){};F[0].value=H.start_date.getHours()*60+H.start_date.getMinutes();F[1].value=H.end_date.getHours()*60+H.end_date.getMinutes()},get_value:function(D,C){var A=D.getElementsByTagName("input");var B=D.getElementsByTagName("select");C.start_date=scheduler.date.add(A[0]._date,B[0].value,"minute");C.end_date=scheduler.date.add(A[1]._date,B[1].value,"minute");if(C.end_date<=C.start_date){C.end_date=scheduler.date.add(C.start_date,scheduler.config.time_step,"minute")}},focus:function(A){}};scheduler.linkCalendar=function(B,C){var A=function(){var D=scheduler._date;var G=scheduler._mode;var F=new Date(D.valueOf());if(C){F=C(F)}F.setDate(1);scheduler.updateCalendar(B,F);if(!C){if(G=="day"){scheduler.markCalendar(B,D,"dhx_calendar_click")}else{if(G=="week"){F=scheduler.date.week_start(new Date(D.valueOf()));for(i=0;i<7;i++){var E=F.getMonth()+F.getYear()*12-D.getMonth()-D.getYear()*12;if(E&&E>0){continue}scheduler.markCalendar(B,F,"dhx_calendar_click");F=scheduler.date.add(F,1,"day")}}}}return true};scheduler.attachEvent("onViewChange",A);scheduler.attachEvent("onXLE",A);scheduler.attachEvent("onEventAdded",A);scheduler.attachEvent("onEventChanged",A);scheduler.attachEvent("onAfterEventDelete",A);A()};
\ No newline at end of file
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/codebase/ext/dhtmlxscheduler_multiselect.js b/addons/base_calendar/static/lib/dhtmlxScheduler/codebase/ext/dhtmlxscheduler_multiselect.js
new file mode 100644
index 00000000000..994620d363a
--- /dev/null
+++ b/addons/base_calendar/static/lib/dhtmlxScheduler/codebase/ext/dhtmlxscheduler_multiselect.js
@@ -0,0 +1,9 @@
+/*
+dhtmlxScheduler v.2.3
+
+This software is allowed to use under GPL or you need to obtain Commercial or Enterise License
+to use it in not GPL project. Please contact sales@dhtmlx.com for details
+
+(c) DHTMLX Ltd.
+*/
+scheduler.form_blocks.multiselect={render:function(C){var B="<div class='dhx_multi_select_"+C.name+"' style='overflow: auto; height: "+C.height+"px; position: relative;' >";for(var A=0;A<C.options.length;A++){B+="<label><input type='checkbox' value='"+C.options[A].key+"'/>"+C.options[A].label+"</label>";if(convertStringToBoolean(C.vertical)){B+="<br/>"}}B+="</div>";return B},set_value:function(C,J,I,A){var E=C.getElementsByTagName("input");for(var G=0;G<E.length;G++){E[G].checked=false}function H(M){var L=C.getElementsByTagName("input");for(var K=0;K<L.length;K++){L[K].checked=!!M[L[K].value]}}if(!scheduler._new_event){var D=[];if(I[A.map_to]){var F=I[A.map_to].split(",");for(var G=0;G<F.length;G++){D[F[G]]=true}H(D)}else{var B=document.createElement("div");B.className="dhx_loading";B.style.cssText="position: absolute; top: 40%; left: 40%;";C.appendChild(B);dhtmlxAjax.get(A.script_url+"?dhx_crosslink_"+A.map_to+"="+I.id+"&uid="+scheduler.uid(),function(K){var M=K.doXPath("//data/item");var N=[];for(var L=0;L<M.length;L++){N[M[L].getAttribute(A.map_to)]=true}H(N);C.removeChild(B)})}}},get_value:function(F,E,A){var C=[];var D=F.getElementsByTagName("input");for(var B=0;B<D.length;B++){if(D[B].checked){C.push(D[B].value)}}return C.join(",")},focus:function(A){}};
\ No newline at end of file
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/codebase/ext/dhtmlxscheduler_multisource.js b/addons/base_calendar/static/lib/dhtmlxScheduler/codebase/ext/dhtmlxscheduler_multisource.js
new file mode 100644
index 00000000000..9efd88a39f9
--- /dev/null
+++ b/addons/base_calendar/static/lib/dhtmlxScheduler/codebase/ext/dhtmlxscheduler_multisource.js
@@ -0,0 +1,9 @@
+/*
+dhtmlxScheduler v.2.3
+
+This software is allowed to use under GPL or you need to obtain Commercial or Enterise License
+to use it in not GPL project. Please contact sales@dhtmlx.com for details
+
+(c) DHTMLX Ltd.
+*/
+(function(){function B(D){var C=function(){};C.prototype=D;return C}var A=scheduler._load;scheduler._load=function(C,F){C=C||this._load_url;if(typeof C=="object"){var E=B(this._loaded);for(var D=0;D<C.length;D++){this._loaded=new E();A.call(this,C[D],F)}}else{A.apply(this,arguments)}}})();
\ No newline at end of file
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/codebase/ext/dhtmlxscheduler_outerdrag.js b/addons/base_calendar/static/lib/dhtmlxScheduler/codebase/ext/dhtmlxscheduler_outerdrag.js
new file mode 100644
index 00000000000..38ca0b7b192
--- /dev/null
+++ b/addons/base_calendar/static/lib/dhtmlxScheduler/codebase/ext/dhtmlxscheduler_outerdrag.js
@@ -0,0 +1,9 @@
+/*
+dhtmlxScheduler v.2.3
+
+This software is allowed to use under GPL or you need to obtain Commercial or Enterise License
+to use it in not GPL project. Please contact sales@dhtmlx.com for details
+
+(c) DHTMLX Ltd.
+*/
+scheduler.attachEvent("onTemplatesReady",function(){var C=(new dhtmlDragAndDropObject());var B=C.stopDrag;var A;C.stopDrag=function(D){A=D||event;return B.apply(this,arguments)};C.addDragLanding(scheduler._els.dhx_cal_data[0],{_drag:function(F,G,D){var E=scheduler.attachEvent("onEventCreated",function(I,H){if(!scheduler.callEvent("onExternalDragIn",[I,F,H])){this._drag_mode=this._drag_id=null;this.deleteEvent(I)}});if(scheduler.matrix[scheduler._mode]){scheduler.dblclick_dhx_matrix_cell(A)}else{scheduler._on_dbl_click(A)}scheduler.detachEvent(E)},_dragIn:function(E,D){return E},_dragOut:function(D){return this}})});
\ No newline at end of file
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/codebase/ext/dhtmlxscheduler_pdf.js b/addons/base_calendar/static/lib/dhtmlxScheduler/codebase/ext/dhtmlxscheduler_pdf.js
new file mode 100644
index 00000000000..c9a6a5352c6
--- /dev/null
+++ b/addons/base_calendar/static/lib/dhtmlxScheduler/codebase/ext/dhtmlxscheduler_pdf.js
@@ -0,0 +1,9 @@
+/*
+dhtmlxScheduler v.2.3
+
+This software is allowed to use under GPL or you need to obtain Commercial or Enterise License
+to use it in not GPL project. Please contact sales@dhtmlx.com for details
+
+(c) DHTMLX Ltd.
+*/
+scheduler.toPDF=function(C,J,P,L){var I=0;var H=0;var F=false;if(J=="fullcolor"){F=true;J="color"}J=J||"color";function M(T){T=parseFloat(T);if(isNaN(T)){return"auto"}return 100*T/I}function Q(T){T=parseFloat(T);if(isNaN(T)){return"auto"}return 100*T/H}function O(U){var T="";for(var V=0;V<U.length;V++){T+="\n<column><![CDATA["+U[V].innerHTML+"]]></column>"}I=U[0].offsetWidth;return T}function G(V,W){var T=parseInt(V.style.left);for(var U=0;U<scheduler._cols.length;U++){T-=scheduler._cols[U];if(T<0){return U}}return W}function N(U,W){var V=parseInt(U.style.top);for(var T=0;T<scheduler._colsS.heights.length;T++){if(scheduler._colsS.heights[T]>V){return T}}return W}function A(W){var U="";var X=W.firstChild.rows;for(var V=0;V<X.length;V++){var Y=[];for(var T=0;T<X[V].cells.length;T++){Y.push(X[V].cells[T].firstChild.innerHTML)}U+="\n<row height='"+W.firstChild.rows[V].cells[0].offsetHeight+"'><![CDATA["+Y.join("|")+"]]></row>";H=W.firstChild.rows[0].cells[0].offsetHeight}return U}function S(X){var U="<data profile='"+X+"'";if(P){U+=" header='"+P+"'"}if(L){U+=" footer='"+L+"'"}U+=">";U+="<scale mode='"+scheduler._mode+"' today='"+scheduler._els.dhx_cal_date[0].innerHTML+"'>";if(scheduler._mode=="agenda"){var T=scheduler._els.dhx_cal_header[0].childNodes[0].childNodes;U+="<column>"+T[0].innerHTML+"</column><column>"+T[1].innerHTML+"</column>"}else{if(scheduler._mode=="year"){var T=scheduler._els.dhx_cal_data[0].childNodes;for(var V=0;V<T.length;V++){U+="<month label='"+T[V].childNodes[0].innerHTML+"'>";U+=O(T[V].childNodes[1].childNodes);U+=A(T[V].childNodes[2]);U+="</month>"}}else{U+="<x>";var T=scheduler._els.dhx_cal_header[0].childNodes;U+=O(T);U+="</x>";var W=scheduler._els.dhx_cal_data[0];if(W.firstChild.tagName=="TABLE"){U+=A(W)}else{W=W.childNodes[W.childNodes.length-1];while(W.className.indexOf("dhx_scale_holder")==-1){W=W.previousSibling}W=W.childNodes;U+="<y>";for(var V=0;V<W.length;V++){U+="\n<row><![CDATA["+W[V].innerHTML+"]]></row>"}U+="</y>";H=W[0].offsetHeight}}}U+="</scale>";return U}function E(U,T){return(window.getComputedStyle?(window.getComputedStyle(U,null)[T]):(U.currentStyle?U.currentStyle[T]:null))||""}function B(){var b="";var j=scheduler._rendered;if(scheduler._mode=="agenda"){for(var Z=0;Z<j.length;Z++){b+="<event><head>"+j[Z].childNodes[0].innerHTML+"</head><body>"+j[Z].childNodes[2].innerHTML+"</body></event>"}}else{if(scheduler._mode=="year"){var j=scheduler.get_visible_events();for(var Z=0;Z<j.length;Z++){var f=j[Z].start_date;if(f.valueOf()<scheduler._min_date.valueOf()){f=scheduler._min_date}while(f<j[Z].end_date){var U=f.getMonth()+12*(f.getFullYear()-scheduler._min_date.getFullYear())-scheduler.week_starts._month;var g=scheduler.week_starts[U]+f.getDate()-1;b+="<event day='"+(g%7)+"' week='"+Math.floor(g/7)+"' month='"+U+"'></event>";scheduler._mark_year_date(f);f=scheduler.date.add(f,1,"day");if(f.valueOf()>=scheduler._max_date.valueOf()){break}}}}else{for(var Z=0;Z<j.length;Z++){var X=M(j[Z].style.left);var V=Q(j[Z].style.top);var e=M(j[Z].style.width);var a=Q(j[Z].style.height);var Y=j[Z].className.split(" ")[0].replace("dhx_cal_","");var c=scheduler.getEvent(j[Z].getAttribute("event_id"));var g=c._sday;var T=c._sweek;if(scheduler._mode!="month"){if(parseInt(j[Z].style.left)<=26){X=2;e+=M(j[Z].style.left)-1}if(j[Z].parentNode==scheduler._els.dhx_cal_data[0]){continue}X+=M(j[Z].parentNode.style.left);X-=M(51)}else{a=parseInt(j[Z].offsetHeight);V=parseInt(j[Z].style.top)-22;g=G(j[Z],g);T=N(j[Z],T)}b+="\n<event week='"+T+"' day='"+g+"' type='"+Y+"' x='"+X+"' y='"+V+"' width='"+e+"' height='"+a+"'>";if(Y=="event"){b+="<header><![CDATA["+j[Z].childNodes[1].innerHTML+"]]></header>";var W=F?E(j[Z].childNodes[2],"color"):"";var h=F?E(j[Z].childNodes[2],"backgroundColor"):"";b+="<body backgroundColor='"+h+"' color='"+W+"'><![CDATA["+j[Z].childNodes[2].innerHTML+"]]></body>"}else{var W=F?E(j[Z],"color"):"";var h=F?E(j[Z],"backgroundColor"):"";b+="<body backgroundColor='"+h+"' color='"+W+"'><![CDATA["+j[Z].innerHTML+"]]></body>"}b+="</event>"}}}return b}function K(){var T="</data>";return T}var D=(new Date()).valueOf();var R=document.createElement("div");R.style.display="none";document.body.appendChild(R);R.innerHTML='<form id="'+D+'" method="post" target="_blank" action="'+C+'" accept-charset="utf-8" enctype="text/html"><input type="hidden" name="mycoolxmlbody"/> </form>';document.getElementById(D).firstChild.value=S(J).replace("\u2013","-")+B()+K();document.getElementById(D).submit();R.parentNode.removeChild(R);grid=null};
\ No newline at end of file
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/codebase/ext/dhtmlxscheduler_readonly.js b/addons/base_calendar/static/lib/dhtmlxScheduler/codebase/ext/dhtmlxscheduler_readonly.js
new file mode 100644
index 00000000000..cc182b4b12a
--- /dev/null
+++ b/addons/base_calendar/static/lib/dhtmlxScheduler/codebase/ext/dhtmlxscheduler_readonly.js
@@ -0,0 +1,9 @@
+/*
+dhtmlxScheduler v.2.3
+
+This software is allowed to use under GPL or you need to obtain Commercial or Enterise License
+to use it in not GPL project. Please contact sales@dhtmlx.com for details
+
+(c) DHTMLX Ltd.
+*/
+scheduler.attachEvent("onTemplatesReady",function(){scheduler.attachEvent("onBeforeLightbox",function(F){if(this.config.readonly_form||this.getEvent(F).readonly){this.config.readonly_active=true}else{this.config.readonly_active=false;return true}for(var E=0;E<this.config.lightbox.sections.length;E++){this.config.lightbox.sections[E].focus=false}return true});function D(E,K,L,J){var G=K.getElementsByTagName(E);var F=L.getElementsByTagName(E);for(var I=F.length-1;I>=0;I--){var L=F[I];if(!J){L.disabled=true}else{var H=document.createElement("SPAN");H.className="dhx_text_disabled";H.innerHTML=J(G[I]);L.parentNode.insertBefore(H,L);L.parentNode.removeChild(L)}}}var B=scheduler._fill_lightbox;scheduler._fill_lightbox=function(){var H=this.config.lightbox.sections;if(this.config.readonly_active){for(var F=0;F<H.length;F++){if(H[F].type=="recurring"){var G=document.getElementById(H[F].id);G.style.display=G.nextSibling.style.display="none";H.splice(F,1);F--}}}var E=B.apply(this,arguments);if(this.config.readonly_active){var I=this._get_lightbox();var J=this._lightbox_r=I.cloneNode(true);D("textarea",I,J,function(K){return K.value});D("input",I,J,false);D("select",I,J,function(K){return K.options[Math.max((K.selectedIndex||0),0)].text});J.removeChild(J.childNodes[2]);J.removeChild(J.childNodes[3]);I.parentNode.insertBefore(J,I);A.call(this,J);this._lightbox=J;this.setLightboxSize();this._lightbox=null;J.onclick=function(K){var L=K?K.target:event.srcElement;if(!L.className){L=L.previousSibling}if(L&&L.className){switch(L.className){case"dhx_cancel_btn":scheduler.callEvent("onEventCancel",[scheduler._lightbox_id]);scheduler._edit_stop_event(scheduler.getEvent(scheduler._lightbox_id),false);scheduler.hide_lightbox();break}}}}return E};var A=scheduler.showCover;scheduler.showCover=function(){if(!this.config.readonly_active){A.apply(this,arguments)}};var C=scheduler.hide_lightbox;scheduler.hide_lightbox=function(){if(this._lightbox_r){this._lightbox_r.parentNode.removeChild(this._lightbox_r);this._lightbox_r=null}return C.apply(this,arguments)}});
\ No newline at end of file
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/codebase/ext/dhtmlxscheduler_recurring.css b/addons/base_calendar/static/lib/dhtmlxScheduler/codebase/ext/dhtmlxscheduler_recurring.css
new file mode 100644
index 00000000000..1d63a1f68b8
--- /dev/null
+++ b/addons/base_calendar/static/lib/dhtmlxScheduler/codebase/ext/dhtmlxscheduler_recurring.css
@@ -0,0 +1,9 @@
+/*
+dhtmlxScheduler v.2.3
+
+This software is allowed to use under GPL or you need to obtain Commercial or Enterise License
+to use it in not GPL project. Please contact sales@dhtmlx.com for details
+
+(c) DHTMLX Ltd.
+*/
+div input.radio{margin:-4px 0 0 -4px!ie;}div input.checkbox{margin:0 0 0 -4px!ie;}.dhx_form_repeat,.dhx_form_repeat input{padding:0;margin:0;font-family:Tahoma,Verdana;font-size:11px;line-height:24px;}.dhx_form_repeat{overflow:hidden;height:0;background-color:#FFF4B5;}.dhx_repeat_center,.dhx_repeat_left{height:115px;padding:10px 0 10px 10px;float:left;}.dhx_repeat_left{width:95px;}.dhx_repeat_center{width:335px;margin-top:12px;}.dhx_repeat_divider{float:left;height:115px;border-left:1px dotted #DCC43E;width:1px;}.dhx_repeat_right{float:right;height:115px;width:160px;padding:10px 3px 10px 10px;margin-top:7px;}input.dhx_repeat_text{height:16px;width:27px;margin:0 4px 0 4px;line-height:18px;padding:0 0 0 2px;}.dhx_form_repeat select{height:20px;width:87px;padding:0 0 0 2px;margin:0 4px 0 4px;}input.dhx_repeat_date{height:18px;width:80px;padding:0 0 0 2px;margin:0 4px 0 4px;background-repeat:no-repeat;background-position:64px 0;border:1px #7f9db9 solid;line-height:18px;}input.dhx_repeat_radio{margin-right:4px;}input.dhx_repeat_checkbox{margin:4px 4px 0 0;}.dhx_repeat_days td{padding-right:5px;}.dhx_repeat_days label{font-size:10px;}.dhx_custom_button_recurring{background-image:url(../imgs/but_repeat.gif);background-position:-5px 20px;width:20px;margin-right:10px;}.dhx_custom_button{width:90px;}.dhx_cal_light{width:640px;}.dhx_cal_larea{width:632px;}
\ No newline at end of file
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/codebase/ext/dhtmlxscheduler_recurring.js b/addons/base_calendar/static/lib/dhtmlxScheduler/codebase/ext/dhtmlxscheduler_recurring.js
new file mode 100644
index 00000000000..4a3f1e76fe4
--- /dev/null
+++ b/addons/base_calendar/static/lib/dhtmlxScheduler/codebase/ext/dhtmlxscheduler_recurring.js
@@ -0,0 +1 @@
+scheduler.form_blocks.recurring={render:function(A){return scheduler.__recurring_template},set_value:function(L,K,P){var I={start:P.start_date,end:P._end_date};var E=scheduler.date.str_to_date(scheduler.config.repeat_date);var G=scheduler.date.date_to_str(scheduler.config.repeat_date);var F=L.getElementsByTagName("FORM")[0];var B=[];function H(S){for(var T=0;T<S.length;T++){var U=S[T];if(U.type=="checkbox"||U.type=="radio"){if(!B[U.name]){B[U.name]=[]}B[U.name].push(U)}else{B[U.name]=U}}}H(F.getElementsByTagName("INPUT"));H(F.getElementsByTagName("SELECT"));var C=function(S){return document.getElementById(S)};function O(T){var S=B[T];for(var U=0;U<S.length;U++){if(S[U].checked){return S[U].value}}}function J(){C("dhx_repeat_day").style.display="none";C("dhx_repeat_week").style.display="none";C("dhx_repeat_month").style.display="none";C("dhx_repeat_year").style.display="none";C("dhx_repeat_"+this.value).style.display="block"}function D(V){var T=[O("repeat")];Q[T[0]](T,V);while(T.length<5){T.push("")}var U="";if(B.end[0].checked){V.end=new Date(9999,1,1);U="no"}else{if(B.end[2].checked){V.end=E(B.date_of_end.value)}else{scheduler.transpose_type(T.join("_"));U=Math.max(1,B.occurences_count.value);var S=((T[0]=="week"&&T[4]&&T[4].toString().indexOf(scheduler.config.start_on_monday?1:0)==-1)?1:0);V.end=scheduler.date.add(new Date(V.start),U+S,T.join("_"))}}return T.join("_")+"#"+U}var Q={month:function(S,T){if(O("month_type")=="d"){S.push(Math.max(1,B.month_count.value));T.start.setDate(B.month_day.value)}else{S.push(Math.max(1,B.month_count2.value));S.push(B.month_day2.value);S.push(Math.max(1,B.month_week2.value));T.start.setDate(1)}T._start=true},week:function(V,W){V.push(Math.max(1,B.week_count.value));V.push("");V.push("");var U=[];var S=B.week_day;for(var T=0;T<S.length;T++){if(S[T].checked){U.push(S[T].value)}}if(!U.length){U.push(W.start.getDay())}W.start=scheduler.date.week_start(W.start);W._start=true;V.push(U.sort().join(","))},day:function(S){if(O("day_type")=="d"){S.push(Math.max(1,B.day_count.value))}else{S.push("week");S.push(1);S.push("");S.push("");S.push("1,2,3,4,5");S.splice(0,1)}},year:function(S,T){if(O("year_type")=="d"){S.push("1");T.start.setMonth(0);T.start.setDate(B.year_day.value);T.start.setMonth(B.year_month.value)}else{S.push("1");S.push(B.year_day2.value);S.push(B.year_week2.value);T.start.setDate(1);T.start.setMonth(B.year_month2.value)}T._start=true}};var M={week:function(V,W){B.week_count.value=V[1];var S=B.week_day;var U=V[4].split(",");var X={};for(var T=0;T<U.length;T++){X[U[T]]=true}for(var T=0;T<S.length;T++){S[T].checked=(!!X[S[T].value])}},month:function(S,T){if(S[2]==""){B.month_type[0].checked=true;B.month_count.value=S[1];B.month_day.value=T.start.getDate()}else{B.month_type[1].checked=true;B.month_count2.value=S[1];B.month_week2.value=S[3];B.month_day2.value=S[2]}},day:function(S,T){B.day_type[0].checked=true;B.day_count.value=S[1]},year:function(S,T){if(S[2]==""){B.year_type[0].checked=true;B.year_day.value=T.start.getDate();B.year_month.value=T.start.getMonth()}else{B.year_type[1].checked=true;B.year_week2.value=S[3];B.year_day2.value=S[2];B.year_month2.value=T.start.getMonth()}}};function R(S,V){var T=S.split("#");S=T[0].split("_");M[S[0]](S,V);var U=B.repeat[({day:0,week:1,month:2,year:3})[S[0]]];switch(T[1]){case"no":B.end[0].checked=true;break;case"":B.end[2].checked=true;B.date_of_end.value=G(V.end);break;default:B.end[1].checked=true;B.occurences_count.value=T[1];break}U.checked=true;U.onclick()}for(var N=0;N<F.elements.length;N++){var A=F.elements[N];switch(A.name){case"repeat":A.onclick=J;break}}scheduler.form_blocks.recurring.set_value=function(T,U,S){T.open=!S.rec_type;if(S.event_pid&&S.event_pid!="0"){T.blocked=true}else{T.blocked=false}I.start=S.start_date;I.end=S._end_date;scheduler.form_blocks.recurring.button_click(0,T.previousSibling.firstChild.firstChild,T,T);if(U){R(U,I)}};scheduler.form_blocks.recurring.get_value=function(T,S){if(T.open){S.rec_type=D(I);if(I._start){S._start_date=S.start_date=I.start;I._start=false}else{S._start_date=null}S._end_date=S.end_date=I.end;S.rec_pattern=S.rec_type.split("#")[0]}else{S.rec_type=S.rec_pattern="";S._end_date=S.end_date}return S.rec_type};scheduler.form_blocks.recurring.set_value(L,K,P)},get_value:function(B,A){},focus:function(A){},button_click:function(B,C,D,A){if(!A.open&&!A.blocked){A.style.height="115px";C.style.backgroundPosition="-5px 0px";C.nextSibling.innerHTML=scheduler.locale.labels.button_recurring_open}else{A.style.height="0px";C.style.backgroundPosition="-5px 20px";C.nextSibling.innerHTML=scheduler.locale.labels.button_recurring}A.open=!A.open;scheduler.setLightboxSize()}};scheduler._rec_markers={};scheduler._rec_markers_pull={};scheduler._add_rec_marker=function(A,B){A._pid_time=B;this._rec_markers[A.id]=A;if(!this._rec_markers_pull[A.event_pid]){this._rec_markers_pull[A.event_pid]={}}this._rec_markers_pull[A.event_pid][B]=A};scheduler._get_rec_marker=function(B,C){var A=this._rec_markers_pull[C];if(A){return A[B]}return null};scheduler._get_rec_markers=function(A){return(this._rec_markers_pull[A]||[])};scheduler._rec_temp=[];scheduler.attachEvent("onEventLoading",function(A){if(A.event_pid!=0){scheduler._add_rec_marker(A,A.event_length*1000)}if(A.rec_type){A.rec_pattern=A.rec_type.split("#")[0]}return true});scheduler.attachEvent("onEventIdChange",function(D,A){if(this._ignore_call){return }this._ignore_call=true;for(var C=0;C<this._rec_temp.length;C++){var B=this._rec_temp[C];if(B.event_pid==D){B.event_pid=A;this.changeEventId(B.id,A+"#"+B.id.split("#")[1])}}delete this._ignore_call});scheduler.attachEvent("onBeforeEventDelete",function(F){var D=this.getEvent(F);if(F.toString().indexOf("#")!=-1){var F=F.split("#");var E=this.uid();var C=this._copy_event(D);C.id=E;C.event_pid=F[0];C.event_length=F[1];C.rec_type=C.rec_pattern="none";this.addEvent(C);this._add_rec_marker(this.getEvent(E),F[1]*1000)}else{if(D.rec_type){this._roll_back_dates(D)}var B=this._get_rec_markers(F);for(var A in B){this.deleteEvent(B[A].id,true)}}return true});scheduler.attachEvent("onEventChanged",function(F){if(this._loading){return true}var D=this.getEvent(F);if(F.toString().indexOf("#")!=-1){var F=F.split("#");var E=this.uid();this._not_render=true;var C=this._copy_event(D);C.id=E;C.event_pid=F[0];C.event_length=F[1];C.rec_type=C.rec_pattern="";this.addEvent(C);this._not_render=false;this._add_rec_marker(this.getEvent(E),F[1]*1000)}else{if(D.rec_type){this._roll_back_dates(D)}var B=this._get_rec_markers(F);for(var A in B){delete this._rec_markers[B[A].id];this.deleteEvent(B[A].id,true)}delete this._rec_markers_pull[F];this._select_id=null}return true});scheduler.attachEvent("onEventAdded",function(B){if(!this._loading){var A=this.getEvent(B);if(A.rec_type&&!A.event_length){this._roll_back_dates(A)}}return true});scheduler.attachEvent("onEventCreated",function(B){var A=this.getEvent(B);if(!A.rec_type){A.rec_type=A.rec_pattern=""}return true});scheduler.attachEvent("onEventCancel",function(B){var A=this.getEvent(B);if(A.rec_type){this._roll_back_dates(A);this.render_view_data(A.id)}});scheduler._roll_back_dates=function(A){A.event_length=(A.end_date.valueOf()-A.start_date.valueOf())/1000;A.end_date=A._end_date;if(A._start_date){A.start_date.setMonth(0);A.start_date.setDate(A._start_date.getDate());A.start_date.setMonth(A._start_date.getMonth());A.start_date.setFullYear(A._start_date.getFullYear())}};scheduler.validId=function(A){return A.toString().indexOf("#")==-1};scheduler.showLightbox_rec=scheduler.showLightbox;scheduler.showLightbox=function(B){var A=this.getEvent(B).event_pid;if(B.toString().indexOf("#")!=-1){A=B.split("#")[0]}if(!A||A==0||(!this.locale.labels.confirm_recurring||!confirm(this.locale.labels.confirm_recurring))){return this.showLightbox_rec(B)}A=this.getEvent(A);A._end_date=A.end_date;A.end_date=new Date(A.start_date.valueOf()+A.event_length*1000);return this.showLightbox_rec(A.id)};scheduler.get_visible_events_rec=scheduler.get_visible_events;scheduler.get_visible_events=function(){for(var C=0;C<this._rec_temp.length;C++){delete this._events[this._rec_temp[C].id]}this._rec_temp=[];var A=this.get_visible_events_rec();var B=[];for(var C=0;C<A.length;C++){if(A[C].rec_type){if(A[C].rec_pattern!="none"){this.repeat_date(A[C],B)}}else{B.push(A[C])}}return B};(function(){var A=scheduler.is_one_day_event;scheduler.is_one_day_event=function(B){if(B.rec_type){return true}return A.call(this,B)}})();scheduler.transponse_size={day:1,week:7,month:1,year:12};scheduler.date.day_week=function(E,C,D){E.setDate(1);D=(D-1)*7;var B=E.getDay();var A=C*1+D-B+1;E.setDate(A<=D?(A+7):A)};scheduler.transpose_day_week=function(G,D,F,C,E){var A=(G.getDay()||(scheduler.config.start_on_monday?7:0))-F;for(var B=0;B<D.length;B++){if(D[B]>A){return G.setDate(G.getDate()+D[B]*1-A-(C?F:E))}}this.transpose_day_week(G,D,F+C,null,F)};scheduler.transpose_type=function(D){var F="transpose_"+D;if(!this.date[F]){var G=D.split("_");var A=60*60*24*1000;var C="add_"+D;var E=this.transponse_size[G[0]]*G[1];if(G[0]=="day"||G[0]=="week"){var H=null;if(G[4]){H=G[4].split(",");if(scheduler.config.start_on_monday){for(var B=0;B<H.length;B++){H[B]=(H[B]*1)||7}H.sort()}}this.date[F]=function(I,K){var J=Math.floor((K.valueOf()-I.valueOf())/(A*E));if(J>0){I.setDate(I.getDate()+J*E)}if(H){scheduler.transpose_day_week(I,H,1,E)}};this.date[C]=function(K,J){var L=new Date(K.valueOf());if(H){for(var I=0;I<J;I++){scheduler.transpose_day_week(L,H,0,E)}}else{L.setDate(L.getDate()+J*E)}return L}}else{if(G[0]=="month"||G[0]=="year"){this.date[F]=function(I,K){var J=Math.ceil(((K.getFullYear()*12+K.getMonth()*1)-(I.getFullYear()*12+I.getMonth()*1))/(E));if(J>=0){I.setMonth(I.getMonth()+J*E)}if(G[3]){scheduler.date.day_week(I,G[2],G[3])}};this.date[C]=function(J,I){var K=new Date(J.valueOf());K.setMonth(K.getMonth()+I*E);if(G[3]){scheduler.date.day_week(K,G[2],G[3])}return K}}}}};scheduler.repeat_date=function(F,G,C,I,J){I=I||this._min_date;J=J||this._max_date;var E=new Date(F.start_date.valueOf());if(!F.rec_pattern&&F.rec_type){F.rec_pattern=F.rec_type.split("#")[0]}this.transpose_type(F.rec_pattern);scheduler.date["transpose_"+F.rec_pattern](E,I);while(E<F.start_date||(E.valueOf()+F.event_length*1000)<=I.valueOf()){E=this.date.add(E,1,F.rec_pattern)}while(E<J&&E<F.end_date){var A=this._get_rec_marker(E.valueOf(),F.id);if(!A){var H=new Date(E.valueOf()+F.event_length*1000);var B=this._copy_event(F);B.start_date=E;B.event_pid=F.id;B.id=F.id+"#"+Math.ceil(E.valueOf()/1000);B.end_date=H;var D=B.start_date.getTimezoneOffset()-B.end_date.getTimezoneOffset();if(D){if(D>0){B.end_date=new Date(E.valueOf()+F.event_length*1000-D*60*1000)}else{B.end_date=new Date(B.end_date.valueOf()+D*60*1000)}}B._timed=this.is_one_day_event(B);if(!B._timed&&!this._table_view&&!this.config.multi_day){return }G.push(B);if(!C){this._events[B.id]=B;this._rec_temp.push(B)}}else{if(C){G.push(A)}}E=this.date.add(E,1,F.rec_pattern)}};scheduler.getRecDates=function(B,H){var G=typeof B=="object"?B:scheduler.getEvent(B);var E=0;var J=[];H=H||1000;var C=new Date(G.start_date.valueOf());var I=new Date(C.valueOf());if(!G.rec_type){return[{start_date:G.start_date,end_date:G.end_date}]}this.transpose_type(G.rec_pattern);scheduler.date["transpose_"+G.rec_pattern](C,I);while(C<G.start_date||(C.valueOf()+G.event_length*1000)<=I.valueOf()){C=this.date.add(C,1,G.rec_pattern)}while(C<G.end_date){var A=this._get_rec_marker(C.valueOf(),G.id);if(!A){var F=new Date(C.valueOf()+G.event_length*1000);var D=new Date(C);J.push({start_date:D,end_date:F});C=this.date.add(C,1,G.rec_pattern);E++}if(E==H){break}}return J};scheduler.getEvents=function(G,F){var A=[];for(var B in this._events){var D=this._events[B];if(D&&D.start_date<F&&D.end_date>G){if(D.rec_pattern){if(D.rec_pattern=="none"){continue}var E=[];this.repeat_date(D,E,true,G,F);for(var C=0;C<E.length;C++){if(!E[C].rec_pattern&&E[C].start_date<F&&E[C].end_date>G){A.push(E[C])}}}else{if(!D.event_pid||D.event_pid==0){A.push(D)}}}}return A};scheduler.config.repeat_date="%m.%d.%Y";scheduler.config.lightbox.sections=[{name:"description",height:130,map_to:"text",type:"textarea",focus:true},{name:"recurring",height:115,type:"recurring",map_to:"rec_type",button:"recurring"},{name:"time",height:72,type:"time",map_to:"auto"}];scheduler._copy_dummy=function(A){this.start_date=new Date(this.start_date);this.end_date=new Date(this.end_date);this.event_length=this.event_pid=this.rec_pattern=this.rec_type=this._timed=null};scheduler.__recurring_template='<div class="dhx_form_repeat"> <form> <div class="dhx_repeat_left"> <label><input class="dhx_repeat_radio" type="radio" name="repeat" value="day" />Daily</label><br /> <label><input class="dhx_repeat_radio" type="radio" name="repeat" value="week"/>Weekly</label><br /> <label><input class="dhx_repeat_radio" type="radio" name="repeat" value="month" checked />Monthly</label><br /> <label><input class="dhx_repeat_radio" type="radio" name="repeat" value="year" />Yearly</label> </div> <div class="dhx_repeat_divider"></div> <div class="dhx_repeat_center"> <div style="display:none;" id="dhx_repeat_day"> <label><input class="dhx_repeat_radio" type="radio" name="day_type" value="d"/>Every</label><input class="dhx_repeat_text" type="text" name="day_count" value="1" />day<br /> <label><input class="dhx_repeat_radio" type="radio" name="day_type" checked value="w"/>Every workday</label> </div> <div style="display:none;" id="dhx_repeat_week"> Repeat every<input class="dhx_repeat_text" type="text" name="week_count" value="1" />week next days:<br /> <table class="dhx_repeat_days"> <tr> <td> <label><input class="dhx_repeat_checkbox" type="checkbox" name="week_day" value="1" />Monday</label><br /> <label><input class="dhx_repeat_checkbox" type="checkbox" name="week_day" value="4" />Thursday</label> </td> <td> <label><input class="dhx_repeat_checkbox" type="checkbox" name="week_day" value="2" />Tuesday</label><br /> <label><input class="dhx_repeat_checkbox" type="checkbox" name="week_day" value="5" />Friday</label> </td> <td> <label><input class="dhx_repeat_checkbox" type="checkbox" name="week_day" value="3" />Wednesday</label><br /> <label><input class="dhx_repeat_checkbox" type="checkbox" name="week_day" value="6" />Saturday</label> </td> <td> <label><input class="dhx_repeat_checkbox" type="checkbox" name="week_day" value="0" />Sunday</label><br /><br /> </td> </tr> </table> </div> <div id="dhx_repeat_month"> <label><input class="dhx_repeat_radio" type="radio" name="month_type" value="d"/>Repeat</label><input class="dhx_repeat_text" type="text" name="month_day" value="1" />day every<input class="dhx_repeat_text" type="text" name="month_count" value="1" />month<br /> <label><input class="dhx_repeat_radio" type="radio" name="month_type" checked value="w"/>On</label><input class="dhx_repeat_text" type="text" name="month_week2" value="1" /><select name="month_day2"><option value="1" selected >Monday<option value="2">Tuesday<option value="3">Wednesday<option value="4">Thursday<option value="5">Friday<option value="6">Saturday<option value="0">Sunday</select>every<input class="dhx_repeat_text" type="text" name="month_count2" value="1" />month<br /> </div> <div style="display:none;" id="dhx_repeat_year"> <label><input class="dhx_repeat_radio" type="radio" name="year_type" value="d"/>Every</label><input class="dhx_repeat_text" type="text" name="year_day" value="1" />day<select name="year_month"><option value="0" selected >January<option value="1">February<option value="2">March<option value="3">April<option value="4">May<option value="5">June<option value="6">July<option value="7">August<option value="8">September<option value="9">October<option value="10">November<option value="11">December</select>month<br /> <label><input class="dhx_repeat_radio" type="radio" name="year_type" checked value="w"/>On</label><input class="dhx_repeat_text" type="text" name="year_week2" value="1" /><select name="year_day2"><option value="1" selected >Monday<option value="2">Tuesday<option value="3">Wednesday<option value="4">Thursday<option value="5">Friday<option value="6">Saturday<option value="7">Sunday</select>of<select name="year_month2"><option value="0" selected >January<option value="1">February<option value="2">March<option value="3">April<option value="4">May<option value="5">June<option value="6">July<option value="7">August<option value="8">September<option value="9">October<option value="10">November<option value="11">December</select><br /> </div> </div> <div class="dhx_repeat_divider"></div> <div class="dhx_repeat_right"> <label><input class="dhx_repeat_radio" type="radio" name="end" checked/>No end date</label><br /> <label><input class="dhx_repeat_radio" type="radio" name="end" />After</label><input class="dhx_repeat_text" type="text" name="occurences_count" value="1" />occurrences<br /> <label><input class="dhx_repeat_radio" type="radio" name="end" />End by</label><input class="dhx_repeat_date" type="text" name="date_of_end" value="01.01.2010" /><br /> </div> </form> </div> <div style="clear:both"> </div>';
\ No newline at end of file
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/codebase/ext/dhtmlxscheduler_serialize.js b/addons/base_calendar/static/lib/dhtmlxScheduler/codebase/ext/dhtmlxscheduler_serialize.js
new file mode 100644
index 00000000000..2e041981b10
--- /dev/null
+++ b/addons/base_calendar/static/lib/dhtmlxScheduler/codebase/ext/dhtmlxscheduler_serialize.js
@@ -0,0 +1,9 @@
+/*
+dhtmlxScheduler v.2.3
+
+This software is allowed to use under GPL or you need to obtain Commercial or Enterise License
+to use it in not GPL project. Please contact sales@dhtmlx.com for details
+
+(c) DHTMLX Ltd.
+*/
+scheduler.data_attributes=function(){var C=[];var E=scheduler.templates.xml_format;for(var A in this._events){var D=this._events[A];for(var B in D){if(B.substr(0,1)!="_"){C.push([B,((B=="start_date"||B=="end_date")?E:null)])}}break}return C};scheduler.toXML=function(F){var C=[];var B=this.data_attributes();for(var A in this._events){var E=this._events[A];if(E.id.toString().indexOf("#")!=-1){continue}C.push("<event>");for(var D=0;D<B.length;D++){C.push("<"+B[D][0]+"><![CDATA["+(B[D][1]?B[D][1](E[B[D][0]]):E[B[D][0]])+"]]></"+B[D][0]+">")}C.push("</event>")}return(F||"")+"<data>"+C.join("\n")+"</data>"};scheduler.toJSON=function(){var E=[];var C=this.data_attributes();for(var B in this._events){var F=this._events[B];if(F.id.toString().indexOf("#")!=-1){continue}var F=this._events[B];var A=[];for(var D=0;D<C.length;D++){A.push(" "+C[D][0]+':"'+((C[D][1]?C[D][1](F[C[D][0]]):F[C[D][0]])||"").toString().replace(/\n/g,"")+'" ')}E.push("{"+A.join(",")+"}")}return"["+E.join(",\n")+"]"};scheduler.toICal=function(G){var F="BEGIN:VCALENDAR\nVERSION:2.0\nPRODID:-//dhtmlXScheduler//NONSGML v2.2//EN\nDESCRIPTION:";var C="END:VCALENDAR";var E=scheduler.date.date_to_str("%Y%m%dT%H%i%s");var B=[];for(var A in this._events){var D=this._events[A];if(D.id.toString().indexOf("#")!=-1){continue}B.push("BEGIN:VEVENT");B.push("DTSTART:"+E(D.start_date));B.push("DTEND:"+E(D.end_date));B.push("SUMMARY:"+D.text);B.push("END:VEVENT")}return F+(G||"")+"\n"+B.join("\n")+"\n"+C};
\ No newline at end of file
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/codebase/ext/dhtmlxscheduler_timeline.js b/addons/base_calendar/static/lib/dhtmlxScheduler/codebase/ext/dhtmlxscheduler_timeline.js
new file mode 100644
index 00000000000..31092a5852f
--- /dev/null
+++ b/addons/base_calendar/static/lib/dhtmlxScheduler/codebase/ext/dhtmlxscheduler_timeline.js
@@ -0,0 +1 @@
+(function(){scheduler.matrix={};scheduler._merge=function(M,L){for(var N in L){if(typeof M[N]=="undefined"){M[N]=L[N]}}};scheduler.createTimelineView=function(O){scheduler._merge(O,{section_autoheight:true,name:"matrix",x:"time",y:"time",x_step:1,x_unit:"hour",y_unit:"day",y_step:1,x_start:0,x_size:24,y_start:0,y_size:7,render:"cell",dx:200,dy:50,_logic:function(S,R,Q){var P={};if(scheduler.checkEvent("onBeforeViewRender")){P=scheduler.callEvent("onBeforeViewRender",[S,R,Q])}return P}});if(scheduler.checkEvent("onTimelineCreated")){scheduler.callEvent("onTimelineCreated",[O])}scheduler[O.name+"_view"]=function(){scheduler.renderMatrix.apply(O,arguments)};var L=scheduler.render_data;scheduler.render_data=function(P,R){if(this._mode==O.name){if(R){for(var Q=0;Q<P.length;Q++){this.clear_event(P[Q]);this.render_timeline_event.call(this.matrix[this._mode],P[Q],0,true)}}else{C.call(O,true)}}else{return L.apply(this,arguments)}};scheduler.matrix[O.name]=O;scheduler.templates[O.name+"_cell_value"]=function(P){return P?P.length:""};scheduler.templates[O.name+"_cell_class"]=function(P){return""};scheduler.templates[O.name+"_scalex_class"]=function(P){return""};scheduler.templates[O.name+"_scaley_class"]=function(Q,R,P){return"class"};scheduler.templates[O.name+"_scale_label"]=function(Q,R,P){return R};scheduler.templates[O.name+"_tooltip"]=function(Q,P,R){return R.text};scheduler.templates[O.name+"_date"]=function(Q,P){if(Q.getDay()==P.getDay()&&Q-P<(24*60*60*1000)){return scheduler.templates.day_date(Q)}return scheduler.templates.week_date(Q,P)};scheduler.templates[O.name+"_scale_date"]=scheduler.date.date_to_str(O.x_date||scheduler.config.hour_date);scheduler.date["add_"+O.name]=function(Q,P,R){return scheduler.date.add(Q,(O.x_length||O.x_size)*P*O.x_step,O.x_unit)};scheduler.date[O.name+"_start"]=scheduler.date[O.x_unit+"_start"]||scheduler.date.day_start;scheduler.attachEvent("onSchedulerResize",function(){if(this._mode==O.name){C.call(O,true);return false}return true});scheduler.attachEvent("onOptionsLoad",function(){O.order={};for(var P=0;P<O.y_unit.length;P++){O.order[O.y_unit[P].key]=P}if(O.name==scheduler._mode){if(scheduler._date){scheduler.setCurrentView(scheduler._date,scheduler._mode)}}});scheduler.callEvent("onOptionsLoad",[O]);if(O.render!="cell"){var N=new Date();var M=(scheduler.date.add(N,1,O.x_unit).valueOf()-N.valueOf());scheduler["mouse_"+O.name]=function(U){var P=this._drag_event;if(this._drag_id){P=this.getEvent(this._drag_id);this._drag_event._dhx_changed=true}U.x-=O.dx;var T=0,S=0,Q=0;for(S;S<this._cols.length-1;S++){T+=this._cols[S];if(T>U.x){break}}T=0;for(Q;Q<this._colsS.heights.length;Q++){T+=this._colsS.heights[Q];if(T>U.y){break}}U.fields={};U.fields[O.y_property]=P[O.y_property]=O.y_unit[Q].key;U.x=Q/10000000;if(this._drag_mode=="new-size"&&P.start_date*1==this._drag_start*1){S++}if(S>=O._trace_x.length){var R=scheduler.date.add(O._trace_x[O._trace_x.length-1],O.x_step,O.x_unit)}else{var R=O._trace_x[S]}U.y=Math.round((R-this._min_date)/(1000*60*this.config.time_step));U.custom=true;U.shift=M;return U}}};scheduler.render_timeline_event=function(U,V,R){var N=E(U,false,this._step);var L=E(U,true,this._step);var P=scheduler.xy.bar_height;var T=2+V*P;var Q=scheduler.templates.event_class(U.start_date,U.end_date,U);Q="dhx_cal_event_line "+(Q||"");var O='<div event_id="'+U.id+'" class="'+Q+'" style="position:absolute; top:'+T+"px; left:"+N+"px; width:"+Math.max(0,L-N)+"px;"+(U._text_style||"")+'">'+scheduler.templates.event_bar_text(U.start_date,U.end_date,U)+"</div>";if(!R){return O}else{var S=document.createElement("DIV");S.innerHTML=O;var M=this.order[U[this.y_property]];var W=scheduler._els.dhx_cal_data[0].firstChild.rows[M].cells[1].firstChild;scheduler._rendered.push(S.firstChild);W.appendChild(S.firstChild)}};function K(){var N=scheduler.getEvents(scheduler._min_date,scheduler._max_date);var M=[];for(var O=0;O<this.y_unit.length;O++){M[O]=[]}if(!M[P]){M[P]=[]}for(var O=0;O<N.length;O++){var P=this.order[N[O][this.y_property]];var L=0;while(this._trace_x[L+1]&&N[O].start_date>=this._trace_x[L+1]){L++}while(this._trace_x[L]&&N[O].end_date>this._trace_x[L]){if(!M[P][L]){M[P][L]=[]}M[P][L].push(N[O]);L++}}return M}function E(S,Q,L){var T=0;var O=(Q)?S.end_date:S.start_date;if(O.valueOf()>scheduler._max_date.valueOf()){O=scheduler._max_date}var U=O-scheduler._min_date_timeline;if(U<0){M=0}else{var R=Math.round(U/(L*scheduler._cols[0]));if(R>scheduler._cols.length){R=scheduler._cols.length}for(var P=0;P<R;P++){T+=scheduler._cols[P]}var N=scheduler.date.add(scheduler._min_date_timeline,scheduler.matrix[scheduler._mode].x_step*R,scheduler.matrix[scheduler._mode].x_unit);U=O-N;var M=Math.floor(U/L)}T+=(Q)?M-14:M+1;return T}function A(S){var R="<table style='table-layout:fixed;' cellspacing='0' cellpadding='0'>";var Z=[];if(scheduler._load_mode&&scheduler._load()){return }if(this.render=="cell"){Z=K.call(this)}else{var T=scheduler.getEvents(scheduler._min_date,scheduler._max_date);for(var O=0;O<T.length;O++){var N=this.order[T[O][this.y_property]];if(!Z[N]){Z[N]=[]}Z[N].push(T[O])}}var Y=0;for(var P=0;P<scheduler._cols.length;P++){Y+=scheduler._cols[P]}var M=new Date();M=(scheduler.date.add(M,this.x_step*this.x_size,this.x_unit)-M)/Y;this._step=M;this._summ=Y;var V=scheduler._colsS.heights=[];for(var P=0;P<this.y_unit.length;P++){var Q=this._logic(this.render,this.y_unit[P],this);scheduler._merge(Q,{height:this.dy});if(this.section_autoheight){if(this.y_unit.length*Q.height<S.offsetHeight){Q.height=Math.max(Q.height,Math.floor((S.offsetHeight-1)/this.y_unit.length))}}scheduler._merge(Q,{tr_className:"",style_height:"height:"+Q.height+"px;",style_width:"width:"+(this.dx-1)+"px;",td_className:"dhx_matrix_scell "+scheduler.templates[this.name+"_scaley_class"](this.y_unit[P].key,this.y_unit[P].label,this),td_content:scheduler.templates[this.name+"_scale_label"](this.y_unit[P].key,this.y_unit[P].label,this),summ_width:"width:"+Y+"px;",table_className:""});R+="<tr class='"+Q.tr_className+"' style='"+Q.style_height+"'><td class='"+Q.td_className+"' style='"+Q.style_width+"'>"+Q.td_content+"</td>";if(this.render=="cell"){for(var O=0;O<scheduler._cols.length;O++){R+="<td class='dhx_matrix_cell "+scheduler.templates[this.name+"_cell_class"](Z[P][O],this._trace_x[O],this.y_unit[P])+"' style='width:"+(scheduler._cols[O]-1)+"px'><div style='width:"+(scheduler._cols[O]-1)+"px'>"+scheduler.templates[this.name+"_cell_value"](Z[P][O])+"<div></td>"}}else{R+="<td><div style='"+Q.summ_width+" "+Q.style_height+" position:relative;' class='dhx_matrix_line'>";if(Z[P]){Z[P].sort(function(d,c){return d.start_date>c.start_date?1:-1});var X=[];for(var O=0;O<Z[P].length;O++){var W=Z[P][O];var L=0;while(X[L]&&X[L].end_date>W.start_date){L++}X[L]=W;R+=scheduler.render_timeline_event.call(this,W,L)}}R+="<table class='"+Q.table_className+"' cellpadding='0' cellspacing='0' style='"+Q.summ_width+" "+Q.style_height+"' >";for(var O=0;O<scheduler._cols.length;O++){R+="<td class='dhx_matrix_cell "+scheduler.templates[this.name+"_cell_class"](Z[P],this._trace_x[O],this.y_unit[P])+"' style='width:"+(scheduler._cols[O]-1)+"px'><div style='width:"+(scheduler._cols[O]-1)+"px'><div></td>"}R+="</table>";R+="</div></td>"}R+="</tr>"}R+="</table>";this._matrix=Z;S.scrollTop=0;S.innerHTML=R;scheduler._rendered=[];var U=document.getElementsByTagName("DIV");for(var P=0;P<U.length;P++){if(U[P].getAttribute("event_id")){scheduler._rendered.push(U[P])}}for(var P=0;P<S.firstChild.rows.length;P++){V.push(S.firstChild.rows[P].offsetHeight)}}function D(N){N.innerHTML="<div></div>";N=N.firstChild;scheduler._cols=[];scheduler._colsS={height:0};this._trace_x=[];scheduler._min_date_timeline=scheduler._min_date;var R=scheduler._min_date;var Q=scheduler._x-this.dx-18;var P=this.dx;for(var L=0;L<this.x_size;L++){scheduler._cols[L]=Math.floor(Q/(this.x_size-L));this._trace_x[L]=new Date(R);scheduler._render_x_header(L,P,R,N);var M=scheduler.templates[this.name+"_scalex_class"](R);if(M){N.lastChild.className+=" "+M}R=scheduler.date.add(R,this.x_step,this.x_unit);Q-=scheduler._cols[L];P+=scheduler._cols[L]}var O=this._trace_x;N.onclick=function(S){var T=B(S);if(T){scheduler.callEvent("onXScaleClick",[T.x,O[T.x],S||event])}};N.ondblclick=function(S){var T=B(S);if(T){scheduler.callEvent("onXScaleDblClick",[T.x,O[T.x],S||event])}}}function C(M){if(M){scheduler.set_sizes();F();var L=scheduler._min_date;D.call(this,scheduler._els.dhx_cal_header[0]);A.call(this,scheduler._els.dhx_cal_data[0]);scheduler._min_date=L;scheduler._els.dhx_cal_date[0].innerHTML=scheduler.templates[this.name+"_date"](scheduler._min_date,scheduler._max_date);scheduler._table_view=true}}function H(){if(scheduler._tooltip){scheduler._tooltip.style.display="none";scheduler._tooltip.date=""}}function J(P,S,Q){if(P.render!="cell"){return }var R=S.x+"_"+S.y;var L=P._matrix[S.y][S.x];if(!L){return H()}L.sort(function(U,T){return U.start_date>T.start_date?1:-1});if(scheduler._tooltip){if(scheduler._tooltip.date==R){return }scheduler._tooltip.innerHTML=""}else{var O=scheduler._tooltip=document.createElement("DIV");O.className="dhx_tooltip";document.body.appendChild(O);O.onclick=scheduler._click.dhx_cal_data}var N="";for(var M=0;M<L.length;M++){N+="<div class='dhx_tooltip_line' event_id='"+L[M].id+"'>";N+="<div class='dhx_tooltip_date'>"+(L[M]._timed?scheduler.templates.event_date(L[M].start_date):"")+"</div>";N+="<div class='dhx_event_icon icon_details'>&nbsp;</div>";N+=scheduler.templates[P.name+"_tooltip"](L[M].start_date,L[M].end_date,L[M])+"</div>"}scheduler._tooltip.style.display="";scheduler._tooltip.style.top="0px";if(document.body.offsetWidth-Q.left-scheduler._tooltip.offsetWidth<0){scheduler._tooltip.style.left=Q.left-scheduler._tooltip.offsetWidth+"px"}else{scheduler._tooltip.style.left=Q.left+S.src.offsetWidth+"px"}scheduler._tooltip.date=R;scheduler._tooltip.innerHTML=N;if(document.body.offsetHeight-Q.top-scheduler._tooltip.offsetHeight<0){scheduler._tooltip.style.top=Q.top-scheduler._tooltip.offsetHeight+S.src.offsetHeight+"px"}else{scheduler._tooltip.style.top=Q.top+"px"}}function F(){dhtmlxEvent(scheduler._els.dhx_cal_data[0],"mouseover",function(M){var L=scheduler.matrix[scheduler._mode];if(L){var O=scheduler._locate_cell_timeline(M);var M=M||event;var N=M.target||M.srcElement;if(O){return J(L,O,getOffset(O.src))}}H()});F=function(){}}scheduler.renderMatrix=function(M){var L=scheduler.date[this.name+"_start"](scheduler._date);scheduler._min_date=scheduler.date.add(L,this.x_start*this.x_step,this.x_unit);scheduler._max_date=scheduler.date.add(scheduler._min_date,this.x_size*this.x_step,this.x_unit);scheduler._table_view=true;C.call(this,M)};function G(M){var N=M.parentNode.childNodes;for(var L=0;L<N.length;L++){if(N[L]==M){return L}}return -1}function B(N){N=N||event;var L=N.target?N.target:N.srcElement;while(L&&L.tagName!="DIV"){L=L.parentNode}if(L&&L.tagName=="DIV"){var M=L.className.split(" ")[0];if(M=="dhx_scale_bar"){return{x:G(L),y:-1,src:L,scale:true}}}}scheduler._locate_cell_timeline=function(O){O=O||event;var L=O.target?O.target:O.srcElement;while(L&&L.tagName!="TD"){L=L.parentNode}if(L&&L.tagName=="TD"){var N=L.className.split(" ")[0];if(N=="dhx_matrix_cell"){if(scheduler._isRender("cell")){return{x:L.cellIndex-1,y:L.parentNode.rowIndex,src:L}}else{var M=L.parentNode;while(M&&M.tagName!="TD"){M=M.parentNode}return{x:L.cellIndex,y:M.parentNode.rowIndex,src:L}}}else{if(N=="dhx_matrix_scell"){return{x:-1,y:L.parentNode.rowIndex,src:L,scale:true}}}}return false};var I=scheduler._click.dhx_cal_data;scheduler._click.dhx_cal_data=function(N){var L=I.apply(this,arguments);var M=scheduler.matrix[scheduler._mode];if(M){var O=scheduler._locate_cell_timeline(N);if(O){if(O.scale){scheduler.callEvent("onYScaleClick",[O.y,M.y_unit[O.y],N||event])}else{scheduler.callEvent("onCellClick",[O.x,O.y,M._trace_x[O.x],(((M._matrix[O.y]||{})[O.x])||[]),N||event])}}}return L};scheduler.dblclick_dhx_matrix_cell=function(M){var L=scheduler.matrix[scheduler._mode];if(L){var N=scheduler._locate_cell_timeline(M);if(N){if(N.scale){scheduler.callEvent("onYScaleDblClick",[N.y,L.y_unit[N.y],M||event])}else{scheduler.callEvent("onCellDblClick",[N.x,N.y,L._trace_x[N.x],(((L._matrix[N.y]||{})[N.x])||[]),M||event])}}}};scheduler.dblclick_dhx_matrix_scell=function(L){return scheduler.dblclick_dhx_matrix_cell(L)};scheduler._isRender=function(L){return(scheduler.matrix[scheduler._mode]&&scheduler.matrix[scheduler._mode].render==L)};scheduler.attachEvent("onCellDblClick",function(M,R,N,L,P){if(this.config.readonly||(P.type=="dblclick"&&!this.config.dblclick_create)){return }var Q=scheduler.matrix[scheduler._mode];var O={};O.start_date=Q._trace_x[M];O.end_date=(Q._trace_x[M+1])?Q._trace_x[M+1]:scheduler.date.add(Q._trace_x[M],Q.x_step,Q.x_unit);O[scheduler.matrix[scheduler._mode].y_property]=Q.y_unit[R].key;scheduler.addEventNow(O,null,P)});scheduler.attachEvent("onBeforeDrag",function(M,N,L){if(scheduler._isRender("cell")){return false}return true})})();
\ No newline at end of file
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/codebase/ext/dhtmlxscheduler_tooltip.js b/addons/base_calendar/static/lib/dhtmlxScheduler/codebase/ext/dhtmlxscheduler_tooltip.js
new file mode 100644
index 00000000000..e24ad910174
--- /dev/null
+++ b/addons/base_calendar/static/lib/dhtmlxScheduler/codebase/ext/dhtmlxscheduler_tooltip.js
@@ -0,0 +1 @@
+window.dhtmlXTooltip={version:0.1};dhtmlXTooltip.config={className:"dhtmlXTooltip tooltip",timeout_to_display:50,delta_x:15,delta_y:-20};dhtmlXTooltip.tooltip=document.createElement("div");dhtmlXTooltip.tooltip.className=dhtmlXTooltip.config.className;dhtmlXTooltip.show=function(D,G){dhtmlXTooltip.tooltip.className=dhtmlXTooltip.config.className;var H=this.position(D);var E=D.target||D.srcElement;if(this.isTooltip(E)){return }var C=H.x+dhtmlXTooltip.config.delta_x||0;var B=H.y-dhtmlXTooltip.config.delta_y||0;this.tooltip.style.visibility="hidden";if(this.tooltip.style.removeAttribute){this.tooltip.style.removeAttribute("right");this.tooltip.style.removeAttribute("bottom")}else{this.tooltip.style.removeProperty("right");this.tooltip.style.removeProperty("bottom")}this.tooltip.style.left="0px";this.tooltip.style.top="0px";this.tooltip.innerHTML=G;scheduler._obj.appendChild(this.tooltip);var A=this.tooltip.offsetWidth;var F=this.tooltip.offsetHeight;if(document.body.offsetWidth-C-A<0){if(this.tooltip.style.removeAttribute){this.tooltip.style.removeAttribute("left")}else{this.tooltip.style.removeProperty("left")}this.tooltip.style.right=(document.body.offsetWidth-C+2*dhtmlXTooltip.config.delta_x||0)+"px"}else{if(C<0){this.tooltip.style.left=(H.x+Math.abs(dhtmlXTooltip.config.delta_x||0))+"px"}else{this.tooltip.style.left=C+"px"}}if(document.body.offsetHeight-B-F<0){if(this.tooltip.style.removeAttribute){this.tooltip.style.removeAttribute("top")}else{this.tooltip.style.removeProperty("top")}this.tooltip.style.bottom=(document.body.offsetHeight-B-2*dhtmlXTooltip.config.delta_y||0)+"px"}else{if(B<0){this.tooltip.style.top=(H.y+Math.abs(dhtmlXTooltip.config.delta_y||0))+"px"}else{this.tooltip.style.top=B+"px"}}this.tooltip.style.visibility="visible"};dhtmlXTooltip.hide=function(){if(this.tooltip.parentNode){this.tooltip.parentNode.removeChild(this.tooltip)}};dhtmlXTooltip.delay=function(D,B,C,A){if(this.tooltip._timeout_id){window.clearTimeout(this.tooltip._timeout_id)}this.tooltip._timeout_id=setTimeout(function(){var E=D.apply(B,C);D=obj=C=null;return E},A||this.config.timeout_to_display)};dhtmlXTooltip.isTooltip=function(B){var A=false;while(B&&!A){A=(B.className==this.tooltip.className);B=B.parentNode}return A};dhtmlXTooltip.position=function(A){var A=A||window.event;if(A.pageX||A.pageY){return{x:A.pageX,y:A.pageY}}var B=((dhtmlx._isIE)&&(document.compatMode!="BackCompat"))?document.documentElement:document.body;return{x:A.clientX+B.scrollLeft-B.clientLeft,y:A.clientY+B.scrollTop-B.clientTop}};scheduler.attachEvent("onMouseMove",function(D,F){var C=F||window.event;var E=C.target||C.srcElement;if(D||dhtmlXTooltip.isTooltip(E)){var B=scheduler.getEvent(D)||scheduler.getEvent(dhtmlXTooltip.tooltip.event_id);dhtmlXTooltip.tooltip.event_id=B.id;var G=scheduler.templates.tooltip_text(B.start_date,B.end_date,B);if(_isIE){var A=document.createEventObject(C)}dhtmlXTooltip.delay(dhtmlXTooltip.show,dhtmlXTooltip,[A||C,G])}else{dhtmlXTooltip.delay(dhtmlXTooltip.hide,dhtmlXTooltip,[])}});scheduler.templates.tooltip_text=function(C,A,B){return"<b>Event:</b> "+B.text+"<br/><b>Start date:</b> "+scheduler.templates.tooltip_date_format(C)+"<br/><b>End date:</b> "+scheduler.templates.tooltip_date_format(A)};
\ No newline at end of file
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/codebase/ext/dhtmlxscheduler_touch.css b/addons/base_calendar/static/lib/dhtmlxScheduler/codebase/ext/dhtmlxscheduler_touch.css
new file mode 100644
index 00000000000..e72e38213d0
--- /dev/null
+++ b/addons/base_calendar/static/lib/dhtmlxScheduler/codebase/ext/dhtmlxscheduler_touch.css
@@ -0,0 +1,9 @@
+/*
+dhtmlxScheduler v.2.3
+
+This software is allowed to use under GPL or you need to obtain Commercial or Enterise License
+to use it in not GPL project. Please contact sales@dhtmlx.com for details
+
+(c) DHTMLX Ltd.
+*/
+.dhx_cal_prev_button,.dhx_cal_next_button,.dhx_cal_today_button,.dhx_cal_add_button{top:6px!important;left:10px;border:1px solid #575D65;border-top:1px solid #4E5052;color:#FFF;text-shadow:0 -1px 0 #65696E;background-image:-webkit-gradient(linear,left top,left bottom,from(#B2B6BC),to(#6B737E));background-color:#989B9F;background-position:0 1px;background-repeat:repeat-x;-webkit-border-radius:5px;padding:3px;text-align:center;text-decoration:none;}.dhx_cal_today_button{left:55px;}.dhx_cal_next_button{left:146px;}.dhx_cal_add_button{right:9px;left:auto;width:20px;font-size:20px;padding:1px 2px 2px 2px;}.dhx_cal_navline .dhx_cal_date{top:7px;left:160px;right:350px;padding-top:4px;width:auto;text-align:center;color:#4F5459;}.dhx_cal_navline{background:-webkit-gradient(linear,0% 0,0% 100%,color-stop(0,#F4F5F8),color-stop(0.3,#F1F2F4),color-stop(0.7,#C4C7D0),color-stop(1,#A6AAB7));border-bottom:1px solid #797F90;height:40px!important;font-family:Helvetica;font-weight:bold;font-size:13px;}.dhx_cal_tab{top:6px!important;color:#4F5459;text-align:center;padding:5px 10px;width:80px;background-image:-webkit-gradient(linear,0% 0,0% 100%,from(#F7F7F7),to(#B9BDC7));background-color:#CFD0D1;background-position:0 1px;background-repeat:repeat-x;text-decoration:none;border:1px solid #95989F;border-top:1px solid #686A6A;height:16px;}.dhx_cal_tab.active{background-image:-webkit-gradient(linear,0% 0,0% 100%,from(#B0B2B6),to(#666D74));background-color:#949799;background-position:0 1px;background-repeat:repeat-x;border:1px solid #4C4D4F;border-top:1px solid #52585C;color:#F8F8F8;text-shadow:0 -1px 0 #5E6063;text-decoration:none;height:16px;padding:5px 10px;z-index:100;}.dhx_cal_light{-webkit-transition:-webkit-transform;-webkit-transform-style:preserve-3d;}.dhx_cal_cover{opacity:.5;}.dhx_cal_ltext{padding-top:0;padding-bottom:0;}.dhx_cal_ltext textarea{-webkit-background-size:0;-webkit-border-radius:0;height:94%;}.dhx_mini_calendar .dhx_month_head{height:35px;line-height:35px;text-align:center;padding-right:0;padding-left:0;}.dhx_mini_calendar .dhx_year_month{height:35px;line-height:30px;background:-webkit-gradient(linear,0% 0,0% 100%,from(#F4F5F8),to(#8A8E9A));font-family:Helvetica;font-weight:bold;font-size:13px;}.dhx_mini_calendar .dhx_year_month .dhx_cal_prev_button,.dhx_mini_calendar .dhx_year_month .dhx_cal_next_button{line-height:normal;}
\ No newline at end of file
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/codebase/ext/dhtmlxscheduler_touch.js b/addons/base_calendar/static/lib/dhtmlxScheduler/codebase/ext/dhtmlxscheduler_touch.js
new file mode 100644
index 00000000000..9004dfcee68
--- /dev/null
+++ b/addons/base_calendar/static/lib/dhtmlxScheduler/codebase/ext/dhtmlxscheduler_touch.js
@@ -0,0 +1,9 @@
+/*
+dhtmlxScheduler v.2.3
+
+This software is allowed to use under GPL or you need to obtain Commercial or Enterise License
+to use it in not GPL project. Please contact sales@dhtmlx.com for details
+
+(c) DHTMLX Ltd.
+*/
+TouchScroll=function(D,E,A,B){this.debug=!!E;this.compat=!!B;this.rough=!!A;this.axisX=this.axisY=true;if(typeof D!="object"){D=document.getElementById(D)}this._init();D.addEventListener("touchstart",this,false);D.addEventListener("webkitTransitionEnd",this,false);if(this.debug){D.addEventListener("mousedown",this,false)}this.node=D;for(var C=0;C<D.childNodes.length;C++){if(D.childNodes[C].nodeType==1){this.area=D.childNodes[C];break}}if(window.getComputedStyle(this.node).position=="static"){this.node.style.position="relative"}this.area.style.cssText+="-webkit-transition: -webkit-transform; -webkit-user-select:none; -webkit-transform-style:preserve-3d;";this.scrolls={}};TouchScroll.prototype={refresh:function(){this.node.style.webkitTransformStyle="flat";this.node.style.webkitTransformStyle="preserve-3d"},scrollTo:function(A,C,B){this.set_matrix({e:A,f:C},(B||0))},onscroll:function(A,B){},handleEvent:function(A){return this["ev_"+A.type](A)},get_matrix:function(A){return new WebKitCSSMatrix(window.getComputedStyle(A||this.area).webkitTransform)},set_matrix:function(C,B,A){(A||this.area).style.webkitTransform="translate("+Math.round(C.e)+"px,"+Math.round(C.f)+"px)";(A||this.area).style.webkitTransitionDuration=B},ev_touchstart:function(A){this.ev_mousedown(A.touches[0]);A.preventDefault();return false},ev_mousedown:function(B){var C=B;this.x=C.pageX;this.y=C.pageY;this.dx=this.node.offsetWidth;this.dy=this.node.offsetHeight;this.mx=this.area.scrollWidth;this.my=this.area.scrollHeight;this.target=C.target;if(!this.rough){var A=this.get_matrix();this.target_x=A.e;this.target_y=A.f;if(!this.scroll&&this.compat){A.e=this.node.scrollLeft*-1;A.f=this.node.scrollTop*-1;this.node.scrollTop=this.node.scrollLeft=0}this.set_matrix(A,0);this._correct_scroll(this.target_x,this.target_y)}this.scroll_x=this.scroll_y=this.scroll=false;this._init_events()},ev_touchend:function(){return this.ev_mouseup()},ev_mouseup:function(){this._deinit_events();if(!this.scroll){this._remove_scroll();var A=document.createEvent("MouseEvent");A.initMouseEvent("click",true,true);this.target.dispatchEvent(A)}this.target=null},ev_webkitTransitionEnd:function(){if(this.target||!this.scroll){return }this._remove_scroll();var B=this.get_matrix();this.node.firstChild._scrollTop=-1*B.f;if(this.compat&&(B.e||B.f)){var C=B.f;var A=B.e;B.e=B.f=0;this.set_matrix(B,0);this.node.scrollTop=-1*C;this.node.scrollLeft=-1*A}this.scroll=false},ev_touchmove:function(A){return this.ev_mousemove(A.touches[0])},ev_mousemove:function(E){if(!this.target){return }var G=E;var D=(G.pageX-this.x)*(this.axisX?5:0);var A=(G.pageY-this.y)*(this.axisY?5:0);if(Math.abs(D)<10&&Math.abs(A)<10){return }if(Math.abs(D)>50){this.scroll_x=true}if(Math.abs(A)>50){this.scroll_y=true}if(this.scroll_x||this.scroll_y){this.x=G.pageX;this.y=G.pageY;this.scroll=true;var C=this.get_matrix();D=D+(this.target_x-C.e);A=A+(this.target_y-C.f);var F="2000ms";var B="500ms";this.target_x=D+C.e;this.target_y=A+C.f;if(this.target_x>0){this.target_x=0;F=B}if(this.target_y>0){this.target_y=0;F=B}if(this.mx-this.dx+this.target_x<0){this.target_x=-this.mx+this.dx;F=B}if(this.my-this.dy+this.target_y<0){this.target_y=-this.my+this.dy;F=B}this.set_matrix({e:this.target_x,f:this.target_y},F);this._add_scroll(C.e,C.f);this._correct_scroll(this.target_x,this.target_y,F);this.onscroll(this.target_x,this.target_y)}return false},_correct_scroll:function(A,F,B){if(this.scrolls.x){var E=this.get_matrix(this.scrolls.x);var D=this.dx*A/this.mx;this.set_matrix({e:-1*D,f:0},B,this.scrolls.x)}if(this.scrolls.y){var E=this.get_matrix(this.scrolls.y);var C=this.dy*F/this.my;this.set_matrix({e:0,f:-1*C},B,this.scrolls.y)}},_remove_scroll:function(){if(this.scrolls.x){this.scrolls.x.parentNode.removeChild(this.scrolls.x)}if(this.scrolls.y){this.scrolls.y.parentNode.removeChild(this.scrolls.y)}this.scrolls={}},_add_scroll:function(){if(this.scrolls.ready){return }var C;if(this.my>5&&this.axisY){var B=this.dy*this.dy/this.my-1;this.scrolls.y=C=document.createElement("DIV");C.className="dhx_scroll_y";C.style.height=B+"px";this.node.appendChild(C)}if(this.mx>5&&this.axisX){var B=this.dx*this.dx/this.mx;this.scrolls.x=C=document.createElement("DIV");C.className="dhx_scroll_x";C.style.width=B+"px";this.node.appendChild(C)}var A=this.get_matrix();this._correct_scroll(A.e,A.f,0);this.scrolls.ready=true},_init_events:function(){document.addEventListener("touchmove",this,false);document.addEventListener("touchend",this,false);if(this.debug){document.addEventListener("mousemove",this,false);document.addEventListener("mouseup",this,false)}},_deinit_events:function(){document.removeEventListener("touchmove",this,false);document.removeEventListener("touchend",this,false);if(this.debug){document.removeEventListener("mousemove",this,false);document.removeEventListener("mouseup",this,false)}},_init:function(){document.styleSheets[0].insertRule(".dhx_scroll_x { width:50px;height:4px;background:rgba(0, 0, 0, 0.4);position:absolute; left:0px; bottom:3px; border:1px solid transparent; -webkit-border-radius:4px;-webkit-transition: -webkit-transform;}",0);document.styleSheets[0].insertRule(".dhx_scroll_y { width:4px;height:50px;background:rgba(0, 0, 0, 0.4);position:absolute; top:0px; right:3px; border:1px solid transparent; -webkit-border-radius:4px;-webkit-transition: -webkit-transform;}",0);this._init=function(){}}};scheduler._ipad_before_init=function(){scheduler._ipad_before_init=function(){};scheduler.xy.scroll_width=0;var C=scheduler._els.dhx_cal_tab;var B=42;for(var A=C.length-1;A>=0;A--){C[A].style.cssText+="top:4px;";C[A].style.left="auto";C[A].style.right=B+"px";if(A==0){C[A].style.cssText+=";-webkit-border-top-left-radius: 5px; -webkit-border-bottom-left-radius: 5px;"}if(A==C.length-1){C[A].style.cssText+=";-webkit-border-top-right-radius: 5px; -webkit-border-bottom-right-radius: 5px;"}B+=100}scheduler._els.dhx_cal_prev_button[0].innerHTML="&lt;";scheduler._els.dhx_cal_next_button[0].innerHTML="&gt;";var F=document.createElement("div");F.className="dhx_cal_add_button";F.innerHTML="+ ";F.onclick=function(){var G=new Date();if(G>scheduler._min_date&&G<scheduler._max_date){scheduler.addEventNow()}else{scheduler.addEventNow(scheduler._min_date.valueOf())}};scheduler._els.dhx_cal_navline[0].appendChild(F);this._obj.onmousedown=this._obj.onmouseup=this._obj.onmousemove=function(){};var D=null;var E=[];this._obj.ontouchmove=function(I){if(D){var H=Math.abs(I.touches[0].pageX-E[0]);var G=Math.abs(I.touches[0].pageY-E[1]);if(H>50||G>50){D=window.clearTimeout(D)}}if(scheduler.config.touch_actions){scheduler._on_mouse_move(I.touches[0])}};this._obj.ontouchstart=function(G){if(scheduler._lightbox_id){return }D=window.setTimeout(function(){scheduler._on_dbl_click(G.touches[0],(G.target.className?G.target:G.target.parentNode))},400);E=[G.touches[0].pageX,G.touches[0].pageY];if(scheduler.config.touch_actions){scheduler._on_mouse_down(G.touches[0])}};this._obj.ontouchend=function(G){if(D){D=window.clearTimeout(D)}if(scheduler.config.touch_actions){scheduler._on_mouse_up(G.touches[0])}}};scheduler._ipad_init=function(){var C=document.createElement("DIV");var B=scheduler._els.dhx_cal_data[0];C.appendChild(B);C.style.cssText="overflow:hidden; width:100%; overflow:hidden;position:relative;";this._obj.appendChild(C);B.style.overflowY="hidden";var A=new TouchScroll(C);A.axisX=false;scheduler._ipad_init=function(){B.parentNode.style.height=B.style.height;B.parentNode.style.top=B.style.top;B.style.height=B.scrollHeight+"px";B.style.top="0px";if(Math.abs(B.parentNode.offsetHeight-B.offsetHeight)<5){A.axisY=false;A.scrollTo(0,0,0)}else{A.axisY=true}A.refresh()};scheduler.attachEvent("onSchedulerResize",function(){setTimeout(function(){scheduler._ipad_init()});return true});scheduler._ipad_init()};scheduler.attachEvent("onViewChange",function(){scheduler._ipad_init()});scheduler.attachEvent("onBeforeViewChange",function(){scheduler._ipad_before_init();return true});scheduler.showCover=function(B){this.show_cover();if(B){B.style.display="block";var C=getOffset(this._obj);B.style.top=B.offsetHeight*-1+"px";B.style.left=Math.round(C.left+(this._obj.offsetWidth-B.offsetWidth)/2)+"px"}var A=this._get_lightbox();A.style.webkitTransform="translate(0px,"+(B.offsetHeight+41)+"px)";A.style.webkitTransitionDuration="500ms"};scheduler.hideCover=function(A){if(A){A.style.webkitTransform="translate(0px,"+(A.offsetHeight+41)*-1+"px)";A.style.webkitTransitionDuration="500ms"}this.hide_cover()};scheduler.config.lightbox.sections[0].height=100;if(scheduler.form_blocks.calendar_time){scheduler.config.lightbox.sections[1].type="calendar_time";scheduler._mini_cal_arrows=["&lt;","&gt;"]}scheduler.xy.menu_width=0;scheduler.attachEvent("onClick",function(){return false});scheduler.locale.labels.new_event="";scheduler._mouse_coords=function(C){var F;var A=document.body;var E=document.documentElement;if(C.pageX||C.pageY){F={x:C.pageX,y:C.pageY}}else{F={x:C.clientX+(A.scrollLeft||E.scrollLeft||0)-A.clientLeft,y:C.clientY+(A.scrollTop||E.scrollTop||0)-A.clientTop}}F.x-=getAbsoluteLeft(this._obj)+(this._table_view?0:this.xy.scale_width);var D=F.y-=getAbsoluteTop(this._obj)+this.xy.nav_height+this._dy_shift+this.xy.scale_height-(this._els.dhx_cal_data[0]._scrollTop||0);if(!this._table_view){F.x=Math.max(0,Math.ceil(F.x/this._cols[0])-1);F.y=Math.max(0,Math.ceil(F.y*60/(this.config.time_step*this.config.hour_size_px))-1)+this.config.first_hour*(60/this.config.time_step)}else{var B=0;for(B=1;B<this._colsS.heights.length;B++){if(this._colsS.heights[B]>F.y){break}}F.y=(Math.max(0,Math.ceil(F.x/this._cols[0])-1)+Math.max(0,B-1)*7)*24*60/this.config.time_step;F.x=0}return F};
\ No newline at end of file
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/codebase/ext/dhtmlxscheduler_treetimeline.js b/addons/base_calendar/static/lib/dhtmlxScheduler/codebase/ext/dhtmlxscheduler_treetimeline.js
new file mode 100644
index 00000000000..ecd08cc8cdd
--- /dev/null
+++ b/addons/base_calendar/static/lib/dhtmlxScheduler/codebase/ext/dhtmlxscheduler_treetimeline.js
@@ -0,0 +1 @@
+scheduler.attachEvent("onTimelineCreated",function(A){if(A.render=="tree"){A.y_unit_original=A.y_unit;A.y_unit=scheduler._getArrayToDisplay(A.y_unit_original);scheduler.form_blocks[A.name]={render:function(C){var B="<div class='dhx_section_timeline' style='overflow: hidden; height: "+C.height+"px'></div>";return B},set_value:function(D,I,G,C){var J=scheduler._getArrayForSelect(scheduler.matrix[C.type].y_unit_original,C.type);D.innerHTML="";var F=document.createElement("select");D.appendChild(F);var H=D.getElementsByTagName("select")[0];for(var E=0;E<J.length;E++){var B=document.createElement("option");B.value=J[E].key;if(B.value==G[scheduler.matrix[C.type].y_property]){B.selected=true}B.innerHTML=J[E].label;H.appendChild(B)}},get_value:function(D,C,B){return D.firstChild.value},focus:function(B){}}}});scheduler.attachEvent("onBeforeViewRender",function(J,E,H){var F={};if(J=="tree"){var I;var D,A,B;var C;var G;if(E.children){I=H.folder_dy||H.dy;if(H.folder_dy&&!H.section_autoheight){A="height:"+H.folder_dy+"px;"}D="dhx_row_folder";B="dhx_matrix_scell folder";C="<div class='dhx_scell_expand'>"+((E.open)?"-":"+")+"</div>";G=(H.folder_events_available)?"dhx_data_table folder_events":"dhx_data_table folder"}else{I=H.dy;D="dhx_row_item";B="dhx_matrix_scell item";C="";G="dhx_data_table"}td_content="<div class='dhx_scell_level"+E.level+"'>"+C+"<div class='dhx_scell_name'>"+(scheduler.templates[H.name+"_scale_label"](E.key,E.label,H)||E.label)+"</div></div>";F={height:I,style_height:A,tr_className:D,td_className:B,td_content:td_content,table_className:G}}return F});var section_id_before;scheduler.attachEvent("onBeforeEventChanged",function(D,A,C){if(scheduler._isRender("tree")){var B=scheduler.getSection(D.section_id);if(typeof B.children!="undefined"&&!scheduler.matrix[scheduler._mode].folder_events_available){if(!C){D[scheduler.matrix[scheduler._mode].y_property]=section_id_before}return false}}return true});scheduler.attachEvent("onBeforeDrag",function(D,E,C){var A=scheduler._locate_cell_timeline(C);if(A){var B=scheduler.matrix[scheduler._mode].y_unit[A.y].key;if(typeof scheduler.matrix[scheduler._mode].y_unit[A.y].children!="undefined"&&!scheduler.matrix[scheduler._mode].folder_events_available){return false}}if(scheduler._isRender("tree")){ev=scheduler.getEvent(D);section_id_before=B||ev[scheduler.matrix[scheduler._mode].y_property]}return true});scheduler._getArrayToDisplay=function(C){var A=[];var B=function(G,D){var F=D||0;for(var E=0;E<G.length;E++){G[E].level=F;if(typeof G[E].children!="undefined"&&typeof G[E].key=="undefined"){G[E].key=scheduler.uid()}A.push(G[E]);if(G[E].open&&G[E].children){B(G[E].children,F+1)}}};B(C);return A};scheduler._getArrayForSelect=function(D,C){var A=[];var B=function(F){for(var E=0;E<F.length;E++){if(scheduler.matrix[C].folder_events_available){A.push(F[E])}else{if(typeof F[E].children=="undefined"){A.push(F[E])}}if(F[E].children){B(F[E].children,C)}}};B(D);return A};scheduler._toggleFolderDisplay=function(E,B,A){var D;var C=function(I,J,G,F){for(var H=0;H<J.length;H++){if((J[H].key==I||F)&&J[H].children){J[H].open=(typeof G!="undefined")?G:!J[H].open;D=true;if(!F&&D){break}}if(J[H].children){C(I,J[H].children,G,F)}}};C(E,scheduler.matrix[scheduler._mode].y_unit_original,B,A);scheduler.matrix[scheduler._mode].y_unit=scheduler._getArrayToDisplay(scheduler.matrix[scheduler._mode].y_unit_original);scheduler.callEvent("onOptionsLoad",[])};scheduler.attachEvent("onCellClick",function(B,E,C,A,D){if(scheduler._isRender("tree")){if(!scheduler.matrix[scheduler._mode].folder_events_available){if(typeof scheduler.matrix[scheduler._mode].y_unit[E].children!="undefined"){scheduler._toggleFolderDisplay(scheduler.matrix[scheduler._mode].y_unit[E].key)}}}});scheduler.attachEvent("onYScaleClick",function(A,C,B){if(scheduler._isRender("tree")){if(typeof C.children!="undefined"){scheduler._toggleFolderDisplay(C.key)}}});scheduler.getSection=function(C){if(scheduler._isRender("tree")){var B;var A=function(E,F){for(var D=0;D<F.length;D++){if(F[D].key==E){B=F[D]}if(F[D].children){A(E,F[D].children)}}};A(C,scheduler.matrix[scheduler._mode].y_unit_original);return B||null}};scheduler.deleteSection=function(C){if(scheduler._isRender("tree")){var A=false;var B=function(E,F){for(var D=0;D<F.length;D++){if(F[D].key==E){F.splice(D,1);A=true}if(A){break}if(F[D].children){B(E,F[D].children)}}};B(C,scheduler.matrix[scheduler._mode].y_unit_original);scheduler.matrix[scheduler._mode].y_unit=scheduler._getArrayToDisplay(scheduler.matrix[scheduler._mode].y_unit_original);scheduler.callEvent("onOptionsLoad",[]);return A}};scheduler.addSection=function(D,B){if(scheduler._isRender("tree")){var A=false;var C=function(G,E,H){if(!B){H.push(G);A=true}else{for(var F=0;F<H.length;F++){if(H[F].key==E&&typeof H[F].children!="undefined"){H[F].children.push(G);A=true}if(A){break}if(H[F].children){C(G,E,H[F].children)}}}};C(D,B,scheduler.matrix[scheduler._mode].y_unit_original);scheduler.matrix[scheduler._mode].y_unit=scheduler._getArrayToDisplay(scheduler.matrix[scheduler._mode].y_unit_original);scheduler.callEvent("onOptionsLoad",[]);return A}};scheduler.openAllSections=function(){if(scheduler._isRender("tree")){scheduler._toggleFolderDisplay(1,true,true)}};scheduler.closeAllSections=function(){if(scheduler._isRender("tree")){scheduler._toggleFolderDisplay(1,false,true)}};scheduler.openSection=function(A){if(scheduler._isRender("tree")){scheduler._toggleFolderDisplay(A,true)}};scheduler.closeSection=function(A){if(scheduler._isRender("tree")){scheduler._toggleFolderDisplay(A,false)}};
\ No newline at end of file
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/codebase/ext/dhtmlxscheduler_units.js b/addons/base_calendar/static/lib/dhtmlxScheduler/codebase/ext/dhtmlxscheduler_units.js
new file mode 100644
index 00000000000..104e843670c
--- /dev/null
+++ b/addons/base_calendar/static/lib/dhtmlxScheduler/codebase/ext/dhtmlxscheduler_units.js
@@ -0,0 +1,9 @@
+/*
+dhtmlxScheduler v.2.3
+
+This software is allowed to use under GPL or you need to obtain Commercial or Enterise License
+to use it in not GPL project. Please contact sales@dhtmlx.com for details
+
+(c) DHTMLX Ltd.
+*/
+scheduler._props={};scheduler.createUnitsView=function(A,E,D,B,C){if(typeof A=="object"){D=A.list;E=A.property;B=A.size||0;C=A.step||1;A=A.name}scheduler.date[A+"_start"]=scheduler.date.day_start;scheduler.templates[A+"_date"]=function(F){return scheduler.templates.day_date(F)};scheduler.templates[A+"_scale_date"]=function(G){if(!D.length){return""}var F=(scheduler._props[A].position||0)+Math.floor((scheduler._correct_shift(G.valueOf(),1)-scheduler._min_date.valueOf())/(60*60*24*1000));if(D[F].css){return"<span class='"+D[F].css+"'>"+D[F].label+"</span>"}else{return D[F].label}};scheduler.date["add_"+A]=function(F,G){return scheduler.date.add(F,G,"day")};scheduler.date["get_"+A+"_end"]=function(F){return scheduler.date.add(F,B||D.length,"day")};scheduler._props[A]={map_to:E,options:D,size:B,step:C,position:0};scheduler.attachEvent("onOptionsLoad",function(){var F=scheduler._props[A].order={};for(var G=0;G<D.length;G++){F[D[G].key]=G}if(scheduler._date){scheduler.setCurrentView(scheduler._date,scheduler._mode)}});scheduler.callEvent("onOptionsLoad",[])};scheduler.scrollUnit=function(A){var B=scheduler._props[this._mode];if(B){B.position=Math.min(Math.max(0,B.position+A),B.options.length-B.size);this.update_view()}};(function(){var D=function(L,J){if(L&&typeof L.order[J[L.map_to]]=="undefined"){var I=scheduler;var H=24*60*60*1000;var K=Math.floor((J.end_date-I._min_date)/H);J[L.map_to]=L.options[Math.min(K+L.position,L.options.length-1)].key;return true}};var B=scheduler._reset_scale;var F=scheduler.is_visible_events;scheduler.is_visible_events=function(I){var H=F.apply(this,arguments);if(H){var K=scheduler._props[this._mode];if(K&&K.size){var J=K.order[I[K.map_to]];if(J<K.position||J>=K.size+K.position){return false}}}return H};scheduler._reset_scale=function(){var M=scheduler._props[this._mode];var H=B.apply(this,arguments);if(M){this._max_date=this.date.add(this._min_date,1,"day");var L=this._els.dhx_cal_data[0].childNodes;for(var I=0;I<L.length;I++){L[I].className=L[I].className.replace("_now","")}if(M.size&&M.size<M.options.length){var J=this._els.dhx_cal_header[0];var K=document.createElement("DIV");if(M.position){K.className="dhx_cal_prev_button";K.style.cssText="left:1px;top:2px;position:absolute;";K.innerHTML="&nbsp;";J.firstChild.appendChild(K);K.onclick=function(){scheduler.scrollUnit(M.step*-1)}}if(M.position+M.size<M.options.length){K=document.createElement("DIV");K.className="dhx_cal_next_button";K.style.cssText="left:auto; right:0px;top:2px;position:absolute;";K.innerHTML="&nbsp;";J.lastChild.appendChild(K);K.onclick=function(){scheduler.scrollUnit(M.step)}}}}return H};var C=scheduler._get_event_sday;scheduler._get_event_sday=function(H){var I=scheduler._props[this._mode];if(I){D(I,H);return I.order[H[I.map_to]]-I.position}return C.call(this,H)};var A=scheduler.locate_holder_day;scheduler.locate_holder_day=function(I,H,J){var K=scheduler._props[this._mode];if(K){D(K,J);return K.order[J[K.map_to]]*1+(H?1:0)-K.position}return A.apply(this,arguments)};var E=scheduler._mouse_coords;scheduler._mouse_coords=function(){var K=scheduler._props[this._mode];var J=E.apply(this,arguments);if(K){var H=this._drag_event;if(this._drag_id){H=this.getEvent(this._drag_id);this._drag_event._dhx_changed=true}var I=Math.min(J.x+K.position,K.options.length-1);H[K.map_to]=K.options[I].key;J.x=I/10000000}return J};var G=scheduler._time_order;scheduler._time_order=function(H){var I=scheduler._props[this._mode];if(I){H.sort(function(K,J){return I.order[K[I.map_to]]>I.order[J[I.map_to]]?1:-1})}else{G.apply(this,arguments)}};scheduler.attachEvent("onEventAdded",function(K,I){if(this._loading){return true}for(var H in scheduler._props){var J=scheduler._props[H];if(typeof I[J.map_to]=="undefined"){I[J.map_to]=J.options[0].key}}return true});scheduler.attachEvent("onEventCreated",function(K,H){var J=scheduler._props[this._mode];if(J){var I=this.getEvent(K);this._mouse_coords(H);D(J,I);this.event_updated(I)}return true})})();
\ No newline at end of file
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/codebase/ext/dhtmlxscheduler_url.js b/addons/base_calendar/static/lib/dhtmlxScheduler/codebase/ext/dhtmlxscheduler_url.js
new file mode 100644
index 00000000000..8992c37f373
--- /dev/null
+++ b/addons/base_calendar/static/lib/dhtmlxScheduler/codebase/ext/dhtmlxscheduler_url.js
@@ -0,0 +1,9 @@
+/*
+dhtmlxScheduler v.2.3
+
+This software is allowed to use under GPL or you need to obtain Commercial or Enterise License
+to use it in not GPL project. Please contact sales@dhtmlx.com for details
+
+(c) DHTMLX Ltd.
+*/
+scheduler.attachEvent("onTemplatesReady",function(){var C=true;var A=scheduler.date.str_to_date("%Y-%m-%d");var B=scheduler.date.date_to_str("%Y-%m-%d");scheduler.attachEvent("onBeforeViewChange",function(K,D,F,J){if(C){C=false;var E={};var G=(document.location.hash||"").replace("#","").split(",");for(var H=0;H<G.length;H++){var M=G[H].split("=");if(M.length==2){E[M[0]]=M[1]}}if(E.date||E.mode){try{this.setCurrentView((E.date?A(E.date):null),(E.mode||null))}catch(I){this.setCurrentView((E.date?A(E.date):null),F)}return false}}var L="#date="+B(J||D)+",mode="+(F||K);document.location.hash=L;return true})});
\ No newline at end of file
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/codebase/ext/dhtmlxscheduler_year_view.js b/addons/base_calendar/static/lib/dhtmlxScheduler/codebase/ext/dhtmlxscheduler_year_view.js
new file mode 100644
index 00000000000..6d4bfb14777
--- /dev/null
+++ b/addons/base_calendar/static/lib/dhtmlxScheduler/codebase/ext/dhtmlxscheduler_year_view.js
@@ -0,0 +1,9 @@
+/*
+dhtmlxScheduler v.2.3
+
+This software is allowed to use under GPL or you need to obtain Commercial or Enterise License
+to use it in not GPL project. Please contact sales@dhtmlx.com for details
+
+(c) DHTMLX Ltd.
+*/
+scheduler.config.year_x=4;scheduler.config.year_y=3;scheduler.config.year_mode_name="year";scheduler.xy.year_top=0;scheduler.templates.year_date=function(A){return scheduler.date.date_to_str(scheduler.locale.labels.year_tab+" %Y")(A)};scheduler.templates.year_month=scheduler.date.date_to_str("%F");scheduler.templates.year_scale_date=scheduler.date.date_to_str("%D");scheduler.templates.year_tooltip=function(A,C,B){return B.text};(function(){var F=function(){return scheduler._mode==scheduler.config.year_mode_name};scheduler.dblclick_dhx_month_head=function(J){if(F()){var I=(J.target||J.srcElement);if(I.parentNode.className.indexOf("dhx_before")!=-1||I.parentNode.className.indexOf("dhx_after")!=-1){return false}var K=this.templates.xml_date(I.parentNode.parentNode.parentNode.parentNode.parentNode.parentNode.getAttribute("date"));K.setDate(parseInt(I.innerHTML,10));var H=this.date.add(K,1,"day");if(!this.config.readonly&&this.config.dblclick_create){this.addEventNow(K.valueOf(),H.valueOf(),J)}}};var C=scheduler.changeEventId;scheduler.changeEventId=function(){C.apply(this,arguments);if(F()){this.year_view(true)}};var B=scheduler.render_data;var G=scheduler.date.date_to_str("%Y/%m/%d");var E=scheduler.date.str_to_date("%Y/%m/%d");scheduler.render_data=function(H){if(!F()){return B.apply(this,arguments)}for(var I=0;I<H.length;I++){this._year_render_event(H[I])}};var A=scheduler.clear_view;scheduler.clear_view=function(){if(!F()){return A.apply(this,arguments)}for(var H=0;H<D.length;H++){D[H].className="dhx_month_head";D[H].setAttribute("date","")}D=[]};scheduler.hideToolTip=function(){if(this._tooltip){this._tooltip.style.display="none";this._tooltip.date=new Date(9999,1,1)}};scheduler.showToolTip=function(I,O,M,N){if(this._tooltip){if(this._tooltip.date.valueOf()==I.valueOf()){return }this._tooltip.innerHTML=""}else{var L=this._tooltip=document.createElement("DIV");L.className="dhx_tooltip";document.body.appendChild(L);L.onclick=scheduler._click.dhx_cal_data}var H=this.getEvents(I,this.date.add(I,1,"day"));var K="";for(var J=0;J<H.length;J++){K+="<div class='dhx_tooltip_line' event_id='"+H[J].id+"'>";K+="<div class='dhx_tooltip_date'>"+(H[J]._timed?this.templates.event_date(H[J].start_date):"")+"</div>";K+="<div class='dhx_event_icon icon_details'>&nbsp;</div>";K+=this.templates.year_tooltip(H[J].start_date,H[J].end_date,H[J])+"</div>"}this._tooltip.style.display="";this._tooltip.style.top="0px";if(document.body.offsetWidth-O.left-this._tooltip.offsetWidth<0){this._tooltip.style.left=O.left-this._tooltip.offsetWidth+"px"}else{this._tooltip.style.left=O.left+N.offsetWidth+"px"}this._tooltip.date=I;this._tooltip.innerHTML=K;if(document.body.offsetHeight-O.top-this._tooltip.offsetHeight<0){this._tooltip.style.top=O.top-this._tooltip.offsetHeight+N.offsetHeight+"px"}else{this._tooltip.style.top=O.top+"px"}};scheduler._init_year_tooltip=function(){dhtmlxEvent(scheduler._els.dhx_cal_data[0],"mouseover",function(H){if(!F()){return }var H=H||event;var I=H.target||H.srcElement;if((I.className||"").indexOf("dhx_year_event")!=-1){scheduler.showToolTip(E(I.getAttribute("date")),getOffset(I),H,I)}else{scheduler.hideToolTip()}});this._init_year_tooltip=function(){}};scheduler.attachEvent("onSchedulerResize",function(){if(F()){this.year_view(true);return false}return true});scheduler._get_year_cell=function(J){var H=J.getMonth()+12*(J.getFullYear()-this._min_date.getFullYear())-this.week_starts._month;var I=this._els.dhx_cal_data[0].childNodes[H];var J=this.week_starts[H]+J.getDate()-1;return I.childNodes[2].firstChild.rows[Math.floor(J/7)].cells[J%7].firstChild};var D=[];scheduler._mark_year_date=function(I,H){var J=this._get_year_cell(I);J.className="dhx_month_head dhx_year_event "+this.templates.event_class(H.start_date,H.end_date,H);J.setAttribute("date",G(I));D.push(J)};scheduler._unmark_year_date=function(H){this._get_year_cell(H).className="dhx_month_head"};scheduler._year_render_event=function(H){var I=H.start_date;if(I.valueOf()<this._min_date.valueOf()){I=this._min_date}else{I=this.date.date_part(new Date(I))}while(I<H.end_date){this._mark_year_date(I,H);I=this.date.add(I,1,"day");if(I.valueOf()>=this._max_date.valueOf()){return }}};scheduler.year_view=function(I){if(I){var H=scheduler.xy.scale_height;scheduler.xy.scale_height=-1}scheduler._els.dhx_cal_header[0].style.display=I?"none":"";scheduler.set_sizes();if(I){scheduler.xy.scale_height=H}scheduler._table_view=I;if(this._load_mode&&this._load()){return }if(I){scheduler._init_year_tooltip();scheduler._reset_year_scale();scheduler.render_view_data()}else{scheduler.hideToolTip()}};scheduler._reset_year_scale=function(){this._cols=[];this._colsS={};var T=[];var Z=this._els.dhx_cal_data[0];var X=this.config;Z.scrollTop=0;Z.innerHTML="";var M=Math.floor(parseInt(Z.style.width)/X.year_x);var L=Math.floor((parseInt(Z.style.height)-scheduler.xy.year_top)/X.year_y);if(L<190){L=190;M=Math.floor((parseInt(Z.style.width)-scheduler.xy.scroll_width)/X.year_x)}var Q=M-11;var I=0;var K=document.createElement("div");var a=this.date.week_start(new Date());for(var V=0;V<7;V++){this._cols[V]=Math.floor(Q/(7-V));this._render_x_header(V,I,a,K);a=this.date.add(a,1,"day");Q-=this._cols[V];I+=this._cols[V]}K.lastChild.className+=" dhx_scale_bar_last";var H=this.date[this._mode+"_start"](this.date.copy(this._date));var R=H;for(var V=0;V<X.year_y;V++){for(var U=0;U<X.year_x;U++){var W=document.createElement("DIV");W.style.cssText="position:absolute;";W.setAttribute("date",this.templates.xml_format(H));W.innerHTML="<div class='dhx_year_month'></div><div class='dhx_year_week'>"+K.innerHTML+"</div><div class='dhx_year_body'></div>";W.childNodes[0].innerHTML=this.templates.year_month(H);var Y=this.date.week_start(H);var J=this._reset_month_scale(W.childNodes[2],H,Y);var P=W.childNodes[2].firstChild.rows;for(var S=P.length;S<6;S++){P[0].parentNode.appendChild(P[0].cloneNode(true));for(var O=0;O<P[S].childNodes.length;O++){P[S].childNodes[O].className="dhx_after";P[S].childNodes[O].firstChild.innerHTML=scheduler.templates.month_day(J);J=scheduler.date.add(J,1,"day")}}Z.appendChild(W);var N=Math.round((L-190)/2);W.style.marginTop=N+"px";this.set_xy(W,M-10,L-N-10,M*U+5,L*V+5+scheduler.xy.year_top);T[V*X.year_x+U]=(H.getDay()-(this.config.start_on_monday?1:0)+7)%7;H=this.date.add(H,1,"month")}}this._els.dhx_cal_date[0].innerHTML=this.templates[this._mode+"_date"](R,H,this._mode);this.week_starts=T;T._month=R.getMonth();this._min_date=R;this._max_date=H}})();
\ No newline at end of file
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/codebase/imgs/blue_tab.png b/addons/base_calendar/static/lib/dhtmlxScheduler/codebase/imgs/blue_tab.png
new file mode 100644
index 00000000000..6e77272f5b0
Binary files /dev/null and b/addons/base_calendar/static/lib/dhtmlxScheduler/codebase/imgs/blue_tab.png differ
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/codebase/imgs/but_repeat.gif b/addons/base_calendar/static/lib/dhtmlxScheduler/codebase/imgs/but_repeat.gif
new file mode 100644
index 00000000000..dd6595e5d9e
Binary files /dev/null and b/addons/base_calendar/static/lib/dhtmlxScheduler/codebase/imgs/but_repeat.gif differ
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/codebase/imgs/buttons.png b/addons/base_calendar/static/lib/dhtmlxScheduler/codebase/imgs/buttons.png
new file mode 100644
index 00000000000..5036c9c2efb
Binary files /dev/null and b/addons/base_calendar/static/lib/dhtmlxScheduler/codebase/imgs/buttons.png differ
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/codebase/imgs/calendar.gif b/addons/base_calendar/static/lib/dhtmlxScheduler/codebase/imgs/calendar.gif
new file mode 100644
index 00000000000..67257083540
Binary files /dev/null and b/addons/base_calendar/static/lib/dhtmlxScheduler/codebase/imgs/calendar.gif differ
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/codebase/imgs/clock_big.gif b/addons/base_calendar/static/lib/dhtmlxScheduler/codebase/imgs/clock_big.gif
new file mode 100644
index 00000000000..61f7dc2e5ac
Binary files /dev/null and b/addons/base_calendar/static/lib/dhtmlxScheduler/codebase/imgs/clock_big.gif differ
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/codebase/imgs/clock_small.gif b/addons/base_calendar/static/lib/dhtmlxScheduler/codebase/imgs/clock_small.gif
new file mode 100644
index 00000000000..3e4b179761e
Binary files /dev/null and b/addons/base_calendar/static/lib/dhtmlxScheduler/codebase/imgs/clock_small.gif differ
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/codebase/imgs/colapce-expand-icon.gif b/addons/base_calendar/static/lib/dhtmlxScheduler/codebase/imgs/colapce-expand-icon.gif
new file mode 100644
index 00000000000..64da9483ea6
Binary files /dev/null and b/addons/base_calendar/static/lib/dhtmlxScheduler/codebase/imgs/colapce-expand-icon.gif differ
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/codebase/imgs/controls.gif b/addons/base_calendar/static/lib/dhtmlxScheduler/codebase/imgs/controls.gif
new file mode 100644
index 00000000000..9732e2da748
Binary files /dev/null and b/addons/base_calendar/static/lib/dhtmlxScheduler/codebase/imgs/controls.gif differ
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/codebase/imgs/databg.png b/addons/base_calendar/static/lib/dhtmlxScheduler/codebase/imgs/databg.png
new file mode 100644
index 00000000000..3bba608beeb
Binary files /dev/null and b/addons/base_calendar/static/lib/dhtmlxScheduler/codebase/imgs/databg.png differ
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/codebase/imgs/databg_now.png b/addons/base_calendar/static/lib/dhtmlxScheduler/codebase/imgs/databg_now.png
new file mode 100644
index 00000000000..510dfd0b17f
Binary files /dev/null and b/addons/base_calendar/static/lib/dhtmlxScheduler/codebase/imgs/databg_now.png differ
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/codebase/imgs/icon.png b/addons/base_calendar/static/lib/dhtmlxScheduler/codebase/imgs/icon.png
new file mode 100644
index 00000000000..31d6626cdd4
Binary files /dev/null and b/addons/base_calendar/static/lib/dhtmlxScheduler/codebase/imgs/icon.png differ
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/codebase/imgs/loading.gif b/addons/base_calendar/static/lib/dhtmlxScheduler/codebase/imgs/loading.gif
new file mode 100644
index 00000000000..f5e71df6aa4
Binary files /dev/null and b/addons/base_calendar/static/lib/dhtmlxScheduler/codebase/imgs/loading.gif differ
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/codebase/imgs/white_tab.png b/addons/base_calendar/static/lib/dhtmlxScheduler/codebase/imgs/white_tab.png
new file mode 100644
index 00000000000..ddff430ce52
Binary files /dev/null and b/addons/base_calendar/static/lib/dhtmlxScheduler/codebase/imgs/white_tab.png differ
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/readme.txt b/addons/base_calendar/static/lib/dhtmlxScheduler/readme.txt
new file mode 100644
index 00000000000..647f03a9958
--- /dev/null
+++ b/addons/base_calendar/static/lib/dhtmlxScheduler/readme.txt
@@ -0,0 +1,7 @@
+dhtmlxScheduler v.2.3
+
+This software is allowed to use under GPL or you need to obtain Commercial or Enterise License
+to use it in not GPL project. Please contact sales@dhtmlx.com for details
+
+
+(c) DHTMLX Ltd. 
\ No newline at end of file
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/sources/base.js b/addons/base_calendar/static/lib/dhtmlxScheduler/sources/base.js
new file mode 100644
index 00000000000..350f83198a1
--- /dev/null
+++ b/addons/base_calendar/static/lib/dhtmlxScheduler/sources/base.js
@@ -0,0 +1,133 @@
+scheduler.date={
+	date_part:function(date){
+		date.setHours(0);
+		date.setMinutes(0);
+		date.setSeconds(0);
+		date.setMilliseconds(0);	
+		return date;
+	},
+	time_part:function(date){
+		return (date.valueOf()/1000 - date.getTimezoneOffset()*60)%86400;
+	},
+	week_start:function(date){
+			var shift=date.getDay();
+			if (scheduler.config.start_on_monday){
+				if (shift==0) shift=6
+				else shift--;
+			}
+			return this.date_part(this.add(date,-1*shift,"day"));
+	},
+	month_start:function(date){
+		date.setDate(1);
+		return this.date_part(date);
+	},
+	year_start:function(date){
+		date.setMonth(0);
+		return this.month_start(date);
+	},
+	day_start:function(date){
+			return this.date_part(date);
+	},
+	add:function(date,inc,mode){
+		var ndate=new Date(date.valueOf());
+		switch(mode){
+			case "day": ndate.setDate(ndate.getDate()+inc); break;
+			case "week": ndate.setDate(ndate.getDate()+7*inc); break;
+			case "month": ndate.setMonth(ndate.getMonth()+inc); break;
+			case "year": ndate.setYear(ndate.getFullYear()+inc); break;
+			case "hour": ndate.setHours(ndate.getHours()+inc); break;
+			case "minute": ndate.setMinutes(ndate.getMinutes()+inc); break;
+			default:
+				return scheduler.date["add_"+mode](date,inc,mode);
+		}
+		return ndate;
+	},
+	to_fixed:function(num){
+		if (num<10)	return "0"+num;
+		return num;
+	},
+	copy:function(date){
+		return new Date(date.valueOf());
+	},
+	date_to_str:function(format,utc){
+		format=format.replace(/%[a-zA-Z]/g,function(a){
+			switch(a){
+				case "%d": return "\"+scheduler.date.to_fixed(date.getDate())+\"";
+				case "%m": return "\"+scheduler.date.to_fixed((date.getMonth()+1))+\"";
+				case "%j": return "\"+date.getDate()+\"";
+				case "%n": return "\"+(date.getMonth()+1)+\"";
+				case "%y": return "\"+scheduler.date.to_fixed(date.getFullYear()%100)+\""; 
+				case "%Y": return "\"+date.getFullYear()+\"";
+				case "%D": return "\"+scheduler.locale.date.day_short[date.getDay()]+\"";
+				case "%l": return "\"+scheduler.locale.date.day_full[date.getDay()]+\"";
+				case "%M": return "\"+scheduler.locale.date.month_short[date.getMonth()]+\"";
+				case "%F": return "\"+scheduler.locale.date.month_full[date.getMonth()]+\"";
+				case "%h": return "\"+scheduler.date.to_fixed((date.getHours()+11)%12+1)+\"";
+				case "%g": return "\"+((date.getHours()+11)%12+1)+\"";
+				case "%G": return "\"+date.getHours()+\"";
+				case "%H": return "\"+scheduler.date.to_fixed(date.getHours())+\"";
+				case "%i": return "\"+scheduler.date.to_fixed(date.getMinutes())+\"";
+				case "%a": return "\"+(date.getHours()>11?\"pm\":\"am\")+\"";
+				case "%A": return "\"+(date.getHours()>11?\"PM\":\"AM\")+\"";
+				case "%s": return "\"+scheduler.date.to_fixed(date.getSeconds())+\"";
+				case "%W": return "\"+scheduler.date.to_fixed(scheduler.date.getISOWeek(date))+\"";
+				default: return a;
+			}
+		})
+		if (utc) format=format.replace(/date\.get/g,"date.getUTC");
+		return new Function("date","return \""+format+"\";");
+	},
+	str_to_date:function(format,utc){
+		var splt="var temp=date.split(/[^0-9a-zA-Z]+/g);";
+		var mask=format.match(/%[a-zA-Z]/g);
+		for (var i=0; i<mask.length; i++){
+			switch(mask[i]){
+				case "%j":
+				case "%d": splt+="set[2]=temp["+i+"]||1;";
+					break;
+				case "%n":
+				case "%m": splt+="set[1]=(temp["+i+"]||1)-1;";
+					break;
+				case "%y": splt+="set[0]=temp["+i+"]*1+(temp["+i+"]>50?1900:2000);";
+					break;
+				case "%g":
+				case "%G":
+				case "%h": 
+				case "%H":
+							splt+="set[3]=temp["+i+"]||0;";
+					break;
+				case "%i":
+							splt+="set[4]=temp["+i+"]||0;";
+					break;
+				case "%Y":  splt+="set[0]=temp["+i+"]||0;";
+					break;
+				case "%a":					
+				case "%A":  splt+="set[3]=set[3]%12+((temp["+i+"]||'').toLowerCase()=='am'?0:12);";
+					break;					
+				case "%s":  splt+="set[5]=temp["+i+"]||0;";
+					break;
+			}
+		}
+		var code ="set[0],set[1],set[2],set[3],set[4],set[5]";
+		if (utc) code =" Date.UTC("+code+")";
+		return new Function("date","var set=[0,0,1,0,0,0]; "+splt+" return new Date("+code+");");
+	},
+		
+	getISOWeek: function(ndate) {
+		if(!ndate) return false;
+		var nday = ndate.getDay();
+		if (nday == 0) {
+			nday = 7;
+		}
+		var first_thursday = new Date(ndate.valueOf());
+		first_thursday.setDate(ndate.getDate() + (4 - nday));
+		var year_number = first_thursday.getFullYear(); // year of the first Thursday
+		var ordinal_date = Math.floor( (first_thursday.getTime() - new Date(year_number, 0, 1).getTime()) / 86400000); //ordinal date of the first Thursday - 1 (so not really ordinal date)
+		var week_number = 1 + Math.floor( ordinal_date / 7);	
+		return week_number;
+	},
+	
+	getUTCISOWeek: function(ndate){
+   	return this.getISOWeek(ndate);
+   }
+}
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/sources/clear.css b/addons/base_calendar/static/lib/dhtmlxScheduler/sources/clear.css
new file mode 100644
index 00000000000..728af2d65bd
--- /dev/null
+++ b/addons/base_calendar/static/lib/dhtmlxScheduler/sources/clear.css
@@ -0,0 +1,106 @@
+.dhx_cal_ltext{
+    text-align:left;
+}
+.dhx_agenda_line {
+  overflow:hidden;
+  white-space:nowrap;
+}
+.dhx_cal_light select{
+    width:auto;
+}
+
+.dhx_custom_button {
+     width:120px !important;
+}
+
+.dhx_cal_ltext{
+    text-align:left;
+}
+.dhx_form_repeat{
+    text-align:left;
+    width:100%;
+}
+
+.dhx_cal_lsection {
+    text-align:left;
+}
+.dhx_month_head{
+	font-size:8pt;
+}
+.dhx_expand_icon {
+	position:absolute; top:0px; right:2px; 
+	background-image:url(./imgs/colapce-expand-icon.gif);
+	width:18px; height:18px;
+	cursor:pointer;
+	background-position:0px 18px;
+	z-index:16;
+}
+
+div.dhx_cal_container table tr td {
+	border-width:0 !important;
+	padding:0 !important;
+}
+
+.dhx_cal_container table {
+	border-collapse:separate !important;
+	margin:0 0 !important;
+}
+
+.dhx_cal_container{
+	z-index:999;
+}
+
+div.dhx_cal_event_clear,  div.dhx_cal_event{
+    line-height:100%;
+}
+
+.dhx_cal_ltext textarea {
+	-moz-box-shadow:none;
+	border-width:0;
+	padding:0;
+	background:transparent none repeat scroll 0 0;
+	-webkit-box-shadow:none;
+}
+
+.dhx_cal_light{
+	text-align:left;
+}
+.dhx_cal_light div, .dhx_cal_container div{
+	line-height:normal;
+}
+
+.dhx_cal_light .dhx_form_repeat div,.dhx_cal_light  .dhx_form_repeat{
+	line-height:24px;
+}
+
+
+/* anti-joomla */
+div.dhx_cal_navline div, .dhx_scale_bar, .dhx_scale_hour, .dhx_title{
+	text-align:center !important;
+}
+#whitebox div .dhx_month_head  {
+	text-align:right;
+}
+#whitebox div .dhx_cal_event_line, #whitebox div .dhx_body{
+	text-align:left;
+}
+div.dhx_cal_container, div.dhx_cal_lsection{
+	line-height:1em;
+}
+div.dhx_cal_container, div.dhx_cal_lsection{
+	line-height:normal;
+}
+.dhx_cal_header .dhx_agenda_line div, .dhx_year_month{
+	text-align:center !important;
+}
+.dhx_tooltip{
+	text-align:left;
+}
+
+
+.dhx_cal_data table{
+	border-width:0px !important;
+}
+.dhx_cal_data table tr td{
+	border-top-width:0px !important;
+}
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/sources/config.js b/addons/base_calendar/static/lib/dhtmlxScheduler/sources/config.js
new file mode 100644
index 00000000000..d9e5685a132
--- /dev/null
+++ b/addons/base_calendar/static/lib/dhtmlxScheduler/sources/config.js
@@ -0,0 +1,105 @@
+/*
+%e	Day of the month without leading zeros (01..31)
+%d	Day of the month, 2 digits with leading zeros (01..31)
+%j	Day of the year, 3 digits with leading zeros (001..366)
+%a	A textual representation of a day, two letters
+%W	A full textual representation of the day of the week
+
+%c	Numeric representation of a month, without leading zeros (0..12)
+%m	Numeric representation of a month, with leading zeros (00..12)
+%b	A short textual representation of a month, three letters (Jan..Dec)
+%M	A full textual representation of a month, such as January or March (January..December)
+
+%y	A two digit representation of a year (93..03)
+%Y	A full numeric representation of a year, 4 digits (1993..03)
+*/
+
+scheduler.config={
+	default_date: "%j %M %Y",
+	month_date: "%F %Y",
+	load_date: "%Y-%m-%d",
+	week_date: "%l",
+	day_date: "%D, %F %j",
+	hour_date: "%H:%i",
+	month_day : "%d",
+	xml_date:"%m/%d/%Y %H:%i",
+	api_date:"%d-%m-%Y %H:%i",
+
+	hour_size_px:42,
+	time_step:5,
+
+	start_on_monday:1,
+	first_hour:0,
+	last_hour:24,
+	readonly:false,
+	drag_resize:1,
+	drag_move:1,
+	drag_create:1,
+	dblclick_create:1,
+	edit_on_create:1,
+	details_on_create:0,
+	click_form_details:0,
+	
+	server_utc:false,
+
+	positive_closing:false,
+
+	icons_edit:["icon_save","icon_cancel"],
+	icons_select:["icon_details","icon_edit","icon_delete"],
+	
+	lightbox:{
+		sections:[	{name:"description", height:200, map_to:"text", type:"textarea" , focus:true},
+					{name:"time", height:72, type:"time", map_to:"auto"}	]
+	}
+};
+scheduler.templates={}
+scheduler.init_templates=function(){
+	var d=scheduler.date.date_to_str;
+	var c=scheduler.config;
+	var f = function(a,b){
+		for (var c in b)
+			if (!a[c]) a[c]=b[c];
+	}
+	f(scheduler.templates,{
+		day_date:d(c.default_date),
+		month_date:d(c.month_date),
+		week_date:function(d1,d2){
+			return scheduler.templates.day_date(d1)+" &ndash; "+scheduler.templates.day_date(scheduler.date.add(d2,-1,"day"));
+		},
+		day_scale_date:d(c.default_date),
+		month_scale_date:d(c.week_date),
+		week_scale_date:d(c.day_date),
+		hour_scale:d(c.hour_date),
+		time_picker:d(c.hour_date),
+		event_date:d(c.hour_date),
+		month_day:d(c.month_day),
+		xml_date:scheduler.date.str_to_date(c.xml_date,c.server_utc),
+		load_format:d(c.load_date,c.server_utc),
+		xml_format:d(c.xml_date,c.server_utc),
+		api_date:scheduler.date.str_to_date(c.api_date),
+		event_header:function(start,end,ev){
+			return scheduler.templates.event_date(start)+" - "+scheduler.templates.event_date(end);
+		},
+		event_text:function(start,end,ev){
+			return ev.text;
+		},
+		event_class:function(start,end,ev){
+			return "";
+		},
+		month_date_class:function(d){
+			return "";
+		},
+		week_date_class:function(d){
+			return "";
+		},
+		event_bar_date:function(start,end,ev){
+			return scheduler.templates.event_date(start)+" ";
+		},
+		event_bar_text:function(start,end,ev){
+			return ev.text;
+		}
+	});
+	this.callEvent("onTemplatesReady",[])
+}
+
+
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/sources/connector.js b/addons/base_calendar/static/lib/dhtmlxScheduler/sources/connector.js
new file mode 100644
index 00000000000..45afbf6d089
--- /dev/null
+++ b/addons/base_calendar/static/lib/dhtmlxScheduler/sources/connector.js
@@ -0,0 +1,137 @@
+/*
+	dhx_sort[index]=direction
+	dhx_filter[index]=mask
+*/
+if (window.dhtmlXGridObject){
+	dhtmlXGridObject.prototype._init_point_connector=dhtmlXGridObject.prototype._init_point;
+	dhtmlXGridObject.prototype._init_point=function(){
+		var clear_url=function(url){
+			url=url.replace(/(\?|\&)connector[^\f]*/g,"");
+			return url+(url.indexOf("?")!=-1?"&":"?")+"connector=true"+(mygrid.hdr.rows.length > 0 ? "&dhx_no_header=1":"");
+		};
+		var combine_urls=function(url){
+			return clear_url(url)+(this._connector_sorting||"")+(this._connector_filter||"");
+		};
+		var sorting_url=function(url,ind,dir){
+			this._connector_sorting="&dhx_sort["+ind+"]="+dir;
+			return combine_urls.call(this,url);
+		};
+		var filtering_url=function(url,inds,vals){
+			for (var i=0; i<inds.length; i++)
+				inds[i]="dhx_filter["+inds[i]+"]="+encodeURIComponent(vals[i]);
+			this._connector_filter="&"+inds.join("&");
+			return combine_urls.call(this,url);
+		};
+		this.attachEvent("onCollectValues",function(ind){
+			if (this._con_f_used[ind]){
+				if (typeof(this._con_f_used[ind]) == "object")
+					return this._con_f_used[ind];
+				else
+					return false;
+			}
+			return true;
+		});	
+		this.attachEvent("onDynXLS",function(){
+				this.xmlFileUrl=combine_urls.call(this,this.xmlFileUrl);
+				return true;
+		});				
+		this.attachEvent("onBeforeSorting",function(ind,type,dir){
+			if (type=="connector"){
+				var self=this;
+				this.clearAndLoad(sorting_url.call(this,this.xmlFileUrl,ind,dir),function(){
+					self.setSortImgState(true,ind,dir);
+				});
+				return false;
+			}
+			return true;
+		});
+		this.attachEvent("onFilterStart",function(a,b){
+			if (this._con_f_used.length){
+				this.clearAndLoad(filtering_url.call(this,this.xmlFileUrl,a,b));
+				return false;
+			}
+			return true;
+		});
+		this.attachEvent("onXLE",function(a,b,c,xml){
+			if (!xml) return;
+		});
+		
+		if (this._init_point_connector) this._init_point_connector();
+	};
+	dhtmlXGridObject.prototype._con_f_used=[];
+	dhtmlXGridObject.prototype._in_header_connector_text_filter=function(t,i){
+		if (!this._con_f_used[i])
+			this._con_f_used[i]=1;
+		return this._in_header_text_filter(t,i);
+	};
+	dhtmlXGridObject.prototype._in_header_connector_select_filter=function(t,i){
+		if (!this._con_f_used[i])
+			this._con_f_used[i]=2;
+		return this._in_header_select_filter(t,i);
+	};
+	dhtmlXGridObject.prototype.load_connector=dhtmlXGridObject.prototype.load;
+	dhtmlXGridObject.prototype.load=function(url, call, type){
+		if (!this._colls_loaded && this.cellType){
+			var ar=[];
+			for (var i=0; i < this.cellType.length; i++)
+				if (this.cellType[i].indexOf("co")==0 || this._con_f_used[i]==2) ar.push(i);
+			if (ar.length)
+				arguments[0]+=(arguments[0].indexOf("?")!=-1?"&":"?")+"connector=true&dhx_colls="+ar.join(",");
+		}
+		return this.load_connector.apply(this,arguments);
+	};
+	dhtmlXGridObject.prototype._parseHead_connector=dhtmlXGridObject.prototype._parseHead;
+	dhtmlXGridObject.prototype._parseHead=function(url, call, type){
+		this._parseHead_connector.apply(this,arguments);
+		if (!this._colls_loaded){
+			var cols = this.xmlLoader.doXPath("./coll_options", arguments[0]);
+			for (var i=0; i < cols.length; i++){
+				var f = cols[i].getAttribute("for");
+				var v = [];
+				var combo=null;
+				if (this.cellType[f] == "combo")
+					combo = this.getColumnCombo(f);
+				if (this.cellType[f].indexOf("co")==0)
+					combo=this.getCombo(f);
+					
+				var os = this.xmlLoader.doXPath("./item",cols[i]);
+				for (var j=0; j<os.length; j++){
+					var val=os[j].getAttribute("value");
+					
+					if (combo){
+						var lab=os[j].getAttribute("label")||val;
+						
+						if (combo.addOption)
+							combo.addOption([[val, lab]]);
+						else
+							combo.put(val,lab);
+							
+						v[v.length]=lab;
+					} else
+						v[v.length]=val;
+				}
+				if (this._con_f_used[f*1])
+					this._con_f_used[f*1]=v;
+			};
+			this._colls_loaded=true;
+		}
+	};	
+	
+	
+	
+
+}
+
+if (window.dataProcessor){
+	dataProcessor.prototype.init_original=dataProcessor.prototype.init;
+	dataProcessor.prototype.init=function(obj){
+		this.init_original(obj);
+		obj._dataprocessor=this;
+		
+		this.setTransactionMode("POST",true);
+		this.serverProcessor+=(this.serverProcessor.indexOf("?")!=-1?"&":"?")+"editing=true";
+	};
+};
+dhtmlxError.catchError("LoadXML",function(a,b,c){
+	alert(c[0].responseText);
+});
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/sources/dataprocessor_hook.js b/addons/base_calendar/static/lib/dhtmlxScheduler/sources/dataprocessor_hook.js
new file mode 100644
index 00000000000..1fdfc17bb68
--- /dev/null
+++ b/addons/base_calendar/static/lib/dhtmlxScheduler/sources/dataprocessor_hook.js
@@ -0,0 +1,78 @@
+scheduler._dp_init=function(dp){
+	dp._methods=["setEventTextStyle","","changeEventId","deleteEvent"];
+	
+	this.attachEvent("onEventAdded",function(id){
+		if (!this._loading && this.validId(id))
+			dp.setUpdated(id,true,"inserted");
+	});
+	this.attachEvent("onBeforeEventDelete",function(id){
+		if (!this.validId(id)) return;
+        var z=dp.getState(id);
+        
+		if (z=="inserted" || this._new_event) {  dp.setUpdated(id,false);		return true; }
+		if (z=="deleted")  return false;
+    	if (z=="true_deleted")  return true;
+    	
+		dp.setUpdated(id,true,"deleted");
+      	return false;
+	});
+	this.attachEvent("onEventChanged",function(id){
+		if (!this._loading && this.validId(id))
+			dp.setUpdated(id,true,"updated");
+	});
+	
+	dp._getRowData=function(id,pref){
+		var ev=this.obj.getEvent(id);
+		var data = {};
+		
+		for (var a in ev){
+			if (a.indexOf("_")==0) continue;
+			if (ev[a] && ev[a].getUTCFullYear) //not very good, but will work
+				data[a] = this.obj.templates.xml_format(ev[a]);
+			else
+				data[a] = ev[a];
+		}
+		
+		return data;
+	};
+	dp._clearUpdateFlag=function(){};
+	
+	dp.attachEvent("insertCallback", scheduler._update_callback);
+	dp.attachEvent("updateCallback", scheduler._update_callback);
+	dp.attachEvent("deleteCallback", function(upd, id) {
+		this.obj.setUserData(id, this.action_param, "true_deleted");
+		this.obj.deleteEvent(id);
+	});
+		
+};
+
+
+scheduler.setUserData=function(id,name,value){
+	if (id)
+		this.getEvent(id)[name]=value;
+	else
+		this._userdata[name]=value;
+};
+scheduler.getUserData=function(id,name){
+	return id?this.getEvent(id)[name]:this._userdata[name];
+};
+scheduler.setEventTextStyle=function(id,style){
+	this.for_rendered(id,function(r){
+		r.style.cssText+=";"+style;
+	});
+	var ev = this.getEvent(id);
+	ev["_text_style"]=style;
+	this.event_updated(ev);
+};
+scheduler.validId=function(id){
+	return true;
+};
+
+scheduler._update_callback = function(upd,id){
+	var data		=	scheduler.xmlNodeToJSON(upd.firstChild);
+	data.text		=	data.text||data._tagvalue;
+	data.start_date	=	scheduler.templates.xml_date(data.start_date);
+	data.end_date	=	scheduler.templates.xml_date(data.end_date);
+	
+	scheduler.addEvent(data);
+};
\ No newline at end of file
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/sources/dhtmlxcommon.js b/addons/base_calendar/static/lib/dhtmlxScheduler/sources/dhtmlxcommon.js
new file mode 100644
index 00000000000..b4c157b4638
--- /dev/null
+++ b/addons/base_calendar/static/lib/dhtmlxScheduler/sources/dhtmlxcommon.js
@@ -0,0 +1,901 @@
+dhtmlx=function(obj){
+	for (var a in obj) dhtmlx[a]=obj[a];
+	return dhtmlx; //simple singleton
+};
+dhtmlx.extend_api=function(name,map,ext){
+	var t = window[name];
+	if (!t) return; //component not defined
+	window[name]=function(obj){
+		if (obj && typeof obj == "object" && !obj.tagName && !(obj instanceof Array)){
+			var that = t.apply(this,(map._init?map._init(obj):arguments));
+			//global settings
+			for (var a in dhtmlx)
+				if (map[a]) this[map[a]](dhtmlx[a]);			
+			//local settings
+			for (var a in obj){
+				if (map[a]) this[map[a]](obj[a]);
+				else if (a.indexOf("on")==0){
+					this.attachEvent(a,obj[a]);
+				}
+			}
+		} else
+			var that = t.apply(this,arguments);
+		if (map._patch) map._patch(this);
+		return that||this;
+	};
+	window[name].prototype=t.prototype;
+	if (ext)
+		dhtmlXHeir(window[name].prototype,ext);
+};
+
+dhtmlxAjax={
+	get:function(url,callback){
+		var t=new dtmlXMLLoaderObject(true);
+		t.async=(arguments.length<3);
+		t.waitCall=callback;
+		t.loadXML(url)
+		return t;
+	},
+	post:function(url,post,callback){
+		var t=new dtmlXMLLoaderObject(true);
+		t.async=(arguments.length<4);
+		t.waitCall=callback;
+		t.loadXML(url,true,post)
+		return t;
+	},
+	getSync:function(url){
+		return this.get(url,null,true)
+	},
+	postSync:function(url,post){
+		return this.post(url,post,null,true);		
+	}
+}
+
+/**
+  *     @desc: xmlLoader object
+  *     @type: private
+  *     @param: funcObject - xml parser function
+  *     @param: object - jsControl object
+  *     @param: async - sync/async mode (async by default)
+  *     @param: rSeed - enable/disable random seed ( prevent IE caching)
+  *     @topic: 0
+  */
+function dtmlXMLLoaderObject(funcObject, dhtmlObject, async, rSeed){
+	this.xmlDoc="";
+
+	if (typeof (async) != "undefined")
+		this.async=async;
+	else
+		this.async=true;
+
+	this.onloadAction=funcObject||null;
+	this.mainObject=dhtmlObject||null;
+	this.waitCall=null;
+	this.rSeed=rSeed||false;
+	return this;
+};
+/**
+  *     @desc: xml loading handler
+  *     @type: private
+  *     @param: dtmlObject - xmlLoader object
+  *     @topic: 0
+  */
+dtmlXMLLoaderObject.prototype.waitLoadFunction=function(dhtmlObject){
+	var once = true;
+	this.check=function (){
+		if ((dhtmlObject)&&(dhtmlObject.onloadAction != null)){
+			if ((!dhtmlObject.xmlDoc.readyState)||(dhtmlObject.xmlDoc.readyState == 4)){
+				if (!once)
+					return;
+
+				once=false; //IE 5 fix
+				if (typeof dhtmlObject.onloadAction == "function")
+					dhtmlObject.onloadAction(dhtmlObject.mainObject, null, null, null, dhtmlObject);
+
+				if (dhtmlObject.waitCall){
+					dhtmlObject.waitCall.call(this,dhtmlObject);
+					dhtmlObject.waitCall=null;
+				}
+			}
+		}
+	};
+	return this.check;
+};
+
+/**
+  *     @desc: return XML top node
+  *     @param: tagName - top XML node tag name (not used in IE, required for Safari and Mozilla)
+  *     @type: private
+  *     @returns: top XML node
+  *     @topic: 0  
+  */
+dtmlXMLLoaderObject.prototype.getXMLTopNode=function(tagName, oldObj){
+	if (this.xmlDoc.responseXML){
+		var temp = this.xmlDoc.responseXML.getElementsByTagName(tagName);
+		if(temp.length==0 && tagName.indexOf(":")!=-1)
+			var temp = this.xmlDoc.responseXML.getElementsByTagName((tagName.split(":"))[1]);
+		var z = temp[0];
+	} else
+		var z = this.xmlDoc.documentElement;
+
+	if (z){
+		this._retry=false;
+		return z;
+	}
+
+	if ((_isIE)&&(!this._retry)){
+		//fall back to MS.XMLDOM
+		var xmlString = this.xmlDoc.responseText;
+		var oldObj = this.xmlDoc;
+		this._retry=true;
+		this.xmlDoc=new ActiveXObject("Microsoft.XMLDOM");
+		this.xmlDoc.async=false;
+		this.xmlDoc["loadXM"+"L"](xmlString);
+
+		return this.getXMLTopNode(tagName, oldObj);
+	}
+	dhtmlxError.throwError("LoadXML", "Incorrect XML", [
+		(oldObj||this.xmlDoc),
+		this.mainObject
+	]);
+
+	return document.createElement("DIV");
+};
+
+/**
+  *     @desc: load XML from string
+  *     @type: private
+  *     @param: xmlString - xml string
+  *     @topic: 0  
+  */
+dtmlXMLLoaderObject.prototype.loadXMLString=function(xmlString){
+	{
+		try{
+			var parser = new DOMParser();
+			this.xmlDoc=parser.parseFromString(xmlString, "text/xml");
+		}
+		catch (e){
+			this.xmlDoc=new ActiveXObject("Microsoft.XMLDOM");
+			this.xmlDoc.async=this.async;
+			this.xmlDoc["loadXM"+"L"](xmlString);
+		}
+	}
+
+	this.onloadAction(this.mainObject, null, null, null, this);
+
+	if (this.waitCall){
+		this.waitCall();
+		this.waitCall=null;
+	}
+}
+/**
+  *     @desc: load XML
+  *     @type: private
+  *     @param: filePath - xml file path
+  *     @param: postMode - send POST request
+  *     @param: postVars - list of vars for post request
+  *     @topic: 0
+  */
+dtmlXMLLoaderObject.prototype.loadXML=function(filePath, postMode, postVars, rpc){
+	if (this.rSeed)
+		filePath+=((filePath.indexOf("?") != -1) ? "&" : "?")+"a_dhx_rSeed="+(new Date()).valueOf();
+	this.filePath=filePath;
+	if ((!_isIE)&&(window.XMLHttpRequest))
+		this.xmlDoc=new XMLHttpRequest();
+	else {
+		this.xmlDoc=new ActiveXObject("Microsoft.XMLHTTP");
+	}
+
+	if (this.async)
+		this.xmlDoc.onreadystatechange=new this.waitLoadFunction(this);
+	this.xmlDoc.open(postMode ? "POST" : "GET", filePath, this.async);
+
+	if (rpc){
+		this.xmlDoc.setRequestHeader("User-Agent", "dhtmlxRPC v0.1 ("+navigator.userAgent+")");
+		this.xmlDoc.setRequestHeader("Content-type", "text/xml");
+	}
+
+	else if (postMode)
+		this.xmlDoc.setRequestHeader('Content-type', 'application/x-www-form-urlencoded');
+		
+	this.xmlDoc.setRequestHeader("X-Requested-With","XMLHttpRequest");
+	this.xmlDoc.send(null||postVars);
+
+	if (!this.async)
+		(new this.waitLoadFunction(this))();
+};
+/**
+  *     @desc: destructor, cleans used memory
+  *     @type: private
+  *     @topic: 0
+  */
+dtmlXMLLoaderObject.prototype.destructor=function(){
+	this.onloadAction=null;
+	this.mainObject=null;
+	this.xmlDoc=null;
+	return null;
+}
+
+dtmlXMLLoaderObject.prototype.xmlNodeToJSON = function(node){
+        var t={};
+        for (var i=0; i<node.attributes.length; i++)
+            t[node.attributes[i].name]=node.attributes[i].value;
+        t["_tagvalue"]=node.firstChild?node.firstChild.nodeValue:"";
+        for (var i=0; i<node.childNodes.length; i++){
+            var name=node.childNodes[i].tagName;
+            if (name){
+                if (!t[name]) t[name]=[];
+                t[name].push(this.xmlNodeToJSON(node.childNodes[i]));
+            }            
+        }        
+        return t;
+    }
+
+/**  
+  *     @desc: Call wrapper
+  *     @type: private
+  *     @param: funcObject - action handler
+  *     @param: dhtmlObject - user data
+  *     @returns: function handler
+  *     @topic: 0  
+  */
+function callerFunction(funcObject, dhtmlObject){
+	this.handler=function(e){
+		if (!e)
+			e=window.event;
+		funcObject(e, dhtmlObject);
+		return true;
+	};
+	return this.handler;
+};
+
+/**  
+  *     @desc: Calculate absolute position of html object
+  *     @type: private
+  *     @param: htmlObject - html object
+  *     @topic: 0  
+  */
+function getAbsoluteLeft(htmlObject){
+	return getOffset(htmlObject).left;
+}
+/**
+  *     @desc: Calculate absolute position of html object
+  *     @type: private
+  *     @param: htmlObject - html object
+  *     @topic: 0  
+  */
+function getAbsoluteTop(htmlObject){
+	return getOffset(htmlObject).top;
+}
+
+function getOffsetSum(elem) {
+	var top=0, left=0;
+	while(elem) {
+		top = top + parseInt(elem.offsetTop);
+		left = left + parseInt(elem.offsetLeft);
+		elem = elem.offsetParent;
+	}
+	return {top: top, left: left};
+}
+function getOffsetRect(elem) {
+	var box = elem.getBoundingClientRect();
+	var body = document.body;
+	var docElem = document.documentElement;
+	var scrollTop = window.pageYOffset || docElem.scrollTop || body.scrollTop;
+	var scrollLeft = window.pageXOffset || docElem.scrollLeft || body.scrollLeft;
+	var clientTop = docElem.clientTop || body.clientTop || 0;
+	var clientLeft = docElem.clientLeft || body.clientLeft || 0;
+	var top  = box.top +  scrollTop - clientTop;
+	var left = box.left + scrollLeft - clientLeft;
+	return { top: Math.round(top), left: Math.round(left) };
+}
+function getOffset(elem) {
+	if (elem.getBoundingClientRect && !_isChrome) {
+		return getOffsetRect(elem);
+	} else {
+		return getOffsetSum(elem);
+	}
+}
+
+/**  
+*     @desc: Convert string to it boolean representation
+*     @type: private
+*     @param: inputString - string for covertion
+*     @topic: 0
+*/
+function convertStringToBoolean(inputString){
+	if (typeof (inputString) == "string")
+		inputString=inputString.toLowerCase();
+
+	switch (inputString){
+		case "1":
+		case "true":
+		case "yes":
+		case "y":
+		case 1:
+		case true:
+			return true;
+			break;
+
+		default: return false;
+	}
+}
+
+/**  
+*     @desc: find out what symbol to use as url param delimiters in further params
+*     @type: private
+*     @param: str - current url string
+*     @topic: 0  
+*/
+function getUrlSymbol(str){
+	if (str.indexOf("?") != -1)
+		return "&"
+	else
+		return "?"
+}
+
+function dhtmlDragAndDropObject(){
+	if (window.dhtmlDragAndDrop)
+		return window.dhtmlDragAndDrop;
+
+	this.lastLanding=0;
+	this.dragNode=0;
+	this.dragStartNode=0;
+	this.dragStartObject=0;
+	this.tempDOMU=null;
+	this.tempDOMM=null;
+	this.waitDrag=0;
+	window.dhtmlDragAndDrop=this;
+
+	return this;
+};
+
+dhtmlDragAndDropObject.prototype.removeDraggableItem=function(htmlNode){
+	htmlNode.onmousedown=null;
+	htmlNode.dragStarter=null;
+	htmlNode.dragLanding=null;
+}
+dhtmlDragAndDropObject.prototype.addDraggableItem=function(htmlNode, dhtmlObject){
+	htmlNode.onmousedown=this.preCreateDragCopy;
+	htmlNode.dragStarter=dhtmlObject;
+	this.addDragLanding(htmlNode, dhtmlObject);
+}
+dhtmlDragAndDropObject.prototype.addDragLanding=function(htmlNode, dhtmlObject){
+	htmlNode.dragLanding=dhtmlObject;
+}
+dhtmlDragAndDropObject.prototype.preCreateDragCopy=function(e){
+	if ((e||event) && (e||event).button == 2)
+		return;
+
+	if (window.dhtmlDragAndDrop.waitDrag){
+		window.dhtmlDragAndDrop.waitDrag=0;
+		document.body.onmouseup=window.dhtmlDragAndDrop.tempDOMU;
+		document.body.onmousemove=window.dhtmlDragAndDrop.tempDOMM;
+		return false;
+	}
+
+	window.dhtmlDragAndDrop.waitDrag=1;
+	window.dhtmlDragAndDrop.tempDOMU=document.body.onmouseup;
+	window.dhtmlDragAndDrop.tempDOMM=document.body.onmousemove;
+	window.dhtmlDragAndDrop.dragStartNode=this;
+	window.dhtmlDragAndDrop.dragStartObject=this.dragStarter;
+	document.body.onmouseup=window.dhtmlDragAndDrop.preCreateDragCopy;
+	document.body.onmousemove=window.dhtmlDragAndDrop.callDrag;
+	window.dhtmlDragAndDrop.downtime = new Date().valueOf();
+	
+
+	if ((e)&&(e.preventDefault)){
+		e.preventDefault();
+		return false;
+	}
+	return false;
+};
+dhtmlDragAndDropObject.prototype.callDrag=function(e){
+	if (!e)
+		e=window.event;
+	dragger=window.dhtmlDragAndDrop;
+	if ((new Date()).valueOf()-dragger.downtime<100) return;
+
+	if ((e.button == 0)&&(_isIE))
+		return dragger.stopDrag();
+
+	if (!dragger.dragNode&&dragger.waitDrag){
+		dragger.dragNode=dragger.dragStartObject._createDragNode(dragger.dragStartNode, e);
+
+		if (!dragger.dragNode)
+			return dragger.stopDrag();
+
+		dragger.dragNode.onselectstart=function(){return false;}
+		dragger.gldragNode=dragger.dragNode;
+		document.body.appendChild(dragger.dragNode);
+		document.body.onmouseup=dragger.stopDrag;
+		dragger.waitDrag=0;
+		dragger.dragNode.pWindow=window;
+		dragger.initFrameRoute();
+	}
+
+	if (dragger.dragNode.parentNode != window.document.body){
+		var grd = dragger.gldragNode;
+
+		if (dragger.gldragNode.old)
+			grd=dragger.gldragNode.old;
+
+		//if (!document.all) dragger.calculateFramePosition();
+		grd.parentNode.removeChild(grd);
+		var oldBody = dragger.dragNode.pWindow;
+
+		//		var oldp=dragger.dragNode.parentObject;
+		if (_isIE){
+			var div = document.createElement("Div");
+			div.innerHTML=dragger.dragNode.outerHTML;
+			dragger.dragNode=div.childNodes[0];
+		} else
+			dragger.dragNode=dragger.dragNode.cloneNode(true);
+
+		dragger.dragNode.pWindow=window;
+		//		dragger.dragNode.parentObject=oldp;
+
+		dragger.gldragNode.old=dragger.dragNode;
+		document.body.appendChild(dragger.dragNode);
+		oldBody.dhtmlDragAndDrop.dragNode=dragger.dragNode;
+	}
+
+	dragger.dragNode.style.left=e.clientX+15+(dragger.fx
+		? dragger.fx*(-1)
+		: 0)
+		+(document.body.scrollLeft||document.documentElement.scrollLeft)+"px";
+	dragger.dragNode.style.top=e.clientY+3+(dragger.fy
+		? dragger.fy*(-1)
+		: 0)
+		+(document.body.scrollTop||document.documentElement.scrollTop)+"px";
+
+	if (!e.srcElement)
+		var z = e.target;
+	else
+		z=e.srcElement;
+	dragger.checkLanding(z, e);
+}
+
+dhtmlDragAndDropObject.prototype.calculateFramePosition=function(n){
+	//this.fx = 0, this.fy = 0;
+	if (window.name){
+		var el = parent.frames[window.name].frameElement.offsetParent;
+		var fx = 0;
+		var fy = 0;
+
+		while (el){
+			fx+=el.offsetLeft;
+			fy+=el.offsetTop;
+			el=el.offsetParent;
+		}
+
+		if ((parent.dhtmlDragAndDrop)){
+			var ls = parent.dhtmlDragAndDrop.calculateFramePosition(1);
+			fx+=ls.split('_')[0]*1;
+			fy+=ls.split('_')[1]*1;
+		}
+
+		if (n)
+			return fx+"_"+fy;
+		else
+			this.fx=fx;
+		this.fy=fy;
+	}
+	return "0_0";
+}
+dhtmlDragAndDropObject.prototype.checkLanding=function(htmlObject, e){
+	if ((htmlObject)&&(htmlObject.dragLanding)){
+		if (this.lastLanding)
+			this.lastLanding.dragLanding._dragOut(this.lastLanding);
+		this.lastLanding=htmlObject;
+		this.lastLanding=this.lastLanding.dragLanding._dragIn(this.lastLanding, this.dragStartNode, e.clientX,
+			e.clientY, e);
+		this.lastLanding_scr=(_isIE ? e.srcElement : e.target);
+	} else {
+		if ((htmlObject)&&(htmlObject.tagName != "BODY"))
+			this.checkLanding(htmlObject.parentNode, e);
+		else {
+			if (this.lastLanding)
+				this.lastLanding.dragLanding._dragOut(this.lastLanding, e.clientX, e.clientY, e);
+			this.lastLanding=0;
+
+			if (this._onNotFound)
+				this._onNotFound();
+		}
+	}
+}
+dhtmlDragAndDropObject.prototype.stopDrag=function(e, mode){
+	dragger=window.dhtmlDragAndDrop;
+
+	if (!mode){
+		dragger.stopFrameRoute();
+		var temp = dragger.lastLanding;
+		dragger.lastLanding=null;
+
+		if (temp)
+			temp.dragLanding._drag(dragger.dragStartNode, dragger.dragStartObject, temp, (_isIE
+				? event.srcElement
+				: e.target));
+	}
+	dragger.lastLanding=null;
+
+	if ((dragger.dragNode)&&(dragger.dragNode.parentNode == document.body))
+		dragger.dragNode.parentNode.removeChild(dragger.dragNode);
+	dragger.dragNode=0;
+	dragger.gldragNode=0;
+	dragger.fx=0;
+	dragger.fy=0;
+	dragger.dragStartNode=0;
+	dragger.dragStartObject=0;
+	document.body.onmouseup=dragger.tempDOMU;
+	document.body.onmousemove=dragger.tempDOMM;
+	dragger.tempDOMU=null;
+	dragger.tempDOMM=null;
+	dragger.waitDrag=0;
+}
+
+dhtmlDragAndDropObject.prototype.stopFrameRoute=function(win){
+	if (win)
+		window.dhtmlDragAndDrop.stopDrag(1, 1);
+
+	for (var i = 0; i < window.frames.length; i++){
+		try{
+		if ((window.frames[i] != win)&&(window.frames[i].dhtmlDragAndDrop))
+			window.frames[i].dhtmlDragAndDrop.stopFrameRoute(window);
+		} catch(e){}
+	}
+
+	try{
+	if ((parent.dhtmlDragAndDrop)&&(parent != window)&&(parent != win))
+		parent.dhtmlDragAndDrop.stopFrameRoute(window);
+	} catch(e){}
+}
+dhtmlDragAndDropObject.prototype.initFrameRoute=function(win, mode){
+	if (win){
+		window.dhtmlDragAndDrop.preCreateDragCopy({});
+		window.dhtmlDragAndDrop.dragStartNode=win.dhtmlDragAndDrop.dragStartNode;
+		window.dhtmlDragAndDrop.dragStartObject=win.dhtmlDragAndDrop.dragStartObject;
+		window.dhtmlDragAndDrop.dragNode=win.dhtmlDragAndDrop.dragNode;
+		window.dhtmlDragAndDrop.gldragNode=win.dhtmlDragAndDrop.dragNode;
+		window.document.body.onmouseup=window.dhtmlDragAndDrop.stopDrag;
+		window.waitDrag=0;
+
+		if (((!_isIE)&&(mode))&&((!_isFF)||(_FFrv < 1.8)))
+			window.dhtmlDragAndDrop.calculateFramePosition();
+	}
+	try{
+	if ((parent.dhtmlDragAndDrop)&&(parent != window)&&(parent != win))
+		parent.dhtmlDragAndDrop.initFrameRoute(window);
+	}catch(e){}
+
+	for (var i = 0; i < window.frames.length; i++){
+		try{
+		if ((window.frames[i] != win)&&(window.frames[i].dhtmlDragAndDrop))
+			window.frames[i].dhtmlDragAndDrop.initFrameRoute(window, ((!win||mode) ? 1 : 0));
+		} catch(e){}
+	}
+}
+
+var _isFF = false;
+var _isIE = false;
+var _isOpera = false;
+var _isKHTML = false;
+var _isMacOS = false;
+var _isChrome = false;
+
+if (navigator.userAgent.indexOf('Macintosh') != -1)
+	_isMacOS=true;
+
+
+if (navigator.userAgent.toLowerCase().indexOf('chrome')>-1)
+	_isChrome=true;
+
+if ((navigator.userAgent.indexOf('Safari') != -1)||(navigator.userAgent.indexOf('Konqueror') != -1)){
+	var _KHTMLrv = parseFloat(navigator.userAgent.substr(navigator.userAgent.indexOf('Safari')+7, 5));
+
+	if (_KHTMLrv > 525){ //mimic FF behavior for Safari 3.1+
+		_isFF=true;
+		var _FFrv = 1.9;
+	} else
+		_isKHTML=true;
+} else if (navigator.userAgent.indexOf('Opera') != -1){
+	_isOpera=true;
+	_OperaRv=parseFloat(navigator.userAgent.substr(navigator.userAgent.indexOf('Opera')+6, 3));
+}
+
+
+else if (navigator.appName.indexOf("Microsoft") != -1){
+	_isIE=true;
+	if (navigator.appVersion.indexOf("MSIE 8.0")!= -1 && document.compatMode != "BackCompat") _isIE=8;
+} else {
+	_isFF=true;
+	var _FFrv = parseFloat(navigator.userAgent.split("rv:")[1])
+}
+
+
+//multibrowser Xpath processor
+dtmlXMLLoaderObject.prototype.doXPath=function(xpathExp, docObj, namespace, result_type){
+	if (_isKHTML || (!_isIE && !window.XPathResult))
+		return this.doXPathOpera(xpathExp, docObj);
+
+	if (_isIE){ //IE
+		if (!docObj)
+			if (!this.xmlDoc.nodeName)
+				docObj=this.xmlDoc.responseXML
+			else
+				docObj=this.xmlDoc;
+
+		if (!docObj)
+			dhtmlxError.throwError("LoadXML", "Incorrect XML", [
+				(docObj||this.xmlDoc),
+				this.mainObject
+			]);
+
+		if (namespace != null)
+			docObj.setProperty("SelectionNamespaces", "xmlns:xsl='"+namespace+"'"); //
+
+		if (result_type == 'single'){
+			return docObj.selectSingleNode(xpathExp);
+		}
+		else {
+			return docObj.selectNodes(xpathExp)||new Array(0);
+		}
+	} else { //Mozilla
+		var nodeObj = docObj;
+
+		if (!docObj){
+			if (!this.xmlDoc.nodeName){
+				docObj=this.xmlDoc.responseXML
+			}
+			else {
+				docObj=this.xmlDoc;
+			}
+		}
+
+		if (!docObj)
+			dhtmlxError.throwError("LoadXML", "Incorrect XML", [
+				(docObj||this.xmlDoc),
+				this.mainObject
+			]);
+
+		if (docObj.nodeName.indexOf("document") != -1){
+			nodeObj=docObj;
+		}
+		else {
+			nodeObj=docObj;
+			docObj=docObj.ownerDocument;
+		}
+		var retType = XPathResult.ANY_TYPE;
+
+		if (result_type == 'single')
+			retType=XPathResult.FIRST_ORDERED_NODE_TYPE
+		var rowsCol = new Array();
+		var col = docObj.evaluate(xpathExp, nodeObj, function(pref){
+			return namespace
+		}, retType, null);
+
+		if (retType == XPathResult.FIRST_ORDERED_NODE_TYPE){
+			return col.singleNodeValue;
+		}
+		var thisColMemb = col.iterateNext();
+
+		while (thisColMemb){
+			rowsCol[rowsCol.length]=thisColMemb;
+			thisColMemb=col.iterateNext();
+		}
+		return rowsCol;
+	}
+}
+
+function _dhtmlxError(type, name, params){
+	if (!this.catches)
+		this.catches=new Array();
+
+	return this;
+}
+
+_dhtmlxError.prototype.catchError=function(type, func_name){
+	this.catches[type]=func_name;
+}
+_dhtmlxError.prototype.throwError=function(type, name, params){
+	if (this.catches[type])
+		return this.catches[type](type, name, params);
+
+	if (this.catches["ALL"])
+		return this.catches["ALL"](type, name, params);
+
+	alert("Error type: "+arguments[0]+"\nDescription: "+arguments[1]);
+	return null;
+}
+
+window.dhtmlxError=new _dhtmlxError();
+
+
+//opera fake, while 9.0 not released
+//multibrowser Xpath processor
+dtmlXMLLoaderObject.prototype.doXPathOpera=function(xpathExp, docObj){
+	//this is fake for Opera
+	var z = xpathExp.replace(/[\/]+/gi, "/").split('/');
+	var obj = null;
+	var i = 1;
+
+	if (!z.length)
+		return [];
+
+	if (z[0] == ".")
+		obj=[docObj]; else if (z[0] == ""){
+		obj=(this.xmlDoc.responseXML||this.xmlDoc).getElementsByTagName(z[i].replace(/\[[^\]]*\]/g, ""));
+		i++;
+	} else
+		return [];
+
+	for (i; i < z.length; i++)obj=this._getAllNamedChilds(obj, z[i]);
+
+	if (z[i-1].indexOf("[") != -1)
+		obj=this._filterXPath(obj, z[i-1]);
+	return obj;
+}
+
+dtmlXMLLoaderObject.prototype._filterXPath=function(a, b){
+	var c = new Array();
+	var b = b.replace(/[^\[]*\[\@/g, "").replace(/[\[\]\@]*/g, "");
+
+	for (var i = 0; i < a.length; i++)
+		if (a[i].getAttribute(b))
+			c[c.length]=a[i];
+
+	return c;
+}
+dtmlXMLLoaderObject.prototype._getAllNamedChilds=function(a, b){
+	var c = new Array();
+
+	if (_isKHTML)
+		b=b.toUpperCase();
+
+	for (var i = 0; i < a.length; i++)for (var j = 0; j < a[i].childNodes.length; j++){
+		if (_isKHTML){
+			if (a[i].childNodes[j].tagName&&a[i].childNodes[j].tagName.toUpperCase() == b)
+				c[c.length]=a[i].childNodes[j];
+		}
+
+		else if (a[i].childNodes[j].tagName == b)
+			c[c.length]=a[i].childNodes[j];
+	}
+
+	return c;
+}
+
+function dhtmlXHeir(a, b){
+	for (var c in b)
+		if (typeof (b[c]) == "function")
+			a[c]=b[c];
+	return a;
+}
+
+function dhtmlxEvent(el, event, handler){
+	if (el.addEventListener)
+		el.addEventListener(event, handler, false);
+
+	else if (el.attachEvent)
+		el.attachEvent("on"+event, handler);
+}
+
+//============= XSL Extension ===================================
+
+dtmlXMLLoaderObject.prototype.xslDoc=null;
+dtmlXMLLoaderObject.prototype.setXSLParamValue=function(paramName, paramValue, xslDoc){
+	if (!xslDoc)
+		xslDoc=this.xslDoc
+
+	if (xslDoc.responseXML)
+		xslDoc=xslDoc.responseXML;
+	var item =
+		this.doXPath("/xsl:stylesheet/xsl:variable[@name='"+paramName+"']", xslDoc,
+			"http:/\/www.w3.org/1999/XSL/Transform", "single");
+
+	if (item != null)
+		item.firstChild.nodeValue=paramValue
+}
+dtmlXMLLoaderObject.prototype.doXSLTransToObject=function(xslDoc, xmlDoc){
+	if (!xslDoc)
+		xslDoc=this.xslDoc;
+
+	if (xslDoc.responseXML)
+		xslDoc=xslDoc.responseXML
+
+	if (!xmlDoc)
+		xmlDoc=this.xmlDoc;
+
+	if (xmlDoc.responseXML)
+		xmlDoc=xmlDoc.responseXML
+
+	//MOzilla
+	if (!_isIE){
+		if (!this.XSLProcessor){
+			this.XSLProcessor=new XSLTProcessor();
+			this.XSLProcessor.importStylesheet(xslDoc);
+		}
+		var result = this.XSLProcessor.transformToDocument(xmlDoc);
+	} else {
+		var result = new ActiveXObject("Msxml2.DOMDocument.3.0");
+		try{
+			xmlDoc.transformNodeToObject(xslDoc, result);
+		}catch(e){
+			result = xmlDoc.transformNode(xslDoc);
+		}
+	}
+	return result;
+}
+
+dtmlXMLLoaderObject.prototype.doXSLTransToString=function(xslDoc, xmlDoc){
+	var res = this.doXSLTransToObject(xslDoc, xmlDoc);
+	if(typeof(res)=="string")
+		return res;
+	return this.doSerialization(res);
+}
+
+dtmlXMLLoaderObject.prototype.doSerialization=function(xmlDoc){
+	if (!xmlDoc)
+			xmlDoc=this.xmlDoc;
+	if (xmlDoc.responseXML)
+			xmlDoc=xmlDoc.responseXML
+	if (!_isIE){
+		var xmlSerializer = new XMLSerializer();
+		return xmlSerializer.serializeToString(xmlDoc);
+	} else
+		return xmlDoc.xml;
+}
+
+/**
+*   @desc: 
+*   @type: private
+*/
+dhtmlxEventable=function(obj){
+		obj.dhx_SeverCatcherPath="";
+		obj.attachEvent=function(name, catcher, callObj){
+			name='ev_'+name.toLowerCase();
+			if (!this[name])
+				this[name]=new this.eventCatcher(callObj||this);
+				
+			return(name+':'+this[name].addEvent(catcher)); //return ID (event name & event ID)
+		}
+		obj.callEvent=function(name, arg0){ 
+			name='ev_'+name.toLowerCase();
+			if (this[name])
+				return this[name].apply(this, arg0);
+			return true;
+		}
+		obj.checkEvent=function(name){
+			return (!!this['ev_'+name.toLowerCase()])
+		}
+		obj.eventCatcher=function(obj){
+			var dhx_catch = [];
+			var z = function(){
+				var res = true;
+				for (var i = 0; i < dhx_catch.length; i++){
+					if (dhx_catch[i] != null){
+						var zr = dhx_catch[i].apply(obj, arguments);
+						res=res&&zr;
+					}
+				}
+				return res;
+			}
+			z.addEvent=function(ev){
+				if (typeof (ev) != "function")
+					ev=eval(ev);
+				if (ev)
+					return dhx_catch.push(ev)-1;
+				return false;
+			}
+			z.removeEvent=function(id){
+				dhx_catch[id]=null;
+			}
+			return z;
+		}
+		obj.detachEvent=function(id){
+			if (id != false){
+				var list = id.split(':');           //get EventName and ID
+				this[list[0]].removeEvent(list[1]); //remove event
+			}
+		}
+}
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/sources/dhtmlxdataprocessor.js b/addons/base_calendar/static/lib/dhtmlxScheduler/sources/dhtmlxdataprocessor.js
new file mode 100644
index 00000000000..8dfc1cb0dd1
--- /dev/null
+++ b/addons/base_calendar/static/lib/dhtmlxScheduler/sources/dhtmlxdataprocessor.js
@@ -0,0 +1,581 @@
+/**
+	* 	@desc: constructor, data processor object 
+	*	@param: serverProcessorURL - url used for update
+	*	@type: public
+	*/
+function dataProcessor(serverProcessorURL){
+    this.serverProcessor = serverProcessorURL;
+    this.action_param="!nativeeditor_status";
+    
+	this.object = null;
+	this.updatedRows = []; //ids of updated rows
+	
+	this.autoUpdate = true;
+	this.updateMode = "cell";
+	this._tMode="GET"; 
+	this.post_delim = "_";
+	
+    this._waitMode=0;
+    this._in_progress={};//?
+    this._invalid={};
+    this.mandatoryFields=[];
+    this.messages=[];
+    
+    this.styles={
+    	updated:"font-weight:bold;",
+    	inserted:"font-weight:bold;",
+    	deleted:"text-decoration : line-through;",
+    	invalid:"background-color:FFE0E0;",
+    	invalid_cell:"border-bottom:2px solid red;",
+    	error:"color:red;",
+    	clear:"font-weight:normal;text-decoration:none;"
+    };
+    
+    this.enableUTFencoding(true);
+    dhtmlxEventable(this);
+
+    return this;
+    }
+
+dataProcessor.prototype={
+	/**
+	* 	@desc: select GET or POST transaction model
+	*	@param: mode - GET/POST
+	*	@param: total - true/false - send records row by row or all at once (for grid only)
+	*	@type: public
+	*/
+	setTransactionMode:function(mode,total){
+        this._tMode=mode;
+		this._tSend=total;
+    },
+    escape:function(data){
+    	if (this._utf)
+    		return encodeURIComponent(data);
+    	else
+        	return escape(data);
+	},
+    /**
+	* 	@desc: allows to set escaping mode
+	*	@param: true - utf based escaping, simple - use current page encoding
+	*	@type: public
+	*/	
+	enableUTFencoding:function(mode){
+        this._utf=convertStringToBoolean(mode);
+    },
+    /**
+	* 	@desc: allows to define, which column may trigger update
+	*	@param: val - array or list of true/false values
+	*	@type: public
+	*/
+	setDataColumns:function(val){
+		this._columns=(typeof val == "string")?val.split(","):val;
+    },
+    /**
+	* 	@desc: get state of updating
+	*	@returns:   true - all in sync with server, false - some items not updated yet.
+	*	@type: public
+	*/
+	getSyncState:function(){
+		return !this.updatedRows.length;
+	},
+	/**
+	* 	@desc: enable/disable named field for data syncing, will use column ids for grid
+	*	@param:   mode - true/false
+	*	@type: public
+	*/
+	enableDataNames:function(mode){
+		this._endnm=convertStringToBoolean(mode);
+	},
+	/**
+	* 	@desc: enable/disable mode , when only changed fields and row id send to the server side, instead of all fields in default mode
+	*	@param:   mode - true/false
+	*	@type: public
+	*/
+	enablePartialDataSend:function(mode){
+		this._changed=convertStringToBoolean(mode);
+	},
+	/**
+	* 	@desc: set if rows should be send to server automaticaly
+	*	@param: mode - "row" - based on row selection changed, "cell" - based on cell editing finished, "off" - manual data sending
+	*	@type: public
+	*/
+	setUpdateMode:function(mode,dnd){
+		this.autoUpdate = (mode=="cell");
+		this.updateMode = mode;
+		this.dnd=dnd;
+	},
+	ignore:function(code,master){
+		this._silent_mode=true;
+		code.call(master||window);
+		this._silent_mode=false;
+	},
+	/**
+	* 	@desc: mark row as updated/normal. check mandatory fields,initiate autoupdate (if turned on)
+	*	@param: rowId - id of row to set update-status for
+	*	@param: state - true for "updated", false for "not updated"
+	*	@param: mode - update mode name
+	*	@type: public
+	*/
+	setUpdated:function(rowId,state,mode){
+		if (this._silent_mode) return;
+		var ind=this.findRow(rowId);
+		
+		mode=mode||"updated";
+		var existing = this.obj.getUserData(rowId,this.action_param);
+		if (existing && mode == "updated") mode=existing;
+		if (state){
+			this.set_invalid(rowId,false); //clear previous error flag
+			this.updatedRows[ind]=rowId;
+			this.obj.setUserData(rowId,this.action_param,mode);
+			if (this._in_progress[rowId]) 
+				this._in_progress[rowId]="wait";
+		} else{
+			if (!this.is_invalid(rowId)){
+				this.updatedRows.splice(ind,1);
+				this.obj.setUserData(rowId,this.action_param,"");
+			}
+		}
+
+		//clear changed flag
+		if (!state)
+			this._clearUpdateFlag(rowId);
+     			
+		this.markRow(rowId,state,mode);
+		if (state && this.autoUpdate) this.sendData(rowId);
+	},
+	_clearUpdateFlag:function(id){},
+	markRow:function(id,state,mode){ 
+		var str="";
+		var invalid=this.is_invalid(id);
+		if (invalid){
+        	str=this.styles[invalid];
+        	state=true;
+    	}
+		if (this.callEvent("onRowMark",[id,state,mode,invalid])){
+			//default logic
+			str=this.styles[state?mode:"clear"]+str;
+			
+        	this.obj[this._methods[0]](id,str);
+
+			if (invalid && invalid.details){
+				str+=this.styles[invalid+"_cell"];
+				for (var i=0; i < invalid.details.length; i++)
+					if (invalid.details[i])
+        				this.obj[this._methods[1]](id,i,str);
+			}
+		}
+	},
+	getState:function(id){
+		return this.obj.getUserData(id,this.action_param);
+	},
+	is_invalid:function(id){
+		return this._invalid[id];
+	},
+	set_invalid:function(id,mode,details){ 
+		if (details) mode={value:mode, details:details, toString:function(){ return this.value.toString(); }};
+		this._invalid[id]=mode;
+	},
+	/**
+	* 	@desc: check mandatory fields and varify values of cells, initiate update (if specified)
+	*	@param: rowId - id of row to set update-status for
+	*	@type: public
+	*/
+	checkBeforeUpdate:function(rowId){ 
+		return true;
+	},
+	/**
+	* 	@desc: send row(s) values to server
+	*	@param: rowId - id of row which data to send. If not specified, then all "updated" rows will be send
+	*	@type: public
+	*/
+	sendData:function(rowId){
+		if (this._waitMode && (this.obj.mytype=="tree" || this.obj._h2)) return;
+		if (this.obj.editStop) this.obj.editStop();
+	
+		
+		if(typeof rowId == "undefined" || this._tSend) return this.sendAllData();
+		if (this._in_progress[rowId]) return false;
+		
+		this.messages=[];
+		if (!this.checkBeforeUpdate(rowId) && this.callEvent("onValidatationError",[rowId,this.messages])) return false;
+		this._beforeSendData(this._getRowData(rowId),rowId);
+    },
+    _beforeSendData:function(data,rowId){
+    	if (!this.callEvent("onBeforeUpdate",[rowId,this.getState(rowId),data])) return false;	
+		this._sendData(data,rowId);
+    },
+    serialize:function(data, id){
+    	if (typeof data == "string")
+    		return data;
+    	if (typeof id != "undefined")
+    		return this.serialize_one(data,"");
+    	else{
+    		var stack = [];
+    		var keys = [];
+    		for (var key in data)
+    			if (data.hasOwnProperty(key)){
+    				stack.push(this.serialize_one(data[key],key+this.post_delim));
+    				keys.push(key);
+				}
+    		stack.push("ids="+this.escape(keys.join(",")));
+    		return stack.join("&");
+    	}
+    },
+    serialize_one:function(data, pref){
+    	if (typeof data == "string")
+    		return data;
+    	var stack = [];
+    	for (var key in data)
+    		if (data.hasOwnProperty(key))
+    			stack.push(this.escape((pref||"")+key)+"="+this.escape(data[key]));
+		return stack.join("&");
+    },
+    _sendData:function(a1,rowId){
+    	if (!a1) return; //nothing to send
+		if (!this.callEvent("onBeforeDataSending",rowId?[rowId,this.getState(rowId),a1]:[null, null, a1])) return false;				
+		
+    	if (rowId)
+			this._in_progress[rowId]=(new Date()).valueOf();
+		var a2=new dtmlXMLLoaderObject(this.afterUpdate,this,true);
+		
+		var a3 = this.serverProcessor+(this._user?(getUrlSymbol(this.serverProcessor)+["dhx_user="+this._user,"dhx_version="+this.obj.getUserData(0,"version")].join("&")):"");
+
+		if (this._tMode!="POST")
+        	a2.loadXML(a3+((a3.indexOf("?")!=-1)?"&":"?")+this.serialize(a1,rowId));
+		else
+        	a2.loadXML(a3,true,this.serialize(a1,rowId));
+
+		this._waitMode++;
+    },
+	sendAllData:function(){
+		if (!this.updatedRows.length) return;			
+
+		this.messages=[]; var valid=true;
+		for (var i=0; i<this.updatedRows.length; i++)
+			valid&=this.checkBeforeUpdate(this.updatedRows[i]);
+		if (!valid && !this.callEvent("onValidatationError",["",this.messages])) return false;
+	
+		if (this._tSend) 
+			this._sendData(this._getAllData());
+		else
+			for (var i=0; i<this.updatedRows.length; i++)
+				if (!this._in_progress[this.updatedRows[i]]){
+					if (this.is_invalid(this.updatedRows[i])) continue;
+					this._beforeSendData(this._getRowData(this.updatedRows[i]),this.updatedRows[i]);
+					if (this._waitMode && (this.obj.mytype=="tree" || this.obj._h2)) return; //block send all for tree
+				}
+	},
+    
+	
+	
+	
+	
+	
+	
+	
+	_getAllData:function(rowId){
+		var out={};
+		var has_one = false;
+		for(var i=0;i<this.updatedRows.length;i++){
+			var id=this.updatedRows[i];
+			if (this._in_progress[id] || this.is_invalid(id)) continue;
+			if (!this.callEvent("onBeforeUpdate",[id,this.getState(id)])) continue;	
+			out[id]=this._getRowData(id,id+this.post_delim);
+			has_one = true;
+			this._in_progress[id]=(new Date()).valueOf();
+		}
+		return has_one?out:null;
+	},
+	
+	
+	/**
+	* 	@desc: specify column which value should be varified before sending to server
+	*	@param: ind - column index (0 based)
+	*	@param: verifFunction - function (object) which should verify cell value (if not specified, then value will be compared to empty string). Two arguments will be passed into it: value and column name
+	*	@type: public
+	*/
+	setVerificator:function(ind,verifFunction){
+		this.mandatoryFields[ind] = verifFunction||(function(value){return (value!="");});
+	},
+	/**
+	* 	@desc: remove column from list of those which should be verified
+	*	@param: ind - column Index (0 based)
+	*	@type: public
+	*/
+	clearVerificator:function(ind){
+		this.mandatoryFields[ind] = false;
+	},
+	
+	
+	
+	
+	
+	findRow:function(pattern){
+		var i=0;
+    	for(i=0;i<this.updatedRows.length;i++)
+		    if(pattern==this.updatedRows[i]) break;
+	    return i;
+    },
+
+   
+	
+
+
+    
+
+
+
+
+
+	/**
+	* 	@desc: define custom actions
+	*	@param: name - name of action, same as value of action attribute
+	*	@param: handler - custom function, which receives a XMl response content for action
+	*	@type: private
+	*/
+	defineAction:function(name,handler){
+        if (!this._uActions) this._uActions=[];
+            this._uActions[name]=handler;
+	},
+
+
+
+
+	/**
+*     @desc: used in combination with setOnBeforeUpdateHandler to create custom client-server transport system
+*     @param: sid - id of item before update
+*     @param: tid - id of item after up0ate
+*     @param: action - action name
+*     @type: public
+*     @topic: 0
+*/
+	afterUpdateCallback:function(sid, tid, action, btag) {
+		var marker = sid;
+		var correct=(action!="error" && action!="invalid");
+		if (!correct) this.set_invalid(sid,action);
+		if ((this._uActions)&&(this._uActions[action])&&(!this._uActions[action](btag))) 
+			return (delete this._in_progress[marker]);
+			
+		if (this._in_progress[marker]!="wait")
+	    	this.setUpdated(sid, false);
+	    	
+	    var soid = sid;
+	
+	    switch (action) {
+	    case "inserted":
+	    case "insert":
+	        if (tid != sid) {
+	            this.obj[this._methods[2]](sid, tid);
+	            sid = tid;
+	        }
+	        break;
+	    case "delete":
+	    case "deleted":
+	    	this.obj.setUserData(sid, this.action_param, "true_deleted");
+	        this.obj[this._methods[3]](sid);
+	        delete this._in_progress[marker];
+	        return this.callEvent("onAfterUpdate", [sid, action, tid, btag]);
+	        break;
+	    }
+	    
+	    if (this._in_progress[marker]!="wait"){
+	    	if (correct) this.obj.setUserData(sid, this.action_param,'');
+	    	delete this._in_progress[marker];
+    	} else {
+    		delete this._in_progress[marker];
+    		this.setUpdated(tid,true,this.obj.getUserData(sid,this.action_param));
+		}
+	    
+	    this.callEvent("onAfterUpdate", [sid, action, tid, btag]);
+	},
+
+	/**
+	* 	@desc: response from server
+	*	@param: xml - XMLLoader object with response XML
+	*	@type: private
+	*/
+	afterUpdate:function(that,b,c,d,xml){
+		xml.getXMLTopNode("data"); //fix incorrect content type in IE
+		if (!xml.xmlDoc.responseXML) return;
+		var atag=xml.doXPath("//data/action");
+		for (var i=0; i<atag.length; i++){
+        	var btag=atag[i];
+			var action = btag.getAttribute("type");
+			var sid = btag.getAttribute("sid");
+			var tid = btag.getAttribute("tid");
+			
+			that.afterUpdateCallback(sid,tid,action,btag);
+		}
+		that.finalizeUpdate();
+	},
+	finalizeUpdate:function(){
+		if (this._waitMode) this._waitMode--;
+		
+		if ((this.obj.mytype=="tree" || this.obj._h2) && this.updatedRows.length) 
+			this.sendData();
+		this.callEvent("onAfterUpdateFinish",[]);
+		if (!this.updatedRows.length)
+			this.callEvent("onFullSync",[]);
+	},
+
+
+
+
+	
+	/**
+	* 	@desc: initializes data-processor
+	*	@param: anObj - dhtmlxGrid object to attach this data-processor to
+	*	@type: public
+	*/
+	init:function(anObj){
+		this.obj = anObj;
+		if (this.obj._dp_init) 
+			this.obj._dp_init(this);
+	},
+	
+	
+	setOnAfterUpdate:function(ev){
+		this.attachEvent("onAfterUpdate",ev);
+	},
+	enableDebug:function(mode){
+	},
+	setOnBeforeUpdateHandler:function(func){  
+		this.attachEvent("onBeforeDataSending",func);
+	},
+
+
+
+	/*! starts autoupdate mode
+		@param interval
+			time interval for sending update requests
+	*/
+	setAutoUpdate: function(interval, user) {
+		interval = interval || 2000;
+		
+		this._user = user || (new Date()).valueOf();
+		this._need_update = false;
+		this._loader = null;
+		this._update_busy = false;
+		
+		this.attachEvent("onAfterUpdate",function(sid,action,tid,xml_node){
+			this.afterAutoUpdate(sid, action, tid, xml_node);
+		});
+		this.attachEvent("onFullSync",function(){
+			this.fullSync();
+		});
+		
+		var self = this;
+		window.setInterval(function(){
+			self.loadUpdate();
+		}, interval);
+	},
+
+
+	/*! process updating request answer
+		if status == collision version is depricated
+		set flag for autoupdating immidiatly
+	*/
+	afterAutoUpdate: function(sid, action, tid, xml_node) {
+		if (action == 'collision') {
+			this._need_update = true;
+			return false;
+		} else {
+			return true;
+		}
+	},
+
+
+	/*! callback function for onFillSync event
+		call update function if it's need
+	*/
+	fullSync: function() {
+		if (this._need_update == true) {
+			this._need_update = false;
+			this.loadUpdate();
+		}
+		return true;
+	},
+
+
+	/*! sends query to the server and call callback function
+	*/
+	getUpdates: function(url,callback){
+		if (this._update_busy) 
+			return false;
+		else
+			this._update_busy = true;
+		
+		this._loader = this._loader || new dtmlXMLLoaderObject(true);
+		
+		this._loader.async=true;
+		this._loader.waitCall=callback;
+		this._loader.loadXML(url);
+	},
+
+
+	/*! returns xml node value
+		@param node
+			xml node
+	*/
+	_v: function(node) {
+		if (node.firstChild) return node.firstChild.nodeValue;
+		return "";
+	},
+
+
+	/*! returns values array of xml nodes array
+		@param arr
+			array of xml nodes
+	*/
+	_a: function(arr) {
+		var res = [];
+		for (var i=0; i < arr.length; i++) {
+			res[i]=this._v(arr[i]);
+		};
+		return res;
+	},
+
+
+	/*! loads updates and processes them
+	*/
+	loadUpdate: function(){
+		var self = this;
+		var version = this.obj.getUserData(0,"version");
+		var url = this.serverProcessor+getUrlSymbol(this.serverProcessor)+["dhx_user="+this._user,"dhx_version="+version].join("&");
+		url = url.replace("editing=true&","");
+		this.getUpdates(url, function(){
+			var vers = self._loader.doXPath("//userdata");
+			self.obj.setUserData(0,"version",self._v(vers[0]));
+			
+			var upds = self._loader.doXPath("//update");
+			if (upds.length){
+				self._silent_mode = true;
+				
+				for (var i=0; i<upds.length; i++) {
+					var status = upds[i].getAttribute('status');
+					var id = upds[i].getAttribute('id');
+					var parent = upds[i].getAttribute('parent');
+					switch (status) {
+						case 'inserted':
+							self.callEvent("insertCallback",[upds[i], id, parent]);
+							break;
+						case 'updated':
+							self.callEvent("updateCallback",[upds[i], id, parent]);
+							break;
+						case 'deleted':
+							self.callEvent("deleteCallback",[upds[i], id, parent]);
+							break;
+					}
+				}
+				
+				self._silent_mode = false;
+			}
+			
+			self._update_busy = false;
+			self = null;
+		});
+	}
+
+};
+
+//(c)dhtmlx ltd. www.dhtmlx.com
\ No newline at end of file
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/sources/dhtmlxdataprocessor_debug.js b/addons/base_calendar/static/lib/dhtmlxScheduler/sources/dhtmlxdataprocessor_debug.js
new file mode 100644
index 00000000000..2b251515166
--- /dev/null
+++ b/addons/base_calendar/static/lib/dhtmlxScheduler/sources/dhtmlxdataprocessor_debug.js
@@ -0,0 +1,164 @@
+dataProcessor.prototype._o_init = dataProcessor.prototype.init;
+dataProcessor.prototype.init=function(obj){
+    this._console=this._console||this._createConsole();
+    this.attachEvent("onValidatationError",function(rowId){
+    	this._log("Validation error for ID="+(rowId||"[multiple]"));
+    	return true;
+	});
+    return this._o_init(obj);
+}
+
+dataProcessor.prototype._createConsole=function(){
+    var c=document.createElement("DIV");
+    c.style.cssText='width:450px; height:420px; overflow:auto; position:absolute; z-index:99999; background-color:white; top:0px; right:0px; border:1px dashed black; font-family:Tahoma; Font-size:10pt;';
+    c.innerHTML="<div style='width:100%; background-color:gray; font-weight:bold; color:white;'><span style='cursor:pointer;float:right;' onclick='this.parentNode.parentNode.style.display=\"none\"'><sup>[close]&nbsp;</sup></span><span style='cursor:pointer;float:right;' onclick='this.parentNode.parentNode.childNodes[2].innerHTML=\"\"'><sup>[clear]&nbsp;</sup></span>&nbsp;DataProcessor</div><div style='width:100%; height:200px; overflow-Y:scroll;'>&nbsp;Current state</div><div style='width:100%; height:200px; overflow-Y:scroll;'>&nbsp;Log:</div>";
+    if (document.body) document.body.insertBefore(c,document.body.firstChild);
+    else dhtmlxEvent(window,"load",function(){
+        document.body.insertBefore(c,document.body.firstChild);
+    })    
+    dhtmlxEvent(window,"dblclick",function(){ 
+        c.style.display='';
+    })    
+    return c;
+}
+
+dataProcessor.prototype._error=function(data){
+	this._log("<span style='color:red'>"+data+"</span>");
+}
+dataProcessor.prototype._log=function(data){
+	var div=document.createElement("DIV");
+	div.innerHTML = data;
+	var parent=this._console.childNodes[2];
+    parent.appendChild(div);
+    parent.scrollTop=parent.scrollHeight;
+    
+    if (window.console && window.console.log)
+    	window.console.log("DataProcessor :: "+data.replace("&nbsp;"," ").replace("<b>","").replace("</b>",""));
+    
+}
+dataProcessor.prototype._updateStat=function(data){
+    var data=["&nbsp;Current state"];
+    for(var i=0;i<this.updatedRows.length;i++)
+	    data.push("&nbsp;ID:"+this.updatedRows[i]+" Status: "+(this.obj.getUserData(this.updatedRows[i],"!nativeeditor_status")||"updated")+", "+(this.is_invalid(this.updatedRows[i])||"valid"))
+	this._console.childNodes[1].innerHTML=data.join("<br/>")+"<hr/>Current mode: "+this.updateMode;
+}
+dataProcessor.prototype.xml_analize=function(xml){
+	if (_isFF){
+		if (!xml.xmlDoc.responseXML)
+			this._error("Not an XML, probably incorrect content type specified ( must be text/xml ), or some text output was started before XML data");
+		else if (xml.xmlDoc.responseXML.firstChild.tagName=="parsererror")
+			this._error(xml.xmlDoc.responseXML.firstChild.textContent);
+		else return true;
+	} else if (_isIE){
+		if (xml.xmlDoc.responseXML.parseError.errorCode)
+			this._error("XML error : "+xml.xmlDoc.responseXML.parseError.reason);
+		else if (!xml.xmlDoc.responseXML.documentElement) 
+			this._error("Not an XML, probably incorrect content type specified ( must be text/xml ), or some text output was started before XML data");
+		else return true;
+	}
+	return false;
+}
+
+dataProcessor.wrap=function(name,before,after){
+	var d=dataProcessor.prototype;
+	if (!d._wrap) d._wrap={};
+	d._wrap[name]=d[name];
+	d[name]=function(){
+		if (before) before.apply(this,arguments);
+		var res=d._wrap[name].apply(this,arguments);
+		if (after) after.apply(this,[arguments,res]);
+		return res;
+	}
+};
+
+dataProcessor.wrap("setUpdated",function(rowId,state,mode){
+	this._log("&nbsp;row <b>"+rowId+"</b> "+(state?"marked":"unmarked")+" ["+(mode||"updated")+","+(this.is_invalid(rowId)||"valid")+"]");
+},function(){
+	this._updateStat();
+});
+
+
+
+dataProcessor.wrap("sendData",function(rowId){
+	if (rowId){
+		this._log("&nbsp;Initiating data sending for <b>"+rowId+"</b>");
+		if (this.obj.mytype=="tree"){
+        	if (!this.obj._idpull[rowId])
+	    		this._log("&nbsp;Error! item with such ID not exists <b>"+rowId+"</b>");
+		} else {
+			if (!this.obj.rowsAr[rowId])
+	        	this._log("&nbsp;Error! row with such ID not exists <b>"+rowId+"</b>");
+        }
+	}
+},function(){
+	
+});
+
+dataProcessor.wrap("sendAllData",function(){
+	this._log("&nbsp;Initiating data sending for <b>all</b> rows ");
+},function(){
+	
+});
+dataProcessor.logSingle=function(data,id){
+	var tdata = {};
+	if (id)
+		tdata[id] = data;
+	else
+		tdata = data;
+		
+	var url = [];
+	for (var key in tdata) {
+		url.push("<fieldset><legend>"+key+"</legend>");
+		var suburl = [];
+		
+		for (var ikey in tdata[key])
+			suburl.push(ikey+" = "+tdata[key][ikey]);
+
+		url.push(suburl.join("<br>"));
+		url.push("</fieldset>");
+	}
+	return url.join("");
+}
+dataProcessor.wrap("_sendData",function(data,rowId){
+	if (rowId)
+		this._log("&nbsp;Sending in one-by-one mode, current ID = "+rowId);
+	else
+		this._log("&nbsp;Sending all data at once");
+	this._log("&nbsp;Server url: "+this.serverProcessor+" <a onclick='this.parentNode.nextSibling.firstChild.style.display=\"block\"' href='#'>parameters</a>");
+	var url = [];
+	this._log("<blockquote style='display:none;'>"+dataProcessor.logSingle(data,rowId)+"<blockquote>");
+},function(){
+	
+});
+
+
+dataProcessor.wrap("afterUpdate",function(that,b,c,d,xml){
+	that._log("&nbsp;Server response received <a onclick='this.nextSibling.style.display=\"block\"' href='#'>details</a><blockquote style='display:none'><code>"+(xml.xmlDoc.responseText||"").replace(/\&/g,"&amp;").replace(/</g,"&lt;").replace(/>/g,"&gt;")+"</code></blockquote>");			
+	if (!that.xml_analize(xml)) return;
+	var atag=xml.doXPath("//data/action");
+	if (!atag){
+		that._log("&nbsp;No actions found");
+		var atag=xml.getXMLTopNode("data");
+		if (!atag) that._log("&nbsp;XML not valid");
+		else that._log("&nbsp;Incorrect content type - need to be text/xml"); 
+	}
+},function(){
+	
+});
+
+dataProcessor.wrap("afterUpdateCallback",function(sid,tid,action){
+	if (this.obj.mytype=="tree"){
+		if (!this.obj._idpull[sid]) this._log("Incorrect SID, item with such ID not exists in grid");
+	} else {
+		if (!this.obj.rowsAr[sid]) this._log("Incorrect SID, row with such ID not exists in grid");
+	}
+	this._log("&nbsp;Action: "+action+" SID:"+sid+" TID:"+tid);
+},function(){
+	
+});
+
+
+
+
+
+
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/sources/event.js b/addons/base_calendar/static/lib/dhtmlxScheduler/sources/event.js
new file mode 100644
index 00000000000..202a6e5fcb9
--- /dev/null
+++ b/addons/base_calendar/static/lib/dhtmlxScheduler/sources/event.js
@@ -0,0 +1,545 @@
+scheduler.uid=function(){
+	if (!this._seed) this._seed=(new Date).valueOf();
+	return this._seed++;
+};
+scheduler._events={};
+scheduler.clearAll=function(){
+	this._events={};
+	this._loaded={};
+	this.clear_view();
+};
+scheduler.addEvent=function(start_date,end_date,text,id,extra_data){
+	var ev=start_date;
+	if (arguments.length!=1){
+		ev=extra_data||{};
+		ev.start_date=start_date;
+		ev.end_date=end_date;
+		ev.text=text;
+		ev.id=id;
+	};
+	ev.id = ev.id||scheduler.uid();
+	ev.text = ev.text||"";
+	
+	if (typeof ev.start_date == "string")  ev.start_date=this.templates.api_date(ev.start_date);
+	if (typeof ev.end_date == "string")  ev.end_date=this.templates.api_date(ev.end_date);
+	ev._timed=this.is_one_day_event(ev);
+
+	var is_new=!this._events[ev.id];
+	this._events[ev.id]=ev;
+	this.event_updated(ev);
+	if (!this._loading)
+		this.callEvent(is_new?"onEventAdded":"onEventChanged",[ev.id,ev]);
+};
+scheduler.deleteEvent=function(id,silent){ 
+	var ev=this._events[id];
+	if (!silent && !this.callEvent("onBeforeEventDelete",[id,ev])) return;
+	
+	if (ev){
+		delete this._events[id];
+		this.unselect(id);
+		this.event_updated(ev);
+	}
+};
+scheduler.getEvent=function(id){
+	return this._events[id];
+};
+scheduler.setEvent=function(id,hash){
+	this._events[id]=hash;
+};
+scheduler.for_rendered=function(id,method){
+	for (var i=this._rendered.length-1; i>=0; i--)
+		if (this._rendered[i].getAttribute("event_id")==id)
+			method(this._rendered[i],i);
+};
+scheduler.changeEventId=function(id,new_id){
+	if (id == new_id) return;
+	var ev=this._events[id];
+	if (ev){
+		ev.id=new_id;
+		this._events[new_id]=ev;
+		delete this._events[id];
+	}
+	this.for_rendered(id,function(r){
+		r.setAttribute("event_id",new_id);
+	});
+	if (this._select_id==id) this._select_id=new_id;
+	if (this._edit_id==id) this._edit_id=new_id;
+	this.callEvent("onEventIdChange",[id,new_id]);
+};
+
+(function(){
+	var attrs=["text","Text","start_date","StartDate","end_date","EndDate"];
+	var create_getter=function(name){
+		return function(id){ return (scheduler.getEvent(id))[name]; };
+	};
+	var create_setter=function(name){
+		return function(id,value){ 
+			var ev=scheduler.getEvent(id); ev[name]=value; 
+			ev._changed=true; 
+			ev._timed=this.is_one_day_event(ev);
+			scheduler.event_updated(ev,true); 
+		};
+	};
+	for (var i=0; i<attrs.length; i+=2){
+		scheduler["getEvent"+attrs[i+1]]=create_getter(attrs[i]);
+		scheduler["setEvent"+attrs[i+1]]=create_setter(attrs[i]);
+	}
+})();
+
+scheduler.event_updated=function(ev,force){
+	if (this.is_visible_events(ev))
+		this.render_view_data();
+	else this.clear_event(ev.id);
+};
+scheduler.is_visible_events=function(ev){
+	if (ev.start_date<this._max_date && this._min_date<ev.end_date) return true;
+	return false;
+};
+scheduler.is_one_day_event=function(ev){
+	var delta = ev.end_date.getDate()-ev.start_date.getDate();
+	
+	if (!delta)
+		return ev.start_date.getMonth()==ev.end_date.getMonth() && ev.start_date.getFullYear()==ev.end_date.getFullYear();
+	else {
+		if (delta < 0)  delta = Math.ceil((ev.end_date.valueOf()-ev.start_date.valueOf())/(24*60*60*1000));
+		return (delta == 1 && !ev.end_date.getHours() && !ev.end_date.getMinutes() && (ev.start_date.getHours() || ev.start_date.getMinutes() ));
+	}
+		
+};
+scheduler.get_visible_events=function(){
+	//not the best strategy for sure
+	var stack=[];
+	var filter = this["filter_"+this._mode];
+	
+	for( var id in this._events)
+		if (this.is_visible_events(this._events[id]))
+			if (this._table_view || this.config.multi_day || this._events[id]._timed)
+				if (!filter || filter(id,this._events[id]))
+					stack.push(this._events[id]);
+				
+	return stack;
+};
+scheduler.render_view_data=function(){
+	if (this._not_render) {
+		this._render_wait=true;
+		return;
+	}
+	this._render_wait=false;
+	
+	this.clear_view();
+	var evs=this.get_visible_events();
+	
+	if (this.config.multi_day && !this._table_view){
+		var tvs = [];
+		var tvd = [];
+		for (var i=0; i < evs.length; i++){
+			if (evs[i]._timed)
+				tvs.push(evs[i]);
+			else
+				tvd.push(evs[i]);
+		};
+		this._table_view=true;
+		this.render_data(tvd);
+		this._table_view=false;		
+		this.render_data(tvs);
+	} else 
+		this.render_data(evs);	
+};
+scheduler.render_data=function(evs,hold){
+	evs=this._pre_render_events(evs,hold);
+	for (var i=0; i<evs.length; i++)
+		if (this._table_view)
+			this.render_event_bar(evs[i]);
+		else
+			this.render_event(evs[i]);
+};
+scheduler._pre_render_events=function(evs,hold){
+	var hb = this.xy.bar_height;
+	var h_old = this._colsS.heights;	
+	var h=this._colsS.heights=[0,0,0,0,0,0,0];
+	
+	if (!this._table_view) evs=this._pre_render_events_line(evs,hold); //ignore long events for now
+	else evs=this._pre_render_events_table(evs,hold);
+	
+	if (this._table_view){
+		if (hold)
+			this._colsS.heights = h_old;
+		else {
+			var evl = this._els["dhx_cal_data"][0].firstChild;
+			if (evl.rows){
+				for (var i=0; i<evl.rows.length; i++){
+					h[i]++;
+					if ((h[i])*hb > this._colsS.height-22){ // 22 - height of cell's header
+						//we have overflow, update heights
+						var cells = evl.rows[i].cells;
+						for (var j=0; j < cells.length; j++) {
+							cells[j].childNodes[1].style.height = h[i]*hb+"px";
+						}
+						h[i]=(h[i-1]||0)+cells[0].offsetHeight;
+					}
+					h[i]=(h[i-1]||0)+evl.rows[i].cells[0].offsetHeight;
+				}	
+				h.unshift(0);
+				if (evl.parentNode.offsetHeight<evl.parentNode.scrollHeight && !evl._h_fix){
+					//we have v-scroll, decrease last day cell
+					for (var i=0; i<evl.rows.length; i++){
+						var cell = evl.rows[i].cells[6].childNodes[0];
+						var w = cell.offsetWidth-scheduler.xy.scroll_width+"px";
+						cell.style.width = w;
+						cell.nextSibling.style.width = w;
+					}		
+					evl._h_fix=true;
+				}
+			} else{
+				
+				if (!evs.length && this._els["dhx_multi_day"][0].style.visibility == "visible")
+					h[0]=-1;
+				if (evs.length || h[0]==-1){
+					//shift days to have space for multiday events
+					var childs = evl.parentNode.childNodes;
+					var dh = (h[0]+1)*hb+"px";
+					for (var i=0; i<childs.length; i++)
+						if (this._colsS[i])
+							childs[i].style.top=dh;
+					var last = this._els["dhx_multi_day"][0];
+					last.style.top = "0px";
+					last.style.height=dh;
+					last.style.visibility=(h[0]==-1?"hidden":"visible");
+					last=this._els["dhx_multi_day"][1];
+					last.style.height=dh;
+					last.style.visibility=(h[0]==-1?"hidden":"visible");
+					last.className=h[0]?"dhx_multi_day_icon":"dhx_multi_day_icon_small";
+					
+					this._dy_shift=(h[0]+1)*hb;
+					h[0] = 0;
+				}				
+				
+			}
+		}
+	}
+	
+	return evs;
+};
+scheduler._get_event_sday=function(ev){
+	return Math.floor((ev.start_date.valueOf()-this._min_date.valueOf())/(24*60*60*1000));
+};
+scheduler._pre_render_events_line=function(evs,hold){
+	evs.sort(function(a,b){ return a.start_date>b.start_date?1:-1; });
+	var days=[]; //events by weeks
+	var evs_originals = [];
+	for (var i=0; i < evs.length; i++) {
+		var ev=evs[i];
+
+		//check scale overflow
+		var sh = ev.start_date.getHours();
+		var eh = ev.end_date.getHours();
+		
+		ev._sday=this._get_event_sday(ev);
+		if (!days[ev._sday]) days[ev._sday]=[];
+		
+		if (!hold){
+			ev._inner=false;
+			var stack=days[ev._sday];
+			while (stack.length && stack[stack.length-1].end_date<=ev.start_date)
+				stack.splice(stack.length-1,1);
+			if (stack.length) stack[stack.length-1]._inner=true;
+			ev._sorder=stack.length; stack.push(ev);
+			if (stack.length>(stack.max_count||0)) stack.max_count=stack.length;
+		}
+		
+		if (sh < this.config.first_hour || eh >= this.config.last_hour){
+			evs_originals.push(ev);
+			evs[i]=ev=this._copy_event(ev);
+			if (sh < this.config.first_hour){
+				ev.start_date.setHours(this.config.first_hour);
+				ev.start_date.setMinutes(0);
+			}
+			if (eh >= this.config.last_hour){
+				ev.end_date.setMinutes(0);
+				ev.end_date.setHours(this.config.last_hour);
+			}
+			if (ev.start_date>ev.end_date || sh==this.config.last_hour) {
+				evs.splice(i,1); i--; continue;
+			}
+		}
+				
+	}
+	if (!hold){
+		for (var i=0; i < evs.length; i++) 
+			evs[i]._count=days[evs[i]._sday].max_count;
+		for (var i=0; i < evs_originals.length; i++) 
+			evs_originals[i]._count=days[evs_originals[i]._sday].max_count;
+	}
+	
+	return evs;
+};
+scheduler._time_order=function(evs){
+	evs.sort(function(a,b){ 
+		if (a.start_date.valueOf()==b.start_date.valueOf()){
+			if (a._timed && !b._timed) return 1;
+			if (!a._timed && b._timed) return -1;
+			return 0;
+		}
+		return a.start_date>b.start_date?1:-1;
+	});
+};
+scheduler._pre_render_events_table=function(evs,hold){ // max - max height of week slot
+	this._time_order(evs);
+	
+	var out=[];
+	var weeks=[[],[],[],[],[],[],[]]; //events by weeks
+	var max = this._colsS.heights;
+	var start_date;
+	var cols = this._cols.length;
+	
+	for (var i=0; i < evs.length; i++) {
+		var ev=evs[i];
+		var sd = (start_date||ev.start_date);
+		var ed = ev.end_date;
+		//trim events which are crossing through current view
+		if (sd<this._min_date) sd=this._min_date;
+		if (ed>this._max_date) ed=this._max_date;
+		
+		var locate_s = this.locate_holder_day(sd,false,ev);
+		ev._sday=locate_s%cols;
+		var locate_e = this.locate_holder_day(ed,true,ev)||cols;
+		ev._eday=(locate_e%cols)||cols; //cols used to fill full week, when event end on monday
+		ev._length=locate_e-locate_s;
+		
+		//3600000 - compensate 1 hour during winter|summer time shift
+		ev._sweek=Math.floor((this._correct_shift(sd.valueOf(),1)-this._min_date.valueOf())/(60*60*1000*24*cols)); 	
+		
+		//current slot
+		var stack=weeks[ev._sweek];
+		//check order position
+		var stack_line;
+		
+		for (stack_line=0; stack_line<stack.length; stack_line++)
+			if (stack[stack_line]._eday<=ev._sday)
+				break;
+		ev._sorder=stack_line; 
+		
+		
+		if (ev._sday+ev._length<=cols){
+			start_date=null;
+			out.push(ev);
+			stack[stack_line]=ev;
+			//get max height of slot
+			max[ev._sweek]=stack.length-1;
+		} else{ // split long event in chunks
+			var copy=this._copy_event(ev);
+			copy._length=cols-ev._sday;
+			copy._eday=cols; copy._sday=ev._sday;
+			copy._sweek=ev._sweek; copy._sorder=ev._sorder;
+			copy.end_date=this.date.add(sd,copy._length,"day");
+			
+			out.push(copy);
+			stack[stack_line]=copy;
+			start_date=copy.end_date;
+			//get max height of slot
+			max[ev._sweek]=stack.length-1;
+			i--; continue;  //repeat same step
+		}
+	};
+	
+	return out;
+};
+scheduler._copy_dummy=function(){ 
+	this.start_date=new Date(this.start_date);
+	this.end_date=new Date(this.end_date);
+};
+scheduler._copy_event=function(ev){
+	this._copy_dummy.prototype = ev;
+	return new this._copy_dummy();
+	//return {start_date:ev.start_date, end_date:ev.end_date, text:ev.text, id:ev.id}
+};
+scheduler._rendered=[];
+scheduler.clear_view=function(){
+	for (var i=0; i<this._rendered.length; i++){
+		var obj=this._rendered[i];
+		if (obj.parentNode) obj.parentNode.removeChild(obj);		
+	}
+	this._rendered=[];
+};
+scheduler.updateEvent=function(id){
+	var ev=this.getEvent(id);
+	this.clear_event(id);
+	if (ev && this.is_visible_events(ev)) 
+		this.render_data([ev],true);
+};
+scheduler.clear_event=function(id){
+	this.for_rendered(id,function(node,i){
+		if (node.parentNode)
+			node.parentNode.removeChild(node);
+		scheduler._rendered.splice(i,1);
+	});
+};
+scheduler.render_event=function(ev){
+	var menu = scheduler.xy.menu_width;
+	if (ev._sday<0) return; //can occur in case of recurring event during time shift
+	var parent=scheduler.locate_holder(ev._sday);	
+	if (!parent) return; //attempt to render non-visible event
+	var sm = ev.start_date.getHours()*60+ev.start_date.getMinutes();
+	var em = (ev.end_date.getHours()*60+ev.end_date.getMinutes())||(scheduler.config.last_hour*60);
+	
+	var top = (Math.round((sm*60*1000-this.config.first_hour*60*60*1000)*this.config.hour_size_px/(60*60*1000)))%(this.config.hour_size_px*24)+1; //42px/hour
+	var height = Math.max(scheduler.xy.min_event_height,(em-sm)*this.config.hour_size_px/60)+1; //42px/hour
+	//var height = Math.max(25,Math.round((ev.end_date.valueOf()-ev.start_date.valueOf())*(this.config.hour_size_px+(this._quirks?1:0))/(60*60*1000))); //42px/hour
+	var width=Math.floor((parent.clientWidth-menu)/ev._count);
+	var left=ev._sorder*width+1;
+	if (!ev._inner) width=width*(ev._count-ev._sorder);
+	
+	
+	
+	var d=this._render_v_bar(ev.id,menu+left,top,width,height,ev._text_style,scheduler.templates.event_header(ev.start_date,ev.end_date,ev),scheduler.templates.event_text(ev.start_date,ev.end_date,ev));
+		
+	this._rendered.push(d);
+	parent.appendChild(d);
+	
+	left=left+parseInt(parent.style.left,10)+menu;
+	
+	top+=this._dy_shift; //corrupt top, to include possible multi-day shift
+	if (this._edit_id==ev.id){
+		d.style.zIndex = 1; //fix overlapping issue
+		width=Math.max(width-4,scheduler.xy.editor_width);
+		var d=document.createElement("DIV");
+		d.setAttribute("event_id",ev.id);
+		this.set_xy(d,width,height-20,left,top+14);
+		d.className="dhx_cal_editor";
+			
+		var d2=document.createElement("DIV");
+		this.set_xy(d2,width-6,height-26);
+		d2.style.cssText+=";margin:2px 2px 2px 2px;overflow:hidden;";
+		
+		d.appendChild(d2);
+		this._els["dhx_cal_data"][0].appendChild(d);
+		this._rendered.push(d);
+	
+		d2.innerHTML="<textarea class='dhx_cal_editor'>"+ev.text+"</textarea>";
+		if (this._quirks7) d2.firstChild.style.height=height-12+"px"; //IEFIX
+		this._editor=d2.firstChild;
+		this._editor.onkeypress=function(e){ 
+			if ((e||event).shiftKey) return true;
+			var code=(e||event).keyCode; 
+			if (code==scheduler.keys.edit_save) scheduler.editStop(true); 
+			if (code==scheduler.keys.edit_cancel) scheduler.editStop(false); 
+		};
+		this._editor.onselectstart=function(e){ return (e||event).cancelBubble=true; };
+		d2.firstChild.focus();
+		//IE and opera can add x-scroll during focusing
+		this._els["dhx_cal_data"][0].scrollLeft=0;
+		d2.firstChild.select();
+	}
+	
+	if (this._select_id==ev.id){
+		//d.style.zIndex = 1; //fix overlapping issue
+		var icons=this.config["icons_"+((this._edit_id==ev.id)?"edit":"select")];
+		var icons_str="";
+		for (var i=0; i<icons.length; i++)
+			icons_str+="<div class='dhx_menu_icon "+icons[i]+"' title='"+this.locale.labels[icons[i]]+"'></div>";
+		var obj = this._render_v_bar(ev.id,left-menu+1,top,menu,icons.length*20+26,"","<div class='dhx_menu_head'></div>",icons_str,true);
+		obj.style.left=left-menu+1;
+		this._els["dhx_cal_data"][0].appendChild(obj);
+		this._rendered.push(obj);
+	}
+};
+scheduler._render_v_bar=function(id,x,y,w,h,style,contentA,contentB,bottom){
+	var d=document.createElement("DIV");
+	
+	var ev = this.getEvent(id);
+	var cs = "dhx_cal_event";
+	var cse = scheduler.templates.event_class(ev.start_date,ev.end_date,ev);
+	if (cse) cs=cs+" "+cse;
+	
+	var html='<div event_id="'+id+'" class="'+cs+'" style="position:absolute; top:'+y+'px; left:'+x+'px; width:'+(w-4)+'px; height:'+h+'px;'+(style||"")+'">';
+	html+='<div class="dhx_header" style=" width:'+(w-6)+'px;" >&nbsp;</div>';
+	html+='<div class="dhx_title">'+contentA+'</div>';
+	html+='<div class="dhx_body" style=" width:'+(w-(this._quirks?4:14))+'px; height:'+(h-(this._quirks?20:30))+'px;">'+contentB+'</div>';
+	html+='<div class="dhx_footer" style=" width:'+(w-8)+'px;'+(bottom?' margin-top:-1px;':'')+'" ></div></div>';
+	
+	d.innerHTML=html;
+	return d.firstChild;
+};
+scheduler.locate_holder=function(day){
+	if (this._mode=="day") return this._els["dhx_cal_data"][0].firstChild; //dirty
+	return this._els["dhx_cal_data"][0].childNodes[day];
+};
+scheduler.locate_holder_day=function(date,past){
+	var day = Math.floor((this._correct_shift(date,1)-this._min_date)/(60*60*24*1000));
+	//when locating end data of event , we need to use next day if time part was defined
+	if (past && this.date.time_part(date)) day++;
+	return day;
+};
+scheduler.render_event_bar=function(ev){
+	var parent=this._els["dhx_cal_data"][0];
+
+	var x=this._colsS[ev._sday];
+	var x2=this._colsS[ev._eday];
+	if (x2==x) x2=this._colsS[ev._eday+1];
+	var hb = this.xy.bar_height;
+	
+	var y=this._colsS.heights[ev._sweek]+(this._colsS.height?(this.xy.month_scale_height+2):2)+ev._sorder*hb; 
+			
+	var d=document.createElement("DIV");
+	var cs = ev._timed?"dhx_cal_event_clear":"dhx_cal_event_line";
+	var cse = scheduler.templates.event_class(ev.start_date,ev.end_date,ev);
+	if (cse) cs=cs+" "+cse; 
+	
+	var html='<div event_id="'+ev.id+'" class="'+cs+'" style="position:absolute; top:'+y+'px; left:'+x+'px; width:'+(x2-x-15)+'px;'+(ev._text_style||"")+'">';
+		
+	if (ev._timed)
+		html+=scheduler.templates.event_bar_date(ev.start_date,ev.end_date,ev);
+	html+=scheduler.templates.event_bar_text(ev.start_date,ev.end_date,ev)+'</div>';
+	html+='</div>';
+	
+	d.innerHTML=html;
+	
+	this._rendered.push(d.firstChild);
+	parent.appendChild(d.firstChild);
+};
+
+scheduler._locate_event=function(node){
+	var id=null;
+	while (node && !id && node.getAttribute){
+		id=node.getAttribute("event_id"); 
+		node=node.parentNode;
+	}
+	return id;
+};
+
+
+scheduler.edit=function(id){
+	if (this._edit_id==id) return;
+	this.editStop(false,id);
+	this._edit_id=id;
+	this.updateEvent(id);
+};
+scheduler.editStop=function(mode,id){
+	if (id && this._edit_id==id) return;
+	var ev=this.getEvent(this._edit_id);
+	if (ev){
+		if (mode) ev.text=this._editor.value;
+		this._edit_id=null;
+		this._editor=null;	
+		this.updateEvent(ev.id);
+		this._edit_stop_event(ev,mode);
+	}
+};
+scheduler._edit_stop_event=function(ev,mode){
+	if (this._new_event){
+		if (!mode) this.deleteEvent(ev.id,true);		
+		else this.callEvent("onEventAdded",[ev.id,ev]);
+		this._new_event=null;
+	} else
+		if (mode) this.callEvent("onEventChanged",[ev.id,ev]);
+};
+
+scheduler.getEvents = function(from,to){
+	var result = [];
+	for (var a in this._events){
+		var ev = this._events[a];
+		if (ev && ev.start_date<to && ev.end_date>from)
+			result.push(ev);
+	}
+	return result;
+};
\ No newline at end of file
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/sources/ext.css b/addons/base_calendar/static/lib/dhtmlxScheduler/sources/ext.css
new file mode 100644
index 00000000000..402c5b38271
--- /dev/null
+++ b/addons/base_calendar/static/lib/dhtmlxScheduler/sources/ext.css
@@ -0,0 +1,317 @@
+.dhx_expand_icon {
+	position:absolute; top:0px; right:0px; 
+	background-image:url(../codebase/imgs/colapce-expand-icon.gif);
+	width:18px; height:18px;
+	cursor:pointer;
+	background-position:0px 18px;
+	z-index:16;
+}
+.dhx_agenda_area{
+	width:100%;
+	height:100%;
+	overflow-y:auto;
+	background-image:url(../codebase/imgs/databg.png);
+}
+.dhx_agenda_line{
+	height:21px;
+	clear:both;
+	overflow:hidden;
+}
+.dhx_agenda_line div{
+	float:left; 
+	width:188px;
+	border-right:1px dotted #8894A3;
+	text-align:center;
+	line-height:21px;
+	overflow:hidden;
+}
+.dhx_agenda_area .dhx_agenda_line div{
+	border-right:0px dotted #8894A3;	
+}
+.dhx_v_border{
+	position:absolute; left:186px; top:0px;
+	border-right:1px dotted #8894A3;
+	width:1px;
+	height:100%;
+}
+.dhx_agenda_line .dhx_event_icon{
+	width:20px;
+	border-width:0px;
+	background:url(../codebase/imgs/icon.png) no-repeat;
+	background-position: 5px 4px;
+	cursor:pointer;
+}
+.dhx_agenda_line span{
+	padding-left:5px;
+	line-height:21px;
+}
+
+
+.dhx_year_body{
+  border-left:1px dotted #586A7E;
+}
+.dhx_year_week{
+  height:20px;
+  position:relative;
+}
+.dhx_scale_bar_last{
+  border-right:1px dotted #586A7E;      
+}   
+.dhx_year_month{
+  height:18px;
+  padding-top:3px;
+  border:1px dotted #586A7E;
+  text-align:center;
+  vertical-align:middle;
+}
+.dhx_year_body .dhx_before .dhx_month_head, .dhx_year_body .dhx_after .dhx_month_head, .dhx_year_body .dhx_before .dhx_month_head a, .dhx_year_body .dhx_after .dhx_month_head a{
+  color:#E2E3E6 !important;
+}
+.dhx_year_body .dhx_month_body{
+  height:0px;
+  overflow:hidden;
+}
+.dhx_month_head.dhx_year_event{
+  background-color:#FFE763;
+}
+.dhx_year_body .dhx_before .dhx_month_head, .dhx_year_body .dhx_after .dhx_month_head{
+	cursor: default;
+}
+.dhx_tooltip{
+  border:1px solid #BBBBBB;
+  background-image:url(../codebase/imgs/databg.png);
+  position:absolute;
+  z-index:9998;
+  width:300px; 
+  height:auto;
+  font-family:Tahoma;
+  font-size:8pt;
+  overflow:hidden;
+}
+
+.dhx_tooltip_line{
+	line-height:20px;
+	height:20px;
+	overflow:hidden;
+}
+
+.dhx_tooltip_line .dhx_event_icon{
+	width:20px; height:20px;
+	padding-right:10px;
+	float:left;
+	border-width:0px;
+	position:relative;
+	background:url(../codebase/imgs/icon.png) no-repeat;
+	background-position: 5px 4px;
+	cursor:pointer;
+}
+
+.dhx_tooltip_date{
+	float:left;
+	width:auto;
+	padding-left:5px;
+	text-align:center;
+}
+
+.dhx_text_disabled{
+	color:#887A2E;
+	font-family:Tahoma;
+	font-size:8pt;
+}
+
+.dhx_mini_calendar{
+	-moz-box-shadow:5px 5px 5px #888;	/*Doesn't work in IE*/
+	-khtml-box-shadow: 5px 5px 5px #888;
+}
+
+.dhx_mini_calendar .dhx_month_head{
+	cursor:pointer;
+}
+.dhx_mini_calendar .dhx_calendar_click{
+	background-color: #C2D5FC;
+}
+.dhx_cal_navline div.dhx_minical_icon{
+	width:18px;
+	height:18px;
+	left:190px;
+	top:1px;
+	cursor:pointer;
+	background-image:url(../imgs/calendar.gif);
+}
+
+
+
+.dhx_matrix_cell, .dhx_matrix_scell{
+	overflow:hidden;
+	text-align:center;
+	vertical-align:middle;
+	border-bottom:1px dotted #8894A3;
+	border-right:1px dotted #8894A3;	
+}
+.dhx_matrix_cell{
+	background-color:white;
+}
+.dhx_matrix_cell div, .dhx_matrix_scell div{ 
+	overflow:hidden;
+	text-align:center;
+	width:100%;
+    height:auto; 
+}
+
+.dhx_cal_lsection .dhx_readonly{
+	font-size:9pt;
+	font-size:8pt;
+	padding:2px;
+	color:#887A2E;
+}
+
+/* Tree view */
+.dhx_matrix_scell.folder, .dhx_data_table.folder .dhx_matrix_cell{
+	background-color: #969394;
+	cursor: pointer;
+}
+.dhx_matrix_scell .dhx_scell_level0{
+	padding-left: 5px;
+}
+.dhx_matrix_scell .dhx_scell_level1{
+	padding-left: 20px;
+}
+.dhx_matrix_scell .dhx_scell_level2{
+	padding-left: 35px;
+}
+
+.dhx_matrix_scell.folder{
+	font-weight: bold;
+	text-align: left;
+}
+
+.dhx_matrix_scell.folder .dhx_scell_expand{
+	float: left;
+	width: 10px;
+	padding-right:3px;
+}
+.dhx_matrix_scell.folder .dhx_scell_name{
+	float: left;
+	width: auto;
+}
+.dhx_matrix_scell.item .dhx_scell_name{
+	padding-left:15px;
+	text-align: left;
+}
+.dhx_section_timeline, .dhx_section_timeline2{
+	overflow: hidden;
+	padding: 2px 0 2px 10px;
+}
+.dhx_section_timeline select, .dhx_section_timeline2 select{
+	width: 552px;
+}
+/* Tree view end*/
+
+/* Map view */
+.dhx_map_area{
+	width:100%;
+	height:100%;
+	overflow-y: auto;
+	overflow-x: hidden;
+	background-image:url(../codebase/imgs/databg.png);
+}
+.dhx_map_line .dhx_event_icon{
+	width:20px;
+	border-width:0px;
+	background:url(../codebase/imgs/icon.png) no-repeat;
+	background-position: 5px 4px;
+	cursor:pointer;
+}
+.dhx_map_line{
+	height:21px;
+	clear:both;
+	overflow:hidden;
+}
+.dhx_map {
+	position:absolute;
+}
+.dhx_map_line div{
+	float:left; 
+	border-right:1px dotted #8894A3;
+	text-align:center;
+	line-height:21px;
+	overflow:hidden;
+}
+.dhx_map_line .headline_description{
+	float:left; 
+
+	border-right:1px dotted #8894A3;
+	text-align:center;
+	line-height:21px;
+	overflow:hidden;
+}
+.dhx_map_line .dhx_map_description{
+	float:left; 
+	border-right: 0px dotted #8894A3;
+	text-align:center;
+	line-height:21px;
+	overflow:hidden;
+}
+.dhx_map_line .line_description{
+	float:left; 
+	border-right:1px dotted #8894A3;
+	text-align:left;
+	padding-left:5px;
+	line-height:21px;
+	overflow:hidden;
+}
+.dhx_map_line.highlight{
+	background-color: #C4C5CC;
+}
+.dhx_map_area .dhx_map_line div{
+	border-right:0px dotted #8894A3;	 
+}
+/* Map view end */
+
+/* dhtmlXTooltip start */
+.dhtmlXTooltip.tooltip{
+	-moz-box-shadow:3px 3px 3px #888888;
+	-khtml-box-shadow:3px 3px 3px #888888;
+	
+	background-color:white;
+	border-left:1px dotted #887A2E;
+	border-top:1px dotted #887A2E;
+	color:#887A2E;
+	cursor:default;
+	padding:10px;
+	position:absolute;
+	z-index:500;
+}
+/* dhtmlXTooltip end */
+
+/* Lightbox checkbox section */
+.dhx_cal_checkbox label {
+	padding-left: 5px;
+}
+/* Lightbox checkbox section end */
+
+
+/* Lightbox radiobuttons section */
+.dhx_cal_light .radio {
+	padding: 2px 0px 2px 10px;
+}
+.dhx_cal_light .radio input,  .dhx_cal_light .radio label{
+	line-height: 15px;
+}
+.dhx_cal_light .radio input {
+	vertical-align: middle;
+	margin: 0px;
+	padding: 0px;
+}
+.dhx_cal_light .radio label {
+	vertical-align: middle;
+	padding-right: 10px;
+}
+/* Lightbox radiobuttons section end */
+
+
+/* Lightbox dhtmlx combo section */
+.dhx_cal_light .combo {
+	padding: 4px;
+}
+/* Lightbox dhtmlx combo section end */
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/sources/ext/ext_active_links.js b/addons/base_calendar/static/lib/dhtmlxScheduler/sources/ext/ext_active_links.js
new file mode 100644
index 00000000000..79ebce494bb
--- /dev/null
+++ b/addons/base_calendar/static/lib/dhtmlxScheduler/sources/ext/ext_active_links.js
@@ -0,0 +1,21 @@
+scheduler.attachEvent("onTemplatesReady",function(){
+	var s_d = scheduler.date.str_to_date(scheduler.config.api_date);
+	var d_s = scheduler.date.date_to_str(scheduler.config.api_date);
+	
+	var month_x = scheduler.templates.month_day;
+	scheduler.templates.month_day=function(date){
+		return "<a jump_to='"+d_s(date)+"' href='#'>"+month_x(date)+"</a>";
+	}
+	var week_x = scheduler.templates.week_scale_date;
+	scheduler.templates.week_scale_date=function(date){
+		return "<a jump_to='"+d_s(date)+"' href='#'>"+week_x(date)+"</a>";
+	}
+	
+	
+	dhtmlxEvent(this._obj,"click",function(e){
+		var start = e.target || event.srcElement;
+		var to = start.getAttribute("jump_to");
+		if (to)
+			scheduler.setCurrentView(s_d(to),"day");
+	})
+})
\ No newline at end of file
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/sources/ext/ext_agenda_view.js b/addons/base_calendar/static/lib/dhtmlxScheduler/sources/ext/ext_agenda_view.js
new file mode 100644
index 00000000000..6fcdd5cc106
--- /dev/null
+++ b/addons/base_calendar/static/lib/dhtmlxScheduler/sources/ext/ext_agenda_view.js
@@ -0,0 +1,93 @@
+scheduler.date.add_agenda = function(date){
+	return (new Date(date.valueOf()));
+}
+
+scheduler.dblclick_dhx_agenda_area=function(){
+	if (!this.config.readonly && this.config.dblclick_create)
+		this.addEventNow();
+}
+scheduler.templates.agenda_time = function(start,end,ev){
+	if (ev._timed) 
+		return this.day_date(ev.start_date, ev.end_date, ev)+" "+this.event_date(start);
+	else
+		return scheduler.templates.day_date(start)+" &ndash; "+scheduler.templates.day_date(end);
+}
+scheduler.templates.agenda_text = function(ev){
+	return ev.text;
+}
+scheduler.date.agenda_start=function(d){ return d; };
+	
+scheduler.attachEvent("onTemplatesReady",function(){
+
+
+
+	scheduler.attachEvent("onSchedulerResize",function(){
+	   if (this._mode == "agenda"){
+	      this.agenda_view(true);
+	      return false;
+	   }
+	   return true;
+	});
+	
+	
+	var old = scheduler.render_data;
+	scheduler.render_data=function(evs){
+		if (this._mode == "agenda")
+   			fill_agenda_tab();
+   		else
+   			return old.apply(this,arguments);
+	}
+
+
+	function set_full_view(mode){
+		if (mode){
+			var l = scheduler.locale.labels;
+			scheduler._els["dhx_cal_header"][0].innerHTML="<div class='dhx_agenda_line'><div>"+l.date+"</div><span style='padding-left:25px'>"+l.description+"</span></div>";
+			scheduler._table_view=true;
+			scheduler.set_sizes();
+		}
+	}
+
+	function fill_agenda_tab(){
+		//get current date
+		var date = scheduler._date;
+		//select events for which data need to be printed
+		
+		var events = scheduler.get_visible_events();
+		events.sort(function(a,b){ return a.start_date>b.start_date?1:-1});
+		
+		//generate html for the view
+		var html="<div class='dhx_agenda_area'>";
+		for (var i=0; i<events.length; i++){
+			html+="<div class='dhx_agenda_line' event_id='"+events[i].id+"' style='"+(events[i]._text_style||"")+"'><div>"+scheduler.templates.agenda_time(events[i].start_date, events[i].end_date,events[i])+"</div>";
+			html+="<div class='dhx_event_icon icon_details'>&nbsp</div>";
+			html+="<span>"+scheduler.templates.agenda_text(events[i])+"</span></div>";
+		}
+		html+="<div class='dhx_v_border'></div></div>";
+			
+		//render html
+                scheduler._els["dhx_cal_data"][0].scrollTop = 0; //fix flickering in FF
+		scheduler._els["dhx_cal_data"][0].innerHTML = html;
+		
+		var t=scheduler._els["dhx_cal_data"][0].firstChild.childNodes;
+		scheduler._els["dhx_cal_date"][0].innerHTML="";
+		
+		scheduler._rendered=[];
+		for (var i=0; i < t.length-1; i++)
+			scheduler._rendered[i]=t[i]
+		
+	}
+
+	scheduler.agenda_view=function(mode){
+		scheduler._min_date = scheduler.config.agenda_start||(new Date());
+		scheduler._max_date = scheduler.config.agenda_end||(new Date(9999,1,1));
+		scheduler._table_view = true;
+		set_full_view(mode);
+		if (mode){
+			//agenda tab activated
+			fill_agenda_tab();
+		} else {
+			//agenda tab de-activated
+		}
+	}
+})
\ No newline at end of file
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/sources/ext/ext_collision.js b/addons/base_calendar/static/lib/dhtmlxScheduler/sources/ext/ext_collision.js
new file mode 100644
index 00000000000..d2582a05926
--- /dev/null
+++ b/addons/base_calendar/static/lib/dhtmlxScheduler/sources/ext/ext_collision.js
@@ -0,0 +1,100 @@
+(function(){
+
+var temp_section,temp_time;
+var before;
+
+scheduler.config.collision_limit = 1;	
+scheduler.attachEvent("onBeforeDrag",function(id){
+	var pr = scheduler._props?scheduler._props[this._mode]:null;
+	var matrix = scheduler.matrix?scheduler.matrix[this._mode]:null;
+	var checked_mode = pr||matrix;
+	if(pr)
+		var map_to = checked_mode.map_to;
+	if(matrix)
+		var map_to = checked_mode.y_property;
+
+	if ((checked_mode) && id){
+		temp_section = this.getEvent(id)[map_to];
+		temp_time = this.getEvent(id).start_date;
+	}
+	return true;
+});
+scheduler.attachEvent("onBeforeLightbox",function(id){
+	var ev = scheduler.getEvent(id);
+	before = [ev.start_date, ev.end_date];
+	return true;
+});
+scheduler.attachEvent("onEventChanged",function(id){
+	if (!id) return true;
+	var ev = scheduler.getEvent(id);
+	if (!collision_check(ev)){
+		if (!before) return false;
+		ev.start_date = before[0];
+		ev.end_date = before[1];
+		ev._timed=this.is_one_day_event(ev);
+	};
+	return true;
+});
+scheduler.attachEvent("onBeforeEventChanged",function(ev,e,is_new){
+	return collision_check(ev);
+});
+scheduler.attachEvent("onEventSave",function(id, edited_ev){
+	//var ev = scheduler.getEvent(id);
+	if(edited_ev.rec_type)
+		scheduler._roll_back_dates(edited_ev);
+	
+	return collision_check(edited_ev);
+});
+
+
+function collision_check(ev){
+	var evs = [];
+	
+	if (ev.rec_type) {
+		var evs_dates = scheduler.getRecDates(ev);
+		for(var k=0; k<evs_dates.length; k++) {
+			var tevs = scheduler.getEvents(evs_dates[k].start_date, evs_dates[k].end_date);
+			for(var j=0; j<tevs.length; j++) { 
+				if ((tevs[j].event_pid || tevs[j].id) != ev.id )
+					evs.push(tevs[j]);
+			}
+		}
+		evs.push(ev);
+	} else {
+		evs = scheduler.getEvents(ev.start_date, ev.end_date);
+	}
+	
+	var pr = scheduler._props?scheduler._props[scheduler._mode]:null;
+	var matrix = scheduler.matrix?scheduler.matrix[scheduler._mode]:null;
+	
+	var checked_mode = pr||matrix;
+	if(pr)
+		var map_to = checked_mode.map_to;
+	if(matrix)
+		var map_to = checked_mode.y_property;
+	
+	var single = true;
+	if (checked_mode) {
+		var count = 0;
+
+		for (var i = 0; i < evs.length; i++) 
+			if (evs[i][map_to] == ev[map_to]) 
+				count++;
+				
+		if (count > scheduler.config.collision_limit) {
+			scheduler._drag_event.start_date = temp_time;
+			ev[map_to] = temp_section;
+			single = false;
+		}
+	}
+	else {
+		if (evs.length > scheduler.config.collision_limit) 
+			single = false;
+	}
+			
+	if (!single) return !scheduler.callEvent("onEventCollision",[ev,evs]);
+	return single;
+	
+};
+
+})();
\ No newline at end of file
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/sources/ext/ext_cookie.js b/addons/base_calendar/static/lib/dhtmlxScheduler/sources/ext/ext_cookie.js
new file mode 100644
index 00000000000..0df4852ccdc
--- /dev/null
+++ b/addons/base_calendar/static/lib/dhtmlxScheduler/sources/ext/ext_cookie.js
@@ -0,0 +1,36 @@
+(function(){
+	function setCookie(name,cookie_param,value) {
+		var str = name + "=" + value +  (cookie_param?("; "+cookie_param):"");
+		document.cookie = str;
+	}
+	function getCookie(name) {
+		var search = name + "=";
+		if (document.cookie.length > 0) {
+			var offset = document.cookie.indexOf(search);
+			if (offset != -1) {
+				offset += search.length;
+				var end = document.cookie.indexOf(";", offset);
+				if (end == -1)
+					end = document.cookie.length;
+				return document.cookie.substring(offset, end);
+			}
+		}
+		return "";
+	}
+	var first = true;
+	scheduler.attachEvent("onBeforeViewChange",function(om,od,m,d){
+		if (first){
+			first = false;
+			var data=getCookie("scheduler_settings");
+			if (data){
+				data = data.split("@");
+				data[0] = this.templates.xml_date(data[0]);
+				this.setCurrentView(data[0],data[1]);
+				return false;
+			}
+		}
+		var text = this.templates.xml_format(d||od)+"@"+(m||om);
+		setCookie("scheduler_settings","expires=Sun, 31 Jan 9999 22:00:00 GMT",text);
+		return true;
+	});
+})();
\ No newline at end of file
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/sources/ext/ext_editors.js b/addons/base_calendar/static/lib/dhtmlxScheduler/sources/ext/ext_editors.js
new file mode 100644
index 00000000000..8c64d13eddc
--- /dev/null
+++ b/addons/base_calendar/static/lib/dhtmlxScheduler/sources/ext/ext_editors.js
@@ -0,0 +1,95 @@
+scheduler.form_blocks['combo']={
+	render:function(sns) {
+		var res = '';
+		res += "<div class='"+sns.type+"' style='height:"+(sns.height||20)+"px;' ></div>";	
+		return res;
+	},
+	set_value:function(node,value,ev,config){
+		if(node._combo) {
+			node._combo.destructor();
+		}  
+		window.dhx_globalImgPath = config.image_path||'/';
+		node._combo = new dhtmlXCombo(node, config.name, node.offsetWidth-8);		
+		node._combo.enableFilteringMode(!!config.filtering, config.script_path||null, !!config.cache);
+		
+		if (!config.script_path) { // script-side filtration is used
+			var all_options = [];
+			for (var i = 0; i < config.options.length; i++) {
+				var single_option = [];
+				single_option.push(config.options[i].key);
+				single_option.push(config.options[i].label);
+				all_options.push(single_option);
+			}
+			node._combo.addOption(all_options);
+			if (ev[config.map_to]) {
+				var index = node._combo.getIndexByValue(ev[config.map_to]);
+				node._combo.selectOption(index);
+			}
+		} else { // server-side filtration is used
+			node._combo.setComboValue(ev[config.map_to]||null);
+		}
+	},
+	get_value:function(node,ev,config){
+		var selected_id = node._combo.getSelectedValue(); // value = key
+		return selected_id;
+	},
+	focus:function(node){
+	}
+};
+
+scheduler.form_blocks['radio']={
+	render:function(sns) {
+		var res = '';
+		res += "<div class='"+sns.type+"' style='height:"+sns.height+"px;' >";
+		for (var i=0; i<sns.options.length; i++) {
+			var id = scheduler.uid();
+			res += "<input id='"+id+"' type='radio' name='"+sns.name+"' value='"+sns.options[i].key+"'><label for='"+id+"'>"+" "+sns.options[i].label+"</label>";
+			if(sns.vertical)
+				res += "<br/>";
+		}
+		res += "</div>";
+		
+		return res;
+	},
+	set_value:function(node,value,ev,config){
+		var radiobuttons = node.getElementsByTagName('input');
+		for (var i = 0; i < radiobuttons.length; i++) {
+			radiobuttons[i].checked = false;
+			if (radiobuttons[i].value == ev[config.map_to]) {
+				radiobuttons[i].checked = true;
+			}
+		}
+	},
+	get_value:function(node,ev,config){
+		var radiobuttons = node.getElementsByTagName('input');
+		for(var i=0; i<radiobuttons.length; i++) {
+			if(radiobuttons[i].checked) {
+				return radiobuttons[i].value;
+			}
+		}
+	},
+	focus:function(node){
+	}
+};
+
+scheduler.form_blocks['checkbox']={
+	render:function(sns) {
+		return '';
+	},
+	set_value:function(node,value,ev,config){
+		var id = scheduler.uid();
+		var isChecked = false;
+		if (typeof config.checked_value != 'undefined' && ev[config.map_to] == config.checked_value) {
+			isChecked = true;
+		}
+		node.previousSibling.className += " dhx_cal_checkbox";
+		node.previousSibling.innerHTML="<input id='"+id+"' type='checkbox' value='true' name='"+config.name+"'"+((isChecked)?"checked='true'":'')+"'><label for='"+id+"'>"+(scheduler.locale.labels["section_"+config.name]||config.name)+"</label>";
+		
+	},
+	get_value:function(node,ev,config){
+		var checkbox = node.previousSibling.getElementsByTagName('input')[0]; // moved to the header
+		return (checkbox.checked)?(config.checked_value||true):(config.unchecked_value||false);
+	},
+	focus:function(node){
+	}
+};
\ No newline at end of file
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/sources/ext/ext_expand.js b/addons/base_calendar/static/lib/dhtmlxScheduler/sources/ext/ext_expand.js
new file mode 100644
index 00000000000..9224bef1af5
--- /dev/null
+++ b/addons/base_calendar/static/lib/dhtmlxScheduler/sources/ext/ext_expand.js
@@ -0,0 +1,54 @@
+scheduler.expand = function(){
+      var t = scheduler._obj;
+      do {
+         t._position = t.style.position||"";
+         t.style.position = "static";
+      } while ((t = t.parentNode) && t.style );
+	  t = scheduler._obj;
+      t.style.position="absolute";
+      t._width = t.style.width;
+      t._height = t.style.height;
+      t.style.width = t.style.height = "100%";
+      t.style.top = t.style.left = "0px";
+      
+	  var top =document.body;
+	  	  top.scrollTop = 0;
+	  	  
+	  top = top.parentNode;
+	  if (top)
+   		  top.scrollTop = 0;
+   	  document.body._overflow=document.body.style.overflow||"";
+   	  document.body.style.overflow = "hidden";
+	  scheduler._maximize()
+}
+   
+scheduler.collapse = function(){
+      var t = scheduler._obj;
+      do {
+         t.style.position = t._position;
+      } while ((t = t.parentNode) && t.style );
+	  t = scheduler._obj;
+      t.style.width = t._width;
+      t.style.height = t._height;
+      document.body.style.overflow=document.body._overflow;
+	  scheduler._maximize()
+}
+   
+scheduler.attachEvent("onTemplatesReady",function(){
+   var t = document.createElement("DIV");
+   t.className="dhx_expand_icon";
+   scheduler.toggleIcon = t;
+   scheduler._obj.appendChild(t);   
+   t.onclick = function(){
+      if (!scheduler.expanded)
+         scheduler.expand();
+      else 
+         scheduler.collapse();
+   }
+});
+scheduler._maximize = function(){
+	  this.expanded = !this.expanded;
+      this.toggleIcon.style.backgroundPosition="0px "+(this._expand?"0":"18")+"px";
+      if (scheduler.callEvent("onSchedulerResize",[]))
+         scheduler.update_view();
+}
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/sources/ext/ext_html_templates.js b/addons/base_calendar/static/lib/dhtmlxScheduler/sources/ext/ext_html_templates.js
new file mode 100644
index 00000000000..d75582b438c
--- /dev/null
+++ b/addons/base_calendar/static/lib/dhtmlxScheduler/sources/ext/ext_html_templates.js
@@ -0,0 +1,15 @@
+scheduler.attachEvent("onTemplatesReady",function(){
+	var els = document.body.getElementsByTagName("DIV");
+	for (var i=0; i < els.length; i++) {
+		var cs = els[i].className||"";
+		cs = cs.split(":");
+		if (cs.length == 2 && cs[0] == "template"){
+			var code = "return \""+(els[i].innerHTML||"").replace(/\"/g,"\\\"").replace(/[\n\r]+/g,"")+"\";";
+			code = unescape(code).replace(/\{event\.([a-z]+)\}/g,function(all,mask){
+				return '"+ev.'+mask+'+"';
+			});
+			scheduler.templates[cs[1]]=Function("start","end","ev",code);
+			els[i].style.display='none';
+		}
+	};
+})
\ No newline at end of file
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/sources/ext/ext_key_nav.js b/addons/base_calendar/static/lib/dhtmlxScheduler/sources/ext/ext_key_nav.js
new file mode 100644
index 00000000000..cc00f3d3698
--- /dev/null
+++ b/addons/base_calendar/static/lib/dhtmlxScheduler/sources/ext/ext_key_nav.js
@@ -0,0 +1,32 @@
+//Initial idea and implementation by Steve MC
+(function (){
+
+var lightboxopen = false;
+
+scheduler.attachEvent("onBeforeLightbox",function(){ lightboxopen = true; return true; });
+scheduler.attachEvent("onAfterLightbox",function(){ lightboxopen = false; return true; });
+
+dhtmlxEvent(document,(_isOpera?"keypress":"keydown"),function(e){
+	e=e||event;
+	if (!lightboxopen){
+		
+		if (e.keyCode == 37 || e.keyCode == 39) { // Left-Arrow
+			e.cancelBubble = true;
+			
+		    var next = scheduler.date.add(scheduler._date,(e.keyCode == 37 ? -1 : 1 ),scheduler._mode);
+		    scheduler.setCurrentView(next);
+		    return true;
+		} else if (e.ctrlKey && e.keyCode == 67){
+			scheduler._copy_id = scheduler._select_id;
+		} else if (e.ctrlKey && e.keyCode == 86){
+			var ev = scheduler.getEvent(scheduler._copy_id);
+			if (ev){
+				var new_ev = scheduler._copy_event(ev);
+					new_ev.id = scheduler.uid();
+					scheduler.addEvent(new_ev);
+			}
+		}
+	}
+});
+
+})();
\ No newline at end of file
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/sources/ext/ext_limit.js b/addons/base_calendar/static/lib/dhtmlxScheduler/sources/ext/ext_limit.js
new file mode 100644
index 00000000000..4a8ad2fed6d
--- /dev/null
+++ b/addons/base_calendar/static/lib/dhtmlxScheduler/sources/ext/ext_limit.js
@@ -0,0 +1,78 @@
+scheduler.config.limit_start = new Date(-3999,0,0);
+scheduler.config.limit_end   = new Date( 3999,0,0);
+scheduler.config.limit_view  = false;
+
+(function(){
+	var before = null;
+	
+	scheduler.attachEvent("onBeforeViewChange",function(om,od,nm,nd){
+		nd = nd||od; nm = nm||om;
+		if (scheduler.config.limit_view){
+			if (nd.valueOf()>scheduler.config.limit_end.valueOf() || this.date.add(nd,1,nm)<=scheduler.config.limit_start.valueOf()){
+				setTimeout(function(){
+					scheduler.setCurrentView(scheduler._date, nm);
+				},1);
+				return false;
+			}
+		}
+		return true;
+	});
+	var blocker = function(ev){
+		var c = scheduler.config;
+		var res = (ev.start_date.valueOf() >= c.limit_start.valueOf() && ev.end_date.valueOf() <= c.limit_end.valueOf());
+		if (!res) {
+			scheduler._drag_id = null;
+			scheduler._drag_mode = null;
+			scheduler.callEvent("onLimitViolation",[ev.id, ev]);
+		}
+		return res;
+	};
+	
+	scheduler.attachEvent("onBeforeDrag",function(id){
+		if (!id) return true;
+		return blocker(scheduler.getEvent(id));
+	});
+	scheduler.attachEvent("onClick", function (event_id, native_event_object){
+		return blocker(scheduler.getEvent(event_id));
+    });
+	scheduler.attachEvent("onBeforeLightbox",function(id){
+		var ev = scheduler.getEvent(id);
+		before = [ev.start_date, ev.end_date];
+		return blocker(ev);
+	});	
+	scheduler.attachEvent("onEventAdded",function(id){
+		if (!id) return true;
+		var ev = scheduler.getEvent(id);
+		if (!blocker(ev)){
+			if (ev.start_date < scheduler.config.limit_start) {
+				ev.start_date = new Date(scheduler.config.limit_start);
+			}
+			if (ev.end_date > scheduler.config.limit_end) {
+				ev.end_date = new Date(scheduler.config.limit_end);
+				// as end date was changed need to recheck if event occuring during one day
+				ev._timed = this.is_one_day_event(ev); 
+			}
+			// in case if both start and end date were specified < scheduler.config.limit_star
+			if (ev.start_date > ev.end_date) { 
+				ev.end_date = this.date.add(ev.start_date, (this.config.event_duration||this.config.time_step), "minute");
+			}
+		}
+		return true;
+	});
+	scheduler.attachEvent("onEventChanged",function(id){
+		if (!id) return true;
+		var ev = scheduler.getEvent(id);
+		if (!blocker(ev)){
+			if (!before) return false;
+			ev.start_date = before[0];
+			ev.end_date = before[1];
+			ev._timed=this.is_one_day_event(ev);
+		};
+		return true;
+	});
+	scheduler.attachEvent("onBeforeEventChanged",function(ev, native_object, is_new){
+		return blocker(ev);
+	});
+
+})();
+	
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/sources/ext/ext_map_view.js b/addons/base_calendar/static/lib/dhtmlxScheduler/sources/ext/ext_map_view.js
new file mode 100644
index 00000000000..05845b9c468
--- /dev/null
+++ b/addons/base_calendar/static/lib/dhtmlxScheduler/sources/ext/ext_map_view.js
@@ -0,0 +1,396 @@
+
+
+scheduler.xy.map_date_width = 188; // date column width
+scheduler.xy.map_description_width = 400; // description column width
+
+scheduler.config.map_resolve_event_location = true; // if events in database doesn't have lat and lng values there will be an attempt to resolve them on event loading, useful for migration
+scheduler.config.map_resolve_user_location = true; // if user will be promted to share his location to display it on the map
+
+scheduler.config.map_initial_position = new google.maps.LatLng(48.724, 8.215); // inital position of the map
+scheduler.config.map_error_position = new google.maps.LatLng(15, 15); // this position will be displayed in case if event doesn't have corresponding coordinates
+
+scheduler.config.map_infowindow_max_width = 300;
+
+scheduler.config.map_type = google.maps.MapTypeId.ROADMAP;
+
+scheduler.config.map_zoom_after_resolve = 15;
+
+scheduler.locale.labels.marker_geo_success = "It seems you are here.";
+scheduler.locale.labels.marker_geo_fail = "Sorry, could not get your current position using geolocation.";
+
+scheduler.templates.marker_date=scheduler.date.date_to_str("%Y-%m-%d %H:%i"); // date for map's infowindow will be formated following way 
+
+scheduler.templates.marker_text=function(start, end, ev){
+	return "<div><b>"+ev.text+"</b><br/><br/>"+(ev.event_location||'')+"<br/><br/>"+scheduler.templates.marker_date(start)+" - "+scheduler.templates.marker_date(end)+"</div>";
+};
+scheduler.dblclick_dhx_map_area=function(){
+	if (!this.config.readonly && this.config.dblclick_create)
+		this.addEventNow();
+};
+scheduler.templates.map_time = function(start,end,ev){
+	if (ev._timed) 
+		return this.day_date(ev.start_date, ev.end_date, ev)+" "+this.event_date(start);
+	else
+		return scheduler.templates.day_date(start)+" &ndash; "+scheduler.templates.day_date(end);
+};
+scheduler.templates.map_text = function(ev){
+	return ev.text;
+};
+scheduler.date.map_start=function(d){ return d; };
+
+	
+scheduler.attachEvent("onTemplatesReady",function(){
+
+	function _append_map() {
+		_isPositionSet = false; // if user actual (geolocation) position was set on the map
+	
+		var gmap = document.createElement('div');
+		gmap.className='dhx_map';
+		gmap.id='dhx_gmap';
+		gmap.style.dispay = "none";
+		
+		node = document.getElementById('scheduler_here');
+
+		node.appendChild(gmap);
+		
+		scheduler._els.dhx_gmap = [];
+		scheduler._els.dhx_gmap.push(gmap);
+		
+		_setMapSize('dhx_gmap');
+
+		var mapOptions = {
+			zoom: scheduler.config.map_inital_zoom || 10,
+			center: scheduler.config.map_initial_position,
+			mapTypeId: scheduler.config.map_type||google.maps.MapTypeId.ROADMAP
+		};
+		map = new google.maps.Map(document.getElementById('dhx_gmap'), mapOptions);
+		map.disableDefaultUI = false;
+		map.disableDoubleClickZoom = true;
+		
+		google.maps.event.addListener(map, "dblclick", function(event) {
+			if (!scheduler.config.readonly && scheduler.config.dblclick_create) {
+				point = event.latLng;
+				geocoder.geocode(
+					{ 'latLng': point },
+					function(results, status) {
+						if (status == google.maps.GeocoderStatus.OK) {
+							point = results[0].geometry.location;
+							scheduler.addEventNow({
+								lat: point.lat(), 
+								lng: point.lng(), 
+								event_location: results[0].formatted_address
+							});
+						}
+					}
+				);
+			}	
+		});
+		
+		var infoWindowOptions = {
+			content: ''
+		};
+
+		if (scheduler.config.map_infowindow_max_width) {
+			infoWindowOptions.maxWidth = scheduler.config.map_infowindow_max_width;
+		}
+		
+		scheduler.map = {
+			_points: [],
+			_markers: [],
+			_infowindow: new google.maps.InfoWindow(infoWindowOptions),
+			_infowindows_content: [],
+			_initialization_count: -1
+		};
+		
+		geocoder = new google.maps.Geocoder();
+		
+		if(scheduler.config.map_resolve_user_location) {
+			if(navigator.geolocation) {
+				if(!_isPositionSet) {	  
+					navigator.geolocation.getCurrentPosition(function(position) {
+						var _userLocation = new google.maps.LatLng(position.coords.latitude,position.coords.longitude);
+						map.setCenter(_userLocation);
+						map.setZoom(scheduler.config.map_zoom_after_resolve||10);
+						scheduler.map._infowindow.setContent(scheduler.locale.labels.marker_geo_success);
+						scheduler.map._infowindow.position = map.getCenter();
+						scheduler.map._infowindow.open(map);
+
+						_isPositionSet = true;	
+					}, 
+					function() {
+						scheduler.map._infowindow.setContent(scheduler.locale.labels.marker_geo_fail);
+						scheduler.map._infowindow.setPosition(map.getCenter());
+						scheduler.map._infowindow.open(map);
+						_isPositionSet = true;	
+					}); 
+				}
+			}
+		}
+		google.maps.event.addListener(map, "resize", function(event) {
+			gmap.style.zIndex='5';	
+			map.setZoom( map.getZoom() );
+		});
+		google.maps.event.addListener(map, "tilesloaded", function(event) {
+			gmap.style.zIndex='5';	
+		});
+	}
+	_append_map();
+
+	scheduler.attachEvent("onSchedulerResize",function(){
+	   if (this._mode == "map"){
+			this.map_view(true);
+	   }
+	});
+	
+	var old = scheduler.render_data;
+	scheduler.render_data=function(evs,hold){
+		if (this._mode == "map") {
+			fill_map_tab(); 
+			var events = scheduler.get_visible_events();
+			for(var i=0; i<events.length; i++) {
+				if(!scheduler.map._markers[events[i].id]) {
+					showAddress(events[i],false,false);
+				}
+			}
+   	} else
+   		return old.apply(this,arguments);
+	};
+
+	function set_full_view(mode){
+		if (mode){
+			var l = scheduler.locale.labels;
+			scheduler._els["dhx_cal_header"][0].innerHTML="<div class='dhx_map_line' style='width: "+(scheduler.xy.map_date_width+scheduler.xy.map_description_width+2)+"px;' ><div style='width: "+scheduler.xy.map_date_width+"px;'>"+l.date+"</div><div class='headline_description' style='width: "+scheduler.xy.map_description_width+"px;'>"+l.description+"</div></div>";
+			scheduler._table_view=true;
+			scheduler.set_sizes();
+		}
+	}
+
+	function fill_map_tab(){
+		//get current date
+		var date = scheduler._date;
+		//select events for which data need to be printed
+		var events = scheduler.get_visible_events();
+		events.sort(function(a,b){ return a.start_date>b.start_date?1:-1; });
+		
+		//generate html for the view
+		var html="<div class='dhx_map_area'>";
+		for (var i=0; i<events.length; i++){
+			var event_class = (events[i].id == scheduler._selected_event_id)?'dhx_map_line highlight':'dhx_map_line';
+			html+="<div class='"+event_class+"' event_id='"+events[i].id+"' style='"+(events[i]._text_style||"")+" width: "+(scheduler.xy.map_date_width+scheduler.xy.map_description_width+2)+"px;'><div style='width: "+scheduler.xy.map_date_width+"px;' >"+scheduler.templates.map_time(events[i].start_date, events[i].end_date,events[i])+"</div>";
+			html+="<div class='dhx_event_icon icon_details'>&nbsp</div>";
+			html+="<div class='line_description' style='width:"+(scheduler.xy.map_description_width-25)+"px;'>"+scheduler.templates.map_text(events[i])+"</div></div>"; // -25 = icon size 20 and padding 5
+		}
+		html+="<div class='dhx_v_border' style='left: "+(scheduler.xy.map_date_width-2)+"px;'></div><div class='dhx_v_border_description'></div></div>";
+		
+		//render html
+		scheduler._els["dhx_cal_data"][0].scrollTop = 0; //fix flickering in FF
+		scheduler._els["dhx_cal_data"][0].innerHTML = html;
+		scheduler._els["dhx_cal_data"][0].style.width = (scheduler.xy.map_date_width + scheduler.xy.map_description_width + 1) + 'px';
+		
+		var t=scheduler._els["dhx_cal_data"][0].firstChild.childNodes;
+		scheduler._els["dhx_cal_date"][0].innerHTML="";
+		
+		scheduler._rendered=[];
+		for (var i=0; i < t.length-2; i++) {
+			scheduler._rendered[i]=t[i];
+		}
+		
+	}
+	
+	function _setMapSize(elem_id) { //input - map's div id
+		var map = document.getElementById(elem_id);
+		map.style.height = (scheduler._y - scheduler.xy.nav_height) + 'px';
+		map.style.width = (scheduler._x - scheduler.xy.map_date_width - scheduler.xy.map_description_width - 1) + 'px';
+		map.style.marginLeft = (scheduler.xy.map_date_width + scheduler.xy.map_description_width + 1) + 'px';
+		map.style.marginTop = (scheduler.xy.nav_height + 2) + 'px';
+	}
+
+	scheduler.map_view=function(mode){
+		scheduler.map._initialization_count++;
+		var gmap = scheduler._els.dhx_gmap[0];
+		
+		scheduler._els.dhx_cal_data[0].style.width = (scheduler.xy.map_date_width + scheduler.xy.map_description_width + 1) + 'px';
+		
+		scheduler._min_date = scheduler.config.map_start||(new Date());
+		scheduler._max_date = scheduler.config.map_end||(new Date(9999,1,1));
+		scheduler._table_view = true;
+		set_full_view(mode);
+		
+		if (mode){ //map tab activated
+			fill_map_tab();
+			gmap.style.display = 'block';
+			
+			// need to resize block everytime window is resized
+			_setMapSize('dhx_gmap');
+	
+			var events = scheduler.get_visible_events();
+			for(var i=0; i<events.length; i++) {
+				if(!scheduler.map._markers[events[i].id]) {
+					showAddress(events[i]);
+				}
+			}
+		} else { //map tab de-activated
+			gmap.style.display = 'none';
+		}
+		
+		google.maps.event.trigger(map, 'resize');
+		if(scheduler.map._initialization_count === 0) { // if tab is activated for the first time need to fix position
+			map.setCenter(scheduler.config.map_initial_position);
+		}
+	};
+	
+	function showAddress(event, setCenter, performClick) { // what if event have incorrect position from the start?
+		if(event.lat && event.lng) {
+			var point = new google.maps.LatLng(event.lat,event.lng);
+		} else {
+			var point = scheduler.config.map_error_position;
+		}
+		var message = scheduler.templates.marker_text(event.start_date, event.end_date, event);
+		if(!scheduler._new_event) {
+			scheduler.map._markers[event.id]= new google.maps.Marker({
+				position: point,
+				map: map
+			});
+
+			scheduler.map._infowindows_content[event.id] = message;
+
+			google.maps.event.addListener(scheduler.map._markers[event.id], 'click', function() {
+				scheduler.map._infowindow.setContent(scheduler.map._infowindows_content[event.id]);
+				scheduler.map._infowindow.open(map,scheduler.map._markers[event.id]);
+				scheduler._selected_event_id = event.id;
+				scheduler.render_data();
+			});
+
+			scheduler.map._points[event.id]=point;
+			
+			if(setCenter) map.setCenter(scheduler.map._points[event.id]);
+			if(performClick) scheduler.callEvent("onClick", [event.id]);
+		}
+	}
+	
+	scheduler.attachEvent("onClick",function(event_id, native_event_object){  
+		if (this._mode == "map"){
+			scheduler._selected_event_id = event_id;
+			for(var i=0; i<scheduler._rendered.length; i++) {
+				scheduler._rendered[i].className='dhx_map_line';
+				if(scheduler._rendered[i].getAttribute("event_id") == event_id) {
+					scheduler._rendered[i].className += " highlight"; 
+				}
+			}
+			if(scheduler.map._points[event_id] && scheduler.map._markers[event_id]) {
+				map.panTo(scheduler.map._points[event_id]);
+				google.maps.event.trigger(scheduler.map._markers[event_id], 'click');
+			}
+	   }
+	   return true;
+	});
+	
+	_displayEventOnMap = function(event) {
+		if (event.event_location && geocoder) { 
+			geocoder.geocode(
+				{ 'address': event.event_location },
+				function(results, status) {
+					var point = {};
+					if (status != google.maps.GeocoderStatus.OK) {
+						point = scheduler.callEvent("onLocationError",[event.id]);
+						if (!point || point === true)
+							point = scheduler.config.map_error_position;
+					} else {
+						point = results[0].geometry.location;
+					}
+					event.lat = point.lat();
+					event.lng = point.lng();
+					
+					scheduler._selected_event_id = event.id;
+					
+					showAddress(event, true, true);
+					dp.setUpdated(event.id, true, "updated");		
+				}
+			);
+		} else {
+			showAddress(event, true, true); 
+		}
+	};
+	
+	_updateEventLocation = function(event) { // update lat and lng in database
+		if (event.event_location && geocoder) {
+			geocoder.geocode(
+				{ 'address': event.event_location },
+				function(results, status) {
+					var point = {};
+					if (status != google.maps.GeocoderStatus.OK) {
+						point = scheduler.callEvent("onLocationError",[event.id]);
+						if (!point || point === true)
+							point = scheduler.config.map_error_position;
+					} else {
+						point = results[0].geometry.location;
+					}
+					event.lat = point.lat();
+					event.lng = point.lng();
+					dp.setUpdated(event.id, true, "updated");
+				}
+			);
+		}
+	};
+	
+	_delay = function(method, object, params, delay) {
+		setTimeout(function(){
+			var ret = method.apply(object,params);
+			method = obj = params = null;
+			return ret;
+		},delay||1000);	
+	};
+	
+	scheduler.attachEvent("onEventChanged", function(event_id,event_object){
+		if(scheduler.is_visible_events(scheduler.getEvent(event_id))) {
+			scheduler.map._markers[event_id].setMap(null);
+			var event = scheduler.getEvent(event_id);
+			_displayEventOnMap(event);
+		} else {
+			scheduler.map._infowindow.close();
+			scheduler.map._markers[event_id].setMap(null);
+		}
+		return true;
+   });
+	
+	scheduler.attachEvent("onEventIdChange", function(old_event_id,new_event_id){
+		if(scheduler.is_visible_events(scheduler.getEvent(new_event_id))) {
+			if(scheduler.map._markers[old_event_id]) scheduler.map._markers[old_event_id].setMap(null); 
+			var event = scheduler.getEvent(new_event_id);
+			_displayEventOnMap(event);
+		}
+		return true;
+	});
+	
+	/* Test/example
+	scheduler.attachEvent("onLocationError", function(event_id,event_object){
+		return new google.maps.LatLng(8, 8);
+   });
+	*/
+	
+	scheduler.attachEvent("onBeforeEventDelete", function(event_id,event_object){
+			if (scheduler.map._markers[event_id]) {
+				scheduler.map._markers[event_id].setMap(null); // if new event is deleted tab != map then it doesn't have marker yet
+			}
+			scheduler.map._infowindow.close();
+		return true;
+   });
+	
+	scheduler._event_resolve_delay = 500;
+	scheduler.attachEvent("onEventLoading", function(event){	
+		if(scheduler.config.map_resolve_event_location && event.event_location && !event.lat && !event.lng) { // don't delete !event.lat && !event.lng as location could change
+			scheduler._event_resolve_delay += 500;
+			_delay(_updateEventLocation,this,[event], scheduler._event_resolve_delay);
+		}
+		return true;
+   });
+	
+	scheduler.attachEvent("onEventCancel", function(event_id, is_new){
+		if(is_new) {
+			if(scheduler.map._markers[event_id]) 
+				scheduler.map._markers[event_id].setMap(null);
+			scheduler.map._infowindow.close();
+		}
+		return true;
+   });
+});
\ No newline at end of file
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/sources/ext/ext_matrix.js b/addons/base_calendar/static/lib/dhtmlxScheduler/sources/ext/ext_matrix.js
new file mode 100644
index 00000000000..e36c6d68e75
--- /dev/null
+++ b/addons/base_calendar/static/lib/dhtmlxScheduler/sources/ext/ext_matrix.js
@@ -0,0 +1,573 @@
+(function(){
+scheduler.matrix = {};
+scheduler._merge=function(a,b){
+	for (var c in b)
+		if (typeof a[c] == "undefined")
+			a[c]=b[c];
+};
+scheduler.createTimelineView=function(obj){
+
+	
+	scheduler._merge(obj,{
+		section_autoheight: true,
+		name:"matrix",
+		x:"time",
+		y:"time",
+		x_step:1,
+		x_unit:"hour",
+		y_unit:"day",
+		y_step:1,
+		x_start:0,
+		x_size:24,
+		y_start:0,
+		y_size:	7,
+		render:"cell",
+		dx:200,
+		dy:50,
+		_logic: function(render_name, y_unit, timeline) {
+			var res = {};
+			if(scheduler.checkEvent("onBeforeViewRender")) { 
+				res = scheduler.callEvent("onBeforeViewRender", [render_name, y_unit, timeline]);
+			}
+			return res;
+		}
+	});
+	
+	if (scheduler.checkEvent("onTimelineCreated")) { 
+		scheduler.callEvent("onTimelineCreated", [obj]);
+	}
+
+	//init custom wrappers
+	scheduler[obj.name+"_view"]=function(){
+		scheduler.renderMatrix.apply(obj, arguments);
+	};
+	
+	var old = scheduler.render_data;
+	scheduler.render_data=function(evs, mode){
+		if (this._mode == obj.name){
+			if (mode)	//repaint single event, precision is not necessary
+				for (var i=0; i < evs.length; i++) {
+					this.clear_event(evs[i]);
+					this.render_timeline_event.call(this.matrix[this._mode], evs[i], 0, true);
+				}
+			else
+   			set_full_view.call(obj,true);
+   		} else
+   			return old.apply(this,arguments);
+	};
+	
+	scheduler.matrix[obj.name]=obj;
+	scheduler.templates[obj.name+"_cell_value"] = function(ar){ return ar?ar.length:""; };
+	scheduler.templates[obj.name+"_cell_class"] = function(ar){ return ""; };
+	scheduler.templates[obj.name+"_scalex_class"] = function(ar){ return ""; };
+	
+	scheduler.templates[obj.name+"_scaley_class"] = function(section_id, section_label, section_options){ return "class"; };
+	scheduler.templates[obj.name+"_scale_label"] = function(section_id, section_label, section_options){ return section_label; };
+	
+	scheduler.templates[obj.name+"_tooltip"] = function(a,b,e){ return e.text; };
+	scheduler.templates[obj.name+"_date"] = function(datea, dateb){ 
+		if (datea.getDay()==dateb.getDay() && datea-dateb<(24*60*60*1000))
+			return scheduler.templates.day_date(datea);
+		return scheduler.templates.week_date(datea, dateb); 
+	};
+	
+	scheduler.templates[obj.name+"_scale_date"] = scheduler.date.date_to_str(obj.x_date||scheduler.config.hour_date);
+		
+	scheduler.date["add_"+obj.name]=function(a,b,c){
+		return scheduler.date.add(a,(obj.x_length||obj.x_size)*b*obj.x_step,obj.x_unit);
+	};
+	
+	// note this is not correct start_date as it doesn't take into account x_start value (though scheduler._min_date is correct)
+	scheduler.date[obj.name+"_start"] = scheduler.date[obj.x_unit+"_start"] || scheduler.date.day_start;
+	
+	scheduler.attachEvent("onSchedulerResize",function(){
+		if (this._mode == obj.name){
+			set_full_view.call(obj,true);
+			return false;
+		}
+		return true;
+	});
+	
+	scheduler.attachEvent("onOptionsLoad",function(){
+			obj.order = {};
+			for(var i=0; i<obj.y_unit.length;i++)
+				obj.order[obj.y_unit[i].key]=i;
+			if(obj.name == scheduler._mode) {
+				if (scheduler._date) 
+					scheduler.setCurrentView(scheduler._date, scheduler._mode);
+			}
+	});	
+	scheduler.callEvent("onOptionsLoad",[obj]);
+	
+	//enable drag for non-cell modes
+		if (obj.render != "cell"){
+		var temp_date = new Date();
+		var step_diff = (scheduler.date.add(temp_date, 1, obj.x_unit).valueOf() - temp_date.valueOf());
+		scheduler["mouse_"+obj.name]=function(pos){	//mouse_coord handler
+			//get event object
+			var ev = this._drag_event;
+			if (this._drag_id){
+				ev = this.getEvent(this._drag_id);
+				this._drag_event._dhx_changed = true;
+			}
+			pos.x-=obj.dx;
+			//scheduler.date.date_part(ev.start_date);
+			
+			var summ = 0, xind = 0, yind = 0;  
+			for (xind; xind < this._cols.length-1; xind++) { 
+				summ+=this._cols[xind];
+				if (summ>pos.x){ //index of section
+					break;
+				}
+			}
+			
+			summ = 0;
+			for (yind; yind < this._colsS.heights.length; yind++) {
+				summ+=this._colsS.heights[yind];
+				if (summ>pos.y)
+					break;
+			}
+			
+			pos.fields={};
+			pos.fields[obj.y_property] = ev[obj.y_property] = obj.y_unit[yind].key;
+			
+			pos.x =  yind/10000000; //force rendering when section changes
+			
+			if (this._drag_mode == "new-size" && ev.start_date*1==this._drag_start*1) {
+				xind++;
+			}
+				
+			
+			if(xind >= obj._trace_x.length) { // if our event is at the end of the view
+				var end_date = scheduler.date.add(obj._trace_x[obj._trace_x.length-1], obj.x_step, obj.x_unit);
+			} else {
+				var end_date = obj._trace_x[xind];
+			}
+
+			pos.y = Math.round((end_date-this._min_date)/(1000*60*this.config.time_step));
+			pos.custom = true;
+			pos.shift = step_diff;
+
+			return pos;
+		};
+	}
+};
+
+scheduler.render_timeline_event = function(ev, stack, attach){
+
+	var x_start = _getX(ev, false, this._step);
+	var x_end = _getX(ev, true, this._step);
+
+	var hb = scheduler.xy.bar_height;
+	var y = 2+stack*hb; 
+					
+				
+	var cs = scheduler.templates.event_class(ev.start_date,ev.end_date,ev);
+	cs = "dhx_cal_event_line "+(cs||"");
+		
+	var html='<div event_id="'+ev.id+'" class="'+cs+'" style="position:absolute; top:'+y+'px; left:'+x_start+'px; width:'+Math.max(0,x_end-x_start)+'px;'+(ev._text_style||"")+'">'+scheduler.templates.event_bar_text(ev.start_date,ev.end_date,ev)+'</div>';
+	
+	if (!attach) 
+		return html;
+	else {
+		var d = document.createElement("DIV");
+		d.innerHTML = html;
+		
+		var ind = this.order[ev[this.y_property]];
+		var parent = scheduler._els["dhx_cal_data"][0].firstChild.rows[ind].cells[1].firstChild;
+		
+		scheduler._rendered.push(d.firstChild);
+		parent.appendChild(d.firstChild);
+	}
+
+};
+	
+function trace_events(){
+	//minimize event set
+	var evs = scheduler.getEvents(scheduler._min_date, scheduler._max_date);
+	var matrix =[];
+	for (var i=0; i < this.y_unit.length; i++) 
+		matrix[i]=[];
+	
+		
+	//next code defines row for undefined key
+	//most possible it is an artifact of incorrect configuration
+	if (!matrix[y])
+		matrix[y]=[];
+	
+	for (var i=0; i < evs.length; i++) {
+		var y = this.order[evs[i][this.y_property]];
+		var x = 0; 
+		while (this._trace_x[x+1] && evs[i].start_date>=this._trace_x[x+1]) x++;
+		while (this._trace_x[x] && evs[i].end_date>this._trace_x[x]) {
+			if (!matrix[y][x]) matrix[y][x]=[];
+			matrix[y][x].push(evs[i]);
+			x++;
+		}
+	}
+	return matrix;
+}
+
+// function used to get X (both start and end) coordinates for timeline bar view
+function _getX(ev, isEndPoint, step) {
+	var x = 0;
+	var date = (isEndPoint) ? ev.end_date : ev.start_date;
+	if(date.valueOf()>scheduler._max_date.valueOf())
+		date = scheduler._max_date;
+	var delta = date - scheduler._min_date_timeline;
+	if (delta<0) {
+		column_offset = 0;
+	} else {
+		var index = Math.round( delta/(step*scheduler._cols[0]) ); // results varies ~0.9 - ~24.17, e.g. that way we get 1 and 24
+		if(index>scheduler._cols.length) // if columns really small it's possible to get incorrect index
+			index = scheduler._cols.length;
+		for (var k=0; k<index; k++) {
+			x += scheduler._cols[k];
+		}
+		var column_date = scheduler.date.add(scheduler._min_date_timeline, scheduler.matrix[scheduler._mode].x_step*index, scheduler.matrix[scheduler._mode].x_unit);
+		delta = date - column_date;
+		var column_offset = Math.floor(delta/step);
+	}
+	x += (isEndPoint) ? column_offset-14 : column_offset+1;
+	return x;
+}
+	
+
+function y_scale(d){ 
+
+	var html = "<table style='table-layout:fixed;' cellspacing='0' cellpadding='0'>";
+	var evs=[];
+	if (scheduler._load_mode && scheduler._load()) return;
+	if (this.render == "cell")
+		evs = trace_events.call(this);
+	else {
+		var tevs = scheduler.getEvents(scheduler._min_date, scheduler._max_date);
+		for (var j=0; j<tevs.length; j++){
+			var ind =  this.order[ tevs[j][this.y_property] ];
+			if (!evs[ind]) evs[ind] = [];
+			evs[ind].push(tevs[j]);
+		}
+	}
+		
+	var summ = 0; 
+	for (var i=0; i < scheduler._cols.length; i++)
+		summ+=scheduler._cols[i];
+		
+	var step = new Date();
+	step = (scheduler.date.add(step, this.x_step*this.x_size, this.x_unit)-step)/summ;
+	
+	this._step = step;
+	this._summ = summ;
+	
+	var heights = scheduler._colsS.heights=[]; 
+	
+	
+	for (var i=0; i<this.y_unit.length; i++){
+		
+		var stats = this._logic(this.render, this.y_unit[i], this); // obj with custom style
+		
+		scheduler._merge(stats, {
+			height: this.dy
+		});
+		
+		//autosize height, if we have a free space
+		if(this.section_autoheight) {
+			if (this.y_unit.length * stats.height < d.offsetHeight) {
+				stats.height = Math.max(stats.height, Math.floor((d.offsetHeight - 1) / this.y_unit.length));
+			}
+		}	
+				
+		scheduler._merge(stats, {
+			//section 1
+			tr_className: "",
+			style_height: "height:"+stats.height+"px;",
+			style_width: "width:"+(this.dx-1)+"px;",
+			td_className: "dhx_matrix_scell "+scheduler.templates[this.name+"_scaley_class"](this.y_unit[i].key, this.y_unit[i].label, this),
+			td_content: scheduler.templates[this.name+'_scale_label'](this.y_unit[i].key, this.y_unit[i].label, this),
+			//section 2
+			summ_width: "width:"+summ+"px;",
+			//section 3
+			table_className: ''
+		});
+		
+		// section 1
+		html+="<tr class='"+stats.tr_className+"' style='"+stats.style_height+"'><td class='"+stats.td_className+"' style='"+stats.style_width+"'>"+stats.td_content+"</td>";	
+
+		if (this.render == "cell"){
+			for (var j=0; j < scheduler._cols.length; j++) {
+					html+="<td class='dhx_matrix_cell "+scheduler.templates[this.name+"_cell_class"](evs[i][j],this._trace_x[j],this.y_unit[i])+"' style='width:"+(scheduler._cols[j]-1)+"px'><div style='width:"+(scheduler._cols[j]-1)+"px'>"+scheduler.templates[this.name+"_cell_value"](evs[i][j])+"<div></td>";
+			}
+		} else {
+			//section 2
+			html+="<td><div style='"+stats.summ_width+" "+stats.style_height+" position:relative;' class='dhx_matrix_line'>";
+
+			if (evs[i]){
+				evs[i].sort(function(a,b){ return a.start_date>b.start_date?1:-1; });
+				var stack=[]; 
+				for (var j=0; j<evs[i].length; j++){
+					var ev = evs[i][j];
+
+					//get line in stack
+					var stack_pointer = 0;
+					
+					while (stack[stack_pointer] && stack[stack_pointer].end_date > ev.start_date)
+						stack_pointer++;
+					stack[stack_pointer]=ev;
+					//render line
+					
+					html+=scheduler.render_timeline_event.call(this, ev, stack_pointer);
+				}
+			}
+			//section 3
+				html+="<table class='"+stats.table_className+"' cellpadding='0' cellspacing='0' style='"+stats.summ_width+" "+stats.style_height+"' >";
+			for (var j=0; j < scheduler._cols.length; j++)
+				html+="<td class='dhx_matrix_cell "+scheduler.templates[this.name+"_cell_class"](evs[i],this._trace_x[j],this.y_unit[i])+"' style='width:"+(scheduler._cols[j]-1)+"px'><div style='width:"+(scheduler._cols[j]-1)+"px'><div></td>";
+			html+="</table>";			
+			html+="</div></td>";	
+		}
+		html+="</tr>";
+	}
+	html += "</table>";
+	this._matrix = evs;
+	d.scrollTop = 0; //fix flickering in FF
+	d.innerHTML = html;
+	
+	scheduler._rendered = [];
+	var divs = document.getElementsByTagName("DIV");
+	for (var i=0; i < divs.length; i++)
+		if (divs[i].getAttribute("event_id"))
+			scheduler._rendered.push(divs[i]);
+			
+	for (var i=0; i < d.firstChild.rows.length; i++)
+		heights.push(d.firstChild.rows[i].offsetHeight); 
+	
+}
+function x_scale(h){
+	h.innerHTML = "<div></div>"; h=h.firstChild;
+	
+	scheduler._cols=[];	//store for data section
+	scheduler._colsS={height:0};
+	this._trace_x =[];
+	
+	scheduler._min_date_timeline = scheduler._min_date; 
+		
+	var start = scheduler._min_date;
+	var summ = scheduler._x-this.dx-18; //border delta
+
+	var left = this.dx;
+	
+	for (var i=0; i<this.x_size; i++){
+		scheduler._cols[i]=Math.floor(summ/(this.x_size-i));
+		this._trace_x[i]=new Date(start);
+		
+		scheduler._render_x_header(i, left, start, h);
+		
+		var cs = scheduler.templates[this.name+"_scalex_class"](start);
+		if (cs)	
+			h.lastChild.className += " "+cs;
+			
+		start = scheduler.date.add(start, this.x_step, this.x_unit);
+		
+		summ-=scheduler._cols[i];
+		left+=scheduler._cols[i];
+	}
+	
+	var trace = this._trace_x;
+	h.onclick = function(e){
+		var pos = locate_hcell(e);
+		if (pos)
+			scheduler.callEvent("onXScaleClick",[pos.x, trace[pos.x], e||event]);
+	};
+	h.ondblclick = function(e){
+		var pos = locate_hcell(e);
+		if (pos)
+			scheduler.callEvent("onXScaleDblClick",[pos.x, trace[pos.x], e||event]);
+	};
+}
+function set_full_view(mode){
+	if (mode){	
+		scheduler.set_sizes();
+		_init_matrix_tooltip();
+		//we need to have day-rounded scales for navigation
+		//in same time, during rendering scales may be shifted
+		var temp = scheduler._min_date;
+			x_scale.call(this,scheduler._els["dhx_cal_header"][0]);
+			y_scale.call(this,scheduler._els["dhx_cal_data"][0]);
+		scheduler._min_date = temp;
+		scheduler._els["dhx_cal_date"][0].innerHTML=scheduler.templates[this.name+"_date"](scheduler._min_date, scheduler._max_date);
+		scheduler._table_view=true;
+	}
+}
+
+
+function hideToolTip(){ 
+	if (scheduler._tooltip){
+		scheduler._tooltip.style.display = "none";
+		scheduler._tooltip.date = "";
+	}
+}
+function showToolTip(obj,pos,offset){ 
+	if (obj.render != "cell") return;
+	var mark = pos.x+"_"+pos.y;		
+	var evs = obj._matrix[pos.y][pos.x];
+	
+	if (!evs) return hideToolTip();
+	
+	evs.sort(function(a,b){ return a.start_date>b.start_date?1:-1; });
+
+	if (scheduler._tooltip){
+		if (scheduler._tooltip.date == mark) return;
+		scheduler._tooltip.innerHTML="";
+	} else {
+		var t = scheduler._tooltip = document.createElement("DIV");
+		t.className = "dhx_tooltip";
+		document.body.appendChild(t);
+		t.onclick = scheduler._click.dhx_cal_data;
+	}
+	
+	var html = "";
+   
+	for (var i=0; i<evs.length; i++){
+		html+="<div class='dhx_tooltip_line' event_id='"+evs[i].id+"'>";
+		html+="<div class='dhx_tooltip_date'>"+(evs[i]._timed?scheduler.templates.event_date(evs[i].start_date):"")+"</div>";
+		html+="<div class='dhx_event_icon icon_details'>&nbsp;</div>";
+		html+=scheduler.templates[obj.name+"_tooltip"](evs[i].start_date, evs[i].end_date,evs[i])+"</div>";
+   }
+   
+	scheduler._tooltip.style.display="";   
+	scheduler._tooltip.style.top = "0px";
+   
+	if (document.body.offsetWidth-offset.left-scheduler._tooltip.offsetWidth < 0)
+		scheduler._tooltip.style.left = offset.left-scheduler._tooltip.offsetWidth+"px";
+	else
+		scheduler._tooltip.style.left = offset.left+pos.src.offsetWidth+"px";
+      
+	scheduler._tooltip.date = mark;
+	scheduler._tooltip.innerHTML = html;
+   
+	if (document.body.offsetHeight-offset.top-scheduler._tooltip.offsetHeight < 0)
+		scheduler._tooltip.style.top= offset.top-scheduler._tooltip.offsetHeight+pos.src.offsetHeight+"px";
+	else
+		scheduler._tooltip.style.top= offset.top+"px";
+}
+
+function _init_matrix_tooltip(){
+	dhtmlxEvent(scheduler._els["dhx_cal_data"][0], "mouseover", function(e){
+		var obj = scheduler.matrix[scheduler._mode];
+		if (obj){
+			var pos = scheduler._locate_cell_timeline(e);
+			var e = e || event;
+			var src = e.target||e.srcElement;
+			if (pos)
+				return showToolTip(obj,pos,getOffset(pos.src));
+		}
+		hideToolTip();
+	});
+   _init_matrix_tooltip=function(){};
+}
+
+scheduler.renderMatrix = function(mode){
+	var start_date = scheduler.date[this.name+"_start"](scheduler._date);
+	scheduler._min_date = scheduler.date.add(start_date, this.x_start*this.x_step, this.x_unit);
+	scheduler._max_date = scheduler.date.add(scheduler._min_date, this.x_size*this.x_step, this.x_unit);
+	scheduler._table_view = true;
+	set_full_view.call(this,mode);
+};
+
+function html_index(el) {
+	var p = el.parentNode.childNodes;
+	for (var i=0; i < p.length; i++) 
+		if (p[i] == el) return i;
+	return -1;
+}
+function locate_hcell(e){
+	e = e||event;
+	var trg = e.target?e.target:e.srcElement;
+	while (trg && trg.tagName != "DIV")
+		trg=trg.parentNode;
+	if (trg && trg.tagName == "DIV"){
+		var cs = trg.className.split(" ")[0];
+		if (cs == "dhx_scale_bar")
+			return { x:html_index(trg), y:-1, src:trg, scale:true };
+	}
+}
+scheduler._locate_cell_timeline = function(e){
+	e = e||event;
+	var trg = e.target?e.target:e.srcElement;
+	while (trg && trg.tagName != "TD")
+		trg=trg.parentNode;
+	if (trg && trg.tagName == "TD"){
+		var cs = trg.className.split(" ")[0];
+		if (cs == "dhx_matrix_cell") {
+		
+			if(scheduler._isRender("cell")) {
+				return { x:trg.cellIndex-1, y:trg.parentNode.rowIndex, src:trg };
+                        } else { // probably desired path for all modes except cell
+				var trscell = trg.parentNode; // moving out from current td
+				while(trscell && trscell.tagName != "TD") { 
+					trscell=trscell.parentNode;
+				}
+				return { x:trg.cellIndex, y:trscell.parentNode.rowIndex, src:trg };
+			}
+		}
+		else if (cs == "dhx_matrix_scell")
+			return { x:-1, y:trg.parentNode.rowIndex, src:trg, scale:true };
+	}
+	return false;
+};
+
+var old_click = scheduler._click.dhx_cal_data;
+scheduler._click.dhx_cal_data = function(e){
+	var ret = old_click.apply(this,arguments);
+	var obj = scheduler.matrix[scheduler._mode];
+	if (obj){
+		var pos = scheduler._locate_cell_timeline(e);
+		if (pos){
+			if (pos.scale)
+				scheduler.callEvent("onYScaleClick",[pos.y, obj.y_unit[pos.y], e||event]);
+			else
+				scheduler.callEvent("onCellClick",[pos.x, pos.y, obj._trace_x[pos.x], (((obj._matrix[pos.y]||{})[pos.x])||[]), e||event]);
+		}
+	}
+	return ret;
+};
+
+scheduler.dblclick_dhx_matrix_cell = function(e){
+	var obj = scheduler.matrix[scheduler._mode];
+	if (obj){
+		var pos = scheduler._locate_cell_timeline(e);
+		if (pos){
+			if (pos.scale)
+				scheduler.callEvent("onYScaleDblClick",[pos.y, obj.y_unit[pos.y], e||event]);
+			else
+				scheduler.callEvent("onCellDblClick",[pos.x, pos.y, obj._trace_x[pos.x], (((obj._matrix[pos.y]||{})[pos.x])||[]), e||event]);
+		}
+	}
+};
+scheduler.dblclick_dhx_matrix_scell = function(e){
+	return scheduler.dblclick_dhx_matrix_cell(e);
+};
+
+scheduler._isRender = function(mode){
+	return (scheduler.matrix[scheduler._mode] && scheduler.matrix[scheduler._mode].render == mode);
+};
+
+scheduler.attachEvent("onCellDblClick", function (x, y, a, b, event){
+	if (this.config.readonly|| (event.type == "dblclick" && !this.config.dblclick_create)) return;
+	
+	var obj = scheduler.matrix[scheduler._mode];
+	var event_options = {};
+	event_options['start_date'] = obj._trace_x[x];
+	event_options['end_date'] = (obj._trace_x[x+1]) ? obj._trace_x[x+1] : scheduler.date.add(obj._trace_x[x], obj.x_step, obj.x_unit);
+	event_options[scheduler.matrix[scheduler._mode].y_property] = obj.y_unit[y].key;
+	scheduler.addEventNow(event_options, null, event);
+});	
+
+scheduler.attachEvent("onBeforeDrag", function (event_id, mode, native_event_object){
+	if(scheduler._isRender("cell")) {
+		return false;
+	}
+	return true;
+});	
+
+})();
\ No newline at end of file
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/sources/ext/ext_minical.js b/addons/base_calendar/static/lib/dhtmlxScheduler/sources/ext/ext_minical.js
new file mode 100644
index 00000000000..d978ec53bb8
--- /dev/null
+++ b/addons/base_calendar/static/lib/dhtmlxScheduler/sources/ext/ext_minical.js
@@ -0,0 +1,378 @@
+scheduler.templates.calendar_month =  scheduler.date.date_to_str("%F %Y");
+scheduler.templates.calendar_scale_date =  scheduler.date.date_to_str("%D");
+scheduler.templates.calendar_date =  scheduler.date.date_to_str("%d");
+
+
+scheduler.renderCalendar=function(obj, _prev){
+	var cal = null;
+	var date = obj.date||(new Date());
+	if (typeof date == "string")
+		date = this.templates.api_date(date);	
+		
+	if (!_prev){
+		var cont = obj.container;
+		var pos  = obj.position;
+		
+		
+		if (typeof cont == "string")
+			cont = document.getElementById(cont);
+	
+		if (typeof pos == "string")
+			pos = document.getElementById(pos);
+		if (pos && (typeof pos.left == "undefined")){
+			var tpos = getOffset(pos);
+			pos = { 
+				top:tpos.top + pos.offsetHeight,
+				left:tpos.left
+			};
+		};
+		if (!cont)
+			cont = scheduler._get_def_cont(pos);
+			
+		cal = this._render_calendar(cont,date,obj);
+		cal.onclick = function(e){
+			e = e||event;
+			var src = e.target||e.srcElement;
+			
+			if (src.className.indexOf("dhx_month_head")!=-1){
+				var pname = src.parentNode.className;
+				if (pname.indexOf("dhx_after")==-1 && pname.indexOf("dhx_before")==-1) {
+					var newdate = scheduler.templates.xml_date(this.getAttribute("date"));
+					newdate.setDate(parseInt(src.innerHTML,10));
+					scheduler.unmarkCalendar(this);
+					scheduler.markCalendar(this,newdate,"dhx_calendar_click");
+					this._last_date=newdate;
+					if (this.conf.handler) this.conf.handler.call(scheduler, newdate, this);
+				}
+			}
+		};
+	} else {
+		cal = this._render_calendar(_prev.parentNode, date, obj, _prev);
+		scheduler.unmarkCalendar(cal);
+	}
+		
+	
+	var start = scheduler.date.month_start(date);
+	var end   = scheduler.date.add(start,1,"month");
+	var evs = this.getEvents(start,end);
+	for (var i=0; i < evs.length; i++){
+		var ev = evs[i];
+		var d = ev.start_date;
+		if (d.valueOf()<start.valueOf()) 
+			d = start;
+		while (d<=ev.end_date){
+			this.markCalendar(cal,d,"dhx_year_event");
+			d = this.date.add(d,1,"day");
+			if (d.valueOf()>=end.valueOf()) 
+				break;
+		}
+	}
+	
+
+	
+	cal.conf = obj;
+	return cal;
+};
+scheduler._get_def_cont = function(pos){
+	if (!this._def_count){
+		this._def_count = document.createElement("DIV");
+		this._def_count.style.cssText = "position:absolute;z-index:10100;width:251px; height:175px;";
+		this._def_count.onclick = function(e){ (e||event).cancelBubble = true; };
+		document.body.appendChild(this._def_count);
+	}
+		
+	this._def_count.style.left = pos.left+"px";
+	this._def_count.style.top  = pos.top+"px";
+	this._def_count._created = new Date();
+	
+	return this._def_count;
+};
+scheduler._locateCalendar=function(cal,date){
+	var table=cal.childNodes[2].childNodes[0];
+	if (typeof date == "string")
+		date = scheduler.templates.api_date(date);
+		
+	var d  = cal.week_start+date.getDate()-1;
+	return table.rows[Math.floor(d/7)].cells[d%7].firstChild;
+};
+scheduler.markCalendar=function(cal,date,css){
+	this._locateCalendar(cal,date).className+=" "+css;
+};
+scheduler.unmarkCalendar=function(cal,date,css){
+	date=date||cal._last_date;
+	css=css||"dhx_calendar_click";
+	if (!date) return;
+	var el = this._locateCalendar(cal,date);
+	el.className= (el.className||"").replace(RegExp(css,"g"));
+};
+scheduler._week_template=function(width){
+	var summ = (width || 250);
+	var left = 0;
+
+	var week_template = document.createElement("div");
+	var dummy_date = this.date.week_start(new Date());
+	for (var i=0; i<7; i++){
+		this._cols[i]=Math.floor(summ/(7-i));
+		this._render_x_header(i,left,dummy_date,week_template);
+		dummy_date = this.date.add(dummy_date,1,"day");
+		summ-=this._cols[i];
+		left+=this._cols[i];
+	}
+	week_template.lastChild.className+=" dhx_scale_bar_last";
+	return week_template;
+};
+scheduler.updateCalendar=function(obj,sd){
+	obj.conf.date = sd;
+	this.renderCalendar(obj.conf, obj);
+};
+scheduler._mini_cal_arrows = ["&nbsp", "&nbsp"];
+scheduler._render_calendar=function(obj,sd,conf, previous){
+	/*store*/ 
+		var ts = scheduler.templates;
+		var temp = this._cols; this._cols=[]; 
+		var temp2 = this._mode; this._mode = "calendar"; 
+		var temp3 = this._colsS; this._colsS = {height:0};
+		var temp4 = new Date(this._min_date); 
+		var temp5 = new Date(this._max_date); 
+		var temp6 = new Date(scheduler._date);
+		var temp7 = ts.month_day; ts.month_day=ts.calendar_date;
+		
+	
+	sd = this.date.month_start(sd);
+	var week_template = this._week_template(obj.offsetWidth-1);
+	
+	var d;
+	if (previous)
+		d = previous;
+	else {
+		var d = document.createElement("DIV");
+		d.className="dhx_cal_container dhx_mini_calendar";
+	}
+	d.setAttribute("date",this.templates.xml_format(sd));
+	d.innerHTML="<div class='dhx_year_month'></div><div class='dhx_year_week'>"+week_template.innerHTML+"</div><div class='dhx_year_body'></div>";
+	
+	d.childNodes[0].innerHTML=this.templates.calendar_month(sd);
+	if (conf.navigation){
+	var arrow = document.createElement("DIV");				
+		arrow.className = "dhx_cal_prev_button";
+		arrow.style.cssText="left:1px;top:2px;position:absolute;";
+		arrow.innerHTML = this._mini_cal_arrows[0];
+		d.firstChild.appendChild(arrow);
+		arrow.onclick=function(){
+			scheduler.updateCalendar(d, scheduler.date.add(d._date, -1, "month"));
+		};
+		
+		arrow = document.createElement("DIV");
+		arrow.className = "dhx_cal_next_button";
+		arrow.style.cssText="left:auto; right:1px;top:2px;position:absolute;";
+		arrow.innerHTML = this._mini_cal_arrows[1];
+		d.firstChild.appendChild(arrow);
+		arrow.onclick=function(){
+			scheduler.updateCalendar(d, scheduler.date.add(d._date, 1, "month"));
+		};
+		d._date = new Date(sd);
+	}
+	
+	d.week_start = (sd.getDay()-(this.config.start_on_monday?1:0)+7)%7;
+	
+	var dd = this.date.week_start(sd);
+	this._reset_month_scale(d.childNodes[2],sd,dd);
+	
+	var r=d.childNodes[2].firstChild.rows;
+	for (var k=r.length; k<6; k++) {
+		r[0].parentNode.appendChild(r[0].cloneNode(true));
+		for (var ri=0; ri < r[k].childNodes.length; ri++) {
+		   r[k].childNodes[ri].className = "dhx_after";
+		};
+	}
+	
+	if (!previous)
+		obj.appendChild(d);
+	
+	/*restore*/ this._cols=temp; this._mode = temp2; this._colsS = temp3; this._min_date=temp4; this._max_date=temp5; scheduler._date = temp6; ts.month_day=temp7;
+	return d;
+};
+scheduler.destroyCalendar=function(cal,force){
+	if (!cal && this._def_count && this._def_count.firstChild){
+		if (force || (new Date()).valueOf() - this._def_count._created.valueOf() > 500)
+			cal  = this._def_count.firstChild;
+	}
+	if (!cal) return;
+	cal.onclick=null;
+	cal.innerHTML="";
+	if (cal.parentNode)
+		cal.parentNode.removeChild(cal);
+	if (this._def_count)
+		this._def_count.style.top = "-1000px";
+};
+scheduler.isCalendarVisible=function(){
+	if (this._def_count && parseInt(this._def_count.style.top,10) > 0 )
+		return this._def_count;
+	return false;
+};
+scheduler.attachEvent("onTemplatesReady",function(){
+	dhtmlxEvent(document.body, "click", function(){ scheduler.destroyCalendar(); });
+});
+
+scheduler.templates.calendar_time = scheduler.date.date_to_str("%d-%m-%Y");
+
+scheduler.form_blocks.calendar_time={
+	render:function(){
+		var html = "<input class='dhx_readonly' type='text' readonly='true'>";
+		
+		var cfg = scheduler.config;
+		var dt = this.date.date_part(new Date());
+		if (cfg.first_hour)
+			dt.setHours(cfg.first_hour);
+			
+		html+=" <select>";
+		for (var i=60*cfg.first_hour; i<60*cfg.last_hour; i+=this.config.time_step*1){
+			var time=this.templates.time_picker(dt);
+			html+="<option value='"+i+"'>"+time+"</option>";
+			dt=this.date.add(dt,this.config.time_step,"minute");
+		}
+		html+="</select>";
+		
+		var full_day = scheduler.config.full_day;
+		
+		return "<div style='height:30px; padding-top:0px; font-size:inherit;' class='dhx_cal_lsection dhx_section_time'>"+html+"<span style='font-weight:normal; font-size:10pt;'> &nbsp;&ndash;&nbsp; </span>"+html+"</div>";
+	},
+	set_value:function(node,value,ev){
+	
+		var inputs=node.getElementsByTagName("input");	
+		var selects=node.getElementsByTagName("select");
+		
+		var _init_once = function(inp,date,number){
+			inp.onclick = function(){
+				scheduler.destroyCalendar(null, true);
+				scheduler.renderCalendar({
+					position:inp, 
+					date:new Date(this._date),
+					navigation:true,
+					handler:function(new_date){
+						inp.value = scheduler.templates.calendar_time(new_date);
+						inp._date = new Date(new_date);
+						scheduler.destroyCalendar();
+						if(scheduler.config.event_duration && number == 0) { //first element = start date
+							_update_minical_select();
+						}
+					}
+				});
+			};
+		};	
+		
+		if(scheduler.config.full_day) {
+			if (!node._full_day){
+				node.previousSibling.innerHTML+="<div class='dhx_fullday_checkbox'><label><input type='checkbox' name='full_day' value='true'> "+scheduler.locale.labels.full_day+"&nbsp;</label></input></div>";
+				node._full_day=true;
+			}
+			var input=node.previousSibling.getElementsByTagName("input")[0];
+			
+			var isFulldayEvent = (scheduler.date.time_part(ev.start_date)==0 && scheduler.date.time_part(ev.end_date)==0 && ev.end_date.valueOf()-ev.start_date.valueOf() < 2*24*60*60*1000);
+			input.checked = isFulldayEvent;
+			for(var i in selects)
+				selects[i].disabled=input.checked;			
+			for(var i=0; i<inputs.length-1; i++)  //last input = checkbox
+				inputs[i].disabled=input.checked;	
+				
+			input.onclick = function(){ 
+				if(input.checked == true) {
+					var start_date = new Date(ev.start_date);
+					var end_date = new Date(ev.end_date);
+
+					scheduler.date.date_part(start_date);
+					end_date = scheduler.date.add(start_date, 1, "day");		
+				}
+				
+				var start = start_date||ev.start_date;
+				var end = end_date||ev.end_date;
+				_attach_action(inputs[0],start);
+				_attach_action(inputs[1],end);
+				selects[0].value=start.getHours()*60+start.getMinutes();
+				selects[1].value=end.getHours()*60+end.getMinutes();	
+				
+				for(var i in selects)
+					selects[i].disabled=input.checked;
+				for(var i=0; i<inputs.length-1; i++)  //last input = checkbox
+					inputs[i].disabled=input.checked;	
+				
+			};
+		};
+		
+		if(scheduler.config.event_duration) {
+			
+			function _update_minical_select() {
+				ev.start_date = scheduler.date.add(inputs[0]._date, selects[0].value, "minute");
+				ev.end_date.setTime(ev.start_date.getTime() + (scheduler.config.event_duration * 60 * 1000));
+				
+				inputs[1].value = scheduler.templates.calendar_time(ev.end_date);
+				inputs[1]._date = scheduler.date.date_part(new Date(ev.end_date));	
+
+				selects[1].value=ev.end_date.getHours()*60+ev.end_date.getMinutes();				
+			}
+			
+			for(var i in selects)
+				selects[i].onchange = _update_minical_select;
+		}
+	
+		function _attach_action(inp, date, number){
+			_init_once(inp,date,number);
+			inp.value = scheduler.templates.calendar_time(date);
+			inp._date = scheduler.date.date_part(new Date(date));
+		};
+
+		_attach_action(inputs[0],ev.start_date, 0);
+		_attach_action(inputs[1],ev.end_date, 1);
+		_init_once = function(){};
+			
+		selects[0].value=ev.start_date.getHours()*60+ev.start_date.getMinutes();
+		selects[1].value=ev.end_date.getHours()*60+ev.end_date.getMinutes();
+		
+	},
+	get_value:function(node,ev){
+		var inputs = node.getElementsByTagName("input");
+		var selects = node.getElementsByTagName("select");		
+		
+		ev.start_date = scheduler.date.add(inputs[0]._date, selects[0].value, "minute");
+		ev.end_date = scheduler.date.add(inputs[1]._date, selects[1].value, "minute");
+		
+		if (ev.end_date<=ev.start_date) 
+			ev.end_date=scheduler.date.add(ev.start_date,scheduler.config.time_step,"minute");
+	},
+	focus:function(node){
+	}
+};
+scheduler.linkCalendar=function(calendar, datediff){
+	var action = function(){
+		var date = scheduler._date;
+		var mode = scheduler._mode;
+		
+		var dateNew = new Date(date.valueOf());
+		if (datediff) dateNew = datediff(dateNew);
+		dateNew.setDate(1);
+		scheduler.updateCalendar(calendar, dateNew);
+		
+		if (!datediff){
+			if (mode == 'day') {
+				scheduler.markCalendar(calendar,date, "dhx_calendar_click");
+			} else if (mode == 'week') {
+				dateNew = scheduler.date.week_start(new Date(date.valueOf()));
+				for (i = 0; i < 7; i++) {
+					var diff = dateNew.getMonth() + dateNew.getYear()*12 - date.getMonth() - date.getYear()*12;
+					if (diff && diff>0)
+						continue;
+					scheduler.markCalendar(calendar, dateNew, "dhx_calendar_click");
+					dateNew = scheduler.date.add(dateNew,1,"day");					
+				}
+			}
+		}
+		return true;
+	};
+	
+	scheduler.attachEvent("onViewChange", action);
+	scheduler.attachEvent("onXLE", action);
+	scheduler.attachEvent("onEventAdded", action);
+	scheduler.attachEvent("onEventChanged", action);
+	scheduler.attachEvent("onAfterEventDelete", action);
+	action();
+};
\ No newline at end of file
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/sources/ext/ext_monthheight.js b/addons/base_calendar/static/lib/dhtmlxScheduler/sources/ext/ext_monthheight.js
new file mode 100644
index 00000000000..52060ffdde4
--- /dev/null
+++ b/addons/base_calendar/static/lib/dhtmlxScheduler/sources/ext/ext_monthheight.js
@@ -0,0 +1,27 @@
+scheduler.attachEvent("onTemplatesReady",function(){
+	scheduler.xy.scroll_width = 0;
+	
+	var old = scheduler.render_view_data;
+	scheduler.render_view_data=function(){
+		var data = this._els["dhx_cal_data"][0];
+		data.firstChild._h_fix = true;
+		
+		old.apply(scheduler,arguments);
+		
+		
+		
+		var height = parseInt(data.style.height);
+		data.style.height="1px";
+		data.style.height=data.scrollHeight+"px";
+		
+		this._obj.style.height = this._obj.clientHeight + data.scrollHeight - height + "px";
+	}
+	
+	var old_s=scheduler._reset_month_scale;
+	scheduler._reset_month_scale=function(a,b,c){
+		var dummy = {clientHeight:100};
+		old_s.apply(scheduler,[dummy,b,c]);
+		a.innerHTML = dummy.innerHTML;
+	}
+	
+});
\ No newline at end of file
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/sources/ext/ext_multiselect.js b/addons/base_calendar/static/lib/dhtmlxScheduler/sources/ext/ext_multiselect.js
new file mode 100644
index 00000000000..98b14168996
--- /dev/null
+++ b/addons/base_calendar/static/lib/dhtmlxScheduler/sources/ext/ext_multiselect.js
@@ -0,0 +1,63 @@
+scheduler.form_blocks["multiselect"]={
+	render:function(sns) {
+		var _result = "<div class='dhx_multi_select_"+sns.name+"' style='overflow: auto; height: "+sns.height+"px; position: relative;' >";
+		for (var i=0; i<sns.options.length; i++) {
+			_result += "<label><input type='checkbox' value='"+sns.options[i].key+"'/>"+sns.options[i].label+"</label>";
+			if(convertStringToBoolean(sns.vertical)) _result += '<br/>';
+		}
+		_result += "</div>";
+		return _result;
+	},
+	set_value:function(node,value,ev,config){
+		
+		var _children = node.getElementsByTagName('input');
+		for(var i=0;i<_children.length;i++) {
+			_children[i].checked = false; //unchecking all inputs on the form
+		}
+		
+		function _mark_inputs(ids) { // ids = [ 0: undefined, 1: undefined, 2: true ... ]
+			var _children = node.getElementsByTagName('input');
+			for(var i=0;i<_children.length; i++) {
+				_children[i].checked = !! ids[_children[i].value];
+			}			
+		}
+		
+		if(!scheduler._new_event) { // if it is a new event - new to get saved options
+			var _ids = [];
+			if(ev[config.map_to]) {
+				var results = ev[config.map_to].split(',');
+				for(var i=0;i<results.length;i++){
+					_ids[results[i]] = true;
+				}
+				_mark_inputs(_ids);
+			}
+			else {
+				var divLoading = document.createElement('div');
+				divLoading.className='dhx_loading';
+				divLoading.style.cssText = "position: absolute; top: 40%; left: 40%;";
+				node.appendChild(divLoading);
+				dhtmlxAjax.get(config.script_url+'?dhx_crosslink_'+config.map_to+'='+ev.id+'&uid='+scheduler.uid(), function(loader) {
+					var _result = loader.doXPath("//data/item");
+					var _ids = [];
+					for(var i=0;i<_result.length;i++){ 
+						_ids[_result[i].getAttribute(config.map_to)] = true;
+					}
+					_mark_inputs(_ids);
+					node.removeChild(divLoading);
+				});
+			}
+		}
+	},
+	get_value:function(node,ev,config){
+		var _result = [];
+		var _children = node.getElementsByTagName("input");
+		for(var i=0;i<_children.length;i++) {
+			if(_children[i].checked)
+				_result.push(_children[i].value); 
+		}
+		return _result.join(','); 
+	},
+	
+	focus:function(node){
+	}
+};
\ No newline at end of file
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/sources/ext/ext_multisource.js b/addons/base_calendar/static/lib/dhtmlxScheduler/sources/ext/ext_multisource.js
new file mode 100644
index 00000000000..0773d264e2c
--- /dev/null
+++ b/addons/base_calendar/static/lib/dhtmlxScheduler/sources/ext/ext_multisource.js
@@ -0,0 +1,22 @@
+(function(){
+
+	function backup(obj){
+		var t = function(){};
+		t.prototype = obj;
+		return t;
+	}
+
+	var old = scheduler._load;
+	scheduler._load=function(url,from){
+		url=url||this._load_url;
+		if (typeof url == "object"){
+			var t = backup(this._loaded);
+			for (var i=0; i < url.length; i++) {
+				this._loaded=new t();
+				old.call(this,url[i],from);
+			}
+		} else 
+			old.apply(this,arguments);
+	}
+	
+})();
\ No newline at end of file
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/sources/ext/ext_outerdrag.js b/addons/base_calendar/static/lib/dhtmlxScheduler/sources/ext/ext_outerdrag.js
new file mode 100644
index 00000000000..f247f687b6d
--- /dev/null
+++ b/addons/base_calendar/static/lib/dhtmlxScheduler/sources/ext/ext_outerdrag.js
@@ -0,0 +1,38 @@
+//lame old code doesn't provide raw event object
+		scheduler.attachEvent("onTemplatesReady", function(){
+		
+			var dragger = (new dhtmlDragAndDropObject());
+			var old = dragger.stopDrag;
+			var last_event;
+			dragger.stopDrag = function(e){
+				last_event = e||event;
+				return old.apply(this, arguments);
+			};
+			dragger.addDragLanding(scheduler._els["dhx_cal_data"][0],{
+				_drag:function(sourceHtmlObject,dhtmlObject,targetHtmlObject){
+					
+					var temp = scheduler.attachEvent("onEventCreated", function(id,e){
+						if (!scheduler.callEvent("onExternalDragIn", [id, sourceHtmlObject, e])){
+							this._drag_mode = this._drag_id = null;
+							this.deleteEvent(id);
+						}
+					});
+					
+					if (scheduler.matrix[scheduler._mode])	
+						scheduler.dblclick_dhx_matrix_cell(last_event);
+					else
+						scheduler._on_dbl_click(last_event);
+						
+					scheduler.detachEvent(temp);
+					
+					
+				},
+				_dragIn:function(htmlObject,shtmlObject){
+					return htmlObject;
+				},
+				_dragOut:function(htmlObject){
+					return this;
+				}
+			});
+		
+		});
\ No newline at end of file
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/sources/ext/ext_pdf.js b/addons/base_calendar/static/lib/dhtmlxScheduler/sources/ext/ext_pdf.js
new file mode 100644
index 00000000000..6ac655aa80f
--- /dev/null
+++ b/addons/base_calendar/static/lib/dhtmlxScheduler/sources/ext/ext_pdf.js
@@ -0,0 +1,196 @@
+scheduler.toPDF=function(url,mode,header,footer){ 
+	var dx = 0;
+	var dy = 0;
+	var colors = false;
+	if (mode == "fullcolor"){
+		colors = true;
+		mode = "color";
+	}
+		
+	mode = mode||"color";
+	
+	function x_norm(x) {
+	    x = parseFloat(x);
+	    if (isNaN(x)) return "auto";
+	    return 100 * x / dx;
+	}
+	function y_norm(y) {
+	    y = parseFloat(y);
+	    if (isNaN(y)) return "auto";
+	    return 100 * y / dy;
+	}
+	function xml_month_scale(xh){
+		var xml="";
+		for (var i = 0; i < xh.length; i++)
+			xml += "\n<column><![CDATA[" + xh[i].innerHTML + "]]></column>";
+		dx = xh[0].offsetWidth;
+		return xml;
+	}
+	function de_day(node,n){ 
+		var x = parseInt(node.style.left);
+		
+		for (var dx=0; dx < scheduler._cols.length; dx++){
+			x-=scheduler._cols[dx];
+			if (x<0) return dx;
+		}
+		return n;
+	}
+	function de_week(node,n){ 
+		var y = parseInt(node.style.top);
+		for (var dy=0; dy < scheduler._colsS.heights.length; dy++)
+			if (scheduler._colsS.heights[dy]>y) return dy;
+		return n;
+	}
+	function xml_month(yh){
+		var xml="";
+        var r = yh.firstChild.rows;
+        for (var i = 0; i < r.length; i++) {
+            var days = [];
+            for (var j = 0; j < r[i].cells.length; j++){
+            /*	var dd = r[i].cells[j];
+            	var css = dd.className;
+            	
+            	if (css!=" " && css!="dhx_now ")
+            		days.push("");
+            	else*/
+                	days.push(r[i].cells[j].firstChild.innerHTML);
+            }
+
+            xml += "\n<row height='"+yh.firstChild.rows[i].cells[0].offsetHeight+"'><![CDATA[" + days.join("|") + "]]></row>";
+            dy = yh.firstChild.rows[0].cells[0].offsetHeight;
+        }
+        return xml;
+	}
+	function xml_top(profile) {
+	    var xml = "<data profile='"+profile+"'";
+	       if (header)
+	          xml+=" header='"+header+"'";
+	       if (footer)
+	          xml+=" footer='"+footer+"'";
+	    xml+=">";
+	    xml += "<scale mode='" + scheduler._mode + "' today='" + scheduler._els.dhx_cal_date[0].innerHTML + "'>";
+	    
+	    if (scheduler._mode == "agenda"){
+	    	var xh = scheduler._els.dhx_cal_header[0].childNodes[0].childNodes;
+	    	
+	    	xml+="<column>"+xh[0].innerHTML+"</column><column>"+xh[1].innerHTML+"</column>"
+	    } else if (scheduler._mode == "year"){
+	    	var xh = scheduler._els.dhx_cal_data[0].childNodes;
+	    	for (var i=0; i < xh.length; i++) {
+	    		xml+="<month label='"+xh[i].childNodes[0].innerHTML+"'>";
+	    			xml+=xml_month_scale(xh[i].childNodes[1].childNodes);
+	    			xml+=xml_month(xh[i].childNodes[2]);
+	    		xml+="</month>";
+	    	};
+	    } else {
+		    xml += "<x>";
+		    var xh = scheduler._els.dhx_cal_header[0].childNodes;
+			xml+=xml_month_scale(xh);
+		    xml += "</x>";
+		
+		    var yh = scheduler._els.dhx_cal_data[0];
+		    if (yh.firstChild.tagName == "TABLE") {
+				xml += xml_month(yh);
+		    } else {
+				yh = yh.childNodes[yh.childNodes.length - 1];
+		        while (yh.className.indexOf("dhx_scale_holder") == -1)
+		            yh = yh.previousSibling;
+		        yh = yh.childNodes;
+		
+		        xml += "<y>";
+		        for (var i = 0; i < yh.length; i++)
+		            xml += "\n<row><![CDATA[" + yh[i].innerHTML + "]]></row>";
+		        xml += "</y>";
+		        dy = yh[0].offsetHeight;
+		    }
+		}
+		
+	    xml += "</scale>";
+	    return xml;
+	}
+	function get_style(node, style){
+		return (window.getComputedStyle?(window.getComputedStyle(node, null)[style]):(node.currentStyle?node.currentStyle[style]:null))||"";
+	}
+	function xml_body() { 
+	    var xml = "";
+	    var evs = scheduler._rendered;
+	    
+	    if (scheduler._mode == "agenda"){
+	    	for (var i=0; i < evs.length; i++)
+	    	 	xml+="<event><head>"+evs[i].childNodes[0].innerHTML+"</head><body>"+evs[i].childNodes[2].innerHTML+"</body></event>";
+	    } else if (scheduler._mode == "year"){
+	    	var evs = scheduler.get_visible_events();
+	    	for (var i=0; i < evs.length; i++) {
+	    		var d = evs[i].start_date;
+				if (d.valueOf()<scheduler._min_date.valueOf()) 
+      				d = scheduler._min_date;
+   				while (d<evs[i].end_date){
+   					var m = d.getMonth()+12*(d.getFullYear()-scheduler._min_date.getFullYear())-scheduler.week_starts._month; 
+   					var day  = scheduler.week_starts[m]+d.getDate()-1;
+
+					xml+="<event day='"+(day%7)+"' week='"+Math.floor(day/7)+"' month='"+m+"'></event>";
+     				scheduler._mark_year_date(d);
+      				d = scheduler.date.add(d,1,"day");
+      				if (d.valueOf()>=scheduler._max_date.valueOf()) 
+         				break;
+     			}
+			}   
+	    } else {
+		    for (var i = 0; i < evs.length; i++) {
+		        var zx = x_norm(evs[i].style.left);
+		        var zy = y_norm(evs[i].style.top);
+		        var zdx = x_norm(evs[i].style.width);
+		        var zdy = y_norm(evs[i].style.height);
+		        var e_type = evs[i].className.split(" ")[0].replace("dhx_cal_", "");
+		        var dets = scheduler.getEvent(evs[i].getAttribute("event_id"))
+		        var day = dets._sday;
+		        var week = dets._sweek;
+		        if (scheduler._mode != "month") {
+		           if (parseInt(evs[i].style.left) <= 26) {
+		              zx = 2;
+		              zdx += x_norm(evs[i].style.left)-1;
+		           }                   
+		            if (evs[i].parentNode == scheduler._els.dhx_cal_data[0]) continue;
+		            zx += x_norm(evs[i].parentNode.style.left);
+		            zx -= x_norm(51);
+		        } else {
+		            zdy = parseInt(evs[i].offsetHeight);
+		            zy = parseInt(evs[i].style.top) - 22;
+		            
+		            day = de_day(evs[i],day);
+		            week = de_week(evs[i],week);
+		        }
+		        
+		        xml += "\n<event week='"+week+"' day='"+day+"' type='" + e_type + "' x='" + zx + "' y='" + zy + "' width='" + zdx + "' height='" + zdy + "'>";
+		        
+		        
+		        if (e_type == "event") {
+		            xml += "<header><![CDATA[" + evs[i].childNodes[1].innerHTML + "]]></header>";
+		            var text_color = colors?get_style(evs[i].childNodes[2],"color"):"";
+		        	var bg_color = colors?get_style(evs[i].childNodes[2],"backgroundColor"):"";
+		            xml += "<body backgroundColor='"+bg_color+"' color='" + text_color + "'><![CDATA[" + evs[i].childNodes[2].innerHTML + "]]></body>";
+		        } else {
+		            var text_color = colors?get_style(evs[i],"color"):"";
+		        	var bg_color = colors?get_style(evs[i],"backgroundColor"):"";
+		            xml += "<body backgroundColor='"+bg_color+"' color='" + text_color + "'><![CDATA[" + evs[i].innerHTML + "]]></body>";
+		        }
+		        xml += "</event>";
+		    }
+	    }
+	    return xml;
+	}
+	function xml_end(){
+	    var xml = "</data>";
+	    return xml;
+	}
+	
+	var uid = (new Date()).valueOf();
+	var d=document.createElement("div");
+	d.style.display="none";
+	document.body.appendChild(d);
+
+	d.innerHTML = '<form id="'+uid+'" method="post" target="_blank" action="'+url+'" accept-charset="utf-8" enctype="text/html"><input type="hidden" name="mycoolxmlbody"/> </form>';
+	document.getElementById(uid).firstChild.value = xml_top(mode).replace("\u2013", "-") + xml_body() + xml_end();
+	document.getElementById(uid).submit();
+	d.parentNode.removeChild(d);grid = null;	
+}   
\ No newline at end of file
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/sources/ext/ext_readonly.js b/addons/base_calendar/static/lib/dhtmlxScheduler/sources/ext/ext_readonly.js
new file mode 100644
index 00000000000..b11c4fe8048
--- /dev/null
+++ b/addons/base_calendar/static/lib/dhtmlxScheduler/sources/ext/ext_readonly.js
@@ -0,0 +1,100 @@
+scheduler.attachEvent("onTemplatesReady",function(){
+   scheduler.attachEvent("onBeforeLightbox",function(id){
+      if (this.config.readonly_form || this.getEvent(id).readonly)
+         this.config.readonly_active = true;
+      else {
+         this.config.readonly_active = false;
+         return true;
+      }
+         
+      for (var i=0; i < this.config.lightbox.sections.length; i++) {
+         this.config.lightbox.sections[i].focus = false;
+      };
+      
+      return true;
+   });
+   
+	function txt_replace(tag,d,n,text){
+		var txts = d.getElementsByTagName(tag);
+		var txtt = n.getElementsByTagName(tag);
+		for (var i=txtt.length-1; i>=0; i--){
+			var n = txtt[i];
+			if (!text)
+				n.disabled = true;
+			else {
+				var t = document.createElement("SPAN");
+				t.className = "dhx_text_disabled";
+				t.innerHTML=text(txts[i]);
+				n.parentNode.insertBefore(t,n);
+				n.parentNode.removeChild(n);   
+			}
+		}
+	}
+   
+   var old = scheduler._fill_lightbox;
+   scheduler._fill_lightbox=function(){
+      var sns = this.config.lightbox.sections;
+      if (this.config.readonly_active){
+         for (var i=0; i < sns.length; i++) {
+            if (sns[i].type == 'recurring') {
+               var s = document.getElementById(sns[i].id);
+               s.style.display=s.nextSibling.style.display='none';
+               sns.splice(i,1);
+               i--;
+            }
+         };
+      }
+      
+      var res = old.apply(this,arguments);
+      if (this.config.readonly_active){
+         
+         var d = this._get_lightbox();
+         var n = this._lightbox_r = d.cloneNode(true);
+         
+         txt_replace("textarea",d,n,function(a){ return a.value; });
+         txt_replace("input",d,n,false);
+         txt_replace("select",d,n,function(a){ return a.options[Math.max((a.selectedIndex||0),0)].text; });
+            
+         n.removeChild(n.childNodes[2]);
+         n.removeChild(n.childNodes[3]);
+         
+         d.parentNode.insertBefore(n,d);
+         
+         olds.call(this,n);
+         this._lightbox = n;
+         this.setLightboxSize();
+         this._lightbox = null;
+         n.onclick=function(e){
+            var src=e?e.target:event.srcElement;
+            if (!src.className) src=src.previousSibling;
+            if (src && src.className)
+               switch(src.className){
+                  case "dhx_cancel_btn":
+                     scheduler.callEvent("onEventCancel",[scheduler._lightbox_id]);
+                     scheduler._edit_stop_event(scheduler.getEvent(scheduler._lightbox_id),false);
+                     scheduler.hide_lightbox();
+                     break;
+               }
+         };
+      }
+      return res;
+   };
+   
+	var olds = scheduler.showCover;
+	scheduler.showCover=function(){
+		if (!this.config.readonly_active)
+			olds.apply(this,arguments);
+	};
+   
+   var hold = scheduler.hide_lightbox;
+   scheduler.hide_lightbox=function(){
+      if (this._lightbox_r){
+         this._lightbox_r.parentNode.removeChild(this._lightbox_r);
+         this._lightbox_r = null;
+      }
+      
+      return hold.apply(this,arguments);
+   };
+   
+   
+});
\ No newline at end of file
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/sources/ext/ext_serialize.js b/addons/base_calendar/static/lib/dhtmlxScheduler/sources/ext/ext_serialize.js
new file mode 100644
index 00000000000..879ab661c62
--- /dev/null
+++ b/addons/base_calendar/static/lib/dhtmlxScheduler/sources/ext/ext_serialize.js
@@ -0,0 +1,66 @@
+//redefine this method, if you want to provide a custom set of attributes for serialization
+scheduler.data_attributes=function(){
+	var attrs = [];
+	var format = scheduler.templates.xml_format;
+	for (var a in this._events){
+		var ev = this._events[a];
+		for (var name in ev)
+			if (name.substr(0,1) !="_")
+				attrs.push([name,((name == "start_date" || name == "end_date")?format:null)]);
+		break;
+	}
+	return attrs;
+}
+
+scheduler.toXML = function(header){
+	var xml = [];
+	var attrs = this.data_attributes();
+	
+	
+	for (var a in this._events){
+		var ev = this._events[a];
+		if (ev.id.toString().indexOf("#")!=-1) continue;
+		xml.push("<event>");	
+		for (var i=0; i < attrs.length; i++)
+			xml.push("<"+attrs[i][0]+"><![CDATA["+(attrs[i][1]?attrs[i][1](ev[attrs[i][0]]):ev[attrs[i][0]])+"]]></"+attrs[i][0]+">");
+			
+		xml.push("</event>");
+	}
+	return (header||"")+"<data>"+xml.join("\n")+"</data>";
+};
+
+scheduler.toJSON = function(){
+	var json = [];
+	var attrs = this.data_attributes();
+	for (var a in this._events){
+		var ev = this._events[a];
+		if (ev.id.toString().indexOf("#")!=-1) continue;
+		var ev = this._events[a];
+		var line =[];	
+		for (var i=0; i < attrs.length; i++)
+			line.push(' '+attrs[i][0]+':"'+((attrs[i][1]?attrs[i][1](ev[attrs[i][0]]):ev[attrs[i][0]])||"").toString().replace(/\n/g,"")+'" ');
+		json.push("{"+line.join(",")+"}");
+	}
+	return "["+json.join(",\n")+"]";
+};
+
+
+scheduler.toICal = function(header){
+	var start = "BEGIN:VCALENDAR\nVERSION:2.0\nPRODID:-//dhtmlXScheduler//NONSGML v2.2//EN\nDESCRIPTION:";
+	var end = "END:VCALENDAR";
+	var format = scheduler.date.date_to_str("%Y%m%dT%H%i%s");
+		
+	var ical = [];
+	for (var a in this._events){
+		var ev = this._events[a];
+		if (ev.id.toString().indexOf("#")!=-1) continue;
+		
+		
+		ical.push("BEGIN:VEVENT");	
+		ical.push("DTSTART:"+format(ev.start_date));	
+		ical.push("DTEND:"+format(ev.end_date));	
+		ical.push("SUMMARY:"+ev.text);	
+		ical.push("END:VEVENT");
+	}
+	return start+(header||"")+"\n"+ical.join("\n")+"\n"+end;
+};
\ No newline at end of file
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/sources/ext/ext_tooltip.js b/addons/base_calendar/static/lib/dhtmlxScheduler/sources/ext/ext_tooltip.js
new file mode 100644
index 00000000000..2146c8f9414
--- /dev/null
+++ b/addons/base_calendar/static/lib/dhtmlxScheduler/sources/ext/ext_tooltip.js
@@ -0,0 +1,133 @@
+window.dhtmlXTooltip={version:0.1};
+
+dhtmlXTooltip.config = {
+	className: 'dhtmlXTooltip tooltip',
+	timeout_to_display: 50,
+	delta_x: 15,
+	delta_y: -20
+};
+
+dhtmlXTooltip.tooltip = document.createElement('div');
+dhtmlXTooltip.tooltip.className = dhtmlXTooltip.config.className;
+
+dhtmlXTooltip.show = function(event, text) { //browser event, text to display
+	dhtmlXTooltip.tooltip.className = dhtmlXTooltip.config.className;
+	var pos=this.position(event);
+
+	var target = event.target||event.srcElement;
+	if (this.isTooltip(target)) {return;} // if we are over tooltip -- do nothing, just return (so tooltip won't move)
+	
+	var actual_x = pos.x+dhtmlXTooltip.config.delta_x||0;
+	var actual_y = pos.y-dhtmlXTooltip.config.delta_y||0;
+	
+	this.tooltip.style.visibility = "hidden";
+	
+	if(this.tooltip.style.removeAttribute) {
+		this.tooltip.style.removeAttribute("right");
+		this.tooltip.style.removeAttribute("bottom");	
+	} else {
+		this.tooltip.style.removeProperty("right");
+		this.tooltip.style.removeProperty("bottom");		
+	}
+
+	this.tooltip.style.left = "0px";
+	this.tooltip.style.top = "0px";	
+	
+	this.tooltip.innerHTML = text;
+	scheduler._obj.appendChild(this.tooltip);
+	
+	var tooltip_width = this.tooltip.offsetWidth;
+	var tooltip_height = this.tooltip.offsetHeight;
+	
+	if (document.body.offsetWidth - actual_x - tooltip_width < 0) { // tooltip is out of the right page bound
+		if(this.tooltip.style.removeAttribute) 
+			this.tooltip.style.removeAttribute("left");
+		else
+			this.tooltip.style.removeProperty("left");
+		this.tooltip.style.right = (document.body.offsetWidth - actual_x + 2 * dhtmlXTooltip.config.delta_x||0) + "px";
+	} else {
+		if (actual_x < 0) { // tooltips is out of the left page bound
+			this.tooltip.style.left = (pos.x + Math.abs(dhtmlXTooltip.config.delta_x||0)) + "px"; 
+		} else { // normal situation
+			this.tooltip.style.left = actual_x + "px";
+		}
+	}
+	
+	if (document.body.offsetHeight - actual_y - tooltip_height < 0) { // tooltip is below bottom of the page
+		if(this.tooltip.style.removeAttribute) 
+			this.tooltip.style.removeAttribute("top");
+		else
+			this.tooltip.style.removeProperty("top");
+		this.tooltip.style.bottom = (document.body.offsetHeight - actual_y - 2 * dhtmlXTooltip.config.delta_y||0) + "px";
+	} else {
+		if (actual_y < 0) { // tooltip is higher then top of the page
+			this.tooltip.style.top = (pos.y + Math.abs(dhtmlXTooltip.config.delta_y||0)) + "px"; 
+		}
+		else { // normal situation
+			this.tooltip.style.top = actual_y + "px";
+		}
+	}
+	
+	this.tooltip.style.visibility = "visible";
+};
+
+dhtmlXTooltip.hide = function() {
+	if(this.tooltip.parentNode) {
+		this.tooltip.parentNode.removeChild(this.tooltip);
+	}
+};
+dhtmlXTooltip.delay = function(method, object, params, delay) {
+	if(this.tooltip._timeout_id) {
+		window.clearTimeout(this.tooltip._timeout_id);
+	}
+	this.tooltip._timeout_id = setTimeout(function(){
+		var ret = method.apply(object,params);
+		method = obj = params = null;
+		return ret;
+	},delay||this.config.timeout_to_display);	
+};
+
+dhtmlXTooltip.isTooltip = function(node){
+	var res = false;
+	while (node && !res) {
+		res = (node.className == this.tooltip.className);
+		node=node.parentNode;
+	}
+	return res;
+};
+
+dhtmlXTooltip.position = function(ev) {
+   var ev = ev || window.event;
+   if(ev.pageX || ev.pageY) //FF, KHTML
+      return {x:ev.pageX, y:ev.pageY};
+   //IE
+   var d  =  ((dhtmlx._isIE)&&(document.compatMode != "BackCompat"))?document.documentElement:document.body;
+   return {
+      x:ev.clientX + d.scrollLeft - d.clientLeft,
+      y:ev.clientY + d.scrollTop  - d.clientTop
+   };
+};
+
+scheduler.attachEvent("onMouseMove", function(event_id, e){ // (scheduler event_id, browser event)
+	var ev = e||window.event;
+	var target = ev.target||ev.srcElement;
+
+	if (event_id || dhtmlXTooltip.isTooltip(target)) { // if we are over event or tooltip
+		var event = scheduler.getEvent(event_id) || scheduler.getEvent(dhtmlXTooltip.tooltip.event_id);
+		dhtmlXTooltip.tooltip.event_id = event.id;
+		var text = scheduler.templates.tooltip_text(event.start_date, event.end_date, event);
+		
+		if (_isIE) { //make a copy of event, will be used in timed call
+			var evt = document.createEventObject(ev);
+		}
+		
+		dhtmlXTooltip.delay(dhtmlXTooltip.show, dhtmlXTooltip, [ evt||ev , text]); // showing tooltip
+	} else {
+		dhtmlXTooltip.delay(dhtmlXTooltip.hide, dhtmlXTooltip, []);
+	}
+});
+
+/* Could be redifined */
+scheduler.templates.tooltip_text = function(start,end,event) {
+	return "<b>Event:</b> "+event.text+"<br/><b>Start date:</b> "+scheduler.templates.tooltip_date_format(start)+"<br/><b>End date:</b> "+scheduler.templates.tooltip_date_format(end);
+};
\ No newline at end of file
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/sources/ext/ext_touch.js b/addons/base_calendar/static/lib/dhtmlxScheduler/sources/ext/ext_touch.js
new file mode 100644
index 00000000000..9dde6fd89b4
--- /dev/null
+++ b/addons/base_calendar/static/lib/dhtmlxScheduler/sources/ext/ext_touch.js
@@ -0,0 +1,411 @@
+TouchScroll=function(node, nontouch, scroll, compat){
+	this.debug =  !!nontouch;
+	this.compat = !!compat;
+	this.rough =  !!scroll;
+
+
+	this.axisX = this.axisY = true;
+	
+	if (typeof node!= "object")
+		node = document.getElementById(node);
+
+	this._init();
+	node.addEventListener("touchstart",this,false);
+	node.addEventListener("webkitTransitionEnd",this,false);
+	if (this.debug)
+		node.addEventListener("mousedown",this,false);
+		
+		
+	this.node = node;
+	for (var i=0; i < node.childNodes.length; i++)
+		if (node.childNodes[i].nodeType == 1){
+			this.area = node.childNodes[i];
+			break;
+		}
+
+	if (window.getComputedStyle(this.node).position == "static")
+		this.node.style.position = "relative"
+	this.area.style.cssText += "-webkit-transition: -webkit-transform; -webkit-user-select:none; -webkit-transform-style:preserve-3d;";
+	this.scrolls={};
+};
+
+TouchScroll.prototype = {
+	refresh:function(){
+		this.node.style.webkitTransformStyle="flat";
+		this.node.style.webkitTransformStyle="preserve-3d";
+	},
+	scrollTo:function(x,y,speed){
+		this.set_matrix({e:x,f:y}, (speed||0));
+	},
+	onscroll:function(x,y){}, 
+	handleEvent:function(ev){
+		return this["ev_"+ev.type](ev);
+	},
+	get_matrix:function(node){
+		return new WebKitCSSMatrix(window.getComputedStyle(node||this.area).webkitTransform);
+	},
+	set_matrix:function(value,speed,node){
+		(node||this.area).style.webkitTransform = "translate("+Math.round(value.e)+"px,"+Math.round(value.f)+"px)";
+		(node||this.area).style.webkitTransitionDuration= speed;
+	},
+	ev_touchstart:function(ev){ 
+		this.ev_mousedown(ev.touches[0]);
+		ev.preventDefault();
+		return false;
+	},
+	ev_mousedown:function(ev){
+		var touch  = ev;
+
+		this.x = touch.pageX;
+		this.y = touch.pageY;
+		this.dx = this.node.offsetWidth;
+		this.dy = this.node.offsetHeight;
+		this.mx = this.area.scrollWidth;
+		this.my = this.area.scrollHeight;
+		this.target = touch.target;
+		
+		if (!this.rough){
+			var temp = this.get_matrix();
+			this.target_x = temp.e;
+			this.target_y = temp.f;
+			if (!this.scroll && this.compat){
+				temp.e = this.node.scrollLeft*-1;
+				temp.f = this.node.scrollTop*-1;
+				this.node.scrollTop = this.node.scrollLeft = 0;
+			} 
+			
+			this.set_matrix(temp,0);
+			this._correct_scroll(this.target_x, this.target_y);
+		}
+		this.scroll_x = this.scroll_y = this.scroll = false;		
+		
+		
+		this._init_events();
+	},
+	ev_touchend:function(){
+		return this.ev_mouseup();
+	},
+	ev_mouseup:function(){
+		this._deinit_events();
+		if (!this.scroll){
+			this._remove_scroll();
+			var ev = document.createEvent("MouseEvent");
+			ev.initMouseEvent("click",true, true);
+			this.target.dispatchEvent(ev);
+		} 
+		this.target = null;
+	},
+	ev_webkitTransitionEnd:function(){
+		if (this.target || !this.scroll) return;
+		
+		this._remove_scroll();
+		var temp = this.get_matrix();
+		this.node.firstChild._scrollTop = -1*temp.f;
+			
+		if (this.compat && (temp.e||temp.f)){ 
+			var y = temp.f; var x = temp.e;
+			temp.e = temp.f = 0;
+			this.set_matrix(temp,0);
+			
+			this.node.scrollTop = -1*y;
+			this.node.scrollLeft = -1*x;
+		}
+		
+		this.scroll = false;
+	},
+	ev_touchmove:function(ev){
+		return this.ev_mousemove(ev.touches[0]);
+	},
+	ev_mousemove:function(ev){
+		if (!this.target) return;
+		var touch = ev;
+		
+		var dx = (touch.pageX - this.x)*(this.axisX?5:0);//Math.min(3,this.mx/this.dx);
+		var dy = (touch.pageY - this.y)*(this.axisY?5:0);//Math.min(3,this.my/this.dy);
+		
+		if (Math.abs(dx)<10 && Math.abs(dy)<10) return;
+		
+		if (Math.abs(dx)>50)
+			this.scroll_x=true;
+		if (Math.abs(dy)>50)
+			this.scroll_y=true;
+			
+		
+		if (this.scroll_x || this.scroll_y){
+			this.x = touch.pageX; this.y = touch.pageY;
+			this.scroll = true;
+			var temp = this.get_matrix();
+			dx = dx + (this.target_x - temp.e);
+			dy = dy + (this.target_y - temp.f);
+			
+			var speed = "2000ms";
+			var fast = "500ms";
+			this.target_x = dx+temp.e;
+			this.target_y = dy+temp.f;
+			
+			if (this.target_x > 0) {
+				this.target_x = 0;
+				speed = fast;
+			}
+			if (this.target_y > 0) {
+				this.target_y = 0;
+				speed = fast;
+			}
+			if (this.mx - this.dx + this.target_x < 0){
+				this.target_x = - this.mx + this.dx;
+				speed = fast;
+			}
+			if (this.my - this.dy + this.target_y < 0){
+				this.target_y = - this.my + this.dy;
+				speed = fast;
+			}
+		
+
+			this.set_matrix({e:this.target_x,f:this.target_y},speed);
+			this._add_scroll(temp.e, temp.f);
+			this._correct_scroll(this.target_x, this.target_y, speed);
+			this.onscroll(this.target_x, this.target_y);
+		}
+		return false;
+	},
+	_correct_scroll:function(x,y,speed){ 
+		if (this.scrolls.x){
+			var stemp = this.get_matrix(this.scrolls.x);
+			var sx = this.dx*x/this.mx;
+			this.set_matrix({e:-1*sx,f:0}, speed, this.scrolls.x);
+		}
+		if (this.scrolls.y){ 
+			var stemp = this.get_matrix(this.scrolls.y);
+			var sy = this.dy*y/this.my;
+			this.set_matrix({e:0,f:-1*sy}, speed, this.scrolls.y);				
+		}		
+	},
+	_remove_scroll:function(){
+		if (this.scrolls.x)
+			this.scrolls.x.parentNode.removeChild(this.scrolls.x);
+		if (this.scrolls.y)	
+			this.scrolls.y.parentNode.removeChild(this.scrolls.y);
+		this.scrolls = {};
+	},
+	_add_scroll:function(){
+		if (this.scrolls.ready) return;
+		
+		var d;
+		if (this.my>5 && this.axisY){
+			var h = this.dy*this.dy/this.my-1;
+			this.scrolls.y = d = document.createElement("DIV");
+			d.className="dhx_scroll_y";
+			d.style.height = h +"px";
+			this.node.appendChild(d);
+		}
+		if (this.mx>5 && this.axisX){
+			var h = this.dx*this.dx/this.mx;
+			this.scrolls.x = d = document.createElement("DIV");
+			d.className="dhx_scroll_x";
+			d.style.width = h +"px";
+			this.node.appendChild(d);
+		}
+		
+		var temp = this.get_matrix();
+		this._correct_scroll(temp.e, temp.f, 0);
+		this.scrolls.ready = true;
+	},
+	_init_events:function(){
+		document.addEventListener("touchmove",this,false);	
+		document.addEventListener("touchend",this,false);	
+		if (this.debug){
+			document.addEventListener("mousemove",this,false);	
+			document.addEventListener("mouseup",this,false);	
+		}
+	},
+	_deinit_events:function(){
+		document.removeEventListener("touchmove",this,false);	
+		document.removeEventListener("touchend",this,false);	
+		if (this.debug){
+			document.removeEventListener("mousemove",this,false);	
+			document.removeEventListener("mouseup",this,false);	
+		}
+	},
+	_init:function(){
+		document.styleSheets[0].insertRule(".dhx_scroll_x { width:50px;height:4px;background:rgba(0, 0, 0, 0.4);position:absolute; left:0px; bottom:3px; border:1px solid transparent; -webkit-border-radius:4px;-webkit-transition: -webkit-transform;}",0);
+		document.styleSheets[0].insertRule(".dhx_scroll_y { width:4px;height:50px;background:rgba(0, 0, 0, 0.4);position:absolute; top:0px; right:3px; border:1px solid transparent; -webkit-border-radius:4px;-webkit-transition: -webkit-transform;}",0);
+		this._init = function(){};
+	}
+};
+
+
+
+
+
+scheduler._ipad_before_init=function(){
+	scheduler._ipad_before_init=function(){};
+	scheduler.xy.scroll_width =  0;
+
+	var tabs = scheduler._els["dhx_cal_tab"];
+	var right = 42;
+	for (var i=tabs.length-1; i >=0; i--) {
+		tabs[i].style.cssText+="top:4px;";
+		tabs[i].style.left="auto";
+		tabs[i].style.right = right+"px";
+		if (i==0)
+			tabs[i].style.cssText+=";-webkit-border-top-left-radius: 5px; -webkit-border-bottom-left-radius: 5px;";
+		if (i==tabs.length-1)
+			tabs[i].style.cssText+=";-webkit-border-top-right-radius: 5px; -webkit-border-bottom-right-radius: 5px;";
+		
+		right+=100;
+	};
+
+	scheduler._els["dhx_cal_prev_button"][0].innerHTML = "&lt;";
+	scheduler._els["dhx_cal_next_button"][0].innerHTML = "&gt;";
+	var d = document.createElement("div");
+	d.className = "dhx_cal_add_button";
+	d.innerHTML = "+ ";
+	d.onclick = function(){
+		var now = new Date();
+		if (now > scheduler._min_date && now < scheduler._max_date)
+			scheduler.addEventNow();
+		else
+			scheduler.addEventNow(scheduler._min_date.valueOf());
+	}
+	scheduler._els["dhx_cal_navline"][0].appendChild(d);
+	
+	
+	this._obj.onmousedown = this._obj.onmouseup = this._obj.onmousemove = function(){};
+	
+	var long_tap = null;
+	var long_tap_pos = [];
+	this._obj.ontouchmove=function(e){
+		if (long_tap){
+			var dx = Math.abs(e.touches[0].pageX - long_tap_pos[0]);
+			var dy = Math.abs(e.touches[0].pageY - long_tap_pos[1]);
+			if (dx>50 || dy>50)
+				long_tap = window.clearTimeout(long_tap);
+		}
+		if (scheduler.config.touch_actions)
+			scheduler._on_mouse_move(e.touches[0]);
+	}
+	this._obj.ontouchstart = function(e){
+		if (scheduler._lightbox_id) return;
+		
+		long_tap = window.setTimeout(function(){
+			scheduler._on_dbl_click(e.touches[0],(e.target.className?e.target:e.target.parentNode));
+		},400);
+		long_tap_pos = [e.touches[0].pageX, e.touches[0].pageY];
+		if (scheduler.config.touch_actions)
+			scheduler._on_mouse_down(e.touches[0]);
+	}
+	this._obj.ontouchend = function(e){
+		if (long_tap)
+			long_tap = window.clearTimeout(long_tap);
+		if (scheduler.config.touch_actions)
+			scheduler._on_mouse_up(e.touches[0]);
+	}
+}
+scheduler._ipad_init=function(){
+	var d = document.createElement("DIV");
+	var data = scheduler._els["dhx_cal_data"][0];
+	d.appendChild(data);
+	d.style.cssText = "overflow:hidden; width:100%; overflow:hidden;position:relative;";
+	this._obj.appendChild(d);
+	
+	data.style.overflowY = "hidden";
+	
+	var scroll = new TouchScroll(d);
+	scroll.axisX = false;
+	scheduler._ipad_init = function(){
+		data.parentNode.style.height = data.style.height;
+		data.parentNode.style.top = data.style.top;
+		data.style.height = data.scrollHeight+"px";
+		data.style.top = "0px";
+		
+		if (Math.abs(data.parentNode.offsetHeight - data.offsetHeight)<5){
+			scroll.axisY=false;
+			scroll.scrollTo(0,0,0);
+		} else
+			scroll.axisY=true;
+			
+		scroll.refresh();
+	};
+
+	scheduler.attachEvent("onSchedulerResize", function(){
+		setTimeout(function(){
+			scheduler._ipad_init();
+		});
+		return true;
+	})
+			
+	scheduler._ipad_init();
+};
+
+scheduler.attachEvent("onViewChange",function(){
+	scheduler._ipad_init();
+});
+scheduler.attachEvent("onBeforeViewChange",function(){
+	scheduler._ipad_before_init();
+	return true;
+});
+
+scheduler.showCover=function(box){
+	this.show_cover();
+	if (box){
+		box.style.display="block";
+		var pos = getOffset(this._obj);
+		box.style.top  = box.offsetHeight*-1+"px";
+		box.style.left = Math.round(pos.left+(this._obj.offsetWidth-box.offsetWidth)/2)+"px";	
+	}
+	
+	var node =this._get_lightbox();
+	node.style.webkitTransform = "translate(0px,"+(box.offsetHeight+41)+"px)";
+	node.style.webkitTransitionDuration = "500ms";
+};
+
+scheduler.hideCover=function(box){
+	if (box){
+		box.style.webkitTransform = "translate(0px,"+(box.offsetHeight+41)*-1+"px)";
+		box.style.webkitTransitionDuration = "500ms";
+	}
+	this.hide_cover();
+}
+
+scheduler.config.lightbox.sections[0].height = 100;
+if (scheduler.form_blocks.calendar_time){
+	scheduler.config.lightbox.sections[1].type = "calendar_time";
+	scheduler._mini_cal_arrows = ["&lt;", "&gt;"];
+}
+	
+scheduler.xy.menu_width = 0;
+scheduler.attachEvent("onClick", function(){
+	return false;
+});
+
+scheduler.locale.labels.new_event="";
+
+scheduler._mouse_coords=function(ev){
+	var pos;
+	var b=document.body;
+	var d = document.documentElement;
+	if(ev.pageX || ev.pageY)
+	    pos={x:ev.pageX, y:ev.pageY};
+	else pos={
+	    x:ev.clientX + (b.scrollLeft||d.scrollLeft||0) - b.clientLeft,
+	    y:ev.clientY + (b.scrollTop||d.scrollTop||0) - b.clientTop
+	}
+
+	//apply layout
+	pos.x-=getAbsoluteLeft(this._obj)+(this._table_view?0:this.xy.scale_width);
+	var top = 
+	pos.y-=getAbsoluteTop(this._obj)+this.xy.nav_height+this._dy_shift+this.xy.scale_height-(this._els["dhx_cal_data"][0]._scrollTop||0);
+	//transform to date
+	if (!this._table_view){
+		pos.x=Math.max(0,Math.ceil(pos.x/this._cols[0])-1);
+		pos.y=Math.max(0,Math.ceil(pos.y*60/(this.config.time_step*this.config.hour_size_px))-1)+this.config.first_hour*(60/this.config.time_step);
+	} else {
+		var dy=0;
+		for (dy=1; dy < this._colsS.heights.length; dy++)
+			if (this._colsS.heights[dy]>pos.y) break;
+
+		pos.y=(Math.max(0,Math.ceil(pos.x/this._cols[0])-1)+Math.max(0,dy-1)*7)*24*60/this.config.time_step; 
+		pos.x=0;
+	}
+	return pos;
+}
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/sources/ext/ext_treetimeline.js b/addons/base_calendar/static/lib/dhtmlxScheduler/sources/ext/ext_treetimeline.js
new file mode 100644
index 00000000000..9fb08261470
--- /dev/null
+++ b/addons/base_calendar/static/lib/dhtmlxScheduler/sources/ext/ext_treetimeline.js
@@ -0,0 +1,275 @@
+scheduler.attachEvent("onTimelineCreated", function (obj){
+
+	if(obj.render == "tree") {
+		obj.y_unit_original = obj.y_unit;
+		obj.y_unit = scheduler._getArrayToDisplay(obj.y_unit_original);
+		
+		scheduler.form_blocks[obj.name]={
+			render:function(sns) {
+				var _result = "<div class='dhx_section_timeline' style='overflow: hidden; height: "+sns.height+"px'></div>";
+				return _result;
+			},
+			set_value:function(node,value,ev,config){
+				var options = scheduler._getArrayForSelect(scheduler.matrix[config.type].y_unit_original, config.type);
+				node.innerHTML = '';
+				var temp_select = document.createElement('select');
+				node.appendChild(temp_select);
+				
+				var select = node.getElementsByTagName('select')[0];
+				
+				for(var i=0; i<options.length; i++) {
+					var temp_option = document.createElement('option');
+					temp_option.value = options[i].key;
+					if(temp_option.value == ev[scheduler.matrix[config.type].y_property])
+						temp_option.selected = true;
+					temp_option.innerHTML = options[i].label;
+					select.appendChild(temp_option);
+				}
+				
+			},
+			get_value:function(node,ev,config){
+				return  node.firstChild.value;
+			},
+			focus:function(node){
+			}
+		};
+	};
+});	
+
+scheduler.attachEvent("onBeforeViewRender", function (render_name, y_unit, timeline){
+	var res = {};
+	if(render_name == "tree"){
+		var height;
+		// section 1
+		var tr_className, style_height, td_className;
+		var div_expand;
+		// section 3
+		var table_className;
+		if(y_unit.children) {
+			height = timeline.folder_dy||timeline.dy;
+			if(timeline.folder_dy && !timeline.section_autoheight) {
+				style_height = "height:"+timeline.folder_dy+"px;";
+			}
+			tr_className = "dhx_row_folder";
+			td_className = "dhx_matrix_scell folder";
+			div_expand = "<div class='dhx_scell_expand'>"+((y_unit.open)?'-':'+')+"</div>";
+			table_className = (timeline.folder_events_available)?"dhx_data_table folder_events":"dhx_data_table folder";
+		} else {
+			height = timeline.dy;
+			tr_className = "dhx_row_item";
+			td_className = "dhx_matrix_scell item";
+			div_expand = '';
+			table_className = "dhx_data_table";
+		}
+		td_content = "<div class='dhx_scell_level"+y_unit.level+"'>"+div_expand+"<div class='dhx_scell_name'>"+(scheduler.templates[timeline.name+'_scale_label'](y_unit.key, y_unit.label, timeline)||y_unit.label)+"</div></div>";
+		
+		res = {
+			height: height,
+			style_height: style_height,
+			//section 1
+			tr_className: tr_className,
+			td_className: td_className,
+			td_content: td_content,
+			//section 3
+			table_className: table_className
+		};
+	};
+	return res;
+});
+
+var section_id_before; // section id of the event before dragging (to bring it back if user drop's event on folder without folder_events_available)
+
+scheduler.attachEvent("onBeforeEventChanged", function(event_object, native_event, is_new) {
+	if (scheduler._isRender("tree")) { // if mode's render == tree
+		var section = scheduler.getSection(event_object.section_id);
+		if (typeof section.children != 'undefined' && !scheduler.matrix[scheduler._mode].folder_events_available) {
+			if (!is_new) { //if old - move back
+				event_object[scheduler.matrix[scheduler._mode].y_property] = section_id_before;
+			}
+			return false;
+		}
+	}
+	return true;
+});
+
+scheduler.attachEvent("onBeforeDrag", function (event_id, mode, native_event_object){
+	var cell = scheduler._locate_cell_timeline(native_event_object);
+	if(cell) {
+		var section_id = scheduler.matrix[scheduler._mode].y_unit[cell.y].key;
+		if(typeof scheduler.matrix[scheduler._mode].y_unit[cell.y].children != "undefined" && !scheduler.matrix[scheduler._mode].folder_events_available) {
+			return false;
+		}
+	}	
+	if(scheduler._isRender("tree")) {
+		ev = scheduler.getEvent(event_id);
+		section_id_before = section_id||ev[scheduler.matrix[scheduler._mode].y_property]; // either event id or section_id will be available
+	}
+	return true;
+});		
+
+scheduler._getArrayToDisplay = function(array){ // function to flatten out hierarhical array, used for tree view
+	var result = [];
+	var fillResultArray = function(array, lvl){
+		var level = lvl||0;
+		for(var i=0; i<array.length; i++) {
+			array[i].level = level;
+			if(typeof array[i].children != "undefined" && typeof array[i].key == "undefined")
+				array[i].key=scheduler.uid();
+			result.push(array[i]);
+			if(array[i].open && array[i].children) {
+				fillResultArray(array[i].children, level+1);
+			} 
+		}
+	};
+	fillResultArray(array);
+	return result;
+};
+
+
+scheduler._getArrayForSelect = function(array, mode){ // function to flatten out hierarhical array, used for tree view
+	var result = [];
+	var fillResultArray = function(array){
+		for(var i=0; i<array.length; i++) {
+			if(scheduler.matrix[mode].folder_events_available) {
+				result.push(array[i]);
+			}
+			else {
+				if(typeof array[i].children == "undefined") {
+					result.push(array[i]);
+				}
+			}
+			if(array[i].children) 
+				fillResultArray(array[i].children, mode);
+		};
+	};
+	fillResultArray(array);
+	return result;
+};
+
+
+/*
+scheduler._toggleFolderDisplay(4) -- toggle display of the section with key 4 (closed -> open)
+scheduler._toggleFolderDisplay(4, true) -- open section with the key 4 (doesn't matter what status was before). False - close.
+scheduler._toggleFolderDisplay(4, false, true) -- close ALL sections. Key is not used in such condition.
+*/
+scheduler._toggleFolderDisplay = function(key, status, all_sections){ // used for tree view
+	var marked;
+	var toggleElement = function(key, array, status, all_sections) {
+		for (var i=0; i<array.length; i++) {
+			if((array[i].key == key || all_sections) && array[i].children) {
+				array[i].open = (typeof status != "undefined") ? status : !array[i].open;
+				marked = true;
+				if(!all_sections && marked) 
+					break;
+			}
+			if(array[i].children) {
+				toggleElement(key,array[i].children, status, all_sections);
+			}
+		}
+	};
+	toggleElement(key,scheduler.matrix[scheduler._mode].y_unit_original, status, all_sections);
+	scheduler.matrix[scheduler._mode].y_unit = scheduler._getArrayToDisplay(scheduler.matrix[scheduler._mode].y_unit_original);
+	scheduler.callEvent("onOptionsLoad",[]);
+};
+
+scheduler.attachEvent("onCellClick", function (x, y, a, b, event){
+	if(scheduler._isRender("tree")) {
+		if(!scheduler.matrix[scheduler._mode].folder_events_available) {
+			if(typeof scheduler.matrix[scheduler._mode].y_unit[y].children != "undefined") {
+				scheduler._toggleFolderDisplay(scheduler.matrix[scheduler._mode].y_unit[y].key);
+			}
+		}
+	}
+});
+
+scheduler.attachEvent("onYScaleClick", function (index, value, event){
+	if(scheduler._isRender("tree")) {
+		if(typeof value.children != "undefined") {
+			scheduler._toggleFolderDisplay(value.key);
+		}
+	}
+});
+
+scheduler.getSection = function(id){
+	if(scheduler._isRender("tree")) {
+		var obj;
+		var findElement = function(key, array) {
+			for (var i=0; i<array.length; i++) {
+				if(array[i].key == key) 
+					obj = array[i];
+				if(array[i].children) 
+					findElement(key,array[i].children);
+			}
+		};
+		findElement(id, scheduler.matrix[scheduler._mode].y_unit_original);
+		return obj||null;
+	}
+};
+
+scheduler.deleteSection = function(id){
+	if(scheduler._isRender("tree")) {
+		var result = false;
+		var deleteElement = function(key, array) {
+			for (var i=0; i<array.length; i++) {
+				if(array[i].key == key) {
+					array.splice(i,1);
+					result = true;
+				}
+				if(result) 
+					break;
+				if(array[i].children) 
+					deleteElement(key,array[i].children);
+			}
+		};
+		deleteElement(id, scheduler.matrix[scheduler._mode].y_unit_original);	
+		scheduler.matrix[scheduler._mode].y_unit = scheduler._getArrayToDisplay(scheduler.matrix[scheduler._mode].y_unit_original);
+		scheduler.callEvent("onOptionsLoad",[]);	
+		return result;
+	}	
+};
+
+scheduler.addSection = function(obj, parent_id){
+	if(scheduler._isRender("tree")) {
+		var result = false;
+		var addElement = function(obj, parent_key, array) {
+			if(!parent_id) {
+				array.push(obj);
+				result = true;
+			}
+			else {
+				for (var i=0; i<array.length; i++) {
+					if(array[i].key == parent_key && typeof array[i].children != "undefined") {
+						array[i].children.push(obj);
+						result = true;
+					}
+					if(result) 
+						break;
+					if(array[i].children) 
+						addElement(obj,parent_key,array[i].children);
+				}
+			}
+		};
+		addElement(obj, parent_id, scheduler.matrix[scheduler._mode].y_unit_original);	
+		scheduler.matrix[scheduler._mode].y_unit = scheduler._getArrayToDisplay(scheduler.matrix[scheduler._mode].y_unit_original);
+		scheduler.callEvent("onOptionsLoad",[]);	
+		return result;
+	}	
+};
+
+
+scheduler.openAllSections = function() {
+	if(scheduler._isRender("tree")) 
+		scheduler._toggleFolderDisplay(1, true, true);
+};
+scheduler.closeAllSections = function() {
+	if(scheduler._isRender("tree")) 
+		scheduler._toggleFolderDisplay(1, false, true);
+};
+scheduler.openSection = function(section_id){
+	if(scheduler._isRender("tree")) 
+		scheduler._toggleFolderDisplay(section_id, true);
+};
+scheduler.closeSection = function(section_id){
+	if(scheduler._isRender("tree")) 
+		scheduler._toggleFolderDisplay(section_id, false);
+};
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/sources/ext/ext_url.js b/addons/base_calendar/static/lib/dhtmlxScheduler/sources/ext/ext_url.js
new file mode 100644
index 00000000000..744fe2c27ae
--- /dev/null
+++ b/addons/base_calendar/static/lib/dhtmlxScheduler/sources/ext/ext_url.js
@@ -0,0 +1,30 @@
+scheduler.attachEvent("onTemplatesReady",function(){
+   var first = true;
+   var s2d = scheduler.date.str_to_date("%Y-%m-%d");
+   var d2s = scheduler.date.date_to_str("%Y-%m-%d");
+   scheduler.attachEvent("onBeforeViewChange",function(om,od,m,d){
+      if (first){
+         first = false;
+         var p={};
+         var data=(document.location.hash||"").replace("#","").split(",");
+         for (var i=0; i < data.length; i++) {
+         	var s = data[i].split("=");
+         	if (s.length==2)
+         	p[s[0]]=s[1];
+         }
+         
+         if (p.date || p.mode){
+         	try{
+            	this.setCurrentView((p.date?s2d(p.date):null),(p.mode||null));
+        	} catch(e){
+        		//assuming that mode is not available anymore
+        		this.setCurrentView((p.date?s2d(p.date):null),m);
+        	}
+            return false;
+         }
+      }
+      var text = "#date="+d2s(d||od)+",mode="+(m||om);
+      document.location.hash = text;
+      return true;
+   });
+});
\ No newline at end of file
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/sources/ext/ext_wp.js b/addons/base_calendar/static/lib/dhtmlxScheduler/sources/ext/ext_wp.js
new file mode 100644
index 00000000000..c112c552681
--- /dev/null
+++ b/addons/base_calendar/static/lib/dhtmlxScheduler/sources/ext/ext_wp.js
@@ -0,0 +1,13 @@
+scheduler.attachEvent("onLightBox",function(){
+	if (this._cover){
+		try{
+			this._cover.style.height = this.expanded ? "100%" : ((document.body.parentNode||document.body).scrollHeight+"px");
+		} catch(e) {};
+	}
+});
+
+scheduler.form_blocks.select.set_value=function(node,value,ev){
+	if (typeof value == "undefined" || value === "")
+		value = (node.firstChild.options[0]||{}).value;
+	node.firstChild.value=value||"";
+};
\ No newline at end of file
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/sources/ext/ext_year_view.js b/addons/base_calendar/static/lib/dhtmlxScheduler/sources/ext/ext_year_view.js
new file mode 100644
index 00000000000..64e4672dce1
--- /dev/null
+++ b/addons/base_calendar/static/lib/dhtmlxScheduler/sources/ext/ext_year_view.js
@@ -0,0 +1,260 @@
+scheduler.config.year_x = 4;
+scheduler.config.year_y = 3;
+scheduler.config.year_mode_name = "year";
+scheduler.xy.year_top = 0;
+
+scheduler.templates.year_date =  function(date){
+	return scheduler.date.date_to_str(scheduler.locale.labels.year_tab+" %Y")(date);
+};
+scheduler.templates.year_month =  scheduler.date.date_to_str("%F");
+scheduler.templates.year_scale_date = scheduler.date.date_to_str("%D");
+scheduler.templates.year_tooltip = function(s,e,ev){
+   return ev.text
+};
+
+
+   
+(function(){
+   
+var is_year_mode = function(){
+   return scheduler._mode == scheduler.config.year_mode_name;
+}
+
+scheduler.dblclick_dhx_month_head=function(e){
+   if (is_year_mode()){
+      var t = (e.target||e.srcElement);
+      if (t.parentNode.className.indexOf("dhx_before")!=-1 || t.parentNode.className.indexOf("dhx_after")!=-1) return false;
+      var start = this.templates.xml_date(t.parentNode.parentNode.parentNode.parentNode.parentNode.parentNode.getAttribute("date"));
+      start.setDate(parseInt(t.innerHTML,10));
+      var end = this.date.add(start,1,"day")
+      if (!this.config.readonly && this.config.dblclick_create)
+         this.addEventNow(start.valueOf(), end.valueOf(), e);
+   }
+}   
+
+var chid = scheduler.changeEventId;
+scheduler.changeEventId = function(){
+   chid.apply(this,arguments);
+   if (is_year_mode())
+      this.year_view(true);
+}
+
+
+var old = scheduler.render_data;
+var to_attr = scheduler.date.date_to_str("%Y/%m/%d");
+var from_attr = scheduler.date.str_to_date("%Y/%m/%d");
+scheduler.render_data=function(evs){ 
+   if (!is_year_mode()) return old.apply(this,arguments);
+   for (var i=0; i<evs.length; i++)
+      this._year_render_event(evs[i]);
+}
+
+var clear = scheduler.clear_view;
+scheduler.clear_view = function(){
+   if (!is_year_mode()) return clear.apply(this,arguments);
+   for (var i=0; i < marked.length; i++) {
+      marked[i].className = "dhx_month_head";
+      marked[i].setAttribute("date","")
+   };
+   marked = [];
+}
+
+
+scheduler.hideToolTip=function(){
+   if (this._tooltip){
+      this._tooltip.style.display = "none";
+      this._tooltip.date = new Date(9999,1,1);
+   }
+    
+}
+scheduler.showToolTip=function(date,pos,e,src){
+   if (this._tooltip){
+     if (this._tooltip.date.valueOf() == date.valueOf()) return;
+     this._tooltip.innerHTML="";
+   } else {
+     var t = this._tooltip = document.createElement("DIV");
+     t.className = "dhx_tooltip";
+     document.body.appendChild(t);
+     t.onclick = scheduler._click.dhx_cal_data;
+     
+   }
+   var evs = this.getEvents(date,this.date.add(date,1,"day"));
+   var html = "";
+   
+   for (var i=0; i<evs.length; i++){
+        html+="<div class='dhx_tooltip_line' event_id='"+evs[i].id+"'>"
+        html+="<div class='dhx_tooltip_date'>"+(evs[i]._timed?this.templates.event_date(evs[i].start_date):"")+"</div>";
+        html+="<div class='dhx_event_icon icon_details'>&nbsp;</div>";
+     html+=this.templates.year_tooltip(evs[i].start_date, evs[i].end_date,evs[i])+"</div>";
+   }
+   
+   this._tooltip.style.display="";   
+   this._tooltip.style.top = "0px";
+   
+         
+   if (document.body.offsetWidth-pos.left-this._tooltip.offsetWidth < 0)
+      this._tooltip.style.left = pos.left-this._tooltip.offsetWidth+"px";
+   else
+      this._tooltip.style.left = pos.left+src.offsetWidth+"px";
+      
+   this._tooltip.date = date;
+   this._tooltip.innerHTML = html;
+   
+   if (document.body.offsetHeight-pos.top-this._tooltip.offsetHeight < 0)
+      this._tooltip.style.top= pos.top-this._tooltip.offsetHeight+src.offsetHeight+"px";
+   else
+      this._tooltip.style.top= pos.top+"px";
+}
+
+scheduler._init_year_tooltip=function(){
+   dhtmlxEvent(scheduler._els["dhx_cal_data"][0], "mouseover", function(e){
+      if (!is_year_mode()) return;
+      
+      var e = e || event;
+      var src = e.target||e.srcElement;
+      if ((src.className||"").indexOf("dhx_year_event")!=-1)
+         scheduler.showToolTip(from_attr(src.getAttribute("date")),getOffset(src),e,src);
+      else
+         scheduler.hideToolTip();
+   })
+   this._init_year_tooltip=function(){};
+}
+
+scheduler.attachEvent("onSchedulerResize",function(){
+   if (is_year_mode()){
+      this.year_view(true);
+      return false;
+   }
+   return true;
+});
+scheduler._get_year_cell=function(d){
+   //there can be more than 1 year in view
+   //year can start not from January
+   var m = d.getMonth()+12*(d.getFullYear()-this._min_date.getFullYear())-this.week_starts._month; 
+   var t = this._els["dhx_cal_data"][0].childNodes[m];
+   var d  = this.week_starts[m]+d.getDate()-1;
+   
+   
+   return t.childNodes[2].firstChild.rows[Math.floor(d/7)].cells[d%7].firstChild;
+}
+
+
+var marked = [];
+scheduler._mark_year_date=function(d,ev){
+   var c = this._get_year_cell(d);
+   c.className = "dhx_month_head dhx_year_event "+this.templates.event_class(ev.start_date,ev.end_date,ev);
+   c.setAttribute("date",to_attr(d))
+   marked.push(c);
+}
+scheduler._unmark_year_date=function(d){
+   this._get_year_cell(d).className = "dhx_month_head";
+}
+scheduler._year_render_event=function(ev){
+   var d = ev.start_date;
+   if (d.valueOf()<this._min_date.valueOf()) 
+      d = this._min_date;
+   else d = this.date.date_part(new Date(d));
+   
+   while (d<ev.end_date){
+     this._mark_year_date(d,ev);
+      d = this.date.add(d,1,"day");
+      if (d.valueOf()>=this._max_date.valueOf()) 
+         return;
+   }
+}
+scheduler.year_view=function(mode){
+   if (mode){
+      var temp = scheduler.xy.scale_height;
+      scheduler.xy.scale_height = -1;
+   }
+   
+      scheduler._els["dhx_cal_header"][0].style.display=mode?"none":"";
+      scheduler.set_sizes();
+      
+   if (mode)
+      scheduler.xy.scale_height = temp;
+   
+   
+   scheduler._table_view = mode;
+   if (this._load_mode && this._load()) return;
+   
+   if (mode){
+      scheduler._init_year_tooltip();
+      scheduler._reset_year_scale();   
+      scheduler.render_view_data();
+   } else {
+      scheduler.hideToolTip();
+   }
+}
+scheduler._reset_year_scale = function(){
+   this._cols=[]; this._colsS={};
+   var week_starts = []; //start day of first week in each month
+   var b=this._els["dhx_cal_data"][0];
+   
+   var c = this.config;
+   b.scrollTop=0; //fix flickering in FF
+   b.innerHTML="";
+   
+   var dx = Math.floor(parseInt(b.style.width)/c.year_x);
+   var dy = Math.floor((parseInt(b.style.height)-scheduler.xy.year_top)/c.year_y);
+   if (dy<190) {
+      dy = 190;
+      dx = Math.floor((parseInt(b.style.width)-scheduler.xy.scroll_width)/c.year_x);
+   }
+   
+   var summ = dx-11;
+   var left = 0;
+   var week_template = document.createElement("div");
+   var dummy_date = this.date.week_start(new Date());
+   for (var i=0; i<7; i++){
+      this._cols[i]=Math.floor(summ/(7-i));
+      this._render_x_header(i,left,dummy_date,week_template);
+      dummy_date = this.date.add(dummy_date,1,"day");
+      summ-=this._cols[i];
+      left+=this._cols[i];
+   }
+   week_template.lastChild.className+=" dhx_scale_bar_last";
+   
+   var sd = this.date[this._mode+"_start"](this.date.copy(this._date));
+   var ssd=sd;
+   
+   for (var i=0; i<c.year_y; i++)
+      for (var j=0; j<c.year_x; j++){
+         var d = document.createElement("DIV");
+         d.style.cssText="position:absolute;";
+         d.setAttribute("date",this.templates.xml_format(sd));
+         d.innerHTML="<div class='dhx_year_month'></div><div class='dhx_year_week'>"+week_template.innerHTML+"</div><div class='dhx_year_body'></div>";
+         d.childNodes[0].innerHTML=this.templates.year_month(sd);
+         
+         var dd = this.date.week_start(sd);
+         var ed = this._reset_month_scale(d.childNodes[2],sd,dd);
+         
+         var r=d.childNodes[2].firstChild.rows;
+       for (var k=r.length; k<6; k++) {
+            r[0].parentNode.appendChild(r[0].cloneNode(true));
+            for (var ri=0; ri < r[k].childNodes.length; ri++) {
+               r[k].childNodes[ri].className = "dhx_after";
+               r[k].childNodes[ri].firstChild.innerHTML = scheduler.templates.month_day(ed);
+               ed = scheduler.date.add(ed,1,"day");
+            };
+         }
+            
+         
+         b.appendChild(d);
+         
+         var dt = Math.round((dy-190)/2);
+         d.style.marginTop=dt+"px";
+         this.set_xy(d,dx-10,dy-dt-10,dx*j+5,dy*i+5+scheduler.xy.year_top);
+         
+         week_starts[i*c.year_x+j] = (sd.getDay()-(this.config.start_on_monday?1:0)+7)%7;
+         sd = this.date.add(sd,1,"month");
+         
+      }
+   this._els["dhx_cal_date"][0].innerHTML=this.templates[this._mode+"_date"](ssd,sd,this._mode);      
+   this.week_starts = week_starts;
+   week_starts._month = ssd.getMonth();
+   this._min_date = ssd;
+   this._max_date = sd;
+}
+
+})();
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/sources/ical.js b/addons/base_calendar/static/lib/dhtmlxScheduler/sources/ical.js
new file mode 100644
index 00000000000..ab6fdb0101c
--- /dev/null
+++ b/addons/base_calendar/static/lib/dhtmlxScheduler/sources/ical.js
@@ -0,0 +1,65 @@
+scheduler.ical={
+	parse:function(str){
+		var data = str.match(RegExp(this.c_start+"[^\f]*"+this.c_end,""));
+		if (!data.length) return;
+		
+		//unfolding 
+		data[0]=data[0].replace(/[\r\n]+(?=[a-z \t])/g," ");
+		//drop property
+		data[0]=data[0].replace(/\;[^:\r\n]*/g,"");
+		
+		
+		var incoming=[];
+		var match;
+		var event_r = RegExp("(?:"+this.e_start+")([^\f]*?)(?:"+this.e_end+")","g");
+		while (match=event_r.exec(data)){
+			var e={};
+			var param;
+			var param_r = /[^\r\n]+[\r\n]+/g;
+			while (param=param_r.exec(match[1]))
+				this.parse_param(param.toString(),e);
+			if (e.uid && !e.id) e.id = e.uid; //fallback to UID, when ID is not defined
+			incoming.push(e);	
+		}
+		return incoming;
+	},
+	parse_param:function(str,obj){
+		var d = str.indexOf(":"); 
+			if (d==-1) return;
+		
+		var name = str.substr(0,d).toLowerCase();
+		var value = str.substr(d+1).replace(/\\\,/g,",").replace(/[\r\n]+$/,"");
+		if (name=="summary")
+			name="text";
+		else if (name=="dtstart"){
+			name = "start_date";
+			value = this.parse_date(value,0,0);
+		}
+		else if (name=="dtend"){
+			name = "end_date";
+			if (obj.start_date && obj.start_date.getHours()==0)
+				value = this.parse_date(value,24,00);
+			else
+				value = this.parse_date(value,23,59);
+		}
+		obj[name]=value;
+	},
+	parse_date:function(value,dh,dm){
+		var t = value.split("T");	
+		if (t[1]){
+			dh=t[1].substr(0,2);
+			dm=t[1].substr(2,2);
+		}
+		var dy = t[0].substr(0,4);
+		var dn = parseInt(t[0].substr(4,2),10)-1;
+		var dd = t[0].substr(6,2);
+		if (scheduler.config.server_utc && !t[1]) { // if no hours/minutes were specified == full day event
+			return new Date(Date.UTC(dy,dn,dd,dh,dm)) ;
+		}
+		return new Date(dy,dn,dd,dh,dm);
+	},
+	c_start:"BEGIN:VCALENDAR",
+	e_start:"BEGIN:VEVENT",
+	e_end:"END:VEVENT",
+	c_end:"END:VCALENDAR"	
+};
\ No newline at end of file
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/sources/layout.css b/addons/base_calendar/static/lib/dhtmlxScheduler/sources/layout.css
new file mode 100644
index 00000000000..4818d92db21
--- /dev/null
+++ b/addons/base_calendar/static/lib/dhtmlxScheduler/sources/layout.css
@@ -0,0 +1,179 @@
+.dhx_cal_container{
+	background-color:#C2D5FC;
+	font-family:Tahoma; 
+	font-size:8pt;
+	position:relative;
+	overflow:hidden;
+}
+.dhx_cal_container div{
+	-moz-user-select:none;    
+	-moz-user-select:-moz-none;    
+}
+.dhx_cal_navline{
+	height:20px;
+	position:absolute;
+	z-index:3;
+	width:750px;
+	color:#2F3A48;
+}
+.dhx_cal_navline div{ 
+	position:absolute;
+	top:2px; 
+	white-space:nowrap;
+}
+.dhx_cal_navline .dhx_cal_date{
+	font-weight:600;
+	left:210px;
+}
+.dhx_cal_button .dhx_left_bg{
+	width:1px; overflow:hidden;
+	height:17px;
+	z-index:20;
+	top:0px;
+}
+.dhx_cal_prev_button{
+	background-image:url(imgs/buttons.png);
+	background-position:0px 0px;
+	width:29px; height:17px;
+	left:50px; cursor:pointer;
+}
+.dhx_cal_next_button{
+	background-image:url(imgs/buttons.png);
+	background-position: -30px 0px;
+	width:29px; height:17px;
+	left:80px; cursor:pointer;
+}
+.dhx_cal_today_button{
+	background-image:url(imgs/buttons.png);
+	background-position: -60px 0px;
+	width:75px; height:17px;
+	left:112px; cursor:pointer;
+	text-align:center;
+	text-decoration:underline;
+}
+.dhx_cal_tab{
+	background-image:url(imgs/white_tab.png);
+	width:61px; height:19px;
+	text-align:center;
+	text-decoration:underline;
+	padding-top:3px; cursor:pointer;
+}
+.dhx_cal_tab.active{
+	background-image:url(imgs/blue_tab.png);
+	text-decoration:none;
+	height:20px;
+	padding-top:2px; cursor:default;
+	font-weight:bold;
+}
+.dhx_cal_header{
+	position:absolute;
+	left:10px; 	top:23px;
+	width:750px;
+	border-top:1px dotted #8894A3;
+	border-right:1px dotted #8894A3;
+	z-index:2;
+	overflow:hidden;
+	color:#2F3A48;
+}
+.dhx_cal_data{
+	border-top:1px dotted #8894A3;
+	position:absolute;
+	top:44px;
+	width:600px;
+	overflow-y:auto;
+	overflow-x:hidden;
+}
+.dhx_scale_bar{
+	position:absolute;	
+	text-align:center;
+	background-color:#C2D5FC;
+	padding-top:3px;
+	border-left:1px dotted #586A7E;
+}
+.dhx_scale_holder{
+	position:absolute;	
+	border-right:1px dotted #586A7E;
+	background-image:url(imgs/databg.png);
+}
+.dhx_scale_holder_now{
+	position:absolute;	
+	border-right:1px dotted #586A7E;
+	background-image:url(imgs/databg_now.png);
+}
+.dhx_scale_hour{
+	height:41px;
+	width:50px;
+	border-bottom:1px dotted #8894A3;
+	background-color:#C2D5FC;
+	text-align:center;
+	line-height:40px;
+	color:#586A7E;
+	overflow:hidden;
+}
+.dhx_month_head{
+	background-color:#EBEFF4;
+	color:#2F3A48;	
+	border-right:1px dotted #586A7E;
+	height:18px;
+	padding-right:5px;
+	padding-top:3px;
+	text-align:right;
+}
+.dhx_month_body{
+	border-right:1px dotted #586A7E;
+	border-bottom:1px dotted #586A7E;
+	background-color:#FFFFFF;
+}
+.dhx_now .dhx_month_body{
+	background-color:#E2EDFF;
+}
+.dhx_after  .dhx_month_body, .dhx_before .dhx_month_body{
+	background-color:#ECECEC;
+}
+.dhx_after  .dhx_month_head, .dhx_before .dhx_month_head{
+	background-color:#E2E3E6;
+	color:#94A6BB;
+}
+.dhx_now .dhx_month_head{
+	background-color:#D1DEF4;
+	font-weight:bold;
+}
+.dhx_cal_drag{
+	position:absolute;
+	z-index:9999;
+	background-color:#FFE763;
+	border:1px solid #B7A543;
+	opacity:0.5;
+	filter:alpha(opacity=50);
+}
+.dhx_loading{
+	position:absolute;
+	width:128px;
+	height:15px;
+	background-image:url(imgs/loading.gif);
+	z-index:9999;
+}
+.dhx_multi_day_icon, .dhx_multi_day{
+	position:absolute;
+	background-color:#E1E6FF;
+	background-repeat:no-repeat;
+	border-bottom:1px dotted #8894A3;
+	border-left:1px dotted #8894A3;
+}
+.dhx_multi_day_icon{
+	background-image:url(imgs/clock_big.gif);
+}
+.dhx_multi_day_icon_small{
+	background-image:url(imgs/clock_small.gif);	
+}
+.dhx_multi_day_icon, .dhx_multi_day_icon_small{
+	background-position: center center;
+	position:absolute;
+	background-color:#E1E6FF;
+	background-repeat:no-repeat;
+	border-bottom:1px dotted #8894A3;
+	border-left:1px dotted #8894A3;	
+}
+.dhtmlxLayoutPolyContainer_dhx_skyblue 	.dhx_cal_container {
+	background-color: #d0e5ff;
+}
\ No newline at end of file
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/sources/lightbox.css b/addons/base_calendar/static/lib/dhtmlxScheduler/sources/lightbox.css
new file mode 100644
index 00000000000..5781bc3d3b5
--- /dev/null
+++ b/addons/base_calendar/static/lib/dhtmlxScheduler/sources/lightbox.css
@@ -0,0 +1,151 @@
+	.dhx_cal_light{
+		height:400px;
+		light:300px;		
+		background-color:#FFE763;
+		
+		font-family:Tahoma;
+		font-size:8pt;
+		border:1px solid #B7A64B;
+		color:#887A2E;		
+		
+		position:absolute;
+		z-index:10001;
+		
+		width:580px;
+		height:300px;
+	}
+	.dhx_mark{
+		position:relative; top:3px;
+		background-image:url('./imgs/controls.gif');
+		background-position: 0px -43px;
+		padding-left:10px;
+	}
+	.dhx_ie6 .dhx_mark{
+		background-position: 6px -41px;
+	}
+	
+	.dhx_cal_light select{
+		font-family:Tahoma;
+		font-size:8pt;
+		color:#887A2E;		
+		padding:2px;
+		margin:0px;
+	}
+	.dhx_cal_ltitle{
+		padding:2px 0px 2px 5px;
+		overflow:hidden;
+		white-space:nowrap;
+	}
+	.dhx_cal_ltitle span{
+		white-space:nowrap;
+	}
+	.dhx_cal_lsection{
+		background-color:#DBCF8C;
+		color:#FFF4B5;
+		font-size:18pt;
+		font-weight:bold;
+		padding:5px 0px 3px 10px;
+	}
+	.dhx_cal_ltext{
+		padding:2px	0px 2px 10px;
+		height:130px;
+		height=140px;
+		overflow:hidden;
+	}
+	.dhx_cal_ltext textarea{
+		background-color:transparent;
+		overflow:auto;
+		border:none;
+		color:#887A2E;
+		height:100%;
+		width:100%;
+		outline:none !important;
+	}
+	.dhx_time{
+		font-weight:bold;
+	}
+	.dhx_cal_light .dhx_title{
+		padding-left:10px;
+	}
+	.dhx_cal_larea{
+		border:1px solid #DCC43E;
+		background-color:#FFF4B5;
+		overflow:hidden;
+		
+		margin-left:3px;
+		
+		width:572px;
+		height:1px;
+	}
+	.dhx_btn_set{
+		padding:5px 10px 0px 10px;
+		float:left;
+	}
+	.dhx_btn_set div{
+		float:left;
+		height:21px;
+		line-height:21px;
+		vertical-align:middle;
+		cursor:pointer;
+	}
+	.dhx_save_btn{
+		background-image:url('./imgs/controls.gif');
+		background-position:-84px 0px;
+		width:21px;
+		
+	}
+	.dhx_cancel_btn{
+		background-image:url('./imgs/controls.gif');
+		background-position:-63px 0px;
+		width:20px;
+	}
+	.dhx_delete_btn{
+		background-image:url('./imgs/controls.gif');
+		background-position:-42px 0px;
+		width:20px;
+	}
+	.dhx_cal_cover{
+		width:100%;
+		height:100%;	
+		position:absolute;
+		z-index:10000;
+		top:0px;
+		left:0px;
+		background-color:black;
+		
+		opacity:0.1;
+		filter:alpha(opacity=10);
+	}
+	.dhx_custom_button{
+		padding:0px 3px 0px 3px;
+		color:#887A2E;
+		font-family:Tahoma;
+		font-size:8pt;
+		background-color:#FFE763;
+		font-weight:normal;
+		margin-right:5px;
+		margin-top:5px;
+		cursor:pointer;
+	}
+	.dhx_custom_button div{
+		cursor:pointer;
+		float:left;
+		height:21px;
+		line-height:21px;
+		vertical-align:middle;
+	}	
+	
+	.dhx_fullday_checkbox {
+		padding-top: 5px;
+		float:right;
+	}
+	
+	.dhx_fullday_checkbox input{
+		vertical-align: middle;
+	}
+	
+	.dhx_fullday_checkbox label{
+		font-size: 12pt;
+		font-weight: bold;
+		vertical-align: middle;		
+	}
\ No newline at end of file
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/sources/lightbox.js b/addons/base_calendar/static/lib/dhtmlxScheduler/sources/lightbox.js
new file mode 100644
index 00000000000..2a928a34831
--- /dev/null
+++ b/addons/base_calendar/static/lib/dhtmlxScheduler/sources/lightbox.js
@@ -0,0 +1,340 @@
+scheduler.form_blocks={
+	textarea:{
+		render:function(sns){
+			var height=(sns.height||"130")+"px";
+			return "<div class='dhx_cal_ltext' style='height:"+height+";'><textarea></textarea></div>";
+		},
+		set_value:function(node,value,ev){
+			node.firstChild.value=value||"";
+		},
+		get_value:function(node,ev){
+			return node.firstChild.value;
+		},
+		focus:function(node){
+			var a=node.firstChild; a.select(); a.focus(); 
+		}
+	},
+	select:{
+		render:function(sns){
+			var height=(sns.height||"23")+"px";
+			var html="<div class='dhx_cal_ltext' style='height:"+height+";'><select style='width:552px;'>";
+			for (var i=0; i < sns.options.length; i++)
+				html+="<option value='"+sns.options[i].key+"'>"+sns.options[i].label+"</option>";
+			html+="</select></div>";
+			return html;
+		},
+		set_value:function(node,value,ev){
+			if (typeof value == "undefined")
+				value = (node.firstChild.options[0]||{}).value;
+			node.firstChild.value=value||"";
+		},
+		get_value:function(node,ev){
+			return node.firstChild.value;
+		},
+		focus:function(node){
+			var a=node.firstChild; if (a.select) a.select(); a.focus(); 
+		}
+	},	
+	time:{
+		render:function(){
+			//hours
+			var cfg = scheduler.config;
+			var dt = this.date.date_part(new Date());
+			var last = 24*60, first = 0;
+			if(scheduler.config.limit_time_select){
+				last = 60*cfg.last_hour+1;
+				first = 60*cfg.first_hour;
+				dt.setHours(cfg.first_hour);
+			}
+				
+			var html="<select>";
+			for (var i=first; i<last; i+=this.config.time_step*1){
+				var time=this.templates.time_picker(dt);
+				html+="<option value='"+i+"'>"+time+"</option>";
+				dt=this.date.add(dt,this.config.time_step,"minute");
+			}
+			
+			//days
+			html+="</select> <select>";
+			for (var i=1; i < 32; i++) 
+				html+="<option value='"+i+"'>"+i+"</option>";
+			
+			//month
+			html+="</select> <select>";
+			for (var i=0; i < 12; i++) 
+				html+="<option value='"+i+"'>"+this.locale.date.month_full[i]+"</option>";
+			
+			//year
+			html+="</select> <select>";
+			dt = dt.getFullYear()-5; //maybe take from config?
+			for (var i=0; i < 10; i++) 
+				html+="<option value='"+(dt+i)+"'>"+(dt+i)+"</option>";
+			html+="</select> ";
+			
+			return "<div style='height:30px; padding-top:0px; font-size:inherit;' class='dhx_cal_lsection dhx_section_time'>"+html+"<span style='font-weight:normal; font-size:10pt;'> &nbsp;&ndash;&nbsp; </span>"+html+"</div>";			
+
+		},
+		set_value:function(node,value,ev){
+
+			var s=node.getElementsByTagName("select");
+
+			if(scheduler.config.full_day) {
+				if (!node._full_day){
+					node.previousSibling.innerHTML+="<div class='dhx_fullday_checkbox'><label><input type='checkbox' name='full_day' value='true'> "+scheduler.locale.labels.full_day+"&nbsp;</label></input></div>";
+					node._full_day=true;
+				}
+				var input=node.previousSibling.getElementsByTagName("input")[0];
+				var isFulldayEvent = (scheduler.date.time_part(ev.start_date)==0 && scheduler.date.time_part(ev.end_date)==0 && ev.end_date.valueOf()-ev.start_date.valueOf() < 2*24*60*60*1000);
+				input.checked = isFulldayEvent;
+				
+				for(var k in s)
+					s[k].disabled=input.checked;
+
+				input.onclick = function(){ 
+					if(input.checked) {
+						var start_date = new Date(ev.start_date);
+						var end_date = new Date(ev.end_date);
+						
+						scheduler.date.date_part(start_date);
+						end_date = scheduler.date.add(start_date, 1, "day")
+					} 
+					for(var i in s)
+						s[i].disabled=input.checked;
+					
+					_fill_lightbox_select(s,0,start_date||ev.start_date);
+					_fill_lightbox_select(s,4,end_date||ev.end_date);
+				}
+			}
+			
+			if(scheduler.config.auto_end_date && scheduler.config.event_duration) {
+				function _update_lightbox_select() {
+					ev.start_date=new Date(s[3].value,s[2].value,s[1].value,0,s[0].value);
+					ev.end_date.setTime(ev.start_date.getTime() + (scheduler.config.event_duration * 60 * 1000));
+					_fill_lightbox_select(s,4,ev.end_date);
+				}
+				for(var i=0; i<4; i++) {
+					s[i].onchange = _update_lightbox_select;
+				}
+			}
+			
+			function _fill_lightbox_select(s,i,d){
+				s[i+0].value=Math.round((d.getHours()*60+d.getMinutes())/scheduler.config.time_step)*scheduler.config.time_step;	
+				s[i+1].value=d.getDate();
+				s[i+2].value=d.getMonth();
+				s[i+3].value=d.getFullYear();
+			}
+			
+			_fill_lightbox_select(s,0,ev.start_date);
+			_fill_lightbox_select(s,4,ev.end_date);
+		},
+		get_value:function(node,ev){
+			s=node.getElementsByTagName("select");
+			ev.start_date=new Date(s[3].value,s[2].value,s[1].value,0,s[0].value);
+			ev.end_date=new Date(s[7].value,s[6].value,s[5].value,0,s[4].value);
+			if (ev.end_date<=ev.start_date) 
+				ev.end_date=scheduler.date.add(ev.start_date,scheduler.config.time_step,"minute");
+		},
+		focus:function(node){
+			node.getElementsByTagName("select")[0].focus(); 
+		}
+	}
+}
+scheduler.showCover=function(box){
+	this.show_cover();
+	if (box){
+		box.style.display="block";
+		var pos = getOffset(this._obj);
+		box.style.top=Math.round(pos.top+(this._obj.offsetHeight-box.offsetHeight)/2)+"px";
+		box.style.left=Math.round(pos.left+(this._obj.offsetWidth-box.offsetWidth)/2)+"px";	
+	}
+}
+scheduler.showLightbox=function(id){
+	if (!id) return;
+	if (!this.callEvent("onBeforeLightbox",[id])) return;
+	var box = this._get_lightbox();
+	this.showCover(box);
+	this._fill_lightbox(id,box);
+	this.callEvent("onLightbox",[id]);
+}
+scheduler._fill_lightbox=function(id,box){ 
+	var ev=this.getEvent(id);
+	var s=box.getElementsByTagName("span");
+	if (scheduler.templates.lightbox_header){
+		s[1].innerHTML="";
+		s[2].innerHTML=scheduler.templates.lightbox_header(ev.start_date,ev.end_date,ev);
+	} else {
+		s[1].innerHTML=this.templates.event_header(ev.start_date,ev.end_date,ev);
+		s[2].innerHTML=(this.templates.event_bar_text(ev.start_date,ev.end_date,ev)||"").substr(0,70); //IE6 fix	
+	}
+	
+	
+	var sns = this.config.lightbox.sections;	
+	for (var i=0; i < sns.length; i++) {
+		var node=document.getElementById(sns[i].id).nextSibling;
+		var block=this.form_blocks[sns[i].type];
+		block.set_value.call(this,node,ev[sns[i].map_to],ev, sns[i])
+		if (sns[i].focus)
+			block.focus.call(this,node);
+	};
+	
+	scheduler._lightbox_id=id;
+}
+scheduler._lightbox_out=function(ev){
+	var sns = this.config.lightbox.sections;	
+	for (var i=0; i < sns.length; i++) {
+		var node=document.getElementById(sns[i].id).nextSibling;
+		var block=this.form_blocks[sns[i].type];
+		var res=block.get_value.call(this,node,ev, sns[i]);
+		if (sns[i].map_to!="auto")
+			ev[sns[i].map_to]=res;
+	}
+	return ev;
+}
+scheduler._empty_lightbox=function(){
+	var id=scheduler._lightbox_id;
+	var ev=this.getEvent(id);
+	var box=this._get_lightbox();
+	
+	this._lightbox_out(ev);
+	
+	ev._timed=this.is_one_day_event(ev);
+	this.setEvent(ev.id,ev);
+	this._edit_stop_event(ev,true)
+	this.render_view_data();
+}
+scheduler.hide_lightbox=function(id){
+	this.hideCover(this._get_lightbox());
+	this._lightbox_id=null;
+	this.callEvent("onAfterLightbox",[]);
+}
+scheduler.hideCover=function(box){
+	if (box) box.style.display="none";
+	this.hide_cover();
+}
+scheduler.hide_cover=function(){
+	if (this._cover) 
+		this._cover.parentNode.removeChild(this._cover);
+	this._cover=null;
+}
+scheduler.show_cover=function(){
+	this._cover=document.createElement("DIV");
+	this._cover.className="dhx_cal_cover";
+	document.body.appendChild(this._cover);
+}
+scheduler.save_lightbox=function(){
+	if (this.checkEvent("onEventSave") && 						!this.callEvent("onEventSave",[this._lightbox_id,this._lightbox_out({ id: this._lightbox_id}), this._new_event]))
+		return;
+	this._empty_lightbox()
+	this.hide_lightbox();
+};
+scheduler.startLightbox = function(id, box){
+	this._lightbox_id=id;
+	this.showCover(box);
+}
+scheduler.endLightbox = function(mode, box){
+	this._edit_stop_event(scheduler.getEvent(this._lightbox_id),mode);
+	if (mode)
+		scheduler.render_view_data();
+	this.hideCover(box);
+};
+scheduler.resetLightbox = function(){
+	scheduler._lightbox = null;
+};
+scheduler.cancel_lightbox=function(){
+	this.callEvent("onEventCancel",[this._lightbox_id, this._new_event]);
+	this.endLightbox(false);
+	this.hide_lightbox();
+};
+scheduler._init_lightbox_events=function(){
+	this._get_lightbox().onclick=function(e){
+		var src=e?e.target:event.srcElement;
+		if (!src.className) src=src.previousSibling;
+		if (src && src.className)
+			switch(src.className){
+				case "dhx_save_btn":
+					scheduler.save_lightbox();
+					break;
+				case "dhx_delete_btn":
+					var c=scheduler.locale.labels.confirm_deleting; 
+					if (!c||confirm(c)) {
+						scheduler.deleteEvent(scheduler._lightbox_id);
+						scheduler._new_event = null; //clear flag, if it was unsaved event
+						scheduler.hide_lightbox();
+					}
+					break;
+				case "dhx_cancel_btn":
+					scheduler.cancel_lightbox();
+					break;
+					
+				default:
+					if (src.className.indexOf("dhx_custom_button_")!=-1){
+						var index = src.parentNode.getAttribute("index");
+						var block=scheduler.form_blocks[scheduler.config.lightbox.sections[index].type];
+						var sec = src.parentNode.parentNode;
+						block.button_click(index,src,sec,sec.nextSibling);	
+					}
+			}
+	};
+	this._get_lightbox().onkeypress=function(e){
+		switch((e||event).keyCode){
+			case scheduler.keys.edit_save:
+				if ((e||event).shiftKey) return;
+				scheduler.save_lightbox();
+				break;
+			case scheduler.keys.edit_cancel:
+				scheduler.cancel_lightbox();
+				break;
+		}
+	}
+}
+scheduler.setLightboxSize=function(){
+	var d = this._lightbox;
+	if (!d) return;
+	
+	var con = d.childNodes[1];
+	con.style.height="0px";
+	con.style.height=con.scrollHeight+"px";		
+	d.style.height=con.scrollHeight+50+"px";		
+	con.style.height=con.scrollHeight+"px";		 //it is incredible , how ugly IE can be 	
+}
+
+scheduler._get_lightbox=function(){
+	if (!this._lightbox){
+		var d=document.createElement("DIV");
+		d.className="dhx_cal_light";
+		if (/msie|MSIE 6/.test(navigator.userAgent))
+			d.className+=" dhx_ie6";
+		d.style.visibility="hidden";
+		d.innerHTML=this._lightbox_template;
+		document.body.insertBefore(d,document.body.firstChild);
+		this._lightbox=d;
+		
+		var sns=this.config.lightbox.sections;
+		var html="";
+		for (var i=0; i < sns.length; i++) {
+			var block=this.form_blocks[sns[i].type];
+			if (!block) continue; //ignore incorrect blocks
+			sns[i].id="area_"+this.uid();
+			var button = "";
+			if (sns[i].button) button = "<div style='float:right;' class='dhx_custom_button' index='"+i+"'><div class='dhx_custom_button_"+sns[i].name+"'></div><div>"+this.locale.labels["button_"+sns[i].button]+"</div></div>";
+			html+="<div id='"+sns[i].id+"' class='dhx_cal_lsection'>"+button+this.locale.labels["section_"+sns[i].name]+"</div>"+block.render.call(this,sns[i]);
+		};
+		
+	
+		//localization
+		var ds=d.getElementsByTagName("div");
+		ds[4].innerHTML=scheduler.locale.labels.icon_save;
+		ds[7].innerHTML=scheduler.locale.labels.icon_cancel;
+		ds[10].innerHTML=scheduler.locale.labels.icon_delete;
+		//sections
+		ds[1].innerHTML=html;
+		//sizes
+		this.setLightboxSize();
+	
+		this._init_lightbox_events(this);
+		d.style.display="none";
+		d.style.visibility="visible";
+	}
+	return this._lightbox;
+}
+scheduler._lightbox_template="<div class='dhx_cal_ltitle'><span class='dhx_mark'>&nbsp;</span><span class='dhx_time'></span><span class='dhx_title'></span></div><div class='dhx_cal_larea'></div><div class='dhx_btn_set'><div class='dhx_save_btn'></div><div>&nbsp;</div></div><div class='dhx_btn_set'><div class='dhx_cancel_btn'></div><div>&nbsp;</div></div><div class='dhx_btn_set' style='float:right;'><div class='dhx_delete_btn'></div><div>&nbsp;</div></div>";
\ No newline at end of file
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/sources/load.js b/addons/base_calendar/static/lib/dhtmlxScheduler/sources/load.js
new file mode 100644
index 00000000000..cb81b4ee2ee
--- /dev/null
+++ b/addons/base_calendar/static/lib/dhtmlxScheduler/sources/load.js
@@ -0,0 +1,184 @@
+scheduler._loaded={};
+scheduler._load=function(url,from){
+	url=url||this._load_url;
+	url+=(url.indexOf("?")==-1?"?":"&")+"timeshift="+(new Date()).getTimezoneOffset();
+	if (this.config.prevent_cache)	url+="&uid="+this.uid();
+	var to;
+	from=from||this._date;
+	
+	if (this._load_mode){
+		var lf = this.templates.load_format;
+		
+		from = this.date[this._load_mode+"_start"](new Date(from.valueOf()));
+		while (from>this._min_date) from=this.date.add(from,-1,this._load_mode);
+		to = from;
+		
+		var cache_line = true;
+		while (to<this._max_date){
+			to=this.date.add(to,1,this._load_mode);	
+			if (this._loaded[lf(from)] && cache_line) 
+				from=this.date.add(from,1,this._load_mode);	
+			else cache_line = false;
+		}
+		
+		var temp_to=to;
+		do {
+			to = temp_to;
+			temp_to=this.date.add(to,-1,this._load_mode);
+		} while (temp_to>from && this._loaded[lf(temp_to)]);
+			
+		if (to<=from) 
+			return false; //already loaded
+		dhtmlxAjax.get(url+"&from="+lf(from)+"&to="+lf(to),function(l){scheduler.on_load(l);});
+		while(from<to){
+			this._loaded[lf(from)]=true;
+			from=this.date.add(from,1,this._load_mode);	
+		}
+	} else
+		dhtmlxAjax.get(url,function(l){scheduler.on_load(l);});
+	this.callEvent("onXLS",[]);
+	return true;
+}
+scheduler.on_load=function(loader){
+	this._loading=true;
+	if (this._process)
+		var evs=this[this._process].parse(loader.xmlDoc.responseText);
+	else
+		var evs=this._magic_parser(loader);
+	
+	this._not_render=true;
+	for (var i=0; i<evs.length; i++){
+		if (!this.callEvent("onEventLoading",[evs[i]])) continue;
+		this.addEvent(evs[i]);
+	}
+	this._not_render=false;
+	if (this._render_wait) this.render_view_data();
+	
+	if (this._after_call) this._after_call();
+	this._after_call=null;
+	this._loading=false;
+	this.callEvent("onXLE",[]);
+}
+scheduler.json={};
+scheduler.json.parse = function(data){
+	if (typeof data == "string"){
+		eval("scheduler._temp = "+data+";");
+		data = scheduler._temp;
+	}
+	var evs = [];
+	for (var i=0; i < data.length; i++){
+		data[i].start_date = scheduler.templates.xml_date(data[i].start_date);
+		data[i].end_date = scheduler.templates.xml_date(data[i].end_date);
+		evs.push(data[i]);
+	}
+	return evs;
+}
+scheduler.parse=function(data,type){
+	this._process=type;
+	this.on_load({xmlDoc:{responseText:data}});
+}
+scheduler.load=function(url,call){
+	if (typeof call == "string"){
+		this._process=call;
+		call = arguments[2];
+	}
+	
+	this._load_url=url;
+	this._after_call=call;
+	this._load(url,this._date);
+};
+//possible values - day,week,month,year,all
+scheduler.setLoadMode=function(mode){
+	if (mode=="all") mode="";
+	this._load_mode=mode;
+};
+
+//current view by default, or all data if "true" as parameter provided
+scheduler.refresh=function(refresh_all){
+	alert("not implemented");
+	/*
+	this._loaded={};
+	this._load();
+	*/
+}
+scheduler.serverList=function(name){
+	return this.serverList[name] = (this.serverList[name]||[]);
+}
+
+scheduler._userdata={};
+scheduler._magic_parser=function(loader){
+	if (!loader.getXMLTopNode){ //from a string
+		var xml_string = loader.xmlDoc.responseText;
+		loader = new dtmlXMLLoaderObject(function(){});
+		loader.loadXMLString(xml_string);
+	}
+	
+	var xml=loader.getXMLTopNode("data");
+	if (xml.tagName!="data") return [];//not an xml
+	
+	var opts = loader.doXPath("//coll_options");
+	for (var i=0; i < opts.length; i++) {
+		var bind = opts[i].getAttribute("for");
+		var arr = this.serverList[bind];
+		if (!arr) continue;
+		arr.splice(0,arr.length);	//clear old options
+		var itms = loader.doXPath(".//item",opts[i]);
+		for (var j=0; j < itms.length; j++)
+			arr.push({ key:itms[j].getAttribute("value"), label:itms[j].getAttribute("label")});
+	}
+	if (opts.length)
+		scheduler.callEvent("onOptionsLoad",[]);
+	
+	var ud=loader.doXPath("//userdata");	
+	for (var i=0; i < ud.length; i++) {
+		var udx = this.xmlNodeToJSON(ud[i]);
+		this._userdata[udx.name]=udx.text;
+	};
+	
+	var evs=[];
+	var xml=loader.doXPath("//event");
+	
+	
+	for (var i=0; i < xml.length; i++) {
+		evs[i]=this.xmlNodeToJSON(xml[i])
+		
+		evs[i].text=evs[i].text||evs[i]._tagvalue;
+		evs[i].start_date=this.templates.xml_date(evs[i].start_date);
+		evs[i].end_date=this.templates.xml_date(evs[i].end_date);
+	}
+	return evs;
+}
+scheduler.xmlNodeToJSON = function(node){
+        var t={};
+        for (var i=0; i<node.attributes.length; i++)
+            t[node.attributes[i].name]=node.attributes[i].value;
+        
+        for (var i=0; i<node.childNodes.length; i++){
+        	var child=node.childNodes[i];
+            if (child.nodeType==1)
+                t[child.tagName]=child.firstChild?child.firstChild.nodeValue:"";
+        }
+                 
+        if (!t.text) t.text=node.firstChild?node.firstChild.nodeValue:"";
+        
+        return t;
+}
+
+scheduler.attachEvent("onXLS",function(){
+	if (this.config.show_loading===true){
+		var t;
+		t=this.config.show_loading=document.createElement("DIV");
+		t.className='dhx_loading';
+		t.style.left = Math.round((this._x-128)/2)+"px";
+		t.style.top = Math.round((this._y-15)/2)+"px";
+		this._obj.appendChild(t);
+	}
+});
+scheduler.attachEvent("onXLE",function(){
+	var t;
+	if (t=this.config.show_loading)
+		if (typeof t == "object"){
+		this._obj.removeChild(t);
+		this.config.show_loading=true;
+	}
+});
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/sources/locale.js b/addons/base_calendar/static/lib/dhtmlxScheduler/sources/locale.js
new file mode 100644
index 00000000000..ecf3cff5e13
--- /dev/null
+++ b/addons/base_calendar/static/lib/dhtmlxScheduler/sources/locale.js
@@ -0,0 +1,40 @@
+scheduler.locale={
+	date:{
+		month_full:["January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December"],
+		month_short:["Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"],
+		day_full:["Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday"],
+    	day_short:["Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"]
+    },
+    labels:{
+    	dhx_cal_today_button:"Today",
+    	day_tab:"Day",
+    	week_tab:"Week",
+    	month_tab:"Month",
+    	new_event:"New event",
+		icon_save:"Save",
+		icon_cancel:"Cancel",
+		icon_details:"Details",
+		icon_edit:"Edit",
+		icon_delete:"Delete",
+		confirm_closing:"",//Your changes will be lost, are your sure ?
+		confirm_deleting:"Event will be deleted permanently, are you sure?",
+		section_description:"Description",
+		section_time:"Time period",
+		full_day:"Full day",
+		
+		/*recurring events*/
+		confirm_recurring:"Do you want to edit the whole set of repeated events?",
+		section_recurring:"Repeat event",
+		button_recurring:"Disabled",
+		button_recurring_open:"Enabled",
+		
+		/*agenda view extension*/
+		agenda_tab:"Agenda",
+		date:"Date",
+		description:"Description",
+		
+		/*year view extension*/
+		year_tab:"Year"
+    }
+}
+
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/sources/locale_ar.js b/addons/base_calendar/static/lib/dhtmlxScheduler/sources/locale_ar.js
new file mode 100644
index 00000000000..335e59d4515
--- /dev/null
+++ b/addons/base_calendar/static/lib/dhtmlxScheduler/sources/locale_ar.js
@@ -0,0 +1,38 @@
+//v.2.0 build 90722
+/*
+Copyright DHTMLX LTD. http://www.dhtmlx.com
+You allowed to use this component or parts of it under GPL terms
+To use it on other terms or get Professional edition of the component please contact us at sales@dhtmlx.com
+*/
+scheduler.locale={
+	date:{
+		month_full:["كانون الثاني", "شباط", "آذار", "نيسان", "أيار", "حزيران", "تموز", "آب", "أيلول", "تشرين الأول", "تشرين الثاني", "كانون الأول"],
+		month_short:["يناير", "�براير", "مارس", "أبريل", "مايو", "يونيو", "يوليو", "أغسطس", "سبتمبر", "أكتوبر", "نو�مبر", "ديسمبر"],
+		day_full:["الأحد", "الأثنين", "ألثلاثاء", "الأربعاء", "ألحميس", "ألجمعة", "السبت"],
+    	day_short:["احد", "اثنين", "ثلاثاء", "اربعاء", "خميس", "جمعة", "سبت"]
+    },
+    labels:{
+    	dhx_cal_today_button:"اليوم",
+    	day_tab:"يوم",
+    	week_tab:"أسبوع",
+    	month_tab:"شهر",
+    	new_event:"حدث جديد",
+		icon_save:"اخزن",
+		icon_cancel:"الغاء",
+		icon_details:"ت�اصيل",
+		icon_edit:"تحرير",
+		icon_delete:"حذ�",
+		confirm_closing:"التغييرات سو� تضيع, هل انت متأكد؟",//Your changes will be lost, are your sure ?
+		confirm_deleting:"الحدث سيتم حذ�ها نهائيا ، هل أنت متأكد؟",
+		section_description:"الوص�",
+		section_time:"ال�ترة الزمنية",
+		full_day:"طوال اليوم",
+		
+		confirm_recurring:"هل تريد تحرير مجموعة كاملة من الأحداث المتكررة؟",
+		section_recurring:"تكرار الحدث",
+		button_recurring:"تعطيل",
+		button_recurring_open:"تمكين"
+    }
+}
+
+
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/sources/locale_ca.js b/addons/base_calendar/static/lib/dhtmlxScheduler/sources/locale_ca.js
new file mode 100644
index 00000000000..00e941f60d7
--- /dev/null
+++ b/addons/base_calendar/static/lib/dhtmlxScheduler/sources/locale_ca.js
@@ -0,0 +1,41 @@
+/*
+	@Traducido por Vicente Adria Bohigues - vicenteadria@hotmail.com
+*/
+scheduler.locale={
+	date:{
+		month_full:["Gener", "Febrer", "Març", "Abril", "Maig", "Juny", "Juliol", "Agost", "Setembre", "Octubre", "Novembre", "Desembre"],
+		month_short:["Gen", "Feb", "Mar", "Abr", "Mai", "Jun", "Jul", "Ago", "Set", "Oct", "Nov", "Des"],
+		day_full:["Diumenge", "Dilluns", "Dimarts", "Dimecres", "Dijous", "Divendres", "Dissabte"],
+    	day_short:["Dg", "Dl", "Dm", "Dc", "Dj", "Dv", "Ds"]
+    },
+    labels:{
+    	dhx_cal_today_button:"Hui",
+    	day_tab:"Dia",
+    	week_tab:"Setmana",
+    	month_tab:"Mes",
+    	new_event:"Nou esdeveniment",
+		icon_save:"Guardar",
+		icon_cancel:"Cancel·lar",
+		icon_details:"Detalls",
+		icon_edit:"Editar",
+		icon_delete:"Esborrar",
+		confirm_closing:"", //"Els seus canvis es perdràn, continuar ?"
+		confirm_deleting:"L'esdeveniment s'esborrarà definitivament, continuar ?",
+		section_description:"Descripció",
+		section_time:"Periode de temps",
+		full_day:"Tot el dia",
+	
+		confirm_recurring:"¿Desitja modificar el conjunt d'esdeveniments repetits?",
+		section_recurring:"Repeteixca l'esdeveniment",
+		button_recurring:"Impedit",
+		button_recurring_open:"Permés",
+		
+		/*agenda view extension*/
+		agenda_tab:"Agenda",
+		date:"Data",
+		description:"Descripció",
+		
+		/*year view extension*/
+		year_tab:"Any"
+	}
+}
\ No newline at end of file
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/sources/locale_cn.js b/addons/base_calendar/static/lib/dhtmlxScheduler/sources/locale_cn.js
new file mode 100644
index 00000000000..3514ae969ac
--- /dev/null
+++ b/addons/base_calendar/static/lib/dhtmlxScheduler/sources/locale_cn.js
@@ -0,0 +1,46 @@
+/*
+Translation by FreezeSoul
+*/
+scheduler.config.day_date="%M %dæ—¥ %D";
+scheduler.config.default_date="%Yå¹´ %M %dæ—¥";
+scheduler.config.month_date="%Yå¹´ %M";
+
+scheduler.locale={
+	date: {
+		month_full: ["一月", "二月", "三月", "四月", "五月", "六月", "七月", "八月", "�月", "�月", "�一月", "�二月"],
+		month_short: ["1月", "2月", "3月", "4月", "5月", "6月", "7月", "8月", "9月", "10月", "11月", "12月"],
+		day_full: ["星期日", "星期一", "星期二", "星期三", "星期四", "星期五", "星期六"],
+		day_short: ["日", "一", "二", "三", "四", "五", "六"]
+	},
+	labels: {
+		dhx_cal_today_button: "今天",
+		day_tab: "æ—¥",
+		week_tab: "周",
+		month_tab: "月",
+		new_event: "新建日程",
+		icon_save: "�存",
+		icon_cancel: "关闭",
+		icon_details: "详细",
+		icon_edit: "编辑",
+		icon_delete: "删除",
+		confirm_closing: "请确认是�撤销修改!", //Your changes will be lost, are your sure?
+		confirm_deleting: "是�删除日程?",
+		section_description: "�述",
+		section_time: "时间范围",
+		full_day: "整天",
+
+		confirm_recurring:"请确认是�将日程设为��模�?",
+		section_recurring:"��周期",
+		button_recurring:"�用",
+		button_recurring_open:"�用",
+		
+		/*agenda view extension*/
+		agenda_tab:"议程",
+		date:"日期",
+		description:"说明",
+		
+		/*year view extension*/
+		year_tab:"今年"
+	}
+};
+
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/sources/locale_cs.js b/addons/base_calendar/static/lib/dhtmlxScheduler/sources/locale_cs.js
new file mode 100644
index 00000000000..729a2fc0329
--- /dev/null
+++ b/addons/base_calendar/static/lib/dhtmlxScheduler/sources/locale_cs.js
@@ -0,0 +1,40 @@
+scheduler.locale={
+	date:{
+		month_full:["Leden", "Únor", "Březen", "Duben", "Květen", "Červen", "Červenec", "Srpen", "Září", "Říjen", "Listopad", "Prosinec"],
+		month_short:["Led", "Ún", "Bře", "Dub", "Kvě", "Čer", "Čec", "Srp", "Září", "Říj", "List", "Pro"],
+		day_full:["Neděle", "Pondělí", "Úterý", "Středa", "Čtvrtek", "Pátek", "Sobota"],
+    	day_short:["Ne", "Po", "Út", "St", "Čt", "Pá", "So"]
+    },
+    labels:{
+    	dhx_cal_today_button:"Dnes",
+    	day_tab:"Den",
+    	week_tab:"Týden",
+    	month_tab:"Měsíc",
+    	new_event:"Nová událost",
+		icon_save:"Uložit",
+		icon_cancel:"Zpět",
+		icon_details:"Detail",
+		icon_edit:"Edituj",
+		icon_delete:"Smazat",
+		confirm_closing:"",//Vaše změny budou ztraceny, opravdu ?
+		confirm_deleting:"Událost bude trvale smazána, opravdu?",
+		section_description:"Poznámky",
+		section_time:"Doba platnosti",
+		
+		/*recurring events*/
+		confirm_recurring:"Přejete si upravit celou řadu opakovaných událostí?",
+		section_recurring:"Opakování události",
+		button_recurring:"Vypnuto",
+		button_recurring_open:"Zapnuto",
+		
+		/*agenda view extension*/
+		agenda_tab:"Program",
+		date:"Datum",
+		description:"Poznámka",
+		
+		/*year view extension*/
+		year_tab:"Rok",
+		full_day:"Full day"
+    }
+}
+
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/sources/locale_de.js b/addons/base_calendar/static/lib/dhtmlxScheduler/sources/locale_de.js
new file mode 100644
index 00000000000..9350b9c8f0b
--- /dev/null
+++ b/addons/base_calendar/static/lib/dhtmlxScheduler/sources/locale_de.js
@@ -0,0 +1,39 @@
+scheduler.locale={
+	date:{
+		month_full:[" Januar", " Februar", " März ", " April", " Mai", " Juni", " Juli", " August", " September ", " Oktober", " November ", " Dezember"],
+		month_short:["Jan", "Feb", "Mär", "Apr", "Mai", "Jun", "Jul", "Aug", "Sep", "Okt", "Nov", "Dec"],
+		day_full:[ "Sonntag", "Montag", "Dienstag", " Mittwoch", " Donnerstag", "Freitag", "Samstag"],
+    	day_short:["So", "Mo", "Di", "Mi", "Do", "Fr", "Sa"]
+    },
+    labels:{
+    	dhx_cal_today_button: "Heute",
+    	day_tab:"Tag",
+    	week_tab:"Woche",
+    	month_tab:"Monat",
+    	new_event:"neuer Eintrag",
+		icon_save:"Speichern",
+		icon_cancel:"Annulieren",
+		icon_details:"Details",
+		icon_edit:"Ändern",
+		icon_delete:"Löschen",
+		confirm_closing:"",//"Ihre Veränderungen werden verloren sein, wollen Sie ergänzen? "
+		confirm_deleting:"Der Eintrag wird gelöscht",
+		section_description:"Beschreibung",
+		section_time:"Zeitspanne",
+		full_day:"Ganzer Tag",
+		
+		confirm_recurring:"Wollen Sie alle Einträge bearbeiten (OK) oder nur diesen einzelnen Eintrag (Abbrechen)?",
+		section_recurring:"Wiederholung",
+		button_recurring:"Aus",
+		button_recurring_open:"An",
+			
+		/*agenda view extension*/
+		agenda_tab:"Agenda",
+		date:"Datum",
+		description:"Beschreibung",
+		
+		/*year view extension*/
+		year_tab:"Jahre"
+	}
+}
+
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/sources/locale_es.js b/addons/base_calendar/static/lib/dhtmlxScheduler/sources/locale_es.js
new file mode 100644
index 00000000000..44271de035a
--- /dev/null
+++ b/addons/base_calendar/static/lib/dhtmlxScheduler/sources/locale_es.js
@@ -0,0 +1,41 @@
+/*
+	@Autor Manuel Fernandez Panzuela - www.mfernandez.es
+*/
+scheduler.locale={
+	date:{
+		month_full:["Enero", "Febrero", "Marzo", "Abril", "Mayo", "Junio", "Julio", "Agosto", "Septiembre", "Octubre", "Noviembre", "Diciembre"],
+		month_short:["Ene", "Feb", "Mar", "Abr", "May", "Jun", "Jul", "Ago", "Sep", "Oct", "Nov", "Dic"],
+		day_full:["Domingo", "Lunes", "Martes", "Miércoles", "Jueves", "Viernes", "Sábado"],
+    	day_short:["Dom", "Lun", "Mar", "Mie", "Jue", "Vie", "Sab"]
+    },
+    labels:{
+    	dhx_cal_today_button:"Hoy",
+    	day_tab:"Día",
+    	week_tab:"Semana",
+    	month_tab:"Mes",
+    	new_event:"Nuevo evento",
+		icon_save:"Guardar",
+		icon_cancel:"Cancelar",
+		icon_details:"Detalles",
+		icon_edit:"Editar",
+		icon_delete:"Eliminar",
+		confirm_closing:"", //"Sus cambios se perderán, continuar ?"
+		confirm_deleting:"El evento se borrará definitivamente, continuar ?",
+		section_description:"Descripción",
+		section_time:"Periodo de tiempo",
+		full_day:"Todo el día",
+	
+		confirm_recurring:"¿Desea modificar el conjunto de eventos repetidos?",
+		section_recurring:"Repita el evento",
+		button_recurring:"Impedido",
+		button_recurring_open:"Permitido",
+		
+		/*agenda view extension*/
+		agenda_tab:"Dia",
+		date:"Fecha",
+		description:"Descripción",
+		
+		/*year view extension*/
+		year_tab:"Año"
+	}
+}
\ No newline at end of file
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/sources/locale_fi.js b/addons/base_calendar/static/lib/dhtmlxScheduler/sources/locale_fi.js
new file mode 100644
index 00000000000..360356ccc11
--- /dev/null
+++ b/addons/base_calendar/static/lib/dhtmlxScheduler/sources/locale_fi.js
@@ -0,0 +1,40 @@
+scheduler.locale={
+	date:{
+		month_full:["Tammikuu", "Helmikuu", "Maaliskuu", "Huhtikuu", "Toukokuu", "Kes&auml;kuu", "Hein&auml;kuu", "Elokuu", "Syyskuu", "Lokakuu", "Marraskuu", "Joulukuu"],
+		month_short:["Tam", "Hel", "Maa", "Huh", "Tou", "Kes", "Hei", "Elo", "Syy", "Lok", "Mar", "Jou"],
+		day_full:["Sunnuntai", "Maanantai", "Tiistai", "Keskiviikko", "Torstai", "Perjantai", "Lauantai"],
+    	day_short:["Su", "Ma", "Ti", "Ke", "To", "Pe", "La"]
+    },
+    labels:{
+    	dhx_cal_today_button:"Tänään",
+    	day_tab:"Päivä",
+    	week_tab:"Viikko",
+    	month_tab:"Kuukausi",
+    	new_event:"Uusi tapahtuma",
+		icon_save:"Tallenna",
+		icon_cancel:"Peru",
+		icon_details:"Tiedot",
+		icon_edit:"Muokkaa",
+		icon_delete:"Poista",
+		confirm_closing:"",//Your changes will be lost, are your sure ?
+		confirm_deleting:"Haluatko varmasti poistaa tapahtuman?",
+		section_description:"Kuvaus",
+		section_time:"Aikajakso",
+		full_day:"Koko päivä",
+		
+		confirm_recurring:"Haluatko varmasti muokata toistuvan tapahtuman kaikkia jaksoja?",
+		section_recurring:"Toista tapahtuma",
+		button_recurring:"Ei k&auml;yt&ouml;ss&auml;",
+		button_recurring_open:"K&auml;yt&ouml;ss&auml;",
+		
+		/*agenda view extension*/
+		agenda_tab:"Esityslista",
+		date:"Päivämäärä",
+		description:"Kuvaus",
+		
+		/*year view extension*/
+		year_tab:"Vuoden"
+	}
+}
+
+
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/sources/locale_fr.js b/addons/base_calendar/static/lib/dhtmlxScheduler/sources/locale_fr.js
new file mode 100644
index 00000000000..475a0caa5d7
--- /dev/null
+++ b/addons/base_calendar/static/lib/dhtmlxScheduler/sources/locale_fr.js
@@ -0,0 +1,38 @@
+scheduler.locale={
+	date:{
+		month_full:["Janvier", "Février", "Mars", "Avril", "Mai", "Juin", "Juillet", "Août", "Septembre", "Octobre", "Novembre", "Décembre"],
+		month_short:["Jan", "Fev", "Mar", "Avr", "Mai", "Juin", "Juil", "Aou", "Sep", "Oct", "Nov", "Dec"],	
+		day_full:["Dimanche", "Lundi", "Mardi", "Mercredi", "Jeudi", "Vendredi", "Samedi"],
+    	day_short:["Dim", "Lun", "Mar", "Mer", "Jeu", "Ven", "Sam"]
+    },
+    labels:{
+    	dhx_cal_today_button:"Aujourd'hui",
+    	day_tab:"Jour",
+    	week_tab:"Semaine",
+    	month_tab:"Mois",
+    	new_event:"Nouvel événement",
+		icon_save:"Enregistrer",
+		icon_cancel:"Annuler",
+		icon_details:"Détails",
+		icon_edit:"Modifier",
+		icon_delete:"Effacer",
+		confirm_closing:"",//Vos modifications seront perdus, êtes-vous sûr ? 
+		confirm_deleting:"L'événement sera effacé sans appel, êtes-vous sûr ?",
+		section_description:"Description",
+		section_time:"Période de temps",
+		full_day:"Journée complète",
+		
+		confirm_recurring:"Voulez-vous éditer toute une série d'évènements répétés?",
+		section_recurring:"Répéter l'évènement",
+		button_recurring:"Désactivé",
+		button_recurring_open:"Activé",
+		
+		/*agenda view extension*/
+		agenda_tab:"Jour",
+		date:"Date",
+		description:"Description",
+		
+		/*year view extension*/
+		year_tab:"Ans"
+	}
+}
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/sources/locale_he.js b/addons/base_calendar/static/lib/dhtmlxScheduler/sources/locale_he.js
new file mode 100644
index 00000000000..47b0c4db615
--- /dev/null
+++ b/addons/base_calendar/static/lib/dhtmlxScheduler/sources/locale_he.js
@@ -0,0 +1,40 @@
+scheduler.locale={
+	date:{
+		month_full:["ינו�ר", "פברו�ר", "מרץ", "�פריל", "מ�י", "יוני", "יולי", "�וגוסט", "ספטמבר", "�וקטובר", "נובמבר", "דצמבר"],
+		month_short:["ינו", "פבר", "מרץ", "�פר", "מ�י", "יונ", "יול", "�וג", "ספט", "�וק", "נוב", "דצמ"],
+		day_full:["ר�שון", "שני", "שלישי", "רביעי", "חמישי", "שישי", "שבת"],
+    	day_short:["�", "ב", "ג", "ד", "ה", "ו", "ש"]
+    },
+    labels:{
+    	dhx_cal_today_button:"היו�",
+    	day_tab:"יו�",
+    	week_tab:"שבוע",
+    	month_tab:"חודש",
+    	new_event:"�רוע חדש",
+		icon_save:"שמור",
+		icon_cancel:"בטל",
+		icon_details:"פרטי�",
+		icon_edit:"ערוך",
+		icon_delete:"מחק",
+		confirm_closing:"",//Your changes will be lost, are your sure ?
+		confirm_deleting:"�רוע ימחק סופית.להמשיך?",
+		section_description:"הסבר",
+		section_time:"תקופה",
+		
+		confirm_recurring:"ה�� ברצונך לשנות כל סדרת �רועי� מתמשכי�?",
+		section_recurring:"להעתיק �רוע",
+		button_recurring:"ל� פעיל",
+		button_recurring_open:"פעיל",
+		full_day:"יו� של�",
+		
+		/*agenda view extension*/
+		agenda_tab:"סדר יו�",
+		date:"ת�ריך",
+		description:"תי�ור",
+		
+		/*year view extension*/
+		year_tab:"לשנה"
+    }
+}
+
+
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/sources/locale_hu.js b/addons/base_calendar/static/lib/dhtmlxScheduler/sources/locale_hu.js
new file mode 100644
index 00000000000..d24d825da88
--- /dev/null
+++ b/addons/base_calendar/static/lib/dhtmlxScheduler/sources/locale_hu.js
@@ -0,0 +1,40 @@
+scheduler.locale={
+	date:{
+		month_full:["Január", "Február", "Március", "Április", "Május", "Június", "Július", "Augusztus", "Szeptember", "Október", "November", "December"],
+		month_short:["Jan", "Feb", "Már", "Ápr", "Máj", "Jún", "Júl", "Aug", "Sep", "Okt", "Nov", "Dec"],
+		day_full:["Vasárnap", "Hétfõ", "Kedd", "Szerda", "Csütörtök", "Péntek", "szombat"],
+    	day_short:["Va", "Hé", "Ke", "Sze", "Csü", "Pé", "Szo"]
+    },
+    labels:{
+    	dhx_cal_today_button:"Ma",
+    	day_tab:"Nap",
+    	week_tab:"Hét",
+    	month_tab:"Hónap",
+    	new_event:"Új esemény",
+		icon_save:"Mentés",
+		icon_cancel:"Mégse",
+		icon_details:"Részletek",
+		icon_edit:"Szerkesztés",
+		icon_delete:"Törlés",
+		confirm_closing:"",//A változások elvesznek, biztosan folytatja? "
+		confirm_deleting:"Az esemény törölve lesz, biztosan folytatja?",
+		section_description:"Leírás",
+		section_time:"Idõszak",
+		full_day:"Egesz napos",
+		
+		/*ismétlõdõ események*/
+		confirm_recurring:"Biztosan szerkeszteni akarod az összes ismétlõdõ esemény beállítását?",
+		section_recurring:"Esemény ismétlése",
+		button_recurring:"Tiltás",
+		button_recurring_open:"Engedélyezés",
+		
+		/*napirendi nézet*/
+		agenda_tab:"Napirend",
+		date:"Dátum",
+		description:"Leírás",
+		
+		/*éves nézet*/
+		year_tab:"Év"
+    }
+}
+
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/sources/locale_id.js b/addons/base_calendar/static/lib/dhtmlxScheduler/sources/locale_id.js
new file mode 100644
index 00000000000..0c87dc7c171
--- /dev/null
+++ b/addons/base_calendar/static/lib/dhtmlxScheduler/sources/locale_id.js
@@ -0,0 +1 @@
+scheduler.locale={
	date:{
		month_full:["Januari", "Februari", "Maret", "April", "Mei", "Juni", "Juli", "Agustus", "September", "Oktober", "November", "Desember"],
		month_short:["Jan", "Feb", "Mar", "Apr", "Mei", "Jun", "Jul", "Ags", "Sep", "Okt", "Nov", "Des"],
		day_full:["Minggu", "Senin", "Selasa", "Rabu", "Kamis", "Jumat", "Sabtu"],
    	day_short:["Ming", "Sen", "Sel", "Rab", "Kam", "Jum", "Sab"]
    },
    labels:{
    	dhx_cal_today_button:"Hari Ini",
    	day_tab:"Hari",
    	week_tab:"Minggu",
    	month_tab:"Bulan",
    	new_event:"Acara Baru",
		icon_save:"Simpan",
		icon_cancel:"Batal",
		icon_details:"Detail",
		icon_edit:"Edit",
		icon_delete:"Hapus",
		confirm_closing:"",//Perubahan tidak akan disimpan ?
		confirm_deleting:"Acara akan dihapus",
		section_description:"Keterangan",
		section_time:"Periode",
		full_day:"Hari penuh",
		
		/*recurring events*/
		confirm_recurring:"Apakah acara ini akan berulang?",
		section_recurring:"Acara Rutin",
		button_recurring:"Tidak Difungsikan",
		button_recurring_open:"Difungsikan",
		
		/*agenda view extension*/
		agenda_tab:"Agenda",
		date:"Tanggal",
		description:"Keterangan",
		
		/*year view extension*/
		year_tab:"Tahun"
    }
}
\ No newline at end of file
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/sources/locale_it.js b/addons/base_calendar/static/lib/dhtmlxScheduler/sources/locale_it.js
new file mode 100644
index 00000000000..e5eb7af284a
--- /dev/null
+++ b/addons/base_calendar/static/lib/dhtmlxScheduler/sources/locale_it.js
@@ -0,0 +1,38 @@
+scheduler.locale={
+	date:{
+		month_full:["Gennaio", "Febbraio", "Marzo", "Aprile", "Maggio", "Giugno", "Luglio", "Agosto", "Settembre", "Ottobre", "Novembre", "Dicembre"],
+		month_short:["Gen", "Feb", "Mar", "Apr", "Mag", "Giu", "Lug", "Ago", "Set", "Ott", "Nov", "Dic"],
+		day_full:["Domenica", "Lunedì", "Martedì", "Mercoledì", "Giovedì", "Venerdì", "Sabato"],
+    	day_short:["Dom", "Lun", "Mar", "Mer", "Gio", "Ven", "Sab"]
+    },
+    labels:{
+    	dhx_cal_today_button:"Oggi",
+    	day_tab:"Giorno",
+    	week_tab:"Settimana",
+    	month_tab:"Mese",
+    	new_event:"Nuovo evento",
+		icon_save:"Salva",
+		icon_cancel:"Cancella",
+		icon_details:"Dettagli",
+		icon_edit:"Modifica",
+		icon_delete:"Elimina",
+		confirm_closing:"",//Le modifiche apportate saranno perse, siete sicuri?
+		confirm_deleting:"L'evento verrà eliminato, siete sicuri?",
+		section_description:"Descrizione",
+		section_time:"Periodo di tempo",
+		full_day:"Intera giornata",
+		
+		confirm_recurring:"Vuoi modificare l'intera serie di eventi?",
+		section_recurring:"Ripetere l'evento",
+		button_recurring:"Disattivato",
+		button_recurring_open:"Attivato",
+		
+		/*agenda view extension*/
+		agenda_tab:"Giorno",
+		date:"Data",
+		description:"Descrizione",
+		
+		/*year view extension*/
+		year_tab:"Anni"
+	}
+}
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/sources/locale_jp.js b/addons/base_calendar/static/lib/dhtmlxScheduler/sources/locale_jp.js
new file mode 100644
index 00000000000..9a4d2c58d13
--- /dev/null
+++ b/addons/base_calendar/static/lib/dhtmlxScheduler/sources/locale_jp.js
@@ -0,0 +1,42 @@
+/*
+Translation by Genexus Japan Inc. 
+*/
+scheduler.locale={
+	date:{
+        	month_full:["1月", "2月", "3月", "4月", "5月", "6月", "7月", "8月", "9月", "10月", "11月", "12月"],
+                month_short:[ "1月", "2月", "3月", "4月", "5月", "6月", "7月", "8月", "9月", "10月", "11月", "12月"],
+                day_full:["日曜日", "月曜日", "�曜日", "水曜日", "木曜日", "金曜日", "土曜日"],
+                day_short:["日", "月", "�", "水", "木", "金", "土"]
+    	},
+    	labels:{
+        	dhx_cal_today_button:"今日",
+                day_tab:"æ—¥",
+                week_tab:"週",
+                month_tab:"月",
+                new_event:"新イベント",
+                icon_save:"�存",
+                icon_cancel:"キャンセル",
+                icon_details:"詳細",
+                icon_edit:"編集",
+                icon_delete:"削除",
+                confirm_closing:"",//変更��り消�れ���宜�����？
+                confirm_deleting:"イベント完全�削除�れ���宜�����？",
+                section_description:"デスクリプション",
+                section_time:"期間",
+                confirm_recurring:"繰り返�れ��るイベントを全�編集����？",
+                section_recurring:"イベントを繰り返�",
+                button_recurring:"無効",
+                button_recurring_open:"有効",
+				full_day:"終日",
+		
+				/*agenda view extension*/
+				agenda_tab:"議題�",
+				date:"日付",
+				description:"説明",
+				
+				/*year view extension*/
+				year_tab:"今年"
+	}
+}
+
+
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/sources/locale_nl.js b/addons/base_calendar/static/lib/dhtmlxScheduler/sources/locale_nl.js
new file mode 100644
index 00000000000..78bf47709a4
--- /dev/null
+++ b/addons/base_calendar/static/lib/dhtmlxScheduler/sources/locale_nl.js
@@ -0,0 +1,40 @@
+scheduler.locale={
+	date:{
+		month_full:["Januari", "Februari", "Maart", "April", "Mei", "Juni", "Juli", "Augustus", "September", "Oktober", "November", "December"],
+		month_short:["Jan", "Feb", "mrt", "Apr", "Mei", "Jun", "Jul", "Aug", "Sep", "Okt", "Nov", "Dec"],
+		day_full:["Zondag", "Maandag", "Dinsdag", "Woensdag", "Donderdag", "Vrijdag", "Zaterdag"],
+    	day_short:["Zo", "Ma", "Di", "Wo", "Do", "Vr", "Za"]
+    },
+    labels:{
+    	dhx_cal_today_button:"Vandaag",
+    	day_tab:"Dag",
+    	week_tab:"Week",
+    	month_tab:"Maand",
+    	new_event:"Nieuw item",
+		icon_save:"Opslaan",
+		icon_cancel:"Annuleren",
+		icon_details:"Details",
+		icon_edit:"Edit",
+		icon_delete:"Verwijderen",
+		confirm_closing:"",//Your changes will be lost, are your sure ?
+		confirm_deleting:"Item zal permanent worden verwijderd, doorgaan?",
+		section_description:"Beschrijving",
+		section_time:"Tijd periode",
+		full_day:"Hele dag",
+		
+		confirm_recurring:"Wilt u alle terugkerende items bijwerken?",
+		section_recurring:"Item herhalen",
+		button_recurring:"Uit",
+		button_recurring_open:"Aan",
+		
+		/*agenda view extension*/
+		agenda_tab:"Agenda",
+		date:"Datum",
+		description:"Omschrijving",
+		
+		/*year view extension*/
+		year_tab:"Jaar"
+	}
+}
+
+
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/sources/locale_no.js b/addons/base_calendar/static/lib/dhtmlxScheduler/sources/locale_no.js
new file mode 100644
index 00000000000..44bc1e8a82e
--- /dev/null
+++ b/addons/base_calendar/static/lib/dhtmlxScheduler/sources/locale_no.js
@@ -0,0 +1,40 @@
+scheduler.locale={
+	date:{
+		month_full:["Januar", "Februar", "Mars", "April", "Mai", "Juni", "Juli", "August", "September", "Oktober", "November", "Desember"],
+		month_short:["Jan", "Feb", "Mar", "Apr", "Mai", "Jun", "Jul", "Aug", "Sep", "Okt", "Nov", "Des"],
+		day_full:["Søndag", "Mandag", "Tirsdag", "Onsdag", "Torsdag", "Fredag", "Lørdag"],
+    	day_short:["Søn", "Man", "Tir", "Ons", "Tor", "Fre", "Lør"]
+    },
+    labels:{
+    	dhx_cal_today_button:"Idag",
+    	day_tab:"Dag",
+    	week_tab:"Uke",
+    	month_tab:"MÃ¥ned",
+    	new_event:"Ny",
+		icon_save:"Lagre",
+		icon_cancel:"Avbryt",
+		icon_details:"Detaljer",
+		icon_edit:"Endre",
+		icon_delete:"Slett",
+		confirm_closing:"Endringer blir ikke lagret, er du sikker?",//Endringer blir ikke lagret, er du sikker?
+		confirm_deleting:"Oppføringen vil bli slettet, er du sikker?",
+		section_description:"Beskrivelse",
+		section_time:"Tidsperiode",
+		full_day:"Full dag",
+		
+		/*recurring events*/
+		confirm_recurring:"Vil du endre hele settet med repeterende oppføringer?",
+		section_recurring:"Repeterende oppføring",
+		button_recurring:"Ikke aktiv",
+		button_recurring_open:"Aktiv",
+		
+		/*agenda view extension*/
+		agenda_tab:"Agenda",
+		date:"Dato",
+		description:"Beskrivelse",
+		
+		/*year view extension*/
+		year_tab:"Ã…r"
+    }
+}
+
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/sources/locale_pl.js b/addons/base_calendar/static/lib/dhtmlxScheduler/sources/locale_pl.js
new file mode 100644
index 00000000000..071b604baea
--- /dev/null
+++ b/addons/base_calendar/static/lib/dhtmlxScheduler/sources/locale_pl.js
@@ -0,0 +1,40 @@
+scheduler.locale={
+	date:{
+		month_full:["Styczeń", "Luty", "Marzec", "Kwiecień", "Maj", "Czerwiec", "Lipiec", "Sierpień", "Wrzesień", "Październik", "Listopad", "Grudzień"],
+		month_short:["Sty", "Lut", "Mar", "Kwi", "Maj", "Cze", "Lip", "Sie", "Wrz", "Paź", "Lis", "Gru"],
+		day_full:["Niedziela", "Poniedziałek", "Wtorek", "Środa", "Czwartek", "Piątek", "Sobota"],
+    	day_short:["Nie", "Pon", "Wto", "Åšro", "Czw", "PiÄ…", "Sob"]
+    },
+    labels:{
+    	dhx_cal_today_button:"DziÅ›",
+    	day_tab:"Dzień",
+    	week_tab:"Tydzień",
+    	month_tab:"MiesiÄ…c",
+    	new_event:"Nowe zdarzenie",
+		icon_save:"Zapisz",
+		icon_cancel:"Anuluj",
+		icon_details:"Szczegóły",
+		icon_edit:"Edytuj",
+		icon_delete:"Usuń",
+		confirm_closing:"",//Zmiany zostaną usunięte, jesteś pewien?
+		confirm_deleting:"Zdarzenie zostanie usunięte na zawsze, kontynuować?",
+		section_description:"Opis",
+		section_time:"Okres czasu",
+		full_day:"Cały dzień",
+		
+		/*recurring events*/
+		confirm_recurring:"Czy chcesz edytować cały zbiór powtarzających się zdarzeń?",
+		section_recurring:"Powtórz zdarzenie",
+		button_recurring:"Nieaktywne",
+		button_recurring_open:"Aktywne",
+		
+		/*agenda view extension*/
+		agenda_tab:"Agenda",
+		date:"Data",
+		description:"Opis",
+		
+		/*year view extension*/
+		year_tab:"Rok"
+    }
+}
+
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/sources/locale_pt.js b/addons/base_calendar/static/lib/dhtmlxScheduler/sources/locale_pt.js
new file mode 100644
index 00000000000..9739665b2da
--- /dev/null
+++ b/addons/base_calendar/static/lib/dhtmlxScheduler/sources/locale_pt.js
@@ -0,0 +1,51 @@
+/*
+
+	TRANSLATION BY MATTHEUS PIROVANI RORIZ GONЗALVES
+	
+	mattheusroriz@hotmail.com / mattheus.pirovani@gmail.com / 
+	
+	www.atrixian.com.br
+
+*/
+
+
+scheduler.locale={
+	date:{
+		month_full:["Janeiro", "Fevereiro", "Março", "Abril", "Maio", "Junho", "Julho", "Agosto", "Setembro", "Outubro", "Novembro", "Dezembro"],
+		month_short:["Jan", "Fev", "Mar", "Abr", "Mai", "Jun", "Jul", "Ago", "Set", "Out", "Nov", "Dez"],
+		day_full:["Domingo", "Segunda", "Terça", "Quarta", "Quinta", "Sexta", "Sábado"],
+    	day_short:["Dom", "Seg", "Ter", "Qua", "Qui", "Sex", "Sab"]
+    },
+    labels:{
+    	dhx_cal_today_button:"Hoje",
+    	day_tab:"Dia",
+    	week_tab:"Semana",
+    	month_tab:"Mês",
+    	new_event:"Novo evento",
+		icon_save:"Salvar",
+		icon_cancel:"Cancelar",
+		icon_details:"Detalhes",
+		icon_edit:"Editar",
+		icon_delete:"Deletar",
+		confirm_closing:"",//Your changes will be lost, are your sure ?
+		confirm_deleting:"Tem certeza que deseja excluir?",
+		section_description:"Descrição",
+		section_time:"Período de tempo",
+		full_day:"Dia inteiro",
+		
+		confirm_recurring:"Deseja editar todos esses eventos repetidos?",
+		section_recurring:"Repetir evento",
+		button_recurring:"Desabilitar",
+		button_recurring_open:"Habilitar",
+		
+		/*agenda view extension*/
+		agenda_tab:"Dia",
+		date:"Data",
+		description:"Descrição",
+		
+		/*year view extension*/
+		year_tab:"Ano"
+	}
+}
+
+
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/sources/locale_recurring_cn.js b/addons/base_calendar/static/lib/dhtmlxScheduler/sources/locale_recurring_cn.js
new file mode 100644
index 00000000000..62561f19709
--- /dev/null
+++ b/addons/base_calendar/static/lib/dhtmlxScheduler/sources/locale_recurring_cn.js
@@ -0,0 +1,2 @@
+scheduler.__recurring_template='<div class="dhx_form_repeat"> <form> <div class="dhx_repeat_left"> <label><input class="dhx_repeat_radio" type="radio" name="repeat" value="day" />按天</label><br /> <label><input class="dhx_repeat_radio" type="radio" name="repeat" value="week"/>按周</label><br /> <label><input class="dhx_repeat_radio" type="radio" name="repeat" value="month" checked />按月</label><br /> <label><input class="dhx_repeat_radio" type="radio" name="repeat" value="year" />按年</label> </div> <div class="dhx_repeat_divider"></div> <div class="dhx_repeat_center"> <div style="display:none;" id="dhx_repeat_day"> <label><input class="dhx_repeat_radio" type="radio" name="day_type" value="d"/>�</label><input class="dhx_repeat_text" type="text" name="day_count" value="1" />天<br /> <label><input class="dhx_repeat_radio" type="radio" name="day_type" checked value="w"/>�个工作日</label> </div> <div style="display:none;" id="dhx_repeat_week"> �� �<input class="dhx_repeat_text" type="text" name="week_count" value="1" />星期的:<br /> <table class="dhx_repeat_days"> <tr> <td> <label><input class="dhx_repeat_checkbox" type="checkbox" name="week_day" value="1" />星期一</label><br /> <label><input class="dhx_repeat_checkbox" type="checkbox" name="week_day" value="4" />星期四</label> </td> <td> <label><input class="dhx_repeat_checkbox" type="checkbox" name="week_day" value="2" />星期二</label><br /> <label><input class="dhx_repeat_checkbox" type="checkbox" name="week_day" value="5" />星期五</label> </td> <td> <label><input class="dhx_repeat_checkbox" type="checkbox" name="week_day" value="3" />星期三</label><br /> <label><input class="dhx_repeat_checkbox" type="checkbox" name="week_day" value="6" />星期六</label> </td> <td> <label><input class="dhx_repeat_checkbox" type="checkbox" name="week_day" value="0" />星期日</label><br /><br /> </td> </tr> </table> </div> <div id="dhx_repeat_month"> <label><input class="dhx_repeat_radio" type="radio" name="month_type" value="d"/>��</label><input class="dhx_repeat_text" type="text" name="month_day" value="1" />日 �<input class="dhx_repeat_text" type="text" name="month_count" value="1" />月<br /> <label><input class="dhx_repeat_radio" type="radio" name="month_type" checked value="w"/>在</label><input class="dhx_repeat_text" type="text" name="month_week2" value="1" /><select name="month_day2"><option value="1" selected >星期一<option value="2">星期二<option value="3">星期三<option value="4">星期四<option value="5">星期五<option value="6">星期六<option value="0">星期日</select>�<input class="dhx_repeat_text" type="text" name="month_count2" value="1" />月<br /> </div> <div style="display:none;" id="dhx_repeat_year"> <label><input class="dhx_repeat_radio" type="radio" name="year_type" value="d"/>�</label><input class="dhx_repeat_text" type="text" name="year_day" value="1" />日<select name="year_month"><option value="0" selected >一月<option value="1">二月<option value="2">三月<option value="3">四月<option value="4">五月<option value="5">六月<option value="6">七月<option value="7">八月<option value="8">�月<option value="9">�月<option value="10">�一月<option value="11">�二月</select>月<br /> <label><input class="dhx_repeat_radio" type="radio" name="year_type" checked value="w"/>在</label><input class="dhx_repeat_text" type="text" name="year_week2" value="1" /><select name="year_day2"><option value="1" selected >星期一<option value="2">星期二<option value="3">星期三<option value="4">星期四<option value="5">星期五<option value="6">星期六<option value="7">星期日</select>的<select name="year_month2"><option value="0" selected >一月<option value="1">二月<option value="2">三月<option value="3">四月<option value="4">五月<option value="5">六月<option value="6">七月<option value="7">八月<option value="8">�月<option value="9">�月<option value="10">�一月<option value="11">�二月</select><br /> </div> </div> <div class="dhx_repeat_divider"></div> <div class="dhx_repeat_right"> <label><input class="dhx_repeat_radio" type="radio" name="end" checked/>无结�日期</label><br /> <label><input class="dhx_repeat_radio" type="radio" name="end" />��</label><input class="dhx_repeat_text" type="text" name="occurences_count" value="1" />次结�<br /> <label><input class="dhx_repeat_radio" type="radio" name="end" />结�于</label><input class="dhx_repeat_date" type="text" name="date_of_end" value="01.01.2010" /><br /> </div> </form> </div> <div style="clear:both"> </div>';
+
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/sources/locale_recurring_cs.js b/addons/base_calendar/static/lib/dhtmlxScheduler/sources/locale_recurring_cs.js
new file mode 100644
index 00000000000..69fd9d50454
--- /dev/null
+++ b/addons/base_calendar/static/lib/dhtmlxScheduler/sources/locale_recurring_cs.js
@@ -0,0 +1,153 @@
+scheduler.__recurring_template='
+<div class="dhx_form_repeat"> 
+  <form> 
+    <div class="dhx_repeat_left"> 
+      <label>
+        <input class="dhx_repeat_radio" type="radio" name="repeat" value="day" />DennÄ›
+      </label><br /> 
+      <label>
+        <input class="dhx_repeat_radio" type="radio" name="repeat" value="week"/>Týdně
+      </label><br /> 
+      <label>
+        <input class="dhx_repeat_radio" type="radio" name="repeat" value="month" checked />Měsí�ně
+      </label><br /> 
+      <label>
+        <input class="dhx_repeat_radio" type="radio" name="repeat" value="year" />Ro�ně
+      </label> 
+    </div> 
+    <div class="dhx_repeat_divider">
+    </div> 
+    <div class="dhx_repeat_center"> 
+      <div style="display:none;" id="dhx_repeat_day"> 
+        <label>Opakované:
+          <br/>
+        </label> 
+        <label>
+          <input class="dhx_repeat_radio" type="radio" name="day_type" value="d"/>každý
+        </label>
+        <input class="dhx_repeat_text" type="text" name="day_count" value="1" />Den<br /> 
+        <label>
+          <input class="dhx_repeat_radio" type="radio" name="day_type" checked value="w"/>pracovní dny
+        </label> 
+      </div> 
+      <div style="display:none;" id="dhx_repeat_week"> Opakuje každých
+        <input class="dhx_repeat_text" type="text" name="week_count" value="1" />Týdnů na:<br /> 
+        <table class="dhx_repeat_days"> 
+          <tr> <td> 
+              <label>
+                <input class="dhx_repeat_checkbox" type="checkbox" name="week_day" value="1" />Pondělí
+              </label><br /> 
+              <label>
+                <input class="dhx_repeat_checkbox" type="checkbox" name="week_day" value="4" />ÄŒtvrtek
+              </label> </td> <td> 
+              <label>
+                <input class="dhx_repeat_checkbox" type="checkbox" name="week_day" value="2" />Úterý
+              </label><br /> 
+              <label>
+                <input class="dhx_repeat_checkbox" type="checkbox" name="week_day" value="5" />Pátek
+              </label> </td> <td> 
+              <label>
+                <input class="dhx_repeat_checkbox" type="checkbox" name="week_day" value="3" />Středa
+              </label><br /> 
+              <label>
+                <input class="dhx_repeat_checkbox" type="checkbox" name="week_day" value="6" />Sobota
+              </label> </td> <td> 
+              <label>
+                <input class="dhx_repeat_checkbox" type="checkbox" name="week_day" value="0" />Neděle
+              </label><br /><br /> </td> 
+          </tr> 
+        </table> 
+      </div> 
+      <div id="dhx_repeat_month"> 
+        <label>Opakované:
+          <br/>
+        </label> 
+        <label>
+          <input class="dhx_repeat_radio" type="radio" name="month_type" value="d"/>u každého
+        </label>
+        <input class="dhx_repeat_text" type="text" name="month_day" value="1" />Den každého
+        <input class="dhx_repeat_text" type="text" name="month_count" value="1" />Měsíc<br /> 
+        <label>
+          <input class="dhx_repeat_radio" type="radio" name="month_type" checked value="w"/>na
+        </label>
+        <input class="dhx_repeat_text" type="text" name="month_week2" value="1" />
+        <select name="month_day2">
+          <option value="1" selected >Pondělí
+          <option value="2">Úterý
+          <option value="3">Středa
+          <option value="4">ÄŒtvrtek
+          <option value="5">Pátek
+          <option value="6">Sobota
+          <option value="0">Neděle
+        </select>každý
+        <input class="dhx_repeat_text" type="text" name="month_count2" value="1" />Měsíc<br /> 
+      </div> 
+      <div style="display:none;" id="dhx_repeat_year"> 
+        <label>Opakované:
+        </label> 
+        <label>
+          <input class="dhx_repeat_radio" type="radio" name="year_type" value="d"/>u každého
+        </label>
+        <input class="dhx_repeat_text" type="text" name="year_day" value="1" />Den v
+        <select name="year_month">
+          <option value="0" selected >Leden
+          <option value="1">Únor
+          <option value="2">Březen
+          <option value="3">Duben
+          <option value="4">Květen
+          <option value="5">ÄŒerven
+          <option value="6">ÄŒervenec
+          <option value="7">Srpen
+          <option value="8">Září
+          <option value="9">Říjen
+          <option value="10">Listopad
+          <option value="11">Prosinec
+        </select><br /> 
+        <label>
+          <input class="dhx_repeat_radio" type="radio" name="year_type" checked value="w"/>na
+        </label>
+        <input class="dhx_repeat_text" type="text" name="year_week2" value="1" />
+        <select name="year_day2">
+          <option value="1" selected >Pondělí
+          <option value="2">Úterý
+          <option value="3">Středa
+          <option value="4">ÄŒtvrtek
+          <option value="5">Pátek
+          <option value="6">Sobota
+          <option value="0">Neděle
+        </select>v
+        <select name="year_month2">
+          <option value="0" selected >Leden
+          <option value="1">Únor
+          <option value="2">Březen
+          <option value="3">Duben
+          <option value="4">Květen
+          <option value="5">ÄŒerven
+          <option value="6">ÄŒervenec
+          <option value="7">Srpen
+          <option value="8">Září
+          <option value="9">Říjen
+          <option value="10">Listopad
+          <option value="11">Prosinec
+        </select><br /> 
+      </div> 
+    </div> 
+    <div class="dhx_repeat_divider">
+    </div> 
+    <div class="dhx_repeat_right"> 
+      <label>
+        <input class="dhx_repeat_radio" type="radio" name="end" checked/>bez data ukon�ení
+      </label><br /> 
+      <label>
+        <input class="dhx_repeat_radio" type="radio" name="end" />po
+      </label>
+      <input class="dhx_repeat_text" type="text" name="occurences_count" value="1" />Události<br /> 
+      <label>
+        <input class="dhx_repeat_radio" type="radio" name="end" />Konec
+      </label>
+      <input class="dhx_repeat_date" type="text" name="date_of_end" value="01.01.2010" /><br /> 
+    </div> 
+  </form> 
+</div> 
+<div style="clear:both"> 
+</div>';
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/sources/locale_recurring_de.js b/addons/base_calendar/static/lib/dhtmlxScheduler/sources/locale_recurring_de.js
new file mode 100644
index 00000000000..f74afa55dc1
--- /dev/null
+++ b/addons/base_calendar/static/lib/dhtmlxScheduler/sources/locale_recurring_de.js
@@ -0,0 +1,2 @@
+scheduler.__recurring_template='<div class="dhx_form_repeat"> <form> <div class="dhx_repeat_left"> <label><input class="dhx_repeat_radio" type="radio" name="repeat" value="day" />Täglich</label><br /> <label><input class="dhx_repeat_radio" type="radio" name="repeat" value="week"/>Wöchentlich</label><br /> <label><input class="dhx_repeat_radio" type="radio" name="repeat" value="month" checked />Monatlich</label><br /> <label><input class="dhx_repeat_radio" type="radio" name="repeat" value="year" />Jährlich</label> </div> <div class="dhx_repeat_divider"></div> <div class="dhx_repeat_center"> <div style="display:none;" id="dhx_repeat_day"> <label>Wiederholt sich:<br/></label> <label><input class="dhx_repeat_radio" type="radio" name="day_type" value="d"/>jeden</label><input class="dhx_repeat_text" type="text" name="day_count" value="1" />Tag<br /> <label><input class="dhx_repeat_radio" type="radio" name="day_type" checked value="w"/>an jedem Arbeitstag</label> </div> <div style="display:none;" id="dhx_repeat_week"> Wiederholt sich jede<input class="dhx_repeat_text" type="text" name="week_count" value="1" />Woche am:<br /> <table class="dhx_repeat_days"> <tr> <td> <label><input class="dhx_repeat_checkbox" type="checkbox" name="week_day" value="1" />Montag</label><br /> <label><input class="dhx_repeat_checkbox" type="checkbox" name="week_day" value="4" />Donnerstag</label> </td> <td> <label><input class="dhx_repeat_checkbox" type="checkbox" name="week_day" value="2" />Dienstag</label><br /> <label><input class="dhx_repeat_checkbox" type="checkbox" name="week_day" value="5" />Freitag</label> </td> <td> <label><input class="dhx_repeat_checkbox" type="checkbox" name="week_day" value="3" />Mittwoch</label><br /> <label><input class="dhx_repeat_checkbox" type="checkbox" name="week_day" value="6" />Samstag</label> </td> <td> <label><input class="dhx_repeat_checkbox" type="checkbox" name="week_day" value="0" />Sonntag</label><br /><br /> </td> </tr> </table> </div> <div id="dhx_repeat_month"> <label>Wiederholt sich:<br/></label> <label><input class="dhx_repeat_radio" type="radio" name="month_type" value="d"/>an jedem</label><input class="dhx_repeat_text" type="text" name="month_day" value="1" />Tag eines jeden<input class="dhx_repeat_text" type="text" name="month_count" value="1" />Monats<br /> <label><input class="dhx_repeat_radio" type="radio" name="month_type" checked value="w"/>am</label><input class="dhx_repeat_text" type="text" name="month_week2" value="1" /><select name="month_day2"><option value="1" selected >Montag<option value="2">Dienstag<option value="3">Mittwoch<option value="4">Donnerstag<option value="5">Freitag<option value="6">Samstag<option value="0">Sonntag</select>jeden<input class="dhx_repeat_text" type="text" name="month_count2" value="1" />Monats<br /> </div> <div style="display:none;" id="dhx_repeat_year"> <label>Wiederholt sich:</label> <label><input class="dhx_repeat_radio" type="radio" name="year_type" value="d"/>an jedem</label><input class="dhx_repeat_text" type="text" name="year_day" value="1" />Tag im<select name="year_month"><option value="0" selected >Januar<option value="1">Februar<option value="2">März<option value="3">April<option value="4">Mai<option value="5">Juni<option value="6">Juli<option value="7">August<option value="8">September<option value="9">Oktober<option value="10">November<option value="11">Dezember</select><br /> <label><input class="dhx_repeat_radio" type="radio" name="year_type" checked value="w"/>am</label><input class="dhx_repeat_text" type="text" name="year_week2" value="1" /><select name="year_day2"><option value="1" selected >Montag<option value="2">Dienstag<option value="3">Mittwoch<option value="4">Donnerstag<option value="5">Freitag<option value="6">Samstag<option value="0">Sonntag</select>im<select name="year_month2"><option value="0" selected >Januar<option value="1">Februar<option value="2">März<option value="3">April<option value="4">Mai<option value="5">Juni<option value="6">Juli<option value="7">August<option value="8">September<option value="9">Oktober<option value="10">November<option value="11">Dezember</select><br /> </div> </div> <div class="dhx_repeat_divider"></div> <div class="dhx_repeat_right"> <label><input class="dhx_repeat_radio" type="radio" name="end" checked/>kein Enddatum</label><br /> <label><input class="dhx_repeat_radio" type="radio" name="end" />nach</label><input class="dhx_repeat_text" type="text" name="occurences_count" value="1" />Ereignissen<br /> <label><input class="dhx_repeat_radio" type="radio" name="end" />Schluß</label><input class="dhx_repeat_date" type="text" name="date_of_end" value="01.01.2010" /><br /> </div> </form> </div> <div style="clear:both"> </div>';
+
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/sources/locale_recurring_es.js b/addons/base_calendar/static/lib/dhtmlxScheduler/sources/locale_recurring_es.js
new file mode 100644
index 00000000000..77b3539d21a
--- /dev/null
+++ b/addons/base_calendar/static/lib/dhtmlxScheduler/sources/locale_recurring_es.js
@@ -0,0 +1,2 @@
+scheduler.__recurring_template='<div class="dhx_form_repeat"> <form> <div class="dhx_repeat_left"> <label><input class="dhx_repeat_radio" type="radio" name="repeat" value="day" />Diariamente</label><br /> <label><input class="dhx_repeat_radio" type="radio" name="repeat" value="week"/>Semanalment</label><br /> <label><input class="dhx_repeat_radio" type="radio" name="repeat" value="month" checked />Mensualmente</label><br /> <label><input class="dhx_repeat_radio" type="radio" name="repeat" value="year" />Anualmente</label> </div> <div class="dhx_repeat_divider"></div> <div class="dhx_repeat_center"> <div style="display:none;" id="dhx_repeat_day"> <label><input class="dhx_repeat_radio" type="radio" name="day_type" value="d"/>Cada</label><input class="dhx_repeat_text" type="text" name="day_count" value="1" />dia<br /> <label><input class="dhx_repeat_radio" type="radio" name="day_type" checked value="w"/>Cada jornada de trabajo</label> </div> <div style="display:none;" id="dhx_repeat_week"> Repetir cada<input class="dhx_repeat_text" type="text" name="week_count" value="1" />semana:<br /> <table class="dhx_repeat_days"> <tr> <td> <label><input class="dhx_repeat_checkbox" type="checkbox" name="week_day" value="1" />Lunes</label><br /> <label><input class="dhx_repeat_checkbox" type="checkbox" name="week_day" value="4" />Jeuves</label> </td> <td> <label><input class="dhx_repeat_checkbox" type="checkbox" name="week_day" value="2" />Martes</label><br /> <label><input class="dhx_repeat_checkbox" type="checkbox" name="week_day" value="5" />Viernes</label> </td> <td> <label><input class="dhx_repeat_checkbox" type="checkbox" name="week_day" value="3" />Miércoles</label><br /> <label><input class="dhx_repeat_checkbox" type="checkbox" name="week_day" value="6" />Sabado</label> </td> <td> <label><input class="dhx_repeat_checkbox" type="checkbox" name="week_day" value="0" />Domingo</label><br /><br /> </td> </tr> </table> </div> <div id="dhx_repeat_month"> <label><input class="dhx_repeat_radio" type="radio" name="month_type" value="d"/>Repita</label><input class="dhx_repeat_text" type="text" name="month_day" value="1" />dia cada <input class="dhx_repeat_text" type="text" name="month_count" value="1" />mes<br /> <label><input class="dhx_repeat_radio" type="radio" name="month_type" checked value="w"/>El</label><input class="dhx_repeat_text" type="text" name="month_week2" value="1" /><select name="month_day2"><option value="1" selected >Lunes<option value="2">Martes<option value="3">Miércoles<option value="4">Jeuves<option value="5">Viernes<option value="6">Sabado<option value="0">Domingo</select>cada<input class="dhx_repeat_text" type="text" name="month_count2" value="1" />mes<br /> </div> <div style="display:none;" id="dhx_repeat_year"> <label><input class="dhx_repeat_radio" type="radio" name="year_type" value="d"/>Cada</label><input class="dhx_repeat_text" type="text" name="year_day" value="1" />dia<select name="year_month"><option value="0" selected >Enero<option value="1">Febrero<option value="2">Маrzo<option value="3">�bril<option value="4">Mayo<option value="5">Junio<option value="6">Julio<option value="7">�gosto<option value="8">Setiembre<option value="9">Octubre<option value="10">Noviembre<option value="11">Diciembre</select>mes<br /> <label><input class="dhx_repeat_radio" type="radio" name="year_type" checked value="w"/>El</label><input class="dhx_repeat_text" type="text" name="year_week2" value="1" /><select name="year_day2"><option value="1" selected >Lunes<option value="2">Martes<option value="3">Miércoles<option value="4">Jeuves<option value="5">Viernes<option value="6">Sabado<option value="0">Domingo</select>del<select name="year_month2"><option value="0" selected >Enero<option value="1">Febrero<option value="2">Маrzo<option value="3">�bril<option value="4">Mayo<option value="5">Junio<option value="6">Julio<option value="7">�gosto<option value="8">Setiembre<option value="9">Octubre<option value="10">Noviembre<option value="11">Diciembre</select><br /> </div> </div> <div class="dhx_repeat_divider"></div> <div class="dhx_repeat_right"> <label><input class="dhx_repeat_radio" type="radio" name="end" checked/>Sin fecha de finalización</label><br /> <label><input class="dhx_repeat_radio" type="radio" name="end" />Después de</label><input class="dhx_repeat_text" type="text" name="occurences_count" value="1" />occurencias<br /> <label><input class="dhx_repeat_radio" type="radio" name="end" />Fin</label><input class="dhx_repeat_date" type="text" name="date_of_end" value="01.01.2010" /><br /> </div> </form> </div> <div style="clear:both"> </div>';
+
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/sources/locale_recurring_fi.js b/addons/base_calendar/static/lib/dhtmlxScheduler/sources/locale_recurring_fi.js
new file mode 100644
index 00000000000..93d4675df3b
--- /dev/null
+++ b/addons/base_calendar/static/lib/dhtmlxScheduler/sources/locale_recurring_fi.js
@@ -0,0 +1,2 @@
+scheduler.__recurring_template='<div class="dhx_form_repeat"> <form> <div class="dhx_repeat_left"> <label><input class="dhx_repeat_radio" type="radio" name="repeat" value="day" />P&auml;ivitt&auml;in</label><br /> <label><input class="dhx_repeat_radio" type="radio" name="repeat" value="week"/>Viikoittain</label><br /> <label><input class="dhx_repeat_radio" type="radio" name="repeat" value="month" checked />Kuukausittain</label><br /> <label><input class="dhx_repeat_radio" type="radio" name="repeat" value="year" />Vuosittain</label> </div> <div class="dhx_repeat_divider"></div> <div class="dhx_repeat_center"> <div style="display:none;" id="dhx_repeat_day"> <label><input class="dhx_repeat_radio" type="radio" name="day_type" value="d"/>Joka</label><input class="dhx_repeat_text" type="text" name="day_count" value="1" />p&auml;iv&auml;<br /> <label><input class="dhx_repeat_radio" type="radio" name="day_type" checked value="w"/>Joka arkip&auml;iv&auml;</label> </div> <div style="display:none;" id="dhx_repeat_week">Toista joka<input class="dhx_repeat_text" type="text" name="week_count" value="1" />viikko n&auml;in&auml; p&auml;ivin&auml;:<br /> <table class="dhx_repeat_days"> <tr> <td> <label><input class="dhx_repeat_checkbox" type="checkbox" name="week_day" value="1" />Maanantai</label><br /> <label><input class="dhx_repeat_checkbox" type="checkbox" name="week_day" value="4" />Torstai</label> </td> <td> <label><input class="dhx_repeat_checkbox" type="checkbox" name="week_day" value="2" />Tiistai</label><br /> <label><input class="dhx_repeat_checkbox" type="checkbox" name="week_day" value="5" />Perjantai</label> </td> <td> <label><input class="dhx_repeat_checkbox" type="checkbox" name="week_day" value="3" />Keskiviikko</label><br /> <label><input class="dhx_repeat_checkbox" type="checkbox" name="week_day" value="6" />Lauantai</label> </td> <td> <label><input class="dhx_repeat_checkbox" type="checkbox" name="week_day" value="0" />Sunnuntai</label><br /><br /> </td> </tr> </table> </div> <div id="dhx_repeat_month"> <label><input class="dhx_repeat_radio" type="radio" name="month_type" value="d"/>Toista</label><input class="dhx_repeat_text" type="text" name="month_day" value="1" />p&auml;iv&auml;n&auml; joka<input class="dhx_repeat_text" type="text" name="month_count" value="1" />kuukausi<br /> <label><input class="dhx_repeat_radio" type="radio" name="month_type" checked value="w"/></label><input class="dhx_repeat_text" type="text" name="month_week2" value="1" /><select name="month_day2"><option value="1" selected >Maanantai<option value="2">Tiistai<option value="3">Keskiviikko<option value="4">Torstai<option value="5">Perjantai<option value="6">Lauantai<option value="0">Sunnuntai</select>joka<input class="dhx_repeat_text" type="text" name="month_count2" value="1" />kuukausi<br /> </div> <div style="display:none;" id="dhx_repeat_year"> <label><input class="dhx_repeat_radio" type="radio" name="year_type" value="d"/>Joka</label><input class="dhx_repeat_text" type="text" name="year_day" value="1" />p&auml;iv&auml;<select name="year_month"><option value="0" selected >Tammikuu<option value="1">Helmikuu<option value="2">Maaliskuu<option value="3">Huhtikuu<option value="4">Toukokuu<option value="5">Kes&auml;kuu<option value="6">Hein&auml;kuu<option value="7">Elokuu<option value="8">Syyskuu<option value="9">Lokakuu<option value="10">Marraskuu<option value="11">Joulukuu</select>kuukausi<br /> <label><input class="dhx_repeat_radio" type="radio" name="year_type" checked value="w"/></label><input class="dhx_repeat_text" type="text" name="year_week2" value="1" /><select name="year_day2"><option value="1" selected >Maanantai<option value="2">Tiistai<option value="3">Keskiviikko<option value="4">Torstai<option value="5">Perjantai<option value="6">Lauantai<option value="0">Sunnuntai</select><select name="year_month2"><option value="0" selected >Tammikuu<option value="1">Helmikuu<option value="2">Maaliskuu<option value="3">Huhtikuu<option value="4">Toukokuu<option value="5">Kes&auml;kuu<option value="6">Hein&auml;kuu<option value="7">Elokuu<option value="8">Syyskuu<option value="9">Lokakuu<option value="10">Marraskuu<option value="11">Joulukuu</select><br /> </div> </div> <div class="dhx_repeat_divider"></div> <div class="dhx_repeat_right"> <label><input class="dhx_repeat_radio" type="radio" name="end" checked/>Ei loppumisaikaa</label><br /> <label><input class="dhx_repeat_radio" type="radio" name="end" /></label><input class="dhx_repeat_text" type="text" name="occurences_count" value="1" />Toiston j&auml;lkeen<br /> <label><input class="dhx_repeat_radio" type="radio" name="end" />Loppuu</label><input class="dhx_repeat_date" type="text" name="date_of_end" value="01.01.2010" /><br /> </div> </form> </div> <div style="clear:both"> </div>';
+
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/sources/locale_recurring_fr.js b/addons/base_calendar/static/lib/dhtmlxScheduler/sources/locale_recurring_fr.js
new file mode 100644
index 00000000000..66601553fdb
--- /dev/null
+++ b/addons/base_calendar/static/lib/dhtmlxScheduler/sources/locale_recurring_fr.js
@@ -0,0 +1,2 @@
+scheduler.__recurring_template='<div class="dhx_form_repeat"> <form> <div class="dhx_repeat_left"> <label><input class="dhx_repeat_radio" type="radio" name="repeat" value="day" />Quotidienne</label><br /> <label><input class="dhx_repeat_radio" type="radio" name="repeat" value="week"/>Hebdomadaire</label><br /> <label><input class="dhx_repeat_radio" type="radio" name="repeat" value="month" checked />Mensuelle</label><br /> <label><input class="dhx_repeat_radio" type="radio" name="repeat" value="year" />Annuelle</label> </div> <div class="dhx_repeat_divider"></div> <div class="dhx_repeat_center"> <div style="display:none;" id="dhx_repeat_day"> <label><input class="dhx_repeat_radio" type="radio" name="day_type" value="d"/>Chaque</label><input class="dhx_repeat_text" type="text" name="day_count" value="1" />jour<br /> <label><input class="dhx_repeat_radio" type="radio" name="day_type" checked value="w"/>Chaque journée de travail</label> </div> <div style="display:none;" id="dhx_repeat_week"> Répéter toutes les<input class="dhx_repeat_text" type="text" name="week_count" value="1" />semaine:<br /> <table class="dhx_repeat_days"> <tr> <td> <label><input class="dhx_repeat_checkbox" type="checkbox" name="week_day" value="1" />Lundi</label><br /> <label><input class="dhx_repeat_checkbox" type="checkbox" name="week_day" value="4" />Jeudi</label> </td> <td> <label><input class="dhx_repeat_checkbox" type="checkbox" name="week_day" value="2" />Mardi</label><br /> <label><input class="dhx_repeat_checkbox" type="checkbox" name="week_day" value="5" />Vendredi</label> </td> <td> <label><input class="dhx_repeat_checkbox" type="checkbox" name="week_day" value="3" />Mercredi</label><br /> <label><input class="dhx_repeat_checkbox" type="checkbox" name="week_day" value="6" />Samedi</label> </td> <td> <label><input class="dhx_repeat_checkbox" type="checkbox" name="week_day" value="0" />Dimanche</label><br /><br /> </td> </tr> </table> </div> <div id="dhx_repeat_month"> <label><input class="dhx_repeat_radio" type="radio" name="month_type" value="d"/>Répéter</label><input class="dhx_repeat_text" type="text" name="month_day" value="1" />jour chaque<input class="dhx_repeat_text" type="text" name="month_count" value="1" />mois<br /> <label><input class="dhx_repeat_radio" type="radio" name="month_type" checked value="w"/>Le</label><input class="dhx_repeat_text" type="text" name="month_week2" value="1" /><select name="month_day2"><option value="1" selected >Lundi<option value="2">Mardi<option value="3">Mercredi<option value="4">Jeudi<option value="5">Vendredi<option value="6">Samedi<option value="0">Dimanche</select>chaque<input class="dhx_repeat_text" type="text" name="month_count2" value="1" />mois<br /> </div> <div style="display:none;" id="dhx_repeat_year"> <label><input class="dhx_repeat_radio" type="radio" name="year_type" value="d"/>Chaque</label><input class="dhx_repeat_text" type="text" name="year_day" value="1" />jour<select name="year_month"><option value="0" selected >Janvier<option value="1">Février<option value="2">Mars<option value="3">Avril<option value="4">Mai<option value="5">Juin<option value="6">Juillet<option value="7">Août<option value="8">Septembre<option value="9">Octobre<option value="10">Novembre<option value="11">Décembre</select>mois<br /> <label><input class="dhx_repeat_radio" type="radio" name="year_type" checked value="w"/>Le</label><input class="dhx_repeat_text" type="text" name="year_week2" value="1" /><select name="year_day2"><option value="1" selected >Lundi<option value="2">Mardi<option value="3">Mercredi<option value="4">Jeudi<option value="5">Vendredi<option value="6">Samedi<option value="0">Dimanche</select>du<select name="year_month2"><option value="0" selected >Janvier<option value="1">Février<option value="2">Mars<option value="3">Avril<option value="4">Mai<option value="5">Juin<option value="6">Juillet<option value="7">Août<option value="8">Septembre<option value="9">Octobre<option value="10">Novembre<option value="11">Décembre</select><br /> </div> </div> <div class="dhx_repeat_divider"></div> <div class="dhx_repeat_right"> <label><input class="dhx_repeat_radio" type="radio" name="end" checked/>Pas de date d&quot;achèvement</label><br /> <label><input class="dhx_repeat_radio" type="radio" name="end" />Après</label><input class="dhx_repeat_text" type="text" name="occurences_count" value="1" />occurrences<br /> <label><input class="dhx_repeat_radio" type="radio" name="end" />Fin</label><input class="dhx_repeat_date" type="text" name="date_of_end" value="01.01.2010" /><br /> </div> </form> </div> <div style="clear:both"> </div>';
+
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/sources/locale_recurring_it.js b/addons/base_calendar/static/lib/dhtmlxScheduler/sources/locale_recurring_it.js
new file mode 100644
index 00000000000..8c0e82b7c12
--- /dev/null
+++ b/addons/base_calendar/static/lib/dhtmlxScheduler/sources/locale_recurring_it.js
@@ -0,0 +1,2 @@
+scheduler.__recurring_template='<div class="dhx_form_repeat"> <form> <div class="dhx_repeat_left"> <label><input class="dhx_repeat_radio" type="radio" name="repeat" value="day" />Quotidiano</label><br /> <label><input class="dhx_repeat_radio" type="radio" name="repeat" value="week"/>Settimanale</label><br /> <label><input class="dhx_repeat_radio" type="radio" name="repeat" value="month" checked />Mensile</label><br /> <label><input class="dhx_repeat_radio" type="radio" name="repeat" value="year" />Annuale</label> </div> <div class="dhx_repeat_divider"></div> <div class="dhx_repeat_center"> <div style="display:none;" id="dhx_repeat_day"> <label><input class="dhx_repeat_radio" type="radio" name="day_type" value="d"/>Ogni</label><input class="dhx_repeat_text" type="text" name="day_count" value="1" />giorno<br /> <label><input class="dhx_repeat_radio" type="radio" name="day_type" checked value="w"/>Ogni giornata lavorativa</label> </div> <div style="display:none;" id="dhx_repeat_week"> Ripetere ogni<input class="dhx_repeat_text" type="text" name="week_count" value="1" />settimana:<br /> <table class="dhx_repeat_days"> <tr> <td> <label><input class="dhx_repeat_checkbox" type="checkbox" name="week_day" value="1" />Lunedì</label><br /> <label><input class="dhx_repeat_checkbox" type="checkbox" name="week_day" value="4" />Jovedì</label> </td> <td> <label><input class="dhx_repeat_checkbox" type="checkbox" name="week_day" value="2" />Martedì</label><br /> <label><input class="dhx_repeat_checkbox" type="checkbox" name="week_day" value="5" />Venerdì</label> </td> <td> <label><input class="dhx_repeat_checkbox" type="checkbox" name="week_day" value="3" />Mercoledì</label><br /> <label><input class="dhx_repeat_checkbox" type="checkbox" name="week_day" value="6" />Sabato</label> </td> <td> <label><input class="dhx_repeat_checkbox" type="checkbox" name="week_day" value="0" />Domenica</label><br /><br /> </td> </tr> </table> </div> <div id="dhx_repeat_month"> <label><input class="dhx_repeat_radio" type="radio" name="month_type" value="d"/>Ripetere</label><input class="dhx_repeat_text" type="text" name="month_day" value="1" />giorno ogni<input class="dhx_repeat_text" type="text" name="month_count" value="1" />mese<br /> <label><input class="dhx_repeat_radio" type="radio" name="month_type" checked value="w"/>Il</label><input class="dhx_repeat_text" type="text" name="month_week2" value="1" /><select name="month_day2"><option value="1" selected >Lunedì<option value="2">Martedì<option value="3">Mercoledì<option value="4">Jovedì<option value="5">Venerdì<option value="6">Sabato<option value="0">Domenica</select>ogni<input class="dhx_repeat_text" type="text" name="month_count2" value="1" />mese<br /> </div> <div style="display:none;" id="dhx_repeat_year"> <label><input class="dhx_repeat_radio" type="radio" name="year_type" value="d"/>Ogni</label><input class="dhx_repeat_text" type="text" name="year_day" value="1" />giorno<select name="year_month"><option value="0" selected >Gennaio<option value="1">Febbraio<option value="2">Marzo<option value="3">Aprile<option value="4">Maggio<option value="5">Jiugno<option value="6">Luglio<option value="7">Agosto<option value="8">Settembre<option value="9">Ottobre<option value="10">Novembre<option value="11">Dicembre</select>mese<br /> <label><input class="dhx_repeat_radio" type="radio" name="year_type" checked value="w"/>Il</label><input class="dhx_repeat_text" type="text" name="year_week2" value="1" /><select name="year_day2"><option value="1" selected >Lunedì<option value="2">Martedì<option value="3">Mercoledì<option value="4">Jovedì<option value="5">Venerdì<option value="6">Sabato<option value="0">Domenica</select>del<select name="year_month2"><option value="0" selected >Gennaio<option value="1">Febbraio<option value="2">Marzo<option value="3">Aprile<option value="4">Maggio<option value="5">Jiugno<option value="6">Luglio<option value="7">Agosto<option value="8">Settembre<option value="9">Ottobre<option value="10">Novembre<option value="11">Dicembre</select><br /> </div> </div> <div class="dhx_repeat_divider"></div> <div class="dhx_repeat_right"> <label><input class="dhx_repeat_radio" type="radio" name="end" checked/>Senza data finale</label><br /> <label><input class="dhx_repeat_radio" type="radio" name="end" />Dopo</label><input class="dhx_repeat_text" type="text" name="occurences_count" value="1" />occorenze<br /> <label><input class="dhx_repeat_radio" type="radio" name="end" />Fine</label><input class="dhx_repeat_date" type="text" name="date_of_end" value="01.01.2010" /><br /> </div> </form> </div> <div style="clear:both"> </div>';
+
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/sources/locale_recurring_nl.js b/addons/base_calendar/static/lib/dhtmlxScheduler/sources/locale_recurring_nl.js
new file mode 100644
index 00000000000..4ccfb09e526
--- /dev/null
+++ b/addons/base_calendar/static/lib/dhtmlxScheduler/sources/locale_recurring_nl.js
@@ -0,0 +1,2 @@
+scheduler.__recurring_template='<div class="dhx_form_repeat"> <form> <div class="dhx_repeat_left"> <label><input class="dhx_repeat_radio" type="radio" name="repeat" value="day" />Dagelijks</label><br /> <label><input class="dhx_repeat_radio" type="radio" name="repeat" value="week"/>Wekelijks</label><br /> <label><input class="dhx_repeat_radio" type="radio" name="repeat" value="month" checked />Maandelijks</label><br /> <label><input class="dhx_repeat_radio" type="radio" name="repeat" value="year" />Jaarlijks</label> </div> <div class="dhx_repeat_divider"></div> <div class="dhx_repeat_center"> <div style="display:none;" id="dhx_repeat_day"> <label><input class="dhx_repeat_radio" type="radio" name="day_type" value="d"/>Elke</label><input class="dhx_repeat_text" type="text" name="day_count" value="1" />dag(en)<br /> <label><input class="dhx_repeat_radio" type="radio" name="day_type" checked value="w"/>Elke werkdag</label> </div> <div style="display:none;" id="dhx_repeat_week"> Herhaal elke<input class="dhx_repeat_text" type="text" name="week_count" value="1" />week op de volgende dagen:<br /> <table class="dhx_repeat_days"> <tr> <td> <label><input class="dhx_repeat_checkbox" type="checkbox" name="week_day" value="1" />Maandag</label><br /> <label><input class="dhx_repeat_checkbox" type="checkbox" name="week_day" value="4" />Donderdag</label> </td> <td> <label><input class="dhx_repeat_checkbox" type="checkbox" name="week_day" value="2" />Dinsdag</label><br /> <label><input class="dhx_repeat_checkbox" type="checkbox" name="week_day" value="5" />Vrijdag</label> </td> <td> <label><input class="dhx_repeat_checkbox" type="checkbox" name="week_day" value="3" />Woensdag</label><br /> <label><input class="dhx_repeat_checkbox" type="checkbox" name="week_day" value="6" />Zaterdag</label> </td> <td> <label><input class="dhx_repeat_checkbox" type="checkbox" name="week_day" value="0" />Zondag</label><br /><br /> </td> </tr> </table> </div> <div id="dhx_repeat_month"> <label><input class="dhx_repeat_radio" type="radio" name="month_type" value="d"/>Herhaal</label><input class="dhx_repeat_text" type="text" name="month_day" value="1" />dag iedere<input class="dhx_repeat_text" type="text" name="month_count" value="1" />maanden<br /> <label><input class="dhx_repeat_radio" type="radio" name="month_type" checked value="w"/>Op</label><input class="dhx_repeat_text" type="text" name="month_week2" value="1" /><select name="month_day2"> <option value="1">Maandag <option value="2">Dinsdag <option value="3">Woensdag <option value="4">Donderdag <option value="5">Vrijdag <option value="6">Zaterdag <option value="0">Zondag </select>iedere<input class="dhx_repeat_text" type="text" name="month_count2" value="1" />maanden<br /> </div> <div style="display:none;" id="dhx_repeat_year"> <label><input class="dhx_repeat_radio" type="radio" name="year_type" value="d"/>Iedere</label><input class="dhx_repeat_text" type="text" name="year_day" value="1" />dag<select name="year_month"><option value="0" selected >Januari<option value="1">Februari<option value="2">Maart<option value="3">April<option value="4">Mei<option value="5">Juni<option value="6">Juli<option value="7">Augustus<option value="8">September<option value="9">Oktober<option value="10">November<option value="11">December</select>maand<br /> <label><input class="dhx_repeat_radio" type="radio" name="year_type" checked value="w"/>Op</label><input class="dhx_repeat_text" type="text" name="year_week2" value="1" /><select name="year_day2"><option value="1" selected >Maandag<option value="2">Dinsdag<option value="3">Woensdag<option value="4">Donderdag<option value="5">Vrijdag<option value="6">Zaterdag<option value="7">Zondag</select>van<select name="year_month2"><option value="0" selected >Januari<option value="1">Februari<option value="2">Maart<option value="3">April<option value="4">Mei<option value="5">Juni<option value="6">Juli<option value="7">Augustus<option value="8">September<option value="9">Oktober<option value="10">November<option value="11">December</select><br /> </div> </div> <div class="dhx_repeat_divider"></div> <div class="dhx_repeat_right"> <label><input class="dhx_repeat_radio" type="radio" name="end" checked/>Geen eind datum</label><br /> <label><input class="dhx_repeat_radio" type="radio" name="end" />Na</label><input class="dhx_repeat_text" type="text" name="occurences_count" value="1" />keren<br /> <label><input class="dhx_repeat_radio" type="radio" name="end" />Eindigd per</label><input class="dhx_repeat_date" type="text" name="date_of_end" value="01.01.2010" /><br /> </div> </form> </div> <div style="clear:both"> </div>';
+
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/sources/locale_recurring_pl.js b/addons/base_calendar/static/lib/dhtmlxScheduler/sources/locale_recurring_pl.js
new file mode 100644
index 00000000000..b11a117a507
--- /dev/null
+++ b/addons/base_calendar/static/lib/dhtmlxScheduler/sources/locale_recurring_pl.js
@@ -0,0 +1,2 @@
+scheduler.__recurring_template='<div class="dhx_form_repeat"> <form> <div class="dhx_repeat_left"> <label><input class="dhx_repeat_radio" type="radio" name="repeat" value="day" />Codziennie</label><br /> <label><input class="dhx_repeat_radio" type="radio" name="repeat" value="week"/>Co tydzie�</label><br /> <label><input class="dhx_repeat_radio" type="radio" name="repeat" value="month" checked />Co miesi�c</label><br /> <label><input class="dhx_repeat_radio" type="radio" name="repeat" value="year" />Co rok</label> </div> <div class="dhx_repeat_divider"></div> <div class="dhx_repeat_center"> <div style="display:none;" id="dhx_repeat_day"> <label><input class="dhx_repeat_radio" type="radio" name="day_type" value="d"/>Ka�dego</label><input class="dhx_repeat_text" type="text" name="day_count" value="1" />dnia<br /> <label><input class="dhx_repeat_radio" type="radio" name="day_type" checked value="w"/>Ka�dego dnia roboczego</label> </div> <div style="display:none;" id="dhx_repeat_week"> Powtarzaj ka�dego<input class="dhx_repeat_text" type="text" name="week_count" value="1" />tygodnia w dni:<br /> <table class="dhx_repeat_days"> <tr> <td> <label><input class="dhx_repeat_checkbox" type="checkbox" name="week_day" value="1" />Poniedzia�ek</label><br /> <label><input class="dhx_repeat_checkbox" type="checkbox" name="week_day" value="4" />Czwartek</label> </td> <td> <label><input class="dhx_repeat_checkbox" type="checkbox" name="week_day" value="2" />Wtorek</label><br /> <label><input class="dhx_repeat_checkbox" type="checkbox" name="week_day" value="5" />Pi�tek</label> </td> <td> <label><input class="dhx_repeat_checkbox" type="checkbox" name="week_day" value="3" />�roda</label><br /> <label><input class="dhx_repeat_checkbox" type="checkbox" name="week_day" value="6" />Sobota</label> </td> <td> <label><input class="dhx_repeat_checkbox" type="checkbox" name="week_day" value="0" />Niedziela</label><br /><br /> </td> </tr> </table> </div> <div id="dhx_repeat_month"> <label><input class="dhx_repeat_radio" type="radio" name="month_type" value="d"/>Powt�rz</label><input class="dhx_repeat_text" type="text" name="month_day" value="1" />dnia ka�dego<input class="dhx_repeat_text" type="text" name="month_count" value="1" />miesi�ca<br /> <label><input class="dhx_repeat_radio" type="radio" name="month_type" checked value="w"/>W</label><input class="dhx_repeat_text" type="text" name="month_week2" value="1" /><select name="month_day2"><option value="1" selected >Poniedzia�ek<option value="2">Wtorek<option value="3">�roda<option value="4">Czwartek<option value="5">Pi�tek<option value="6">Sobota<option value="0">Niedziela</select>ka�dego<input class="dhx_repeat_text" type="text" name="month_count2" value="1" />miesi�ca<br /> </div> <div style="display:none;" id="dhx_repeat_year"> <label><input class="dhx_repeat_radio" type="radio" name="year_type" value="d"/>Ka�dego</label><input class="dhx_repeat_text" type="text" name="year_day" value="1" />dnia miesi�ca<select name="year_month"><option value="0" selected >Stycznia<option value="1">Lutego<option value="2">Marca<option value="3">Kwietnia<option value="4">Maja<option value="5">Czerwca<option value="6">Lipca<option value="7">Sierpnia<option value="8">Wrze�nia<option value="9">Pa�dziernka<option value="10">Listopada<option value="11">Grudnia</select><br /> <label><input class="dhx_repeat_radio" type="radio" name="year_type" checked value="w"/>W</label><input class="dhx_repeat_text" type="text" name="year_week2" value="1" /><select name="year_day2"><option value="1" selected >Poniedzia�ek<option value="2">Wtorek<option value="3">�rod�<option value="4">Czwartek<option value="5">Pi�tek<option value="6">Sobot�<option value="7">Niedziel�</select>miesi�ca<select name="year_month2"><option value="0" selected >Stycznia<option value="1">Lutego<option value="2">Marca<option value="3">Kwietnia<option value="4">Maja<option value="5">Czerwca<option value="6">Lipca<option value="7">Sierpnia<option value="8">Wrze�nia<option value="9">Pa�dziernka<option value="10">Listopada<option value="11">Grudnia</select><br /> </div> </div> <div class="dhx_repeat_divider"></div> <div class="dhx_repeat_right"> <label><input class="dhx_repeat_radio" type="radio" name="end" checked/>Bez daty ko�cowej</label><br /> <label><input class="dhx_repeat_radio" type="radio" name="end" />Po</label><input class="dhx_repeat_text" type="text" name="occurences_count" value="1" />wyst�pieniu/ach<br /> <label><input class="dhx_repeat_radio" type="radio" name="end" />Zako�cz w</label><input class="dhx_repeat_date" type="text" name="date_of_end" value="01.01.2010" /><br /> </div> </form> </div> <div style="clear:both"> </div>';
+
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/sources/locale_recurring_pt.js b/addons/base_calendar/static/lib/dhtmlxScheduler/sources/locale_recurring_pt.js
new file mode 100644
index 00000000000..665e26d7a43
--- /dev/null
+++ b/addons/base_calendar/static/lib/dhtmlxScheduler/sources/locale_recurring_pt.js
@@ -0,0 +1 @@
+scheduler.__recurring_template='<div class="dhx_form_repeat"> <form> <div class="dhx_repeat_left"> <label><input class="dhx_repeat_radio" type="radio" name="repeat" value="day" />Diário</label><br /> <label><input class="dhx_repeat_radio" type="radio" name="repeat" value="week"/>Semanal</label><br /> <label><input class="dhx_repeat_radio" type="radio" name="repeat" value="month" checked />Mensal</label><br /> <label><input class="dhx_repeat_radio" type="radio" name="repeat" value="year" />Anual</label> </div> <div class="dhx_repeat_divider"></div> <div class="dhx_repeat_center"> <div style="display:none;" id="dhx_repeat_day"> <label><input class="dhx_repeat_radio" type="radio" name="day_type" value="d"/>Cada</label><input class="dhx_repeat_text" type="text" name="day_count" value="1" />day<br /> <label><input class="dhx_repeat_radio" type="radio" name="day_type" checked value="w"/>Cada trabalho diário</label> </div> <div style="display:none;" id="dhx_repeat_week"> Repita cada<input class="dhx_repeat_text" type="text" name="week_count" value="1" />semana:<br /> <table class="dhx_repeat_days"> <tr> <td> <label><input class="dhx_repeat_checkbox" type="checkbox" name="week_day" value="1" />Segunda</label><br /> <label><input class="dhx_repeat_checkbox" type="checkbox" name="week_day" value="4" />Quinta</label> </td> <td> <label><input class="dhx_repeat_checkbox" type="checkbox" name="week_day" value="2" />Terça</label><br /> <label><input class="dhx_repeat_checkbox" type="checkbox" name="week_day" value="5" />Sexta</label> </td> <td> <label><input class="dhx_repeat_checkbox" type="checkbox" name="week_day" value="3" />Quarta</label><br /> <label><input class="dhx_repeat_checkbox" type="checkbox" name="week_day" value="6" />Sábado</label> </td> <td> <label><input class="dhx_repeat_checkbox" type="checkbox" name="week_day" value="0" />Domingo</label><br /><br /> </td> </tr> </table> </div> <div id="dhx_repeat_month"> <label><input class="dhx_repeat_radio" type="radio" name="month_type" value="d"/>Repetir</label><input class="dhx_repeat_text" type="text" name="month_day" value="1" />todo dia<input class="dhx_repeat_text" type="text" name="month_count" value="1" />mês<br /> <label><input class="dhx_repeat_radio" type="radio" name="month_type" checked value="w"/>Em</label><input class="dhx_repeat_text" type="text" name="month_week2" value="1" /><select name="month_day2"><option value="1" selected >Segunda<option value="2">Terça<option value="3">Quarta<option value="4">Quinta<option value="5">Sexta<option value="6">Sabado<option value="0">Domingo</select>todo<input class="dhx_repeat_text" type="text" name="month_count2" value="1" />mês<br /> </div> <div style="display:none;" id="dhx_repeat_year"> <label><input class="dhx_repeat_radio" type="radio" name="year_type" value="d"/>Todo</label><input class="dhx_repeat_text" type="text" name="year_day" value="1" />dia<select name="year_month"><option value="0" selected >Janeiro<option value="1">Fevereiro<option value="2">Março<option value="3">Abril<option value="4">Maio<option value="5">Junho<option value="6">Julho<option value="7">Agosto<option value="8">Setembro<option value="9">Outubro<option value="10">Novembro<option value="11">Dezembro</select>mês<br /> <label><input class="dhx_repeat_radio" type="radio" name="year_type" checked value="w"/>Em</label><input class="dhx_repeat_text" type="text" name="year_week2" value="1" /><select name="year_day2"><option value="1" selected >Segunda<option value="2">Terça<option value="3">Quarta<option value="4">Quinta<option value="5">Sexta<option value="6">Sabado<option value="7">Domingo</select>of<select name="year_month2"><option value="0" selected >Janeiro<option value="1">Fevereiro<option value="2">Março<option value="3">Abril<option value="4">Maio<option value="5">Junho<option value="6">Julho<option value="7">Agosto<option value="8">Setembro<option value="9">Outubro<option value="10">Novembro<option value="11">Dezembro</select><br /> </div> </div> <div class="dhx_repeat_divider"></div> <div class="dhx_repeat_right"> <label><input class="dhx_repeat_radio" type="radio" name="end" checked/>Sem data final</label><br /> <label><input class="dhx_repeat_radio" type="radio" name="end" />Depois</label><input class="dhx_repeat_text" type="text" name="occurences_count" value="1" />ocorrências<br /> <label><input class="dhx_repeat_radio" type="radio" name="end" />Fim</label><input class="dhx_repeat_date" type="text" name="date_of_end" value="01.01.2010" /><br /> </div> </form> </div> <div style="clear:both"> </div>';
\ No newline at end of file
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/sources/locale_recurring_ru.js b/addons/base_calendar/static/lib/dhtmlxScheduler/sources/locale_recurring_ru.js
new file mode 100644
index 00000000000..1919fe21b28
--- /dev/null
+++ b/addons/base_calendar/static/lib/dhtmlxScheduler/sources/locale_recurring_ru.js
@@ -0,0 +1,2 @@
+scheduler.__recurring_template='<div class="dhx_form_repeat"> <form> <div class="dhx_repeat_left"> <label><input class="dhx_repeat_radio" type="radio" name="repeat" value="day" />День</label><br /> <label><input class="dhx_repeat_radio" type="radio" name="repeat" value="week"/>�едел�</label><br /> <label><input class="dhx_repeat_radio" type="radio" name="repeat" value="month" checked />Ме��ц</label><br /> <label><input class="dhx_repeat_radio" type="radio" name="repeat" value="year" />Год</label> </div> <div class="dhx_repeat_divider"></div> <div class="dhx_repeat_center"> <div style="display:none;" id="dhx_repeat_day"> <label><input class="dhx_repeat_radio" type="radio" name="day_type" value="d"/>Каждый</label><input class="dhx_repeat_text" type="text" name="day_count" value="1" />день<br /> <label><input class="dhx_repeat_radio" type="radio" name="day_type" checked value="w"/>Каждый рабочий день</label> </div> <div style="display:none;" id="dhx_repeat_week"> Повтор�ть каждую<input class="dhx_repeat_text" type="text" name="week_count" value="1" />неделю , в:<br /> <table class="dhx_repeat_days"> <tr> <td> <label><input class="dhx_repeat_checkbox" type="checkbox" name="week_day" value="1" />Понедельник</label><br /> <label><input class="dhx_repeat_checkbox" type="checkbox" name="week_day" value="4" />Четверг</label> </td> <td> <label><input class="dhx_repeat_checkbox" type="checkbox" name="week_day" value="2" />Вторник</label><br /> <label><input class="dhx_repeat_checkbox" type="checkbox" name="week_day" value="5" />П�тницу</label> </td> <td> <label><input class="dhx_repeat_checkbox" type="checkbox" name="week_day" value="3" />Среду&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</label><br /> <label><input class="dhx_repeat_checkbox" type="checkbox" name="week_day" value="6" />Субботу</label> </td> <td> <label><input class="dhx_repeat_checkbox" type="checkbox" name="week_day" value="0" />Во�кре�енье</label><br /><br /> </td> </tr> </table> </div> <div id="dhx_repeat_month"> <label><input class="dhx_repeat_radio" type="radio" name="month_type" value="d"/>Повтор�ть</label><input class="dhx_repeat_text" type="text" name="month_day" value="1" /> чи�ла каждый <input class="dhx_repeat_text" type="text" name="month_count" value="1" />ме��ц<br /> <label><input class="dhx_repeat_radio" type="radio" name="month_type" checked value="w"/></label><input class="dhx_repeat_text" type="text" name="month_week2" value="1" /><select name="month_day2"><option value="1" selected >Понедельник<option value="2">Вторник<option value="3">Среда<option value="4">Четверг<option value="5">П�тница<option value="6">Суббота<option value="0">Во�кре�енье</select>каждый <input class="dhx_repeat_text" type="text" name="month_count2" value="1" />ме��ц<br /> </div> <div style="display:none;" id="dhx_repeat_year"> <label><input class="dhx_repeat_radio" type="radio" name="year_type" value="d"/></label><input class="dhx_repeat_text" type="text" name="year_day" value="1" />день<select name="year_month"><option value="0" selected >Январ�<option value="1">Феврал�<option value="2">Марта<option value="3">�прел�<option value="4">Ма�<option value="5">Июн�<option value="6">Июл�<option value="7">�вгу�та<option value="8">Сент�бр�<option value="9">Окт�бр�<option value="10">�о�бр�<option value="11">Декабр�</select><br /> <label><input class="dhx_repeat_radio" type="radio" name="year_type" checked value="w"/></label><input class="dhx_repeat_text" type="text" name="year_week2" value="1" /><select name="year_day2"><option value="1" selected >Понедельник<option value="2">Вторник<option value="3">Среда<option value="4">Четверг<option value="5">П�тница<option value="6">Суббота<option value="0">Во�кре�енье</select><select name="year_month2"><option value="0" selected >Январ�<option value="1">Феврал�<option value="2">Марта<option value="3">�прел�<option value="4">Ма�<option value="5">Июн�<option value="6">Июл�<option value="7">�вгу�та<option value="8">Сент�бр�<option value="9">Окт�бр�<option value="10">�о�бр�<option value="11">Декабр�</select><br /> </div> </div> <div class="dhx_repeat_divider"></div> <div class="dhx_repeat_right"> <label><input class="dhx_repeat_radio" type="radio" name="end" checked/>Без даты окончани�</label><br /> <label><input class="dhx_repeat_radio" type="radio" name="end" /></label><input class="dhx_repeat_text" type="text" name="occurences_count" value="1" />повторений<br /> <label><input class="dhx_repeat_radio" type="radio" name="end" />До </label><input class="dhx_repeat_date" type="text" name="date_of_end" value="01.01.2010" /><br /> </div> </form> </div> <div style="clear:both"> </div>';
+
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/sources/locale_recurring_sv.js b/addons/base_calendar/static/lib/dhtmlxScheduler/sources/locale_recurring_sv.js
new file mode 100644
index 00000000000..3087f904bcb
--- /dev/null
+++ b/addons/base_calendar/static/lib/dhtmlxScheduler/sources/locale_recurring_sv.js
@@ -0,0 +1 @@
+scheduler.__recurring_template='<div class="dhx_form_repeat"> <form> <div class="dhx_repeat_left"> <label><input class="dhx_repeat_radio" type="radio" name="repeat" value="day" />Dagligen</label><br /> <label><input class="dhx_repeat_radio" type="radio" name="repeat" value="week"/>Veckovis</label><br /> <label><input class="dhx_repeat_radio" type="radio" name="repeat" value="month" checked />Månadsvis</label><br /> <label><input class="dhx_repeat_radio" type="radio" name="repeat" value="year" />Årligen</label> </div> <div class="dhx_repeat_divider"></div> <div class="dhx_repeat_center"> <div style="display:none;" id="dhx_repeat_day"> <label><input class="dhx_repeat_radio" type="radio" name="day_type" value="d"/>Var</label><input class="dhx_repeat_text" type="text" name="day_count" value="1" />dag<br /> <label><input class="dhx_repeat_radio" type="radio" name="day_type" checked value="w"/>Varje arbetsdag</label> </div> <div style="display:none;" id="dhx_repeat_week"> Upprepa var<input class="dhx_repeat_text" type="text" name="week_count" value="1" />vecka dessa dagar:<br /> <table class="dhx_repeat_days"> <tr> <td> <label><input class="dhx_repeat_checkbox" type="checkbox" name="week_day" value="1" />Måndag</label><br /> <label><input class="dhx_repeat_checkbox" type="checkbox" name="week_day" value="4" />Tisdag</label> </td> <td> <label><input class="dhx_repeat_checkbox" type="checkbox" name="week_day" value="2" />Torsdag</label><br /> <label><input class="dhx_repeat_checkbox" type="checkbox" name="week_day" value="5" />Fredag</label> </td> <td> <label><input class="dhx_repeat_checkbox" type="checkbox" name="week_day" value="3" />Onsdag</label><br /> <label><input class="dhx_repeat_checkbox" type="checkbox" name="week_day" value="6" />Lördag</label> </td> <td> <label><input class="dhx_repeat_checkbox" type="checkbox" name="week_day" value="0" />Söndag</label><br /><br /> </td> </tr> </table> </div> <div id="dhx_repeat_month"> <label><input class="dhx_repeat_radio" type="radio" name="month_type" value="d"/>Upprepa</label><input class="dhx_repeat_text" type="text" name="month_day" value="1" />dagen var<input class="dhx_repeat_text" type="text" name="month_count" value="1" />månad<br /> <label><input class="dhx_repeat_radio" type="radio" name="month_type" checked value="w"/>Den</label><input class="dhx_repeat_text" type="text" name="month_week2" value="1" /><select name="month_day2"><option value="1" selected >måndagen<option value="2">tisdagen<option value="3">onsdagen<option value="4">torsdagen<option value="5">fredagen<option value="6">lördagen<option value="0">söndagen</select>var<input class="dhx_repeat_text" type="text" name="month_count2" value="1" />månad<br /> </div> <div style="display:none;" id="dhx_repeat_year"> <label><input class="dhx_repeat_radio" type="radio" name="year_type" value="d"/>Varje</label><input class="dhx_repeat_text" type="text" name="year_day" value="1" />dag i<select name="year_month"><option value="0" selected >Januari<option value="1">Februari<option value="2">Mars<option value="3">April<option value="4">Maj<option value="5">Juni<option value="6">Juli<option value="7">Augusti<option value="8">September<option value="9">Oktober<option value="10">November<option value="11">December</select>månad<br /> <label><input class="dhx_repeat_radio" type="radio" name="year_type" checked value="w"/>Den</label><input class="dhx_repeat_text" type="text" name="year_week2" value="1" /><select name="year_day2"><option value="1" selected >måndagen<option value="2">tisdagen<option value="3">onsdagen<option value="4">torsdagen<option value="5">fredagen<option value="6">lördagen<option value="7">söndagen</select>i<select name="year_month2"><option value="0" selected >Januari<option value="1">Februari<option value="2">Mars<option value="3">April<option value="4">Maj<option value="5">Juni<option value="6">Juli<option value="7">Augusti<option value="8">September<option value="9">Oktober<option value="10">November<option value="11">December</select><br /> </div> </div> <div class="dhx_repeat_divider"></div> <div class="dhx_repeat_right"> <label><input class="dhx_repeat_radio" type="radio" name="end" checked/>Inget slutdatum</label><br /> <label><input class="dhx_repeat_radio" type="radio" name="end" />Efter</label><input class="dhx_repeat_text" type="text" name="occurences_count" value="1" />upprepningar<br /> <label><input class="dhx_repeat_radio" type="radio" name="end" />Sluta efter</label><input class="dhx_repeat_date" type="text" name="date_of_end" value="01.01.2010" /><br /> </div> </form> </div> <div style="clear:both"> </div>';
\ No newline at end of file
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/sources/locale_recurring_ua.js b/addons/base_calendar/static/lib/dhtmlxScheduler/sources/locale_recurring_ua.js
new file mode 100644
index 00000000000..5b723675b69
--- /dev/null
+++ b/addons/base_calendar/static/lib/dhtmlxScheduler/sources/locale_recurring_ua.js
@@ -0,0 +1,2 @@
+scheduler.__recurring_template='<div class="dhx_form_repeat"> <form> <div class="dhx_repeat_left"> <label><input class="dhx_repeat_radio" type="radio" name="repeat" value="day" />День</label><br /> <label><input class="dhx_repeat_radio" type="radio" name="repeat" value="week"/>Тиждень</label><br /> <label><input class="dhx_repeat_radio" type="radio" name="repeat" value="month" checked />Мі��ць</label><br /> <label><input class="dhx_repeat_radio" type="radio" name="repeat" value="year" />Рік</label> </div> <div class="dhx_repeat_divider"></div> <div class="dhx_repeat_center"> <div style="display:none;" id="dhx_repeat_day"> <label><input class="dhx_repeat_radio" type="radio" name="day_type" value="d"/>Кожний</label><input class="dhx_repeat_text" type="text" name="day_count" value="1" />день<br /> <label><input class="dhx_repeat_radio" type="radio" name="day_type" checked value="w"/>Кожний робочий день</label> </div> <div style="display:none;" id="dhx_repeat_week"> Повторювати кожен<input class="dhx_repeat_text" type="text" name="week_count" value="1" />тиждень , по:<br /> <table class="dhx_repeat_days"> <tr> <td> <label><input class="dhx_repeat_checkbox" type="checkbox" name="week_day" value="1" />Понеділкам</label><br /> <label><input class="dhx_repeat_checkbox" type="checkbox" name="week_day" value="4" />Четвергам</label> </td> <td> <label><input class="dhx_repeat_checkbox" type="checkbox" name="week_day" value="2" />Вівторкам</label><br /> <label><input class="dhx_repeat_checkbox" type="checkbox" name="week_day" value="5" />П''�тниц�м</label> </td> <td> <label><input class="dhx_repeat_checkbox" type="checkbox" name="week_day" value="3" />Середам&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</label><br /> <label><input class="dhx_repeat_checkbox" type="checkbox" name="week_day" value="6" />Суботам</label> </td> <td> <label><input class="dhx_repeat_checkbox" type="checkbox" name="week_day" value="0" />�еділ�м</label><br /><br /> </td> </tr> </table> </div> <div id="dhx_repeat_month"> <label><input class="dhx_repeat_radio" type="radio" name="month_type" value="d"/>Повторювати</label><input class="dhx_repeat_text" type="text" name="month_day" value="1" /> чи�ла кожний <input class="dhx_repeat_text" type="text" name="month_count" value="1" />мі��ць<br /> <label><input class="dhx_repeat_radio" type="radio" name="month_type" checked value="w"/></label><input class="dhx_repeat_text" type="text" name="month_week2" value="1" /><select name="month_day2"><option value="1" selected >Понеділок<option value="2">Вівторок<option value="3">Середа<option value="4">Четвер<option value="5">П''�тниц�<option value="6">Субота<option value="0">�еділ�</select>кожен <input class="dhx_repeat_text" type="text" name="month_count2" value="1" />мі��ць<br /> </div> <div style="display:none;" id="dhx_repeat_year"> <label><input class="dhx_repeat_radio" type="radio" name="year_type" value="d"/></label><input class="dhx_repeat_text" type="text" name="year_day" value="1" />день<select name="year_month"><option value="0" selected >�ічн�<option value="1">лютого<option value="2">березн�<option value="3">квітн�<option value="4">травн�<option value="5">червн�<option value="6">липн�<option value="7">�ерпн�<option value="8">вере�н�<option value="9">жовтн�<option value="10">ли�топада<option value="11">грудн�</select><br /> <label><input class="dhx_repeat_radio" type="radio" name="year_type" checked value="w"/></label><input class="dhx_repeat_text" type="text" name="year_week2" value="1" /><select name="year_day2"><option value="1" selected >понеділок<option value="2">вівторок<option value="3">�ереда<option value="4">четвер<option value="5">п''�тниц�<option value="6">�убота<option value="0">неділ�</select><select name="year_month2"><option value="0" selected >�ічн�<option value="1">лютого<option value="2">березн�<option value="3">квітн�<option value="4">березн�<option value="5">червн�<option value="6">липн�<option value="7">�ерпн�<option value="8">вере�н�<option value="9">жовтн�<option value="10">ли�топада<option value="11">грудн�</select><br /> </div> </div> <div class="dhx_repeat_divider"></div> <div class="dhx_repeat_right"> <label><input class="dhx_repeat_radio" type="radio" name="end" checked/>Без дати закінченн�</label><br /> <label><input class="dhx_repeat_radio" type="radio" name="end" /></label><input class="dhx_repeat_text" type="text" name="occurences_count" value="1" />повторень<br /> <label><input class="dhx_repeat_radio" type="radio" name="end" />До </label><input class="dhx_repeat_date" type="text" name="date_of_end" value="01.01.2010" /><br /> </div> </form> </div> <div style="clear:both"> </div>';
+
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/sources/locale_ru.js b/addons/base_calendar/static/lib/dhtmlxScheduler/sources/locale_ru.js
new file mode 100644
index 00000000000..485cd795488
--- /dev/null
+++ b/addons/base_calendar/static/lib/dhtmlxScheduler/sources/locale_ru.js
@@ -0,0 +1,38 @@
+scheduler.locale={
+	date:{
+		month_full:["Январь", "Февраль", "Март", "�прель", "Maй", "Июнь", "Июль", "�вгу�т", "Сент�брь", "Oкт�брь", "�о�брь", "Декабрь"],
+		month_short:["Янв", "Фев", "Maр", "Aпр", "Maй", "Июн", "Июл", "Aвг", "Сен", "Окт", "�о�", "Дек"],
+		day_full:[ "Во�кре�енье", "Понедельник", "Вторник", "Среда", "Четверг", "П�тница", "Суббота"],
+    	day_short:["В�", "Пн", "Вт", "Ср", "Чт", "Пт", "Сб"]
+    },
+    labels:{
+    	dhx_cal_today_button: "Сегодн�",
+    	day_tab:"День",
+    	week_tab:"�едел�",
+    	month_tab:"Ме��ц",
+    	new_event:"�овое �обытие",
+		icon_save:"Сохранить",
+		icon_cancel:"Отменить",
+		icon_details:"Детали",
+		icon_edit:"Изменить",
+		icon_delete:"Удалить",
+		confirm_closing:"",//Ваши изменени� будут потер�ны, продолжить? 
+		confirm_deleting:"Событие будет удалено безвозвратно, продолжить?",
+		section_description:"Опи�ание",
+		section_time:"Период времени",
+		full_day:"Ве�ь день",
+		
+		confirm_recurring:"Вы хотите изменить в�ю �ерию повтор�ющих�� �обытий?",
+		section_recurring:"Повторение",
+		button_recurring:"Отключено",
+		button_recurring_open:"Включено",
+		
+		/*agenda view extension*/
+		agenda_tab:"Спи�ок",
+		date:"Дата",
+		description:"Опи�ание",
+		
+		/*year view extension*/
+		year_tab:"Год"
+	}
+}
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/sources/locale_si.js b/addons/base_calendar/static/lib/dhtmlxScheduler/sources/locale_si.js
new file mode 100644
index 00000000000..29da1a35bc0
--- /dev/null
+++ b/addons/base_calendar/static/lib/dhtmlxScheduler/sources/locale_si.js
@@ -0,0 +1,40 @@
+scheduler.locale={
+	date:{
+		month_full:["Januar", "Februar", "Marec", "April", "Maj", "Junij", "Julij", "Avgust", "September", "Oktober", "November", "December"],
+		month_short:["Jan", "Feb", "Mar", "Apr", "Maj", "Jun", "Jul", "Avg", "Sep", "Okt", "Nov", "Dec"],
+		day_full:["Nedelja", "Ponedeljek", "Torek", "Sreda", "Èetrtek", "Petek", "Sobota"],
+    	day_short:["Ne", "Po", "To", "Sre", "Èe", "Pe", "So"]
+    },
+    labels:{
+    	dhx_cal_today_button:"Danes",
+    	day_tab:"Dan",
+    	week_tab:"Teden",
+    	month_tab:"Mesec",
+    	new_event:"Nov dogodek",
+		icon_save:"Shrani",
+		icon_cancel:"Preklièi",
+		icon_details:"Podrobnosti",
+		icon_edit:"Uredi",
+		icon_delete:"Zbriši",
+		confirm_closing:"",//Vaše spremembe bodo izgubljene, želite nadaljevati ?
+		confirm_deleting:"Dogodek bo izbrisan trajno, želite nadaljevati?",
+		section_description:"Opis",
+		section_time:"Èasovno obdobje",
+		full_day:"Ves dan",
+		
+		/*recurring events*/
+		confirm_recurring:"Ali želite urediti celoten nabor ponavljajoèih dogodkov?",
+		section_recurring:"Ponovi dogodek",
+		button_recurring:"Onemogoèi",
+		button_recurring_open:"Omogoèi",
+		
+		/*agenda view extension*/
+		agenda_tab:"Agenda",
+		date:"Datum",
+		description:"Opis",
+		
+		/*year view extension*/
+		year_tab:"Leto"
+    }
+}
+
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/sources/locale_sv.js b/addons/base_calendar/static/lib/dhtmlxScheduler/sources/locale_sv.js
new file mode 100644
index 00000000000..76bf908acec
--- /dev/null
+++ b/addons/base_calendar/static/lib/dhtmlxScheduler/sources/locale_sv.js
@@ -0,0 +1,45 @@
+/*
+Copyright DHTMLX LTD. http://www.dhtmlx.com
+You allowed to use this component or parts of it under GPL terms
+To use it on other terms please contact us at sales@dhtmlx.com
+*/
+
+scheduler.locale={
+	date:{
+		month_full:["Januari", "Februari", "Mars", "April", "Maj", "Juni", "Juli", "Augusti", "September", "Oktober", "November", "December"],
+		month_short:["Jan", "Feb", "Mar", "Apr", "Maj", "Jun", "Jul", "Aug", "Sep", "Okt", "Nov", "Dec"],
+		day_full:["Söndag", "Måndag", "Tisdag", "Onsdag", "Torsdag", "Fredag", "Lördag"],
+    	day_short:["Sön", "Mån", "Tis", "Ons", "Tor", "Fre", "Lör"]
+    },
+    labels:{
+    	dhx_cal_today_button:"Idag",
+    	day_tab:"Dag",
+    	week_tab:"Vecka",
+    	month_tab:"MÃ¥nad",
+    	new_event:"Ny händelse",
+		icon_save:"Spara",
+		icon_cancel:"Ã…ngra",
+		icon_details:"Detajer",
+		icon_edit:"Ändra",
+		icon_delete:"Ta bort",
+		confirm_closing:"",//Dina förändingar kommer gå förlorade, är du säker?
+		confirm_deleting:"Är du säker på att du vill ta bort händelsen permanent?",
+		section_description:"Beskrivning",
+		section_time:"Tid",
+		full_day:"Hela dagen",
+		
+		/*recurring events*/
+		confirm_recurring:"Vill du redigera hela serien med repeterande händelser?",
+		section_recurring:"Upprepa händelse",
+		button_recurring:"Inaktiverat",
+		button_recurring_open:"Aktiverat",
+		
+		/*agenda view extension*/
+		agenda_tab:"Dagordning",
+		date:"Datum",
+		description:"Beskrivning",
+		
+		/*year view extension*/
+		year_tab:"Ã…r"
+	}
+}
\ No newline at end of file
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/sources/locale_ua.js b/addons/base_calendar/static/lib/dhtmlxScheduler/sources/locale_ua.js
new file mode 100644
index 00000000000..a7c946159e1
--- /dev/null
+++ b/addons/base_calendar/static/lib/dhtmlxScheduler/sources/locale_ua.js
@@ -0,0 +1,40 @@
+scheduler.locale={
+	date:{
+		month_full:["Січень", "Лютий", "Березень", "Квітень", "Травень", "Червень", "Липень", "Серпень", "Вере�ень", "Жовтень", "Ли�топад", "Грудень"],
+		month_short:["Січ", "Лют", "Бер", "Кві", "Тра", "Чер", "Лип", "Сер", "Вер", "Жов", "Ли�", "Гру"],
+		day_full:["�еділ�", "Понеділок", "Вівторок", "Середа", "Четвер", "П'�тниц�", "Субота"],
+    	day_short:["�ед", "Пон", "Вів", "Сер", "Чет", "Птн", "Суб"]
+    },
+    labels:{
+    	dhx_cal_today_button:"Сьогодні",
+    	day_tab:"День",
+    	week_tab:"Тиждень",
+    	month_tab:"Мі��ць",
+    	new_event:"�ова поді�",
+		icon_save:"Зберегти",
+		icon_cancel:"Відміна",
+		icon_details:"Деталі",
+		icon_edit:"Редагувати",
+		icon_delete:"Вилучити",
+		confirm_closing:"",//Ваші зміни втрат�ть��. Ви впевнені ?
+		confirm_deleting:"Поді� вилучить�� назавжди. Ви впевнені?",
+		section_description:"Опи�",
+		section_time:"Ча�овий проміжок",
+		full_day:"Ве�ь день",
+		
+		/*recurring events*/
+		confirm_recurring:"Хочете редагувати ве�ь перелік повторюваних подій?",
+		section_recurring:"Повторювана поді�",
+		button_recurring:"Відключено",
+		button_recurring_open:"Включено",
+		
+		/*agenda view extension*/
+		agenda_tab:"Перелік",
+		date:"Дата",
+		description:"Опи�",
+		
+		/*year view extension*/
+		year_tab:"Рік"
+    }
+}
+
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/sources/note.css b/addons/base_calendar/static/lib/dhtmlxScheduler/sources/note.css
new file mode 100644
index 00000000000..e1ebfed7378
--- /dev/null
+++ b/addons/base_calendar/static/lib/dhtmlxScheduler/sources/note.css
@@ -0,0 +1,115 @@
+.dhx_cal_event div{
+	background-color:#FFE763;
+	border:1px solid #B7A543;
+	color:#887A2E;
+	overflow:hidden;
+	width:100%;
+	
+	font-family:Tahoma;
+	font-size:8pt;
+}
+.dhx_move_denied .dhx_cal_event .dhx_header, .dhx_move_denied .dhx_cal_event .dhx_title{
+	cursor:default;
+}
+.dhx_cal_event .dhx_header{
+	height:1px; 
+	margin-left:1px; 
+	border-width:1px 1px 0px 1px;
+	cursor:pointer;
+}
+.dhx_cal_event .dhx_title{
+	height:12px;
+	border-width:0px 1px 1px 1px;
+	border-bottom-style:dotted;
+	
+	font-size:7pt;
+	font-weight:bold;
+	text-align:center;
+	
+	background-position:right;
+	background-repeat:no-repeat;
+	cursor:pointer;
+}
+.dhx_cal_event .dhx_body{
+	border-width:0px 1px 1px 1px;
+	padding:5px;
+}
+.dhx_resize_denied .dhx_cal_event .dhx_footer{
+	cursor:default;
+}
+.dhx_cal_event .dhx_footer{
+	height:1px; 
+	margin-left:2px; 
+	border-width:0px 1px 1px 1px;
+	cursor:s-resize;
+}
+.dhx_cal_event_line{
+	background-color:#FFE763;
+	border:1px solid #B7A543;
+	font-family:Tahoma;
+	font-size:8pt;
+	height:13px;
+	padding-left:10px;
+	color:#887A2E;
+	cursor:pointer;
+	overflow:hidden;
+}
+.dhx_cal_event_clear{
+	font-family:Tahoma;
+	font-size:8pt;
+	height:13px;
+	padding-left:2px;
+	color:#887A2E;	
+	white-space:nowrap;
+	overflow:hidden;
+	cursor:pointer;
+}
+.dhx_in_move{
+	background-color:#FFFF80;
+}
+div.dhx_cal_editor{
+	background-color:#FFE763;
+	border:1px solid #B7A543;
+	border-top-style:dotted;
+	z-index:999;
+	position:absolute;
+	overflow:hidden;
+}
+textarea.dhx_cal_editor{
+	width:100%; 
+	height:100%;
+	border:0px solid black;
+	margin:none;
+	padding:none;
+	overflow:auto;
+}
+div.dhx_menu_head{
+	background-image:url(imgs/controls.gif);
+	background-position: 0px -43px;
+	width:10px; height:10px;
+	margin-left:5px; margin-top:1px;
+	border:none;
+	cursor:default;
+}
+div.dhx_menu_icon{
+	background-image:url(imgs/controls.gif);
+	width:20px; height:20px;
+	margin-left:-5px; margin-top:0px;
+	border:none;
+	cursor:pointer;
+}
+div.icon_details{
+	background-position: 0px 0px;
+}
+div.icon_edit{
+	background-position: -22px 0px;
+}
+div.icon_save{
+	background-position: -84px -1px;
+}
+div.icon_cancel{
+	background-position: -62px 0px;
+}
+div.icon_delete{
+	background-position: -42px 0px;
+}
\ No newline at end of file
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/sources/property.js b/addons/base_calendar/static/lib/dhtmlxScheduler/sources/property.js
new file mode 100644
index 00000000000..ee9a59d2222
--- /dev/null
+++ b/addons/base_calendar/static/lib/dhtmlxScheduler/sources/property.js
@@ -0,0 +1,175 @@
+scheduler._props = {};
+scheduler.createUnitsView=function(name,property,list,size,step){
+	if (typeof name == "object"){
+		list = name.list;
+		property = name.property;
+		size = name.size||0;
+		step = name.step||1;
+		name = name.name;		
+	}
+	scheduler.date[name+"_start"]= scheduler.date.day_start;
+	scheduler.templates[name+"_date"] = function(date){
+		return scheduler.templates.day_date(date);
+	}
+	scheduler.templates[name+"_scale_date"] = function(date){
+		if (!list.length) return "";
+		var index = (scheduler._props[name].position||0)+Math.floor((scheduler._correct_shift(date.valueOf(),1)-scheduler._min_date.valueOf())/(60*60*24*1000));
+		if (list[index].css) 
+			return "<span class='"+list[index].css+"'>"+list[index].label+"</span>";
+		else
+			return list[index].label;
+	}
+	scheduler.date["add_"+name]=function(date,inc){ return scheduler.date.add(date,inc,"day"); }
+	scheduler.date["get_"+name+"_end"]=function(date){ return scheduler.date.add(date,size||list.length,"day"); }
+	
+	scheduler._props[name]={map_to:property, options:list, size:size, step:step, position:0 };	
+	
+	scheduler.attachEvent("onOptionsLoad",function(){
+		var order = scheduler._props[name].order = {};
+		for(var i=0; i<list.length;i++)
+			order[list[i].key]=i;	
+		if (scheduler._date) 
+			scheduler.setCurrentView(scheduler._date, scheduler._mode);
+	});
+	scheduler.callEvent("onOptionsLoad",[]);
+};
+scheduler.scrollUnit=function(step){
+	var pr = scheduler._props[this._mode];
+	if (pr){
+		pr.position=Math.min(Math.max(0,pr.position+step),pr.options.length-pr.size);
+		this.update_view();		
+	}
+};
+
+(function(){
+	var fix_und=function(pr,ev){
+		if (pr && typeof pr.order[ev[pr.map_to]] == "undefined"){
+			var s = scheduler;
+			var dx = 24*60*60*1000;
+			var ind = Math.floor((ev.end_date - s._min_date)/dx);
+			//ev.end_date = new Date(s.date.time_part(ev.end_date)*1000+s._min_date.valueOf());
+			//ev.start_date = new Date(s.date.time_part(ev.start_date)*1000+s._min_date.valueOf());
+			ev[pr.map_to] = pr.options[Math.min(ind+pr.position,pr.options.length-1)].key;
+			return true;
+		}
+	}
+	var t = scheduler._reset_scale;
+	
+	var oldive = scheduler.is_visible_events;
+	scheduler.is_visible_events = function(e){
+		var res = oldive.apply(this,arguments);
+		if (res){
+			var pr = scheduler._props[this._mode];
+			if (pr && pr.size){
+				 var val = pr.order[e[pr.map_to]];
+				 if (val < pr.position || val >= pr.size+pr.position )
+				 	return false;
+			}
+		}
+		return res;
+	}
+	
+	scheduler._reset_scale = function(){
+		var pr = scheduler._props[this._mode];
+		var ret = t.apply(this,arguments);
+		if (pr){
+			this._max_date=this.date.add(this._min_date,1,"day");
+				
+				var d = this._els["dhx_cal_data"][0].childNodes;
+				for (var i=0; i < d.length; i++)
+					d[i].className = d[i].className.replace("_now",""); //clear now class
+				
+			if (pr.size && pr.size < pr.options.length){
+				
+				var h = this._els["dhx_cal_header"][0];
+				var arrow = document.createElement("DIV");				
+				if (pr.position){
+					arrow.className = "dhx_cal_prev_button";
+					arrow.style.cssText="left:1px;top:2px;position:absolute;"
+					arrow.innerHTML = "&nbsp;"				
+					h.firstChild.appendChild(arrow);
+					arrow.onclick=function(){
+						scheduler.scrollUnit(pr.step*-1);
+					}
+				}
+				if (pr.position+pr.size<pr.options.length){
+					arrow = document.createElement("DIV");
+					arrow.className = "dhx_cal_next_button";
+					arrow.style.cssText="left:auto; right:0px;top:2px;position:absolute;"
+					arrow.innerHTML = "&nbsp;"		
+					h.lastChild.appendChild(arrow);
+					arrow.onclick=function(){
+						scheduler.scrollUnit(pr.step);
+					}
+				}
+			}
+		}
+		return ret;
+		
+	}
+	var r = scheduler._get_event_sday;
+	scheduler._get_event_sday=function(ev){
+		var pr = scheduler._props[this._mode];
+		if (pr){
+			fix_und(pr,ev);
+			return pr.order[ev[pr.map_to]]-pr.position;	
+		}
+		return r.call(this,ev);
+	}
+	var l = scheduler.locate_holder_day;
+	scheduler.locate_holder_day=function(a,b,ev){
+		var pr = scheduler._props[this._mode];
+		if (pr){
+			fix_und(pr,ev);
+			return pr.order[ev[pr.map_to]]*1+(b?1:0)-pr.position;	
+		}
+		return l.apply(this,arguments);
+	}
+	var p = scheduler._mouse_coords;
+	scheduler._mouse_coords=function(){
+		var pr = scheduler._props[this._mode];
+		var pos=p.apply(this,arguments);
+		if (pr){
+			var ev = this._drag_event;
+			if (this._drag_id){
+				ev = this.getEvent(this._drag_id);
+				this._drag_event._dhx_changed = true;
+			}
+			var unit_ind = Math.min(pos.x+pr.position,pr.options.length-1);
+			ev[pr.map_to]=pr.options[unit_ind].key;
+			pos.x = unit_ind/10000000;
+		}
+		return pos;
+	}
+	var o = scheduler._time_order;
+	scheduler._time_order = function(evs){
+		var pr = scheduler._props[this._mode];
+		if (pr){
+			evs.sort(function(a,b){
+				return pr.order[a[pr.map_to]]>pr.order[b[pr.map_to]]?1:-1;
+			});
+		} else
+			o.apply(this,arguments);
+	}
+	
+	scheduler.attachEvent("onEventAdded",function(id,ev){
+		if (this._loading) return true;
+		for (var a in scheduler._props){
+			var pr = scheduler._props[a];
+			if (typeof ev[pr.map_to] == "undefined")
+				ev[pr.map_to] = pr.options[0].key;
+		}
+		return true;
+	})
+	scheduler.attachEvent("onEventCreated",function(id,n_ev){
+		var pr = scheduler._props[this._mode];
+		if (pr){
+			var ev = this.getEvent(id);
+			this._mouse_coords(n_ev);
+			fix_und(pr,ev);
+			this.event_updated(ev);
+		}
+		return true;
+	})
+			
+})();
\ No newline at end of file
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/sources/recurring.css b/addons/base_calendar/static/lib/dhtmlxScheduler/sources/recurring.css
new file mode 100644
index 00000000000..ed4755f0892
--- /dev/null
+++ b/addons/base_calendar/static/lib/dhtmlxScheduler/sources/recurring.css
@@ -0,0 +1,111 @@
+/*IE*/
+div input.radio 	{ margin:-4px 0 0 -4px !ie; }
+div input.checkbox 	{ margin:0 0 0 -4px !ie; }
+
+/*All*/  
+.dhx_form_repeat, .dhx_form_repeat input {
+    padding:0;
+    margin:0;
+    font-family:Tahoma, Verdana;
+    font-size:11px;
+    line-height:24px;
+}
+
+.dhx_form_repeat {
+    overflow:hidden;
+    /*height:115px;*/
+    height:0px;
+    background-color: #FFF4B5;
+    /*border: 1px solid #DCC43E;*/
+}
+
+
+.dhx_repeat_center, .dhx_repeat_left{
+    height:115px;
+    padding:10px 0 10px 10px;
+    float:left;
+}
+
+.dhx_repeat_left{
+    width:95px;
+}
+
+.dhx_repeat_center{
+    width:335px;
+    margin-top:12px;
+}
+
+.dhx_repeat_divider{
+    float:left;
+    height:115px;
+    border-left:1px dotted #DCC43E;
+    /*background-color: #DCC43E;*/
+    width:1px;
+}
+
+.dhx_repeat_right {
+    float:right;
+    height:115px;
+    width:160px;
+    padding:10px 3px 10px 10px;
+    margin-top:7px;
+}
+
+input.dhx_repeat_text {
+    height:16px;
+    width: 27px;
+    margin: 0 4px 0 4px;
+    line-height:18px;
+    padding: 0 0 0 2px;
+}
+
+.dhx_form_repeat select {
+    height: 20px;
+    width: 87px;
+    padding:0 0 0 2px;
+    margin: 0 4px 0 4px;
+}
+
+input.dhx_repeat_date{
+    height: 18px;
+    width: 80px;
+    padding:0 0 0 2px;
+    margin: 0 4px 0 4px;
+    background-repeat:no-repeat;
+    background-position:64px 0;
+    border:1px #7f9db9 solid;
+    line-height:18px;
+}
+
+input.dhx_repeat_radio {
+    margin-right:4px;
+}
+
+input.dhx_repeat_checkbox {
+    margin:4px 4px 0 0;
+}
+
+.dhx_repeat_days td {
+    padding-right:5px;
+}
+
+.dhx_repeat_days label {
+    font-size:10px;
+}
+
+.dhx_custom_button_recurring{
+	background-image:url(imgs/but_repeat.gif);
+	background-position:-5px 20px;
+	width:20px;
+	margin-right:10px;
+}
+.dhx_custom_button{
+	width:90px;
+}
+/* increase width of lightbox */
+.dhx_cal_light{
+	width:640px;
+}
+.dhx_cal_larea{
+	width:632px;
+}
\ No newline at end of file
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/sources/recurring.js b/addons/base_calendar/static/lib/dhtmlxScheduler/sources/recurring.js
new file mode 100644
index 00000000000..938226c9fb4
--- /dev/null
+++ b/addons/base_calendar/static/lib/dhtmlxScheduler/sources/recurring.js
@@ -0,0 +1,596 @@
+scheduler.form_blocks["recurring"]={
+	render:function(sns){
+		return scheduler.__recurring_template;
+	},
+	set_value:function(node,value,ev){
+		var ds = {start:ev.start_date, end:ev._end_date};
+		var str_date=scheduler.date.str_to_date(scheduler.config.repeat_date);
+			var date_str=scheduler.date.date_to_str(scheduler.config.repeat_date);
+
+		var top = node.getElementsByTagName("FORM")[0];
+	 	var els = [];
+	 	function register_els(inps){
+		 	for (var i=0; i<inps.length; i++){
+		 		var inp = inps[i]; 
+		 		if (inp.type=="checkbox" || inp.type=="radio"){
+	 				if (!els[inp.name])
+	 					els[inp.name]=[];
+	 				els[inp.name].push(inp);
+	 			} else
+	 				els[inp.name]=inp;
+	 		}
+	 	}
+	 	register_els(top.getElementsByTagName("INPUT"));
+	 	register_els(top.getElementsByTagName("SELECT"));
+	 	
+	 	var $ = function(a){ return document.getElementById(a); };
+	 	function get_radio_value(name){
+	 		var col = els[name];
+	 		for (var i=0; i<col.length; i++)
+	 			if (col[i].checked) return col[i].value;
+	 	}
+	 	function change_current_view(){
+	 		$("dhx_repeat_day").style.display="none";
+	 		$("dhx_repeat_week").style.display="none";
+	 		$("dhx_repeat_month").style.display="none";
+	 		$("dhx_repeat_year").style.display="none";
+	 		$("dhx_repeat_"+this.value).style.display="block";
+	 	}
+	 	
+	 	function get_repeat_code(dates){
+	 		var code = [get_radio_value("repeat")];
+	 		get_rcode[code[0]](code,dates);
+	 		
+	 		while (code.length < 5) code.push("");
+	 		var repeat = "";
+	 		if (els["end"][0].checked){
+	 			dates.end = new Date(9999,1,1);
+	 			repeat = "no";
+	 		}
+	 		else if (els["end"][2].checked){
+	 			dates.end = str_date(els["date_of_end"].value);
+	 		}
+	 		else { 
+	 			scheduler.transpose_type(code.join("_"));
+	 			repeat=Math.max(1,els["occurences_count"].value);
+	 			var transp = ((code[0]=="week" && code[4] && code[4].toString().indexOf(scheduler.config.start_on_monday?1:0)==-1)?1:0);
+	 			dates.end = scheduler.date.add(new Date(dates.start),repeat+transp,code.join("_")); 
+	 		}
+	 			
+	 		return code.join("_")+"#"+repeat;
+	 	}
+	 	var get_rcode={
+			month:function(code,dates){
+		 		if (get_radio_value("month_type")=="d"){
+		 			code.push(Math.max(1,els["month_count"].value));
+		 			dates.start.setDate(els["month_day"].value);
+		 		} else {
+		 			code.push(Math.max(1,els["month_count2"].value));
+		 			code.push(els["month_day2"].value);	
+		 			code.push(Math.max(1,els["month_week2"].value));
+		 			dates.start.setDate(1);
+		 		}
+		 		dates._start = true;
+	 		},
+	 		week:function(code,dates){
+				code.push(Math.max(1,els["week_count"].value));
+				code.push("");code.push("");
+				var t = [];
+				var col = els["week_day"];
+				for (var i=0; i < col.length; i++) {
+					if (col[i].checked) t.push(col[i].value);
+				}
+				if (!t.length)
+					t.push(dates.start.getDay());
+					
+				dates.start=scheduler.date.week_start(dates.start);
+				dates._start = true;
+				
+				code.push(t.sort().join(","));
+			 },
+			 day:function(code){
+		 		if (get_radio_value("day_type")=="d"){
+		 			code.push(Math.max(1,els["day_count"].value));
+		 		} else {
+		 			code.push("week");code.push(1);code.push("");code.push("");code.push("1,2,3,4,5");
+		 			code.splice(0,1);
+		 		}
+	 		 },
+	 		 year:function(code,dates){
+		 		if (get_radio_value("year_type")=="d"){
+		 			code.push("1");
+		 			dates.start.setMonth(0);
+		 			dates.start.setDate(els["year_day"].value);
+		 			dates.start.setMonth(els["year_month"].value);
+		 			
+		 		} else {
+		 			code.push("1");
+		 			code.push(els["year_day2"].value);
+		 			code.push(els["year_week2"].value);
+		 			dates.start.setDate(1);
+		 			dates.start.setMonth(els["year_month2"].value);
+		 		}
+		 		dates._start = true;
+	 		} 	
+ 		};
+ 		var set_rcode={
+ 			week:function(code,dates){
+ 				els["week_count"].value=code[1];
+				var col = els["week_day"];
+				var t = code[4].split(","); var d ={};
+				for (var i=0; i < t.length; i++) d[t[i]]=true;
+				for (var i=0; i < col.length; i++)
+					col[i].checked = (!!d[col[i].value]);
+				},
+ 			month:function(code,dates){
+ 		 		if (code[2]==""){
+		 			els["month_type"][0].checked=true;
+		 			els["month_count"].value=code[1];
+		 			els["month_day"].value=dates.start.getDate();
+		 		} else {
+		 			els["month_type"][1].checked=true;
+		 			els["month_count2"].value=code[1];
+		 			els["month_week2"].value=code[3];
+		 			els["month_day2"].value=code[2];
+		 		}
+				},
+ 			day:function(code,dates){
+ 				els["day_type"][0].checked=true;
+	 			els["day_count"].value=code[1];
+				},
+ 			year:function(code,dates){
+ 		 		if (code[2]==""){
+		 			els["year_type"][0].checked=true;
+		 			els["year_day"].value=dates.start.getDate();
+		 			els["year_month"].value=dates.start.getMonth();
+		 		} else {
+		 			els["year_type"][1].checked=true;
+		 			els["year_week2"].value=code[3];
+		 			els["year_day2"].value=code[2];
+		 			els["year_month2"].value=dates.start.getMonth();
+		 		}
+			}
+		};
+	 	function set_repeat_code(code,dates){
+	 		var data = code.split("#");
+	 		code = data[0].split("_");
+	 		set_rcode[code[0]](code,dates);
+	 		var e = els["repeat"][({day:0, week:1, month:2, year:3})[code[0]]];
+	 		switch(data[1]){
+	 			case "no":
+	 				els["end"][0].checked=true;
+	 				break;
+	 			case "":
+	 				els["end"][2].checked=true;
+	 				els["date_of_end"].value=date_str(dates.end);
+	 				break;
+	 			default:
+	 				els["end"][1].checked=true;
+	 				els["occurences_count"].value=data[1];
+	 				break;
+	 		}
+	 		 		
+	 		e.checked=true;
+	 		e.onclick();
+	 	}
+
+		for (var i=0; i<top.elements.length; i++){
+			var el = top.elements[i];
+			switch(el.name){
+				case "repeat":
+					el.onclick = change_current_view;
+					break;
+			}
+		}
+		scheduler.form_blocks["recurring"].set_value=function(node,value,ev){
+			node.open=!ev.rec_type;
+			if (ev.event_pid && ev.event_pid!="0") node.blocked=true;
+			else node.blocked=false;
+			
+			ds.start = ev.start_date;
+			ds.end = ev._end_date;
+			
+			scheduler.form_blocks["recurring"].button_click(0,node.previousSibling.firstChild.firstChild,node,node);
+			if (value)
+				set_repeat_code(value,ds);
+			
+		};
+		scheduler.form_blocks["recurring"].get_value=function(node,ev){
+			if (node.open){
+				ev.rec_type=get_repeat_code(ds);
+				if (ds._start){
+					ev._start_date = ev.start_date = ds.start;
+					ds._start=false;
+				} else 
+					ev._start_date = null;
+					
+				ev._end_date = ev.end_date = ds.end;
+				ev.rec_pattern = ev.rec_type.split("#")[0];
+			} else {
+				ev.rec_type= ev.rec_pattern = "";
+				ev._end_date = ev.end_date;
+			}
+			return ev.rec_type;
+		};
+		scheduler.form_blocks["recurring"].set_value(node,value,ev);
+	},
+	get_value:function(node,ev){
+	},
+	focus:function(node){
+	},
+	button_click:function(index,el, section, cont){
+		if (!cont.open && !cont.blocked){
+			cont.style.height="115px";
+			el.style.backgroundPosition="-5px 0px";
+			el.nextSibling.innerHTML = scheduler.locale.labels.button_recurring_open;
+		} else {
+			cont.style.height="0px";
+			el.style.backgroundPosition="-5px 20px";
+			el.nextSibling.innerHTML = scheduler.locale.labels.button_recurring;
+		}
+		cont.open=!cont.open;
+		
+		scheduler.setLightboxSize();
+	}
+};
+
+
+//problem may occur if we will have two repeating events in the same moment of time
+scheduler._rec_markers = {};
+scheduler._rec_markers_pull = {};
+scheduler._add_rec_marker = function(ev,time){
+	ev._pid_time = time;
+	this._rec_markers[ev.id] = ev;
+	if (!this._rec_markers_pull[ev.event_pid]) this._rec_markers_pull[ev.event_pid] = {};
+	this._rec_markers_pull[ev.event_pid][time]=ev;
+};
+scheduler._get_rec_marker = function(time, id){
+	var ch = this._rec_markers_pull[id];
+	if (ch) return ch[time];
+	return null;	 
+};
+scheduler._get_rec_markers = function(id){
+	return (this._rec_markers_pull[id]||[]);	
+};
+scheduler._rec_temp = [];
+scheduler.attachEvent("onEventLoading",function(ev){
+	if (ev.event_pid!=0)
+		scheduler._add_rec_marker(ev,ev.event_length*1000);
+	if (ev.rec_type)
+		ev.rec_pattern = ev.rec_type.split("#")[0];
+	return true;
+});
+scheduler.attachEvent("onEventIdChange",function(id,new_id){
+	if (this._ignore_call) return;
+	this._ignore_call = true;
+	
+	for (var i=0; i<this._rec_temp.length; i++){
+		var tev = this._rec_temp[i];
+		if (tev.event_pid == id){
+			tev.event_pid = new_id;
+			this.changeEventId(tev.id,new_id+"#"+tev.id.split("#")[1]);
+		}
+	}
+	
+	delete this._ignore_call;
+});
+scheduler.attachEvent("onBeforeEventDelete",function(id){
+	var ev = this.getEvent(id);
+	if (id.toString().indexOf("#")!=-1) {
+		var id = id.split("#");
+		var nid = this.uid();
+		
+		var nev = this._copy_event(ev);
+		nev.id = nid; 
+		nev.event_pid = id[0];
+		nev.event_length = id[1];
+		nev.rec_type = nev.rec_pattern = "none";
+		this.addEvent(nev);
+		
+		this._add_rec_marker(this.getEvent(nid), id[1]*1000);
+	} else {
+		if (ev.rec_type)
+			this._roll_back_dates(ev);
+		var sub = this._get_rec_markers(id);
+		for (var i in sub)
+			this.deleteEvent(sub[i].id,true);		
+	}
+	return true;
+});
+
+scheduler.attachEvent("onEventChanged",function(id){
+	if (this._loading) return true;
+	
+	var ev = this.getEvent(id);
+	if (id.toString().indexOf("#")!=-1) {
+		var id = id.split("#");
+		var nid = this.uid();
+		this._not_render=true;
+		
+		var nev = this._copy_event(ev);
+		nev.id = nid;
+		nev.event_pid = id[0];
+		nev.event_length=id[1];
+		nev.rec_type = nev.rec_pattern = "";
+		this.addEvent(nev);
+		
+		this._not_render=false;
+		this._add_rec_marker(this.getEvent(nid),id[1]*1000);
+	} else{
+		if (ev.rec_type)
+			this._roll_back_dates(ev);
+		var sub = this._get_rec_markers(id);
+		for (var i in sub) {
+			delete this._rec_markers[sub[i].id];
+			this.deleteEvent(sub[i].id,true);		
+		};
+		delete this._rec_markers_pull[id];
+		
+		this._select_id = null; //remove selectin , because now was can have complex-ids
+	}
+	return true;
+});
+scheduler.attachEvent("onEventAdded",function(id){
+	if (!this._loading){
+		var ev = this.getEvent(id);	
+		if (ev.rec_type && !ev.event_length )
+			this._roll_back_dates(ev);
+	}
+	return true;
+});
+scheduler.attachEvent("onEventCreated",function(id){
+	var ev = this.getEvent(id);
+	if (!ev.rec_type)
+		ev.rec_type = ev.rec_pattern = "";
+	return true;
+});
+scheduler.attachEvent("onEventCancel",function(id){
+	var ev = this.getEvent(id);	
+	if (ev.rec_type){
+		this._roll_back_dates(ev);
+		// a bit expensive, but we need to be sure that event re-rendered, because view can be corrupted by resize , during edit process
+		this.render_view_data(ev.id);
+	}
+});
+scheduler._roll_back_dates=function(ev){
+	ev.event_length = (ev.end_date.valueOf() - ev.start_date.valueOf())/1000;
+	ev.end_date = ev._end_date;
+	if (ev._start_date){
+		ev.start_date.setMonth(0);
+		ev.start_date.setDate(ev._start_date.getDate());
+		ev.start_date.setMonth(ev._start_date.getMonth());
+		ev.start_date.setFullYear(ev._start_date.getFullYear());
+		
+	}
+};
+
+
+scheduler.validId=function(id){
+	return id.toString().indexOf("#")==-1;
+};
+
+
+scheduler.showLightbox_rec=scheduler.showLightbox;
+scheduler.showLightbox=function(id){
+	var pid=this.getEvent(id).event_pid;
+	if (id.toString().indexOf("#")!=-1)
+		pid = id.split("#")[0];
+	if (!pid || pid == 0 || (!this.locale.labels.confirm_recurring || !confirm(this.locale.labels.confirm_recurring))) return this.showLightbox_rec(id);
+	pid = this.getEvent(pid);
+	pid._end_date = pid.end_date;
+	pid.end_date = new Date(pid.start_date.valueOf()+pid.event_length*1000);
+	return this.showLightbox_rec(pid.id);
+};
+scheduler.get_visible_events_rec = scheduler.get_visible_events;
+scheduler.get_visible_events=function(){
+	for (var i=0; i<this._rec_temp.length; i++)
+		delete this._events[this._rec_temp[i].id];
+	this._rec_temp = [];
+	
+	var stack = this.get_visible_events_rec();
+	var out=[];
+	for (var i=0; i<stack.length; i++){
+		if (stack[i].rec_type){
+			//deleted element of serie
+			if (stack[i].rec_pattern != "none")
+				this.repeat_date(stack[i],out);
+		} 
+		else out.push(stack[i]);
+	}
+	return out;
+};
+
+(function(){
+var old = scheduler.is_one_day_event;
+scheduler.is_one_day_event=function(ev){
+	if (ev.rec_type) return true;
+	return old.call(this,ev);
+};
+})();
+
+scheduler.transponse_size={
+	day:1, week:7, month:1, year:12 
+};
+scheduler.date.day_week=function(sd,day,week){
+	sd.setDate(1);
+	week = (week-1)*7;
+	var cday = sd.getDay();
+	var nday=day*1+week-cday+1;
+	sd.setDate(nday<=week?(nday+7):nday);
+};
+scheduler.transpose_day_week=function(sd,list,cor,size,cor2){
+	var cday = (sd.getDay()||(scheduler.config.start_on_monday?7:0))-cor;
+	for (var i=0; i < list.length; i++) {
+		if (list[i]>cday)
+			return sd.setDate(sd.getDate()+list[i]*1-cday-(size?cor:cor2));
+	}
+	this.transpose_day_week(sd,list,cor+size,null,cor);
+};	
+scheduler.transpose_type = function(type){
+	var f = "transpose_"+type;
+	if (!this.date[f]) {
+		var str = type.split("_");
+		var day = 60*60*24*1000;
+		var gf = "add_"+type;
+		var step = this.transponse_size[str[0]]*str[1];
+		
+		if (str[0]=="day" || str[0]=="week"){
+			var days = null;
+			if (str[4]){
+				days=str[4].split(",");
+				if (scheduler.config.start_on_monday){
+					for (var i=0; i < days.length; i++)
+						days[i]=(days[i]*1)||7;
+					days.sort();
+				}
+			}
+			
+			
+			this.date[f] = function(nd,td){
+				var delta = Math.floor((td.valueOf()-nd.valueOf())/(day*step));
+				if (delta>0)
+					nd.setDate(nd.getDate()+delta*step);
+				if (days)
+						scheduler.transpose_day_week(nd,days,1,step);
+			};
+			this.date[gf] = function(sd,inc){
+				var nd =  new Date(sd.valueOf());
+				if (days){
+					for (var count=0; count < inc; count++)
+						scheduler.transpose_day_week(nd,days,0,step);	
+				} else
+					nd.setDate(nd.getDate()+inc*step);
+				
+				return nd;
+			};
+		}
+		else if (str[0]=="month" || str[0]=="year"){
+			this.date[f] = function(nd,td){
+				var delta = Math.ceil(((td.getFullYear()*12+td.getMonth()*1)-(nd.getFullYear()*12+nd.getMonth()*1))/(step));
+				if (delta>=0)
+					nd.setMonth(nd.getMonth()+delta*step);
+				if (str[3])
+					scheduler.date.day_week(nd,str[2],str[3]);
+			};
+			this.date[gf] = function(sd,inc){
+				var nd =  new Date(sd.valueOf());
+				nd.setMonth(nd.getMonth()+inc*step);
+				if (str[3])
+					scheduler.date.day_week(nd,str[2],str[3]);
+				return nd;
+			};
+		}
+	}
+};
+scheduler.repeat_date=function(ev,stack,non_render,from,to){
+	from = from||this._min_date;
+	to = to||this._max_date;
+	
+	var td = new Date(ev.start_date.valueOf());
+	if (!ev.rec_pattern && ev.rec_type) 
+		ev.rec_pattern = ev.rec_type.split("#")[0];
+		
+	this.transpose_type(ev.rec_pattern);
+	scheduler.date["transpose_"+ev.rec_pattern](td, from);
+	while (td<ev.start_date || (td.valueOf()+ev.event_length*1000)<=from.valueOf()) 
+		td = this.date.add(td,1,ev.rec_pattern);
+	while (td < to && td < ev.end_date){
+		var ch = this._get_rec_marker(td.valueOf(),ev.id);
+		if (!ch) { //not changed element of serie
+			var ted = new Date(td.valueOf()+ev.event_length*1000);
+			var copy=this._copy_event(ev);
+			//copy._timed = ev._timed;
+			copy.start_date = td;
+			copy.event_pid = ev.id;
+			copy.id = ev.id+"#"+Math.ceil(td.valueOf()/1000);
+			copy.end_date = ted;
+			
+			var shift = copy.start_date.getTimezoneOffset() - copy.end_date.getTimezoneOffset();
+			if (shift){
+				if (shift>0) 
+					copy.end_date = new Date(td.valueOf()+ev.event_length*1000-shift*60*1000);
+				else {
+					copy.end_date = new Date(copy.end_date.valueOf() + shift*60*1000);
+				}
+			}
+							
+			copy._timed=this.is_one_day_event(copy);
+			
+			if (!copy._timed && !this._table_view && !this.config.multi_day) return;
+			stack.push(copy);
+			
+			if(!non_render){
+				this._events[copy.id] = copy;
+				this._rec_temp.push(copy);
+			}
+			
+		} else 
+			if (non_render) stack.push(ch);
+			
+		td = this.date.add(td,1,ev.rec_pattern);
+	}		
+};
+
+scheduler.getRecDates = function(id, max){
+	var ev = typeof id == "object" ? id : scheduler.getEvent(id);
+	var count = 0;
+	var result = [];
+	max = max || 1000;
+	
+	
+	var td = new Date(ev.start_date.valueOf());
+	var from = new Date(td.valueOf());
+	
+	if(!ev.rec_type) {
+		return [ { start_date: ev.start_date, end_date: ev.end_date } ];
+	}
+	this.transpose_type(ev.rec_pattern);
+	scheduler.date["transpose_"+ev.rec_pattern](td, from);
+	
+	while (td<ev.start_date || (td.valueOf()+ev.event_length*1000)<=from.valueOf())
+		td = this.date.add(td,1,ev.rec_pattern);
+	while (td < ev.end_date){
+		var ch = this._get_rec_marker(td.valueOf(),ev.id);
+		if (!ch){ //not changed element of serie
+			var ted = new Date(td.valueOf()+ev.event_length*1000);
+			var sed = new Date(td);
+			result.push({start_date:sed, end_date:ted});
+			td = this.date.add(td,1,ev.rec_pattern);
+			count++;
+		}
+		if (count == max) break;
+	}
+	return result;
+};
+scheduler.getEvents = function(from,to){
+	var result = [];
+	for (var a in this._events){
+		var ev = this._events[a];
+		if (ev && ev.start_date<to && ev.end_date>from){
+			if (ev.rec_pattern){
+				if (ev.rec_pattern=="none") continue;				
+				var sev = [];
+				this.repeat_date(ev,sev,true,from,to);
+				for (var i=0; i < sev.length; i++)
+					if (!sev[i].rec_pattern && sev[i].start_date<to && sev[i].end_date>from)
+						result.push(sev[i]);
+			} else if (!ev.event_pid || ev.event_pid==0){
+				result.push(ev);
+			}
+		}
+	}
+	return result;
+};
+
+scheduler.config.repeat_date="%m.%d.%Y";
+scheduler.config.lightbox.sections=[	
+	{name:"description", height:130, map_to:"text", type:"textarea" , focus:true},
+	{name:"recurring", height:115, type:"recurring", map_to:"rec_type", button:"recurring"},
+	{name:"time", height:72, type:"time", map_to:"auto"}
+];
+//drop secondary attributes
+scheduler._copy_dummy=function(ev){
+	this.start_date=new Date(this.start_date);
+	this.end_date=new Date(this.end_date);
+	this.event_length=this.event_pid=this.rec_pattern=this.rec_type=this._timed=null;
+};
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/sources/repeat_template.html b/addons/base_calendar/static/lib/dhtmlxScheduler/sources/repeat_template.html
new file mode 100644
index 00000000000..3d351383fc9
--- /dev/null
+++ b/addons/base_calendar/static/lib/dhtmlxScheduler/sources/repeat_template.html
@@ -0,0 +1,57 @@
+<div class="dhx_form_repeat">
+	<form>
+    <div class="dhx_repeat_left">
+               <label><input class="dhx_repeat_radio" type="radio" name="repeat" value="day" />Daily</label><br />
+               <label><input class="dhx_repeat_radio" type="radio" name="repeat" value="week"/>Weekly</label><br />
+               <label><input class="dhx_repeat_radio" type="radio" name="repeat" value="month" checked />Monthly</label><br />
+               <label><input class="dhx_repeat_radio" type="radio" name="repeat" value="year" />Yearly</label>
+    </div>
+    <div class="dhx_repeat_divider"></div>
+    <div class="dhx_repeat_center">
+               <div style="display:none;" id="dhx_repeat_day">
+                   <label><input class="dhx_repeat_radio" type="radio" name="day_type" value="d"/>Every</label><input class="dhx_repeat_text" type="text" name="day_count" value="1" />day<br />
+                   <label><input class="dhx_repeat_radio" type="radio" name="day_type" checked value="w"/>Every workday</label>
+               </div>
+               <div style="display:none;" id="dhx_repeat_week">
+                   Repeat every<input class="dhx_repeat_text" type="text" name="week_count" value="1" />week next days:<br />
+
+                   <table class="dhx_repeat_days">
+                       <tr>
+                           <td>
+                               <label><input class="dhx_repeat_checkbox" type="checkbox" name="week_day" value="1" />Monday</label><br />
+                               <label><input class="dhx_repeat_checkbox" type="checkbox" name="week_day" value="4" />Thursday</label>
+                           </td>
+                           <td>
+                               <label><input class="dhx_repeat_checkbox" type="checkbox" name="week_day" value="2" />Tuesday</label><br />
+                               <label><input class="dhx_repeat_checkbox" type="checkbox" name="week_day" value="5" />Friday</label>
+                           </td>
+                           <td>
+                               <label><input class="dhx_repeat_checkbox" type="checkbox" name="week_day" value="3" />Wednesday</label><br />
+                               <label><input class="dhx_repeat_checkbox" type="checkbox" name="week_day" value="6" />Saturday</label>
+                           </td>
+                           <td>
+                               <label><input class="dhx_repeat_checkbox" type="checkbox" name="week_day" value="0" />Sunday</label><br /><br />
+                           </td>
+                       </tr>
+                   </table>
+
+               </div>
+               <div id="dhx_repeat_month">
+                   <label><input class="dhx_repeat_radio" type="radio" name="month_type" value="d"/>Repeat</label><input class="dhx_repeat_text" type="text" name="month_day" value="1" />day every<input class="dhx_repeat_text" type="text" name="month_count" value="1" />month<br />
+                   <label><input class="dhx_repeat_radio" type="radio" name="month_type" checked value="w"/>On</label><input class="dhx_repeat_text" type="text" name="month_week2" value="1" /><select name="month_day2"><option value="1" selected >Monday<option value="2">Tuesday<option value="3">Wednesday<option value="4">Thursday<option value="5">Friday<option value="6">Saturday<option value="0">Sunday</select>every<input class="dhx_repeat_text" type="text" name="month_count2" value="1" />month<br />
+               </div>
+               <div style="display:none;" id="dhx_repeat_year">
+                   <label><input class="dhx_repeat_radio" type="radio" name="year_type" value="d"/>Every</label><input class="dhx_repeat_text" type="text" name="year_day" value="1" />day<select name="year_month"><option value="0" selected >January<option value="1">February<option value="2">March<option value="3">April<option value="4">May<option value="5">June<option value="6">July<option value="7">August<option value="8">September<option value="9">October<option value="10">November<option value="11">December</select>month<br />
+                   <label><input class="dhx_repeat_radio" type="radio" name="year_type" checked value="w"/>On</label><input class="dhx_repeat_text" type="text" name="year_week2" value="1" /><select name="year_day2"><option value="1" selected >Monday<option value="2">Tuesday<option value="3">Wednesday<option value="4">Thursday<option value="5">Friday<option value="6">Saturday<option value="7">Sunday</select>of<select name="year_month2"><option value="0" selected >January<option value="1">February<option value="2">March<option value="3">April<option value="4">May<option value="5">June<option value="6">July<option value="7">August<option value="8">September<option value="9">October<option value="10">November<option value="11">December</select><br />
+               </div>
+    </div>
+    <div class="dhx_repeat_divider"></div>
+    <div class="dhx_repeat_right">
+               <label><input class="dhx_repeat_radio" type="radio" name="end" checked/>No end date</label><br />
+               <label><input class="dhx_repeat_radio" type="radio" name="end" />After</label><input class="dhx_repeat_text" type="text" name="occurences_count" value="1" />occurrences<br />
+               <label><input class="dhx_repeat_radio" type="radio" name="end" />End by</label><input class="dhx_repeat_date" type="text" name="date_of_end" value="01.01.2010" /><br />
+    </div>
+    </form>
+ </div>
+ <div style="clear:both">
+ </div>
\ No newline at end of file
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/sources/repeat_template_cn.html b/addons/base_calendar/static/lib/dhtmlxScheduler/sources/repeat_template_cn.html
new file mode 100644
index 00000000000..222bb5f6e6c
--- /dev/null
+++ b/addons/base_calendar/static/lib/dhtmlxScheduler/sources/repeat_template_cn.html
@@ -0,0 +1,57 @@
+<div class="dhx_form_repeat">
+	<form>
+    <div class="dhx_repeat_left">
+               <label><input class="dhx_repeat_radio" type="radio" name="repeat" value="day" />按天</label><br />
+               <label><input class="dhx_repeat_radio" type="radio" name="repeat" value="week"/>按周</label><br />
+               <label><input class="dhx_repeat_radio" type="radio" name="repeat" value="month" checked />按月</label><br />
+               <label><input class="dhx_repeat_radio" type="radio" name="repeat" value="year" />按年</label>
+    </div>
+    <div class="dhx_repeat_divider"></div>
+    <div class="dhx_repeat_center">
+               <div style="display:none;" id="dhx_repeat_day">
+                   <label><input class="dhx_repeat_radio" type="radio" name="day_type" value="d"/>�</label><input class="dhx_repeat_text" type="text" name="day_count" value="1" />天<br />
+                   <label><input class="dhx_repeat_radio" type="radio" name="day_type" checked value="w"/>�个工作日</label>
+               </div>
+               <div style="display:none;" id="dhx_repeat_week">
+                   �� �<input class="dhx_repeat_text" type="text" name="week_count" value="1" />星期的:<br />
+
+                   <table class="dhx_repeat_days">
+                       <tr>
+                           <td>
+                               <label><input class="dhx_repeat_checkbox" type="checkbox" name="week_day" value="1" />星期一</label><br />
+                               <label><input class="dhx_repeat_checkbox" type="checkbox" name="week_day" value="4" />星期四</label>
+                           </td>
+                           <td>
+                               <label><input class="dhx_repeat_checkbox" type="checkbox" name="week_day" value="2" />星期二</label><br />
+                               <label><input class="dhx_repeat_checkbox" type="checkbox" name="week_day" value="5" />星期五</label>
+                           </td>
+                           <td>
+                               <label><input class="dhx_repeat_checkbox" type="checkbox" name="week_day" value="3" />星期三</label><br />
+                               <label><input class="dhx_repeat_checkbox" type="checkbox" name="week_day" value="6" />星期六</label>
+                           </td>
+                           <td>
+                               <label><input class="dhx_repeat_checkbox" type="checkbox" name="week_day" value="0" />星期日</label><br /><br />
+                           </td>
+                       </tr>
+                   </table>
+
+               </div>
+               <div id="dhx_repeat_month">
+                   <label><input class="dhx_repeat_radio" type="radio" name="month_type" value="d"/>��</label><input class="dhx_repeat_text" type="text" name="month_day" value="1" />日 �<input class="dhx_repeat_text" type="text" name="month_count" value="1" />月<br />
+                   <label><input class="dhx_repeat_radio" type="radio" name="month_type" checked value="w"/>在</label><input class="dhx_repeat_text" type="text" name="month_week2" value="1" /><select name="month_day2"><option value="1" selected >星期一<option value="2">星期二<option value="3">星期三<option value="4">星期四<option value="5">星期五<option value="6">星期六<option value="0">星期日</select>�<input class="dhx_repeat_text" type="text" name="month_count2" value="1" />月<br />
+               </div>
+               <div style="display:none;" id="dhx_repeat_year">
+                   <label><input class="dhx_repeat_radio" type="radio" name="year_type" value="d"/>�</label><input class="dhx_repeat_text" type="text" name="year_day" value="1" />日<select name="year_month"><option value="0" selected >一月<option value="1">二月<option value="2">三月<option value="3">四月<option value="4">五月<option value="5">六月<option value="6">七月<option value="7">八月<option value="8">�月<option value="9">�月<option value="10">�一月<option value="11">�二月</select>月<br />
+                   <label><input class="dhx_repeat_radio" type="radio" name="year_type" checked value="w"/>在</label><input class="dhx_repeat_text" type="text" name="year_week2" value="1" /><select name="year_day2"><option value="1" selected >星期一<option value="2">星期二<option value="3">星期三<option value="4">星期四<option value="5">星期五<option value="6">星期六<option value="7">星期日</select>的<select name="year_month2"><option value="0" selected >一月<option value="1">二月<option value="2">三月<option value="3">四月<option value="4">五月<option value="5">六月<option value="6">七月<option value="7">八月<option value="8">�月<option value="9">�月<option value="10">�一月<option value="11">�二月</select><br />
+               </div>
+    </div>
+    <div class="dhx_repeat_divider"></div>
+    <div class="dhx_repeat_right">
+               <label><input class="dhx_repeat_radio" type="radio" name="end" checked/>无结�日期</label><br />
+               <label><input class="dhx_repeat_radio" type="radio" name="end" />��</label><input class="dhx_repeat_text" type="text" name="occurences_count" value="1" />次结�<br />
+               <label><input class="dhx_repeat_radio" type="radio" name="end" />结�于</label><input class="dhx_repeat_date" type="text" name="date_of_end" value="01.01.2010" /><br />
+    </div>
+    </form>
+ </div>
+ <div style="clear:both">
+ </div>
\ No newline at end of file
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/sources/repeat_template_de.html b/addons/base_calendar/static/lib/dhtmlxScheduler/sources/repeat_template_de.html
new file mode 100644
index 00000000000..ae9dbb3cabf
--- /dev/null
+++ b/addons/base_calendar/static/lib/dhtmlxScheduler/sources/repeat_template_de.html
@@ -0,0 +1,60 @@
+<div class="dhx_form_repeat">
+	<form>
+    <div class="dhx_repeat_left">
+               <label><input class="dhx_repeat_radio" type="radio" name="repeat" value="day" />Täglich</label><br />
+               <label><input class="dhx_repeat_radio" type="radio" name="repeat" value="week"/>Wöchentlich</label><br />
+               <label><input class="dhx_repeat_radio" type="radio" name="repeat" value="month" checked />Monatlich</label><br />
+               <label><input class="dhx_repeat_radio" type="radio" name="repeat" value="year" />Jährlich</label>
+    </div>
+    <div class="dhx_repeat_divider"></div>
+    <div class="dhx_repeat_center">
+               <div style="display:none;" id="dhx_repeat_day">
+               	   <label>Wiederholt sich:<br/></label>
+                   <label><input class="dhx_repeat_radio" type="radio" name="day_type" value="d"/>jeden</label><input class="dhx_repeat_text" type="text" name="day_count" value="1" />Tag<br />
+                   <label><input class="dhx_repeat_radio" type="radio" name="day_type" checked value="w"/>an jedem Arbeitstag</label>
+               </div>
+               <div style="display:none;" id="dhx_repeat_week">
+                   Wiederholt sich jede<input class="dhx_repeat_text" type="text" name="week_count" value="1" />Woche am:<br />
+
+                   <table class="dhx_repeat_days">
+                       <tr>
+                           <td>
+                               <label><input class="dhx_repeat_checkbox" type="checkbox" name="week_day" value="1" />Montag</label><br />
+                               <label><input class="dhx_repeat_checkbox" type="checkbox" name="week_day" value="4" />Donnerstag</label>
+                           </td>
+                           <td>
+                               <label><input class="dhx_repeat_checkbox" type="checkbox" name="week_day" value="2" />Dienstag</label><br />
+                               <label><input class="dhx_repeat_checkbox" type="checkbox" name="week_day" value="5" />Freitag</label>
+                           </td>
+                           <td>
+                               <label><input class="dhx_repeat_checkbox" type="checkbox" name="week_day" value="3" />Mittwoch</label><br />
+                               <label><input class="dhx_repeat_checkbox" type="checkbox" name="week_day" value="6" />Samstag</label>
+                           </td>
+                           <td>
+                               <label><input class="dhx_repeat_checkbox" type="checkbox" name="week_day" value="0" />Sonntag</label><br /><br />
+                           </td>
+                       </tr>
+                   </table>
+
+               </div>
+               <div id="dhx_repeat_month">
+               	   <label>Wiederholt sich:<br/></label>
+                   <label><input class="dhx_repeat_radio" type="radio" name="month_type" value="d"/>an jedem</label><input class="dhx_repeat_text" type="text" name="month_day" value="1" />Tag eines jeden<input class="dhx_repeat_text" type="text" name="month_count" value="1" />Monats<br />
+                   <label><input class="dhx_repeat_radio" type="radio" name="month_type" checked value="w"/>am</label><input class="dhx_repeat_text" type="text" name="month_week2" value="1" /><select name="month_day2"><option value="1" selected >Montag<option value="2">Dienstag<option value="3">Mittwoch<option value="4">Donnerstag<option value="5">Freitag<option value="6">Samstag<option value="0">Sonntag</select>jeden<input class="dhx_repeat_text" type="text" name="month_count2" value="1" />Monats<br />
+               </div>
+               <div style="display:none;" id="dhx_repeat_year">
+				   <label>Wiederholt sich:</label>
+                   <label><input class="dhx_repeat_radio" type="radio" name="year_type" value="d"/>an jedem</label><input class="dhx_repeat_text" type="text" name="year_day" value="1" />Tag im<select name="year_month"><option value="0" selected >Januar<option value="1">Februar<option value="2">März<option value="3">April<option value="4">Mai<option value="5">Juni<option value="6">Juli<option value="7">August<option value="8">September<option value="9">Oktober<option value="10">November<option value="11">Dezember</select><br />
+                   <label><input class="dhx_repeat_radio" type="radio" name="year_type" checked value="w"/>am</label><input class="dhx_repeat_text" type="text" name="year_week2" value="1" /><select name="year_day2"><option value="1" selected >Montag<option value="2">Dienstag<option value="3">Mittwoch<option value="4">Donnerstag<option value="5">Freitag<option value="6">Samstag<option value="0">Sonntag</select>im<select name="year_month2"><option value="0" selected >Januar<option value="1">Februar<option value="2">März<option value="3">April<option value="4">Mai<option value="5">Juni<option value="6">Juli<option value="7">August<option value="8">September<option value="9">Oktober<option value="10">November<option value="11">Dezember</select><br />
+               </div>
+    </div>
+    <div class="dhx_repeat_divider"></div>
+    <div class="dhx_repeat_right">
+               <label><input class="dhx_repeat_radio" type="radio" name="end" checked/>kein Enddatum</label><br />
+               <label><input class="dhx_repeat_radio" type="radio" name="end" />nach</label><input class="dhx_repeat_text" type="text" name="occurences_count" value="1" />Ereignissen<br />
+               <label><input class="dhx_repeat_radio" type="radio" name="end" />Schluß</label><input class="dhx_repeat_date" type="text" name="date_of_end" value="01.01.2010" /><br />
+    </div>
+    </form>
+ </div>
+ <div style="clear:both">
+ </div>
\ No newline at end of file
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/sources/repeat_template_es.html b/addons/base_calendar/static/lib/dhtmlxScheduler/sources/repeat_template_es.html
new file mode 100644
index 00000000000..bcfcf2e81ea
--- /dev/null
+++ b/addons/base_calendar/static/lib/dhtmlxScheduler/sources/repeat_template_es.html
@@ -0,0 +1,57 @@
+<div class="dhx_form_repeat">
+	<form>
+    <div class="dhx_repeat_left">
+               <label><input class="dhx_repeat_radio" type="radio" name="repeat" value="day" />Diariamente</label><br />
+               <label><input class="dhx_repeat_radio" type="radio" name="repeat" value="week"/>Semanalment</label><br />
+               <label><input class="dhx_repeat_radio" type="radio" name="repeat" value="month" checked />Mensualmente</label><br />
+               <label><input class="dhx_repeat_radio" type="radio" name="repeat" value="year" />Anualmente</label>
+    </div>
+    <div class="dhx_repeat_divider"></div>
+    <div class="dhx_repeat_center">
+               <div style="display:none;" id="dhx_repeat_day">
+                   <label><input class="dhx_repeat_radio" type="radio" name="day_type" value="d"/>Cada</label><input class="dhx_repeat_text" type="text" name="day_count" value="1" />dia<br />
+                   <label><input class="dhx_repeat_radio" type="radio" name="day_type" checked value="w"/>Cada jornada de trabajo</label>
+               </div>
+               <div style="display:none;" id="dhx_repeat_week">
+                   Repetir cada<input class="dhx_repeat_text" type="text" name="week_count" value="1" />semana:<br />
+
+                   <table class="dhx_repeat_days">
+                       <tr>
+                           <td>
+                               <label><input class="dhx_repeat_checkbox" type="checkbox" name="week_day" value="1" />Lunes</label><br />
+                               <label><input class="dhx_repeat_checkbox" type="checkbox" name="week_day" value="4" />Jeuves</label>
+                           </td>
+                           <td>
+                               <label><input class="dhx_repeat_checkbox" type="checkbox" name="week_day" value="2" />Martes</label><br />
+                               <label><input class="dhx_repeat_checkbox" type="checkbox" name="week_day" value="5" />Viernes</label>
+                           </td>
+                           <td>
+                               <label><input class="dhx_repeat_checkbox" type="checkbox" name="week_day" value="3" />Miércoles</label><br />
+                               <label><input class="dhx_repeat_checkbox" type="checkbox" name="week_day" value="6" />Sabado</label>
+                           </td>
+                           <td>
+                               <label><input class="dhx_repeat_checkbox" type="checkbox" name="week_day" value="0" />Domingo</label><br /><br />
+                           </td>
+                       </tr>
+                   </table>
+
+               </div>
+               <div id="dhx_repeat_month">
+                   <label><input class="dhx_repeat_radio" type="radio" name="month_type" value="d"/>Repita</label><input class="dhx_repeat_text" type="text" name="month_day" value="1" />dia  cada <input class="dhx_repeat_text" type="text" name="month_count" value="1" />mes<br />
+                   <label><input class="dhx_repeat_radio" type="radio" name="month_type" checked value="w"/>El</label><input class="dhx_repeat_text" type="text" name="month_week2" value="1" /><select name="month_day2"><option value="1" selected >Lunes<option value="2">Martes<option value="3">Miércoles<option value="4">Jeuves<option value="5">Viernes<option value="6">Sabado<option value="0">Domingo</select>cada<input class="dhx_repeat_text" type="text" name="month_count2" value="1" />mes<br />
+               </div>
+               <div style="display:none;" id="dhx_repeat_year">
+                   <label><input class="dhx_repeat_radio" type="radio" name="year_type" value="d"/>Cada</label><input class="dhx_repeat_text" type="text" name="year_day" value="1" />dia<select name="year_month"><option value="0" selected >Enero<option value="1">Febrero<option value="2">Маrzo<option value="3">�bril<option value="4">Mayo<option value="5">Junio<option value="6">Julio<option value="7">�gosto<option value="8">Setiembre<option value="9">Octubre<option value="10">Noviembre<option value="11">Diciembre</select>mes<br />
+                   <label><input class="dhx_repeat_radio" type="radio" name="year_type" checked value="w"/>El</label><input class="dhx_repeat_text" type="text" name="year_week2" value="1" /><select name="year_day2"><option value="1" selected >Lunes<option value="2">Martes<option value="3">Miércoles<option value="4">Jeuves<option value="5">Viernes<option value="6">Sabado<option value="0">Domingo</select>del<select name="year_month2"><option value="0" selected >Enero<option value="1">Febrero<option value="2">Маrzo<option value="3">�bril<option value="4">Mayo<option value="5">Junio<option value="6">Julio<option value="7">�gosto<option value="8">Setiembre<option value="9">Octubre<option value="10">Noviembre<option value="11">Diciembre</select><br />
+               </div>
+    </div>
+    <div class="dhx_repeat_divider"></div>
+    <div class="dhx_repeat_right">
+               <label><input class="dhx_repeat_radio" type="radio" name="end" checked/>Sin fecha de finalización</label><br />
+               <label><input class="dhx_repeat_radio" type="radio" name="end" />Después de</label><input class="dhx_repeat_text" type="text" name="occurences_count" value="1" />occurencias<br />
+               <label><input class="dhx_repeat_radio" type="radio" name="end" />Fin</label><input class="dhx_repeat_date" type="text" name="date_of_end" value="01.01.2010" /><br />
+    </div>
+    </form>
+ </div>
+ <div style="clear:both">
+ </div>
\ No newline at end of file
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/sources/repeat_template_fr.html b/addons/base_calendar/static/lib/dhtmlxScheduler/sources/repeat_template_fr.html
new file mode 100644
index 00000000000..65313e6314b
--- /dev/null
+++ b/addons/base_calendar/static/lib/dhtmlxScheduler/sources/repeat_template_fr.html
@@ -0,0 +1,57 @@
+<div class="dhx_form_repeat">
+	<form>
+    <div class="dhx_repeat_left">
+               <label><input class="dhx_repeat_radio" type="radio" name="repeat" value="day" />Quotidienne</label><br />
+               <label><input class="dhx_repeat_radio" type="radio" name="repeat" value="week"/>Hebdomadaire</label><br />
+               <label><input class="dhx_repeat_radio" type="radio" name="repeat" value="month" checked />Mensuelle</label><br />
+               <label><input class="dhx_repeat_radio" type="radio" name="repeat" value="year" />Annuelle</label>
+    </div>
+    <div class="dhx_repeat_divider"></div>
+    <div class="dhx_repeat_center">
+               <div style="display:none;" id="dhx_repeat_day">
+                   <label><input class="dhx_repeat_radio" type="radio" name="day_type" value="d"/>Chaque</label><input class="dhx_repeat_text" type="text" name="day_count" value="1" />jour<br />
+                   <label><input class="dhx_repeat_radio" type="radio" name="day_type" checked value="w"/>Chaque journée de travail</label>
+               </div>
+               <div style="display:none;" id="dhx_repeat_week">
+                   Répéter toutes les<input class="dhx_repeat_text" type="text" name="week_count" value="1" />semaine:<br />
+
+                   <table class="dhx_repeat_days">
+                       <tr>
+                           <td>
+                               <label><input class="dhx_repeat_checkbox" type="checkbox" name="week_day" value="1" />Lundi</label><br />
+                               <label><input class="dhx_repeat_checkbox" type="checkbox" name="week_day" value="4" />Jeudi</label>
+                           </td>
+                           <td>
+                               <label><input class="dhx_repeat_checkbox" type="checkbox" name="week_day" value="2" />Mardi</label><br />
+                               <label><input class="dhx_repeat_checkbox" type="checkbox" name="week_day" value="5" />Vendredi</label>
+                           </td>
+                           <td>
+                               <label><input class="dhx_repeat_checkbox" type="checkbox" name="week_day" value="3" />Mercredi</label><br />
+                               <label><input class="dhx_repeat_checkbox" type="checkbox" name="week_day" value="6" />Samedi</label>
+                           </td>
+                           <td>
+                               <label><input class="dhx_repeat_checkbox" type="checkbox" name="week_day" value="0" />Dimanche</label><br /><br />
+                           </td>
+                       </tr>
+                   </table>
+
+               </div>
+               <div id="dhx_repeat_month">
+                   <label><input class="dhx_repeat_radio" type="radio" name="month_type" value="d"/>Répéter</label><input class="dhx_repeat_text" type="text" name="month_day" value="1" />jour  chaque<input class="dhx_repeat_text" type="text" name="month_count" value="1" />mois<br />
+                   <label><input class="dhx_repeat_radio" type="radio" name="month_type" checked value="w"/>Le</label><input class="dhx_repeat_text" type="text" name="month_week2" value="1" /><select name="month_day2"><option value="1" selected >Lundi<option value="2">Mardi<option value="3">Mercredi<option value="4">Jeudi<option value="5">Vendredi<option value="6">Samedi<option value="0">Dimanche</select>chaque<input class="dhx_repeat_text" type="text" name="month_count2" value="1" />mois<br />
+               </div>
+               <div style="display:none;" id="dhx_repeat_year">
+                   <label><input class="dhx_repeat_radio" type="radio" name="year_type" value="d"/>Chaque</label><input class="dhx_repeat_text" type="text" name="year_day" value="1" />jour<select name="year_month"><option value="0" selected >Janvier<option value="1">Février<option value="2">Mars<option value="3">Avril<option value="4">Mai<option value="5">Juin<option value="6">Juillet<option value="7">Août<option value="8">Septembre<option value="9">Octobre<option value="10">Novembre<option value="11">Décembre</select>mois<br />
+                   <label><input class="dhx_repeat_radio" type="radio" name="year_type" checked value="w"/>Le</label><input class="dhx_repeat_text" type="text" name="year_week2" value="1" /><select name="year_day2"><option value="1" selected >Lundi<option value="2">Mardi<option value="3">Mercredi<option value="4">Jeudi<option value="5">Vendredi<option value="6">Samedi<option value="0">Dimanche</select>du<select name="year_month2"><option value="0" selected >Janvier<option value="1">Février<option value="2">Mars<option value="3">Avril<option value="4">Mai<option value="5">Juin<option value="6">Juillet<option value="7">Août<option value="8">Septembre<option value="9">Octobre<option value="10">Novembre<option value="11">Décembre</select><br />
+               </div>
+    </div>
+    <div class="dhx_repeat_divider"></div>
+    <div class="dhx_repeat_right">
+               <label><input class="dhx_repeat_radio" type="radio" name="end" checked/>Pas de date d&quot;achèvement</label><br />
+               <label><input class="dhx_repeat_radio" type="radio" name="end" />Après</label><input class="dhx_repeat_text" type="text" name="occurences_count" value="1" />occurrences<br />
+               <label><input class="dhx_repeat_radio" type="radio" name="end" />Fin</label><input class="dhx_repeat_date" type="text" name="date_of_end" value="01.01.2010" /><br />
+    </div>
+    </form>
+ </div>
+ <div style="clear:both">
+ </div>
\ No newline at end of file
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/sources/repeat_template_it.html b/addons/base_calendar/static/lib/dhtmlxScheduler/sources/repeat_template_it.html
new file mode 100644
index 00000000000..e55c7ebc2bc
--- /dev/null
+++ b/addons/base_calendar/static/lib/dhtmlxScheduler/sources/repeat_template_it.html
@@ -0,0 +1,57 @@
+<div class="dhx_form_repeat">
+	<form>
+    <div class="dhx_repeat_left">
+               <label><input class="dhx_repeat_radio" type="radio" name="repeat" value="day" />Quotidiano</label><br />
+               <label><input class="dhx_repeat_radio" type="radio" name="repeat" value="week"/>Settimanale</label><br />
+               <label><input class="dhx_repeat_radio" type="radio" name="repeat" value="month" checked />Mensile</label><br />
+               <label><input class="dhx_repeat_radio" type="radio" name="repeat" value="year" />Annuale</label>
+    </div>
+    <div class="dhx_repeat_divider"></div>
+    <div class="dhx_repeat_center">
+               <div style="display:none;" id="dhx_repeat_day">
+                   <label><input class="dhx_repeat_radio" type="radio" name="day_type" value="d"/>Ogni</label><input class="dhx_repeat_text" type="text" name="day_count" value="1" />giorno<br />
+                   <label><input class="dhx_repeat_radio" type="radio" name="day_type" checked value="w"/>Ogni giornata lavorativa</label>
+               </div>
+               <div style="display:none;" id="dhx_repeat_week">
+                   Ripetere ogni<input class="dhx_repeat_text" type="text" name="week_count" value="1" />settimana:<br />
+
+                   <table class="dhx_repeat_days">
+                       <tr>
+                           <td>
+                               <label><input class="dhx_repeat_checkbox" type="checkbox" name="week_day" value="1" />Lunedì</label><br />
+                               <label><input class="dhx_repeat_checkbox" type="checkbox" name="week_day" value="4" />Jovedì</label>
+                           </td>
+                           <td>
+                               <label><input class="dhx_repeat_checkbox" type="checkbox" name="week_day" value="2" />Martedì</label><br />
+                               <label><input class="dhx_repeat_checkbox" type="checkbox" name="week_day" value="5" />Venerdì</label>
+                           </td>
+                           <td>
+                               <label><input class="dhx_repeat_checkbox" type="checkbox" name="week_day" value="3" />Mercoledì</label><br />
+                               <label><input class="dhx_repeat_checkbox" type="checkbox" name="week_day" value="6" />Sabato</label>
+                           </td>
+                           <td>
+                               <label><input class="dhx_repeat_checkbox" type="checkbox" name="week_day" value="0" />Domenica</label><br /><br />
+                           </td>
+                       </tr>
+                   </table>
+
+               </div>
+               <div id="dhx_repeat_month">
+                   <label><input class="dhx_repeat_radio" type="radio" name="month_type" value="d"/>Ripetere</label><input class="dhx_repeat_text" type="text" name="month_day" value="1" />giorno ogni<input class="dhx_repeat_text" type="text" name="month_count" value="1" />mese<br />
+                   <label><input class="dhx_repeat_radio" type="radio" name="month_type" checked value="w"/>Il</label><input class="dhx_repeat_text" type="text" name="month_week2" value="1" /><select name="month_day2"><option value="1" selected >Lunedì<option value="2">Martedì<option value="3">Mercoledì<option value="4">Jovedì<option value="5">Venerdì<option value="6">Sabato<option value="0">Domenica</select>ogni<input class="dhx_repeat_text" type="text" name="month_count2" value="1" />mese<br />
+               </div>
+               <div style="display:none;" id="dhx_repeat_year">
+                   <label><input class="dhx_repeat_radio" type="radio" name="year_type" value="d"/>Ogni</label><input class="dhx_repeat_text" type="text" name="year_day" value="1" />giorno<select name="year_month"><option value="0" selected >Gennaio<option value="1">Febbraio<option value="2">Marzo<option value="3">Aprile<option value="4">Maggio<option value="5">Jiugno<option value="6">Luglio<option value="7">Agosto<option value="8">Settembre<option value="9">Ottobre<option value="10">Novembre<option value="11">Dicembre</select>mese<br />
+                   <label><input class="dhx_repeat_radio" type="radio" name="year_type" checked value="w"/>Il</label><input class="dhx_repeat_text" type="text" name="year_week2" value="1" /><select name="year_day2"><option value="1" selected >Lunedì<option value="2">Martedì<option value="3">Mercoledì<option value="4">Jovedì<option value="5">Venerdì<option value="6">Sabato<option value="0">Domenica</select>del<select name="year_month2"><option value="0" selected >Gennaio<option value="1">Febbraio<option value="2">Marzo<option value="3">Aprile<option value="4">Maggio<option value="5">Jiugno<option value="6">Luglio<option value="7">Agosto<option value="8">Settembre<option value="9">Ottobre<option value="10">Novembre<option value="11">Dicembre</select><br />
+               </div>
+    </div>
+    <div class="dhx_repeat_divider"></div>
+    <div class="dhx_repeat_right">
+               <label><input class="dhx_repeat_radio" type="radio" name="end" checked/>Senza data finale</label><br />
+               <label><input class="dhx_repeat_radio" type="radio" name="end" />Dopo</label><input class="dhx_repeat_text" type="text" name="occurences_count" value="1" />occorenze<br />
+               <label><input class="dhx_repeat_radio" type="radio" name="end" />Fine</label><input class="dhx_repeat_date" type="text" name="date_of_end" value="01.01.2010" /><br />
+    </div>
+    </form>
+ </div>
+ <div style="clear:both">
+ </div>
\ No newline at end of file
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/sources/repeat_template_nl.html b/addons/base_calendar/static/lib/dhtmlxScheduler/sources/repeat_template_nl.html
new file mode 100644
index 00000000000..14f32c7f2ef
--- /dev/null
+++ b/addons/base_calendar/static/lib/dhtmlxScheduler/sources/repeat_template_nl.html
@@ -0,0 +1,65 @@
+<div class="dhx_form_repeat">
+	<form>
+    <div class="dhx_repeat_left">
+               <label><input class="dhx_repeat_radio" type="radio" name="repeat" value="day" />Dagelijks</label><br />
+               <label><input class="dhx_repeat_radio" type="radio" name="repeat" value="week"/>Wekelijks</label><br />
+               <label><input class="dhx_repeat_radio" type="radio" name="repeat" value="month" checked />Maandelijks</label><br />
+               <label><input class="dhx_repeat_radio" type="radio" name="repeat" value="year" />Jaarlijks</label>
+    </div>
+    <div class="dhx_repeat_divider"></div>
+    <div class="dhx_repeat_center">
+               <div style="display:none;" id="dhx_repeat_day">
+                   <label><input class="dhx_repeat_radio" type="radio" name="day_type" value="d"/>Elke</label><input class="dhx_repeat_text" type="text" name="day_count" value="1" />dag(en)<br />
+                   <label><input class="dhx_repeat_radio" type="radio" name="day_type" checked value="w"/>Elke werkdag</label>
+               </div>
+               <div style="display:none;" id="dhx_repeat_week">
+                   Herhaal elke<input class="dhx_repeat_text" type="text" name="week_count" value="1" />week op de volgende dagen:<br />
+
+                   <table class="dhx_repeat_days">
+                       <tr>
+                           <td>
+                               <label><input class="dhx_repeat_checkbox" type="checkbox" name="week_day" value="1" />Maandag</label><br />
+                               <label><input class="dhx_repeat_checkbox" type="checkbox" name="week_day" value="4" />Donderdag</label>
+                           </td>
+                           <td>
+                               <label><input class="dhx_repeat_checkbox" type="checkbox" name="week_day" value="2" />Dinsdag</label><br />
+                               <label><input class="dhx_repeat_checkbox" type="checkbox" name="week_day" value="5" />Vrijdag</label>
+                           </td>
+                           <td>
+                               <label><input class="dhx_repeat_checkbox" type="checkbox" name="week_day" value="3" />Woensdag</label><br />
+                               <label><input class="dhx_repeat_checkbox" type="checkbox" name="week_day" value="6" />Zaterdag</label>
+                           </td>
+                           <td>
+                               <label><input class="dhx_repeat_checkbox" type="checkbox" name="week_day" value="0" />Zondag</label><br /><br />
+                           </td>
+                       </tr>
+                   </table>
+
+               </div>
+               <div id="dhx_repeat_month">
+                   <label><input class="dhx_repeat_radio" type="radio" name="month_type" value="d"/>Herhaal</label><input class="dhx_repeat_text" type="text" name="month_day" value="1" />dag iedere<input class="dhx_repeat_text" type="text" name="month_count" value="1" />maanden<br />
+                   <label><input class="dhx_repeat_radio" type="radio" name="month_type" checked value="w"/>Op</label><input class="dhx_repeat_text" type="text" name="month_week2" value="1" /><select name="month_day2">
+                     <option value="1">Maandag
+                     <option value="2">Dinsdag
+                     <option value="3">Woensdag
+                     <option value="4">Donderdag
+                     <option value="5">Vrijdag
+                     <option value="6">Zaterdag
+                     <option value="0">Zondag
+                     </select>iedere<input class="dhx_repeat_text" type="text" name="month_count2" value="1" />maanden<br />
+               </div>
+               <div style="display:none;" id="dhx_repeat_year">
+                   <label><input class="dhx_repeat_radio" type="radio" name="year_type" value="d"/>Iedere</label><input class="dhx_repeat_text" type="text" name="year_day" value="1" />dag<select name="year_month"><option value="0" selected >Januari<option value="1">Februari<option value="2">Maart<option value="3">April<option value="4">Mei<option value="5">Juni<option value="6">Juli<option value="7">Augustus<option value="8">September<option value="9">Oktober<option value="10">November<option value="11">December</select>maand<br />
+                   <label><input class="dhx_repeat_radio" type="radio" name="year_type" checked value="w"/>Op</label><input class="dhx_repeat_text" type="text" name="year_week2" value="1" /><select name="year_day2"><option value="1" selected >Maandag<option value="2">Dinsdag<option value="3">Woensdag<option value="4">Donderdag<option value="5">Vrijdag<option value="6">Zaterdag<option value="7">Zondag</select>van<select name="year_month2"><option value="0" selected >Januari<option value="1">Februari<option value="2">Maart<option value="3">April<option value="4">Mei<option value="5">Juni<option value="6">Juli<option value="7">Augustus<option value="8">September<option value="9">Oktober<option value="10">November<option value="11">December</select><br />
+               </div>
+    </div>
+    <div class="dhx_repeat_divider"></div>
+    <div class="dhx_repeat_right">
+               <label><input class="dhx_repeat_radio" type="radio" name="end" checked/>Geen eind datum</label><br />
+               <label><input class="dhx_repeat_radio" type="radio" name="end" />Na</label><input class="dhx_repeat_text" type="text" name="occurences_count" value="1" />keren<br />
+               <label><input class="dhx_repeat_radio" type="radio" name="end" />Eindigd per</label><input class="dhx_repeat_date" type="text" name="date_of_end" value="01.01.2010" /><br />
+    </div>
+    </form>
+ </div>
+ <div style="clear:both">
+ </div>
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/sources/repeat_template_ru.html b/addons/base_calendar/static/lib/dhtmlxScheduler/sources/repeat_template_ru.html
new file mode 100644
index 00000000000..6b521212eb0
--- /dev/null
+++ b/addons/base_calendar/static/lib/dhtmlxScheduler/sources/repeat_template_ru.html
@@ -0,0 +1,57 @@
+<div class="dhx_form_repeat">
+	<form>
+    <div class="dhx_repeat_left">
+               <label><input class="dhx_repeat_radio" type="radio" name="repeat" value="day" />День</label><br />
+               <label><input class="dhx_repeat_radio" type="radio" name="repeat" value="week"/>�едел�</label><br />
+               <label><input class="dhx_repeat_radio" type="radio" name="repeat" value="month" checked />Ме��ц</label><br />
+               <label><input class="dhx_repeat_radio" type="radio" name="repeat" value="year" />Год</label>
+    </div>
+    <div class="dhx_repeat_divider"></div>
+    <div class="dhx_repeat_center">
+               <div style="display:none;" id="dhx_repeat_day">
+                   <label><input class="dhx_repeat_radio" type="radio" name="day_type" value="d"/>Каждый</label><input class="dhx_repeat_text" type="text" name="day_count" value="1" />день<br />
+                   <label><input class="dhx_repeat_radio" type="radio" name="day_type" checked value="w"/>Каждый рабочий день</label>
+               </div>
+               <div style="display:none;" id="dhx_repeat_week">
+                   Повтор�ть каждую<input class="dhx_repeat_text" type="text" name="week_count" value="1" />неделю , в:<br />
+
+                   <table class="dhx_repeat_days">
+                       <tr>
+                           <td>
+                               <label><input class="dhx_repeat_checkbox" type="checkbox" name="week_day" value="1" />Понедельник</label><br />
+                               <label><input class="dhx_repeat_checkbox" type="checkbox" name="week_day" value="4" />Четверг</label>
+                           </td>
+                           <td>
+                               <label><input class="dhx_repeat_checkbox" type="checkbox" name="week_day" value="2" />Вторник</label><br />
+                               <label><input class="dhx_repeat_checkbox" type="checkbox" name="week_day" value="5" />П�тницу</label>
+                           </td>
+                           <td>
+                               <label><input class="dhx_repeat_checkbox" type="checkbox" name="week_day" value="3" />Среду&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</label><br />
+                               <label><input class="dhx_repeat_checkbox" type="checkbox" name="week_day" value="6" />Субботу</label>
+                           </td>
+                           <td>
+                               <label><input class="dhx_repeat_checkbox" type="checkbox" name="week_day" value="0" />Во�кре�енье</label><br /><br />
+                           </td>
+                       </tr>
+                   </table>
+
+               </div>
+               <div id="dhx_repeat_month">
+                   <label><input class="dhx_repeat_radio" type="radio" name="month_type" value="d"/>Повтор�ть</label><input class="dhx_repeat_text" type="text" name="month_day" value="1" /> чи�ла каждый <input class="dhx_repeat_text" type="text" name="month_count" value="1" />ме��ц<br />
+                   <label><input class="dhx_repeat_radio" type="radio" name="month_type" checked value="w"/></label><input class="dhx_repeat_text" type="text" name="month_week2" value="1" /><select name="month_day2"><option value="1" selected >Понедельник<option value="2">Вторник<option value="3">Среда<option value="4">Четверг<option value="5">П�тница<option value="6">Суббота<option value="0">Во�кре�енье</select>каждый <input class="dhx_repeat_text" type="text" name="month_count2" value="1" />ме��ц<br />
+               </div>
+               <div style="display:none;" id="dhx_repeat_year">
+                   <label><input class="dhx_repeat_radio" type="radio" name="year_type" value="d"/></label><input class="dhx_repeat_text" type="text" name="year_day" value="1" />день<select name="year_month"><option value="0" selected >Январ�<option value="1">Феврал�<option value="2">Марта<option value="3">�прел�<option value="4">Ма�<option value="5">Июн�<option value="6">Июл�<option value="7">�вгу�та<option value="8">Сент�бр�<option value="9">Окт�бр�<option value="10">�о�бр�<option value="11">Декабр�</select><br />
+                   <label><input class="dhx_repeat_radio" type="radio" name="year_type" checked value="w"/></label><input class="dhx_repeat_text" type="text" name="year_week2" value="1" /><select name="year_day2"><option value="1" selected >Понедельник<option value="2">Вторник<option value="3">Среда<option value="4">Четверг<option value="5">П�тница<option value="6">Суббота<option value="0">Во�кре�енье</select><select name="year_month2"><option value="0" selected >Январ�<option value="1">Феврал�<option value="2">Марта<option value="3">�прел�<option value="4">Ма�<option value="5">Июн�<option value="6">Июл�<option value="7">�вгу�та<option value="8">Сент�бр�<option value="9">Окт�бр�<option value="10">�о�бр�<option value="11">Декабр�</select><br />
+               </div>
+    </div>
+    <div class="dhx_repeat_divider"></div>
+    <div class="dhx_repeat_right">
+               <label><input class="dhx_repeat_radio" type="radio" name="end" checked/>Без даты окончани�</label><br />
+               <label><input class="dhx_repeat_radio" type="radio" name="end" /></label><input class="dhx_repeat_text" type="text" name="occurences_count" value="1" />повторений<br />
+               <label><input class="dhx_repeat_radio" type="radio" name="end" />До </label><input class="dhx_repeat_date" type="text" name="date_of_end" value="01.01.2010" /><br />
+    </div>
+    </form>
+ </div>
+ <div style="clear:both">
+ </div>
\ No newline at end of file
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/sources/scheduler.js b/addons/base_calendar/static/lib/dhtmlxScheduler/sources/scheduler.js
new file mode 100644
index 00000000000..b14592a050b
--- /dev/null
+++ b/addons/base_calendar/static/lib/dhtmlxScheduler/sources/scheduler.js
@@ -0,0 +1,642 @@
+window.dhtmlXScheduler=window.scheduler={version:2.2};
+dhtmlxEventable(scheduler);
+scheduler.init=function(id,date,mode){
+	date=date||(new Date());
+	mode=mode||"week";
+	
+	this._obj=(typeof id == "string")?document.getElementById(id):id;
+	this._els=[];
+	this._scroll=true;
+	this._quirks=(_isIE && document.compatMode == "BackCompat");
+	this._quirks7=(_isIE && navigator.appVersion.indexOf("MSIE 8")==-1);
+	
+	this.get_elements();
+	this.init_templates();
+	this.set_actions();
+	dhtmlxEvent(window,"resize",function(){
+		window.clearTimeout(scheduler._resize_timer);
+		scheduler._resize_timer=window.setTimeout(function(){
+			if (scheduler.callEvent("onSchedulerResize",[]))
+				scheduler.update_view();
+		}, 100);
+	})
+	
+	this.set_sizes();
+	this.setCurrentView(date,mode);
+};
+scheduler.xy={
+	nav_height:22,
+	min_event_height:40,
+	scale_width:50,
+	bar_height:20,
+	scroll_width:18,
+	scale_height:20,
+	month_scale_height:20,
+	menu_width:25,
+	margin_top:0,
+	margin_left:0,
+	editor_width:140
+};
+scheduler.keys={
+	edit_save:13,
+	edit_cancel:27
+};
+scheduler.set_sizes=function(){
+	var w = this._x = this._obj.clientWidth-this.xy.margin_left;
+	var h = this._y = this._obj.clientHeight-this.xy.margin_top;
+	
+	//not-table mode always has scroll - need to be fixed in future
+	var scale_x=this._table_view?0:(this.xy.scale_width+this.xy.scroll_width);
+	var scale_s=this._table_view?-1:this.xy.scale_width;
+	
+	this.set_xy(this._els["dhx_cal_navline"][0],w,this.xy.nav_height,0,0);
+	this.set_xy(this._els["dhx_cal_header"][0],w-scale_x,this.xy.scale_height,scale_s,this.xy.nav_height+(this._quirks?-1:1));
+	//to support alter-skin, we need a way to alter height directly from css
+	var actual_height = this._els["dhx_cal_navline"][0].offsetHeight;
+	if (actual_height > 0) this.xy.nav_height = actual_height;
+	
+	var data_y=this.xy.scale_height+this.xy.nav_height+(this._quirks?-2:0);
+	this.set_xy(this._els["dhx_cal_data"][0],w,h-(data_y+2),0,data_y+2);
+}
+scheduler.set_xy=function(node,w,h,x,y){
+	node.style.width=Math.max(0,w)+"px";
+	node.style.height=Math.max(0,h)+"px";
+	if (arguments.length>3){
+		node.style.left=x+"px";
+		node.style.top=y+"px";	
+	}
+}
+scheduler.get_elements=function(){
+	//get all child elements as named hash
+	var els=this._obj.getElementsByTagName("DIV");
+	for (var i=0; i < els.length; i++){
+		var name=els[i].className;
+		if (!this._els[name]) this._els[name]=[];
+		this._els[name].push(els[i]);
+		
+		//check if name need to be changed
+		var t=scheduler.locale.labels[els[i].getAttribute("name")||name];
+		if (t) els[i].innerHTML=t;
+	}
+}
+scheduler.set_actions=function(){
+	for (var a in this._els)
+		if (this._click[a])
+			for (var i=0; i < this._els[a].length; i++)
+				this._els[a][i].onclick=scheduler._click[a];
+	this._obj.onselectstart=function(e){ return false; }
+	this._obj.onmousemove=function(e){
+		scheduler._on_mouse_move(e||event);
+	}
+	this._obj.onmousedown=function(e){
+		scheduler._on_mouse_down(e||event);
+	}
+	this._obj.onmouseup=function(e){
+		scheduler._on_mouse_up(e||event);
+	}
+	this._obj.ondblclick=function(e){
+		scheduler._on_dbl_click(e||event);
+	}
+}
+scheduler.select=function(id){
+	if (this._table_view || !this.getEvent(id)._timed) return; //temporary block
+	if (this._select_id==id) return;
+	this.editStop(false);
+	this.unselect();
+	this._select_id = id;
+	this.updateEvent(id);
+}
+scheduler.unselect=function(id){
+	if (id && id!=this._select_id) return;
+	var t=this._select_id;
+	this._select_id = null;
+	if (t) this.updateEvent(t);
+}
+scheduler.getState=function(){
+	return {
+		mode: this._mode,
+		date: this._date,
+		min_date: this._min_date,
+		max_date: this._max_date,
+		editor_id: this._edit_id,
+		lightbox_id: this._lightbox_id
+	};
+}
+scheduler._click={
+	dhx_cal_data:function(e){
+		var trg = e?e.target:event.srcElement;
+		var id = scheduler._locate_event(trg);
+		
+		e = e || event;
+		if ((id && !scheduler.callEvent("onClick",[id,e])) ||scheduler.config.readonly) return;
+		
+		if (id) {		
+			scheduler.select(id);
+			var mask = trg.className;
+			if (mask.indexOf("_icon")!=-1)
+				scheduler._click.buttons[mask.split(" ")[1].replace("icon_","")](id);
+		} else
+			scheduler._close_not_saved();
+	},
+	dhx_cal_prev_button:function(){
+		scheduler._click.dhx_cal_next_button(0,-1);
+	},
+	dhx_cal_next_button:function(dummy,step){
+		scheduler.setCurrentView(scheduler.date.add( //next line changes scheduler._date , but seems it has not side-effects
+			scheduler.date[scheduler._mode+"_start"](scheduler._date),(step||1),scheduler._mode));
+	},
+	dhx_cal_today_button:function(){
+		scheduler.setCurrentView(new Date());
+	},
+	dhx_cal_tab:function(){
+		var mode = this.getAttribute("name").split("_")[0];
+		scheduler.setCurrentView(scheduler._date,mode);
+	},
+	buttons:{
+		"delete":function(id){ var c=scheduler.locale.labels.confirm_deleting; if (!c||confirm(c)) scheduler.deleteEvent(id); },
+		edit:function(id){ scheduler.edit(id); },
+		save:function(id){ scheduler.editStop(true); },
+		details:function(id){ scheduler.showLightbox(id); },
+		cancel:function(id){ scheduler.editStop(false); }
+	}
+}
+
+scheduler.addEventNow=function(start,end,e){
+	var base = {};
+	if (typeof start == "object"){
+		base = start;
+		start = null;
+	}
+	
+	var d = (this.config.event_duration||this.config.time_step)*60000;
+	if (!start) start = Math.round((new Date()).valueOf()/d)*d;
+	var start_date = new Date(start);
+	if (!end){
+		var start_hour = this.config.first_hour;
+		if (start_hour > start_date.getHours()){
+			start_date.setHours(start_hour);
+			start = start_date.valueOf();
+		}
+		end = start+d;
+	}
+	
+	
+	base.start_date = base.start_date||start_date;
+	base.end_date =  base.end_date||new Date(end);
+	base.text = base.text||this.locale.labels.new_event;
+	base.id = this._drag_id = this.uid();
+	this._drag_mode="new-size";
+	
+	this._loading=true;
+	this.addEvent(base);
+	this.callEvent("onEventCreated",[this._drag_id,e]);
+	this._loading=false;
+	
+	this._drag_event={}; //dummy , to trigger correct event updating logic
+	this._on_mouse_up(e);	
+}
+scheduler._on_dbl_click=function(e,src){
+	src = src||(e.target||e.srcElement);
+	if (this.config.readonly) return;
+	var name = src.className.split(" ")[0];
+	switch(name){
+		case "dhx_scale_holder":
+		case "dhx_scale_holder_now":
+		case "dhx_month_body":
+			if (!scheduler.config.dblclick_create) break;
+			var pos=this._mouse_coords(e);
+			var start=this._min_date.valueOf()+(pos.y*this.config.time_step+(this._table_view?0:pos.x)*24*60)*60000;
+			start = this._correct_shift(start);
+			this.addEventNow(start,null,e);
+			break;
+		case "dhx_body":
+		case "dhx_cal_event_line":
+		case "dhx_cal_event_clear":
+			var id = this._locate_event(src);
+			if (!this.callEvent("onDblClick",[id,e])) return;
+			if (this.config.details_on_dblclick || this._table_view || !this.getEvent(id)._timed)
+				this.showLightbox(id);
+			else
+				this.edit(id);
+			break;
+		case "":
+			if (src.parentNode)
+				return scheduler._on_dbl_click(e,src.parentNode);			
+		default:
+			var t = this["dblclick_"+name];
+			if (t) t.call(this,e);
+			break;
+	}
+}
+
+scheduler._mouse_coords=function(ev){
+	var pos;
+	var b=document.body;
+	var d = document.documentElement;
+	if(ev.pageX || ev.pageY)
+	    pos={x:ev.pageX, y:ev.pageY};
+	else pos={
+	    x:ev.clientX + (b.scrollLeft||d.scrollLeft||0) - b.clientLeft,
+	    y:ev.clientY + (b.scrollTop||d.scrollTop||0) - b.clientTop
+	}
+
+	//apply layout
+	pos.x-=getAbsoluteLeft(this._obj)+(this._table_view?0:this.xy.scale_width);
+	pos.y-=getAbsoluteTop(this._obj)+this.xy.nav_height+(this._dy_shift||0)+this.xy.scale_height-this._els["dhx_cal_data"][0].scrollTop;
+	pos.ev = ev;
+	
+	var handler = this["mouse_"+this._mode];
+	if (handler)
+		return handler.call(this,pos);
+		
+	//transform to date
+	if (!this._table_view){
+		pos.x=Math.max(0,Math.ceil(pos.x/this._cols[0])-1);
+		pos.y=Math.max(0,Math.ceil(pos.y*60/(this.config.time_step*this.config.hour_size_px))-1)+this.config.first_hour*(60/this.config.time_step);
+	} else {
+		var dy=0;
+		for (dy=1; dy < this._colsS.heights.length; dy++)
+			if (this._colsS.heights[dy]>pos.y) break;
+
+		pos.y=(Math.max(0,Math.ceil(pos.x/this._cols[0])-1)+Math.max(0,dy-1)*7)*24*60/this.config.time_step; 
+		pos.x=0;
+	}
+
+	return pos;
+}
+scheduler._close_not_saved=function(){
+	if (new Date().valueOf()-(scheduler._new_event||0) > 500 && scheduler._edit_id){
+		var c=scheduler.locale.labels.confirm_closing;
+		if (!c || confirm(c))
+			scheduler.editStop(scheduler.config.positive_closing);
+	}
+}
+scheduler._correct_shift=function(start, back){
+	return start-=((new Date(scheduler._min_date)).getTimezoneOffset()-(new Date(start)).getTimezoneOffset())*60000*(back?-1:1);	
+}
+scheduler._on_mouse_move=function(e){
+	if (this._drag_mode){
+		var pos=this._mouse_coords(e);
+		if (!this._drag_pos || this._drag_pos.x!=pos.x || this._drag_pos.y!=pos.y){
+			
+			if (this._edit_id!=this._drag_id)
+				this._close_not_saved();
+				
+			this._drag_pos=pos;
+			
+			if (this._drag_mode=="create"){
+				this._close_not_saved();
+				this._loading=true; //will be ignored by dataprocessor
+				
+				var start=this._min_date.valueOf()+(pos.y*this.config.time_step+(this._table_view?0:pos.x)*24*60)*60000;
+				//if (this._mode != "week" && this._mode != "day")
+				start = this._correct_shift(start);
+				
+				if (!this._drag_start){
+					this._drag_start=start; return; 
+				}
+				var end = start;
+				if (end==this._drag_start) return;
+				
+				this._drag_id=this.uid();
+				this.addEvent(new Date(this._drag_start), new Date(end),this.locale.labels.new_event,this._drag_id, pos.fields);
+				
+				this.callEvent("onEventCreated",[this._drag_id,e]);
+				this._loading=false;
+				this._drag_mode="new-size";
+				
+			} 
+
+			var ev=this.getEvent(this._drag_id);
+			var start,end;
+			if (this._drag_mode=="move"){
+				start = this._min_date.valueOf()+(pos.y*this.config.time_step+pos.x*24*60)*60000;
+				if (!pos.custom && this._table_view) start+=this.date.time_part(ev.start_date)*1000;
+				start = this._correct_shift(start);
+				end = ev.end_date.valueOf()-(ev.start_date.valueOf()-start);
+			} else {
+				start = ev.start_date.valueOf();
+				if (this._table_view)
+					end = this._min_date.valueOf()+pos.y*this.config.time_step*60000 + (pos.custom?0:24*60*60000);
+				else{
+					end = this.date.date_part(new Date(ev.end_date)).valueOf()+pos.y*this.config.time_step*60000;
+					this._els["dhx_cal_data"][0].style.cursor="s-resize";
+					if (this._mode == "week" || this._mode == "day")
+						end = this._correct_shift(end);
+				}
+				if (this._drag_mode == "new-size"){ 
+					if (end <= this._drag_start){
+						var shift = pos.shift||((this._table_view && !pos.custom)?24*60*60000:0);
+						start = end-shift;
+						end = this._drag_start+(shift||(this.config.time_step*60000));
+					} else {
+						start = this._drag_start;
+					}
+					
+				} else if (end<=start) 
+					end=start+this.config.time_step*60000;
+			}
+			var new_end = new Date(end-1);			
+			var new_start = new Date(start);
+			//prevent out-of-borders situation for day|week view
+			if (this._table_view || (new_end.getDate()==new_start.getDate() && new_end.getHours()<this.config.last_hour)){
+				ev.start_date=new_start;
+				ev.end_date=new Date(end);
+				if (this.config.update_render)
+					this.update_view();
+				else
+					this.updateEvent(this._drag_id);
+			}
+			if (this._table_view)
+				this.for_rendered(this._drag_id,function(r){
+					r.className+=" dhx_in_move";
+				})
+		}
+	}  else {
+		if (scheduler.checkEvent("onMouseMove")){
+			var id = this._locate_event(e.target||e.srcElement);
+			this.callEvent("onMouseMove",[id,e]);
+		}
+	}
+}
+scheduler._on_mouse_context=function(e,src){
+	return this.callEvent("onContextMenu",[this._locate_event(src),e]);
+}
+scheduler._on_mouse_down=function(e,src){
+	if (this.config.readonly || this._drag_mode) return;
+	src = src||(e.target||e.srcElement);
+	if (e.button==2||e.ctrlKey) return this._on_mouse_context(e,src);
+		switch(src.className.split(" ")[0]){
+		case "dhx_cal_event_line":
+		case "dhx_cal_event_clear":
+			if (this._table_view)
+				this._drag_mode="move"; //item in table mode
+			break;
+		case "dhx_header":
+		case "dhx_title":
+			this._drag_mode="move"; //item in table mode
+			break;
+		case "dhx_footer":
+			this._drag_mode="resize"; //item in table mode
+			break;
+		case "dhx_scale_holder":
+		case "dhx_scale_holder_now":
+		case "dhx_month_body":
+		case "dhx_matrix_cell":
+			this._drag_mode="create";
+			break;
+		case "":
+			if (src.parentNode)
+				return scheduler._on_mouse_down(e,src.parentNode);
+		default:
+			this._drag_mode=null;
+			this._drag_id=null;
+	}
+	if (this._drag_mode){
+		var id = this._locate_event(src);
+		if (!this.config["drag_"+this._drag_mode] || !this.callEvent("onBeforeDrag",[id, this._drag_mode, e]))
+			this._drag_mode=this._drag_id=0;
+		else {
+			this._drag_id= id;
+			this._drag_event=this._copy_event(this.getEvent(this._drag_id)||{});
+		}
+	}
+	this._drag_start=null;
+}
+scheduler._on_mouse_up=function(e){
+	if (this._drag_mode && this._drag_id){
+		this._els["dhx_cal_data"][0].style.cursor="default";
+		//drop
+		var ev=this.getEvent(this._drag_id);
+		if (this._drag_event._dhx_changed || !this._drag_event.start_date || ev.start_date.valueOf()!=this._drag_event.start_date.valueOf() || ev.end_date.valueOf()!=this._drag_event.end_date.valueOf()){
+			var is_new=(this._drag_mode=="new-size");
+			if (!this.callEvent("onBeforeEventChanged",[ev,e,is_new])){
+				if (is_new) 
+					this.deleteEvent(ev.id, true);
+				else {
+					ev.start_date = this._drag_event.start_date;
+					ev.end_date = this._drag_event.end_date;
+					this.updateEvent(ev.id);
+				}
+			} else {
+				if (is_new && this.config.edit_on_create){
+					this.unselect();
+					this._new_event=new Date();//timestamp of creation
+					if (this._table_view || this.config.details_on_create) {
+						this._drag_mode=null;
+						return this.showLightbox(this._drag_id);
+					}
+					this._drag_pos=true; //set flag to trigger full redraw
+					this._select_id=this._edit_id=this._drag_id;
+				} else if (!this._new_event)
+					this.callEvent(is_new?"onEventAdded":"onEventChanged",[this._drag_id,this.getEvent(this._drag_id)]);
+			}
+		}
+		if (this._drag_pos) this.render_view_data(); //redraw even if there is no real changes - necessary for correct positioning item after drag
+	}
+	this._drag_mode=null;
+	this._drag_pos=null;
+}	
+scheduler.update_view=function(){
+	//this.set_sizes();
+	this._reset_scale();
+	if (this._load_mode && this._load()) return this._render_wait = true;
+	this.render_view_data();
+}
+scheduler.setCurrentView=function(date,mode){
+	
+	if (!this.callEvent("onBeforeViewChange",[this._mode,this._date,mode,date])) return;
+	//hide old custom view
+	if (this[this._mode+"_view"] && mode && this._mode!=mode)
+		this[this._mode+"_view"](false);
+		
+	this._close_not_saved();
+	
+	this._mode=mode||this._mode;
+	this._date=date;
+	this._table_view=(this._mode=="month");
+	
+	var tabs=this._els["dhx_cal_tab"];
+	for (var i=0; i < tabs.length; i++) {
+		tabs[i].className="dhx_cal_tab"+((tabs[i].getAttribute("name")==this._mode+"_tab")?" active":"");
+	};
+	
+	//show new view
+	var view=this[this._mode+"_view"];
+	view?view(true):this.update_view();
+	
+	this.callEvent("onViewChange",[this._mode,this._date]);
+}
+scheduler._render_x_header = function(i,left,d,h){
+	//header scale	
+	var head=document.createElement("DIV"); head.className="dhx_scale_bar";
+	this.set_xy(head,this._cols[i]-1,this.xy.scale_height-2,left,0);//-1 for border
+	head.innerHTML=this.templates[this._mode+"_scale_date"](d,this._mode); //TODO - move in separate method
+	h.appendChild(head);
+}
+scheduler._reset_scale=function(){
+	//current mode doesn't support scales
+	//we mustn't call reset_scale for such modes, so it just to be sure
+	if (!this.templates[this._mode+"_date"]) return;
+	
+	var h=this._els["dhx_cal_header"][0];
+	var b=this._els["dhx_cal_data"][0];
+	var c = this.config;
+	
+	h.innerHTML="";
+	b.scrollTop=0; //fix flickering in FF
+	b.innerHTML="";
+	
+	
+	var str=((c.readonly||(!c.drag_resize))?" dhx_resize_denied":"")+((c.readonly||(!c.drag_move))?" dhx_move_denied":"");
+	if (str) b.className = "dhx_cal_data"+str;
+		
+		
+	this._cols=[];	//store for data section
+	this._colsS={height:0};
+	this._dy_shift=0;
+	
+	this.set_sizes();
+	var summ=parseInt(h.style.width); //border delta
+	var left=0;
+	
+	var d,dd,sd,today;
+	dd=this.date[this._mode+"_start"](new Date(this._date.valueOf()));
+	d=sd=this._table_view?scheduler.date.week_start(dd):dd;
+	today=this.date.date_part(new Date());
+	
+	//reset date in header
+	var ed=scheduler.date.add(dd,1,this._mode);
+	var count = 7;
+	
+	if (!this._table_view){
+		var count_n = this.date["get_"+this._mode+"_end"];
+		if (count_n) ed = count_n(dd);
+		count = Math.round((ed.valueOf()-dd.valueOf())/(1000*60*60*24));
+	}
+	
+	this._min_date=d;
+	this._els["dhx_cal_date"][0].innerHTML=this.templates[this._mode+"_date"](dd,ed,this._mode);
+	
+	
+	for (var i=0; i<count; i++){
+		this._cols[i]=Math.floor(summ/(count-i));
+	
+		this._render_x_header(i,left,d,h);
+		if (!this._table_view){
+			var scales=document.createElement("DIV");
+			var cls = "dhx_scale_holder"
+			if (d.valueOf()==today.valueOf()) cls = "dhx_scale_holder_now";
+			scales.className=cls+" "+this.templates.week_date_class(d,today);
+			this.set_xy(scales,this._cols[i]-1,c.hour_size_px*(c.last_hour-c.first_hour),left+this.xy.scale_width+1,0);//-1 for border
+			b.appendChild(scales);
+		}
+		
+		d=this.date.add(d,1,"day")
+		summ-=this._cols[i];
+		left+=this._cols[i];
+		this._colsS[i]=(this._cols[i-1]||0)+(this._colsS[i-1]||(this._table_view?0:this.xy.scale_width+2));
+	}
+	this._max_date=d;
+	this._colsS[count]=this._cols[count-1]+this._colsS[count-1];
+	
+	if (this._table_view)
+		this._reset_month_scale(b,dd,sd);
+	else{
+		this._reset_hours_scale(b,dd,sd);
+		if (c.multi_day){
+			var c1 = document.createElement("DIV");
+			c1.className="dhx_multi_day";
+			c1.style.visibility="hidden";
+			this.set_xy(c1,parseInt(h.style.width),0,this.xy.scale_width,0);
+			b.appendChild(c1);
+			var c2 = c1.cloneNode(true);
+			c2.className="dhx_multi_day_icon";
+			c2.style.visibility="hidden";
+			this.set_xy(c2,this.xy.scale_width-1,0,0,0);
+			b.appendChild(c2);
+			
+			this._els["dhx_multi_day"]=[c1,c2];
+		}
+	}
+}
+scheduler._reset_hours_scale=function(b,dd,sd){
+	var c=document.createElement("DIV");
+	c.className="dhx_scale_holder";
+	
+	var date = new Date(1980,1,1,this.config.first_hour,0,0);
+	for (var i=this.config.first_hour*1; i < this.config.last_hour; i++) {
+		var cc=document.createElement("DIV");
+		cc.className="dhx_scale_hour";
+		cc.style.height=this.config.hour_size_px-(this._quirks?0:1)+"px";
+		cc.style.width=this.xy.scale_width+"px";
+		cc.innerHTML=scheduler.templates.hour_scale(date);
+		
+		c.appendChild(cc);
+		date=this.date.add(date,1,"hour");
+	};
+	b.appendChild(c);
+	if (this.config.scroll_hour)
+		b.scrollTop = this.config.hour_size_px*(this.config.scroll_hour-this.config.first_hour);
+}
+scheduler._reset_month_scale=function(b,dd,sd){
+	var ed=scheduler.date.add(dd,1,"month");
+	
+	//trim time part for comparation reasons
+	var cd=new Date();
+	this.date.date_part(cd);
+	this.date.date_part(sd);
+	
+	var rows=Math.ceil((ed.valueOf()-sd.valueOf())/(60*60*24*1000*7));
+	var tdcss=[];
+	var height=(Math.floor(b.clientHeight/rows)-22);
+	
+	this._colsS.height=height+22;
+	var h = this._colsS.heights = [];
+	for (var i=0; i<=7; i++)
+		tdcss[i]=" style='height:"+height+"px; width:"+((this._cols[i]||0)-1)+"px;' "
+
+	
+	
+	var cellheight = 0;
+	this._min_date=sd;
+	var html="<table cellpadding='0' cellspacing='0'>";
+	for (var i=0; i<rows; i++){
+		html+="<tr>";
+			for (var j=0; j<7; j++){
+				html+="<td";
+				var cls = "";
+				if (sd<dd)
+					cls='dhx_before';
+				else if (sd>=ed)
+					cls='dhx_after';
+				else if (sd.valueOf()==cd.valueOf())
+					cls='dhx_now';
+				html+=" class='"+cls+" "+this.templates.month_date_class(sd,cd)+"' ";
+				html+="><div class='dhx_month_head'>"+this.templates.month_day(sd)+"</div><div class='dhx_month_body' "+tdcss[j]+"></div></td>"
+				sd=this.date.add(sd,1,"day");
+			}
+		html+="</tr>";
+		h[i] = cellheight;
+		cellheight+=this._colsS.height;
+	}
+	html+="</table>";
+	this._max_date=sd;
+	
+	b.innerHTML=html;	
+	return sd;
+}
+scheduler.getLabel = function(property, key) {
+	var sections = this.config.lightbox.sections;
+	for (var i=0; i<sections.length; i++) {
+		if(sections[i].map_to == property) {
+			var options = sections[i].options;
+			for (var j=0; j<options.length; j++) {
+				if(options[j].key == key) {
+					return options[j].label;
+				}
+			}
+		}
+	}
+	return "";
+};
\ No newline at end of file
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/sources/touch.css b/addons/base_calendar/static/lib/dhtmlxScheduler/sources/touch.css
new file mode 100644
index 00000000000..131dfdab9d5
--- /dev/null
+++ b/addons/base_calendar/static/lib/dhtmlxScheduler/sources/touch.css
@@ -0,0 +1,116 @@
+.dhx_cal_prev_button, .dhx_cal_next_button, .dhx_cal_today_button, .dhx_cal_add_button{
+	top:6px !important; left:10px; 
+	border:1px solid #575D65;
+	border-top:1px solid #4E5052;
+	color: #FFFFFF;
+	text-shadow:0 -1px 0 #65696E;
+	background-image: -webkit-gradient(linear, left top, left bottom, from(#B2B6BC), to(#6B737E)); 
+	background-color:#989B9F;
+	background-position:0px 1px;
+	background-repeat:repeat-x;
+	
+	-webkit-border-radius:5px;
+	padding: 3px;
+	text-align:center;
+	text-decoration:none;
+}
+.dhx_cal_today_button{
+	left:55px; 
+}
+.dhx_cal_next_button{
+	left:146px;
+}
+.dhx_cal_add_button{
+	right:9px;
+	left:auto;
+	width:20px;
+	font-size:20px;
+	padding:1px 2px 2px 2px;
+}
+.dhx_cal_navline .dhx_cal_date{
+	top:7px; left:160px; right:350px;
+	padding-top:4px;
+	width:auto;
+	text-align:center;
+	color:#4F5459;
+}
+
+.dhx_cal_navline{
+	background: -webkit-gradient(linear, 0% 0%, 0% 100%, color-stop(0,#F4F5F8), color-stop(0.3,#F1F2F4), color-stop(0.7,#C4C7D0), color-stop(1,#A6AAB7));
+	border-bottom:1px solid #797F90;
+	height:40px !important;
+	
+	font-family: Helvetica;
+	font-weight: bold;
+	font-size: 13px;
+}
+.dhx_cal_tab{
+	top:6px !important;
+	color: #4F5459;
+	text-align: center;
+	padding: 5px 10px;
+	width:80px;
+	
+	background-image:-webkit-gradient(linear, 0% 0%, 0% 100%, from(#F7F7F7), to(#B9BDC7));
+	background-color: #CFD0D1;
+	background-position:0px 1px;
+	background-repeat:repeat-x;
+	
+	text-decoration:none;
+	
+	border:1px solid #95989F;
+	border-top:1px solid #686A6A;
+	height:16px;
+}
+.dhx_cal_tab.active{
+	background-image:-webkit-gradient(linear, 0% 0%, 0% 100%, from(#B0B2B6), to(#666D74));
+	background-color: #949799;
+	background-position:0px 1px;
+	background-repeat:repeat-x;
+	
+	border:1px solid #4C4D4F;
+	border-top:1px solid #52585C;
+	
+	color: #F8F8F8;
+	text-shadow:0 -1px 0 #5E6063;
+	
+	text-decoration:none;
+	height:16px;
+	padding: 5px 10px;
+	z-index:100;
+}
+
+.dhx_cal_light{
+	-webkit-transition: -webkit-transform;
+	-webkit-transform-style:preserve-3d;
+}
+.dhx_cal_cover{
+	opacity:0.5;
+}
+.dhx_cal_ltext{
+	padding-top:0px;
+	padding-bottom:0px;
+}
+.dhx_cal_ltext textarea{
+	-webkit-background-size:0px 0px;
+	-webkit-border-radius:0;
+	height:94%;
+}
+.dhx_mini_calendar .dhx_month_head{
+	height: 35px;
+	line-height:35px;
+	text-align:center;
+	padding-right:0px;
+	padding-left:0px;
+}
+.dhx_mini_calendar .dhx_year_month{
+	height:35px;
+	line-height:30px;
+	background: -webkit-gradient(linear, 0% 0%, 0% 100%, from(#F4F5F8), to(#8A8E9A));
+	font-family: Helvetica;
+	font-weight: bold;
+	font-size: 13px;
+}
+.dhx_mini_calendar .dhx_year_month .dhx_cal_prev_button, .dhx_mini_calendar .dhx_year_month .dhx_cal_next_button {
+	line-height:normal;
+}
\ No newline at end of file
diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/whatsnew.txt b/addons/base_calendar/static/lib/dhtmlxScheduler/whatsnew.txt
new file mode 100644
index 00000000000..77fde87358b
--- /dev/null
+++ b/addons/base_calendar/static/lib/dhtmlxScheduler/whatsnew.txt
@@ -0,0 +1,27 @@
+2.3 
+
+Major changes
+	Map view was added 
+	Cell mode for Timeline view was added 
+	Tree mode for Timeline view was added 
+	Tooltips for all views were added
+	Abbility to create new events by double click or by drag-and-drop in Timeline mode
+	Abbility to move events by drop-and-drag in Timeline mode
+	Abbility to create new events by external drag and drop 
+
+
+Minor changes
+	Week-number format option was added 
+	full_day configuration option added 
+	event_duration and auto_end_date configuration options added 
+	Multiselect section for details form 
+	Checkbox, combo, radio - sections for details form 
+	Preventing events collisions for recurring events
+	extra parameters were added to timeline-related handlers
+	api of mini-calendar extension extended 
+	custom form implementation simplified
+
+Fixes
+	incorrect processing of specific iCal datasources
+	incorrect event rendering for overlapping events
+
diff --git a/addons/base_calendar/static/openerp/js/base_calendar.js b/addons/base_calendar/static/openerp/js/base_calendar.js
deleted file mode 100644
index 37c1cd1a8f7..00000000000
--- a/addons/base_calendar/static/openerp/js/base_calendar.js
+++ /dev/null
@@ -1,28 +0,0 @@
-/*---------------------------------------------------------
- * OpenERP base_calendar
- *---------------------------------------------------------*/
-
-openerp.base_calendar = function(openerp) {
-
-openerp.base_calendar.CalendarView = openerp.base.Controller.extend({
-// Dhtmlx scheduler ?
-});
-
-//openerp.base.Action = openerp.base.Action.extend({
-//    do_action_window: function(action) {
-//        this._super.apply(this,arguments);
-//        for(var i = 0; i < action.views.length; i++)  {
-//            if(action.views[i][1] == "calendar") {
-//                this.calendar_id = action.views[i][0];
-//                break;
-//            }
-//        }
-//        // IF there is a view calender
-//        // if(this.calendar_id
-//    },
-//});
-
-};
-
-// DEBUG_RPC:rpc.request:('execute', 'addons-dsh-l10n_us', 1, '*', ('ir.filters', 'get_filters', u'res.partner'))
-// vim:et fdc=0 fdl=0 foldnestmax=3 fdm=syntax:
diff --git a/addons/base_calendar/static/src/js/calendar.js b/addons/base_calendar/static/src/js/calendar.js
new file mode 100644
index 00000000000..96a7fad8178
--- /dev/null
+++ b/addons/base_calendar/static/src/js/calendar.js
@@ -0,0 +1,224 @@
+/*---------------------------------------------------------
+ * OpenERP base_calendar
+ *---------------------------------------------------------*/
+
+openerp.base_calendar = function(openerp) {
+QWeb.add_template('/base_calendar/static/src/xml/base_calendar.xml');
+openerp.base.views.add('calendar', 'openerp.base_calendar.CalendarView');
+openerp.base_calendar.CalendarView = openerp.base.Controller.extend({
+// Dhtmlx scheduler ?
+	init: function(view_manager, session, element_id, dataset, view_id){
+		this._super(session, element_id);
+		this.view_manager = view_manager;
+        this.dataset = dataset;
+        this.dataset_index = 0;
+        this.model = dataset.model;
+        this.view_id = view_id;
+        this.fields_view = {};
+        this.widgets = {};
+        this.widgets_counter = 0;
+        this.fields = this.dataset.fields ? this.dataset.fields: {};
+        this.datarecord = {};
+		this.name = "";
+		this.date_start = "";
+		this.date_delay = "";
+		this.date_stop = "";
+		this.color_field = "";
+		this.day_lenth = 8;
+		this.colors = [];
+		this.color_values = [];
+		this.calendar_fields = {};
+		this.info_fields = [];
+		this.domain = this.dataset._domain ? this.dataset._domain: [];
+		this.context = {};
+	},
+	start: function() {
+		this.rpc("/base_calendar/calendarview/load", {"model": this.model, "view_id": this.view_id}, this.on_loaded);
+	},
+	on_loaded: function(result) {
+		var self = this;
+		var params = {};
+		this.fields_view = result.fields_view;
+		this.name = this.fields_view.name || this.fields_view.arch.attrs.string;
+		this.view_id = this.fields_view.view_id;
+		
+		this.date_start = this.fields_view.arch.attrs.date_start;
+		this.date_delay = this.fields_view.arch.attrs.date_delay;
+		this.date_stop = this.fields_view.arch.attrs.date_stop;
+		
+		this.colors = this.fields_view.arch.attrs.colors;
+		this.day_length = this.fields_view.arch.attrs.day_length || 8;
+		this.color_field = this.fields_view.arch.attrs.color;
+		this.fields =  this.fields_view.fields;
+		
+		//* Calendar Fields *
+		this.calendar_fields['date_start'] = {'name': this.date_start, 'kind': this.fields[this.date_start]['type']};
+		
+		if(this.date_delay)
+			this.calendar_fields['date_delay'] = {'name': this.date_delay, 'kind': this.fields[this.date_delay]['type']};
+			
+		if(this.date_stop)
+			this.calendar_fields['date_stop'] = {'name': this.date_stop, 'kind': this.fields[this.date_stop]['type']};
+			
+		this.calendar_fields['day_length'] = this.day_length;
+		//* ------- *
+		
+		for(var fld=0;fld<this.fields_view.arch.children.length;fld++) {
+			this.info_fields.push(this.fields_view.arch.children[fld].attrs.name);
+		}
+		
+		
+		this.load_scheduler();
+	},
+	
+	load_scheduler:function() {
+		var self = this;
+		
+		var params = {};
+		
+		params['model'] = this.model;
+		params['calendar_fields'] = this.calendar_fields;
+		params['info_fields'] = this.info_fields;
+		params['fields'] = this.fields;
+		params['color_field'] = this.color_field;
+		params['domain'] = this.domain;
+		params['colors'] =  this.colors;
+		
+		/*
+		 * Start dhtmlx Schedular
+		 */
+		scheduler.clearAll();
+		scheduler.config.xml_date="%Y-%m-%d %H:%i";
+		scheduler.config.multi_day = true; //Multi day events are not rendered in daily and weekly views
+		
+		this.rpc(
+			'/base_calendar/calendarview/schedule_events',
+			params,
+			function(result) {
+				self.schedule_events(result);
+			}
+		)
+	},
+	
+	schedule_events: function(result) {
+		var self = this;
+		var res = result.result;
+		var sidebar = result.sidebar;
+		this.$element.html(QWeb.render("CalendarView", {"view": this, "fields_view": this.fields_view, "sidebar":sidebar, "calendar":this}));
+		
+		// Initialize Sceduler
+		scheduler.init('openerp_scheduler',null,"month");
+		scheduler.parse(res,"json");
+		jQuery('#dhx_minical_icon').bind('click', this.mini_calendar);
+		
+		
+		// To Change Event
+		scheduler.attachEvent(
+					'onEventChanged'
+					,function(event_id, event_object) {
+						self.edit_event(event_id, event_object)
+					});
+		
+		/*
+		 * Create Sidebar
+		 */
+		jQuery('#calendar-sidebar').append(
+			jQuery('<table>',{'width':'100%','cellspacing': 0, 'cellpadding': 0, 'id':'cal-sidebar-option'})
+		)
+		for(s in sidebar) {
+			jQuery('#cal-sidebar-option').append(
+				jQuery('<tr>').append(
+					jQuery('<td>').append(
+						jQuery('<div>')
+						.append(
+							jQuery('<input>',
+							{
+								'type': 'checkbox', 
+								'id':sidebar[s][0],
+								'value':sidebar[s][0]
+							}).bind('click',function(){
+								self.reload_scheduler()
+							}),
+							sidebar[s][1]
+						)
+						.css('background-color',sidebar[s][sidebar[s].length-1])
+					)
+				)
+			)
+		}
+	},
+	
+	convert_date_format: function(start_date, end_date) {
+		var params = {};
+		params['start_date'] = start_date.getFullYear() +'-' + start_date.getMonth()+'-' + start_date.getDate()+' '+start_date.getHours()+':'+start_date.getMinutes()+':'+start_date.getSeconds();
+		if(end_date) {
+			params['end_date'] = end_date.getFullYear() +'-' + end_date.getMonth()+'-' + end_date.getDate()+' '+end_date.getHours()+':'+end_date.getMinutes()+':'+end_date.getSeconds();
+		}
+		return params; 
+	},
+	
+	edit_event: function(evt_id, evt_object) {
+		var dates = this.convert_date_format(evt_object.start_date, evt_object.end_date);
+		this.rpc(
+			'/base_calendar/calendarview/edit_events',
+			{
+				'start_date': dates.start_date,
+				'end_date': dates.end_date,
+				'id': evt_id,
+				'model': this.model,
+				'info_fields': this.info_fields,
+				'fields': this.fields,
+				'calendar_fields': this.calendar_fields
+			}
+		);
+	},
+	
+	mini_calendar: function() {
+		
+		if(scheduler.isCalendarVisible()) {
+			scheduler.destroyCalendar();
+		} else {
+			scheduler.renderCalendar({
+				position:"dhx_minical_icon",
+            	date:scheduler._date,
+            	navigation:true,
+				handler:function(date,calendar){
+	               scheduler.setCurrentView(date);
+	               scheduler.destroyCalendar()
+	            }
+			});
+		}
+	},
+	
+	reload_scheduler: function() {
+//		self.color_field
+		console.log('Reload Scheduler>>>')
+	},
+	
+	do_show: function () {
+        this.$element.show();
+    },
+	
+    do_hide: function () {
+        this.$element.hide();
+    }
+});
+
+//openerp.base.Action = openerp.base.Action.extend({
+//    do_action_window: function(action) {
+//        this._super.apply(this,arguments);
+//        for(var i = 0; i < action.views.length; i++)  {
+//            if(action.views[i][1] == "calendar") {
+//                this.calendar_id = action.views[i][0];
+//                break;
+//            }
+//        }
+//        // IF there is a view calender
+//        // if(this.calendar_id
+//    },
+//});
+
+};
+
+// DEBUG_RPC:rpc.request:('execute', 'addons-dsh-l10n_us', 1, '*', ('ir.filters', 'get_filters', u'res.partner'))
+// vim:et fdc=0 fdl=0 foldnestmax=3 fdm=syntax:
diff --git a/addons/base_calendar/static/src/xml/base_calendar.xml b/addons/base_calendar/static/src/xml/base_calendar.xml
new file mode 100644
index 00000000000..02d67be05bb
--- /dev/null
+++ b/addons/base_calendar/static/src/xml/base_calendar.xml
@@ -0,0 +1,33 @@
+<template>
+  <t t-name="CalendarView">
+    <h3 class="title"><t t-esc="view.fields_view.arch.attrs.string"/></h3>
+    <table class="calendar-view" width="100%" height="100%" cellspacing="0" cellpadding="0">
+      <tr>
+        <td>
+          <div style="height: 1000px;width: 100%;">
+            <div id="calendar-sidebar">
+            </div>
+          </div>
+        </td>
+        <td style="width:85%;" align="left">
+          <div id="openerp_scheduler" class="dhx_cal_container" style="height: 1000px;width: 100%;">
+            <div class="dhx_cal_navline">
+              <div class="dhx_cal_prev_button"/>
+              <div class="dhx_cal_next_button"/>
+              <div class="dhx_cal_today_button"/>
+              <div class="dhx_cal_date"/>
+              <div class="dhx_minical_icon" id="dhx_minical_icon"/>
+              <div class="dhx_cal_tab" name="day_tab" style="right:204px;"/>
+              <div class="dhx_cal_tab" name="week_tab" style="right:140px;"/>
+              <div class="dhx_cal_tab" name="month_tab" style="right:76px;"/>
+            </div>
+            <div class="dhx_cal_header">
+            </div>
+            <div class="dhx_cal_data">
+            </div>
+          </div>
+        </td>
+      </tr>
+    </table>
+  </t>
+</template>
diff --git a/addons/base_diagram/__init__.py b/addons/base_diagram/__init__.py
new file mode 100644
index 00000000000..355939a4922
--- /dev/null
+++ b/addons/base_diagram/__init__.py
@@ -0,0 +1 @@
+import controllers
\ No newline at end of file
diff --git a/addons/base_diagram/__openerp__.py b/addons/base_diagram/__openerp__.py
new file mode 100644
index 00000000000..92b768896f9
--- /dev/null
+++ b/addons/base_diagram/__openerp__.py
@@ -0,0 +1,6 @@
+{
+    "name" : "OpenERP Web base Diagram",
+    "version" : "2.0",
+    "depends" : [],
+    'active': False,
+}
diff --git a/addons/base_diagram/controllers/__init__.py b/addons/base_diagram/controllers/__init__.py
new file mode 100644
index 00000000000..039d9715fab
--- /dev/null
+++ b/addons/base_diagram/controllers/__init__.py
@@ -0,0 +1 @@
+import main
\ No newline at end of file
diff --git a/addons/base_diagram/controllers/main.py b/addons/base_diagram/controllers/main.py
new file mode 100644
index 00000000000..2f76ead7117
--- /dev/null
+++ b/addons/base_diagram/controllers/main.py
@@ -0,0 +1,127 @@
+from base.controllers.main import View
+import openerpweb
+
+class DiagramView(View):
+    _cp_path = "/base_diagram/diagram"
+
+    @openerpweb.jsonrequest
+    def load(self, req, model, view_id):
+        print req
+        print dir(req)
+        fields_view = self.fields_view_get(req, model, view_id, 'diagram')
+        return {'fields_view': fields_view}
+    
+    @openerpweb.jsonrequest
+    def get_diagram_info(self, req, **kw):
+        id = kw['id']
+        model = kw['model']
+        node = kw['node']
+        connector = kw['connector']
+        src_node = kw['src_node']
+        des_node = kw['des_node']
+        
+        visible_node_fields = kw.get('visible_node_fields',[])
+        invisible_node_fields = kw.get('invisible_node_fields',[])
+        node_fields_string = kw.get('node_fields_string',[])
+        connector_fields = kw.get('connector_fields',[])
+        connector_fields_string = kw.get('connector_fields_string',[])
+        
+        bgcolors = {}
+        shapes = {}
+        bgcolor = kw.get('bgcolor','')
+        shape = kw.get('shape','')
+        
+        if bgcolor:
+            for color_spec in bgcolor.split(';'):
+                if color_spec:
+                    colour, color_state = color_spec.split(':')
+                    bgcolors[colour] = color_state
+                    
+        if shape:
+            for shape_spec in shape.split(';'):
+                if shape_spec:
+                    shape_colour, shape_color_state = shape_spec.split(':')
+                    shapes[shape_colour] = shape_color_state
+                    
+        ir_view = req.session.model('ir.ui.view')
+        graphs = ir_view.graph_get(id, model, node, connector, src_node, des_node, False,
+                          (140, 180), req.session.context)
+        
+        nodes = graphs['nodes']
+        transitions = graphs['transitions']
+        isolate_nodes = {}
+        
+        for node in graphs['blank_nodes']:
+            isolate_nodes[node['id']] = node
+        else:
+            y = map(lambda t: t['y'],filter(lambda x: x['y'] if x['x']==20 else None, nodes.values()))
+            y_max = (y and max(y)) or 120
+        
+        connectors = {}
+        list_tr = []
+
+        for tr in transitions:
+            list_tr.append(tr)
+            connectors.setdefault(tr, {
+                'id': tr,
+                's_id': transitions[tr][0],
+                'd_id': transitions[tr][1]
+            })
+        connector_tr = req.session.model(connector)
+        connector_ids = connector_tr.search([('id', 'in', list_tr)], 0, 0, 0, req.session.context)
+        
+        data_connectors =connector_tr.read(connector_ids, connector_fields, req.session.context)
+        
+        
+        for tr in data_connectors:
+            t = connectors.get(str(tr['id']))
+            t.update({
+                      'source': tr[src_node][1],
+                      'destination': tr[des_node][1],
+                      'options': {}
+                      })
+
+            for i, fld in enumerate(connector_fields):
+                t['options'][connector_fields_string[i]] = tr[fld]
+        
+        fields = req.session.model('ir.model.fields')
+        field_ids = fields.search([('model', '=', model), ('relation', '=', node)], 0, 0, 0, req.session.context)
+        field_data = fields.read(field_ids, ['relation_field'], req.session.context)
+        
+        node_act = req.session.model(node)
+        search_acts = node_act.search([(field_data[0]['relation_field'], '=', id)], 0, 0, 0, req.session.context)
+        data_acts = node_act.read(search_acts, invisible_node_fields + visible_node_fields, req.session.context)
+        
+        for act in data_acts:
+            n = nodes.get(str(act['id']))
+            if not n:
+                n = isolate_nodes.get(act['id'], {})
+                y_max += 140
+                n.update({'x': 20, 'y': y_max})
+                nodes[act['id']] = n
+
+            n.update(
+                id=act['id'],
+                color='white',
+                shape='ellipse',
+                options={}
+            )
+            for color, expr in bgcolors.items():
+                if eval(expr, act):
+                    n['color'] = color
+
+            for shape, expr in shapes.items():
+                if eval(expr, act):
+                    n['shape'] = shape
+
+            for i, fld in enumerate(visible_node_fields):
+                n['options'][node_fields_string[i]] = act[fld]
+                
+        #to relate m2o field of transition to corresponding o2m in activity
+        in_transition_field_id = fields.search([('relation', '=', connector), ('relation_field', '=', des_node), ('model', '=', node)], 0, 0, 0, req.session.context)
+        in_transition_field = fields.read(in_transition_field_id[0], ['name'], req.session.context)['name']
+
+        out_transition_field_id = fields.search([('relation', '=', connector), ('relation_field', '=', src_node), ('model', '=', node)], 0, 0, 0, req.session.context)
+        out_transition_field = fields.read(out_transition_field_id[0], ['name'], req.session.context)['name']
+
+        return dict(nodes=nodes, conn=connectors, in_transition_field=in_transition_field, out_transition_field=out_transition_field)
diff --git a/addons/base_diagram/static/lib/js/Curry-1.0.1.js b/addons/base_diagram/static/lib/js/Curry-1.0.1.js
new file mode 100644
index 00000000000..f5aa0f993a6
--- /dev/null
+++ b/addons/base_diagram/static/lib/js/Curry-1.0.1.js
@@ -0,0 +1,29 @@
+/**
+ * Curry - Function currying
+ * Copyright (c) 2008 Ariel Flesler - aflesler(at)gmail(dot)com | http://flesler.blogspot.com
+ * Licensed under BSD (http://www.opensource.org/licenses/bsd-license.php)
+ * Date: 10/4/2008
+ *
+ * @author Ariel Flesler
+ * @version 1.0.1
+ */
+
+function curry( fn ){
+	return function(){
+		var args = curry.args(arguments),
+			master = arguments.callee,
+			self = this;
+
+		return args.length >= fn.length ? fn.apply(self,args) :	function(){
+			return master.apply( self, args.concat(curry.args(arguments)) );
+		};
+	};
+};
+
+curry.args = function( args ){
+	return Array.prototype.slice.call(args);
+};
+
+Function.prototype.curry = function(){
+	return curry(this);
+};
\ No newline at end of file
diff --git a/addons/base_diagram/static/lib/js/dracula_algorithms.js b/addons/base_diagram/static/lib/js/dracula_algorithms.js
new file mode 100644
index 00000000000..0fbb0857fc8
--- /dev/null
+++ b/addons/base_diagram/static/lib/js/dracula_algorithms.js
@@ -0,0 +1,599 @@
+/*
+ * Various algorithms and data structures, licensed under the MIT-license.
+ * (c) 2010 by Johann Philipp Strathausen <strathausen@gmail.com>
+ * http://strathausen.eu
+ *
+ */
+
+
+
+/*
+        Bellman-Ford
+    
+    Path-finding algorithm, finds the shortest paths from one node to all nodes.
+    
+    
+        Complexity
+        
+    O( |E| · |V| ), where E = edges and V = vertices (nodes)
+    
+    
+        Constraints
+    
+    Can run on graphs with negative edge weights as long as they do not have
+    any negative weight cycles.
+    
+ */
+function bellman_ford(g, source) {
+
+    /* STEP 1: initialisation */
+    for(var n in g.nodes)
+        g.nodes[n].distance = Infinity;
+        /* predecessors are implicitly null */
+    source.distance = 0;
+    
+    step("Initially, all distances are infinite and all predecessors are null.");
+    
+    /* STEP 2: relax each edge (this is at the heart of Bellman-Ford) */
+    /* repeat this for the number of nodes minus one */
+    for(var i = 1; i < g.nodes.length; i++)
+        /* for each edge */
+        for(var e in g.edges) {
+            var edge = g.edges[e];
+            if(edge.source.distance + edge.weight < edge.target.distance) {
+                step("Relax edge between " + edge.source.id + " and " + edge.target.id + ".");
+                edge.target.distance = edge.source.distance + edge.weight;
+                edge.target.predecessor = edge.source;
+            }
+	    //Added by Jake Stothard (Needs to be tested)
+	    if(!edge.style.directed) {
+		if(edge.target.distance + edge.weight < edge.source.distance) {
+                    g.snapShot("Relax edge between "+edge.target.id+" and "+edge.source.id+".");
+                    edge.source.distance = edge.target.distance + edge.weight;
+                    edge.source.predecessor = edge.target;
+		}
+	    }
+        }
+    step("Ready.");
+    
+    /* STEP 3: TODO Check for negative cycles */
+    /* For now we assume here that the graph does not contain any negative
+       weights cycles. (this is left as an excercise to the reader[tm]) */
+}
+
+
+
+/*
+   Path-finding algorithm Dijkstra
+   
+   - worst-case running time is O((|E| + |V|) · log |V| ) thus better than
+     Bellman-Ford for sparse graphs (with less edges), but cannot handle
+     negative edge weights
+ */
+function dijkstra(g, source) {
+
+    /* initially, all distances are infinite and all predecessors are null */
+    for(var n in g.nodes)
+        g.nodes[n].distance = Infinity;
+        /* predecessors are implicitly null */
+
+    g.snapShot("Initially, all distances are infinite and all predecessors are null.");
+
+    source.distance = 0;
+    /* set of unoptimized nodes, sorted by their distance (but a Fibonacci heap
+       would be better) */
+    var q = new BinaryMinHeap(g.nodes, "distance");
+
+    /* pointer to the node in focus */
+    var node;
+
+    /* get the node with the smallest distance
+       as long as we have unoptimized nodes. q.min() can have O(log n). */
+    while(q.min() != undefined) {
+        /* remove the latest */
+        node = q.extractMin();
+        node.optimized = true;
+
+        /* no nodes accessible from this one, should not happen */
+        if(node.distance == Infinity)
+            throw "Orphaned node!";
+
+        /* for each neighbour of node */
+        for(e in node.edges) {
+	    var other = (node == node.edges[e].target) ? node.edges[e].source : node.edges[e].target;
+		
+            if(other.optimized)
+                continue;
+
+            /* look for an alternative route */
+            var alt = node.distance + node.edges[e].weight;
+            
+            /* update distance and route if a better one has been found */
+            if (alt < other.distance) {
+            
+                /* update distance of neighbour */
+                other.distance = alt;
+
+                /* update priority queue */
+                q.heapify();
+
+                /* update path */
+                other.predecessor = node;
+                g.snapShot("Enhancing node.")
+            }
+        }
+    }
+}
+
+
+/* All-Pairs-Shortest-Paths */
+/* Runs at worst in O(|V|³) and at best in Omega(|V|³) :-)
+   complexity Sigma(|V|²) */
+/* This implementation is not yet ready for general use, but works with the
+   Dracula graph library. */
+function floyd_warshall(g, source) {
+
+    /* Step 1: initialising empty path matrix (second dimension is implicit) */
+    var path = [];
+    var next = [];
+    var n = g.nodes.length;
+
+    /* construct path matrix, initialize with Infinity */
+    for(j in g.nodes) {
+        path[j] = [];
+        next[j] = [];
+        for(i in g.nodes)
+            path[j][i] = j == i ? 0 : Infinity;
+    }   
+    
+    /* initialize path with edge weights */
+    for(e in g.edges)
+        path[g.edges[e].source.id][g.edges[e].target.id] = g.edges[e].weight;
+    
+    /* Note: Usually, the initialisation is done by getting the edge weights
+       from a node matrix representation of the graph, not by iterating through
+       a list of edges as done here. */
+    
+    /* Step 2: find best distances (the heart of Floyd-Warshall) */
+    for(k in g.nodes){
+        for(i in g.nodes) {
+            for(j in g.nodes)
+                if(path[i][j] > path[i][k] + path[k][j]) {
+                    path[i][j] = path[i][k] + path[k][j];
+                    /* Step 2.b: remember the path */
+                    next[i][j] = k;
+                }
+        }
+    }
+
+    /* Step 3: Path reconstruction, get shortest path */
+    function getPath(i, j) {
+        if(path[i][j] == Infinity)
+            throw "There is no path.";
+        var intermediate = next[i][j];
+        if(intermediate == undefined)
+            return null;
+        else
+            return getPath(i, intermediate)
+                .concat([intermediate])
+                .concat(getPath(intermediate, j));
+    }
+
+    /* TODO use the knowledge, e.g. mark path in graph */
+}
+
+/*
+        Ford-Fulkerson
+    
+    Max-Flow-Min-Cut Algorithm finding the maximum flow through a directed
+    graph from source to sink.
+    
+    
+        Complexity
+
+    O(E * max(f)), max(f) being the maximum flow
+    
+    
+        Description
+
+    As long as there is an open path through the residual graph, send the
+    minimum of the residual capacities on the path.
+    
+    
+        Constraints
+    
+    The algorithm works only if all weights are integers. Otherwise it is
+    possible that the Ford–Fulkerson algorithm will not converge to the maximum
+    value.
+    
+    
+        Input
+    
+    g - Graph object
+    s - Source ID
+    t - Target (sink) ID
+    
+    
+        Output
+    
+    Maximum flow from Source s to Target t
+
+ */
+/*
+        Edmonds-Karp
+    
+    Max-Flow-Min-Cut Algorithm finding the maximum flow through a directed
+    graph from source to sink. An implementation of the Ford-Fulkerson
+    algorithm.
+    
+    
+        Complexity
+    
+    O(|V|*|E|²)
+    
+    
+        Input
+        
+    g - Graph object (with node and edge lists, capacity is a property of edge)
+    s - source ID
+    t - sink ID
+    
+ */
+function edmonds_karp(g, s, t) {
+
+}
+
+/*
+   A simple binary min-heap serving as a priority queue
+   - takes an array as the input, with elements having a key property
+   - elements will look like this:
+        {
+            key: "... key property ...", 
+            value: "... element content ..."
+        }
+    - provides insert(), min(), extractMin() and heapify()
+    - example usage (e.g. via the Firebug or Chromium console):
+        var x = {foo: 20, hui: "bla"};
+        var a = new BinaryMinHeap([x,{foo:3},{foo:10},{foo:20},{foo:30},{foo:6},{foo:1},{foo:3}],"foo");
+        console.log(a.extractMin());
+        console.log(a.extractMin());
+        x.foo = 0; // update key
+        a.heapify(); // call this always after having a key updated
+        console.log(a.extractMin());
+        console.log(a.extractMin());
+    - can also be used on a simple array, like [9,7,8,5]
+ */
+function BinaryMinHeap(array, key) {
+    
+    /* Binary tree stored in an array, no need for a complicated data structure */
+    var tree = [];
+    
+    var key = key || 'key';
+    
+    /* Calculate the index of the parent or a child */
+    var parent = function(index) { return Math.floor((index - 1)/2); };
+    var right = function(index) { return 2 * index + 2; };
+    var left = function(index) { return 2 * index + 1; };
+
+    /* Helper function to swap elements with their parent 
+       as long as the parent is bigger */
+    function bubble_up(i) {
+        var p = parent(i);
+        while((p >= 0) && (tree[i][key] < tree[p][key])) {
+            /* swap with parent */
+            tree[i] = tree.splice(p, 1, tree[i])[0];
+            /* go up one level */
+            i = p;
+            p = parent(i);
+        }
+    }
+
+    /* Helper function to swap elements with the smaller of their children
+       as long as there is one */
+    function bubble_down(i) {
+        var l = left(i);
+        var r = right(i);
+        
+        /* as long as there are smaller children */
+        while(tree[l] && (tree[i][key] > tree[l][key]) || tree[r] && (tree[i][key] > tree[r][key])) {
+            
+            /* find smaller child */
+            var child = tree[l] ? tree[r] ? tree[l][key] > tree[r][key] ? r : l : l : l;
+            
+            /* swap with smaller child with current element */
+            tree[i] = tree.splice(child, 1, tree[i])[0];
+            
+            /* go up one level */
+            i = child;
+            l = left(i);
+            r = right(i);
+        }
+    }
+    
+    /* Insert a new element with respect to the heap property
+       1. Insert the element at the end
+       2. Bubble it up until it is smaller than its parent */
+    this.insert = function(element) {
+    
+        /* make sure there's a key property */
+        (element[key] == undefined) && (element = {key:element});
+        
+        /* insert element at the end */
+        tree.push(element);
+
+        /* bubble up the element */
+        bubble_up(tree.length - 1);
+    }
+    
+    /* Only show us the minimum */
+    this.min = function() {
+        return tree.length == 1 ? undefined : tree[0];
+    }
+    
+    /* Return and remove the minimum
+       1. Take the root as the minimum that we are looking for
+       2. Move the last element to the root (thereby deleting the root) 
+       3. Compare the new root with both of its children, swap it with the
+          smaller child and then check again from there (bubble down)
+    */
+    this.extractMin = function() {
+        var result = this.min();
+        
+        /* move the last element to the root or empty the tree completely */
+        /* bubble down the new root if necessary */
+        (tree.length == 1) && (tree = []) || (tree[0] = tree.pop()) && bubble_down(0);
+        
+        return result;        
+    }
+    
+    /* currently unused, TODO implement */
+    this.changeKey = function(index, key) {
+        throw "function not implemented";
+    }
+
+    this.heapify = function() {
+        for(var start = Math.floor((tree.length - 2) / 2); start >= 0; start--) {
+            bubble_down(start);
+        }
+    }
+    
+    /* insert the input elements one by one only when we don't have a key property (TODO can be done more elegant) */
+    for(i in (array || []))
+        this.insert(array[i]);
+}
+
+
+
+/*
+    Quick Sort:
+        1. Select some random value from the array, the median.
+        2. Divide the array in three smaller arrays according to the elements
+           being less, equal or greater than the median.
+        3. Recursively sort the array containg the elements less than the
+           median and the one containing elements greater than the median.
+        4. Concatenate the three arrays (less, equal and greater).
+        5. One or no element is always sorted.
+    TODO: This could be implemented more efficiently by using only one array object and several pointers.
+*/
+function quickSort(arr) {
+    /* recursion anchor: one element is always sorted */
+    if(arr.length <= 1) return arr;
+    /* randomly selecting some value */
+    var median = arr[Math.floor(Math.random() * arr.length)];
+    var arr1 = [], arr2 = [], arr3 = [];
+    for(var i in arr) {
+        arr[i] < median && arr1.push(arr[i]);
+        arr[i] == median && arr2.push(arr[i]);
+        arr[i] > median && arr3.push(arr[i]);
+    }
+    /* recursive sorting and assembling final result */
+    return quickSort(arr1).concat(arr2).concat(quickSort(arr3));
+}
+
+/*
+    Selection Sort:
+        1. Select the minimum and remove it from the array
+        2. Sort the rest recursively
+        3. Return the minimum plus the sorted rest
+        4. An array with only one element is already sorted
+*/
+function selectionSort(arr) {
+    /* recursion anchor: one element is always sorted */
+    if(arr.length == 1) return arr;
+    var minimum = Infinity;
+    var index;
+    for(var i in arr) {
+        if(arr[i] < minimum) {
+            minimum = arr[i];
+            index = i; /* remember the minimum index for later removal */
+        }
+    }
+    /* remove the minimum */
+    arr.splice(index, 1);
+    /* assemble result and sort recursively (could be easily done iteratively as well)*/
+    return [minimum].concat(selectionSort(arr));
+}
+
+/*
+    Merge Sort:
+        1. Cut the array in half
+        2. Sort each of them recursively
+        3. Merge the two sorted arrays
+        4. An array with only one element is considered sorted
+
+*/
+function mergeSort(arr) {
+    /* merges two sorted arrays into one sorted array */
+    function merge(a, b) {
+        /* result set */
+        var c = [];
+        /* as long as there are elements in the arrays to be merged */
+        while(a.length > 0 || b.length > 0){
+            /* are there elements to be merged, if yes, compare them and merge */
+            var n = a.length > 0 && b.length > 0 ? a[0] < b[0] ? a.shift() : b.shift() : b.length > 0 ? b.shift() : a.length > 0 ? a.shift() : null;
+            /* always push the smaller one onto the result set */
+            n != null && c.push(n);
+        }
+        return c;
+    }
+    /* this mergeSort implementation cuts the array in half, wich should be fine with randomized arrays, but introduces the risk of a worst-case scenario */
+    median = Math.floor(arr.length / 2);
+    var part1 = arr.slice(0, median); /* for some reason it doesn't work if inserted directly in the return statement (tried so with firefox) */
+    var part2 = arr.slice(median - arr.length);
+    return arr.length <= 1 ? arr : merge(
+        mergeSort(part1), /* first half */
+        mergeSort(part2) /* second half */
+    );
+}
+
+/* Balanced Red-Black-Tree */
+function RedBlackTree(arr) {
+    
+}
+
+function BTree(arr) {
+    
+}
+
+function NaryTree(n, arr) {
+    
+}
+
+/**
+ * Knuth-Morris-Pratt string matching algorithm - finds a pattern in a text.
+ * FIXME: Doesn't work correctly yet.
+ */
+function kmp(p, t) {
+
+    /**
+     * PREFIX, OVERLAP or FALIURE function for KMP. Computes how many iterations
+     * the algorithm can skip after a mismatch.
+     *
+     * @input p - pattern (string)
+     * @result array of skippable iterations
+     */
+    function prefix(p) {
+        /* pi contains the computed skip marks */
+        var pi = [0], k = 0;
+        for(q = 1; q < p.length; q++) {
+            while(k > 0 && (p.charAt(k) != p.charAt(q)))
+                k = pi[k-1];
+            
+            (p.charAt(k) == p.charAt(q)) && k++;
+            
+            pi[q] = k;
+        }
+        return pi;
+    }
+    
+    /* The actual KMP algorithm starts here. */
+    
+    var pi = prefix(p), q = 0, result = [];
+    
+    for(var i = 0; i < t.length; i++) {
+        /* jump forward as long as the character doesn't match */
+        while((q > 0) && (p.charAt(q) != t.charAt(i)))
+            q = pi[q];
+        
+        (p.charAt(q) == t.charAt(i)) && q++;
+        
+        (q == p.length) && result.push(i - p.length) && (q = pi[q]);
+    }
+    
+    return result;
+}
+
+/* step for algorithm visualisation */
+function step(comment, funct) {
+    //wait for input
+    //display comment (before or after waiting)
+//    next.wait();
+    /* execute callback function */
+    funct();
+}
+
+/**
+ * Curry - Function currying
+ * Copyright (c) 2008 Ariel Flesler - aflesler(at)gmail(dot)com | http://flesler.blogspot.com
+ * Licensed under BSD (http://www.opensource.org/licenses/bsd-license.php)
+ * Date: 10/4/2008
+ *
+ * @author Ariel Flesler
+ * @version 1.0.1
+ */
+function curry( fn ){
+	return function(){
+		var args = curry.args(arguments),
+			master = arguments.callee,
+			self = this;
+
+		return args.length >= fn.length ? fn.apply(self,args) :	function(){
+			return master.apply( self, args.concat(curry.args(arguments)) );
+		};
+	};
+};
+
+curry.args = function( args ){
+	return Array.prototype.slice.call(args);
+};
+
+Function.prototype.curry = function(){
+	return curry(this);
+};
+
+/**
+ * Topological Sort
+ *
+ * Sort a directed graph based on incoming edges
+ *
+ * Coded by Jake Stothard
+ */
+function topological_sort(g) {
+    //Mark nodes as "deleted" instead of actually deleting them
+    //That way we don't have to copy g
+
+    for(i in g.nodes)
+	g.nodes[i].deleted = false;
+    
+    var ret = topological_sort_helper(g);
+
+    //Cleanup: Remove the deleted property
+    for(i in g.nodes)
+	delete g.nodes[i].deleted
+
+    return ret;
+}
+function topological_sort_helper(g) {
+    //Find node with no incoming edges
+    var node;
+    for(i in g.nodes) {
+	if(g.nodes[i].deleted)
+	    continue; //Bad style, meh
+	
+	var incoming = false;
+	for(j in g.nodes[i].edges) {
+	    if(g.nodes[i].edges[j].target == g.nodes[i]
+	      && g.nodes[i].edges[j].source.deleted == false) {
+		incoming = true;
+		break;
+	    }
+	}
+	if(!incoming) {
+	    node = g.nodes[i];
+	    break;
+	}
+    }
+
+    // Either unsortable or done. Either way, GTFO
+    if(node == undefined)
+	return [];
+
+    //"Delete" node from g
+    node.deleted = true;
+    
+    var tail = topological_sort_helper(g);
+
+    tail.unshift(node);
+
+    return tail;
+}
diff --git a/addons/base_diagram/static/lib/js/dracula_graffle.js b/addons/base_diagram/static/lib/js/dracula_graffle.js
new file mode 100644
index 00000000000..9d4fd2099e8
--- /dev/null
+++ b/addons/base_diagram/static/lib/js/dracula_graffle.js
@@ -0,0 +1,106 @@
+/**
+ * Originally grabbed from the official RaphaelJS Documentation
+ * http://raphaeljs.com/graffle.html
+ * Adopted (arrows) and commented by Philipp Strathausen http://blog.ameisenbar.de
+ * Licenced under the MIT licence.
+ */
+
+/**
+ * Usage:
+ * connect two shapes
+ * parameters: 
+ *      source shape [or connection for redrawing], 
+ *      target shape,
+ *      style with { fg : linecolor, bg : background color, directed: boolean }
+ * returns:
+ *      connection { draw = function() }
+ */
+Raphael.fn.connection = function (obj1, obj2, style) {
+    var selfRef = this;
+    /* create and return new connection */
+    var edge = {/*
+        from : obj1,
+        to : obj2,
+        style : style,*/
+        draw : function() {
+            /* get bounding boxes of target and source */
+            var bb1 = obj1.getBBox();
+            var bb2 = obj2.getBBox();
+            var off1 = 0;
+            var off2 = 0;
+            /* coordinates for potential connection coordinates from/to the objects */
+            var p = [
+                {x: bb1.x + bb1.width / 2, y: bb1.y - off1},              /* NORTH 1 */
+                {x: bb1.x + bb1.width / 2, y: bb1.y + bb1.height + off1}, /* SOUTH 1 */
+                {x: bb1.x - off1, y: bb1.y + bb1.height / 2},             /* WEST  1 */
+                {x: bb1.x + bb1.width + off1, y: bb1.y + bb1.height / 2}, /* EAST  1 */
+                {x: bb2.x + bb2.width / 2, y: bb2.y - off2},              /* NORTH 2 */
+                {x: bb2.x + bb2.width / 2, y: bb2.y + bb2.height + off2}, /* SOUTH 2 */
+                {x: bb2.x - off2, y: bb2.y + bb2.height / 2},             /* WEST  2 */
+                {x: bb2.x + bb2.width + off2, y: bb2.y + bb2.height / 2}  /* EAST  2 */
+            ];
+            
+            /* distances between objects and according coordinates connection */
+            var d = {}, dis = [];
+
+            /*
+             * find out the best connection coordinates by trying all possible ways
+             */
+            /* loop the first object's connection coordinates */
+            for (var i = 0; i < 4; i++) {
+                /* loop the seond object's connection coordinates */
+                for (var j = 4; j < 8; j++) {
+                    var dx = Math.abs(p[i].x - p[j].x),
+                        dy = Math.abs(p[i].y - p[j].y);
+                    if ((i == j - 4) || (((i != 3 && j != 6) || p[i].x < p[j].x) && ((i != 2 && j != 7) || p[i].x > p[j].x) && ((i != 0 && j != 5) || p[i].y > p[j].y) && ((i != 1 && j != 4) || p[i].y < p[j].y))) {
+                        dis.push(dx + dy);
+                        d[dis[dis.length - 1].toFixed(3)] = [i, j];
+                    }
+                }
+            }
+            var res = dis.length == 0 ? [0, 4] : d[Math.min.apply(Math, dis).toFixed(3)];
+            /* bezier path */
+            var x1 = p[res[0]].x,
+                y1 = p[res[0]].y,
+                x4 = p[res[1]].x,
+                y4 = p[res[1]].y,
+                dx = Math.max(Math.abs(x1 - x4) / 2, 10),
+                dy = Math.max(Math.abs(y1 - y4) / 2, 10),
+                x2 = [x1, x1, x1 - dx, x1 + dx][res[0]].toFixed(3),
+                y2 = [y1 - dy, y1 + dy, y1, y1][res[0]].toFixed(3),
+                x3 = [0, 0, 0, 0, x4, x4, x4 - dx, x4 + dx][res[1]].toFixed(3),
+                y3 = [0, 0, 0, 0, y1 + dy, y1 - dy, y4, y4][res[1]].toFixed(3);
+            /* assemble path and arrow */
+            var path = ["M", x1.toFixed(3), y1.toFixed(3), "C", x2, y2, x3, y3, x4.toFixed(3), y4.toFixed(3)].join(",");
+            /* arrow */
+            if(style && style.directed) {
+                /* magnitude, length of the last path vector */
+                var mag = Math.sqrt((y4 - y3) * (y4 - y3) + (x4 - x3) * (x4 - x3));
+                /* vector normalisation to specified length  */
+                var norm = function(x,l){return (-x*(l||5)/mag);};
+                /* calculate array coordinates (two lines orthogonal to the path vector) */
+                var arr = [
+                    {x:(norm(x4-x3)+norm(y4-y3)+x4).toFixed(3), y:(norm(y4-y3)+norm(x4-x3)+y4).toFixed(3)},
+                    {x:(norm(x4-x3)-norm(y4-y3)+x4).toFixed(3), y:(norm(y4-y3)-norm(x4-x3)+y4).toFixed(3)}
+                ];
+                path = path + ",M"+arr[0].x+","+arr[0].y+",L"+x4+","+y4+",L"+arr[1].x+","+arr[1].y; 
+            }
+            /* function to be used for moving existent path(s), e.g. animate() or attr() */
+            var move = "attr";
+            /* applying path(s) */
+            edge.fg && edge.fg[move]({path:path}) 
+                || (edge.fg = selfRef.path(path).attr({stroke: style && style.stroke || "#000", fill: "none"}).toBack());
+            edge.bg && edge.bg[move]({path:path})
+                || style && style.fill && (edge.bg = style.fill.split && selfRef.path(path).attr({stroke: style.fill.split("|")[0], fill: "none", "stroke-width": style.fill.split("|")[1] || 3}).toBack());
+            /* setting label */
+            style && style.label 
+                && (edge.label && edge.label.attr({x:(x1+x4)/2, y:(y1+y4)/2}) 
+                    || (edge.label = selfRef.text((x1+x4)/2, (y1+y4)/2, style.label).attr({fill: "#000", "font-size": style["font-size"] || "12px"})));
+//                && selfRef.text(x4, y4, style.label).attr({stroke: style && style.stroke || "#fff", "font-weight":"bold", "font-size":"20px"})
+//            style && style.callback && style.callback(edge);
+        }
+    }
+    edge.draw();
+    return edge;
+};
+//Raphael.prototype.set.prototype.dodo=function(){console.log("works");};
diff --git a/addons/base_diagram/static/lib/js/dracula_graph.coffee b/addons/base_diagram/static/lib/js/dracula_graph.coffee
new file mode 100644
index 00000000000..bb91945098d
--- /dev/null
+++ b/addons/base_diagram/static/lib/js/dracula_graph.coffee
@@ -0,0 +1,524 @@
+###
+ *  Dracula Graph Layout and Drawing Framework 0.0.3alpha
+ *  (c) 2010 Philipp Strathausen <strathausen@gmail.com>, http://strathausen.eu
+ *  
+ *  Contributions by:
+ *  Branched by Jake Stothard <stothardj@gmail.com>.
+ *
+ *  based on the Graph JavaScript framework, version 0.0.1
+ *  (c) 2006 Aslak Hellesoy <aslak.hellesoy@gmail.com>
+ *  (c) 2006 Dave Hoover <dave.hoover@gmail.com>
+ *
+ *  Ported from Graph::Layouter::Spring in
+ *    http://search.cpan.org/~pasky/Graph-Layderer-0.02/
+ *  The algorithm is based on a spring-style layouter of a Java-based social
+ *  network tracker PieSpy written by Paul Mutton E<lt>paul@jibble.orgE<gt>.
+ *
+ *  This code is freely distributable under the terms of an MIT-style license.
+ *  For details, see the Graph web site: http://dev.buildpatternd.com/trac
+ *
+ *  Links:
+ *
+ *  Graph Dracula JavaScript Framework:
+ *      http://graphdracula.net
+ *
+ *  Demo of the original applet:
+ *      http://redsquirrel.com/dave/work/webdep/
+ *
+ *  Mirrored original source code at snipplr:
+ *      http://snipplr.com/view/1950/graph-javascript-framework-version-001/
+ *
+ *  Original usage example:
+ *      http://ajaxian.com/archives/new-javascriptcanvas-graph-library
+ *
+###
+
+
+###
+    Edge Factory
+###
+AbstractEdge = ->
+
+AbstractEdge.prototype =
+    hide: ->
+        @connection.fg.hide()
+        @connection.bg && @bg.connection.hide()
+
+EdgeFactory = ->
+    @template = new AbstractEdge()
+    @template.style = new Object()
+    @template.style.directed = false
+    @template.weight = 1
+
+EdgeFactory.prototype =
+    build: (source, target) ->
+        e = jQuery.extend true, {}, @template
+        e.source = source
+        e.target = target
+        e
+
+###
+    Graph
+###
+Graph = ->
+    @nodes = {}
+    @edges = []
+    @snapshots = [] # previous graph states TODO to be implemented
+    @edgeFactory = new EdgeFactory()
+
+Graph.prototype =
+###
+    add a node
+    @id          the node's ID (string or number)
+    @content     (optional, dictionary) can contain any information that is
+                 being interpreted by the layout algorithm or the graph
+                 representation
+###
+    addNode: (id, content) ->
+        # testing if node is already existing in the graph
+        if @nodes[id] == undefined
+            @nodes[id] = new Graph.Node id, content
+        @nodes[id]
+
+    addEdge: (source, target, style) ->
+        s = @addNode source
+        t = @addNode target
+        var edge = @edgeFactory.build s, t
+        jQuery.extend edge.style, style
+        s.edges.push edge
+        @edges.push edge
+        # NOTE: Even directed edges are added to both nodes.
+        t.edges.push edge
+
+    # TODO to be implemented
+    # Preserve a copy of the graph state (nodes, positions, ...)
+    # @comment     a comment describing the state
+    snapShot: (comment) ->
+        ###/* FIXME
+        var graph = new Graph()
+        graph.nodes = jQuery.extend(true, {}, @nodes)
+        graph.edges = jQuery.extend(true, {}, @edges)
+        @snapshots.push({comment: comment, graph: graph})
+        */
+        ###
+
+    removeNode: (id) ->
+        delete @nodes[id]
+        for i = 0; i < @edges.length; i++
+            if @edges[i].source.id == id || @edges[i].target.id == id
+                @edges.splice(i, 1)
+                i--
+
+/*
+ * Node
+ */
+Graph.Node = (id, node) ->
+    node = node || {}
+    node.id = id
+    node.edges = []
+    node.hide = ->
+        @hidden = true
+        @shape && @shape.hide() # FIXME this is representation specific code and should be elsewhere */
+        for(i in @edges)
+            (@edges[i].source.id == id || @edges[i].target == id) && @edges[i].hide && @edges[i].hide()
+
+    node.show = ->
+        @hidden = false
+        @shape && @shape.show()
+        for(i in @edges)
+            (@edges[i].source.id == id || @edges[i].target == id) && @edges[i].show && @edges[i].show()
+
+    node
+
+Graph.Node.prototype = { }
+
+###
+    Renderer base class
+###
+Graph.Renderer = { }
+
+###
+    Renderer implementation using RaphaelJS
+###
+Graph.Renderer.Raphael = (element, graph, width, height) ->
+    @width = width || 400
+    @height = height || 400
+    var selfRef = this
+    @r = Raphael element, @width, @height
+    @radius = 40 # max dimension of a node
+    @graph = graph
+    @mouse_in = false
+
+    # TODO default node rendering
+    if(!@graph.render) {
+        @graph.render = ->
+            return
+        }
+    }
+    
+    /*
+     * Dragging
+     */
+    @isDrag = false
+    @dragger = (e) ->
+        @dx = e.clientX
+        @dy = e.clientY
+        selfRef.isDrag = this
+        @set && @set.animate "fill-opacity": .1, 200 && @set.toFront()
+        e.preventDefault && e.preventDefault()
+
+    document.onmousemove =  (e) {
+        e = e || window.event
+        if (selfRef.isDrag) {
+            var bBox = selfRef.isDrag.set.getBBox()
+            // TODO round the coordinates here (eg. for proper image representation)
+            var newX = e.clientX - selfRef.isDrag.dx + (bBox.x + bBox.width / 2)
+            var newY = e.clientY - selfRef.isDrag.dy + (bBox.y + bBox.height / 2)
+            /* prevent shapes from being dragged out of the canvas */
+            var clientX = e.clientX - (newX < 20 ? newX - 20 : newX > selfRef.width - 20 ? newX - selfRef.width + 20 : 0)
+            var clientY = e.clientY - (newY < 20 ? newY - 20 : newY > selfRef.height - 20 ? newY - selfRef.height + 20 : 0)
+            selfRef.isDrag.set.translate(clientX - Math.round(selfRef.isDrag.dx), clientY - Math.round(selfRef.isDrag.dy))
+            //            console.log(clientX - Math.round(selfRef.isDrag.dx), clientY - Math.round(selfRef.isDrag.dy))
+            for (var i in selfRef.graph.edges) {
+                selfRef.graph.edges[i].connection && selfRef.graph.edges[i].connection.draw()
+            }
+            //selfRef.r.safari()
+            selfRef.isDrag.dx = clientX
+            selfRef.isDrag.dy = clientY
+        }
+    }
+    document.onmouseup =  ->
+        selfRef.isDrag && selfRef.isDrag.set.animate({"fill-opacity": .6}, 500)
+        selfRef.isDrag = false
+    }
+    @draw()
+}
+Graph.Renderer.Raphael.prototype = {
+    translate: (point) {
+        return [
+            (point[0] - @graph.layoutMinX) * @factorX + @radius,
+            (point[1] - @graph.layoutMinY) * @factorY + @radius
+        ]
+    },
+
+    rotate: (point, length, angle) {
+        var dx = length * Math.cos(angle)
+        var dy = length * Math.sin(angle)
+        return [point[0]+dx, point[1]+dy]
+    },
+
+    draw: ->
+        @factorX = (@width - 2 * @radius) / (@graph.layoutMaxX - @graph.layoutMinX)
+        @factorY = (@height - 2 * @radius) / (@graph.layoutMaxY - @graph.layoutMinY)
+        for (i in @graph.nodes) {
+            @drawNode(@graph.nodes[i])
+        }
+        for (var i = 0; i < @graph.edges.length; i++) {
+            @drawEdge(@graph.edges[i])
+        }
+    },
+
+    drawNode: (node) {
+        var point = @translate([node.layoutPosX, node.layoutPosY])
+        node.point = point
+
+        /* if node has already been drawn, move the nodes */
+        if(node.shape) {
+            var oBBox = node.shape.getBBox()
+            var opoint = { x: oBBox.x + oBBox.width / 2, y: oBBox.y + oBBox.height / 2}
+            node.shape.translate(Math.round(point[0] - opoint.x), Math.round(point[1] - opoint.y))
+            @r.safari()
+            return node
+        }/* else, draw new nodes */
+
+        var shape
+
+        /* if a node renderer  is provided by the user, then use it 
+           or the default render  instead */
+        if(!node.render) {
+            node.render = (r, node) {
+                /* the default node drawing */
+                var color = Raphael.getColor()
+                var ellipse = r.ellipse(0, 0, 30, 20).attr({fill: color, stroke: color, "stroke-width": 2})
+                /* set DOM node ID */
+                ellipse.node.id = node.label || node.id
+                shape = r.set().
+                    push(ellipse).
+                    push(r.text(0, 30, node.label || node.id))
+                return shape
+            }
+        }
+        /* or check for an ajax representation of the nodes */
+        if(node.shapes) {
+            // TODO ajax representation evaluation
+        }
+
+        shape = node.render(@r, node).hide()
+
+        shape.attr({"fill-opacity": .6})
+        /* re-reference to the node an element belongs to, needed for dragging all elements of a node */
+        shape.items.forEach((item){ item.set = shape; item.node.style.cursor = "move"; })
+        shape.mousedown(@dragger)
+
+        var box = shape.getBBox()
+        shape.translate(Math.round(point[0]-(box.x+box.width/2)),Math.round(point[1]-(box.y+box.height/2)))
+        //console.log(box,point)
+        node.hidden || shape.show()
+        node.shape = shape
+    },
+    drawEdge: (edge) {
+        /* if this edge already exists the other way around and is undirected */
+        if(edge.backedge)
+            return
+        if(edge.source.hidden || edge.target.hidden) {
+            edge.connection && edge.connection.fg.hide() | edge.connection.bg && edge.connection.bg.hide()
+            return
+        }
+        /* if edge already has been drawn, only refresh the edge */
+        if(!edge.connection) {
+            edge.style && edge.style.callback && edge.style.callback(edge); // TODO move this somewhere else
+            edge.connection = @r.connection(edge.source.shape, edge.target.shape, edge.style)
+            return
+        }
+        //FIXME showing doesn't work well
+        edge.connection.fg.show()
+        edge.connection.bg && edge.connection.bg.show()
+        edge.connection.draw()
+    }
+}
+Graph.Layout = {}
+Graph.Layout.Spring = (graph) {
+    @graph = graph
+    @iterations = 500
+    @maxRepulsiveForceDistance = 6
+    @k = 2
+    @c = 0.01
+    @maxVertexMovement = 0.5
+    @layout()
+}
+Graph.Layout.Spring.prototype = {
+    layout: ->
+        @layoutPrepare()
+        for (var i = 0; i < @iterations; i++) {
+            @layoutIteration()
+        }
+        @layoutCalcBounds()
+    },
+    
+    layoutPrepare: ->
+        for (i in @graph.nodes) {
+            var node = @graph.nodes[i]
+            node.layoutPosX = 0
+            node.layoutPosY = 0
+            node.layoutForceX = 0
+            node.layoutForceY = 0
+        }
+        
+    },
+    
+    layoutCalcBounds: ->
+        var minx = Infinity, maxx = -Infinity, miny = Infinity, maxy = -Infinity
+
+        for (i in @graph.nodes) {
+            var x = @graph.nodes[i].layoutPosX
+            var y = @graph.nodes[i].layoutPosY
+            
+            if(x > maxx) maxx = x
+            if(x < minx) minx = x
+            if(y > maxy) maxy = y
+            if(y < miny) miny = y
+        }
+
+        @graph.layoutMinX = minx
+        @graph.layoutMaxX = maxx
+        @graph.layoutMinY = miny
+        @graph.layoutMaxY = maxy
+    },
+    
+    layoutIteration: ->
+        // Forces on nodes due to node-node repulsions
+
+        var prev = new Array()
+        for(var c in @graph.nodes) {
+            var node1 = @graph.nodes[c]
+            for (var d in prev) {
+                var node2 = @graph.nodes[prev[d]]
+                @layoutRepulsive(node1, node2)
+                
+            }
+            prev.push(c)
+        }
+        
+        // Forces on nodes due to edge attractions
+        for (var i = 0; i < @graph.edges.length; i++) {
+            var edge = @graph.edges[i]
+            @layoutAttractive(edge);             
+        }
+        
+        // Move by the given force
+        for (i in @graph.nodes) {
+            var node = @graph.nodes[i]
+            var xmove = @c * node.layoutForceX
+            var ymove = @c * node.layoutForceY
+
+            var max = @maxVertexMovement
+            if(xmove > max) xmove = max
+            if(xmove < -max) xmove = -max
+            if(ymove > max) ymove = max
+            if(ymove < -max) ymove = -max
+            
+            node.layoutPosX += xmove
+            node.layoutPosY += ymove
+            node.layoutForceX = 0
+            node.layoutForceY = 0
+        }
+    },
+
+    layoutRepulsive: (node1, node2) {
+        var dx = node2.layoutPosX - node1.layoutPosX
+        var dy = node2.layoutPosY - node1.layoutPosY
+        var d2 = dx * dx + dy * dy
+        if(d2 < 0.01) {
+            dx = 0.1 * Math.random() + 0.1
+            dy = 0.1 * Math.random() + 0.1
+            var d2 = dx * dx + dy * dy
+        }
+        var d = Math.sqrt(d2)
+        if(d < @maxRepulsiveForceDistance) {
+            var repulsiveForce = @k * @k / d
+            node2.layoutForceX += repulsiveForce * dx / d
+            node2.layoutForceY += repulsiveForce * dy / d
+            node1.layoutForceX -= repulsiveForce * dx / d
+            node1.layoutForceY -= repulsiveForce * dy / d
+        }
+    },
+
+    layoutAttractive: (edge) {
+        var node1 = edge.source
+        var node2 = edge.target
+        
+        var dx = node2.layoutPosX - node1.layoutPosX
+        var dy = node2.layoutPosY - node1.layoutPosY
+        var d2 = dx * dx + dy * dy
+        if(d2 < 0.01) {
+            dx = 0.1 * Math.random() + 0.1
+            dy = 0.1 * Math.random() + 0.1
+            var d2 = dx * dx + dy * dy
+        }
+        var d = Math.sqrt(d2)
+        if(d > @maxRepulsiveForceDistance) {
+            d = @maxRepulsiveForceDistance
+            d2 = d * d
+        }
+        var attractiveForce = (d2 - @k * @k) / @k
+        if(edge.attraction == undefined) edge.attraction = 1
+        attractiveForce *= Math.log(edge.attraction) * 0.5 + 1
+        
+        node2.layoutForceX -= attractiveForce * dx / d
+        node2.layoutForceY -= attractiveForce * dy / d
+        node1.layoutForceX += attractiveForce * dx / d
+        node1.layoutForceY += attractiveForce * dy / d
+    }
+}
+
+Graph.Layout.Ordered = (graph, order) {
+    @graph = graph
+    @order = order
+    @layout()
+}
+Graph.Layout.Ordered.prototype = {
+    layout: ->
+        @layoutPrepare()
+        @layoutCalcBounds()
+    },
+    
+    layoutPrepare: (order) {
+        for (i in @graph.nodes) {
+            var node = @graph.nodes[i]
+            node.layoutPosX = 0
+            node.layoutPosY = 0
+        }
+            var counter = 0
+            for (i in @order) {
+                var node = @order[i]
+                node.layoutPosX = counter
+                node.layoutPosY = Math.random()
+                counter++
+            }
+    },
+    
+    layoutCalcBounds: ->
+        var minx = Infinity, maxx = -Infinity, miny = Infinity, maxy = -Infinity
+
+        for (i in @graph.nodes) {
+            var x = @graph.nodes[i].layoutPosX
+            var y = @graph.nodes[i].layoutPosY
+            
+            if(x > maxx) maxx = x
+            if(x < minx) minx = x
+            if(y > maxy) maxy = y
+            if(y < miny) miny = y
+        }
+
+        @graph.layoutMinX = minx
+        @graph.layoutMaxX = maxx
+
+        @graph.layoutMinY = miny
+        @graph.layoutMaxY = maxy
+    }
+}
+
+/*
+ * usefull JavaScript extensions, 
+ */
+
+ log(a) {console.log&&console.log(a);}
+
+/*
+ * Raphael Tooltip Plugin
+ * - attaches an element as a tooltip to another element
+ *
+ * Usage example, adding a rectangle as a tooltip to a circle:
+ *
+ *      paper.circle(100,100,10).tooltip(paper.rect(0,0,20,30))
+ *
+ * If you want to use more shapes, you'll have to put them into a set.
+ *
+ */
+Raphael.el.tooltip =  (tp) {
+    @tp = tp
+    @tp.o = {x: 0, y: 0}
+    @tp.hide()
+    @hover(
+        (event){ 
+            @mousemove((event){ 
+                @tp.translate(event.clientX - 
+                                  @tp.o.x,event.clientY - @tp.o.y)
+                @tp.o = {x: event.clientX, y: event.clientY}
+            })
+            @tp.show().toFront()
+        }, 
+        (event){
+            @tp.hide()
+            @unmousemove()
+        })
+    return this
+}
+
+/* For IE */
+if (!Array.prototype.forEach)
+{
+  Array.prototype.forEach = (fun /*, thisp*/)
+  {
+    var len = @length
+    if (typeof fun != "")
+      throw new TypeError()
+
+    var thisp = arguments[1]
+    for (var i = 0; i < len; i++)
+    {
+      if (i in this)
+        fun.call(thisp, this[i], i, this)
+    }
+  }
+}
diff --git a/addons/base_diagram/static/lib/js/dracula_graph.js b/addons/base_diagram/static/lib/js/dracula_graph.js
new file mode 100644
index 00000000000..f7069c5d2e5
--- /dev/null
+++ b/addons/base_diagram/static/lib/js/dracula_graph.js
@@ -0,0 +1,525 @@
+/*
+ *  Dracula Graph Layout and Drawing Framework 0.0.3alpha
+ *  (c) 2010 Philipp Strathausen <strathausen@gmail.com>, http://strathausen.eu
+ *  Contributions by Jake Stothard <stothardj@gmail.com>.
+ *
+ *  based on the Graph JavaScript framework, version 0.0.1
+ *  (c) 2006 Aslak Hellesoy <aslak.hellesoy@gmail.com>
+ *  (c) 2006 Dave Hoover <dave.hoover@gmail.com>
+ *
+ *  Ported from Graph::Layouter::Spring in
+ *    http://search.cpan.org/~pasky/Graph-Layderer-0.02/
+ *  The algorithm is based on a spring-style layouter of a Java-based social
+ *  network tracker PieSpy written by Paul Mutton <paul@jibble.org>.
+ *
+ *  This code is freely distributable under the MIT license. Commercial use is
+ *  hereby granted without any cost or restriction.
+ *
+ *  Links:
+ *
+ *  Graph Dracula JavaScript Framework:
+ *      http://graphdracula.net
+ *
+ /*--------------------------------------------------------------------------*/
+
+/*
+ * Edge Factory
+ */
+var AbstractEdge = function() {
+}
+AbstractEdge.prototype = {
+    hide: function() {
+        this.connection.fg.hide();
+        this.connection.bg && this.bg.connection.hide();
+    }
+};
+var EdgeFactory = function() {
+    this.template = new AbstractEdge();
+    this.template.style = new Object();
+    this.template.style.directed = false;
+    this.template.weight = 1;
+};
+EdgeFactory.prototype = {
+    build: function(source, target) {
+        var e = jQuery.extend(true, {}, this.template);
+        e.source = source;
+        e.target = target;
+        return e;
+    }
+};
+
+/*
+ * Graph
+ */
+var Graph = function() {
+    this.nodes = {};
+    this.edges = [];
+    this.snapshots = []; // previous graph states TODO to be implemented
+    this.edgeFactory = new EdgeFactory();
+};
+Graph.prototype = {
+    /* 
+     * add a node
+     * @id          the node's ID (string or number)
+     * @content     (optional, dictionary) can contain any information that is
+     *              being interpreted by the layout algorithm or the graph
+     *              representation
+     */
+    addNode: function(id, content) {
+        /* testing if node is already existing in the graph */
+        if(this.nodes[id] == undefined) {
+            this.nodes[id] = new Graph.Node(id, content);
+        }
+        return this.nodes[id];
+    },
+
+    addEdge: function(source, target, style) {
+        var s = this.addNode(source);
+        var t = this.addNode(target);
+        var edge = this.edgeFactory.build(s, t);
+        jQuery.extend(edge.style,style);
+        s.edges.push(edge);
+        this.edges.push(edge);
+        // NOTE: Even directed edges are added to both nodes.
+        t.edges.push(edge);
+    },
+    
+    /* TODO to be implemented
+     * Preserve a copy of the graph state (nodes, positions, ...)
+     * @comment     a comment describing the state
+     */
+    snapShot: function(comment) {
+        /* FIXME
+        var graph = new Graph();
+        graph.nodes = jQuery.extend(true, {}, this.nodes);
+        graph.edges = jQuery.extend(true, {}, this.edges);
+        this.snapshots.push({comment: comment, graph: graph});
+        */
+    },
+    removeNode: function(id) {
+        delete this.nodes[id];
+        for(var i = 0; i < this.edges.length; i++) {
+            if (this.edges[i].source.id == id || this.edges[i].target.id == id) {
+                this.edges.splice(i, 1);
+                i--;
+            }
+        }
+    }
+};
+
+/*
+ * Node
+ */
+Graph.Node = function(id, node){
+    node = node || {};
+    node.id = id;
+    node.edges = [];
+    node.hide = function() {
+        this.hidden = true;
+        this.shape && this.shape.hide(); /* FIXME this is representation specific code and should be elsewhere */
+        for(i in this.edges)
+            (this.edges[i].source.id == id || this.edges[i].target == id) && this.edges[i].hide && this.edges[i].hide();
+    };
+    node.show = function() {
+        this.hidden = false;
+        this.shape && this.shape.show();
+        for(i in this.edges)
+            (this.edges[i].source.id == id || this.edges[i].target == id) && this.edges[i].show && this.edges[i].show();
+    };
+    return node;
+};
+Graph.Node.prototype = {
+};
+
+/*
+ * Renderer base class
+ */
+Graph.Renderer = {};
+
+/*
+ * Renderer implementation using RaphaelJS
+ */
+Graph.Renderer.Raphael = function(element, graph, width, height) {
+    this.width = width || 800;
+    this.height = height || 800;
+    var selfRef = this;
+    this.r = Raphael(element, this.width, this.height);
+    this.radius = 40; /* max dimension of a node */
+    this.graph = graph;
+    this.mouse_in = false;
+
+    /* TODO default node rendering function */
+    if(!this.graph.render) {
+        this.graph.render = function() {
+            return;
+        }
+    }
+    
+    /*
+     * Dragging
+     */
+    this.isDrag = false;
+    this.dragger = function (e) {
+        this.dx = e.clientX;
+        this.dy = e.clientY;
+        selfRef.isDrag = this;
+        this.set && this.set.animate({"fill-opacity": .1}, 200) && this.set.toFront();
+        e.preventDefault && e.preventDefault();
+    };
+    
+    var d = document.getElementById(element);
+    d.onmousemove = function (e) {
+        e = e || window.event;
+        if (selfRef.isDrag) {
+            var bBox = selfRef.isDrag.set.getBBox();
+            // TODO round the coordinates here (eg. for proper image representation)
+            var newX = e.clientX - selfRef.isDrag.dx + (bBox.x + bBox.width / 2);
+            var newY = e.clientY - selfRef.isDrag.dy + (bBox.y + bBox.height / 2);
+            /* prevent shapes from being dragged out of the canvas */
+            var clientX = e.clientX - (newX < 20 ? newX - 20 : newX > selfRef.width - 20 ? newX - selfRef.width + 20 : 0);
+            var clientY = e.clientY - (newY < 20 ? newY - 20 : newY > selfRef.height - 20 ? newY - selfRef.height + 20 : 0);
+            selfRef.isDrag.set.translate(clientX - Math.round(selfRef.isDrag.dx), clientY - Math.round(selfRef.isDrag.dy));
+            //            console.log(clientX - Math.round(selfRef.isDrag.dx), clientY - Math.round(selfRef.isDrag.dy));
+            for (var i in selfRef.graph.edges) {
+                selfRef.graph.edges[i].connection && selfRef.graph.edges[i].connection.draw();
+            }
+            //selfRef.r.safari();
+            selfRef.isDrag.dx = clientX;
+            selfRef.isDrag.dy = clientY;
+        }
+    };
+    d.onmouseup = function () {
+        selfRef.isDrag && selfRef.isDrag.set.animate({"fill-opacity": .6}, 500);
+        selfRef.isDrag = false;
+    };
+    this.draw();
+};
+Graph.Renderer.Raphael.prototype = {
+    translate: function(point) {
+        return [
+            (point[0] - this.graph.layoutMinX) * this.factorX + this.radius,
+            (point[1] - this.graph.layoutMinY) * this.factorY + this.radius
+        ];
+    },
+
+    rotate: function(point, length, angle) {
+        var dx = length * Math.cos(angle);
+        var dy = length * Math.sin(angle);
+        return [point[0]+dx, point[1]+dy];
+    },
+
+    draw: function() {
+        this.factorX = (this.width - 2 * this.radius) / (this.graph.layoutMaxX - this.graph.layoutMinX);
+        this.factorY = (this.height - 2 * this.radius) / (this.graph.layoutMaxY - this.graph.layoutMinY);
+        for (i in this.graph.nodes) {
+            this.drawNode(this.graph.nodes[i]);
+        }
+        for (var i = 0; i < this.graph.edges.length; i++) {
+            this.drawEdge(this.graph.edges[i]);
+        }
+    },
+
+    drawNode: function(node) {
+        var point = this.translate([node.layoutPosX, node.layoutPosY]);
+        node.point = point;
+
+        /* if node has already been drawn, move the nodes */
+        if(node.shape) {
+            var oBBox = node.shape.getBBox();
+            var opoint = { x: oBBox.x + oBBox.width / 2, y: oBBox.y + oBBox.height / 2};
+            node.shape.translate(Math.round(point[0] - opoint.x), Math.round(point[1] - opoint.y));
+            this.r.safari();
+            return node;
+        }/* else, draw new nodes */
+
+        var shape;
+
+        /* if a node renderer function is provided by the user, then use it 
+           or the default render function instead */
+        if(!node.render) {
+            node.render = function(r, node) {
+                /* the default node drawing */
+                var color = Raphael.getColor();
+                var ellipse = r.ellipse(0, 0, 30, 20).attr({fill: color, stroke: color, "stroke-width": 2});
+                /* set DOM node ID */
+                ellipse.node.id = node.label || node.id;
+                shape = r.set().
+                    push(ellipse).
+                    push(r.text(0, 30, node.label || node.id));
+                return shape;
+            }
+        }
+        /* or check for an ajax representation of the nodes */
+        if(node.shapes) {
+            // TODO ajax representation evaluation
+        }
+
+        shape = node.render(this.r, node).hide();
+
+        shape.attr({"fill-opacity": .6});
+        /* re-reference to the node an element belongs to, needed for dragging all elements of a node */
+        shape.items.forEach(function(item){ item.set = shape; item.node.style.cursor = "move"; });
+        shape.mousedown(this.dragger);
+
+        var box = shape.getBBox();
+        shape.translate(Math.round(point[0]-(box.x+box.width/2)),Math.round(point[1]-(box.y+box.height/2)))
+        //console.log(box,point);
+        node.hidden || shape.show();
+        node.shape = shape;
+    },
+    drawEdge: function(edge) {
+        /* if this edge already exists the other way around and is undirected */
+        if(edge.backedge)
+            return;
+        if(edge.source.hidden || edge.target.hidden) {
+            edge.connection && edge.connection.fg.hide() | edge.connection.bg && edge.connection.bg.hide();
+            return;
+        }
+        /* if edge already has been drawn, only refresh the edge */
+        if(!edge.connection) {
+            edge.style && edge.style.callback && edge.style.callback(edge); // TODO move this somewhere else
+            edge.connection = this.r.connection(edge.source.shape, edge.target.shape, edge.style);
+            return;
+        }
+        //FIXME showing doesn't work well
+        edge.connection.fg.show();
+        edge.connection.bg && edge.connection.bg.show();
+        edge.connection.draw();
+    }
+};
+Graph.Layout = {};
+Graph.Layout.Spring = function(graph) {
+    this.graph = graph;
+    this.iterations = 500;
+    this.maxRepulsiveForceDistance = 6;
+    this.k = 2;
+    this.c = 0.01;
+    this.maxVertexMovement = 0.5;
+    this.layout();
+};
+Graph.Layout.Spring.prototype = {
+    layout: function() {
+        this.layoutPrepare();
+        for (var i = 0; i < this.iterations; i++) {
+            this.layoutIteration();
+        }
+        this.layoutCalcBounds();
+    },
+    
+    layoutPrepare: function() {
+        for (i in this.graph.nodes) {
+            var node = this.graph.nodes[i];
+            node.layoutPosX = 0;
+            node.layoutPosY = 0;
+            node.layoutForceX = 0;
+            node.layoutForceY = 0;
+        }
+        
+    },
+    
+    layoutCalcBounds: function() {
+        var minx = Infinity, maxx = -Infinity, miny = Infinity, maxy = -Infinity;
+
+        for (i in this.graph.nodes) {
+            var x = this.graph.nodes[i].layoutPosX;
+            var y = this.graph.nodes[i].layoutPosY;
+            
+            if(x > maxx) maxx = x;
+            if(x < minx) minx = x;
+            if(y > maxy) maxy = y;
+            if(y < miny) miny = y;
+        }
+
+        this.graph.layoutMinX = minx;
+        this.graph.layoutMaxX = maxx;
+        this.graph.layoutMinY = miny;
+        this.graph.layoutMaxY = maxy;
+    },
+    
+    layoutIteration: function() {
+        // Forces on nodes due to node-node repulsions
+
+        var prev = new Array();
+        for(var c in this.graph.nodes) {
+            var node1 = this.graph.nodes[c];
+            for (var d in prev) {
+                var node2 = this.graph.nodes[prev[d]];
+                this.layoutRepulsive(node1, node2);
+                
+            }
+            prev.push(c);
+        }
+        
+        // Forces on nodes due to edge attractions
+        for (var i = 0; i < this.graph.edges.length; i++) {
+            var edge = this.graph.edges[i];
+            this.layoutAttractive(edge);             
+        }
+        
+        // Move by the given force
+        for (i in this.graph.nodes) {
+            var node = this.graph.nodes[i];
+            var xmove = this.c * node.layoutForceX;
+            var ymove = this.c * node.layoutForceY;
+
+            var max = this.maxVertexMovement;
+            if(xmove > max) xmove = max;
+            if(xmove < -max) xmove = -max;
+            if(ymove > max) ymove = max;
+            if(ymove < -max) ymove = -max;
+            
+            node.layoutPosX += xmove;
+            node.layoutPosY += ymove;
+            node.layoutForceX = 0;
+            node.layoutForceY = 0;
+        }
+    },
+
+    layoutRepulsive: function(node1, node2) {
+        var dx = node2.layoutPosX - node1.layoutPosX;
+        var dy = node2.layoutPosY - node1.layoutPosY;
+        var d2 = dx * dx + dy * dy;
+        if(d2 < 0.01) {
+            dx = 0.1 * Math.random() + 0.1;
+            dy = 0.1 * Math.random() + 0.1;
+            var d2 = dx * dx + dy * dy;
+        }
+        var d = Math.sqrt(d2);
+        if(d < this.maxRepulsiveForceDistance) {
+            var repulsiveForce = this.k * this.k / d;
+            node2.layoutForceX += repulsiveForce * dx / d;
+            node2.layoutForceY += repulsiveForce * dy / d;
+            node1.layoutForceX -= repulsiveForce * dx / d;
+            node1.layoutForceY -= repulsiveForce * dy / d;
+        }
+    },
+
+    layoutAttractive: function(edge) {
+        var node1 = edge.source;
+        var node2 = edge.target;
+        
+        var dx = node2.layoutPosX - node1.layoutPosX;
+        var dy = node2.layoutPosY - node1.layoutPosY;
+        var d2 = dx * dx + dy * dy;
+        if(d2 < 0.01) {
+            dx = 0.1 * Math.random() + 0.1;
+            dy = 0.1 * Math.random() + 0.1;
+            var d2 = dx * dx + dy * dy;
+        }
+        var d = Math.sqrt(d2);
+        if(d > this.maxRepulsiveForceDistance) {
+            d = this.maxRepulsiveForceDistance;
+            d2 = d * d;
+        }
+        var attractiveForce = (d2 - this.k * this.k) / this.k;
+        if(edge.attraction == undefined) edge.attraction = 1;
+        attractiveForce *= Math.log(edge.attraction) * 0.5 + 1;
+        
+        node2.layoutForceX -= attractiveForce * dx / d;
+        node2.layoutForceY -= attractiveForce * dy / d;
+        node1.layoutForceX += attractiveForce * dx / d;
+        node1.layoutForceY += attractiveForce * dy / d;
+    }
+};
+
+Graph.Layout.Ordered = function(graph, order) {
+    this.graph = graph;
+    this.order = order;
+    this.layout();
+};
+Graph.Layout.Ordered.prototype = {
+    layout: function() {
+        this.layoutPrepare();
+        this.layoutCalcBounds();
+    },
+    
+    layoutPrepare: function(order) {
+        for (i in this.graph.nodes) {
+            var node = this.graph.nodes[i];
+            node.layoutPosX = 0;
+            node.layoutPosY = 0;
+        }
+            var counter = 0;
+            for (i in this.order) {
+                var node = this.order[i];
+                node.layoutPosX = counter;
+                node.layoutPosY = Math.random();
+                counter++;
+            }
+    },
+    
+    layoutCalcBounds: function() {
+        var minx = Infinity, maxx = -Infinity, miny = Infinity, maxy = -Infinity;
+
+        for (i in this.graph.nodes) {
+            var x = this.graph.nodes[i].layoutPosX;
+            var y = this.graph.nodes[i].layoutPosY;
+            
+            if(x > maxx) maxx = x;
+            if(x < minx) minx = x;
+            if(y > maxy) maxy = y;
+            if(y < miny) miny = y;
+        }
+
+        this.graph.layoutMinX = minx;
+        this.graph.layoutMaxX = maxx;
+
+        this.graph.layoutMinY = miny;
+        this.graph.layoutMaxY = maxy;
+    }
+};
+
+/*
+ * usefull JavaScript extensions, 
+ */
+
+function log(a) {console.log&&console.log(a);}
+
+/*
+ * Raphael Tooltip Plugin
+ * - attaches an element as a tooltip to another element
+ *
+ * Usage example, adding a rectangle as a tooltip to a circle:
+ *
+ *      paper.circle(100,100,10).tooltip(paper.rect(0,0,20,30));
+ *
+ * If you want to use more shapes, you'll have to put them into a set.
+ *
+ */
+Raphael.el.tooltip = function (tp) {
+    this.tp = tp;
+    this.tp.o = {x: 0, y: 0};
+    this.tp.hide();
+    this.hover(
+        function(event){ 
+            this.mousemove(function(event){ 
+                this.tp.translate(event.clientX - 
+                                  this.tp.o.x,event.clientY - this.tp.o.y);
+                this.tp.o = {x: event.clientX, y: event.clientY};
+            });
+            this.tp.show().toFront();
+        }, 
+        function(event){
+            this.tp.hide();
+            this.unmousemove();
+        });
+    return this;
+};
+
+/* For IE */
+if (!Array.prototype.forEach)
+{
+  Array.prototype.forEach = function(fun /*, thisp*/)
+  {
+    var len = this.length;
+    if (typeof fun != "function")
+      throw new TypeError();
+
+    var thisp = arguments[1];
+    for (var i = 0; i < len; i++)
+    {
+      if (i in this)
+        fun.call(thisp, this[i], i, this);
+    }
+  };
+}
diff --git a/addons/base_diagram/static/lib/js/raphael-min.js b/addons/base_diagram/static/lib/js/raphael-min.js
new file mode 100644
index 00000000000..8718b5bc749
--- /dev/null
+++ b/addons/base_diagram/static/lib/js/raphael-min.js
@@ -0,0 +1,7 @@
+/*
+ * Raphael 1.3.1 - JavaScript Vector Library
+ *
+ * Copyright (c) 2008 - 2009 Dmitry Baranovskiy (http://raphaeljs.com)
+ * Licensed under the MIT (http://www.opensource.org/licenses/mit-license.php) license.
+ */
+Raphael=(function(){var a=/[, ]+/,aO=/^(circle|rect|path|ellipse|text|image)$/,L=document,au=window,l={was:"Raphael" in au,is:au.Raphael},an=function(){if(an.is(arguments[0],"array")){var d=arguments[0],e=w[aW](an,d.splice(0,3+an.is(d[0],al))),S=e.set();for(var R=0,a0=d[m];R<a0;R++){var E=d[R]||{};aO.test(E.type)&&S[f](e[E.type]().attr(E));}return S;}return w[aW](an,arguments);},aT=function(){},aL="appendChild",aW="apply",aS="concat",at="",am=" ",z="split",F="click dblclick mousedown mousemove mouseout mouseover mouseup"[z](am),Q="hasOwnProperty",az="join",m="length",aY="prototype",aZ=String[aY].toLowerCase,ab=Math,g=ab.max,aI=ab.min,al="number",aA="toString",aw=Object[aY][aA],aQ={},aM=ab.pow,f="push",aU=/^(?=[\da-f]$)/,c=/^url\(['"]?([^\)]+)['"]?\)$/i,x=/^\s*((#[a-f\d]{6})|(#[a-f\d]{3})|rgb\(\s*([\d\.]+\s*,\s*[\d\.]+\s*,\s*[\d\.]+)\s*\)|rgb\(\s*([\d\.]+%\s*,\s*[\d\.]+%\s*,\s*[\d\.]+%)\s*\)|hs[bl]\(\s*([\d\.]+\s*,\s*[\d\.]+\s*,\s*[\d\.]+)\s*\)|hs[bl]\(\s*([\d\.]+%\s*,\s*[\d\.]+%\s*,\s*[\d\.]+%)\s*\))\s*$/i,O=ab.round,v="setAttribute",W=parseFloat,G=parseInt,aN=String[aY].toUpperCase,j={"clip-rect":"0 0 1e9 1e9",cursor:"default",cx:0,cy:0,fill:"#fff","fill-opacity":1,font:'10px "Arial"',"font-family":'"Arial"',"font-size":"10","font-style":"normal","font-weight":400,gradient:0,height:0,href:"http://raphaeljs.com/",opacity:1,path:"M0,0",r:0,rotation:0,rx:0,ry:0,scale:"1 1",src:"",stroke:"#000","stroke-dasharray":"","stroke-linecap":"butt","stroke-linejoin":"butt","stroke-miterlimit":0,"stroke-opacity":1,"stroke-width":1,target:"_blank","text-anchor":"middle",title:"Raphael",translation:"0 0",width:0,x:0,y:0},Z={along:"along","clip-rect":"csv",cx:al,cy:al,fill:"colour","fill-opacity":al,"font-size":al,height:al,opacity:al,path:"path",r:al,rotation:"csv",rx:al,ry:al,scale:"csv",stroke:"colour","stroke-opacity":al,"stroke-width":al,translation:"csv",width:al,x:al,y:al},aP="replace";an.version="1.3.1";an.type=(au.SVGAngle||L.implementation.hasFeature("http://www.w3.org/TR/SVG11/feature#BasicStructure","1.1")?"SVG":"VML");if(an.type=="VML"){var ag=document.createElement("div");ag.innerHTML="<!--[if vml]><br><br><![endif]-->";if(ag.childNodes[m]!=2){return null;}}an.svg=!(an.vml=an.type=="VML");aT[aY]=an[aY];an._id=0;an._oid=0;an.fn={};an.is=function(e,d){d=aZ.call(d);return((d=="object"||d=="undefined")&&typeof e==d)||(e==null&&d=="null")||aZ.call(aw.call(e).slice(8,-1))==d;};an.setWindow=function(d){au=d;L=au.document;};var aD=function(e){if(an.vml){var d=/^\s+|\s+$/g;aD=aj(function(R){var S;R=(R+at)[aP](d,at);try{var a0=new ActiveXObject("htmlfile");a0.write("<body>");a0.close();S=a0.body;}catch(a2){S=createPopup().document.body;}var i=S.createTextRange();try{S.style.color=R;var a1=i.queryCommandValue("ForeColor");a1=((a1&255)<<16)|(a1&65280)|((a1&16711680)>>>16);return"#"+("000000"+a1[aA](16)).slice(-6);}catch(a2){return"none";}});}else{var E=L.createElement("i");E.title="Rapha\xebl Colour Picker";E.style.display="none";L.body[aL](E);aD=aj(function(i){E.style.color=i;return L.defaultView.getComputedStyle(E,at).getPropertyValue("color");});}return aD(e);};an.hsb2rgb=aj(function(a3,a1,a7){if(an.is(a3,"object")&&"h" in a3&&"s" in a3&&"b" in a3){a7=a3.b;a1=a3.s;a3=a3.h;}var R,S,a8;if(a7==0){return{r:0,g:0,b:0,hex:"#000"};}if(a3>1||a1>1||a7>1){a3/=255;a1/=255;a7/=255;}var a0=~~(a3*6),a4=(a3*6)-a0,E=a7*(1-a1),e=a7*(1-(a1*a4)),a9=a7*(1-(a1*(1-a4)));R=[a7,e,E,E,a9,a7,a7][a0];S=[a9,a7,a7,e,E,E,a9][a0];a8=[E,E,a9,a7,a7,e,E][a0];R*=255;S*=255;a8*=255;var a5={r:R,g:S,b:a8},d=(~~R)[aA](16),a2=(~~S)[aA](16),a6=(~~a8)[aA](16);d=d[aP](aU,"0");a2=a2[aP](aU,"0");a6=a6[aP](aU,"0");a5.hex="#"+d+a2+a6;return a5;},an);an.rgb2hsb=aj(function(d,e,a1){if(an.is(d,"object")&&"r" in d&&"g" in d&&"b" in d){a1=d.b;e=d.g;d=d.r;}if(an.is(d,"string")){var a3=an.getRGB(d);d=a3.r;e=a3.g;a1=a3.b;}if(d>1||e>1||a1>1){d/=255;e/=255;a1/=255;}var a0=g(d,e,a1),i=aI(d,e,a1),R,E,S=a0;if(i==a0){return{h:0,s:0,b:a0};}else{var a2=(a0-i);E=a2/a0;if(d==a0){R=(e-a1)/a2;}else{if(e==a0){R=2+((a1-d)/a2);}else{R=4+((d-e)/a2);}}R/=6;R<0&&R++;R>1&&R--;}return{h:R,s:E,b:S};},an);var aE=/,?([achlmqrstvxz]),?/gi;an._path2string=function(){return this.join(",")[aP](aE,"$1");};function aj(E,e,d){function i(){var R=Array[aY].slice.call(arguments,0),a0=R[az]("\u25ba"),S=i.cache=i.cache||{},a1=i.count=i.count||[];if(S[Q](a0)){return d?d(S[a0]):S[a0];}a1[m]>=1000&&delete S[a1.shift()];a1[f](a0);S[a0]=E[aW](e,R);return d?d(S[a0]):S[a0];}return i;}an.getRGB=aj(function(d){if(!d||!!((d=d+at).indexOf("-")+1)){return{r:-1,g:-1,b:-1,hex:"none",error:1};}if(d=="none"){return{r:-1,g:-1,b:-1,hex:"none"};}!(({hs:1,rg:1})[Q](d.substring(0,2))||d.charAt()=="#")&&(d=aD(d));var S,i,E,a2,a3,a0=d.match(x);if(a0){if(a0[2]){a2=G(a0[2].substring(5),16);E=G(a0[2].substring(3,5),16);i=G(a0[2].substring(1,3),16);}if(a0[3]){a2=G((a3=a0[3].charAt(3))+a3,16);E=G((a3=a0[3].charAt(2))+a3,16);i=G((a3=a0[3].charAt(1))+a3,16);}if(a0[4]){a0=a0[4][z](/\s*,\s*/);i=W(a0[0]);E=W(a0[1]);a2=W(a0[2]);}if(a0[5]){a0=a0[5][z](/\s*,\s*/);i=W(a0[0])*2.55;E=W(a0[1])*2.55;a2=W(a0[2])*2.55;}if(a0[6]){a0=a0[6][z](/\s*,\s*/);i=W(a0[0]);E=W(a0[1]);a2=W(a0[2]);return an.hsb2rgb(i,E,a2);}if(a0[7]){a0=a0[7][z](/\s*,\s*/);i=W(a0[0])*2.55;E=W(a0[1])*2.55;a2=W(a0[2])*2.55;return an.hsb2rgb(i,E,a2);}a0={r:i,g:E,b:a2};var e=(~~i)[aA](16),R=(~~E)[aA](16),a1=(~~a2)[aA](16);e=e[aP](aU,"0");R=R[aP](aU,"0");a1=a1[aP](aU,"0");a0.hex="#"+e+R+a1;return a0;}return{r:-1,g:-1,b:-1,hex:"none",error:1};},an);an.getColor=function(e){var i=this.getColor.start=this.getColor.start||{h:0,s:1,b:e||0.75},d=this.hsb2rgb(i.h,i.s,i.b);i.h+=0.075;if(i.h>1){i.h=0;i.s-=0.2;i.s<=0&&(this.getColor.start={h:0,s:1,b:i.b});}return d.hex;};an.getColor.reset=function(){delete this.start;};an.parsePathString=aj(function(d){if(!d){return null;}var i={a:7,c:6,h:1,l:2,m:2,q:4,s:4,t:2,v:1,z:0},e=[];if(an.is(d,"array")&&an.is(d[0],"array")){e=av(d);}if(!e[m]){(d+at)[aP](/([achlmqstvz])[\s,]*((-?\d*\.?\d*(?:e[-+]?\d+)?\s*,?\s*)+)/ig,function(R,E,a1){var a0=[],S=aZ.call(E);a1[aP](/(-?\d*\.?\d*(?:e[-+]?\d+)?)\s*,?\s*/ig,function(a3,a2){a2&&a0[f](+a2);});while(a0[m]>=i[S]){e[f]([E][aS](a0.splice(0,i[S])));if(!i[S]){break;}}});}e[aA]=an._path2string;return e;});an.findDotsAtSegment=function(e,d,be,bc,a0,R,a2,a1,a8){var a6=1-a8,a5=aM(a6,3)*e+aM(a6,2)*3*a8*be+a6*3*a8*a8*a0+aM(a8,3)*a2,a3=aM(a6,3)*d+aM(a6,2)*3*a8*bc+a6*3*a8*a8*R+aM(a8,3)*a1,ba=e+2*a8*(be-e)+a8*a8*(a0-2*be+e),a9=d+2*a8*(bc-d)+a8*a8*(R-2*bc+d),bd=be+2*a8*(a0-be)+a8*a8*(a2-2*a0+be),bb=bc+2*a8*(R-bc)+a8*a8*(a1-2*R+bc),a7=(1-a8)*e+a8*be,a4=(1-a8)*d+a8*bc,E=(1-a8)*a0+a8*a2,i=(1-a8)*R+a8*a1,S=(90-ab.atan((ba-bd)/(a9-bb))*180/ab.PI);(ba>bd||a9<bb)&&(S+=180);return{x:a5,y:a3,m:{x:ba,y:a9},n:{x:bd,y:bb},start:{x:a7,y:a4},end:{x:E,y:i},alpha:S};};var U=aj(function(a5){if(!a5){return{x:0,y:0,width:0,height:0};}a5=H(a5);var a2=0,a1=0,R=[],e=[],E;for(var S=0,a4=a5[m];S<a4;S++){E=a5[S];if(E[0]=="M"){a2=E[1];a1=E[2];R[f](a2);e[f](a1);}else{var a0=aC(a2,a1,E[1],E[2],E[3],E[4],E[5],E[6]);R=R[aS](a0.min.x,a0.max.x);e=e[aS](a0.min.y,a0.max.y);a2=E[5];a1=E[6];}}var d=aI[aW](0,R),a3=aI[aW](0,e);return{x:d,y:a3,width:g[aW](0,R)-d,height:g[aW](0,e)-a3};}),av=function(a0){var E=[];if(!an.is(a0,"array")||!an.is(a0&&a0[0],"array")){a0=an.parsePathString(a0);}for(var e=0,R=a0[m];e<R;e++){E[e]=[];for(var d=0,S=a0[e][m];d<S;d++){E[e][d]=a0[e][d];}}E[aA]=an._path2string;return E;},ad=aj(function(R){if(!an.is(R,"array")||!an.is(R&&R[0],"array")){R=an.parsePathString(R);}var a4=[],a6=0,a5=0,a9=0,a8=0,E=0;if(R[0][0]=="M"){a6=R[0][1];a5=R[0][2];a9=a6;a8=a5;E++;a4[f](["M",a6,a5]);}for(var a1=E,ba=R[m];a1<ba;a1++){var d=a4[a1]=[],a7=R[a1];if(a7[0]!=aZ.call(a7[0])){d[0]=aZ.call(a7[0]);switch(d[0]){case"a":d[1]=a7[1];d[2]=a7[2];d[3]=a7[3];d[4]=a7[4];d[5]=a7[5];d[6]=+(a7[6]-a6).toFixed(3);d[7]=+(a7[7]-a5).toFixed(3);break;case"v":d[1]=+(a7[1]-a5).toFixed(3);break;case"m":a9=a7[1];a8=a7[2];default:for(var a0=1,a2=a7[m];a0<a2;a0++){d[a0]=+(a7[a0]-((a0%2)?a6:a5)).toFixed(3);}}}else{d=a4[a1]=[];if(a7[0]=="m"){a9=a7[1]+a6;a8=a7[2]+a5;}for(var S=0,e=a7[m];S<e;S++){a4[a1][S]=a7[S];}}var a3=a4[a1][m];switch(a4[a1][0]){case"z":a6=a9;a5=a8;break;case"h":a6+=+a4[a1][a3-1];break;case"v":a5+=+a4[a1][a3-1];break;default:a6+=+a4[a1][a3-2];a5+=+a4[a1][a3-1];}}a4[aA]=an._path2string;return a4;},0,av),r=aj(function(R){if(!an.is(R,"array")||!an.is(R&&R[0],"array")){R=an.parsePathString(R);}var a3=[],a5=0,a4=0,a8=0,a7=0,E=0;if(R[0][0]=="M"){a5=+R[0][1];a4=+R[0][2];a8=a5;a7=a4;E++;a3[0]=["M",a5,a4];}for(var a1=E,a9=R[m];a1<a9;a1++){var d=a3[a1]=[],a6=R[a1];if(a6[0]!=aN.call(a6[0])){d[0]=aN.call(a6[0]);switch(d[0]){case"A":d[1]=a6[1];d[2]=a6[2];d[3]=a6[3];d[4]=a6[4];d[5]=a6[5];d[6]=+(a6[6]+a5);d[7]=+(a6[7]+a4);break;case"V":d[1]=+a6[1]+a4;break;case"H":d[1]=+a6[1]+a5;break;case"M":a8=+a6[1]+a5;a7=+a6[2]+a4;default:for(var a0=1,a2=a6[m];a0<a2;a0++){d[a0]=+a6[a0]+((a0%2)?a5:a4);}}}else{for(var S=0,e=a6[m];S<e;S++){a3[a1][S]=a6[S];}}switch(d[0]){case"Z":a5=a8;a4=a7;break;case"H":a5=d[1];break;case"V":a4=d[1];break;default:a5=a3[a1][a3[a1][m]-2];a4=a3[a1][a3[a1][m]-1];}}a3[aA]=an._path2string;return a3;},null,av),aX=function(e,E,d,i){return[e,E,d,i,d,i];},aK=function(e,E,a0,R,d,i){var S=1/3,a1=2/3;return[S*e+a1*a0,S*E+a1*R,S*d+a1*a0,S*i+a1*R,d,i];},K=function(a9,bE,bi,bg,ba,a4,S,a8,bD,bb){var R=ab.PI,bf=R*120/180,d=R/180*(+ba||0),bm=[],bj,bA=aj(function(bF,bI,i){var bH=bF*ab.cos(i)-bI*ab.sin(i),bG=bF*ab.sin(i)+bI*ab.cos(i);return{x:bH,y:bG};});if(!bb){bj=bA(a9,bE,-d);a9=bj.x;bE=bj.y;bj=bA(a8,bD,-d);a8=bj.x;bD=bj.y;var e=ab.cos(R/180*ba),a6=ab.sin(R/180*ba),bo=(a9-a8)/2,bn=(bE-bD)/2;bi=g(bi,ab.abs(bo));bg=g(bg,ab.abs(bn));var by=(bo*bo)/(bi*bi)+(bn*bn)/(bg*bg);if(by>1){bi=ab.sqrt(by)*bi;bg=ab.sqrt(by)*bg;}var E=bi*bi,br=bg*bg,bt=(a4==S?-1:1)*ab.sqrt(ab.abs((E*br-E*bn*bn-br*bo*bo)/(E*bn*bn+br*bo*bo))),bd=bt*bi*bn/bg+(a9+a8)/2,bc=bt*-bg*bo/bi+(bE+bD)/2,a3=ab.asin(((bE-bc)/bg).toFixed(7)),a2=ab.asin(((bD-bc)/bg).toFixed(7));a3=a9<bd?R-a3:a3;a2=a8<bd?R-a2:a2;a3<0&&(a3=R*2+a3);a2<0&&(a2=R*2+a2);if(S&&a3>a2){a3=a3-R*2;}if(!S&&a2>a3){a2=a2-R*2;}}else{a3=bb[0];a2=bb[1];bd=bb[2];bc=bb[3];}var a7=a2-a3;if(ab.abs(a7)>bf){var be=a2,bh=a8,a5=bD;a2=a3+bf*(S&&a2>a3?1:-1);a8=bd+bi*ab.cos(a2);bD=bc+bg*ab.sin(a2);bm=K(a8,bD,bi,bg,ba,0,S,bh,a5,[a2,be,bd,bc]);}a7=a2-a3;var a1=ab.cos(a3),bC=ab.sin(a3),a0=ab.cos(a2),bB=ab.sin(a2),bp=ab.tan(a7/4),bs=4/3*bi*bp,bq=4/3*bg*bp,bz=[a9,bE],bx=[a9+bs*bC,bE-bq*a1],bw=[a8+bs*bB,bD-bq*a0],bu=[a8,bD];bx[0]=2*bz[0]-bx[0];bx[1]=2*bz[1]-bx[1];if(bb){return[bx,bw,bu][aS](bm);}else{bm=[bx,bw,bu][aS](bm)[az]()[z](",");var bk=[];for(var bv=0,bl=bm[m];bv<bl;bv++){bk[bv]=bv%2?bA(bm[bv-1],bm[bv],d).y:bA(bm[bv],bm[bv+1],d).x;}return bk;}},M=function(e,d,E,i,a2,a1,a0,S,a3){var R=1-a3;return{x:aM(R,3)*e+aM(R,2)*3*a3*E+R*3*a3*a3*a2+aM(a3,3)*a0,y:aM(R,3)*d+aM(R,2)*3*a3*i+R*3*a3*a3*a1+aM(a3,3)*S};},aC=aj(function(i,d,R,E,a9,a8,a5,a2){var a7=(a9-2*R+i)-(a5-2*a9+R),a4=2*(R-i)-2*(a9-R),a1=i-R,a0=(-a4+ab.sqrt(a4*a4-4*a7*a1))/2/a7,S=(-a4-ab.sqrt(a4*a4-4*a7*a1))/2/a7,a3=[d,a2],a6=[i,a5],e;ab.abs(a0)>1000000000000&&(a0=0.5);ab.abs(S)>1000000000000&&(S=0.5);if(a0>0&&a0<1){e=M(i,d,R,E,a9,a8,a5,a2,a0);a6[f](e.x);a3[f](e.y);}if(S>0&&S<1){e=M(i,d,R,E,a9,a8,a5,a2,S);a6[f](e.x);a3[f](e.y);}a7=(a8-2*E+d)-(a2-2*a8+E);a4=2*(E-d)-2*(a8-E);a1=d-E;a0=(-a4+ab.sqrt(a4*a4-4*a7*a1))/2/a7;S=(-a4-ab.sqrt(a4*a4-4*a7*a1))/2/a7;ab.abs(a0)>1000000000000&&(a0=0.5);ab.abs(S)>1000000000000&&(S=0.5);if(a0>0&&a0<1){e=M(i,d,R,E,a9,a8,a5,a2,a0);a6[f](e.x);a3[f](e.y);}if(S>0&&S<1){e=M(i,d,R,E,a9,a8,a5,a2,S);a6[f](e.x);a3[f](e.y);}return{min:{x:aI[aW](0,a6),y:aI[aW](0,a3)},max:{x:g[aW](0,a6),y:g[aW](0,a3)}};}),H=aj(function(a9,a4){var R=r(a9),a5=a4&&r(a4),a6={x:0,y:0,bx:0,by:0,X:0,Y:0,qx:null,qy:null},d={x:0,y:0,bx:0,by:0,X:0,Y:0,qx:null,qy:null},a0=function(ba,bb){var i,bc;if(!ba){return["C",bb.x,bb.y,bb.x,bb.y,bb.x,bb.y];}!(ba[0] in {T:1,Q:1})&&(bb.qx=bb.qy=null);switch(ba[0]){case"M":bb.X=ba[1];bb.Y=ba[2];break;case"A":ba=["C"][aS](K[aW](0,[bb.x,bb.y][aS](ba.slice(1))));break;case"S":i=bb.x+(bb.x-(bb.bx||bb.x));bc=bb.y+(bb.y-(bb.by||bb.y));ba=["C",i,bc][aS](ba.slice(1));break;case"T":bb.qx=bb.x+(bb.x-(bb.qx||bb.x));bb.qy=bb.y+(bb.y-(bb.qy||bb.y));ba=["C"][aS](aK(bb.x,bb.y,bb.qx,bb.qy,ba[1],ba[2]));break;case"Q":bb.qx=ba[1];bb.qy=ba[2];ba=["C"][aS](aK(bb.x,bb.y,ba[1],ba[2],ba[3],ba[4]));break;case"L":ba=["C"][aS](aX(bb.x,bb.y,ba[1],ba[2]));break;case"H":ba=["C"][aS](aX(bb.x,bb.y,ba[1],bb.y));break;case"V":ba=["C"][aS](aX(bb.x,bb.y,bb.x,ba[1]));break;case"Z":ba=["C"][aS](aX(bb.x,bb.y,bb.X,bb.Y));break;}return ba;},e=function(ba,bb){if(ba[bb][m]>7){ba[bb].shift();var bc=ba[bb];while(bc[m]){ba.splice(bb++,0,["C"][aS](bc.splice(0,6)));}ba.splice(bb,1);a7=g(R[m],a5&&a5[m]||0);}},E=function(be,bd,bb,ba,bc){if(be&&bd&&be[bc][0]=="M"&&bd[bc][0]!="M"){bd.splice(bc,0,["M",ba.x,ba.y]);bb.bx=0;bb.by=0;bb.x=be[bc][1];bb.y=be[bc][2];a7=g(R[m],a5&&a5[m]||0);}};for(var a2=0,a7=g(R[m],a5&&a5[m]||0);a2<a7;a2++){R[a2]=a0(R[a2],a6);e(R,a2);a5&&(a5[a2]=a0(a5[a2],d));a5&&e(a5,a2);E(R,a5,a6,d,a2);E(a5,R,d,a6,a2);var a1=R[a2],a8=a5&&a5[a2],S=a1[m],a3=a5&&a8[m];a6.x=a1[S-2];a6.y=a1[S-1];a6.bx=W(a1[S-4])||a6.x;a6.by=W(a1[S-3])||a6.y;d.bx=a5&&(W(a8[a3-4])||d.x);d.by=a5&&(W(a8[a3-3])||d.y);d.x=a5&&a8[a3-2];d.y=a5&&a8[a3-1];}return a5?[R,a5]:R;},null,av),p=aj(function(a4){var a3=[];for(var a0=0,a5=a4[m];a0<a5;a0++){var e={},a2=a4[a0].match(/^([^:]*):?([\d\.]*)/);e.color=an.getRGB(a2[1]);if(e.color.error){return null;}e.color=e.color.hex;a2[2]&&(e.offset=a2[2]+"%");a3[f](e);}for(var a0=1,a5=a3[m]-1;a0<a5;a0++){if(!a3[a0].offset){var E=W(a3[a0-1].offset||0),R=0;for(var S=a0+1;S<a5;S++){if(a3[S].offset){R=a3[S].offset;break;}}if(!R){R=100;S=a5;}R=W(R);var a1=(R-E)/(S-a0+1);for(;a0<S;a0++){E+=a1;a3[a0].offset=E+"%";}}}return a3;}),ao=function(){var i,e,R,E,d;if(an.is(arguments[0],"string")||an.is(arguments[0],"object")){if(an.is(arguments[0],"string")){i=L.getElementById(arguments[0]);}else{i=arguments[0];}if(i.tagName){if(arguments[1]==null){return{container:i,width:i.style.pixelWidth||i.offsetWidth,height:i.style.pixelHeight||i.offsetHeight};}else{return{container:i,width:arguments[1],height:arguments[2]};}}}else{if(an.is(arguments[0],al)&&arguments[m]>3){return{container:1,x:arguments[0],y:arguments[1],width:arguments[2],height:arguments[3]};}}},aG=function(d,i){var e=this;for(var E in i){if(i[Q](E)&&!(E in d)){switch(typeof i[E]){case"function":(function(R){d[E]=d===e?R:function(){return R[aW](e,arguments);};})(i[E]);break;case"object":d[E]=d[E]||{};aG.call(this,d[E],i[E]);break;default:d[E]=i[E];break;}}}},ak=function(d,e){d==e.top&&(e.top=d.prev);d==e.bottom&&(e.bottom=d.next);d.next&&(d.next.prev=d.prev);d.prev&&(d.prev.next=d.next);},Y=function(d,e){if(e.top===d){return;}ak(d,e);d.next=null;d.prev=e.top;e.top.next=d;e.top=d;},k=function(d,e){if(e.bottom===d){return;}ak(d,e);d.next=e.bottom;d.prev=null;e.bottom.prev=d;e.bottom=d;},A=function(e,d,i){ak(e,i);d==i.top&&(i.top=e);d.next&&(d.next.prev=e);e.next=d.next;e.prev=d;d.next=e;},aq=function(e,d,i){ak(e,i);d==i.bottom&&(i.bottom=e);d.prev&&(d.prev.next=e);e.prev=d.prev;d.prev=e;e.next=d;},s=function(d){return function(){throw new Error("Rapha\xebl: you are calling to method \u201c"+d+"\u201d of removed object");};},ar=/^r(?:\(([^,]+?)\s*,\s*([^\)]+?)\))?/;if(an.svg){aT[aY].svgns="http://www.w3.org/2000/svg";aT[aY].xlink="http://www.w3.org/1999/xlink";var O=function(d){return +d+(~~d===d)*0.5;},V=function(S){for(var e=0,E=S[m];e<E;e++){if(aZ.call(S[e][0])!="a"){for(var d=1,R=S[e][m];d<R;d++){S[e][d]=O(S[e][d]);}}else{S[e][6]=O(S[e][6]);S[e][7]=O(S[e][7]);}}return S;},aJ=function(i,d){if(d){for(var e in d){if(d[Q](e)){i[v](e,d[e]);}}}else{return L.createElementNS(aT[aY].svgns,i);}};an[aA]=function(){return"Your browser supports SVG.\nYou are running Rapha\xebl "+this.version;};var q=function(d,E){var e=aJ("path");E.canvas&&E.canvas[aL](e);var i=new ax(e,E);i.type="path";aa(i,{fill:"none",stroke:"#000",path:d});return i;};var b=function(E,a7,d){var a4="linear",a1=0.5,S=0.5,a9=E.style;a7=(a7+at)[aP](ar,function(bb,i,bc){a4="radial";if(i&&bc){a1=W(i);S=W(bc);var ba=((S>0.5)*2-1);aM(a1-0.5,2)+aM(S-0.5,2)>0.25&&(S=ab.sqrt(0.25-aM(a1-0.5,2))*ba+0.5)&&S!=0.5&&(S=S.toFixed(5)-0.00001*ba);}return at;});a7=a7[z](/\s*\-\s*/);if(a4=="linear"){var a0=a7.shift();a0=-W(a0);if(isNaN(a0)){return null;}var R=[0,0,ab.cos(a0*ab.PI/180),ab.sin(a0*ab.PI/180)],a6=1/(g(ab.abs(R[2]),ab.abs(R[3]))||1);R[2]*=a6;R[3]*=a6;if(R[2]<0){R[0]=-R[2];R[2]=0;}if(R[3]<0){R[1]=-R[3];R[3]=0;}}var a3=p(a7);if(!a3){return null;}var e=aJ(a4+"Gradient");e.id="r"+(an._id++)[aA](36);aJ(e,a4=="radial"?{fx:a1,fy:S}:{x1:R[0],y1:R[1],x2:R[2],y2:R[3]});d.defs[aL](e);for(var a2=0,a8=a3[m];a2<a8;a2++){var a5=aJ("stop");aJ(a5,{offset:a3[a2].offset?a3[a2].offset:!a2?"0%":"100%","stop-color":a3[a2].color||"#fff"});e[aL](a5);}aJ(E,{fill:"url(#"+e.id+")",opacity:1,"fill-opacity":1});a9.fill=at;a9.opacity=1;a9.fillOpacity=1;return 1;};var N=function(e){var d=e.getBBox();aJ(e.pattern,{patternTransform:an.format("translate({0},{1})",d.x,d.y)});};var aa=function(a6,bf){var a9={"":[0],none:[0],"-":[3,1],".":[1,1],"-.":[3,1,1,1],"-..":[3,1,1,1,1,1],". ":[1,3],"- ":[4,3],"--":[8,3],"- .":[4,3,1,3],"--.":[8,3,1,3],"--..":[8,3,1,3,1,3]},bb=a6.node,a7=a6.attrs,a3=a6.rotate(),S=function(bm,bl){bl=a9[aZ.call(bl)];if(bl){var bj=bm.attrs["stroke-width"]||"1",bh={round:bj,square:bj,butt:0}[bm.attrs["stroke-linecap"]||bf["stroke-linecap"]]||0,bk=[];var bi=bl[m];while(bi--){bk[bi]=bl[bi]*bj+((bi%2)?1:-1)*bh;}aJ(bb,{"stroke-dasharray":bk[az](",")});}};bf[Q]("rotation")&&(a3=bf.rotation);var a2=(a3+at)[z](a);if(!(a2.length-1)){a2=null;}else{a2[1]=+a2[1];a2[2]=+a2[2];}W(a3)&&a6.rotate(0,true);for(var ba in bf){if(bf[Q](ba)){if(!j[Q](ba)){continue;}var a8=bf[ba];a7[ba]=a8;switch(ba){case"rotation":a6.rotate(a8,true);break;case"href":case"title":case"target":var bd=bb.parentNode;if(aZ.call(bd.tagName)!="a"){var E=aJ("a");bd.insertBefore(E,bb);E[aL](bb);bd=E;}bd.setAttributeNS(a6.paper.xlink,ba,a8);break;case"cursor":bb.style.cursor=a8;break;case"clip-rect":var e=(a8+at)[z](a);if(e[m]==4){a6.clip&&a6.clip.parentNode.parentNode.removeChild(a6.clip.parentNode);var i=aJ("clipPath"),bc=aJ("rect");i.id="r"+(an._id++)[aA](36);aJ(bc,{x:e[0],y:e[1],width:e[2],height:e[3]});i[aL](bc);a6.paper.defs[aL](i);aJ(bb,{"clip-path":"url(#"+i.id+")"});a6.clip=bc;}if(!a8){var be=L.getElementById(bb.getAttribute("clip-path")[aP](/(^url\(#|\)$)/g,at));be&&be.parentNode.removeChild(be);aJ(bb,{"clip-path":at});delete a6.clip;}break;case"path":if(a8&&a6.type=="path"){a7.path=V(r(a8));aJ(bb,{d:a7.path});}break;case"width":bb[v](ba,a8);if(a7.fx){ba="x";a8=a7.x;}else{break;}case"x":if(a7.fx){a8=-a7.x-(a7.width||0);}case"rx":if(ba=="rx"&&a6.type=="rect"){break;}case"cx":a2&&(ba=="x"||ba=="cx")&&(a2[1]+=a8-a7[ba]);bb[v](ba,O(a8));a6.pattern&&N(a6);break;case"height":bb[v](ba,a8);if(a7.fy){ba="y";a8=a7.y;}else{break;}case"y":if(a7.fy){a8=-a7.y-(a7.height||0);}case"ry":if(ba=="ry"&&a6.type=="rect"){break;}case"cy":a2&&(ba=="y"||ba=="cy")&&(a2[2]+=a8-a7[ba]);bb[v](ba,O(a8));a6.pattern&&N(a6);break;case"r":if(a6.type=="rect"){aJ(bb,{rx:a8,ry:a8});}else{bb[v](ba,a8);}break;case"src":if(a6.type=="image"){bb.setAttributeNS(a6.paper.xlink,"href",a8);}break;case"stroke-width":bb.style.strokeWidth=a8;bb[v](ba,a8);if(a7["stroke-dasharray"]){S(a6,a7["stroke-dasharray"]);}break;case"stroke-dasharray":S(a6,a8);break;case"translation":var a0=(a8+at)[z](a);a0[0]=+a0[0]||0;a0[1]=+a0[1]||0;if(a2){a2[1]+=a0[0];a2[2]+=a0[1];}t.call(a6,a0[0],a0[1]);break;case"scale":var a0=(a8+at)[z](a);a6.scale(+a0[0]||1,+a0[1]||+a0[0]||1,+a0[2]||null,+a0[3]||null);break;case"fill":var R=(a8+at).match(c);if(R){var i=aJ("pattern"),a5=aJ("image");i.id="r"+(an._id++)[aA](36);aJ(i,{x:0,y:0,patternUnits:"userSpaceOnUse",height:1,width:1});aJ(a5,{x:0,y:0});a5.setAttributeNS(a6.paper.xlink,"href",R[1]);i[aL](a5);var bg=L.createElement("img");bg.style.cssText="position:absolute;left:-9999em;top-9999em";bg.onload=function(){aJ(i,{width:this.offsetWidth,height:this.offsetHeight});aJ(a5,{width:this.offsetWidth,height:this.offsetHeight});L.body.removeChild(this);a6.paper.safari();};L.body[aL](bg);bg.src=R[1];a6.paper.defs[aL](i);bb.style.fill="url(#"+i.id+")";aJ(bb,{fill:"url(#"+i.id+")"});a6.pattern=i;a6.pattern&&N(a6);break;}if(!an.getRGB(a8).error){delete bf.gradient;delete a7.gradient;!an.is(a7.opacity,"undefined")&&an.is(bf.opacity,"undefined")&&aJ(bb,{opacity:a7.opacity});!an.is(a7["fill-opacity"],"undefined")&&an.is(bf["fill-opacity"],"undefined")&&aJ(bb,{"fill-opacity":a7["fill-opacity"]});}else{if((({circle:1,ellipse:1})[Q](a6.type)||(a8+at).charAt()!="r")&&b(bb,a8,a6.paper)){a7.gradient=a8;a7.fill="none";break;}}case"stroke":bb[v](ba,an.getRGB(a8).hex);break;case"gradient":(({circle:1,ellipse:1})[Q](a6.type)||(a8+at).charAt()!="r")&&b(bb,a8,a6.paper);break;case"opacity":case"fill-opacity":if(a7.gradient){var d=L.getElementById(bb.getAttribute("fill")[aP](/^url\(#|\)$/g,at));if(d){var a1=d.getElementsByTagName("stop");a1[a1[m]-1][v]("stop-opacity",a8);}break;}default:ba=="font-size"&&(a8=G(a8,10)+"px");var a4=ba[aP](/(\-.)/g,function(bh){return aN.call(bh.substring(1));});bb.style[a4]=a8;bb[v](ba,a8);break;}}}D(a6,bf);if(a2){a6.rotate(a2.join(am));}else{W(a3)&&a6.rotate(a3,true);}};var h=1.2;var D=function(d,R){if(d.type!="text"||!(R[Q]("text")||R[Q]("font")||R[Q]("font-size")||R[Q]("x")||R[Q]("y"))){return;}var a3=d.attrs,e=d.node,a5=e.firstChild?G(L.defaultView.getComputedStyle(e.firstChild,at).getPropertyValue("font-size"),10):10;if(R[Q]("text")){a3.text=R.text;while(e.firstChild){e.removeChild(e.firstChild);}var E=(R.text+at)[z]("\n");for(var S=0,a4=E[m];S<a4;S++){if(E[S]){var a1=aJ("tspan");S&&aJ(a1,{dy:a5*h,x:a3.x});a1[aL](L.createTextNode(E[S]));e[aL](a1);}}}else{var E=e.getElementsByTagName("tspan");for(var S=0,a4=E[m];S<a4;S++){S&&aJ(E[S],{dy:a5*h,x:a3.x});}}aJ(e,{y:a3.y});var a0=d.getBBox(),a2=a3.y-(a0.y+a0.height/2);a2&&isFinite(a2)&&aJ(e,{y:a3.y+a2});};var ax=function(e,d){var E=0,i=0;this[0]=e;this.id=an._oid++;this.node=e;e.raphael=this;this.paper=d;this.attrs=this.attrs||{};this.transformations=[];this._={tx:0,ty:0,rt:{deg:0,cx:0,cy:0},sx:1,sy:1};!d.bottom&&(d.bottom=this);this.prev=d.top;d.top&&(d.top.next=this);d.top=this;this.next=null;};ax[aY].rotate=function(e,d,E){if(this.removed){return this;}if(e==null){if(this._.rt.cx){return[this._.rt.deg,this._.rt.cx,this._.rt.cy][az](am);}return this._.rt.deg;}var i=this.getBBox();e=(e+at)[z](a);if(e[m]-1){d=W(e[1]);E=W(e[2]);}e=W(e[0]);if(d!=null){this._.rt.deg=e;}else{this._.rt.deg+=e;}(E==null)&&(d=null);this._.rt.cx=d;this._.rt.cy=E;d=d==null?i.x+i.width/2:d;E=E==null?i.y+i.height/2:E;if(this._.rt.deg){this.transformations[0]=an.format("rotate({0} {1} {2})",this._.rt.deg,d,E);this.clip&&aJ(this.clip,{transform:an.format("rotate({0} {1} {2})",-this._.rt.deg,d,E)});}else{this.transformations[0]=at;this.clip&&aJ(this.clip,{transform:at});}aJ(this.node,{transform:this.transformations[az](am)});return this;};ax[aY].hide=function(){!this.removed&&(this.node.style.display="none");return this;};ax[aY].show=function(){!this.removed&&(this.node.style.display="");return this;};ax[aY].remove=function(){if(this.removed){return;}ak(this,this.paper);this.node.parentNode.removeChild(this.node);for(var d in this){delete this[d];}this.removed=true;};ax[aY].getBBox=function(){if(this.removed){return this;}if(this.type=="path"){return U(this.attrs.path);}if(this.node.style.display=="none"){this.show();var E=true;}var a1={};try{a1=this.node.getBBox();}catch(S){}finally{a1=a1||{};}if(this.type=="text"){a1={x:a1.x,y:Infinity,width:0,height:0};for(var d=0,R=this.node.getNumberOfChars();d<R;d++){var a0=this.node.getExtentOfChar(d);(a0.y<a1.y)&&(a1.y=a0.y);(a0.y+a0.height-a1.y>a1.height)&&(a1.height=a0.y+a0.height-a1.y);(a0.x+a0.width-a1.x>a1.width)&&(a1.width=a0.x+a0.width-a1.x);}}E&&this.hide();return a1;};ax[aY].attr=function(){if(this.removed){return this;}if(arguments[m]==0){var R={};for(var E in this.attrs){if(this.attrs[Q](E)){R[E]=this.attrs[E];}}this._.rt.deg&&(R.rotation=this.rotate());(this._.sx!=1||this._.sy!=1)&&(R.scale=this.scale());R.gradient&&R.fill=="none"&&(R.fill=R.gradient)&&delete R.gradient;return R;}if(arguments[m]==1&&an.is(arguments[0],"string")){if(arguments[0]=="translation"){return t.call(this);}if(arguments[0]=="rotation"){return this.rotate();}if(arguments[0]=="scale"){return this.scale();}if(arguments[0]=="fill"&&this.attrs.fill=="none"&&this.attrs.gradient){return this.attrs.gradient;}return this.attrs[arguments[0]];}if(arguments[m]==1&&an.is(arguments[0],"array")){var d={};for(var e in arguments[0]){if(arguments[0][Q](e)){d[arguments[0][e]]=this.attrs[arguments[0][e]];}}return d;}if(arguments[m]==2){var S={};S[arguments[0]]=arguments[1];aa(this,S);}else{if(arguments[m]==1&&an.is(arguments[0],"object")){aa(this,arguments[0]);}}return this;};ax[aY].toFront=function(){if(this.removed){return this;}this.node.parentNode[aL](this.node);var d=this.paper;d.top!=this&&Y(this,d);return this;};ax[aY].toBack=function(){if(this.removed){return this;}if(this.node.parentNode.firstChild!=this.node){this.node.parentNode.insertBefore(this.node,this.node.parentNode.firstChild);k(this,this.paper);var d=this.paper;}return this;};ax[aY].insertAfter=function(d){if(this.removed){return this;}var e=d.node;if(e.nextSibling){e.parentNode.insertBefore(this.node,e.nextSibling);}else{e.parentNode[aL](this.node);}A(this,d,this.paper);return this;};ax[aY].insertBefore=function(d){if(this.removed){return this;}var e=d.node;e.parentNode.insertBefore(this.node,e);aq(this,d,this.paper);return this;};var P=function(e,d,S,R){d=O(d);S=O(S);var E=aJ("circle");e.canvas&&e.canvas[aL](E);var i=new ax(E,e);i.attrs={cx:d,cy:S,r:R,fill:"none",stroke:"#000"};i.type="circle";aJ(E,i.attrs);return i;};var aF=function(i,d,a1,e,S,a0){d=O(d);a1=O(a1);var R=aJ("rect");i.canvas&&i.canvas[aL](R);var E=new ax(R,i);E.attrs={x:d,y:a1,width:e,height:S,r:a0||0,rx:a0||0,ry:a0||0,fill:"none",stroke:"#000"};E.type="rect";aJ(R,E.attrs);return E;};var ai=function(e,d,a0,S,R){d=O(d);a0=O(a0);var E=aJ("ellipse");e.canvas&&e.canvas[aL](E);var i=new ax(E,e);i.attrs={cx:d,cy:a0,rx:S,ry:R,fill:"none",stroke:"#000"};i.type="ellipse";aJ(E,i.attrs);return i;};var o=function(i,a0,d,a1,e,S){var R=aJ("image");aJ(R,{x:d,y:a1,width:e,height:S,preserveAspectRatio:"none"});R.setAttributeNS(i.xlink,"href",a0);i.canvas&&i.canvas[aL](R);var E=new ax(R,i);E.attrs={x:d,y:a1,width:e,height:S,src:a0};E.type="image";return E;};var X=function(e,d,S,R){var E=aJ("text");aJ(E,{x:d,y:S,"text-anchor":"middle"});e.canvas&&e.canvas[aL](E);var i=new ax(E,e);i.attrs={x:d,y:S,"text-anchor":"middle",text:R,font:j.font,stroke:"none",fill:"#000"};i.type="text";aa(i,i.attrs);return i;};var aV=function(e,d){this.width=e||this.width;this.height=d||this.height;this.canvas[v]("width",this.width);this.canvas[v]("height",this.height);return this;};var w=function(){var E=ao[aW](null,arguments),i=E&&E.container,e=E.x,a0=E.y,R=E.width,d=E.height;if(!i){throw new Error("SVG container not found.");}var S=aJ("svg");R=R||512;d=d||342;aJ(S,{xmlns:"http://www.w3.org/2000/svg",version:1.1,width:R,height:d});if(i==1){S.style.cssText="position:absolute;left:"+e+"px;top:"+a0+"px";L.body[aL](S);}else{if(i.firstChild){i.insertBefore(S,i.firstChild);}else{i[aL](S);}}i=new aT;i.width=R;i.height=d;i.canvas=S;aG.call(i,i,an.fn);i.clear();return i;};aT[aY].clear=function(){var d=this.canvas;while(d.firstChild){d.removeChild(d.firstChild);}this.bottom=this.top=null;(this.desc=aJ("desc"))[aL](L.createTextNode("Created with Rapha\xebl"));d[aL](this.desc);d[aL](this.defs=aJ("defs"));};aT[aY].remove=function(){this.canvas.parentNode&&this.canvas.parentNode.removeChild(this.canvas);for(var d in this){this[d]=s(d);}};}if(an.vml){var aH=function(a8){var a5=/[ahqstv]/ig,a0=r;(a8+at).match(a5)&&(a0=H);a5=/[clmz]/g;if(a0==r&&!(a8+at).match(a5)){var e={M:"m",L:"l",C:"c",Z:"x",m:"t",l:"r",c:"v",z:"x"},R=/([clmz]),?([^clmz]*)/gi,S=/-?[^,\s-]+/g;var a4=(a8+at)[aP](R,function(a9,bb,i){var ba=[];i[aP](S,function(bc){ba[f](O(bc));});return e[bb]+ba;});return a4;}var a6=a0(a8),E,a4=[],d;for(var a2=0,a7=a6[m];a2<a7;a2++){E=a6[a2];d=aZ.call(a6[a2][0]);d=="z"&&(d="x");for(var a1=1,a3=E[m];a1<a3;a1++){d+=O(E[a1])+(a1!=a3-1?",":at);}a4[f](d);}return a4[az](am);};an[aA]=function(){return"Your browser doesn\u2019t support SVG. Falling down to VML.\nYou are running Rapha\xebl "+this.version;};var q=function(d,S){var E=ah("group");E.style.cssText="position:absolute;left:0;top:0;width:"+S.width+"px;height:"+S.height+"px";E.coordsize=S.coordsize;E.coordorigin=S.coordorigin;var i=ah("shape"),e=i.style;e.width=S.width+"px";e.height=S.height+"px";i.coordsize=this.coordsize;i.coordorigin=this.coordorigin;E[aL](i);var R=new ax(i,E,S);R.isAbsolute=true;R.type="path";R.path=[];R.Path=at;d&&aa(R,{fill:"none",stroke:"#000",path:d});S.canvas[aL](E);return R;};var aa=function(a3,a8){a3.attrs=a3.attrs||{};var a6=a3.node,a9=a3.attrs,a0=a6.style,E,bd=a3;for(var a1 in a8){if(a8[Q](a1)){a9[a1]=a8[a1];}}a8.href&&(a6.href=a8.href);a8.title&&(a6.title=a8.title);a8.target&&(a6.target=a8.target);a8.cursor&&(a0.cursor=a8.cursor);if(a8.path&&a3.type=="path"){a9.path=a8.path;a6.path=aH(a9.path);}if(a8.rotation!=null){a3.rotate(a8.rotation,true);}if(a8.translation){E=(a8.translation+at)[z](a);t.call(a3,E[0],E[1]);if(a3._.rt.cx!=null){a3._.rt.cx+=+E[0];a3._.rt.cy+=+E[1];a3.setBox(a3.attrs,E[0],E[1]);}}if(a8.scale){E=(a8.scale+at)[z](a);a3.scale(+E[0]||1,+E[1]||+E[0]||1,+E[2]||null,+E[3]||null);}if("clip-rect" in a8){var d=(a8["clip-rect"]+at)[z](a);if(d[m]==4){d[2]=+d[2]+(+d[0]);d[3]=+d[3]+(+d[1]);var a2=a6.clipRect||L.createElement("div"),bc=a2.style,S=a6.parentNode;bc.clip=an.format("rect({1}px {2}px {3}px {0}px)",d);if(!a6.clipRect){bc.position="absolute";bc.top=0;bc.left=0;bc.width=a3.paper.width+"px";bc.height=a3.paper.height+"px";S.parentNode.insertBefore(a2,S);a2[aL](S);a6.clipRect=a2;}}if(!a8["clip-rect"]){a6.clipRect&&(a6.clipRect.style.clip=at);}}if(a3.type=="image"&&a8.src){a6.src=a8.src;}if(a3.type=="image"&&a8.opacity){a6.filterOpacity=" progid:DXImageTransform.Microsoft.Alpha(opacity="+(a8.opacity*100)+")";a0.filter=(a6.filterMatrix||at)+(a6.filterOpacity||at);}a8.font&&(a0.font=a8.font);a8["font-family"]&&(a0.fontFamily='"'+a8["font-family"][z](",")[0][aP](/^['"]+|['"]+$/g,at)+'"');a8["font-size"]&&(a0.fontSize=a8["font-size"]);a8["font-weight"]&&(a0.fontWeight=a8["font-weight"]);a8["font-style"]&&(a0.fontStyle=a8["font-style"]);if(a8.opacity!=null||a8["stroke-width"]!=null||a8.fill!=null||a8.stroke!=null||a8["stroke-width"]!=null||a8["stroke-opacity"]!=null||a8["fill-opacity"]!=null||a8["stroke-dasharray"]!=null||a8["stroke-miterlimit"]!=null||a8["stroke-linejoin"]!=null||a8["stroke-linecap"]!=null){a6=a3.shape||a6;var a7=(a6.getElementsByTagName("fill")&&a6.getElementsByTagName("fill")[0]),ba=false;!a7&&(ba=a7=ah("fill"));if("fill-opacity" in a8||"opacity" in a8){var e=((+a9["fill-opacity"]+1||2)-1)*((+a9.opacity+1||2)-1);e<0&&(e=0);e>1&&(e=1);a7.opacity=e;}a8.fill&&(a7.on=true);if(a7.on==null||a8.fill=="none"){a7.on=false;}if(a7.on&&a8.fill){var i=a8.fill.match(c);if(i){a7.src=i[1];a7.type="tile";}else{a7.color=an.getRGB(a8.fill).hex;a7.src=at;a7.type="solid";if(an.getRGB(a8.fill).error&&(bd.type in {circle:1,ellipse:1}||(a8.fill+at).charAt()!="r")&&b(bd,a8.fill)){a9.fill="none";a9.gradient=a8.fill;}}}ba&&a6[aL](a7);var R=(a6.getElementsByTagName("stroke")&&a6.getElementsByTagName("stroke")[0]),bb=false;!R&&(bb=R=ah("stroke"));if((a8.stroke&&a8.stroke!="none")||a8["stroke-width"]||a8["stroke-opacity"]!=null||a8["stroke-dasharray"]||a8["stroke-miterlimit"]||a8["stroke-linejoin"]||a8["stroke-linecap"]){R.on=true;}(a8.stroke=="none"||R.on==null||a8.stroke==0||a8["stroke-width"]==0)&&(R.on=false);R.on&&a8.stroke&&(R.color=an.getRGB(a8.stroke).hex);var e=((+a9["stroke-opacity"]+1||2)-1)*((+a9.opacity+1||2)-1),a4=(W(a8["stroke-width"])||1)*0.75;e<0&&(e=0);e>1&&(e=1);a8["stroke-width"]==null&&(a4=a9["stroke-width"]);a8["stroke-width"]&&(R.weight=a4);a4&&a4<1&&(e*=a4)&&(R.weight=1);R.opacity=e;a8["stroke-linejoin"]&&(R.joinstyle=a8["stroke-linejoin"]||"miter");R.miterlimit=a8["stroke-miterlimit"]||8;a8["stroke-linecap"]&&(R.endcap=a8["stroke-linecap"]=="butt"?"flat":a8["stroke-linecap"]=="square"?"square":"round");if(a8["stroke-dasharray"]){var a5={"-":"shortdash",".":"shortdot","-.":"shortdashdot","-..":"shortdashdotdot",". ":"dot","- ":"dash","--":"longdash","- .":"dashdot","--.":"longdashdot","--..":"longdashdotdot"};R.dashstyle=a5[Q](a8["stroke-dasharray"])?a5[a8["stroke-dasharray"]]:at;}bb&&a6[aL](R);}if(bd.type=="text"){var a0=bd.paper.span.style;a9.font&&(a0.font=a9.font);a9["font-family"]&&(a0.fontFamily=a9["font-family"]);a9["font-size"]&&(a0.fontSize=a9["font-size"]);a9["font-weight"]&&(a0.fontWeight=a9["font-weight"]);a9["font-style"]&&(a0.fontStyle=a9["font-style"]);bd.node.string&&(bd.paper.span.innerHTML=(bd.node.string+at)[aP](/</g,"&#60;")[aP](/&/g,"&#38;")[aP](/\n/g,"<br>"));bd.W=a9.w=bd.paper.span.offsetWidth;bd.H=a9.h=bd.paper.span.offsetHeight;bd.X=a9.x;bd.Y=a9.y+O(bd.H/2);switch(a9["text-anchor"]){case"start":bd.node.style["v-text-align"]="left";bd.bbx=O(bd.W/2);break;case"end":bd.node.style["v-text-align"]="right";bd.bbx=-O(bd.W/2);break;default:bd.node.style["v-text-align"]="center";break;}}};var b=function(d,a1){d.attrs=d.attrs||{};var a2=d.attrs,a4=d.node.getElementsByTagName("fill"),S="linear",a0=".5 .5";d.attrs.gradient=a1;a1=(a1+at)[aP](ar,function(a6,a7,i){S="radial";if(a7&&i){a7=W(a7);i=W(i);aM(a7-0.5,2)+aM(i-0.5,2)>0.25&&(i=ab.sqrt(0.25-aM(a7-0.5,2))*((i>0.5)*2-1)+0.5);a0=a7+am+i;}return at;});a1=a1[z](/\s*\-\s*/);if(S=="linear"){var e=a1.shift();e=-W(e);if(isNaN(e)){return null;}}var R=p(a1);if(!R){return null;}d=d.shape||d.node;a4=a4[0]||ah("fill");if(R[m]){a4.on=true;a4.method="none";a4.type=(S=="radial")?"gradientradial":"gradient";a4.color=R[0].color;a4.color2=R[R[m]-1].color;var a5=[];for(var E=0,a3=R[m];E<a3;E++){R[E].offset&&a5[f](R[E].offset+am+R[E].color);}a4.colors&&(a4.colors.value=a5[m]?a5[az](","):"0% "+a4.color);if(S=="radial"){a4.focus="100%";a4.focussize=a0;a4.focusposition=a0;}else{a4.angle=(270-e)%360;}}return 1;};var ax=function(R,a0,d){var S=0,i=0,e=0,E=1;this[0]=R;this.id=an._oid++;this.node=R;R.raphael=this;this.X=0;this.Y=0;this.attrs={};this.Group=a0;this.paper=d;this._={tx:0,ty:0,rt:{deg:0},sx:1,sy:1};!d.bottom&&(d.bottom=this);this.prev=d.top;d.top&&(d.top.next=this);d.top=this;this.next=null;};ax[aY].rotate=function(e,d,i){if(this.removed){return this;}if(e==null){if(this._.rt.cx){return[this._.rt.deg,this._.rt.cx,this._.rt.cy][az](am);}return this._.rt.deg;}e=(e+at)[z](a);if(e[m]-1){d=W(e[1]);i=W(e[2]);}e=W(e[0]);if(d!=null){this._.rt.deg=e;}else{this._.rt.deg+=e;}i==null&&(d=null);this._.rt.cx=d;this._.rt.cy=i;this.setBox(this.attrs,d,i);this.Group.style.rotation=this._.rt.deg;return this;};ax[aY].setBox=function(bb,e,d){if(this.removed){return this;}var a5=this.Group.style,R=(this.shape&&this.shape.style)||this.node.style;bb=bb||{};for(var a9 in bb){if(bb[Q](a9)){this.attrs[a9]=bb[a9];}}e=e||this._.rt.cx;d=d||this._.rt.cy;var a7=this.attrs,a1,a0,a2,ba;switch(this.type){case"circle":a1=a7.cx-a7.r;a0=a7.cy-a7.r;a2=ba=a7.r*2;break;case"ellipse":a1=a7.cx-a7.rx;a0=a7.cy-a7.ry;a2=a7.rx*2;ba=a7.ry*2;break;case"rect":case"image":a1=+a7.x;a0=+a7.y;a2=a7.width||0;ba=a7.height||0;break;case"text":this.textpath.v=["m",O(a7.x),", ",O(a7.y-2),"l",O(a7.x)+1,", ",O(a7.y-2)][az](at);a1=a7.x-O(this.W/2);a0=a7.y-this.H/2;a2=this.W;ba=this.H;break;case"path":if(!this.attrs.path){a1=0;a0=0;a2=this.paper.width;ba=this.paper.height;}else{var a8=U(this.attrs.path);a1=a8.x;a0=a8.y;a2=a8.width;ba=a8.height;}break;default:a1=0;a0=0;a2=this.paper.width;ba=this.paper.height;break;}e=(e==null)?a1+a2/2:e;d=(d==null)?a0+ba/2:d;var E=e-this.paper.width/2,a4=d-this.paper.height/2;if(this.type=="path"||this.type=="text"){(a5.left!=E+"px")&&(a5.left=E+"px");(a5.top!=a4+"px")&&(a5.top=a4+"px");this.X=this.type=="text"?a1:-E;this.Y=this.type=="text"?a0:-a4;this.W=a2;this.H=ba;(R.left!=-E+"px")&&(R.left=-E+"px");(R.top!=-a4+"px")&&(R.top=-a4+"px");}else{(a5.left!=E+"px")&&(a5.left=E+"px");(a5.top!=a4+"px")&&(a5.top=a4+"px");this.X=a1;this.Y=a0;this.W=a2;this.H=ba;(a5.width!=this.paper.width+"px")&&(a5.width=this.paper.width+"px");(a5.height!=this.paper.height+"px")&&(a5.height=this.paper.height+"px");(R.left!=a1-E+"px")&&(R.left=a1-E+"px");(R.top!=a0-a4+"px")&&(R.top=a0-a4+"px");(R.width!=a2+"px")&&(R.width=a2+"px");(R.height!=ba+"px")&&(R.height=ba+"px");var S=(+bb.r||0)/aI(a2,ba);if(this.type=="rect"&&this.arcsize.toFixed(4)!=S.toFixed(4)&&(S||this.arcsize)){var a6=ah("roundrect"),bc={},a9=0,a3=this.events&&this.events[m];a6.arcsize=S;a6.raphael=this;this.Group[aL](a6);this.Group.removeChild(this.node);this[0]=this.node=a6;this.arcsize=S;for(var a9 in a7){bc[a9]=a7[a9];}delete bc.scale;this.attr(bc);if(this.events){for(;a9<a3;a9++){this.events[a9].unbind=ae(this.node,this.events[a9].name,this.events[a9].f,this);}}}}};ax[aY].hide=function(){!this.removed&&(this.Group.style.display="none");return this;};ax[aY].show=function(){!this.removed&&(this.Group.style.display="block");return this;};ax[aY].getBBox=function(){if(this.removed){return this;}if(this.type=="path"){return U(this.attrs.path);}return{x:this.X+(this.bbx||0),y:this.Y,width:this.W,height:this.H};};ax[aY].remove=function(){if(this.removed){return;}ak(this,this.paper);this.node.parentNode.removeChild(this.node);this.Group.parentNode.removeChild(this.Group);this.shape&&this.shape.parentNode.removeChild(this.shape);for(var d in this){delete this[d];}this.removed=true;};ax[aY].attr=function(){if(this.removed){return this;}if(arguments[m]==0){var E={};for(var e in this.attrs){if(this.attrs[Q](e)){E[e]=this.attrs[e];}}this._.rt.deg&&(E.rotation=this.rotate());(this._.sx!=1||this._.sy!=1)&&(E.scale=this.scale());E.gradient&&E.fill=="none"&&(E.fill=E.gradient)&&delete E.gradient;return E;}if(arguments[m]==1&&an.is(arguments[0],"string")){if(arguments[0]=="translation"){return t.call(this);}if(arguments[0]=="rotation"){return this.rotate();}if(arguments[0]=="scale"){return this.scale();}if(arguments[0]=="fill"&&this.attrs.fill=="none"&&this.attrs.gradient){return this.attrs.gradient;}return this.attrs[arguments[0]];}if(this.attrs&&arguments[m]==1&&an.is(arguments[0],"array")){var d={};for(var e=0,R=arguments[0][m];e<R;e++){d[arguments[0][e]]=this.attrs[arguments[0][e]];}return d;}var S;if(arguments[m]==2){S={};S[arguments[0]]=arguments[1];}arguments[m]==1&&an.is(arguments[0],"object")&&(S=arguments[0]);if(S){if(S.text&&this.type=="text"){this.node.string=S.text;}aa(this,S);if(S.gradient&&(({circle:1,ellipse:1})[Q](this.type)||(S.gradient+at).charAt()!="r")){b(this,S.gradient);}(this.type!="path"||this._.rt.deg)&&this.setBox(this.attrs);}return this;};ax[aY].toFront=function(){!this.removed&&this.Group.parentNode[aL](this.Group);this.paper.top!=this&&Y(this,this.paper);return this;};ax[aY].toBack=function(){if(this.removed){return this;}if(this.Group.parentNode.firstChild!=this.Group){this.Group.parentNode.insertBefore(this.Group,this.Group.parentNode.firstChild);k(this,this.paper);}return this;};ax[aY].insertAfter=function(d){if(this.removed){return this;}if(d.Group.nextSibling){d.Group.parentNode.insertBefore(this.Group,d.Group.nextSibling);}else{d.Group.parentNode[aL](this.Group);}A(this,d,this.paper);return this;};ax[aY].insertBefore=function(d){if(this.removed){return this;}d.Group.parentNode.insertBefore(this.Group,d.Group);aq(this,d,this.paper);return this;};var P=function(e,d,a1,S){var R=ah("group"),a0=ah("oval"),i=a0.style;R.style.cssText="position:absolute;left:0;top:0;width:"+e.width+"px;height:"+e.height+"px";R.coordsize=e.coordsize;R.coordorigin=e.coordorigin;R[aL](a0);var E=new ax(a0,R,e);E.type="circle";aa(E,{stroke:"#000",fill:"none"});E.attrs.cx=d;E.attrs.cy=a1;E.attrs.r=S;E.setBox({x:d-S,y:a1-S,width:S*2,height:S*2});e.canvas[aL](R);return E;},aF=function(e,a1,a0,a2,E,d){var R=ah("group"),i=ah("roundrect"),a3=(+d||0)/(aI(a2,E));R.style.cssText="position:absolute;left:0;top:0;width:"+e.width+"px;height:"+e.height+"px";R.coordsize=e.coordsize;R.coordorigin=e.coordorigin;R[aL](i);i.arcsize=a3;var S=new ax(i,R,e);S.type="rect";aa(S,{stroke:"#000"});S.arcsize=a3;S.setBox({x:a1,y:a0,width:a2,height:E,r:d});e.canvas[aL](R);return S;},ai=function(d,a2,a1,i,e){var R=ah("group"),E=ah("oval"),a0=E.style;R.style.cssText="position:absolute;left:0;top:0;width:"+d.width+"px;height:"+d.height+"px";R.coordsize=d.coordsize;R.coordorigin=d.coordorigin;R[aL](E);var S=new ax(E,R,d);S.type="ellipse";aa(S,{stroke:"#000"});S.attrs.cx=a2;S.attrs.cy=a1;S.attrs.rx=i;S.attrs.ry=e;S.setBox({x:a2-i,y:a1-e,width:i*2,height:e*2});d.canvas[aL](R);return S;},o=function(e,d,a2,a1,a3,E){var R=ah("group"),i=ah("image"),a0=i.style;R.style.cssText="position:absolute;left:0;top:0;width:"+e.width+"px;height:"+e.height+"px";R.coordsize=e.coordsize;R.coordorigin=e.coordorigin;i.src=d;R[aL](i);var S=new ax(i,R,e);S.type="image";S.attrs.src=d;S.attrs.x=a2;S.attrs.y=a1;S.attrs.w=a3;S.attrs.h=E;S.setBox({x:a2,y:a1,width:a3,height:E});e.canvas[aL](R);return S;},X=function(e,a2,a1,a3){var R=ah("group"),E=ah("shape"),a0=E.style,a4=ah("path"),d=a4.style,i=ah("textpath");R.style.cssText="position:absolute;left:0;top:0;width:"+e.width+"px;height:"+e.height+"px";R.coordsize=e.coordsize;R.coordorigin=e.coordorigin;a4.v=an.format("m{0},{1}l{2},{1}",O(a2),O(a1),O(a2)+1);a4.textpathok=true;a0.width=e.width;a0.height=e.height;i.string=a3+at;i.on=true;E[aL](i);E[aL](a4);R[aL](E);var S=new ax(i,R,e);S.shape=E;S.textpath=a4;S.type="text";S.attrs.text=a3;S.attrs.x=a2;S.attrs.y=a1;S.attrs.w=1;S.attrs.h=1;aa(S,{font:j.font,stroke:"none",fill:"#000"});S.setBox();e.canvas[aL](R);return S;},aV=function(i,d){var e=this.canvas.style;i==+i&&(i+="px");d==+d&&(d+="px");e.width=i;e.height=d;e.clip="rect(0 "+i+" "+d+" 0)";return this;},ah;L.createStyleSheet().addRule(".rvml","behavior:url(#default#VML)");try{!L.namespaces.rvml&&L.namespaces.add("rvml","urn:schemas-microsoft-com:vml");ah=function(d){return L.createElement("<rvml:"+d+' class="rvml">');};}catch(af){ah=function(d){return L.createElement("<"+d+' xmlns="urn:schemas-microsoft.com:vml" class="rvml">');};}var w=function(){var i=ao[aW](null,arguments),d=i.container,a2=i.height,a3,e=i.width,a1=i.x,a0=i.y;if(!d){throw new Error("VML container not found.");}var R=new aT,S=R.canvas=L.createElement("div"),E=S.style;e=e||512;a2=a2||342;e==+e&&(e+="px");a2==+a2&&(a2+="px");R.width=1000;R.height=1000;R.coordsize="1000 1000";R.coordorigin="0 0";R.span=L.createElement("span");R.span.style.cssText="position:absolute;left:-9999em;top:-9999em;padding:0;margin:0;line-height:1;display:inline;";S[aL](R.span);E.cssText=an.format("width:{0};height:{1};position:absolute;clip:rect(0 {0} {1} 0);overflow:hidden",e,a2);if(d==1){L.body[aL](S);E.left=a1+"px";E.top=a0+"px";}else{d.style.width=e;d.style.height=a2;if(d.firstChild){d.insertBefore(S,d.firstChild);}else{d[aL](S);}}aG.call(R,R,an.fn);return R;};aT[aY].clear=function(){this.canvas.innerHTML=at;this.span=L.createElement("span");this.span.style.cssText="position:absolute;left:-9999em;top:-9999em;padding:0;margin:0;line-height:1;display:inline;";this.canvas[aL](this.span);this.bottom=this.top=null;};aT[aY].remove=function(){this.canvas.parentNode.removeChild(this.canvas);for(var d in this){this[d]=s(d);}};}if((/^Apple|^Google/).test(navigator.vendor)&&!(navigator.userAgent.indexOf("Version/4.0")+1)){aT[aY].safari=function(){var d=this.rect(-99,-99,this.width+99,this.height+99);setTimeout(function(){d.remove();});};}else{aT[aY].safari=function(){};}var ae=(function(){if(L.addEventListener){return function(R,i,e,d){var E=function(S){return e.call(d,S);};R.addEventListener(i,E,false);return function(){R.removeEventListener(i,E,false);return true;};};}else{if(L.attachEvent){return function(S,E,i,e){var R=function(a0){return i.call(e,a0||au.event);};S.attachEvent("on"+E,R);var d=function(){S.detachEvent("on"+E,R);return true;};return d;};}}})();for(var ac=F[m];ac--;){(function(d){ax[aY][d]=function(e){if(an.is(e,"function")){this.events=this.events||[];this.events.push({name:d,f:e,unbind:ae(this.shape||this.node,d,e,this)});}return this;};ax[aY]["un"+d]=function(E){var i=this.events,e=i[m];while(e--){if(i[e].name==d&&i[e].f==E){i[e].unbind();i.splice(e,1);!i.length&&delete this.events;return this;}}return this;};})(F[ac]);}ax[aY].hover=function(e,d){return this.mouseover(e).mouseout(d);};ax[aY].unhover=function(e,d){return this.unmouseover(e).unmouseout(d);};aT[aY].circle=function(d,i,e){return P(this,d||0,i||0,e||0);};aT[aY].rect=function(d,R,e,i,E){return aF(this,d||0,R||0,e||0,i||0,E||0);};aT[aY].ellipse=function(d,E,i,e){return ai(this,d||0,E||0,i||0,e||0);};aT[aY].path=function(d){d&&!an.is(d,"string")&&!an.is(d[0],"array")&&(d+=at);return q(an.format[aW](an,arguments),this);};aT[aY].image=function(E,d,R,e,i){return o(this,E||"about:blank",d||0,R||0,e||0,i||0);};aT[aY].text=function(d,i,e){return X(this,d||0,i||0,e||at);};aT[aY].set=function(d){arguments[m]>1&&(d=Array[aY].splice.call(arguments,0,arguments[m]));return new T(d);};aT[aY].setSize=aV;aT[aY].top=aT[aY].bottom=null;aT[aY].raphael=an;function u(){return this.x+am+this.y;}ax[aY].scale=function(a6,a5,E,e){if(a6==null&&a5==null){return{x:this._.sx,y:this._.sy,toString:u};}a5=a5||a6;!+a5&&(a5=a6);var ba,a8,a9,a7,bm=this.attrs;if(a6!=0){var a4=this.getBBox(),a1=a4.x+a4.width/2,R=a4.y+a4.height/2,bl=a6/this._.sx,bk=a5/this._.sy;E=(+E||E==0)?E:a1;e=(+e||e==0)?e:R;var a3=~~(a6/ab.abs(a6)),a0=~~(a5/ab.abs(a5)),be=this.node.style,bo=E+(a1-E)*bl,bn=e+(R-e)*bk;switch(this.type){case"rect":case"image":var a2=bm.width*a3*bl,bd=bm.height*a0*bk;this.attr({height:bd,r:bm.r*aI(a3*bl,a0*bk),width:a2,x:bo-a2/2,y:bn-bd/2});break;case"circle":case"ellipse":this.attr({rx:bm.rx*a3*bl,ry:bm.ry*a0*bk,r:bm.r*aI(a3*bl,a0*bk),cx:bo,cy:bn});break;case"path":var bg=ad(bm.path),bh=true;for(var bj=0,bc=bg[m];bj<bc;bj++){var bf=bg[bj],bi,S=aN.call(bf[0]);if(S=="M"&&bh){continue;}else{bh=false;}if(S=="A"){bf[bg[bj][m]-2]*=bl;bf[bg[bj][m]-1]*=bk;bf[1]*=a3*bl;bf[2]*=a0*bk;bf[5]=+(a3+a0?!!+bf[5]:!+bf[5]);}else{if(S=="H"){for(bi=1,jj=bf[m];bi<jj;bi++){bf[bi]*=bl;}}else{if(S=="V"){for(bi=1,jj=bf[m];bi<jj;bi++){bf[bi]*=bk;}}else{for(bi=1,jj=bf[m];bi<jj;bi++){bf[bi]*=(bi%2)?bl:bk;}}}}}var d=U(bg),ba=bo-d.x-d.width/2,a8=bn-d.y-d.height/2;bg[0][1]+=ba;bg[0][2]+=a8;this.attr({path:bg});break;}if(this.type in {text:1,image:1}&&(a3!=1||a0!=1)){if(this.transformations){this.transformations[2]="scale("[aS](a3,",",a0,")");this.node[v]("transform",this.transformations[az](am));ba=(a3==-1)?-bm.x-(a2||0):bm.x;a8=(a0==-1)?-bm.y-(bd||0):bm.y;this.attr({x:ba,y:a8});bm.fx=a3-1;bm.fy=a0-1;}else{this.node.filterMatrix=" progid:DXImageTransform.Microsoft.Matrix(M11="[aS](a3,", M12=0, M21=0, M22=",a0,", Dx=0, Dy=0, sizingmethod='auto expand', filtertype='bilinear')");be.filter=(this.node.filterMatrix||at)+(this.node.filterOpacity||at);}}else{if(this.transformations){this.transformations[2]=at;this.node[v]("transform",this.transformations[az](am));bm.fx=0;bm.fy=0;}else{this.node.filterMatrix=at;be.filter=(this.node.filterMatrix||at)+(this.node.filterOpacity||at);}}bm.scale=[a6,a5,E,e][az](am);this._.sx=a6;this._.sy=a5;}return this;};ax[aY].clone=function(){var d=this.attr();delete d.scale;delete d.translation;return this.paper[this.type]().attr(d);};var aB=function(d,e){return function(a9,S,a0){a9=H(a9);var a5,a4,E,a1,R="",a8={},a6,a3=0;for(var a2=0,a7=a9.length;a2<a7;a2++){E=a9[a2];if(E[0]=="M"){a5=+E[1];a4=+E[2];}else{a1=n(a5,a4,E[1],E[2],E[3],E[4],E[5],E[6]);if(a3+a1>S){if(e&&!a8.start){a6=an.findDotsAtSegment(a5,a4,E[1],E[2],E[3],E[4],E[5],E[6],(S-a3)/a1);R+=["C",a6.start.x,a6.start.y,a6.m.x,a6.m.y,a6.x,a6.y];if(a0){return R;}a8.start=R;R=["M",a6.x,a6.y+"C",a6.n.x,a6.n.y,a6.end.x,a6.end.y,E[5],E[6]][az]();a3+=a1;a5=+E[5];a4=+E[6];continue;}if(!d&&!e){a6=an.findDotsAtSegment(a5,a4,E[1],E[2],E[3],E[4],E[5],E[6],(S-a3)/a1);return{x:a6.x,y:a6.y,alpha:a6.alpha};}}a3+=a1;a5=+E[5];a4=+E[6];}R+=E;}a8.end=R;a6=d?a3:e?a8:an.findDotsAtSegment(a5,a4,E[1],E[2],E[3],E[4],E[5],E[6],1);a6.alpha&&(a6={x:a6.x,y:a6.y,alpha:a6.alpha});return a6;};},n=aj(function(E,d,a0,S,a6,a5,a4,a3){var R={x:0,y:0},a2=0;for(var a1=0;a1<1.01;a1+=0.01){var e=M(E,d,a0,S,a6,a5,a4,a3,a1);a1&&(a2+=ab.sqrt(aM(R.x-e.x,2)+aM(R.y-e.y,2)));R=e;}return a2;});var ap=aB(1),C=aB(),J=aB(0,1);ax[aY].getTotalLength=function(){if(this.type!="path"){return;}return ap(this.attrs.path);};ax[aY].getPointAtLength=function(d){if(this.type!="path"){return;}return C(this.attrs.path,d);};ax[aY].getSubpath=function(i,e){if(this.type!="path"){return;}if(ab.abs(this.getTotalLength()-e)<0.000001){return J(this.attrs.path,i).end;}var d=J(this.attrs.path,e,1);return i?J(d,i).end:d;};an.easing_formulas={linear:function(d){return d;},"<":function(d){return aM(d,3);},">":function(d){return aM(d-1,3)+1;},"<>":function(d){d=d*2;if(d<1){return aM(d,3)/2;}d-=2;return(aM(d,3)+2)/2;},backIn:function(e){var d=1.70158;return e*e*((d+1)*e-d);},backOut:function(e){e=e-1;var d=1.70158;return e*e*((d+1)*e+d)+1;},elastic:function(i){if(i==0||i==1){return i;}var e=0.3,d=e/4;return aM(2,-10*i)*ab.sin((i-d)*(2*ab.PI)/e)+1;},bounce:function(E){var e=7.5625,i=2.75,d;if(E<(1/i)){d=e*E*E;}else{if(E<(2/i)){E-=(1.5/i);d=e*E*E+0.75;}else{if(E<(2.5/i)){E-=(2.25/i);d=e*E*E+0.9375;}else{E-=(2.625/i);d=e*E*E+0.984375;}}}return d;}};var I={length:0},aR=function(){var a2=+new Date;for(var be in I){if(be!="length"&&I[Q](be)){var bj=I[be];if(bj.stop){delete I[be];I[m]--;continue;}var a0=a2-bj.start,bb=bj.ms,ba=bj.easing,bf=bj.from,a7=bj.diff,E=bj.to,a6=bj.t,a9=bj.prev||0,a1=bj.el,R=bj.callback,a8={},d;if(a0<bb){var S=an.easing_formulas[ba]?an.easing_formulas[ba](a0/bb):a0/bb;for(var bc in bf){if(bf[Q](bc)){switch(Z[bc]){case"along":d=S*bb*a7[bc];E.back&&(d=E.len-d);var bd=C(E[bc],d);a1.translate(a7.sx-a7.x||0,a7.sy-a7.y||0);a7.x=bd.x;a7.y=bd.y;a1.translate(bd.x-a7.sx,bd.y-a7.sy);E.rot&&a1.rotate(a7.r+bd.alpha,bd.x,bd.y);break;case"number":d=+bf[bc]+S*bb*a7[bc];break;case"colour":d="rgb("+[B(O(bf[bc].r+S*bb*a7[bc].r)),B(O(bf[bc].g+S*bb*a7[bc].g)),B(O(bf[bc].b+S*bb*a7[bc].b))][az](",")+")";break;case"path":d=[];for(var bh=0,a5=bf[bc][m];bh<a5;bh++){d[bh]=[bf[bc][bh][0]];for(var bg=1,bi=bf[bc][bh][m];bg<bi;bg++){d[bh][bg]=+bf[bc][bh][bg]+S*bb*a7[bc][bh][bg];}d[bh]=d[bh][az](am);}d=d[az](am);break;case"csv":switch(bc){case"translation":var a4=a7[bc][0]*(a0-a9),a3=a7[bc][1]*(a0-a9);a6.x+=a4;a6.y+=a3;d=a4+am+a3;break;case"rotation":d=+bf[bc][0]+S*bb*a7[bc][0];bf[bc][1]&&(d+=","+bf[bc][1]+","+bf[bc][2]);break;case"scale":d=[+bf[bc][0]+S*bb*a7[bc][0],+bf[bc][1]+S*bb*a7[bc][1],(2 in E[bc]?E[bc][2]:at),(3 in E[bc]?E[bc][3]:at)][az](am);break;case"clip-rect":d=[];var bh=4;while(bh--){d[bh]=+bf[bc][bh]+S*bb*a7[bc][bh];}break;}break;}a8[bc]=d;}}a1.attr(a8);a1._run&&a1._run.call(a1);}else{if(E.along){var bd=C(E.along,E.len*!E.back);a1.translate(a7.sx-(a7.x||0)+bd.x-a7.sx,a7.sy-(a7.y||0)+bd.y-a7.sy);E.rot&&a1.rotate(a7.r+bd.alpha,bd.x,bd.y);}(a6.x||a6.y)&&a1.translate(-a6.x,-a6.y);E.scale&&(E.scale=E.scale+at);a1.attr(E);delete I[be];I[m]--;a1.in_animation=null;an.is(R,"function")&&R.call(a1);}bj.prev=a0;}}an.svg&&a1&&a1.paper.safari();I[m]&&setTimeout(aR);},B=function(d){return d>255?255:(d<0?0:d);},t=function(d,i){if(d==null){return{x:this._.tx,y:this._.ty,toString:u};}this._.tx+=+d;this._.ty+=+i;switch(this.type){case"circle":case"ellipse":this.attr({cx:+d+this.attrs.cx,cy:+i+this.attrs.cy});break;case"rect":case"image":case"text":this.attr({x:+d+this.attrs.x,y:+i+this.attrs.y});break;case"path":var e=ad(this.attrs.path);e[0][1]+=+d;e[0][2]+=+i;this.attr({path:e});break;}return this;};ax[aY].animateWith=function(e,i,d,R,E){I[e.id]&&(i.start=I[e.id].start);return this.animate(i,d,R,E);};ax[aY].animateAlong=ay();ax[aY].animateAlongBack=ay(1);function ay(d){return function(E,i,e,S){var R={back:d};an.is(e,"function")?(S=e):(R.rot=e);E&&E.constructor==ax&&(E=E.attrs.path);E&&(R.along=E);return this.animate(R,i,S);};}ax[aY].onAnimation=function(d){this._run=d||0;return this;};ax[aY].animate=function(be,a5,a4,E){if(an.is(a4,"function")||!a4){E=a4||null;}var a9={},e={},a2={};for(var a6 in be){if(be[Q](a6)){if(Z[Q](a6)){a9[a6]=this.attr(a6);(a9[a6]==null)&&(a9[a6]=j[a6]);e[a6]=be[a6];switch(Z[a6]){case"along":var bc=ap(be[a6]),a7=C(be[a6],bc*!!be.back),R=this.getBBox();a2[a6]=bc/a5;a2.tx=R.x;a2.ty=R.y;a2.sx=a7.x;a2.sy=a7.y;e.rot=be.rot;e.back=be.back;e.len=bc;be.rot&&(a2.r=W(this.rotate())||0);break;case"number":a2[a6]=(e[a6]-a9[a6])/a5;break;case"colour":a9[a6]=an.getRGB(a9[a6]);var a8=an.getRGB(e[a6]);a2[a6]={r:(a8.r-a9[a6].r)/a5,g:(a8.g-a9[a6].g)/a5,b:(a8.b-a9[a6].b)/a5};break;case"path":var S=H(a9[a6],e[a6]);a9[a6]=S[0];var a3=S[1];a2[a6]=[];for(var bb=0,a1=a9[a6][m];bb<a1;bb++){a2[a6][bb]=[0];for(var ba=1,bd=a9[a6][bb][m];ba<bd;ba++){a2[a6][bb][ba]=(a3[bb][ba]-a9[a6][bb][ba])/a5;}}break;case"csv":var d=(be[a6]+at)[z](a),a0=(a9[a6]+at)[z](a);switch(a6){case"translation":a9[a6]=[0,0];a2[a6]=[d[0]/a5,d[1]/a5];break;case"rotation":a9[a6]=(a0[1]==d[1]&&a0[2]==d[2])?a0:[0,d[1],d[2]];a2[a6]=[(d[0]-a9[a6][0])/a5,0,0];break;case"scale":be[a6]=d;a9[a6]=(a9[a6]+at)[z](a);a2[a6]=[(d[0]-a9[a6][0])/a5,(d[1]-a9[a6][1])/a5,0,0];break;case"clip-rect":a9[a6]=(a9[a6]+at)[z](a);a2[a6]=[];var bb=4;while(bb--){a2[a6][bb]=(d[bb]-a9[a6][bb])/a5;}break;}e[a6]=d;}}}}this.stop();this.in_animation=1;I[this.id]={start:be.start||+new Date,ms:a5,easing:a4,from:a9,diff:a2,to:e,el:this,callback:E,t:{x:0,y:0}};++I[m]==1&&aR();return this;};ax[aY].stop=function(){I[this.id]&&I[m]--;delete I[this.id];return this;};ax[aY].translate=function(d,e){return this.attr({translation:d+" "+e});};ax[aY][aA]=function(){return"Rapha\xebl\u2019s object";};an.ae=I;var T=function(d){this.items=[];this[m]=0;if(d){for(var e=0,E=d[m];e<E;e++){if(d[e]&&(d[e].constructor==ax||d[e].constructor==T)){this[this.items[m]]=this.items[this.items[m]]=d[e];this[m]++;}}}};T[aY][f]=function(){var R,d;for(var e=0,E=arguments[m];e<E;e++){R=arguments[e];if(R&&(R.constructor==ax||R.constructor==T)){d=this.items[m];this[d]=this.items[d]=R;this[m]++;}}return this;};T[aY].pop=function(){delete this[this[m]--];return this.items.pop();};for(var y in ax[aY]){if(ax[aY][Q](y)){T[aY][y]=(function(d){return function(){for(var e=0,E=this.items[m];e<E;e++){this.items[e][d][aW](this.items[e],arguments);}return this;};})(y);}}T[aY].attr=function(e,a0){if(e&&an.is(e,"array")&&an.is(e[0],"object")){for(var d=0,S=e[m];d<S;d++){this.items[d].attr(e[d]);}}else{for(var E=0,R=this.items[m];E<R;E++){this.items[E].attr[aW](this.items[E],arguments);}}return this;};T[aY].animate=function(S,e,a2,a1){(an.is(a2,"function")||!a2)&&(a1=a2||null);var d=this.items[m],E=d,a0=this,R;a1&&(R=function(){!--d&&a1.call(a0);});this.items[--E].animate(S,e,a2||R,R);while(E--){this.items[E].animateWith(this.items[d-1],S,e,a2||R,R);}return this;};T[aY].insertAfter=function(e){var d=this.items[m];while(d--){this.items[d].insertAfter(e);}return this;};T[aY].getBBox=function(){var d=[],a0=[],e=[],R=[];for(var E=this.items[m];E--;){var S=this.items[E].getBBox();d[f](S.x);a0[f](S.y);e[f](S.x+S.width);R[f](S.y+S.height);}d=aI[aW](0,d);a0=aI[aW](0,a0);return{x:d,y:a0,width:g[aW](0,e)-d,height:g[aW](0,R)-a0};};an.registerFont=function(e){if(!e.face){return e;}this.fonts=this.fonts||{};var E={w:e.w,face:{},glyphs:{}},i=e.face["font-family"];for(var a0 in e.face){if(e.face[Q](a0)){E.face[a0]=e.face[a0];}}if(this.fonts[i]){this.fonts[i][f](E);}else{this.fonts[i]=[E];}if(!e.svg){E.face["units-per-em"]=G(e.face["units-per-em"],10);for(var R in e.glyphs){if(e.glyphs[Q](R)){var S=e.glyphs[R];E.glyphs[R]={w:S.w,k:{},d:S.d&&"M"+S.d[aP](/[mlcxtrv]/g,function(a1){return{l:"L",c:"C",x:"z",t:"m",r:"l",v:"c"}[a1]||"M";})+"z"};if(S.k){for(var d in S.k){if(S[Q](d)){E.glyphs[R].k[d]=S.k[d];}}}}}}return e;};aT[aY].getFont=function(a2,a3,e,R){R=R||"normal";e=e||"normal";a3=+a3||{normal:400,bold:700,lighter:300,bolder:800}[a3]||400;var S=an.fonts[a2];if(!S){var E=new RegExp("(^|\\s)"+a2[aP](/[^\w\d\s+!~.:_-]/g,at)+"(\\s|$)","i");for(var d in an.fonts){if(an.fonts[Q](d)){if(E.test(d)){S=an.fonts[d];break;}}}}var a0;if(S){for(var a1=0,a4=S[m];a1<a4;a1++){a0=S[a1];if(a0.face["font-weight"]==a3&&(a0.face["font-style"]==e||!a0.face["font-style"])&&a0.face["font-stretch"]==R){break;}}}return a0;};aT[aY].print=function(R,E,d,a1,a2,bb){bb=bb||"middle";var a7=this.set(),ba=(d+at)[z](at),a8=0,a4=at,bc;an.is(a1,"string")&&(a1=this.getFont(a1));if(a1){bc=(a2||16)/a1.face["units-per-em"];var e=a1.face.bbox.split(a),a0=+e[0],a3=+e[1]+(bb=="baseline"?e[3]-e[1]+(+a1.face.descent):(e[3]-e[1])/2);for(var a6=0,S=ba[m];a6<S;a6++){var a5=a6&&a1.glyphs[ba[a6-1]]||{},a9=a1.glyphs[ba[a6]];a8+=a6?(a5.w||a1.w)+(a5.k&&a5.k[ba[a6]]||0):0;a9&&a9.d&&a7[f](this.path(a9.d).attr({fill:"#000",stroke:"none",translation:[a8,0]}));}a7.scale(bc,bc,a0,a3).translate(R-a0,E-a3);}return a7;};an.format=function(i){var e=an.is(arguments[1],"array")?[0][aS](arguments[1]):arguments,d=/\{(\d+)\}/g;i&&an.is(i,"string")&&e[m]-1&&(i=i[aP](d,function(R,E){return e[++E]==null?at:e[E];}));return i||at;};an.ninja=function(){var d=Raphael;if(l.was){Raphael=l.is;}else{delete Raphael;}return d;};an.el=ax[aY];return an;})();
\ No newline at end of file
diff --git a/addons/base_diagram/static/lib/js/seedrandom.js b/addons/base_diagram/static/lib/js/seedrandom.js
new file mode 100644
index 00000000000..ce8ce8b578e
--- /dev/null
+++ b/addons/base_diagram/static/lib/js/seedrandom.js
@@ -0,0 +1,266 @@
+// seedrandom.js
+// Author: David Bau 3/11/2010
+//
+// Defines a method Math.seedrandom() that, when called, substitutes
+// an explicitly seeded RC4-based algorithm for Math.random().  Also
+// supports automatic seeding from local or network sources of entropy.
+//
+// Usage:
+//
+//   <script src=http://davidbau.com/encode/seedrandom-min.js></script>
+//
+//   Math.seedrandom('yipee'); Sets Math.random to a function that is
+//                             initialized using the given explicit seed.
+//
+//   Math.seedrandom();        Sets Math.random to a function that is
+//                             seeded using the current time, dom state,
+//                             and other accumulated local entropy.
+//                             The generated seed string is returned.
+//
+//   Math.seedrandom('yowza', true);
+//                             Seeds using the given explicit seed mixed
+//                             together with accumulated entropy.
+//
+//   <script src="http://bit.ly/srandom-512"></script>
+//                             Seeds using physical random bits downloaded
+//                             from random.org.
+//
+// Examples:
+//
+//   Math.seedrandom("hello");            // Use "hello" as the seed.
+//   document.write(Math.random());       // Always 0.5463663768140734
+//   document.write(Math.random());       // Always 0.43973793770592234
+//   var rng1 = Math.random;              // Remember the current prng.
+//
+//   var autoseed = Math.seedrandom();    // New prng with an automatic seed.
+//   document.write(Math.random());       // Pretty much unpredictable.
+//
+//   Math.random = rng1;                  // Continue "hello" prng sequence.
+//   document.write(Math.random());       // Always 0.554769432473455
+//
+//   Math.seedrandom(autoseed);           // Restart at the previous seed.
+//   document.write(Math.random());       // Repeat the 'unpredictable' value.
+//
+// Notes:
+//
+// Each time seedrandom('arg') is called, entropy from the passed seed
+// is accumulated in a pool to help generate future seeds for the
+// zero-argument form of Math.seedrandom, so entropy can be injected over
+// time by calling seedrandom with explicit data repeatedly.
+//
+// On speed - This javascript implementation of Math.random() is about
+// 3-10x slower than the built-in Math.random() because it is not native
+// code, but this is typically fast enough anyway.  Seeding is more expensive,
+// especially if you use auto-seeding.  Some details (timings on Chrome 4):
+//
+// Our Math.random()            - avg less than 0.002 milliseconds per call
+// seedrandom('explicit')       - avg less than 0.5 milliseconds per call
+// seedrandom('explicit', true) - avg less than 2 milliseconds per call
+// seedrandom()                 - avg about 38 milliseconds per call
+//
+// LICENSE (BSD):
+//
+// Copyright 2010 David Bau, all rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are met:
+// 
+//   1. Redistributions of source code must retain the above copyright
+//      notice, this list of conditions and the following disclaimer.
+//
+//   2. Redistributions in binary form must reproduce the above copyright
+//      notice, this list of conditions and the following disclaimer in the
+//      documentation and/or other materials provided with the distribution.
+// 
+//   3. Neither the name of this module nor the names of its contributors may
+//      be used to endorse or promote products derived from this software
+//      without specific prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//
+/**
+ * All code is in an anonymous closure to keep the global namespace clean.
+ *
+ * @param {number=} overflow 
+ * @param {number=} startdenom
+ */
+(function (pool, math, width, chunks, significance, overflow, startdenom) {
+
+
+//
+// seedrandom()
+// This is the seedrandom function described above.
+//
+math['seedrandom'] = function seedrandom(seed, use_entropy) {
+  var key = [];
+  var arc4;
+
+  // Flatten the seed string or build one from local entropy if needed.
+  seed = mixkey(flatten(
+    use_entropy ? [seed, pool] :
+    arguments.length ? seed :
+    [new Date().getTime(), pool, window], 3), key);
+
+  // Use the seed to initialize an ARC4 generator.
+  arc4 = new ARC4(key);
+
+  // Mix the randomness into accumulated entropy.
+  mixkey(arc4.S, pool);
+
+  // Override Math.random
+
+  // This function returns a random double in [0, 1) that contains
+  // randomness in every bit of the mantissa of the IEEE 754 value.
+
+  math['random'] = function random() {  // Closure to return a random double:
+    var n = arc4.g(chunks);             // Start with a numerator n < 2 ^ 48
+    var d = startdenom;                 //   and denominator d = 2 ^ 48.
+    var x = 0;                          //   and no 'extra last byte'.
+    while (n < significance) {          // Fill up all significant digits by
+      n = (n + x) * width;              //   shifting numerator and
+      d *= width;                       //   denominator and generating a
+      x = arc4.g(1);                    //   new least-significant-byte.
+    }
+    while (n >= overflow) {             // To avoid rounding up, before adding
+      n /= 2;                           //   last byte, shift everything
+      d /= 2;                           //   right using integer math until
+      x >>>= 1;                         //   we have exactly the desired bits.
+    }
+    return (n + x) / d;                 // Form the number within [0, 1).
+  };
+
+  // Return the seed that was used
+  return seed;
+};
+
+//
+// ARC4
+//
+// An ARC4 implementation.  The constructor takes a key in the form of
+// an array of at most (width) integers that should be 0 <= x < (width).
+//
+// The g(count) method returns a pseudorandom integer that concatenates
+// the next (count) outputs from ARC4.  Its return value is a number x
+// that is in the range 0 <= x < (width ^ count).
+//
+/** @constructor */
+function ARC4(key) {
+  var t, u, me = this, keylen = key.length;
+  var i = 0, j = me.i = me.j = me.m = 0;
+  me.S = [];
+  me.c = [];
+
+  // The empty key [] is treated as [0].
+  if (!keylen) { key = [keylen++]; }
+
+  // Set up S using the standard key scheduling algorithm.
+  while (i < width) { me.S[i] = i++; }
+  for (i = 0; i < width; i++) {
+    t = me.S[i];
+    j = lowbits(j + t + key[i % keylen]);
+    u = me.S[j];
+    me.S[i] = u;
+    me.S[j] = t;
+  }
+
+  // The "g" method returns the next (count) outputs as one number.
+  me.g = function getnext(count) {
+    var s = me.S;
+    var i = lowbits(me.i + 1); var t = s[i];
+    var j = lowbits(me.j + t); var u = s[j];
+    s[i] = u;
+    s[j] = t;
+    var r = s[lowbits(t + u)];
+    while (--count) {
+      i = lowbits(i + 1); t = s[i];
+      j = lowbits(j + t); u = s[j];
+      s[i] = u;
+      s[j] = t;
+      r = r * width + s[lowbits(t + u)];
+    }
+    me.i = i;
+    me.j = j;
+    return r;
+  };
+  // For robust unpredictability discard an initial batch of values.
+  // See http://www.rsa.com/rsalabs/node.asp?id=2009
+  me.g(width);
+}
+
+//
+// flatten()
+// Converts an object tree to nested arrays of strings.
+//
+/** @param {Object=} result 
+  * @param {string=} prop */
+function flatten(obj, depth, result, prop) {
+  result = [];
+  if (depth && typeof(obj) == 'object') {
+    for (prop in obj) {
+      if (prop.indexOf('S') < 5) {    // Avoid FF3 bug (local/sessionStorage)
+        try { result.push(flatten(obj[prop], depth - 1)); } catch (e) {}
+      }
+    }
+  }
+  return result.length ? result : '' + obj;
+}
+
+//
+// mixkey()
+// Mixes a string seed into a key that is an array of integers, and
+// returns a shortened string seed that is equivalent to the result key.
+//
+/** @param {number=} smear 
+  * @param {number=} j */
+function mixkey(seed, key, smear, j) {
+  seed += '';                         // Ensure the seed is a string
+  smear = 0;
+  for (j = 0; j < seed.length; j++) {
+    key[lowbits(j)] =
+      lowbits((smear ^= key[lowbits(j)] * 19) + seed.charCodeAt(j));
+  }
+  seed = '';
+  for (j in key) { seed += String.fromCharCode(key[j]); }
+  return seed;
+}
+
+//
+// lowbits()
+// A quick "n mod width" for width a power of 2.
+//
+function lowbits(n) { return n & (width - 1); }
+
+//
+// The following constants are related to IEEE 754 limits.
+//
+startdenom = math.pow(width, chunks);
+significance = math.pow(2, significance);
+overflow = significance * 2;
+
+//
+// When seedrandom.js is loaded, we immediately mix a few bits
+// from the built-in RNG into the entropy pool.  Because we do
+// not want to intefere with determinstic PRNG state later,
+// seedrandom will not call math.random on its own again after
+// initialization.
+//
+mixkey(math.random(), pool);
+
+// End anonymous scope, and pass initial values.
+})(
+  [],   // pool: entropy pool starts empty
+  Math, // math: package containing random, pow, and seedrandom
+  256,  // width: each RC4 output is 0 <= x < 256
+  6,    // chunks: at least six RC4 outputs for each double
+  52    // significance: there are 52 significant digits in a double
+);
diff --git a/addons/base_diagram/static/src/js/diagram.js b/addons/base_diagram/static/src/js/diagram.js
new file mode 100644
index 00000000000..af56c256ee7
--- /dev/null
+++ b/addons/base_diagram/static/src/js/diagram.js
@@ -0,0 +1,183 @@
+/*---------------------------------------------------------
+ * OpenERP base library
+ *---------------------------------------------------------*/
+
+openerp.base.diagram = function (openerp) {
+	
+openerp.base.views.add('diagram', 'openerp.base.DiagramView');
+openerp.base.DiagramView = openerp.base.Controller.extend({
+	init: function(view_manager, session, element_id, dataset, view_id){
+		this._super(session, element_id);
+        this.view_manager = view_manager;
+        this.dataset = dataset;
+        this.model = dataset.model;
+        this.view_id = view_id;
+        this.name = "";
+		this.domain = this.dataset._domain ? this.dataset._domain: [];
+		this.context = {};
+		this.ids = this.dataset.ids;
+		
+		console.log('data set>>',this.dataset)
+	},
+	start: function() {
+		this.rpc("/base_diagram/diagram/load", {"model": this.model, "view_id": this.view_id}, this.on_loaded);
+	},
+	
+	toTitleCase: function(str) {
+		return str.replace(/\w\S*/g, function(txt){return txt.charAt(0).toUpperCase() + txt.substr(1).toLowerCase();});
+	},
+	
+	on_loaded: function(result) {
+		
+		var self = this;
+		if(this.ids && this.ids.length) {
+			this.id = this.ids[0];
+		}
+		
+		this.fields_view = result.fields_view;
+		this.view_id = this.fields_view.view_id;
+		this.name = this.fields_view.name;
+		
+		this.fields = this.fields_view.fields;
+		
+		var children = this.fields_view.arch.children;
+		/*
+		 * For Nodes (Fields)
+		 */
+		this.node = '';
+		this.bgcolor = '';
+		this.shape = '';
+		this.visible_fields_nodes = [];
+		this.invisible_fields_nodes = [];
+		this.fields_nodes_string = [];
+		
+		/*
+		 * For Arraows(Connector)
+		 */
+		this.connector = '';
+		this.src_node = '';
+		this.des_node = '';
+		this.connector_fields = [];
+		this.fields_connector_string = [];
+		
+		for(ch in children) {
+			if(children[ch]['tag'] == 'node') {
+				this.node = children[ch]['attrs']['object'];
+				this.bgcolor = children[ch]['attrs']['bgcolor'] || '';
+				this.shape = children[ch]['attrs']['shape'] || '';
+				for(node_chld in children[ch]['children']) {
+					if (children[ch]['children'][node_chld]['tag'] = 'field') {
+						var ch_name = children[ch]['children'][node_chld]['attrs']['name'];
+						
+						if (children[ch]['children'][node_chld]['attrs']['invisible']) {
+							if (children[ch]['children'][node_chld]['attrs']['invisible'] == 1 && children[ch]['children'][node_chld]['attrs']['invisible'] == '1') {
+								this.invisible_fields_nodes.push(ch_name)
+							}
+						}
+						else {
+							this.visible_fields_nodes.push(ch_name);
+							var ch_node_string = this.fields[ch_name]['string'] || this.toTitleCase(ch_name);
+							this.fields_nodes_string.push(ch_node_string)
+						}
+					}
+				}
+			} else if(children[ch]['tag'] == 'arrow') {
+				this.connector = children[ch]['attrs']['object'];
+				this.src_node = children[ch]['attrs']['source'];
+				this.des_node = children[ch]['attrs']['destination'];
+				for (arrow_chld in children[ch]['children']) {
+					if (children[ch]['children'][arrow_chld]['tag'] = 'field') {
+						var arr_ch_name = children[ch]['children'][arrow_chld]['attrs']['name'];
+						var ch_node_string = this.fields[arr_ch_name]['string'] || this.toTitleCase(arr_ch_name);
+						this.fields_connector_string.push(ch_node_string);
+						this.connector_fields.push(arr_ch_name);
+					}
+				}
+			}
+		}
+		this.$element.html(QWeb.render("DiagramView", {"fields_view": this.fields_view}));
+		
+		if(this.id) {
+			this.rpc(
+			'/base_diagram/diagram/get_diagram_info',
+			{
+				'id': this.id,
+				'model': this.model,
+				'bgcolor': this.bgcolor,
+				'shape': this.shape,
+				'node': this.node,
+				'connector': this.connector,
+				'src_node': this.src_node,
+				'des_node': this.des_node,
+				'visible_node_fields': this.visible_fields_nodes,
+				'invisible_node_fields': this.invisible_fields_nodes,
+				'node_fields_string': this.fields_nodes_string,
+				'connector_fields': this.connector_fields,
+				'connector_fields_string': this.fields_connector_string
+			},
+			function(result) {
+				self.draw_diagram(result);
+			}
+			)
+		}
+	},
+	
+	draw_diagram: function(result) {
+		console.log('this>>>',this)
+		var g = new Graph();
+//		var raphel = new 
+		this.in_transition_field = result['in_transition_field'];
+		this.out_transition_field = result['out_transition_field'];
+		var res_nodes = result['nodes'];
+		var res_connectors = result['conn'];
+		
+		var render = function(r, n) {
+			var set;
+			if (n.node.shape == 'ellipse') {
+				set = r.set().push(
+				r.ellipse(n.node.x - 30, n.node.y - 13, 40, 40).attr({
+					"fill": n.node.color,
+					r: "12px",
+					"stroke-width": n.distance == 0 ? "3px" : "1px"
+				})).push(r.text(n.node.x - 30, n.node.y - 10, (n.label || n.id)));
+			} else  {
+				set = r.set().push(
+                r.rect(n.node.x-30, n.node.y-13, 60, 44).attr({"fill": n.node.color, r : "12px", "stroke-width" : n.distance == 0 ? "3px" : "1px" })).push(
+                r.text(n.point[0], n.point[1] + 10, (n.label || n.id) + "\n(" + (n.distance == undefined ? "Infinity" : n.distance) + ")"));
+				
+			}
+            return set;
+        };
+		
+		for(nd in res_nodes) {
+			var res_node = res_nodes[nd];
+			g.addNode(res_node['name'],
+			{
+				node: res_node,
+				render: render
+			});
+		}
+		
+		for(cr in res_connectors) {
+			var res_connector = res_connectors[cr];
+			g.addEdge(res_connector['source'], res_connector['destination']);
+		}
+		
+		var layouter = new Graph.Layout.Spring(g);
+		layouter.layout();
+		
+		var renderer = new Graph.Renderer.Raphael('dia-canvas', g, 800, 800);
+		renderer.draw();
+	},
+	
+	do_show: function () {
+        this.$element.show();
+    },
+	
+    do_hide: function () {
+        this.$element.hide();
+    }
+});
+};
+
+// vim:et fdc=0 fdl=0 foldnestmax=3 fdm=syntax:
diff --git a/addons/base_diagram/static/src/js/views.js b/addons/base_diagram/static/src/js/views.js
deleted file mode 100644
index 606e1e5c78c..00000000000
--- a/addons/base_diagram/static/src/js/views.js
+++ /dev/null
@@ -1,12 +0,0 @@
-/*---------------------------------------------------------
- * OpenERP base library
- *---------------------------------------------------------*/
-
-openerp.base_diagram = function(openerp) {
-
-openerp.base_diagram.DiagramView = openerp.base.Controller.extend({
-});
-
-};
-
-// vim:et fdc=0 fdl=0 foldnestmax=3 fdm=syntax:
diff --git a/addons/base_gantt/__openerp__.py b/addons/base_gantt/__openerp__.py
index d3b4dbd3885..55cec2c0863 100644
--- a/addons/base_gantt/__openerp__.py
+++ b/addons/base_gantt/__openerp__.py
@@ -1,7 +1,12 @@
 {
     "name": "Base Gantt",
     "version": "2.0",
-    "depends": [],
-    "js": ["static/*/js/*.js"],
-    "css": [],
+    "depends": ['base'],
+    "js": [
+        'static/lib/dhtmlxGantt/codebase/dhtmlxcommon.js',
+        'static/lib/dhtmlxGantt/codebase/dhtmlxgantt.js',
+        'static/src/js/gantt.js'
+    ],
+    "css": ['static/lib/dhtmlxGantt/codebase/dhtmlxgantt.css'],
+    'active': True
 }
diff --git a/addons/base_gantt/static/src/gantt.js b/addons/base_gantt/static/src/js/gantt.js
similarity index 97%
rename from addons/base_gantt/static/src/gantt.js
rename to addons/base_gantt/static/src/js/gantt.js
index 0e65fb48b5b..f8391f2744b 100644
--- a/addons/base_gantt/static/src/gantt.js
+++ b/addons/base_gantt/static/src/js/gantt.js
@@ -2,9 +2,10 @@
  * OpenERP base_gantt
  *---------------------------------------------------------*/
 
-openerp.base.gantt = function (openerp) {
-openerp.base.views.add('gantt', 'openerp.base.GanttView');
-openerp.base.GanttView = openerp.base.Controller.extend({
+openerp.base_gantt = function (openerp) {
+QWeb.add_template('/base_gantt/static/src/xml/base_gantt.xml');
+openerp.base.views.add('gantt', 'openerp.base_gantt.GanttView');
+openerp.base_gantt.GanttView = openerp.base.Controller.extend({
 
     init: function(view_manager, session, element_id, dataset, view_id) {
         this._super(session, element_id);
@@ -216,7 +217,7 @@ openerp.base.GanttView = openerp.base.Controller.extend({
                 },
                 function(result) {
                 })
-    },
+    }
 
 });
 
diff --git a/addons/base_gantt/static/src/xml/base_gantt.xml b/addons/base_gantt/static/src/xml/base_gantt.xml
new file mode 100644
index 00000000000..72c14ceb16c
--- /dev/null
+++ b/addons/base_gantt/static/src/xml/base_gantt.xml
@@ -0,0 +1,15 @@
+<template>
+  <t t-name="GanttView">
+    <h3 class="title"><t t-esc="view.fields_view.arch.attrs.string"/></h3>
+    <table class="gantt-view" width="100%" height="100%" cellspacing="0" cellpadding="0">
+      <tr>
+        <td style="width:85%">
+          <div style="width:100%;height:300px;position:relative" id="GanttDiv"/>
+        </td>
+        <td valign = "top">
+          <div id="gantt-sidebar"/>
+        </td>
+      </tr>
+    </table>
+  </t>
+</template>
diff --git a/addons/web_chat/__openerp__.py b/addons/web_chat/__openerp__.py
index 132986ff90d..3d5358702c2 100644
--- a/addons/web_chat/__openerp__.py
+++ b/addons/web_chat/__openerp__.py
@@ -1,8 +1,14 @@
 {
     "name": "Web Chat",
     "version": "2.0",
-    "depends": [],
-    "js": ["static/src/web_chat.js"],
+    "depends": ['base'],
+    "js": [
+        'static/lib/AjaxIM/js/jquery.jsonp-1.1.0.js',
+        'static/lib/AjaxIM/js/jquery.jstore-all-min.js',
+        'static/lib/AjaxIM/js/jquery.md5.js',
+        'static/lib/AjaxIM/js/im.js',
+        'static/src/js/web_chat.js'
+    ],
     "css": [],
-    'active': True,
+    'active': False,
 }
diff --git a/addons/web_chat/controllers/main.py b/addons/web_chat/controllers/main.py
index d8d33bac445..5e8d48344f8 100644
--- a/addons/web_chat/controllers/main.py
+++ b/addons/web_chat/controllers/main.py
@@ -1,8 +1,9 @@
 # -*- coding: utf-8 -*-
 import sys, time
+import cherrypy
 
 import simplejson
-
+import random
 import openerpweb
 
 #----------------------------------------------------------
@@ -11,23 +12,32 @@ import openerpweb
 class PollServerMessageQueue(object):
     def __init__(self):
         # message queue
-        self.l = []
+        self.messages = []
         # online users
         self.users = {}
         # should contains: {
         #   'user1234' : { s:1, m:"status message", timestamp: last_contact_timestamp }
         # }
-    def userlist():
-        # return user list
-        pass
+    def userlist(self, req):
+        userlist = [users for users in req.applicationsession['users']]
+        
+#        userlist = [
+#                    {"u": "Guest130205108745.47", "s": {"s": 1, "m": ""}, "g": "Users"},
+#                    {"u": "Guest130209838956.76", "s": {"s": 1, "m": ""}, "g": "Users"},
+#                ]
 
-    def write(self, m_type,  m_sender, m_recipent, m_message, m_group):
-        # appends messages to l
-        # when status message uupdate users
-        pass
-    def read(self, recpient, timestamp):
-        # return matching message
+        return userlist
+
+    def write(self, m_type,  m_from, m_to, m_message, m_group):
+        self.messages.append({'type': m_type, 'from': m_from, 'to': m_to, 'message': m_message, 'group': m_group})
+        # when status message update users
         pass
+    
+    def read(self, recipient, timestamp):
+        for msg in self.messages:
+            if msg['to'] == recipient:
+                return self.messages
+            
     def gc():
         # remove message older than 300s from self.l
         # remove dead users from self.users
@@ -38,6 +48,7 @@ class PollServer(openerpweb.Controller):
 
     @openerpweb.httprequest
     def login(self, req, **kw):
+                
         """
         --> POST http://ajaxim.com/wp-content/plugins/im/ajaxim.php/login
             Form Data
@@ -56,23 +67,32 @@ class PollServer(openerpweb.Controller):
                 ]
             }
         """
-        mq = req.applicationsession.setdefault("web_chat",PollServerMessageQueue())
-        print "chat login",kw
-        # r = 'loggued in'
+        mq = req.applicationsession.setdefault("web_chat", PollServerMessageQueue())
+        mq.messages = []
+        
+        #r = 'logged in'
         #u = generate random.randint(0,2**32)
         #s = cherrypy cookie id
         #f = mq.userlist()
-        return  """
-            {
-                "r":"logged in",
-                "u":"Guest130213866190.85",
-                "s":"f9e1811536f19ad5b9e00376f9ff1532",
-                "f":[
-                    {"u":"Guest130205108745.47","s":{"s":1,"m":""},"g":"Users"},
-                    {"u":"Guest130209838956.76","s":{"s":1,"m":""},"g":"Users"},
-                ]
-            }
-        """
+        
+#        username = 'Guest'+ str(random.randint(0, 2**32))
+#        
+#        if not req.applicationsession.get('users'):
+#            req.applicationsession['users'] = [{'u': username, 's':{'s':1, 'm':''}, 'g':'Users'}]
+#        else:
+#            req.applicationsession['users'].append({'u': username, 's':{'s':1, 'm':''}, 'g':'Users'})
+        req.applicationsession['users'] = [{'u': 'Guest1', 's':{'s':1, 'm':'111'}, 'g':'Users'},
+                                           {'u': 'Guest2', 's':{'s':1, 'm':'222'}, 'g':'Users'},
+                                           {'u': 'Guest3', 's':{'s':1, 'm':'333'}, 'g':'Users'}]
+        
+        # Temporary Guest1 is my current user
+        req.applicationsession['current_user'] = 'Guest1'
+        
+        
+        return simplejson.dumps({'r': 'logged in', 'u': 'Guest1', 's': 'f9e1811536f19ad5b9e00376f9ff1532', 
+                                 'f': [{'u': 'Guest1', 's':{'s':1, 'm':'111'}, 'g':'Users'},
+                                       {'u': 'Guest2', 's':{'s':1, 'm':'222'}, 'g':'Users'},
+                                       {'u': 'Guest3', 's':{'s':1, 'm':'333'}, 'g':'Users'}]})
 
     @openerpweb.httprequest
     def logout(self, req):
@@ -98,29 +118,34 @@ class PollServer(openerpweb.Controller):
             jsonp1302140441577([{"t":"s","s":"Guest130214038974.31","r":"","m":"0:"}]);
 
             receive message:
-            jsonp1302140191599([{"t":"m","s":"Guest130214008855.5","r":"Guest130214013134.26","m":"fuck"}]);
+            jsonp1302140191599([{"t":"m","s":"Guest130214008855.5","r":"Guest130214013134.26","m":"xxxxxx"}]);
 
             ('t' => $msg->type, 's' => $msg->from, 'r' => $msg->to, 'm' => $msg->message )
             mag type s or m
             echo '<script type="text/javascript">parent.AjaxIM.incoming('. json_encode($this->_pollParseMessages($messages)) .  ');</script>'
 
-
         """
-        # for i in range(60):
-            #r = mq.read(username,timestamp)
-            # if messages
-                # return r
-            # if no message sleep 2s and retry
-                # sleep 2
-        # else
-            # return emptylist
-        print "chat poll",kw
-        time.sleep(2)
-        # it's http://localhost:8002/web_chat/pollserver/poll?method=long?callback=jsonp1302147330483&_1302147330483=
-        return '%s([{"t":"m","s":"Guest130214008855.5","r":"Guest130214013134.26","m":"fuck"}]);'%kw.get('callback','')
-        return None
+        mq = req.applicationsession.setdefault("web_chat", PollServerMessageQueue())
+        
+        # Method: Long Poll
 
-    @openerpweb.jsonrequest
+        
+        msg = '[]'
+
+        cherrypy.response.headers['content-type'] = 'application/javascript';
+        
+        for i in range(5):
+            received_msg = mq.read('Guest1', i)
+            if received_msg:
+                msg = self._pollParseMessages(received_msg)
+                mq.messages = []
+                return '%s'%kw.get('callback', '') + '(' + str(msg) + ');'
+            else:
+                msg = '[]'
+                time.sleep(2)
+                return '%s'%kw.get('callback', '') + '(' + str(msg) + ');'
+        
+    @openerpweb.httprequest
     def send(self, req, **kw):
         """
         --> GET http://im.ajaxim.com/send?callback=jsonp1302139980022&to=Guest130205108745.47&message=test&_1302139980022=
@@ -138,11 +163,26 @@ class PollServer(openerpweb.Controller):
             return array('r' => 'error', 'e' => 'send error');
 
         """
-        print "chat send",kw
-        # mq.write()
-        return {"action": actions}
+        
+        to = kw.get('to')
+        message = kw.get('message')
+        
+        mq = req.applicationsession.setdefault("web_chat", PollServerMessageQueue())
 
-    @openerpweb.jsonrequest
+        
+        if not req.applicationsession['current_user']:
+            return dict(r='error', e='no session found')
+        
+        if not to:
+            return dict(r='error', e='no_recipient')
+        
+        if message:
+            mq.write(m_type="m",  m_from=req.applicationsession['current_user'], m_to=to, m_message=message, m_group="Users")        
+            return '%s'%kw.get('callback', '') + '(' + simplejson.dumps({'r': 'sent'}) + ')'
+        else:
+            return {'r': 'error', 'e': 'send error'}
+
+    @openerpweb.httprequest
     def status(self, req, **kw):
         """
         --> GET status call
@@ -158,8 +198,20 @@ class PollServer(openerpweb.Controller):
             return array('r' => 'error', 'e' => 'no session found');
             return array('r' => 'error', 'e' => 'status error');
         """
-        print "chat status",kw
+        mq = req.applicationsession.setdefault("web_chat", PollServerMessageQueue())
+
+        print "======== chat status ========",kw
         # mq.write()
-        return {"action": actions}
+        return {"action": ""}
+    
+    def _pollParseMessages(self, messages):
+        msg_arr = []
+        for msg in messages:
+            msg_arr.append({"t": str(msg['type']), "s": str(msg['from']), "r": str(msg['to']), "m": str(msg['message'])})
+        
+        return msg_arr
+    
+    def _sanitize(self, message):
+        return message.replace('>', '&gt;').replace('<', '&lt;').replace('&', '&amp;');
 
 
diff --git a/addons/web_chat/controllers/noz_ajaxim.py b/addons/web_chat/controllers/noz_ajaxim.py
deleted file mode 100644
index abcaded7d0d..00000000000
--- a/addons/web_chat/controllers/noz_ajaxim.py
+++ /dev/null
@@ -1,21 +0,0 @@
-
-import im
-from server import main # import the server library
-
-im = Webchat_IM()
-action = preg_replace('/^' . preg_quote($_SERVER['SCRIPT_NAME'], '/') . '\/(.+?)(\?.+)?$/', '\1', $_SERVER['REQUEST_URI']);
-
-if(substr(action, 0, 1) != '_' && method_exists(im, action))
-    if(action == 'poll') {
-        if($_GET['method'] == 'comet') {
-            im->poll('comet');
-        } else {
-            print $_GET['callback'] . '(' . json_encode(im->poll($_GET['method'])) . ')';
-        }
-    } else {
-        execute = call_user_func_array(array(im, action), $_POST);
-        if(execute)
-            print json_encode(execute !== false ? execute : array('e'=>'wrong args'));
-    }
-else
-    print json_encode(array('e'=>'no method'));
\ No newline at end of file
diff --git a/addons/web_chat/controllers/noz_im.py b/addons/web_chat/controllers/noz_im.py
deleted file mode 100644
index 392a56645fa..00000000000
--- a/addons/web_chat/controllers/noz_im.py
+++ /dev/null
@@ -1,22 +0,0 @@
-
-import openerpweb
-
-class IM(openerpweb.Controller):
-    def __init__(self):
-        super(IM, self).__init__()
-        return;
-    
-    def chat_login(self, username, password):
-        return dict()
-    
-    def chat_logout(self):
-        return dict()
-    
-    def send(self):
-        return dict()
-    
-    def status(self, status, message):
-        return dict()
-    
-    def poll(self, method):
-        return dict()
diff --git a/addons/web_chat/controllers/noz_main.py b/addons/web_chat/controllers/noz_main.py
deleted file mode 100644
index b48513eaf0c..00000000000
--- a/addons/web_chat/controllers/noz_main.py
+++ /dev/null
@@ -1,61 +0,0 @@
-# -*- coding: utf-8 -*-
-
-import simplejson
-import openerpweb
-
-from web_chat.controllers import im
-
-__all__ = ['Webchat_IM']
-
-chat_config_options = {'IM_LIBRARY': 'main',               # The IM server library.
-                       'COOKIE_NAME': 'ajaxim_session',    # Session cookie used by Ajax IM
-                       'COOKIE_PERIOD': 365                # Cookie period, in days                       
-                       }
-
-nodejs_memcache_server = ['localhost:11211']
-
-class Webchat_IM(im.IM):
-    
-    _cp_path = "/webchat/webchatim"
-    
-    def __init__(self):
-        super(Webchat_IM, self).__init__()
-        
-        return;
-    
-    @openerpweb.jsonrequest
-    def index(self, req, username="admin", password="admin"):
-                
-        if req._login:
-            self.username = req._login
-            self.uid = req._uid
-            self.db = req._db
-            
-        return;
-    
-    @openerpweb.jsonrequest
-    def chat_login(self, req, username="admin", password="admin"):
-        # TODO: use db and uid for unique identification.
-        
-        self.auth = [['admin', 'a'], ['demo', 'demo']]
-        
-        self.user_pass = []
-        self.user_session = None
-        
-        if username and password:
-            self.user_pass = [username, password]
-        
-        if self.user_pass in self.auth:
-            self.user_session = username + '_' + str(req.session_id)
-        
-        data = {'username': username, 'user_id': username, 'user_session': self.user_session,
-                'friends': {'u': 'demo', 'g': 'Friends', 's': '1'}    # {'u': 'username', 'g': 'group', 's': 'status'}
-                }
-        
-        # Get the list of friends from memcache.            
-        
-        return dict(r='logged in', s=self.user_session, f=data['friends'])
-    
-    @openerpweb.jsonrequest
-    def chat_logout(self):
-        return dict(r='Logged out')
\ No newline at end of file
diff --git a/addons/web_chat/static/lib/AjaxIM/js/im.js b/addons/web_chat/static/lib/AjaxIM/js/im.js
index fbf6a1552f3..9ab195fd6b6 100644
--- a/addons/web_chat/static/lib/AjaxIM/js/im.js
+++ b/addons/web_chat/static/lib/AjaxIM/js/im.js
@@ -1 +1,2101 @@
-// = im.js =
//
// **Copyright &copy; 2005 &ndash; 2010 Joshua Gross**\\
// //MIT Licensed//
//
// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the "Software"), to deal
// in the Software without restriction, including without limitation the rights
// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
// copies of the Software, and to permit persons to whom the Software is
// furnished to do so, subject to the following conditions:
//
// The above copyright notice and this permission notice shall be included in
// all copies or substantial portions of the Software.
// 
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
// THE SOFTWARE.
//
// This is the main library for Ajax IM. It encompasses the UI controls,
// and connecting with the server. It does //not// handle registration or
// account management.

(function($, _instance) {
    AjaxIM = function(options, actions) {
        if(this instanceof AjaxIM) {
            var self = this;
            
            // === {{{ defaults }}} ===
            //
            // These are the available settings for Ajax IM, and the associated
            // defaults:
            //
            // * {{{pollType}}} determines the way in which the client will talk to
            // the server.
            // ** {{{comet}}} will use http streaming, wherein a connection to the server will be held open indefinitely, and the server will push down new events (messages, status updates) as they occur.
            // ** {{{long}}} will hold open a connection with the server for as long as possible, or until a new event is received. Upon the server sending an event or closing the connection, the client will automatically&mdash;and immediately&mdash;reconnect.
            // ** {{{short}}} will open a connection, and the server (if this method is supported) will //immediately// provide a response as to whether or not there are any new events. Once a response is received, the client will wait 5 seconds, and then reconnect.
            // * {{{pollServer}}} is the default URL to which all actions refer. It is
            // possible to specify certain action URLs separately (as is used with the
            // NodeJS server).
            // * {{{cookieName}}} is the name of the session cookie used by the server.
            // If this is not set properly, the IM engine will not be able to automatically
            // reinitialize sessions.
            // * {{{theme}}} is the name of the theme folder that defines the HTML and
            // CSS of the IM bar and chat boxes. Usually, themes are deposited in the
            // provided "themes" folder and specified by that path, e.g. {{{themes/default}}}.
            // Theme files within the theme folder must be named {{{theme.html}}} and
            // {{{theme.css}}}.
            // * {{{storageMethod}}} defines the way in which data (chat sessions) are
            // temporarily stored client-side. By default, {{{"flash"}}} is used because
            // it is the most widely supported method. However,
            // [[http://eric.garside.name/docs.html?p=jstore#js-engines|other storage engines]]
            // are available, with their respective up- and down-sides
            // outlined, on the jStore website.
            // * {{{storeSession}}} (**not implemented**) sets the number of days to
            // retain stored chat session data before it should be deleted.
            // * {{{checkResume}}} is a flag that sets whether or not the client should
            // make a call to the server before resuming the session (such as on a page
            // reload). This will ensure that the session has not expired. If set to {{{false}}},
            // a call to the server will not be made, and the session will be assumed to
            // be active.
            var defaults = {
                pollType: 'long',
                pollServer: './ajaxim.php',
                cookieName: 'ajaxim_session',
                theme: 'themes/default',
                storageMethod: 'auto',
                flashStorage: 'js/jStore.Flash.html',
                storeSession: 5, // number of days to store chat data (0 for current session only)
                checkResume: true
            };

            // === {{{AjaxIM.}}}**{{{settings}}}** ===
            //
            // These are the settings for the IM. If particular options are not specified,
            // the defaults (see above) will be used. //These options will be defined
            // upon calling the initialization function, and not set directly.//
            this.settings = $.extend(defaults, options);

            // === {{{AjaxIM.}}}**{{{actions}}}** ===
            //
            // Each individual action that the IM engine can execute is predefined here.
            // By default, it merely appends the action onto the end of the {{{pollServer}}} url,
            // however, it is possible to define actions individually. //The alternative actions
            // will be defined upon calling the initialization function, and not set directly.//
            //
            // Should you define an action at a different URL, Ajax IM will determine whether
            // or not this URL is within the current domain. If it is within a subdomain of
            // the current domain, it will set the document.domain variable for you,
            // to match a broader hostname scope; the action will continue to use {{{$.post}}}
            // (the default AJAX method for Ajax IM).
            //
            // On the other hand, should you choose a URL outside the current domain
            // Ajax IM will switch to {{{$.getJSON}}} (a get request) to avoid
            // cross-domain scripting issues. This means that a server on a different
            // port or at a different address will need to be able to handle GET
            // requests rather than POST requests (such as how the Node.JS Ajax IM
            // server works).
            this.actions = $.extend({
                login: this.settings.pollServer + '/login',
                logout: this.settings.pollServer + '/logout',
                register: this.settings.pollServer + '/register',
                poll: this.settings.pollServer + '/poll?method=' + this.settings.pollType,
                send: this.settings.pollServer + '/send',
                status: this.settings.pollServer + '/status',
                resume: this.settings.pollServer + '/resume'
            }, actions);

            var httpRx = new RegExp('^http://', 'i'),
                slashslashRx = new RegExp('^//', 'i'),
                queryStrRx = new RegExp('[?](.+)$'),
                subdomainRx = new RegExp('((http[s]?:)?//)?(.+?)[.]' + window.location.host, 'i');
            $.each(this.actions, function(name, action) {
                if(name == 'poll') {
                    if(self.settings.pollType != 'comet')
                        action += (queryStrRx.test(action[1]) ? '&' : '?') + 'callback=?';
                        
                    action = ['jsonp', action];
                } else {
                    action = ['ajax', action];
                    if(subdomainRx.test(action[1])) {
                        document.domain = '.' + window.location.host;
                    } else if((http = httpRx.test(action[1])) || slashslashRx.test(action[1])) {
                        if(!(new RegExp('//' + window.location.host + '/', 'i')).test(action[1])) {
                            action[1] += (queryStrRx.test(action[1]) ? '&' : '?') + 'callback=?';
                            action = ['jsonp', action[1]];
                        }
                    }
                }
                
                self.actions[name] = action;
            });
            
            // We load the theme dynamically based on the passed
            // settings. If the theme is set to false, we assume
            // that the user is going to load it himself.
            this.themeLoaded = false;
            if(this.settings.theme) {
                $('<div></div>').appendTo('body').load(this.settings.theme + '/theme.html #imjs-bar, .imjs-tooltip',
                    function() {
                        self.themeLoaded = true;
                        setup.apply(self);
                    }
                );
                if(typeof document.createStyleSheet == 'function')
                    document.createStyleSheet(this.settings.theme + '/theme.css');
                else
                    $('body').append('<link rel="stylesheet" href="' +
                        this.settings.theme + '/theme.css" />');
            } else {
                this.themeLoaded = true;
                setup.apply(this);
            }
            
            // Client-side storage for keeping track of
            // conversation states, active tabs, etc.
            // The default is flash storage, however, other
            // options are available via the jStore library.
            if(this.settings.storageMethod) {
                this.storageBrowserKey = 'unknown';
                this.storeKey = '';
                
                $.each($.browser, function(k, v) {
                    if(k == 'version') return true;
                    else if(v == true) {
                        self.storageBrowserKey = k;
                        return false;
                    }
                });
            
                if(this.settings.storageMethod == 'auto') {
                    $.each(['ie', 'html5', 'local', 'flash'], function() {
                        if($.jStore.Availability[this]()) {
                            self.settings.storageMethod = this;
                            return false;
                        }
                    });
                }
            
                $.extend($.jStore.defaults, {
                    project: 'im.js',
                    engine: this.settings.storageMethod,
                    flash: this.settings.flashStorage
                });
                    
                this.storageReady = false;
                
                if(this.settings.storageMethod == 'flash') {                    
                    $.jStore.ready(function(engine) {
                        $.jStore.flashReady(function() {
                            self.storageReady = true;
                            setup.apply(self);
                        });
                    })
                } else {
                    $.jStore.ready(function(engine) {
                        self.storageReady = true;
                        setup.apply(self);
                    });
                }
                
                $.jStore.load();
            } else {
                this.storageReady = true;
                setup.apply(this);
            }

            // Allow a chatbox to me minimized
            $('.imjs-chatbox').live('click', function(e) {
                e.preventDefault();
                return false;
            });
            
            $('.imjs-chatbox .imjs-minimize').live('click', function() {
                $(this).parents('.imjs-chatbox').data('tab').click();
            });
            
            // Allow a chatbox to be closed
            $('.imjs-chatbox .imjs-close').live('click', function() {
                var chatbox = $(this).parents('.imjs-chatbox');
                chatbox.data('tab')
                    .data('state', 'closed').css('display', 'none');
                    
                if(self.settings.storageMethod && self.storageReady) {
                    delete self.chatstore[chatbox.data('username')];
                    if(self.storageReady) {
                        $.jStore.store(
                            self.storageBrowserKey + '-' +
                            self.username + '-chats',
                            self.chatstore);
                    }
                }
            });
            
            // Setup message sending for all chatboxes
            $('.imjs-chatbox .imjs-input').live('keydown', function(event) {               
                var obj = $(this);
                if(event.keyCode == 13 && !($.browser.msie && $.browser.version < 8)) {
                    self.send(obj.parents('.imjs-chatbox').data('username'), obj.val());
                }
            }).live('keyup', function(event) {
                if(event.keyCode == 13) {
                    if($.browser.msie && $.browser.version < 8) {
                        var obj = $(this);
                        self.send(obj.parents('.imjs-chatbox').data('username'), obj.val());
                    }

                    var obj = $(this);
                    obj.val('');
                    obj.height(obj.data('height'));
                }
            }).live('keypress', function(e) {
                var obj = $(this);
                if(!($.browser.msie && $.browser.opera)) obj.height(0);
                if(this.scrollHeight > obj.height() || this.scrollHeight < obj.height()) {
                    obj.height(this.scrollHeight);
                }
            });
            
            $('.imjs-msglog').live('click', function() {
                var chatbox = $(this).parents('.imjs-chatbox');
                chatbox.find('.imjs-input').focus();
            });
            
            // Create a chatbox when a buddylist item is clicked
            $('.imjs-friend').live('click', function() {
                var chatbox = self._createChatbox($(this).data('friend'));
                
                if(chatbox.data('tab').data('state') != 'active')
                    chatbox.data('tab').click();
                    
                chatbox.find('.imjs-input').focus();
            });
            
            // Setup and hide the scrollers
            $('.imjs-scroll').css('display', 'none');
            $('#imjs-scroll-left').live('click', function() {
                var hiddenTab = $('#imjs-bar li.imjs-tab:visible').slice(-1)
                    .next('#imjs-bar li.imjs-tab:hidden')
                    .filter(function() {
                        return $(this).data('state') != 'closed'
                    })
                    .not('.imjs-default').slice(-1).css('display', '');
                    
                if(hiddenTab.length) {
                    $('#imjs-bar li.imjs-tab:visible').eq(0).css('display', 'none');
                    $(this).html(parseInt($(this).html()) - 1);
                    $('#imjs-scroll-right').html(parseInt($('#imjs-scroll-right').html()) + 1);
                }

                return false;
            });
            $('#imjs-scroll-right').live('click', function() {
                var hiddenTab = $('#imjs-bar li.imjs-tab:visible').eq(0)
                    .prev('#imjs-bar li.imjs-tab:hidden')
                    .filter(function() {
                        return $(this).data('state') != 'closed'
                    })
                    .not('.imjs-default').slice(-1).css('display', '');
                    
                if(hiddenTab.length) {
                    $('#imjs-bar li.imjs-tab:visible').slice(-1).css('display', 'none');
                    $(this).html(parseInt($(this).html()) - 1);
                    $('#imjs-scroll-left').html(parseInt($('#imjs-scroll-left').html()) + 1);
                }
                
                return false;
            });
            
            // Initialize the chatbox hash
            this.chats = {};
            
            // Try to resume any existing session
            this.resume();
            
            $(window).resize(function() {
                self.bar._scrollers();
            });
        } else
            return AjaxIM.init(options);
    };
    
    // We predefine all public functions here...
    // If they are called before everything (theme, storage engine) has loaded,
    // then they get put into a "prequeue" and run when everything *does*
    // finally load.
    //
    // This ensures that nothing loads without all of the principal components
    // being pre-loaded. If that were to occur (without this prequeue), things
    // would surely break.
    var prequeue = [];
    var empty = function() {
        var func = this;
        return function() { prequeue.push([func, arguments]) };
    };
    $.extend(AjaxIM.prototype, {
        settings: {},
        friends: {},
        chats: {},
        
        storage: empty.apply('storage'),
        login: empty.apply('login'),
        logout: empty.apply('logout'),
        resume: empty.apply('resume'),
        form: empty.apply('form'),
        poll: empty.apply('poll'),
        incoming: empty.apply('incoming'),
        send: empty.apply('send'),
        status: empty.apply('status'),
        statuses: {},
        bar: {
            initialize: empty.apply('bar.initialize'),
            activateTab: empty.apply('bar.activateTab'),
            closeTab: empty.apply('bar.closeTab'),
            addTab: empty.apply('bar.addTab'),
            notification: empty.apply('bar.notification'),
            _scrollers: empty.apply('bar._scrollers')
        }
    });
    
    setup = (function() {
    var self = this;
    if(!this.storageReady || !this.themeLoaded) return;
    
    $(self).trigger('loadComplete');
    $(window).resize();
    
    $.extend(AjaxIM.prototype, {        
        // == Cookies ==
        //
        // The "cookies" functions can be used to set, get, and erase JSON-based cookies.
        // These functions are primarily used to manage and read the server-set cookie
        // that handles the user's chat session ID.
        cookies: {
            // === {{{AjaxIM.}}}**{{{cookies.set(name, value, days)}}}** ===
            //
            // Sets a cookie, stringifying the JSON value upon storing it.
            //
            // ==== Parameters ====
            // * {{{name}}} is the cookie name.\\
            // * {{{value}}} is the cookie data that you would like to store.\\
            // * {{{days}}} is the number of days that the cookie will be stored for.
            set: function(name, value, days) {
                if (days) {
                    var date = new Date();
                    date.setTime(date.getTime() + (days * 24 * 60 * 60 * 1000));
                    var expires = "; expires=" + date.toGMTString();
                } else var expires = "";
                document.cookie = name + "=" + $.compactJSON(value) + expires + "; path=/";
            },
            
            // === {{{AjaxIM.}}}**{{{cookies.get(name)}}}** ===
            //
            // Gets a cookie, decoding the JSON value before returning the data.
            //
            // ==== Parameters ====
            // * {{{name}}} is the cookie name that you would like to retrieve.
            get: function(name) {
                var nameEQ = name + "=";
                var ca = document.cookie.split(';');
                for(var i = 0; i < ca.length; i++) {
                    var c = ca[i];
                    while (c.charAt(0) == ' ') c = c.substring(1, c.length);
                    if (c.indexOf(nameEQ) == 0) {
                      var cval = decodeURIComponent(c.substring(nameEQ.length, c.length));
                      return $.secureEvalJSON(cval);
                    }
                }
                return null;
            },
            
            // === {{{AjaxIM.}}}**{{{cookies.erase(name)}}}** ===
            //
            // Deletes a cookie.
            //
            // {{{name}}} is the existing cookie that you would like to delete.
            erase: function(name) {
                self.cookies.set(name, '', -1);
            }
        },

        // == Main ==
        
        // === {{{AjaxIM.}}}**{{{storage()}}}** ===
        //
        // Retrieves chat session data from whatever storage engine is enabled
        // (provided that one is enabled at all). If a page reloads, this function
        // is called to restore the user's chat state (existing conversations, active tab).
        // This function is called //automatically//, upon initialization of the IM engine.
        storage: function() {
            if(!self.storeKey.length) return;
            
            try {
                var chatstore = $.jStore.store(self.storeKey + 'chats') || {};
            } catch(e) {
                $.jStore.remove(self.storeKey + 'chats');
                var chatstore = {};
            }

            if(this.chatstore) {            
                $.each(this.chatstore, function(username, convo) {
                    if(username in chatstore)
                        chatstore[username] = $.merge(chatstore[username], self.chatstore[username]);
                    else
                        chatstore[username] = self.chatstore[username];
                });
                                
                this.chatstore = chatstore;
                $.jStore.store(self.storeKey + 'chats', chatstore);
            } else {
                this.chatstore = chatstore;
            }
            
            $.each(this.chatstore, function(username, convo) {
                if(!convo.length) return;
                
                var chatbox = self._createChatbox(username, true);
                chatbox.data('lastDateStamp', null).css('display', 'none');
                
                // Remove the automatic date stamp
                chatbox.find('.imjs-msglog').empty();
                
                // Restore all messages, date stamps, and errors
                $.each(convo, function() {
                    switch(this[0]) {
                        case 'error':
                            self._addError(chatbox, decodeURIComponent(this[2]), this[3]);
                        break;
                        
                        case 'datestamp':
                            self._addDateStamp(chatbox, this[3]);
                        break;
                        
                        case 'a':
                        case 'b':
                            self._addMessage(this[0], chatbox, this[1],
                                decodeURIComponent(this[2]), this[3]);
                        break;
                    }
                });
                
                $(self).trigger('chatRestored', [username, chatbox]);
            });
            
            var activeTab = $.jStore.store(self.storeKey + 'activeTab') || [];
            if(activeTab.length && (activeTab = activeTab[0]) && activeTab in this.chats) {
                this.chats[activeTab].data('tab').click();
                var msglog = this.chats[activeTab].find('.imjs-msglog');
                msglog[0].scrollTop = msglog[0].scrollHeight;
            }
        },
        
        // === {{{AjaxIM.}}}**{{{login(username, password)}}}** ===
        //
        // Authenticates a user and initializes the IM engine. If the user is
        // already logged in, [s]he is logged out, the session is cleared, and
        // the new user is logged in.
        //
        // Returns the user's properly formatted username, session ID, and online
        // friends in JSON, if successful; e.g.:\\
        // {{{ {u: 'username', s: 'longsessionid', f: [{u: 'friend', s: 1, g: 'group'}]} }}}
        //
        // If unsuccessful, {{{false}}} is returned.
        //
        // ==== Parameters ====
        // * {{{username}}} is the user's username.\\
        // * {{{password}}} is the user's password. This password will be MD5 hashed
        // before it is sent to the server.
        login: function(username, password) {
            if(!username) username = '';
            if(!password) password = '';
            
            if(this.username)
                return true; // Already logged in!
        
            // hash password before sending it to the server
            password = $.md5(password);

            // authenticate
            AjaxIM.request(
                this.actions.login,
                {'username': username, 'password': password},
                function(auth) {
                    if(auth.r == 'logged in') {
                        self.username = ('u' in auth ? auth.u : username);
                        
                        if(self.settings.storageMethod)
                            self.storeKey = [self.storageBrowserKey, self.username, ''].join('-');
                            
                        var existing = self.cookies.get(self.settings.cookieName);
                        self.storage();
                        
                        // Begin the session
                        $.each(auth.f, function() {
                            self.friends[this.u] = {status: [this.s, ''], group: this.g};
                        });
                        self._session(self.friends);
                        self._storeFriends();
                        
                        $(self).trigger('loginSuccessful', [auth]);
                        
                        return auth;
                    } else {
                        $(self).trigger('loginError', [auth]);
                    }
                    
                    return false;
                }
            );
        },
        
        // === {{{AjaxIM.}}}**{{{logout()}}}** ===
        //
        // Logs the user out and removes his/her session cookie. As well, it
        // will close all existing chat windows, clear the storage engine, and
        // remove the IM bar.
        logout: function() {
            AjaxIM.request(
                this.actions.logout,
                {},
                function(done) {
                    if(done) {
                        self.cookies.erase(self.settings.cookieName);
                        self._clearSession();
                        $(self).trigger('logoutSuccessful');
                        return true;
                    } else {
                        $(self).trigger('logoutError');
                        return false;
                    }
                }
            );
        },
        
        // === {{{AjaxIM.}}}**{{{resume()}}}** ===
        //
        // Resumes an existing session based on a session ID stored in the
        // server-set cookie. This function is called //automatically// upon IM
        // engine (re-)initialization, so the user does not need to re-login
        // should a session already exist.
        resume: function() {
            var session = this.cookies.get(this.settings.cookieName);
            
            if(session && session.sid) {
                this.username = session.user;
                
                this.storeKey = [this.storageBrowserKey, this.username, ''].join('-');
                
                var friends = $.jStore.store(this.storeKey + 'friends') || [];
                if(self.settings.checkResume) {
                    AjaxIM.request(
                        this.actions.resume,
                        {},
                        function(response) {
                            if(response.r == 'connected') {
                                self._session(friends);
                                self.storage();
                            } else {
                                var username = this.username;
                                self._clearSession();
                                $(self).trigger('sessionNotResumed', [username]);
                            }
                        }
                    );
                } else {
                    self._session(friends);
                    self.storage();
                }
            } else {
                $(self).trigger('noSession');
            }
        },
        
        // === //private// {{{AjaxIM.}}}**{{{_session(friends)}}}** ===
        //
        // Restores session data (username, friends) and begins polling the server.
        // Called only by {{{AjaxIM.resume()}}}.
        //
        // ==== Parameters ====
        // * {{{friends}}} is a list of "friend" objects, e.g.:\\
        // {{{[{u: 'friend', s: 1, g: 'group'}, ...]}}}
        // ** {{{u}}} being the friend's username.
        // ** {{{s}}} being one of the available status codes (see {{{AjaxIM.statuses}}}), depending on the friend's current status.
        // ** {{{g}}} being the group that the friend is in.
        _session: function(friends) {
            $('#imjs-friends-panel .imjs-header span').html(this.username);
            $('#imjs-friends').removeClass('imjs-not-connected');
            
            $.each(friends, function(friend, info) {
                self.addFriend.apply(self, [friend, info.status, info.group]);
            });
            self._storeFriends();
            
            $(self).trigger('sessionResumed', [this.username]);
            
            setTimeout(function() { self.poll(); }, 0);
        },
        
        // === //private// {{{AjaxIM.}}}**{{{_clearSession()}}}** ===
        //
        // Clears all session data from the last known user.
        _clearSession: function() {                    
            if(self.settings.storageMethod && self.storageReady) {
                $.jStore.remove(self.storeKey + 'chats');
                $.jStore.remove(self.storeKey + 'friends');
                $.jStore.remove(self.storeKey + 'activeTab');
            }
            
            self.chats = {};
            $('.imjs-tab').not('.imjs-tab.imjs-default').remove();
            
            self.cookies.erase('ajaxim_session');
            delete self.username;
        },
        
        // === {{{AjaxIM.}}}**{{{form(element)}}}** ===
        //
        // Loads a login and registration form into the specified element
        // or, if no element is supplied, to the location on the page from
        // which this function was called.
        form: function(element) {
            $(element).load(this.settings.theme + '/theme.html #imjs-lr', function() {
                $('#imjs-lr .error').hide();
                
                if(self.username) {
                    $('#imjs-register, #imjs-login fieldset').hide();
                    $('#imjs-logged-in')
                        .show()
                        .html($('#imjs-logged-in').html().replace('{username}', self.username));
                } else {
                    $('#imjs-logged-in').hide();
                }

                // Handle logout success                
                $(self).bind('logoutSuccessful', function() {
                    $('#imjs-login fieldset').slideDown();
                    $('#imjs-register').slideDown();
                    
                    $('#imjs-logged-in')
                        .html($('#imjs-logged-in strong').html('{username}'))
                        .slideUp();
                });
                $('#imjs-logged-in a').click(function() {
                    self.logout();
                    return false;
                });

                // Handle login error or success
                $(self).bind('loginError', function() {
                    $('#imjs-login .error').html(AjaxIM.i18n.authInvalid).slideDown('fast');
                    $('#imjs-login input')
                        .addClass('imjs-lr-error')
                        .blur(function() { $(this).removeClass('imjs-lr-error'); });
                }).bind('loginSuccessful', function() {
                    $('#imjs-login fieldset').slideUp();
                    $('#imjs-register').slideUp();
                    
                    $('#imjs-logged-in')
                        .html($('#imjs-logged-in').html().replace('{username}', self.username))
                        .slideDown();
                });
                var login = function() {
                    self.login($('#imjs-login-username').val(), $('#imjs-login-password').val());
                    return false;
                };
                $('#imjs-login').submit(login);
                $('#imjs-login-submit').click(login);
                
                var regIssues = false;
                var regError = function(error, fields) {
                    $('#imjs-register .error')
                        .append(AjaxIM.i18n['register' + error] + ' ')
                        .slideDown();
                    $(fields)
                        .addClass('imjs-lr-error')
                        .blur(function() { $(this).removeClass('imjs-lr-error'); });
                    regIssues = true;
                };
                
                var register = function() {
                    $('#imjs-register .error').empty();
                    
                    regIssues = false;
                    
                    var username = $('#imjs-register-username').val();
                    var password = $('#imjs-register-password').val();
                    
                    if(password.length < 4)
                        regError('PasswordLength', '#imjs-register-password');
                
                    if(password != $('#imjs-register-cpassword').val())
                        regError('PasswordMatch', '#imjs-register-password, #imjs-register-cpassword');
                    
                    if(username.length <= 2 ||
                        !$('#imjs-register-username').val().match(/^[A-Za-z0-9_.]+$/))
                        regError('UsernameLength', '#imjs-register-username');
                    
                    if(!regIssues) {
                        AjaxIM.request(
                            self.actions.register,
                            {username: username, password: password},
                            function(response) {
                                if(response.r == 'registered') {
                                    self.login(username, password);
                                } else if(response.r == 'error') {
                                    switch(response.e) {
                                        case 'unknown':
                                            regError('Unknown', '');
                                        break;
                                        
                                        case 'invalid password':
                                            regError('PasswordLength', '#imjs-register-password');
                                        break;
                                        
                                        case 'invalid username':
                                            regError('UsernameLength', '#imjs-register-username');
                                        break;
                                        
                                        case 'username taken':
                                            regError('UsernameTaken', '#imjs-register-username');
                                        break;
                                    }
                                }
                            },
                            function(error) {
                                regError('Unknown', '');
                            }
                        );
                    }
                    
                    return false;
                };
                $('#imjs-register').submit(register);
                $('#imjs-register-submit').click(register);
            });
        },
        
        // === {{{AjaxIM.}}}**{{{poll()}}}** ===
        //
        // Queries the server for new messages. If a 'long' or 'short' poll
        // type is used, jQuery's {{{$.post}}} or {{{$.getJSON}}} will be
        // used. If 'comet' is used, the server connection will be deferred
        // to the comet set of functions.
        poll: function() {
            if(/^(short|long)$/.test(this.settings.pollType)) {
                AjaxIM.request(
                    this.actions.poll,
                    {},
                    function(response) {
                        if(!response['e']) {
                            if(response.length)
                                self._parseMessages(response);
                                
                            setTimeout(function() { self.poll(); }, 0);                            
                        } else {
                            switch(response.e) {
                                case 'no session found':
                                    self._notConnected();
                                break;
                            }
                            
                            $(self).trigger('pollFailed', [response.e]);
                        }
                    },
                    function(error) {
                        self._notConnected();
                        $(self).trigger('pollFailed', ['not connected']);
                        // try reconnecting?
                    }
                );
            } else if(this.settings.pollType == 'comet') {
                this.comet.connect();
            }
        },
        
        // === //private// {{{AjaxIM.}}}**{{{_parseMessages(messages)}}}** ===
        //
        // Handles an incoming message array:\\
        // {{{[{t: 'type', s: 'sender', r: 'recipient', m: 'message'}, ...]}}}
        //
        // * {{{t}}} (message type) is one of:
        // ** {{{m}}} &mdash; a standard message
        // ** {{{s}}} &mdash; a user's status update
        // ** {{{b}}} &mdash; a broadcasted message (sent to many users simultaneously)
        // * {{{s}}} is the sender of the message.
        // * {{{r}}} is the intended recipient of the message. Most of the time, this will
        // simply be the logged in user, however, a broadcasted message may not specify
        // a recipient or may specify a different recipient. Also provides future
        // compatability for chatrooms.
        // * {{{m}}} is the actual message. For something such as a status update, this can
        // be a JSON object or parsable string; e.g. {{{"2:I'm away."}}}
        //
        // ==== Parameters ====
        // * {{{messages}}} is the message array
        _parseMessages: function(messages) {
            if($.isArray(messages)) {
                $.each(messages, function() {
                    $(self).trigger('parseMessage', [this]);
                    
                    switch(this.t) {
                        case 'm':
                            self.incoming(this.s, this.m);
                        break;
                        
                        case 's':
                            var status = this.m.split(':');
                            if(this['g'])
                                self.addFriend(this.s, status, this.g);
                            self._friendUpdate(this.s, status[0], status.slice(1).join(':'));
                            self._storeFriends();
                        break;
    
                        case 'b':
                        break;
                        
                        default:
                        break;
                    }
                });
            }
        },
        
        // === {{{AjaxIM.}}}**{{{incoming(from, message)}}}** ===
        //
        // Handles a new message from another user. If a chatbox for that
        // user does not yet exist, one is created. If it does exist, but
        // is minimized, the user is notified but the chatbox is not brought
        // to the front. This function also stores the message, if a storage
        // method is set.
        //
        // ==== Parameters ====
        // * {{{from}}} is the username of the sender.
        // * {{{message}}} is the body.
        incoming: function(from, message) {
            // check if IM exists, otherwise create new window
            // TODO: If friend is not on the buddylist,
            // should add them to a temp list?
            var chatbox = this._createChatbox(from);
            
            if(!$('#imjs-bar .imjs-selected').length) {
                chatbox.data('tab').click();
            } else if(chatbox.data('tab').data('state') != 'active') {
                this.bar.notification(chatbox.data('tab'));
            }
            
            var time = this._addMessage('b', chatbox, from, message);
            this._storeMessage('b', chatbox, from, message, time);
        },
        
        // === {{{AjaxIM.}}}**{{{addFriend(username, group)}}}** ===
        //
        // Inserts a new friend into the friends list. If the group specified
        // doesn't exist, it is created. If the friend is already in this group,
        // they aren't added again, however, the friend item is returned.
        //
        // ==== Parameters ====
        // * {{{username}}} is the username of the new friend.
        // * {{{status}}} is the current status of the friend.
        // * {{{group}}} is the user group to which the friend should be added.
        addFriend: function(username, status, group) {
            var status_name = 'available';
            $.each(this.statuses,
                function(key, val) { if(status[0] == val) { status_name = key; return false; } });

            var group_id = 'imjs-group-' + $.md5(group);
            
            if(!(group_item = $('#' + group_id)).length) {
                var group_item = $('.imjs-friend-group.imjs-default').clone()
                        .removeClass('imjs-default')
                        .attr('id', group_id)
                        .data('group', group)
                        .appendTo('#imjs-friends-list');
                        
                var group_header = group_item.find('.imjs-friend-group-header');
                group_header.html(group_header.html().replace('{group}', group));
            }
            
            var user_id = 'imjs-friend-' + $.md5(username + group);
            
            if(!$('#' + user_id).length) {
                var user_item = group_item.find('ul li.imjs-default').clone()
                        .removeClass('imjs-default')
                        .addClass('imjs-' + status_name)
                        .attr('id', user_id)
                        .data('friend', username)
                        .appendTo(group_item.find('ul'));
                if(status[0] == 0) user_item.hide();
                user_item.html(user_item.html().replace('{username}', username));
            }
                        
            this.friends[username] = {'status': status, group: group};
            
            this._updateFriendCount();
            
            return this.friends[username];
        },
        
        // === //private// {{{AjaxIM.}}}**{{{_updateFriendCount()}}}** ===
        //
        // Counts the number of online friends and updates the friends count
        // in the friend tab.
        _updateFriendCount: function() {
            var friendsLength = 0;
            for(var f in this.friends) {
                if(this.friends[f].status[0] != 0)
                    friendsLength++;
            }
            $('#imjs-friends .imjs-tab-text span span').html(friendsLength);
        },
        
        // === //private// {{{AjaxIM.}}}**{{{_storeFriends()}}}** ===
        //
        // If a storage method is enabled, the current state of the
        // user's friends list is stored.
        _storeFriends: function() {
            if(this.settings.storageMethod && this.storageReady)
                $.jStore.store(this.storeKey + 'friends', this.friends);
        },
        
        // === //private// {{{AjaxIM.}}}**{{{_createChatbox(username)}}}** ===
        //
        // Builds a chatbox based on the default chatbox HTML and CSS defined
        // in the current theme. Should a chatbox for this user already exist,
        // a new one is not created. Instead, it is either given focus (should
        // no other windows already have focus), or a notification is issued.
        //
        // As well, if the chatbox does not exist, an associated tab will be
        // created.
        //
        // ==== Parameters ====
        // * {{{username}}} is the name of the user for whom the chatbox is intended
        // for.
        // * {{{no_stamp}}} sets whther or not to add a date stamp to the chatbox
        // upon creation.
        //
        // //Note:// New chatboxes are given an automatically generated ID in the
        // format of {{{#imjs-[md5 of username]}}}.
        _createChatbox: function(username, no_stamp) {
            var chatbox_id = 'imjs-' + $.md5(username);
            if(!(chatbox = $('#' + chatbox_id)).size()) {
                // add a tab
                var tab = this.bar.addTab(username, '#' + chatbox_id);
                var chatbox = tab.find('.imjs-chatbox');
                chatbox.attr('id', chatbox_id);

                chatbox.data('tab', tab);
                
                // remove default items from the message log
                var message_log = chatbox.find('.imjs-msglog').empty();
                
                // setup the chatbox header
                var cb_header = chatbox.find('.imjs-header');
                cb_header.html(cb_header.html().replace('{username}', username));
                
                if(!no_stamp) {
                    // add a date stamp
                    var time = this._addDateStamp(chatbox);
                    this._storeNonMessage('datestamp', username, null, time);
                }
                
                // associate the username with the object and vice-versa
                this.chats[username] = chatbox;
                chatbox.data('username', username);
                
                // did this chatbox fall down?
                this.bar._scrollers();
                
                if(username in this.friends) {
                    status = this.friends[username].status;
                    var status_name = 'available';
                    $.each(this.statuses,
                        function(key, val) { if(status[0] == val) { status_name = key; return false; } });
                    tab.addClass('imjs-' + status_name);
                }
                
                // store inputbox height
                //var input = chatbox.find('.imjs-input');
                //input.data('height', input.height());
            } else if(chatbox.data('tab').data('state') == 'closed') {
                chatbox.find('.imjs-msglog > *').addClass('imjs-msg-old');
                
                var tab = chatbox.data('tab');
                if(tab.css('display') == 'none')
                    tab.css('display', '').removeClass('imjs-selected')
                        .appendTo('#imjs-bar');
                
                if(!no_stamp) {
                    // possibly add a date stamp
                    var time = this._addDateStamp(chatbox);
                    this._storeNonMessage('datestamp', username, null, time);
                }
                    
                if(!$('#imjs-bar .imjs-selected').length) {
                    tab.click();
                } else {
                    this.bar.notification(tab);
                }
            }
            
            return chatbox;
        },
        
        // === //private// {{{AjaxIM.}}}**{{{_addDateStamp(chatbox)}}}** //
        //
        // Adds a date/time notifier to a chatbox. These are generally
        // inserted upon creation of a chatbox, or upon the date changing
        // since the last time a date stamp was added. If a date stamp for
        // the current date already exists, a new one will not be added.
        //
        // ==== Parameters ====
        // * {{{chatbox}}} refers to the jQuery-selected chatbox DOM element.
        // * {{{time}}} is the date/time the date stamp will show. It is specified
        // in milliseconds since the Unix Epoch. This is //only// defined when
        // date stamps are being restored from storage; if not specified, the
        // current computer time will be used.
        _addDateStamp: function(chatbox, time) {
            var message_log = $(chatbox).find('.imjs-msglog');
            if(!time)
               time = (new Date()).getTime();
 
            var date_stamp = $('.imjs-tab.imjs-default .imjs-chatbox .imjs-msglog .imjs-date').clone();
            var date_stamp_time = date_stamp.find('.imjs-msg-time');
            if(date_stamp_time.length)
                date_stamp_time.html(AjaxIM.dateFormat(time, date_stamp_time.html()));
            
            var date_stamp_date = date_stamp.find('.imjs-date-date');
            var formatted_date = AjaxIM.dateFormat(time, date_stamp_date.html());
            if(chatbox.data('lastDateStamp') != formatted_date) {
                if(date_stamp_date.length)
                    date_stamp_date.html(AjaxIM.dateFormat(time, date_stamp_date.html()));
            
                chatbox.data('lastDateStamp', formatted_date);
                date_stamp.appendTo(message_log);
            } else {
                //$('<div></div>').appendTo(message_log);
            }
            
            return time;
        },
        
        // === //private// {{{AjaxIM.}}}**{{{_addError(chatbox, error)}}}** //
        //
        // Adds an error to a chatbox. These are generally inserted after
        // a user sends a message unsuccessfully. If an error message
        // was already added, another one will be added anyway.
        //
        // ==== Parameters ====
        // * {{{chatbox}}} refers to the jQuery-selected chatbox DOM element.
        // * {{{error}}} is the error message string.
        // * {{{time}}} is the date/time the error occurred. It is specified in
        // milliseconds since the Unix Epoch. This is //only// defined when
        // errors are being restored from storage; if not specified, the current
        // computer time will be used.
        _addError: function(chatbox, error, time) {
            var message_log = $(chatbox).find('.imjs-msglog');
 
            var error_item =
                $('.imjs-tab.imjs-default .imjs-chatbox .imjs-msglog .imjs-error').clone();
                
            var error_item_time = error_item.find('.imjs-msg-time');
            if(error_item_time.length) {
                if(!time)
                    time = (new Date()).getTime();
                error_item_time.html(AjaxIM.dateFormat(time, error_item_time.html()));
            }

            error_item.find('.imjs-error-error').html(error);
            error_item.appendTo(message_log);
            
            message_log[0].scrollTop = message_log[0].scrollHeight;
        },
        
        // === //private// {{{AjaxIM.}}}**{{{_addMessage(ab, chatbox, username, message, time)}}}** //
        //
        // Adds a message to a chatbox. Depending on the {{{ab}}} value,
        // the color of the username may change as a way of visually
        // identifying users (however, this depends on the theme's CSS).
        // A timestamp is added to the message, and the chatbox is scrolled
        // to the bottom, such that the new message is visible.
        //
        // Messages will be automatically tag-escaped, so as to prevent
        // any potential cross-site scripting problems. Additionally,
        // URLs will be automatically linked.
        //
        // ==== Parameters ====
        // * {{{ab}}} refers to whether the user is "a" or "b" in a conversation.
        // For the general case, "you" are "a" and "they" are "b".
        // * {{{chatbox}}} refers to the jQuery-selected chatbox DOM element.
        // * {{{username}}} is the username of the user who sent the message.
        // * {{{time}}} is the time the message was sent in milliseconds since
        // the Unix Epoch. This is //only// defined when messages are being 
        // restored from storage. For new messages, the current computer
        // time is automatically used.
        _addMessage: function(ab, chatbox, username, message, time) {
            var last_message = chatbox.find('.imjs-msglog > *:last-child');
            if(last_message.hasClass('imjs-msg-' + ab)) {
                // Last message was from the same person, so let's just add another imjs-msg-*-msg
                var message_container = (last_message.hasClass('imjs-msg-' + ab + '-container') ?
                    last_message :
                    last_message.find('.imjs-msg-' + ab + '-container'));
                    
                var single_message =
                    $('.imjs-tab.imjs-default .imjs-chatbox .imjs-msglog .imjs-msg-' + ab + '-msg')
                    .clone().appendTo(message_container);
                
                single_message.html(single_message.html().replace('{username}', username));
            } else if(!last_message.length || !last_message.hasClass('imjs-msg-' + ab)) {
                var message_group = $('.imjs-tab.imjs-default .imjs-chatbox .imjs-msg-' + ab)
                    .clone().appendTo(chatbox.find('.imjs-msglog'));
                message_group.html(message_group.html().replace('{username}', username));
                
                var single_message = message_group.find('.imjs-msg-' + ab + '-msg');
            }
            
            // clean up the message
            message = message.replace(/</g, '&lt;').replace(/>/g, '&gt;')
                        .replace(/(^|.*)\*([^*]+)\*(.*|$)/, '$1<strong>$2</strong>$3');
            
            // autolink URLs
            message = message.replace(
                new RegExp('([A-Za-z][A-Za-z0-9+.-]{1,120}:[A-Za-z0-9/]' +
                '(([A-Za-z0-9$_.+!*,;/?:@&~=-])|%[A-Fa-f0-9]{2}){1,333}' +
                '(#([a-zA-Z0-9][a-zA-Z0-9$_.+!*,;/?:@&~=%-]{0,1000}))?)', 'g'),
                '<a href="$1" target="_blank">$1</a>');
            
            // insert the message
            single_message.html(single_message.html().replace('{message}', message));
            
            // set the message time
            var msgtime = single_message.find('.imjs-msg-time');
            if(!time)
                time = new Date();
        
            if(typeof time != 'string')
                time = AjaxIM.dateFormat(time, msgtime.html());
            
            msgtime.html(time);
            
            var msglog = chatbox.find('.imjs-msglog');
            msglog[0].scrollTop = msglog[0].scrollHeight;
            
            return time;
        },
        
        // === //private// {{{AjaxIM.}}}**{{{_storeNonMessage(type, username, data, time)}}}** ===
        //
        // **Redundant?**\\
        // Similar to {{{AjaxIM._storeMessage}}}, but stores items that aren't messages,
        // such as datestamps and errors.
        //
        // ==== Parameters ====
        // * {{{type}}} is the type of non-message (error, datestamp).
        // * {{{username}}} is the username of the user being chatted with.
        // * {{{data}}} is the (optional) data of the non-message to be stored.
        // * {{{time}}} is the time of the message.
        _storeNonMessage: function(type, username, data, time) {
            // If storage is on & ready, store the non-message
            if(this.settings.storageMethod) {
                if(!this.chatstore) this.chatstore = {};                 
                if(!(username in this.chatstore)) this.chatstore[username] = [];
                
                // If the chat store gets too long, it becomes slow to load.
                if(this.chatstore[username].length > 300)
                    this.chatstore[username].shift();
                
                // For some reason, if we don't encode and decode the message, it *will* break
                // (at least) the Flash storage engine's retrieval. Gah!
                this.chatstore[username].push(
                    [type, username, encodeURIComponent(data), time]);
                
                if(this.storageReady) $.jStore.store(self.storeKey + 'chats', this.chatstore);
            }
        },
        
        // === //private// {{{AjaxIM.}}}**{{{_storeMessage(ab, chatbox, username, message, time)}}}** ===
        //
        // Taking the same arguments as {{{AjaxIM._addMessage}}}, {{{_storeMessage}}} pushes a message
        // into the storage hash, if storage is enabled.
        //
        // Messages are added to a message array, by username. The entire chat hash is stored as
        // a {{{'chats'}}} object in whatever storage engine is enabled.
        _storeMessage: function(ab, chatbox, username, message, time) {
            // If storage is on & ready, store the message
            if(this.settings.storageMethod) {
                if(!this.chatstore) this.chatstore = {}; 
                
                message = message.replace(/</g, '&lt;').replace(/>/g, '&gt;');
                
                if(!(username in this.chatstore)) {
                    this.chatstore[username] = [];
                } else if(this.chatstore[username].length > 300) {
                    // If the chat store gets too long, it becomes slow to load.
                    this.chatstore[username].shift();
                }
                
                // For some reason, if we don't encode and decode the message, it *will* break
                // (at least) the Flash storage engine's retrieval. Gah!
                this.chatstore[chatbox.data('username')].push(
                    [ab, username, encodeURIComponent(message), time]);
                
                if(this.storageReady) $.jStore.store(this.storeKey + 'chats', this.chatstore);
            }
        },
        
        // === //private// {{{AjaxIM.}}}**{{{_friendUpdate(friend, status, statusMessage)}}}** ===
        //
        // Called when a friend's status is updated. This function will update all locations
        // where a status icon is displayed (chat tab, friends list), as well as insert
        // a notification, should a chatbox be open.
        //
        // ==== Parameters ====
        // * {{{friend}}} is the username of the friend.
        // * {{{status}}} is the new status code. See {{{AjaxIM.statuses}}} for a list of available
        // codes. //Note: If an invalid status is specified, no action will be taken.//
        // * {{{statusMessage}}} is a message that was, optionally, specified by the user. It will be
        // used should "you" send the user an IM while they are away, or if their status is viewed
        // in another way (such as via the friends list [**not yet implemented**]).
        _friendUpdate: function(friend, status, statusMessage) {
            // add friend to buddylist, update their status, etc.           
            var status_name = 'available';
            $.each(this.statuses,
                function(key, val) { if(status == val) { status_name = key; return false; } });

            if(this.chats[friend]) {
                var tab = this.chats[friend].data('tab');
                var tab_class = 'imjs-tab';
                if(tab.data('state') == 'active') tab_class += ' imjs-selected';
                tab_class += ' imjs-' + status_name;
                
                tab.attr('class', tab_class);
                
                // display the status in the chatbox
                var date_stamp =
                    $('.imjs-tab.imjs-default .imjs-chatbox .imjs-msglog .imjs-date').clone();
                    
                var date_stamp_time = date_stamp.find('.imjs-msg-time');
                if(date_stamp_time.length)
                    date_stamp_time.html(AjaxIM.dateFormat(date_stamp_time.html()));
                
                var date_stamp_date = date_stamp.find('.imjs-date-date').html(
                    AjaxIM.i18n[
                        'chat' + status_name[0].toUpperCase() + status_name.slice(1)
                    ].replace(/%s/g, friend));
                
                var msglog = this.chats[friend].find('.imjs-msglog');
                date_stamp.appendTo(msglog);
                msglog[0].scrollTop = msglog[0].scrollHeight;
            }
            
            if(this.friends[friend]) {
                var friend_id = 'imjs-friend-' + $.md5(friend + this.friends[friend].group);
                $('#' + friend_id).attr('class', 'imjs-friend imjs-' + status_name);
                
                if(status == 0) {
                    $('#' + friend_id + ':visible').slideUp();
                    $('#' + friend_id + ':hidden').hide();
                } else if(!$('#' + friend_id + ':visible').length) {
                    $('#' + friend_id).slideDown();
                }
                
                this.friends[friend].status = [status, statusMessage];
                this._updateFriendCount();
            }
        },
        
        // === //private// {{{AjaxIM.}}}**{{{_notConnected()}}}** ===
        //
        // Puts the user into a visible state of disconnection. Sets the
        // friends list to "not connected" and empties it; disallows new messages
        // to be sent.
        _notConnected: function() {
            $('#imjs-friends').addClass('imjs-not-connected').unbind('click', this.activateTab);
        },
        
        // === {{{AjaxIM.}}}**{{{send(to, message)}}}** ===
        //
        // Sends a message to another user. The message will be added
        // to the chatbox before it is actually sent, however, if an
        // error occurs during sending, that will be indicated immediately
        // afterward.
        //
        // After sending the message, one of three status codes should be
        // returned as a JSON object, e.g. {{{{r: 'code'}}}}:
        // * {{{ok}}} &mdash; Message was sent successfully.
        // * {{{offline}}} &mdash; The user is offline or unavailable to
        // receive messages.
        // * {{{error}}} &mdash; a problem occurred, unrelated to the user
        // being unavailable.
        //
        // ==== Parameters ====
        // * {{{to}}} is the username of the recipient.
        // * {{{message}}} is the content to be sent.
        send: function(to, message) {         
            if(!message) return;
               
            if(this.chats[to]) { // REMOVE ME?
                // possibly add a datestamp
                var time = self._addDateStamp(this.chats[to]);
                this._storeNonMessage('datestamp', to, null, time);
                
                time = this._addMessage('a', this.chats[to], this.username, message);                
                this._storeMessage('a', this.chats[to], this.username, message, time);
            }
            
            $(self).trigger('sendingMessage', [to, message]);
            
            AjaxIM.request(
                this.actions.send,
                {'to': to, 'message': message},
                function(result) {
                    switch(result.r) {
                        case 'ok':
                            $(self).trigger('sendMessageSuccessful', [to, message]);
                        break;
                        
                        case 'offline':
                            $(self).trigger('sendMessageFailed', ['offline', to, message]);
                        break;
                        
                        case 'error':
                        default:
                            if(result.e == 'no session found') {
                                self._notConnected();
                                self._addError(self.chats[to], AjaxIM.i18n.notConnected);
                                self._storeNonMessage('error', to,
                                    AjaxIM.i18n.notConnected, (new Date()).getTime());
                            }
                            
                            $(self).trigger('sendMessageFailed', [result.e, to, message]);
                        break;
                    }
                },
                function(error) {
                    self._notConnected();
                    self._addError(self.chats[to], AjaxIM.i18n.notConnected);
                    self._storeNonMessage('error', to,
                        AjaxIM.i18n.notConnected, (new Date()).getTime());
                        
                    $(self).trigger('sendMessageFailed', ['not connected', to, message]);
                }
            );
        },
        
        // === {{{AjaxIM.}}}**{{{status(s, message)}}}** ===
        //
        // Sets the user's status and status message. It is possible to not
        // set a status message by setting it to an empty string. The status
        // will be sent to the server, where upon the server will broadcast
        // the update to all individuals with "you" on their friends list.
        //
        // ==== Parameters ====
        // * {{{s}}} is the status code, as defined by {{{AjaxIM.statuses}}}.
        // * {{{message}}} is the custom status message.
        status: function(s, message) {
            // update status icon(s)
            if(!this.statuses[s])
                return;
                
            $('#imjs-friends').attr('class', 'imjs-' + s);
            
            $(self).trigger('changingStatus', [s, message]);
            
            AjaxIM.request(
                this.actions.status,
                {'status': this.statuses[s], 'message': message},
                function(result) {
                    switch(result.r) {
                        case 'ok':
                            $(self).trigger('changeStatusSuccessful', [s, message]);
                        break;
                        
                        case 'error':
                        default:
                            $(self).trigger('changeStatusFailed', [result.e, s, message]);
                        break;
                    }
                },
                function(error) {
                    $(self).trigger('changeStatusFailed', ['not connected', s, message]);
                }
            );
        },
        
        // === {{{AjaxIM.}}}**{{{statuses}}}** ===
        //
        // These are the available status codes and their associated identities:
        // * {{{offline}}} (0) &mdash; Only used when signing out/when another
        // user has signed out, as once this status is set, the user is removed
        // from the server and friends will be unable to contact the user.
        // * {{{available}}} (1) &mdash; The user is online and ready to be messaged.
        // * {{{away}}} (2) &mdash; The user is online but is not available. Others
        // may still contact this user, however, the user may not respond. Anyone
        // contacting an away user will receive a notice stating that the user is away,
        // and (if one is set) their custom status message.
        // * {{{invisible}}} (3; **not yet implemented**) &mdash; The user is online,
        // but other users are made unaware, and the user will be represented
        // as being offline. It is still possible to contact this user, and for this
        // user to contact others; no status message or notice will be sent to others
        // messaging this user.
        statuses: {offline: 0, available: 1, away: 2, invisible: 3},
        
        // == Footer bar ==
        //
        // The footer bar is the bar that sits at the bottom of the page, in a fixed
        // position. It contains a tab for the friends list, and tabs for any open
        // chat boxes. It is also possible to add custom tabs for other functionality.
        bar: {
            // === {{{AjaxIM.}}}**{{{bar.initialize()}}}** ===
            //
            // Setup the footer bar and enable tab actions. This function
            // uses {{{jQuery.live}}} to set hooks on any bar tabs created
            // in the future.
            initialize: function() {
                // Set up your standard tab actions
                $('.imjs-tab')
                    .live('click', this.activateTab);
                    
                $('.imjs-tab .imjs-close')
                    .live('click', this.closeTab);
            
                // Set up the friends list actions
                var self = this;
                $(document).click(function(e) {
                    if(e.target.id == 'imjs-friends' ||
                        $(e.target).parents('#imjs-friends').length) {    
                        return;
                    }
                    
                    if($('#imjs-friends').data('state') == 'active')
                        self.activateTab.call($('#imjs-friends'));
                });
                $('#imjs-friends')
                    .data('state', 'minimized')
                    .click(function(e) {
                        if(!$(this).hasClass('imjs-not-connected') &&
                            e.target.id != 'imjs-friends-panel' &&
                            !$(e.target).parents('#imjs-friends-panel').length)
                            self.activateTab.call(this);
                    })
                    .mouseenter(function() {
                        if($(this).hasClass('imjs-not-connected')) {
                            $('.imjs-tooltip').css('display', 'block');
                            $('.imjs-tooltip p').html(AjaxIM.i18n.notConnectedTip);

                            var tip_left = $(this).offset().left -
                                $('.imjs-tooltip').outerWidth() +
                                ($(this).outerWidth() / 2);
                            var tip_top = $(this).offset().top -
                                $('.imjs-tooltip').outerHeight(true);

                            $('.imjs-tooltip').css({
                                    left: tip_left,
                                    top: tip_top
                                });
                        }
                    })
                    .mouseleave(function() {
                        if($(this).hasClass('imjs-not-connected')) {
                            $('.imjs-tooltip').css('display', '');
                        }
                    });
                $('#imjs-friends-panel')
                    .data('tab', $('#imjs-friends'))
                    .css('display', 'none');
            },
            
            // === {{{AjaxIM.}}}**{{{bar.activateTab()}}}** ===
            //
            // Activate a tab by setting it to the 'active' state and
            // showing any related chatbox. If a chatbox is available
            // for this tab, also focus the input box.
            //
            // //Note:// {{{this}}}, here, refers to the tab DOM element.
            activateTab: function() {
                var chatbox = $(this).find('.imjs-chatbox') || false;

                if($(this).data('state') != 'active') {
                    if($(this).attr('id') != 'imjs-friends') {
                        $('#imjs-bar > li')
                            .not($(this))
                            .not('#imjs-friends')
                            .removeClass('imjs-selected')
                            .each(function() {
                                if($(this).data('state') != 'closed') {
                                    $(this).data('state', 'minimized');
                                    var chatbox = $(this).find('.imjs-chatbox');
                                    if(chatbox.length)
                                        chatbox.css('display', 'none');
                                }
                            });
                    }
                    
                    if(chatbox && chatbox.css('display') == 'none')
                        chatbox.css('display', '');
                    
                    // set the tab to active...
                    var tab = $(this).addClass('imjs-selected').data('state', 'active');
                    
                    // ...and hide and reset the notification icon
                    tab.find('.imjs-notification').css('display', 'none')
                        .data('count', 0);
                    
                    if(self.settings.storageMethod && self.storageReady &&
                        chatbox && (username = chatbox.data('username'))) { 
                        $.jStore.store(self.storeKey + 'activeTab', [username]);
                    }
                    
                    $(self).trigger('tabToggled', ['activated', tab]);
                } else {
                    var tab = $(this).removeClass('imjs-selected').data('state', 'minimized');
                    
                    if(chatbox && chatbox.css('display') != 'none')
                        chatbox.css('display', 'none');
                    
                    if(self.settings.storageMethod && self.storageReady) { 
                        $.jStore.store(self.storeKey + 'activeTab', ['*']);
                    }
                    
                    $(self).trigger('tabToggled', ['minimized', tab]);
                }
                
                if(chatbox) {
                    if(!(input = chatbox.find('.imjs-input')).data('height')) {
                        // store the height for resizing later
                        input.data('height', input.height());
                    }
                    
                    try {
                        var msglog = chatbox.find('.imjs-msglog');
                        msglog[0].scrollTop = msglog[0].scrollHeight;
                    } catch(e) {}
                    
                    try { chatbox.find('.imjs-input').focus(); } catch(e) {}
                }
            },
            
            // === {{{AjaxIM.}}}**{{{bar.closeTab()}}}** ===
            //
            // Close a tab and hide any related chatbox, such that
            // the chatbox can not be reopened without reinitializing
            // the tab.
            //
            // //Note:// {{{this}}}, here, refers to the tab DOM element.
            closeTab: function() {
                var tab = $(this).parents('.imjs-tab');
                tab.css('display', 'none').data('state', 'closed');

                if(self.settings.storageMethod && self.storageReady) {
                    delete self.chatstore[tab.find('.imjs-chatbox').data('username')];
                    if(self.storageReady) $.jStore.store(self.storeKey + 'chats', self.chatstore);
                }

                $(self).trigger('tabToggled', ['closed', tab]);

                self.bar._scrollers();

                return false;
            },
            
            // === {{{AjaxIM.}}}**{{{bar.addTab(label, action, closable)}}}** ===
            //
            // Adds a tab to the tab bar, with the label {{{label}}}. When
            // clicked, it will call a callback function, {{{action}}}. If
            // {{{action}}} is a string, it is assumed that the string is
            // referring to a chatbox ID.
            //
            // ==== Parameters ====
            // * {{{label}}} is the text that will be displayed on the tab.\\
            // * {{{action}}} is the callback function, if it is a non-chatbox
            // tab, or a string if it //is// a chatbox tab.\\
            // * {{{closable}}} is a boolean value that determines whether or not
            // it is possible for a user to close this tab.
            //
            // //Note:// New tabs are given an automatically generated ID
            // in the format of {{{#imjs-tab-[md5 of label]}}}.
            addTab: function(label, action, closable) {
                var tab = $('.imjs-tab.imjs-default').clone().insertAfter('#imjs-scroll-right');
                tab.removeClass('imjs-default')
                    .attr('id', 'imjs-tab-' + $.md5(label))
                    .html(tab.html().replace('{label}', label))
                    .data('state', 'minimized');
                    
                var notification = tab.find('.imjs-notification');
                notification.css('display', 'none')
                    .data('count', 0)
                    .data('default-text', notification.html())
                    .html(notification.html().replace('{count}', '0'));
                
                if(closable === false)
                    tab.find('.imjs-close').eq(0).remove();
                
                if(typeof action == 'string') {
                    //tab.data('chatbox', action);
                } else {
                    tab.find('.imjs-chatbox').remove();
                    tab.click(action);
                }
                
                return tab;
            },
            
            // === {{{AjaxIM.}}}**{{{bar.notification(tab)}}}** ===
            //
            // Displays a notification on a tab. Generally, this is called when
            // a tab is minimized to let the user know that there is an update
            // for them. The way the notification is displayed depends on the
            // theme CSS.
            //
            // ==== Parameters ====
            // * {{{tab}}} is the jQuery-selected tab DOM element.
            notification: function(tab) {
                var notify = tab.find('.imjs-notification');
                var notify_count = notify.data('count') + 1;
                
                notify.data('count', notify_count)
                    .html(notify.data('default-text').replace('{count}', notify_count))
                    .css('display', '');
            },
            
            // === //private// {{{AjaxIM.}}}**{{{bar._scrollers()}}}** ===
            //
            // Document me!
            _scrollers: function() {
                var needScrollers = false;
                $('.imjs-tab').filter(function() {
                    return $(this).data('state') != 'closed'
                }).css('display', '');
                
                $.each(self.chats, function(username, chatbox) {
                    var tab = chatbox.data('tab');
                    if(tab.data('state') == 'closed') return true;
                    
                    if(tab.position().top > $('#imjs-bar').height()) {
                        $('.imjs-scroll').css('display', '');
                        tab.css('display', 'none');
                        needScrollers = true;
                    } else {
                        tab.css('display', '');
                    }
                });
                
                if(!needScrollers) {
                    $('.imjs-scroll').css('display', 'none');
                }
                
                if($('#imjs-scroll-left').css('display') != 'none' &&
                    $('#imjs-scroll-left').position().top > $('#imjs-bar').height()) {
                    $('#imjs-bar li.imjs-tab:visible').slice(-1).css('display', 'none');
                }
                
                var hiddenLeft = $('#imjs-bar li.imjs-tab:visible').slice(-1)
                    .nextAll('#imjs-bar li.imjs-tab:hidden')
                    .not('.imjs-default')
                    .filter(function() {
                        return $(this).data('state') != 'closed'
                    }).length;
                    
                var hiddenRight = $('#imjs-bar li.imjs-tab:visible').eq(0)
                    .prevAll('#imjs-bar li.imjs-tab:hidden')
                    .not('.imjs-default')
                    .filter(function() {
                        return $(this).data('state') != 'closed'
                    }).length;
                    
                $('#imjs-scroll-left').html(hiddenLeft);
                $('#imjs-scroll-right').html(hiddenRight);
            }
        },
        
        // == Comet ==
        //
        // Comet, or HTTP streaming, holds open a connection between the client and
        // the server indefinitely. As the server receives new messages or events,
        // they are passed down to the client in a {{{&lt;script&gt;}}}
        // tag which calls the {{{AjaxIM.incoming()}}} function. The connection is
        // opened using either an {{{iframe}}} (in Opera or Internet Explorer) or
        // an {{{XMLHTTPRequest}}} object. Due to the extra flexibility necessary
        // with the {{{XMLHTTPRequest}}} object, jQuery's {{{$.ajax}}} is not used.
        comet: {
            type: '',
            obj: null,
        
            onbeforeunload: null,
            onreadystatechange: null,
            
            iframe: function() {                
                if(/loaded|complete/i.test(this.obj.readyState))
                    throw new Error("IM server not available!");
            },

            // === {{{AjaxIM.}}}**{{{comet.connect()}}}** ===
            //
            // Creates and initializes the object and connection between the server
            // and the client. For Internet Explorer and Opera, we use an
            // {{{&lt;iframe&gt;}}} element; for all other browsers, we create an
            // {{{XMLHTTPRequest}}} object. The server connects to the URI defined
            // as the "poll" action. This function is called automatically, when
            // the IM engine is initialized and the {{{AjaxIM.poll()}}} function
            // is called.
            connect: function() {
                var self = _instance;
                
                if($.browser.opera || $.browser.msie) {
                    var iframe = $('<iframe></iframe>');
                    with(iframe) {
                        css({
                            position: 'absolute',
                            visibility: 'visible',
                            display: 'block',
                            left: '-10000px',
                            top: '-10000px',
                            width: '1px',
                            height: '1px'
                        });
                        
                        attr('src', self.actions.poll[1]);
                        appendTo('body');
                        
                        bind('readystatechange',
                            self.comet.onreadystatechange = function() { self.comet.iframe() });
                        bind('beforeunload',
                            self.comet.onbeforeunload = function() { self.comet.disconnect() });
                    }
                    
                    self.comet.type = 'iframe';
                    self.comet.obj = iframe;
                } else {
                    var xhr = new XMLHttpRequest;
                    var length = 1029;
                    var code = /^\s*<script[^>]*>parent\.(.+);<\/script><br\s*\/>$/;
                    
                    xhr.open('get', self.actions.poll[1], true);
                    xhr.onreadystatechange = function(){
                        if(xhr.readyState > 2) {
                            if(xhr.status == 200) {
                                responseText = xhr.responseText.substring(length);
                                length = xhr.responseText.length;
                                if(responseText != ' ') 
                                    eval(responseText.replace(code, "$1"));
                            }
                            // We need an "else" here. If the state changes to
                            // "loaded", the user needs to know they're
                            // disconnected.
                        }
                    };
                    
                    self.comet.type = 'xhr';
                    self.comet.obj = xhr;
                    
                    addEventListener('beforeunload',
                        self.comet.beforeunload = function() { self.comet.disconnect(); }, false);
                    setTimeout(function() { xhr.send(null) }, 10);
                }
            },

            // === {{{AjaxIM.}}}**{{{comet.disconnect()}}}** ===
            //
            // Disconnect from the server and destroy the connection object. This
            // function is called before the page unloads, so that we plug up and
            // potential leaks and free memory.
            disconnect: function() {
                var self = _instance.comet;
                
                if(!this.type || !this.obj)
                    return;
                
                if(this.type == 'iframe') {
                    detachEvent('onreadystatechange', this.onreadystatechange);
                    detachEvent('onbeforeunload', this.onbeforeunload);
                    this.obj.src = '.';
                    $(this.obj).remove();
                } else {
                    removeEventListener('beforeunload', this.onbeforeunload, false);
                    this.obj.onreadystatechange = function(){};
                    this.obj.abort();
                }
                
                delete this.obj;
            }
        }
    })
        
    self.bar.initialize();
    
    if(prequeue.length) {
        $.each(prequeue, function() {
            var func = this[0].split('.');
            if(func.length > 1)
                self[func[0]][func[1]].apply(self, this[1]);
            else
                self[func[0]].apply(self, this[1]);
        });
    }
    });
    
    // == Static functions and variables ==
    //
    // The following functions and variables are available outside of an initialized
    // {{{AjaxIM}}} object.
    
    // === {{{AjaxIM.}}}**{{{client}}}** ===
    //
    // Once {{{AjaxIM.init()}}} is called, this will be set to the active AjaxIM
    // object. Only one AjaxIM object instance can exist at a time. This variable
    // can and should be accessed directly.
    AjaxIM.client = null;
    
    // === {{{AjaxIM.}}}**{{{init(options, actions)}}}** ===
    //
    // Initialize the AjaxIM client object and engine. Here, you can define your
    // options and actions as outlined at the top of this documentation.
    //
    // ==== Parameters ====
    // * {{{options}}} is the hash of custom settings to initialize Ajax IM with.
    // * {{{actions}}} is the hash of any custom action URLs.
    AjaxIM.init = function(options, actions) {
        if(!_instance) {
            _instance = new AjaxIM(options, actions);
            AjaxIM.client = _instance;
        }
        
        return _instance;
    }
    
    
    // === {{{AjaxIM.}}}**{{{request(url, data, successFunc, failureFunc)}}}** ===
    //
    // Wrapper around {{{$.jsonp}}}, the JSON-P library for jQuery, and {{{$.ajax}}},
    // jQuery's ajax library. Allows either function to be called, automatically,
    // depending on the request's URL array (see {{{AjaxIM.actions}}}).
    //
    // ==== Parameters ====
    // {{{url}}} is the URL of the request.
    // {{{data}}} are any arguments that go along with the request.
    // {{{success}}} is a callback function called when a request has completed
    // without issue.
    // {{{_ignore_}}} is simply to provide compatability with {{{$.post}}}.
    // {{{failure}}} is a callback function called when a request hasn't not
    // completed successfully.
    AjaxIM.request = function(url, data, successFunc, failureFunc) {
        if(typeof failureFunc != 'function');
            failureFunc = function(){};

        $[url[0]]({
            'url': url[1],
            'data': data,
            dataType: (url[0] == 'ajax' ? 'json' : 'jsonp'),
            type: 'POST',
            cache: false,
            timeout: 60000,
            callback: 'jsonp' + (new Date()).getTime(),
            success: function(json, textStatus) {
                successFunc(json);
            },
            error: function(xOptions, error) {
                failureFunc(error);
            }
        });
        
        // This prevents Firefox from spinning indefinitely
        // while it waits for a response. Why? Fuck if I know.
        if(url[0] == 'jsonp' && $.browser.mozilla) {
            $.jsonp({
                'url': 'about:',
                timeout: 0
            });
        }
    };
    
    // === {{{AjaxIM.}}}**{{{incoming(data)}}}** ===
    //
    // Never call this directly. It is used as a connecting function between
    // client and server for Comet.
    //
    // //Note:// There are two {{{AjaxIM.incoming()}}} functions. This one is a
    // static function called outside of the initialized AjaxIM object; the other
    // is only called within the initalized AjaxIM object.
    AjaxIM.incoming = function(data) {
        if(!_instance)
            return false;
        
        if(data.length)
            _instance._parseMessages(data);
    }
    
    // === {{{AjaxIM.}}}**{{{loaded}}}** ===
    //
    // If Ajax IM has been loaded with the im.load.js file, this function will be
    // called when the library is finally loaded and ready for use. Similar to
    // jQuery's $(document).ready(), but for Ajax IM.
    AjaxIM.loaded = function() {
        if(typeof AjaxIMLoadedFunction == 'function') {
            AjaxIMLoadedFunction();
            delete AjaxIMLoadedFunction; // clean up the global namespace
        }
    };
    
    // === {{{AjaxIM.}}}**{{{dateFormat([date,] [mask,] utc)}}}** ===
    //
    // Date Format 1.2.3\\
    // &copy; 2007-2009 Steven Levithan ([[http://blog.stevenlevithan.com/archives/date-time-format|stevenlevithan.com]])\\
    // MIT license
    //
    // Includes enhancements by Scott Trenda
    // and Kris Kowal ([[http://cixar.com/~kris.kowal/|cixar.com/~kris.kowal/]])
    //
    // Accepts a date, a mask, or a date and a mask and returns a formatted version
    // of the given date.
    //
    // ==== Parameters ====
    // * {{{date}}} is a {{{Date()}}} object. If not specified, the date defaults to the
    // current date/time.
    // * {{{mask}}} is a string that defines the formatting of the date. Formatting
    // options can be found in the
    // [[http://blog.stevenlevithan.com/archives/date-time-format|Date Format]]
    // documentation. If not specified, the mask defaults to {{{dateFormat.masks.default}}}.
    
    AjaxIM.dateFormat = function () {
        var token = /d{1,4}|m{1,4}|yy(?:yy)?|([HhMsTt])\1?|[LloSZ]|"[^"]*"|'[^']*'/g,
            timezone = new RegExp('\b(?:[PMCEA][SDP]T|(?:Pacific|Mountain|Central|Eastern|Atlantic) ' +
                                  '(?:Standard|Daylight|Prevailing) Time|(?:GMT|UTC)(?:[-+]\d{4})?)\b',
                                  'g'),
            timezoneClip = /[^-+\dA-Z]/g,
            pad = function (val, len) {
                val = String(val);
                len = len || 2;
                while (val.length < len) val = "0" + val;
                return val;
            };
    
        // Regexes and supporting functions are cached through closure
        return function (date, mask, utc) {
            var dF = AjaxIM.dateFormat;
    
            // You can't provide utc if you skip other args (use the "UTC:" mask prefix)
            if (arguments.length == 1 && Object.prototype.toString.call(date) ==
                  "[object String]" && !/\d/.test(date)) {
                mask = date;
                date = undefined;
            }
    
            // Passing date through Date applies Date.parse, if necessary
            date = date ? new Date(date) : new Date;
            if (isNaN(date)) throw SyntaxError("invalid date");
    
            mask = String(dF.masks[mask] || mask || dF.masks["default"]);
    
            // Allow setting the utc argument via the mask
            if (mask.slice(0, 4) == "UTC:") {
                mask = mask.slice(4);
                utc = true;
            }
    
            var _ = utc ? "getUTC" : "get",
                d = date[_ + "Date"](),
                D = date[_ + "Day"](),
                m = date[_ + "Month"](),
                y = date[_ + "FullYear"](),
                H = date[_ + "Hours"](),
                M = date[_ + "Minutes"](),
                s = date[_ + "Seconds"](),
                L = date[_ + "Milliseconds"](),
                o = utc ? 0 : date.getTimezoneOffset(),
                flags = {
                    d:    d,
                    dd:   pad(d),
                    ddd:  AjaxIM.i18n.dayNames[D],
                    dddd: AjaxIM.i18n.dayNames[D + 7],
                    m:    m + 1,
                    mm:   pad(m + 1),
                    mmm:  AjaxIM.i18n.monthNames[m],
                    mmmm: AjaxIM.i18n.monthNames[m + 12],
                    yy:   String(y).slice(2),
                    yyyy: y,
                    h:    H % 12 || 12,
                    hh:   pad(H % 12 || 12),
                    H:    H,
                    HH:   pad(H),
                    M:    M,
                    MM:   pad(M),
                    s:    s,
                    ss:   pad(s),
                    l:    pad(L, 3),
                    L:    pad(L > 99 ? Math.round(L / 10) : L),
                    t:    H < 12 ? "a"  : "p",
                    tt:   H < 12 ? "am" : "pm",
                    T:    H < 12 ? "A"  : "P",
                    TT:   H < 12 ? "AM" : "PM",
                    Z:    utc ? "UTC" :
                            (String(date).match(timezone) || [""])
                            .pop().replace(timezoneClip, ""),
                    o:    (o > 0 ? "-" : "+") +
                            pad(Math.floor(Math.abs(o) / 60) * 100 + Math.abs(o) % 60, 4),
                    S:    ["th", "st", "nd", "rd"][d % 10 > 3 ?
                            0 :
                            (d % 100 - d % 10 != 10) * d % 10]
                };
    
            return mask.replace(token, function ($0) {
                return $0 in flags ? flags[$0] : $0.slice(1, $0.length - 1);
            });
        };
    }();
    
    // Some common format strings
    AjaxIM.dateFormat.masks = {
        "default":      "ddd mmm dd yyyy HH:MM:ss",
        shortDate:      "m/d/yy",
        mediumDate:     "mmm d, yyyy",
        longDate:       "mmmm d, yyyy",
        fullDate:       "dddd, mmmm d, yyyy",
        shortTime:      "h:MM TT",
        mediumTime:     "h:MM:ss TT",
        longTime:       "h:MM:ss TT Z",
        isoDate:        "yyyy-mm-dd",
        isoTime:        "HH:MM:ss",
        isoDateTime:    "yyyy-mm-dd'T'HH:MM:ss",
        isoUtcDateTime: "UTC:yyyy-mm-dd'T'HH:MM:ss'Z'"
    };

    // === {{{AjaxIM.}}}**{{{i18n}}}** ===
    //
    // Text strings used by Ajax IM. Should you want to translate Ajax IM into
    // another language, merely change these strings.
    // 
    // {{{%s}}} denotes text that will be automatically replaced when the string is
    // used.
    AjaxIM.i18n = {
        dayNames: [
            "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat",
            "Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday"
        ],
        monthNames: [
            "Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec",
            "January", "February", "March", "April", "May", "June", "July", "August", "September",
            "October", "November", "December"
        ],
        
        chatOffline: '%s signed off.',
        chatAvailable: '%s became available.',
        chatAway: '%s went away.',
        
        notConnected: 'You are currently not connected or the server is not available. ' +
                      'Please ensure that you are signed in and try again.',
        notConnectedTip: 'You are currently not connected.',
        
        authInvalid: 'Invalid username or password.',
        
        registerPasswordLength: 'Passwords must be more than 4 characters in length.',
        registerUsernameLength: 'Usernames must be more than 2 characters in length and ' +
                        ' contain only A-Z, a-z, 0-9, underscores (_) and periods (.).',
        registerPasswordMatch: 'Entered passwords do not match.',
        registerUsernameTaken: 'The chosen username is already in use; please choose another.',
        registerUnknown: 'An unknown error occurred. Please try again.'
    }
})(jQuery, false);
\ No newline at end of file
+// = im.js =
+//
+// **Copyright &copy; 2005 &ndash; 2010 Joshua Gross**\\
+// //MIT Licensed//
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+//
+// This is the main library for Ajax IM. It encompasses the UI controls,
+// and connecting with the server. It does //not// handle registration or
+// account management.
+
+(function($, _instance) {
+    AjaxIM = function(options, actions) {
+        if(this instanceof AjaxIM) {
+            var self = this;
+            
+            // === {{{ defaults }}} ===
+            //
+            // These are the available settings for Ajax IM, and the associated
+            // defaults:
+            //
+            // * {{{pollType}}} determines the way in which the client will talk to
+            // the server.
+            // ** {{{comet}}} will use http streaming, wherein a connection to the server will be held open indefinitely, and the server will push down new events (messages, status updates) as they occur.
+            // ** {{{long}}} will hold open a connection with the server for as long as possible, or until a new event is received. Upon the server sending an event or closing the connection, the client will automatically&mdash;and immediately&mdash;reconnect.
+            // ** {{{short}}} will open a connection, and the server (if this method is supported) will //immediately// provide a response as to whether or not there are any new events. Once a response is received, the client will wait 5 seconds, and then reconnect.
+            // * {{{pollServer}}} is the default URL to which all actions refer. It is
+            // possible to specify certain action URLs separately (as is used with the
+            // NodeJS server).
+            // * {{{cookieName}}} is the name of the session cookie used by the server.
+            // If this is not set properly, the IM engine will not be able to automatically
+            // reinitialize sessions.
+            // * {{{theme}}} is the name of the theme folder that defines the HTML and
+            // CSS of the IM bar and chat boxes. Usually, themes are deposited in the
+            // provided "themes" folder and specified by that path, e.g. {{{themes/default}}}.
+            // Theme files within the theme folder must be named {{{theme.html}}} and
+            // {{{theme.css}}}.
+            // * {{{storageMethod}}} defines the way in which data (chat sessions) are
+            // temporarily stored client-side. By default, {{{"flash"}}} is used because
+            // it is the most widely supported method. However,
+            // [[http://eric.garside.name/docs.html?p=jstore#js-engines|other storage engines]]
+            // are available, with their respective up- and down-sides
+            // outlined, on the jStore website.
+            // * {{{storeSession}}} (**not implemented**) sets the number of days to
+            // retain stored chat session data before it should be deleted.
+            // * {{{checkResume}}} is a flag that sets whether or not the client should
+            // make a call to the server before resuming the session (such as on a page
+            // reload). This will ensure that the session has not expired. If set to {{{false}}},
+            // a call to the server will not be made, and the session will be assumed to
+            // be active.
+            var defaults = {
+                pollType: 'long',
+                pollServer: './ajaxim.php',
+                cookieName: 'ajaxim_session',
+                theme: 'themes/default',
+                storageMethod: 'auto',
+                flashStorage: 'js/jStore.Flash.html',
+                storeSession: 5, // number of days to store chat data (0 for current session only)
+                checkResume: true
+            };
+
+            // === {{{AjaxIM.}}}**{{{settings}}}** ===
+            //
+            // These are the settings for the IM. If particular options are not specified,
+            // the defaults (see above) will be used. //These options will be defined
+            // upon calling the initialization function, and not set directly.//
+            this.settings = $.extend(defaults, options);
+
+            // === {{{AjaxIM.}}}**{{{actions}}}** ===
+            //
+            // Each individual action that the IM engine can execute is predefined here.
+            // By default, it merely appends the action onto the end of the {{{pollServer}}} url,
+            // however, it is possible to define actions individually. //The alternative actions
+            // will be defined upon calling the initialization function, and not set directly.//
+            //
+            // Should you define an action at a different URL, Ajax IM will determine whether
+            // or not this URL is within the current domain. If it is within a subdomain of
+            // the current domain, it will set the document.domain variable for you,
+            // to match a broader hostname scope; the action will continue to use {{{$.post}}}
+            // (the default AJAX method for Ajax IM).
+            //
+            // On the other hand, should you choose a URL outside the current domain
+            // Ajax IM will switch to {{{$.getJSON}}} (a get request) to avoid
+            // cross-domain scripting issues. This means that a server on a different
+            // port or at a different address will need to be able to handle GET
+            // requests rather than POST requests (such as how the Node.JS Ajax IM
+            // server works).
+            this.actions = $.extend({
+                login: this.settings.pollServer + '/login',
+                logout: this.settings.pollServer + '/logout',
+                register: this.settings.pollServer + '/register',
+                poll: this.settings.pollServer + '/poll',
+                send: this.settings.pollServer + '/send',
+                status: this.settings.pollServer + '/status',
+                resume: this.settings.pollServer + '/resume'
+            }, actions);
+
+            var httpRx = new RegExp('^http://', 'i'),
+                slashslashRx = new RegExp('^//', 'i'),
+                queryStrRx = new RegExp('[?](.+)$'),
+                subdomainRx = new RegExp('((http[s]?:)?//)?(.+?)[.]' + window.location.host, 'i');
+            $.each(this.actions, function(name, action) {
+                if(name == 'poll' || name == 'send') {
+                    if(self.settings.pollType != 'comet')
+                        action += (queryStrRx.test(action[1]) ? '&' : '?') + 'callback=?';
+                        
+                    action = ['jsonp', action];
+                } else {
+                    action = ['ajax', action];
+                    if(subdomainRx.test(action[1])) {
+                        document.domain = '.' + window.location.host;
+                    } else if((http = httpRx.test(action[1])) || slashslashRx.test(action[1])) {
+                        if(!(new RegExp('//' + window.location.host + '/', 'i')).test(action[1])) {
+                            action[1] += (queryStrRx.test(action[1]) ? '&' : '?') + 'callback=?';
+                            action = ['jsonp', action[1]];
+                        }
+                    }
+                }
+                
+                self.actions[name] = action;
+            });
+            
+            // We load the theme dynamically based on the passed
+            // settings. If the theme is set to false, we assume
+            // that the user is going to load it himself.
+            this.themeLoaded = false;
+            if(this.settings.theme) {
+                $('<div></div>').appendTo('body').load(this.settings.theme + '/theme.html #imjs-bar, .imjs-tooltip',
+                    function() {
+                        self.themeLoaded = true;
+                        setup.apply(self);
+                    }
+                );
+                if(typeof document.createStyleSheet == 'function')
+                    document.createStyleSheet(this.settings.theme + '/theme.css');
+                else
+                    $('body').append('<link rel="stylesheet" href="' +
+                        this.settings.theme + '/theme.css" />');
+            } else {
+                this.themeLoaded = true;
+                setup.apply(this);
+            }
+            
+            // Client-side storage for keeping track of
+            // conversation states, active tabs, etc.
+            // The default is flash storage, however, other
+            // options are available via the jStore library.
+            if(this.settings.storageMethod) {
+                this.storageBrowserKey = 'unknown';
+                this.storeKey = '';
+                
+                $.each($.browser, function(k, v) {
+                    if(k == 'version') return true;
+                    else if(v == true) {
+                        self.storageBrowserKey = k;
+                        return false;
+                    }
+                });
+            
+                if(this.settings.storageMethod == 'auto') {
+                    $.each(['ie', 'html5', 'local', 'flash'], function() {
+                        if($.jStore.Availability[this]()) {
+                            self.settings.storageMethod = this;
+                            return false;
+                        }
+                    });
+                }
+            
+                $.extend($.jStore.defaults, {
+                    project: 'im.js',
+                    engine: this.settings.storageMethod,
+                    flash: this.settings.flashStorage
+                });
+                    
+                this.storageReady = false;
+                
+                if(this.settings.storageMethod == 'flash') {                    
+                    $.jStore.ready(function(engine) {
+                        $.jStore.flashReady(function() {
+                            self.storageReady = true;
+                            setup.apply(self);
+                        });
+                    })
+                } else {
+                    $.jStore.ready(function(engine) {
+                        self.storageReady = true;
+                        setup.apply(self);
+                    });
+                }
+                
+                $.jStore.load();
+            } else {
+                this.storageReady = true;
+                setup.apply(this);
+            }
+
+            // Allow a chatbox to me minimized
+            $('.imjs-chatbox').live('click', function(e) {
+                e.preventDefault();
+                return false;
+            });
+            
+            $('.imjs-chatbox .imjs-minimize').live('click', function() {
+                $(this).parents('.imjs-chatbox').data('tab').click();
+            });
+            
+            // Allow a chatbox to be closed
+            $('.imjs-chatbox .imjs-close').live('click', function() {
+                var chatbox = $(this).parents('.imjs-chatbox');
+                chatbox.data('tab')
+                    .data('state', 'closed').css('display', 'none');
+                    
+                if(self.settings.storageMethod && self.storageReady) {
+                    delete self.chatstore[chatbox.data('username')];
+                    if(self.storageReady) {
+                        $.jStore.store(
+                            self.storageBrowserKey + '-' +
+                            self.username + '-chats',
+                            self.chatstore);
+                    }
+                }
+            });
+            
+            // Setup message sending for all chatboxes
+            $('.imjs-chatbox .imjs-input').live('keydown', function(event) {               
+                var obj = $(this);
+                if(event.keyCode == 13 && !($.browser.msie && $.browser.version < 8)) {
+                    self.send(obj.parents('.imjs-chatbox').data('username'), obj.val());
+                }
+            }).live('keyup', function(event) {
+                if(event.keyCode == 13) {
+                    if($.browser.msie && $.browser.version < 8) {
+                        var obj = $(this);
+                        self.send(obj.parents('.imjs-chatbox').data('username'), obj.val());
+                    }
+
+                    var obj = $(this);
+                    obj.val('');
+                    obj.height(obj.data('height'));
+                }
+            }).live('keypress', function(e) {
+                var obj = $(this);
+                if(!($.browser.msie && $.browser.opera)) obj.height(0);
+                if(this.scrollHeight > obj.height() || this.scrollHeight < obj.height()) {
+                    obj.height(this.scrollHeight);
+                }
+            });
+            
+            $('.imjs-msglog').live('click', function() {
+                var chatbox = $(this).parents('.imjs-chatbox');
+                chatbox.find('.imjs-input').focus();
+            });
+            
+            // Create a chatbox when a buddylist item is clicked
+            $('.imjs-friend').live('click', function() {
+                var chatbox = self._createChatbox($(this).data('friend'));
+                
+                if(chatbox.data('tab').data('state') != 'active')
+                    chatbox.data('tab').click();
+                    
+                chatbox.find('.imjs-input').focus();
+            });
+            
+            // Setup and hide the scrollers
+            $('.imjs-scroll').css('display', 'none');
+            $('#imjs-scroll-left').live('click', function() {
+                var hiddenTab = $('#imjs-bar li.imjs-tab:visible').slice(-1)
+                    .next('#imjs-bar li.imjs-tab:hidden')
+                    .filter(function() {
+                        return $(this).data('state') != 'closed'
+                    })
+                    .not('.imjs-default').slice(-1).css('display', '');
+                    
+                if(hiddenTab.length) {
+                    $('#imjs-bar li.imjs-tab:visible').eq(0).css('display', 'none');
+                    $(this).html(parseInt($(this).html()) - 1);
+                    $('#imjs-scroll-right').html(parseInt($('#imjs-scroll-right').html()) + 1);
+                }
+
+                return false;
+            });
+            $('#imjs-scroll-right').live('click', function() {
+                var hiddenTab = $('#imjs-bar li.imjs-tab:visible').eq(0)
+                    .prev('#imjs-bar li.imjs-tab:hidden')
+                    .filter(function() {
+                        return $(this).data('state') != 'closed'
+                    })
+                    .not('.imjs-default').slice(-1).css('display', '');
+                    
+                if(hiddenTab.length) {
+                    $('#imjs-bar li.imjs-tab:visible').slice(-1).css('display', 'none');
+                    $(this).html(parseInt($(this).html()) - 1);
+                    $('#imjs-scroll-left').html(parseInt($('#imjs-scroll-left').html()) + 1);
+                }
+                
+                return false;
+            });
+            
+            // Initialize the chatbox hash
+            this.chats = {};
+            
+            // Try to resume any existing session
+            this.resume();
+            
+            $(window).resize(function() {
+                self.bar._scrollers();
+            });
+        } else
+            return AjaxIM.init(options);
+    };
+    
+    // We predefine all public functions here...
+    // If they are called before everything (theme, storage engine) has loaded,
+    // then they get put into a "prequeue" and run when everything *does*
+    // finally load.
+    //
+    // This ensures that nothing loads without all of the principal components
+    // being pre-loaded. If that were to occur (without this prequeue), things
+    // would surely break.
+    var prequeue = [];
+    var empty = function() {
+        var func = this;
+        return function() { prequeue.push([func, arguments]) };
+    };
+    $.extend(AjaxIM.prototype, {
+        settings: {},
+        friends: {},
+        chats: {},
+        
+        storage: empty.apply('storage'),
+        login: empty.apply('login'),
+        logout: empty.apply('logout'),
+        resume: empty.apply('resume'),
+        form: empty.apply('form'),
+        poll: empty.apply('poll'),
+        incoming: empty.apply('incoming'),
+        send: empty.apply('send'),
+        status: empty.apply('status'),
+        statuses: {},
+        bar: {
+            initialize: empty.apply('bar.initialize'),
+            activateTab: empty.apply('bar.activateTab'),
+            closeTab: empty.apply('bar.closeTab'),
+            addTab: empty.apply('bar.addTab'),
+            notification: empty.apply('bar.notification'),
+            _scrollers: empty.apply('bar._scrollers')
+        }
+    });
+    
+    setup = (function() {
+    var self = this;
+    if(!this.storageReady || !this.themeLoaded) return;
+    
+    $(self).trigger('loadComplete');
+    $(window).resize();
+    
+    $.extend(AjaxIM.prototype, {        
+        // == Cookies ==
+        //
+        // The "cookies" functions can be used to set, get, and erase JSON-based cookies.
+        // These functions are primarily used to manage and read the server-set cookie
+        // that handles the user's chat session ID.
+        cookies: {
+            // === {{{AjaxIM.}}}**{{{cookies.set(name, value, days)}}}** ===
+            //
+            // Sets a cookie, stringifying the JSON value upon storing it.
+            //
+            // ==== Parameters ====
+            // * {{{name}}} is the cookie name.\\
+            // * {{{value}}} is the cookie data that you would like to store.\\
+            // * {{{days}}} is the number of days that the cookie will be stored for.
+            set: function(name, value, days) {
+                if (days) {
+                    var date = new Date();
+                    date.setTime(date.getTime() + (days * 24 * 60 * 60 * 1000));
+                    var expires = "; expires=" + date.toGMTString();
+                } else var expires = "";
+                document.cookie = name + "=" + $.compactJSON(value) + expires + "; path=/";
+            },
+            
+            // === {{{AjaxIM.}}}**{{{cookies.get(name)}}}** ===
+            //
+            // Gets a cookie, decoding the JSON value before returning the data.
+            //
+            // ==== Parameters ====
+            // * {{{name}}} is the cookie name that you would like to retrieve.
+            get: function(name) {
+                var nameEQ = name + "=";
+                var ca = document.cookie.split(';');
+                for(var i = 0; i < ca.length; i++) {
+                    var c = ca[i];
+                    while (c.charAt(0) == ' ') c = c.substring(1, c.length);
+                    if (c.indexOf(nameEQ) == 0) {
+                      var cval = decodeURIComponent(c.substring(nameEQ.length, c.length));
+                      return $.secureEvalJSON(cval);
+                    }
+                }
+                return null;
+            },
+            
+            // === {{{AjaxIM.}}}**{{{cookies.erase(name)}}}** ===
+            //
+            // Deletes a cookie.
+            //
+            // {{{name}}} is the existing cookie that you would like to delete.
+            erase: function(name) {
+                self.cookies.set(name, '', -1);
+            }
+        },
+
+        // == Main ==
+        
+        // === {{{AjaxIM.}}}**{{{storage()}}}** ===
+        //
+        // Retrieves chat session data from whatever storage engine is enabled
+        // (provided that one is enabled at all). If a page reloads, this function
+        // is called to restore the user's chat state (existing conversations, active tab).
+        // This function is called //automatically//, upon initialization of the IM engine.
+        storage: function() {
+            if(!self.storeKey.length) return;
+            
+            try {
+                var chatstore = $.jStore.store(self.storeKey + 'chats') || {};
+            } catch(e) {
+                $.jStore.remove(self.storeKey + 'chats');
+                var chatstore = {};
+            }
+
+            if(this.chatstore) {            
+                $.each(this.chatstore, function(username, convo) {
+                    if(username in chatstore)
+                        chatstore[username] = $.merge(chatstore[username], self.chatstore[username]);
+                    else
+                        chatstore[username] = self.chatstore[username];
+                });
+                                
+                this.chatstore = chatstore;
+                $.jStore.store(self.storeKey + 'chats', chatstore);
+            } else {
+                this.chatstore = chatstore;
+            }
+            
+            $.each(this.chatstore, function(username, convo) {
+                if(!convo.length) return;
+                
+                var chatbox = self._createChatbox(username, true);
+                chatbox.data('lastDateStamp', null).css('display', 'none');
+                
+                // Remove the automatic date stamp
+                chatbox.find('.imjs-msglog').empty();
+                
+                // Restore all messages, date stamps, and errors
+                $.each(convo, function() {
+                    switch(this[0]) {
+                        case 'error':
+                            self._addError(chatbox, decodeURIComponent(this[2]), this[3]);
+                        break;
+                        
+                        case 'datestamp':
+                            self._addDateStamp(chatbox, this[3]);
+                        break;
+                        
+                        case 'a':
+                        case 'b':
+                            self._addMessage(this[0], chatbox, this[1],
+                                decodeURIComponent(this[2]), this[3]);
+                        break;
+                    }
+                });
+                
+                $(self).trigger('chatRestored', [username, chatbox]);
+            });
+            
+            var activeTab = $.jStore.store(self.storeKey + 'activeTab') || [];
+            if(activeTab.length && (activeTab = activeTab[0]) && activeTab in this.chats) {
+                this.chats[activeTab].data('tab').click();
+                var msglog = this.chats[activeTab].find('.imjs-msglog');
+                msglog[0].scrollTop = msglog[0].scrollHeight;
+            }
+        },
+        
+        // === {{{AjaxIM.}}}**{{{login(username, password)}}}** ===
+        //
+        // Authenticates a user and initializes the IM engine. If the user is
+        // already logged in, [s]he is logged out, the session is cleared, and
+        // the new user is logged in.
+        //
+        // Returns the user's properly formatted username, session ID, and online
+        // friends in JSON, if successful; e.g.:\\
+        // {{{ {u: 'username', s: 'longsessionid', f: [{u: 'friend', s: 1, g: 'group'}]} }}}
+        //
+        // If unsuccessful, {{{false}}} is returned.
+        //
+        // ==== Parameters ====
+        // * {{{username}}} is the user's username.\\
+        // * {{{password}}} is the user's password. This password will be MD5 hashed
+        // before it is sent to the server.
+        login: function(username, password) {
+            if(!username) username = '';
+            if(!password) password = '';
+            
+            if(this.username)
+                return true; // Already logged in!
+        
+            // hash password before sending it to the server
+            password = $.md5(password);
+
+            // authenticate
+            AjaxIM.request(
+                this.actions.login,
+                {'username': username, 'password': password},
+                function(auth) {
+                    if(auth.r == 'logged in') {
+                        self.username = ('u' in auth ? auth.u : username);
+                        
+                        if(self.settings.storageMethod)
+                            self.storeKey = [self.storageBrowserKey, self.username, ''].join('-');
+                            
+                        var existing = self.cookies.get(self.settings.cookieName);
+                        self.storage();
+                        
+                        // Begin the session
+                        $.each(auth.f, function() {
+                            self.friends[this.u] = {status: [this.s, ''], group: this.g};
+                        });
+                        self._session(self.friends);
+                        self._storeFriends();
+                        
+                        $(self).trigger('loginSuccessful', [auth]);
+                        
+                        return auth;
+                    } else {
+                        $(self).trigger('loginError', [auth]);
+                    }
+                    
+                    return false;
+                }
+            );
+        },
+        
+        // === {{{AjaxIM.}}}**{{{logout()}}}** ===
+        //
+        // Logs the user out and removes his/her session cookie. As well, it
+        // will close all existing chat windows, clear the storage engine, and
+        // remove the IM bar.
+        logout: function() {
+            AjaxIM.request(
+                this.actions.logout,
+                {},
+                function(done) {
+                    if(done) {
+                        self.cookies.erase(self.settings.cookieName);
+                        self._clearSession();
+                        $(self).trigger('logoutSuccessful');
+                        return true;
+                    } else {
+                        $(self).trigger('logoutError');
+                        return false;
+                    }
+                }
+            );
+        },
+        
+        // === {{{AjaxIM.}}}**{{{resume()}}}** ===
+        //
+        // Resumes an existing session based on a session ID stored in the
+        // server-set cookie. This function is called //automatically// upon IM
+        // engine (re-)initialization, so the user does not need to re-login
+        // should a session already exist.
+        resume: function() {
+            var session = this.cookies.get(this.settings.cookieName);
+            
+            if(session && session.sid) {
+                this.username = session.user;
+                
+                this.storeKey = [this.storageBrowserKey, this.username, ''].join('-');
+                
+                var friends = $.jStore.store(this.storeKey + 'friends') || [];
+                if(self.settings.checkResume) {
+                    AjaxIM.request(
+                        this.actions.resume,
+                        {},
+                        function(response) {
+                            if(response.r == 'connected') {
+                                self._session(friends);
+                                self.storage();
+                            } else {
+                                var username = this.username;
+                                self._clearSession();
+                                $(self).trigger('sessionNotResumed', [username]);
+                            }
+                        }
+                    );
+                } else {
+                    self._session(friends);
+                    self.storage();
+                }
+            } else {
+                $(self).trigger('noSession');
+            }
+        },
+        
+        // === //private// {{{AjaxIM.}}}**{{{_session(friends)}}}** ===
+        //
+        // Restores session data (username, friends) and begins polling the server.
+        // Called only by {{{AjaxIM.resume()}}}.
+        //
+        // ==== Parameters ====
+        // * {{{friends}}} is a list of "friend" objects, e.g.:\\
+        // {{{[{u: 'friend', s: 1, g: 'group'}, ...]}}}
+        // ** {{{u}}} being the friend's username.
+        // ** {{{s}}} being one of the available status codes (see {{{AjaxIM.statuses}}}), depending on the friend's current status.
+        // ** {{{g}}} being the group that the friend is in.
+        _session: function(friends) {
+            $('#imjs-friends-panel .imjs-header span').html(this.username);
+            $('#imjs-friends').removeClass('imjs-not-connected');
+            
+            $.each(friends, function(friend, info) {
+                self.addFriend.apply(self, [friend, info.status, info.group]);
+            });
+            self._storeFriends();
+            
+            $(self).trigger('sessionResumed', [this.username]);
+            
+            setTimeout(function() { self.poll(); }, 0);
+        },
+        
+        // === //private// {{{AjaxIM.}}}**{{{_clearSession()}}}** ===
+        //
+        // Clears all session data from the last known user.
+        _clearSession: function() {                    
+            if(self.settings.storageMethod && self.storageReady) {
+                $.jStore.remove(self.storeKey + 'chats');
+                $.jStore.remove(self.storeKey + 'friends');
+                $.jStore.remove(self.storeKey + 'activeTab');
+            }
+            
+            self.chats = {};
+            $('.imjs-tab').not('.imjs-tab.imjs-default').remove();
+            
+            self.cookies.erase('ajaxim_session');
+            delete self.username;
+        },
+        
+        // === {{{AjaxIM.}}}**{{{form(element)}}}** ===
+        //
+        // Loads a login and registration form into the specified element
+        // or, if no element is supplied, to the location on the page from
+        // which this function was called.
+        form: function(element) {
+            $(element).load(this.settings.theme + '/theme.html #imjs-lr', function() {
+                $('#imjs-lr .error').hide();
+                
+                if(self.username) {
+                    $('#imjs-register, #imjs-login fieldset').hide();
+                    $('#imjs-logged-in')
+                        .show()
+                        .html($('#imjs-logged-in').html().replace('{username}', self.username));
+                } else {
+                    $('#imjs-logged-in').hide();
+                }
+
+                // Handle logout success                
+                $(self).bind('logoutSuccessful', function() {
+                    $('#imjs-login fieldset').slideDown();
+                    $('#imjs-register').slideDown();
+                    
+                    $('#imjs-logged-in')
+                        .html($('#imjs-logged-in strong').html('{username}'))
+                        .slideUp();
+                });
+                $('#imjs-logged-in a').click(function() {
+                    self.logout();
+                    return false;
+                });
+
+                // Handle login error or success
+                $(self).bind('loginError', function() {
+                    $('#imjs-login .error').html(AjaxIM.i18n.authInvalid).slideDown('fast');
+                    $('#imjs-login input')
+                        .addClass('imjs-lr-error')
+                        .blur(function() { $(this).removeClass('imjs-lr-error'); });
+                }).bind('loginSuccessful', function() {
+                    $('#imjs-login fieldset').slideUp();
+                    $('#imjs-register').slideUp();
+                    
+                    $('#imjs-logged-in')
+                        .html($('#imjs-logged-in').html().replace('{username}', self.username))
+                        .slideDown();
+                });
+                var login = function() {
+                    self.login($('#imjs-login-username').val(), $('#imjs-login-password').val());
+                    return false;
+                };
+                $('#imjs-login').submit(login);
+                $('#imjs-login-submit').click(login);
+                
+                var regIssues = false;
+                var regError = function(error, fields) {
+                    $('#imjs-register .error')
+                        .append(AjaxIM.i18n['register' + error] + ' ')
+                        .slideDown();
+                    $(fields)
+                        .addClass('imjs-lr-error')
+                        .blur(function() { $(this).removeClass('imjs-lr-error'); });
+                    regIssues = true;
+                };
+                
+                var register = function() {
+                    $('#imjs-register .error').empty();
+                    
+                    regIssues = false;
+                    
+                    var username = $('#imjs-register-username').val();
+                    var password = $('#imjs-register-password').val();
+                    
+                    if(password.length < 4)
+                        regError('PasswordLength', '#imjs-register-password');
+                
+                    if(password != $('#imjs-register-cpassword').val())
+                        regError('PasswordMatch', '#imjs-register-password, #imjs-register-cpassword');
+                    
+                    if(username.length <= 2 ||
+                        !$('#imjs-register-username').val().match(/^[A-Za-z0-9_.]+$/))
+                        regError('UsernameLength', '#imjs-register-username');
+                    
+                    if(!regIssues) {
+                        AjaxIM.request(
+                            self.actions.register,
+                            {username: username, password: password},
+                            function(response) {
+                                if(response.r == 'registered') {
+                                    self.login(username, password);
+                                } else if(response.r == 'error') {
+                                    switch(response.e) {
+                                        case 'unknown':
+                                            regError('Unknown', '');
+                                        break;
+                                        
+                                        case 'invalid password':
+                                            regError('PasswordLength', '#imjs-register-password');
+                                        break;
+                                        
+                                        case 'invalid username':
+                                            regError('UsernameLength', '#imjs-register-username');
+                                        break;
+                                        
+                                        case 'username taken':
+                                            regError('UsernameTaken', '#imjs-register-username');
+                                        break;
+                                    }
+                                }
+                            },
+                            function(error) {
+                                regError('Unknown', '');
+                            }
+                        );
+                    }
+                    
+                    return false;
+                };
+                $('#imjs-register').submit(register);
+                $('#imjs-register-submit').click(register);
+            });
+        },
+        
+        // === {{{AjaxIM.}}}**{{{poll()}}}** ===
+        //
+        // Queries the server for new messages. If a 'long' or 'short' poll
+        // type is used, jQuery's {{{$.post}}} or {{{$.getJSON}}} will be
+        // used. If 'comet' is used, the server connection will be deferred
+        // to the comet set of functions.
+        poll: function() {
+            if(/^(short|long)$/.test(this.settings.pollType)) {
+                AjaxIM.request(
+                    this.actions.poll,
+                    {},
+                    function(response) {
+                        if(!response['e']) {
+                            if(response.length)
+                                self._parseMessages(response);
+                                
+                            setTimeout(function() { self.poll(); }, 0);                            
+                        } else {
+                            switch(response.e) {
+                                case 'no session found':
+                                    self._notConnected();
+                                break;
+                            }
+                            
+                            $(self).trigger('pollFailed', [response.e]);
+                        }
+                    },
+                    function(error) {
+                        self._notConnected();
+                        $(self).trigger('pollFailed', ['not connected']);
+                        // try reconnecting?
+                    }
+                );
+            } else if(this.settings.pollType == 'comet') {
+                this.comet.connect();
+            }
+        },
+        
+        // === //private// {{{AjaxIM.}}}**{{{_parseMessages(messages)}}}** ===
+        //
+        // Handles an incoming message array:\\
+        // {{{[{t: 'type', s: 'sender', r: 'recipient', m: 'message'}, ...]}}}
+        //
+        // * {{{t}}} (message type) is one of:
+        // ** {{{m}}} &mdash; a standard message
+        // ** {{{s}}} &mdash; a user's status update
+        // ** {{{b}}} &mdash; a broadcasted message (sent to many users simultaneously)
+        // * {{{s}}} is the sender of the message.
+        // * {{{r}}} is the intended recipient of the message. Most of the time, this will
+        // simply be the logged in user, however, a broadcasted message may not specify
+        // a recipient or may specify a different recipient. Also provides future
+        // compatability for chatrooms.
+        // * {{{m}}} is the actual message. For something such as a status update, this can
+        // be a JSON object or parsable string; e.g. {{{"2:I'm away."}}}
+        //
+        // ==== Parameters ====
+        // * {{{messages}}} is the message array
+        _parseMessages: function(messages) {
+            if($.isArray(messages)) {
+                $.each(messages, function() {
+                    $(self).trigger('parseMessage', [this]);
+                    
+                    switch(this.t) {
+                        case 'm':
+                            self.incoming(this.s, this.m);
+                        break;
+                        
+                        case 's':
+                            var status = this.m.split(':');
+                            if(this['g'])
+                                self.addFriend(this.s, status, this.g);
+                            self._friendUpdate(this.s, status[0], status.slice(1).join(':'));
+                            self._storeFriends();
+                        break;
+    
+                        case 'b':
+                        break;
+                        
+                        default:
+                        break;
+                    }
+                });
+            }
+        },
+        
+        // === {{{AjaxIM.}}}**{{{incoming(from, message)}}}** ===
+        //
+        // Handles a new message from another user. If a chatbox for that
+        // user does not yet exist, one is created. If it does exist, but
+        // is minimized, the user is notified but the chatbox is not brought
+        // to the front. This function also stores the message, if a storage
+        // method is set.
+        //
+        // ==== Parameters ====
+        // * {{{from}}} is the username of the sender.
+        // * {{{message}}} is the body.
+        incoming: function(from, message) {
+            // check if IM exists, otherwise create new window
+            // TODO: If friend is not on the buddylist,
+            // should add them to a temp list?
+            var chatbox = this._createChatbox(from);
+            
+            if(!$('#imjs-bar .imjs-selected').length) {
+                chatbox.data('tab').click();
+            } else if(chatbox.data('tab').data('state') != 'active') {
+                this.bar.notification(chatbox.data('tab'));
+            }
+            
+            var time = this._addMessage('b', chatbox, from, message);
+            this._storeMessage('b', chatbox, from, message, time);
+        },
+        
+        // === {{{AjaxIM.}}}**{{{addFriend(username, group)}}}** ===
+        //
+        // Inserts a new friend into the friends list. If the group specified
+        // doesn't exist, it is created. If the friend is already in this group,
+        // they aren't added again, however, the friend item is returned.
+        //
+        // ==== Parameters ====
+        // * {{{username}}} is the username of the new friend.
+        // * {{{status}}} is the current status of the friend.
+        // * {{{group}}} is the user group to which the friend should be added.
+        addFriend: function(username, status, group) {
+            var status_name = 'available';
+            $.each(this.statuses,
+                function(key, val) { if(status[0] == val) { status_name = key; return false; } });
+
+            var group_id = 'imjs-group-' + $.md5(group);
+            
+            if(!(group_item = $('#' + group_id)).length) {
+                var group_item = $('.imjs-friend-group.imjs-default').clone()
+                        .removeClass('imjs-default')
+                        .attr('id', group_id)
+                        .data('group', group)
+                        .appendTo('#imjs-friends-list');
+                        
+                var group_header = group_item.find('.imjs-friend-group-header');
+                group_header.html(group_header.html().replace('{group}', group));
+            }
+            
+            var user_id = 'imjs-friend-' + $.md5(username + group);
+            
+            if(!$('#' + user_id).length) {
+                var user_item = group_item.find('ul li.imjs-default').clone()
+                        .removeClass('imjs-default')
+                        .addClass('imjs-' + status_name)
+                        .attr('id', user_id)
+                        .data('friend', username)
+                        .appendTo(group_item.find('ul'));
+                if(status[0] == 0) user_item.hide();
+                user_item.html(user_item.html().replace('{username}', username));
+            }
+                        
+            this.friends[username] = {'status': status, group: group};
+            
+            this._updateFriendCount();
+            
+            return this.friends[username];
+        },
+        
+        // === //private// {{{AjaxIM.}}}**{{{_updateFriendCount()}}}** ===
+        //
+        // Counts the number of online friends and updates the friends count
+        // in the friend tab.
+        _updateFriendCount: function() {
+            var friendsLength = 0;
+            for(var f in this.friends) {
+                if(this.friends[f].status[0] != 0)
+                    friendsLength++;
+            }
+            $('#imjs-friends .imjs-tab-text span span').html(friendsLength);
+        },
+        
+        // === //private// {{{AjaxIM.}}}**{{{_storeFriends()}}}** ===
+        //
+        // If a storage method is enabled, the current state of the
+        // user's friends list is stored.
+        _storeFriends: function() {
+            if(this.settings.storageMethod && this.storageReady)
+                $.jStore.store(this.storeKey + 'friends', this.friends);
+        },
+        
+        // === //private// {{{AjaxIM.}}}**{{{_createChatbox(username)}}}** ===
+        //
+        // Builds a chatbox based on the default chatbox HTML and CSS defined
+        // in the current theme. Should a chatbox for this user already exist,
+        // a new one is not created. Instead, it is either given focus (should
+        // no other windows already have focus), or a notification is issued.
+        //
+        // As well, if the chatbox does not exist, an associated tab will be
+        // created.
+        //
+        // ==== Parameters ====
+        // * {{{username}}} is the name of the user for whom the chatbox is intended
+        // for.
+        // * {{{no_stamp}}} sets whther or not to add a date stamp to the chatbox
+        // upon creation.
+        //
+        // //Note:// New chatboxes are given an automatically generated ID in the
+        // format of {{{#imjs-[md5 of username]}}}.
+        _createChatbox: function(username, no_stamp) {
+            var chatbox_id = 'imjs-' + $.md5(username);
+            if(!(chatbox = $('#' + chatbox_id)).size()) {
+                // add a tab
+                var tab = this.bar.addTab(username, '#' + chatbox_id);
+                var chatbox = tab.find('.imjs-chatbox');
+                chatbox.attr('id', chatbox_id);
+
+                chatbox.data('tab', tab);
+                
+                // remove default items from the message log
+                var message_log = chatbox.find('.imjs-msglog').empty();
+                
+                // setup the chatbox header
+                var cb_header = chatbox.find('.imjs-header');
+                cb_header.html(cb_header.html().replace('{username}', username));
+                
+                if(!no_stamp) {
+                    // add a date stamp
+                    var time = this._addDateStamp(chatbox);
+                    this._storeNonMessage('datestamp', username, null, time);
+                }
+                
+                // associate the username with the object and vice-versa
+                this.chats[username] = chatbox;
+                chatbox.data('username', username);
+                
+                // did this chatbox fall down?
+                this.bar._scrollers();
+                
+                if(username in this.friends) {
+                    status = this.friends[username].status;
+                    var status_name = 'available';
+                    $.each(this.statuses,
+                        function(key, val) { if(status[0] == val) { status_name = key; return false; } });
+                    tab.addClass('imjs-' + status_name);
+                }
+                
+                // store inputbox height
+                //var input = chatbox.find('.imjs-input');
+                //input.data('height', input.height());
+            } else if(chatbox.data('tab').data('state') == 'closed') {
+                chatbox.find('.imjs-msglog > *').addClass('imjs-msg-old');
+                
+                var tab = chatbox.data('tab');
+                if(tab.css('display') == 'none')
+                    tab.css('display', '').removeClass('imjs-selected')
+                        .appendTo('#imjs-bar');
+                
+                if(!no_stamp) {
+                    // possibly add a date stamp
+                    var time = this._addDateStamp(chatbox);
+                    this._storeNonMessage('datestamp', username, null, time);
+                }
+                    
+                if(!$('#imjs-bar .imjs-selected').length) {
+                    tab.click();
+                } else {
+                    this.bar.notification(tab);
+                }
+            }
+            
+            return chatbox;
+        },
+        
+        // === //private// {{{AjaxIM.}}}**{{{_addDateStamp(chatbox)}}}** //
+        //
+        // Adds a date/time notifier to a chatbox. These are generally
+        // inserted upon creation of a chatbox, or upon the date changing
+        // since the last time a date stamp was added. If a date stamp for
+        // the current date already exists, a new one will not be added.
+        //
+        // ==== Parameters ====
+        // * {{{chatbox}}} refers to the jQuery-selected chatbox DOM element.
+        // * {{{time}}} is the date/time the date stamp will show. It is specified
+        // in milliseconds since the Unix Epoch. This is //only// defined when
+        // date stamps are being restored from storage; if not specified, the
+        // current computer time will be used.
+        _addDateStamp: function(chatbox, time) {
+            var message_log = $(chatbox).find('.imjs-msglog');
+            if(!time)
+               time = (new Date()).getTime();
+ 
+            var date_stamp = $('.imjs-tab.imjs-default .imjs-chatbox .imjs-msglog .imjs-date').clone();
+            var date_stamp_time = date_stamp.find('.imjs-msg-time');
+            if(date_stamp_time.length)
+                date_stamp_time.html(AjaxIM.dateFormat(time, date_stamp_time.html()));
+            
+            var date_stamp_date = date_stamp.find('.imjs-date-date');
+            var formatted_date = AjaxIM.dateFormat(time, date_stamp_date.html());
+            if(chatbox.data('lastDateStamp') != formatted_date) {
+                if(date_stamp_date.length)
+                    date_stamp_date.html(AjaxIM.dateFormat(time, date_stamp_date.html()));
+            
+                chatbox.data('lastDateStamp', formatted_date);
+                date_stamp.appendTo(message_log);
+            } else {
+                //$('<div></div>').appendTo(message_log);
+            }
+            
+            return time;
+        },
+        
+        // === //private// {{{AjaxIM.}}}**{{{_addError(chatbox, error)}}}** //
+        //
+        // Adds an error to a chatbox. These are generally inserted after
+        // a user sends a message unsuccessfully. If an error message
+        // was already added, another one will be added anyway.
+        //
+        // ==== Parameters ====
+        // * {{{chatbox}}} refers to the jQuery-selected chatbox DOM element.
+        // * {{{error}}} is the error message string.
+        // * {{{time}}} is the date/time the error occurred. It is specified in
+        // milliseconds since the Unix Epoch. This is //only// defined when
+        // errors are being restored from storage; if not specified, the current
+        // computer time will be used.
+        _addError: function(chatbox, error, time) {
+            var message_log = $(chatbox).find('.imjs-msglog');
+ 
+            var error_item =
+                $('.imjs-tab.imjs-default .imjs-chatbox .imjs-msglog .imjs-error').clone();
+                
+            var error_item_time = error_item.find('.imjs-msg-time');
+            if(error_item_time.length) {
+                if(!time)
+                    time = (new Date()).getTime();
+                error_item_time.html(AjaxIM.dateFormat(time, error_item_time.html()));
+            }
+
+            error_item.find('.imjs-error-error').html(error);
+            error_item.appendTo(message_log);
+            
+            message_log[0].scrollTop = message_log[0].scrollHeight;
+        },
+        
+        // === //private// {{{AjaxIM.}}}**{{{_addMessage(ab, chatbox, username, message, time)}}}** //
+        //
+        // Adds a message to a chatbox. Depending on the {{{ab}}} value,
+        // the color of the username may change as a way of visually
+        // identifying users (however, this depends on the theme's CSS).
+        // A timestamp is added to the message, and the chatbox is scrolled
+        // to the bottom, such that the new message is visible.
+        //
+        // Messages will be automatically tag-escaped, so as to prevent
+        // any potential cross-site scripting problems. Additionally,
+        // URLs will be automatically linked.
+        //
+        // ==== Parameters ====
+        // * {{{ab}}} refers to whether the user is "a" or "b" in a conversation.
+        // For the general case, "you" are "a" and "they" are "b".
+        // * {{{chatbox}}} refers to the jQuery-selected chatbox DOM element.
+        // * {{{username}}} is the username of the user who sent the message.
+        // * {{{time}}} is the time the message was sent in milliseconds since
+        // the Unix Epoch. This is //only// defined when messages are being 
+        // restored from storage. For new messages, the current computer
+        // time is automatically used.
+        _addMessage: function(ab, chatbox, username, message, time) {
+            var last_message = chatbox.find('.imjs-msglog > *:last-child');
+            if(last_message.hasClass('imjs-msg-' + ab)) {
+                // Last message was from the same person, so let's just add another imjs-msg-*-msg
+                var message_container = (last_message.hasClass('imjs-msg-' + ab + '-container') ?
+                    last_message :
+                    last_message.find('.imjs-msg-' + ab + '-container'));
+                    
+                var single_message =
+                    $('.imjs-tab.imjs-default .imjs-chatbox .imjs-msglog .imjs-msg-' + ab + '-msg')
+                    .clone().appendTo(message_container);
+                
+                single_message.html(single_message.html().replace('{username}', username));
+            } else if(!last_message.length || !last_message.hasClass('imjs-msg-' + ab)) {
+                var message_group = $('.imjs-tab.imjs-default .imjs-chatbox .imjs-msg-' + ab)
+                    .clone().appendTo(chatbox.find('.imjs-msglog'));
+                message_group.html(message_group.html().replace('{username}', username));
+                
+                var single_message = message_group.find('.imjs-msg-' + ab + '-msg');
+            }
+            
+            // clean up the message
+            message = message.replace(/</g, '&lt;').replace(/>/g, '&gt;')
+                        .replace(/(^|.*)\*([^*]+)\*(.*|$)/, '$1<strong>$2</strong>$3');
+            
+            // autolink URLs
+            message = message.replace(
+                new RegExp('([A-Za-z][A-Za-z0-9+.-]{1,120}:[A-Za-z0-9/]' +
+                '(([A-Za-z0-9$_.+!*,;/?:@&~=-])|%[A-Fa-f0-9]{2}){1,333}' +
+                '(#([a-zA-Z0-9][a-zA-Z0-9$_.+!*,;/?:@&~=%-]{0,1000}))?)', 'g'),
+                '<a href="$1" target="_blank">$1</a>');
+            
+            // insert the message
+            single_message.html(single_message.html().replace('{message}', message));
+            
+            // set the message time
+            var msgtime = single_message.find('.imjs-msg-time');
+            if(!time)
+                time = new Date();
+        
+            if(typeof time != 'string')
+                time = AjaxIM.dateFormat(time, msgtime.html());
+            
+            msgtime.html(time);
+            
+            var msglog = chatbox.find('.imjs-msglog');
+            msglog[0].scrollTop = msglog[0].scrollHeight;
+            
+            return time;
+        },
+        
+        // === //private// {{{AjaxIM.}}}**{{{_storeNonMessage(type, username, data, time)}}}** ===
+        //
+        // **Redundant?**\\
+        // Similar to {{{AjaxIM._storeMessage}}}, but stores items that aren't messages,
+        // such as datestamps and errors.
+        //
+        // ==== Parameters ====
+        // * {{{type}}} is the type of non-message (error, datestamp).
+        // * {{{username}}} is the username of the user being chatted with.
+        // * {{{data}}} is the (optional) data of the non-message to be stored.
+        // * {{{time}}} is the time of the message.
+        _storeNonMessage: function(type, username, data, time) {
+            // If storage is on & ready, store the non-message
+            if(this.settings.storageMethod) {
+                if(!this.chatstore) this.chatstore = {};                 
+                if(!(username in this.chatstore)) this.chatstore[username] = [];
+                
+                // If the chat store gets too long, it becomes slow to load.
+                if(this.chatstore[username].length > 300)
+                    this.chatstore[username].shift();
+                
+                // For some reason, if we don't encode and decode the message, it *will* break
+                // (at least) the Flash storage engine's retrieval. Gah!
+                this.chatstore[username].push(
+                    [type, username, encodeURIComponent(data), time]);
+                
+                if(this.storageReady) $.jStore.store(self.storeKey + 'chats', this.chatstore);
+            }
+        },
+        
+        // === //private// {{{AjaxIM.}}}**{{{_storeMessage(ab, chatbox, username, message, time)}}}** ===
+        //
+        // Taking the same arguments as {{{AjaxIM._addMessage}}}, {{{_storeMessage}}} pushes a message
+        // into the storage hash, if storage is enabled.
+        //
+        // Messages are added to a message array, by username. The entire chat hash is stored as
+        // a {{{'chats'}}} object in whatever storage engine is enabled.
+        _storeMessage: function(ab, chatbox, username, message, time) {
+            // If storage is on & ready, store the message
+            if(this.settings.storageMethod) {
+                if(!this.chatstore) this.chatstore = {}; 
+                
+                message = message.replace(/</g, '&lt;').replace(/>/g, '&gt;');
+                
+                if(!(username in this.chatstore)) {
+                    this.chatstore[username] = [];
+                } else if(this.chatstore[username].length > 300) {
+                    // If the chat store gets too long, it becomes slow to load.
+                    this.chatstore[username].shift();
+                }
+                
+                // For some reason, if we don't encode and decode the message, it *will* break
+                // (at least) the Flash storage engine's retrieval. Gah!
+                this.chatstore[chatbox.data('username')].push(
+                    [ab, username, encodeURIComponent(message), time]);
+                
+                if(this.storageReady) $.jStore.store(this.storeKey + 'chats', this.chatstore);
+            }
+        },
+        
+        // === //private// {{{AjaxIM.}}}**{{{_friendUpdate(friend, status, statusMessage)}}}** ===
+        //
+        // Called when a friend's status is updated. This function will update all locations
+        // where a status icon is displayed (chat tab, friends list), as well as insert
+        // a notification, should a chatbox be open.
+        //
+        // ==== Parameters ====
+        // * {{{friend}}} is the username of the friend.
+        // * {{{status}}} is the new status code. See {{{AjaxIM.statuses}}} for a list of available
+        // codes. //Note: If an invalid status is specified, no action will be taken.//
+        // * {{{statusMessage}}} is a message that was, optionally, specified by the user. It will be
+        // used should "you" send the user an IM while they are away, or if their status is viewed
+        // in another way (such as via the friends list [**not yet implemented**]).
+        _friendUpdate: function(friend, status, statusMessage) {
+            // add friend to buddylist, update their status, etc.           
+            var status_name = 'available';
+            $.each(this.statuses,
+                function(key, val) { if(status == val) { status_name = key; return false; } });
+
+            if(this.chats[friend]) {
+                var tab = this.chats[friend].data('tab');
+                var tab_class = 'imjs-tab';
+                if(tab.data('state') == 'active') tab_class += ' imjs-selected';
+                tab_class += ' imjs-' + status_name;
+                
+                tab.attr('class', tab_class);
+                
+                // display the status in the chatbox
+                var date_stamp =
+                    $('.imjs-tab.imjs-default .imjs-chatbox .imjs-msglog .imjs-date').clone();
+                    
+                var date_stamp_time = date_stamp.find('.imjs-msg-time');
+                if(date_stamp_time.length)
+                    date_stamp_time.html(AjaxIM.dateFormat(date_stamp_time.html()));
+                
+                var date_stamp_date = date_stamp.find('.imjs-date-date').html(
+                    AjaxIM.i18n[
+                        'chat' + status_name[0].toUpperCase() + status_name.slice(1)
+                    ].replace(/%s/g, friend));
+                
+                var msglog = this.chats[friend].find('.imjs-msglog');
+                date_stamp.appendTo(msglog);
+                msglog[0].scrollTop = msglog[0].scrollHeight;
+            }
+            
+            if(this.friends[friend]) {
+                var friend_id = 'imjs-friend-' + $.md5(friend + this.friends[friend].group);
+                $('#' + friend_id).attr('class', 'imjs-friend imjs-' + status_name);
+                
+                if(status == 0) {
+                    $('#' + friend_id + ':visible').slideUp();
+                    $('#' + friend_id + ':hidden').hide();
+                } else if(!$('#' + friend_id + ':visible').length) {
+                    $('#' + friend_id).slideDown();
+                }
+                
+                this.friends[friend].status = [status, statusMessage];
+                this._updateFriendCount();
+            }
+        },
+        
+        // === //private// {{{AjaxIM.}}}**{{{_notConnected()}}}** ===
+        //
+        // Puts the user into a visible state of disconnection. Sets the
+        // friends list to "not connected" and empties it; disallows new messages
+        // to be sent.
+        _notConnected: function() {
+            $('#imjs-friends').addClass('imjs-not-connected').unbind('click', this.activateTab);
+        },
+        
+        // === {{{AjaxIM.}}}**{{{send(to, message)}}}** ===
+        //
+        // Sends a message to another user. The message will be added
+        // to the chatbox before it is actually sent, however, if an
+        // error occurs during sending, that will be indicated immediately
+        // afterward.
+        //
+        // After sending the message, one of three status codes should be
+        // returned as a JSON object, e.g. {{{{r: 'code'}}}}:
+        // * {{{ok}}} &mdash; Message was sent successfully.
+        // * {{{offline}}} &mdash; The user is offline or unavailable to
+        // receive messages.
+        // * {{{error}}} &mdash; a problem occurred, unrelated to the user
+        // being unavailable.
+        //
+        // ==== Parameters ====
+        // * {{{to}}} is the username of the recipient.
+        // * {{{message}}} is the content to be sent.
+        send: function(to, message) {         
+            if(!message) return;
+               
+            if(this.chats[to]) { // REMOVE ME?
+                // possibly add a datestamp
+                var time = self._addDateStamp(this.chats[to]);
+                this._storeNonMessage('datestamp', to, null, time);
+                
+                time = this._addMessage('a', this.chats[to], this.username, message);                
+                this._storeMessage('a', this.chats[to], this.username, message, time);
+            }
+            
+            $(self).trigger('sendingMessage', [to, message]);
+            
+            AjaxIM.request(
+                this.actions.send,
+                {'to': to, 'message': message},
+                function(result) {
+                    switch(result.r) {
+                        case 'ok':
+                            $(self).trigger('sendMessageSuccessful', [to, message]);
+                        break;
+                        
+                        case 'offline':
+                            $(self).trigger('sendMessageFailed', ['offline', to, message]);
+                        break;
+                        
+                        case 'error':
+                        default:
+                            if(result.e == 'no session found') {
+                                self._notConnected();
+                                self._addError(self.chats[to], AjaxIM.i18n.notConnected);
+                                self._storeNonMessage('error', to,
+                                    AjaxIM.i18n.notConnected, (new Date()).getTime());
+                            }
+                            
+                            $(self).trigger('sendMessageFailed', [result.e, to, message]);
+                        break;
+                    }
+                },
+                function(error) {
+                    self._notConnected();
+                    self._addError(self.chats[to], AjaxIM.i18n.notConnected);
+                    self._storeNonMessage('error', to,
+                        AjaxIM.i18n.notConnected, (new Date()).getTime());
+                        
+                    $(self).trigger('sendMessageFailed', ['not connected', to, message]);
+                }
+            );
+        },
+        
+        // === {{{AjaxIM.}}}**{{{status(s, message)}}}** ===
+        //
+        // Sets the user's status and status message. It is possible to not
+        // set a status message by setting it to an empty string. The status
+        // will be sent to the server, where upon the server will broadcast
+        // the update to all individuals with "you" on their friends list.
+        //
+        // ==== Parameters ====
+        // * {{{s}}} is the status code, as defined by {{{AjaxIM.statuses}}}.
+        // * {{{message}}} is the custom status message.
+        status: function(s, message) {
+            // update status icon(s)
+            if(!this.statuses[s])
+                return;
+                
+            $('#imjs-friends').attr('class', 'imjs-' + s);
+            
+            $(self).trigger('changingStatus', [s, message]);
+            
+            AjaxIM.request(
+                this.actions.status,
+                {'status': this.statuses[s], 'message': message},
+                function(result) {
+                    switch(result.r) {
+                        case 'ok':
+                            $(self).trigger('changeStatusSuccessful', [s, message]);
+                        break;
+                        
+                        case 'error':
+                        default:
+                            $(self).trigger('changeStatusFailed', [result.e, s, message]);
+                        break;
+                    }
+                },
+                function(error) {
+                    $(self).trigger('changeStatusFailed', ['not connected', s, message]);
+                }
+            );
+        },
+        
+        // === {{{AjaxIM.}}}**{{{statuses}}}** ===
+        //
+        // These are the available status codes and their associated identities:
+        // * {{{offline}}} (0) &mdash; Only used when signing out/when another
+        // user has signed out, as once this status is set, the user is removed
+        // from the server and friends will be unable to contact the user.
+        // * {{{available}}} (1) &mdash; The user is online and ready to be messaged.
+        // * {{{away}}} (2) &mdash; The user is online but is not available. Others
+        // may still contact this user, however, the user may not respond. Anyone
+        // contacting an away user will receive a notice stating that the user is away,
+        // and (if one is set) their custom status message.
+        // * {{{invisible}}} (3; **not yet implemented**) &mdash; The user is online,
+        // but other users are made unaware, and the user will be represented
+        // as being offline. It is still possible to contact this user, and for this
+        // user to contact others; no status message or notice will be sent to others
+        // messaging this user.
+        statuses: {offline: 0, available: 1, away: 2, invisible: 3},
+        
+        // == Footer bar ==
+        //
+        // The footer bar is the bar that sits at the bottom of the page, in a fixed
+        // position. It contains a tab for the friends list, and tabs for any open
+        // chat boxes. It is also possible to add custom tabs for other functionality.
+        bar: {
+            // === {{{AjaxIM.}}}**{{{bar.initialize()}}}** ===
+            //
+            // Setup the footer bar and enable tab actions. This function
+            // uses {{{jQuery.live}}} to set hooks on any bar tabs created
+            // in the future.
+            initialize: function() {
+                // Set up your standard tab actions
+                $('.imjs-tab')
+                    .live('click', this.activateTab);
+                    
+                $('.imjs-tab .imjs-close')
+                    .live('click', this.closeTab);
+            
+                // Set up the friends list actions
+                var self = this;
+                $(document).click(function(e) {
+                    if(e.target.id == 'imjs-friends' ||
+                        $(e.target).parents('#imjs-friends').length) {    
+                        return;
+                    }
+                    
+                    if($('#imjs-friends').data('state') == 'active')
+                        self.activateTab.call($('#imjs-friends'));
+                });
+                $('#imjs-friends')
+                    .data('state', 'minimized')
+                    .click(function(e) {
+                        if(!$(this).hasClass('imjs-not-connected') &&
+                            e.target.id != 'imjs-friends-panel' &&
+                            !$(e.target).parents('#imjs-friends-panel').length)
+                            self.activateTab.call(this);
+                    })
+                    .mouseenter(function() {
+                        if($(this).hasClass('imjs-not-connected')) {
+                            $('.imjs-tooltip').css('display', 'block');
+                            $('.imjs-tooltip p').html(AjaxIM.i18n.notConnectedTip);
+
+                            var tip_left = $(this).offset().left -
+                                $('.imjs-tooltip').outerWidth() +
+                                ($(this).outerWidth() / 2);
+                            var tip_top = $(this).offset().top -
+                                $('.imjs-tooltip').outerHeight(true);
+
+                            $('.imjs-tooltip').css({
+                                    left: tip_left,
+                                    top: tip_top
+                                });
+                        }
+                    })
+                    .mouseleave(function() {
+                        if($(this).hasClass('imjs-not-connected')) {
+                            $('.imjs-tooltip').css('display', '');
+                        }
+                    });
+                $('#imjs-friends-panel')
+                    .data('tab', $('#imjs-friends'))
+                    .css('display', 'none');
+            },
+            
+            // === {{{AjaxIM.}}}**{{{bar.activateTab()}}}** ===
+            //
+            // Activate a tab by setting it to the 'active' state and
+            // showing any related chatbox. If a chatbox is available
+            // for this tab, also focus the input box.
+            //
+            // //Note:// {{{this}}}, here, refers to the tab DOM element.
+            activateTab: function() {
+                var chatbox = $(this).find('.imjs-chatbox') || false;
+
+                if($(this).data('state') != 'active') {
+                    if($(this).attr('id') != 'imjs-friends') {
+                        $('#imjs-bar > li')
+                            .not($(this))
+                            .not('#imjs-friends')
+                            .removeClass('imjs-selected')
+                            .each(function() {
+                                if($(this).data('state') != 'closed') {
+                                    $(this).data('state', 'minimized');
+                                    var chatbox = $(this).find('.imjs-chatbox');
+                                    if(chatbox.length)
+                                        chatbox.css('display', 'none');
+                                }
+                            });
+                    }
+                    
+                    if(chatbox && chatbox.css('display') == 'none')
+                        chatbox.css('display', '');
+                    
+                    // set the tab to active...
+                    var tab = $(this).addClass('imjs-selected').data('state', 'active');
+                    
+                    // ...and hide and reset the notification icon
+                    tab.find('.imjs-notification').css('display', 'none')
+                        .data('count', 0);
+                    
+                    if(self.settings.storageMethod && self.storageReady &&
+                        chatbox && (username = chatbox.data('username'))) { 
+                        $.jStore.store(self.storeKey + 'activeTab', [username]);
+                    }
+                    
+                    $(self).trigger('tabToggled', ['activated', tab]);
+                } else {
+                    var tab = $(this).removeClass('imjs-selected').data('state', 'minimized');
+                    
+                    if(chatbox && chatbox.css('display') != 'none')
+                        chatbox.css('display', 'none');
+                    
+                    if(self.settings.storageMethod && self.storageReady) { 
+                        $.jStore.store(self.storeKey + 'activeTab', ['*']);
+                    }
+                    
+                    $(self).trigger('tabToggled', ['minimized', tab]);
+                }
+                
+                if(chatbox) {
+                    if(!(input = chatbox.find('.imjs-input')).data('height')) {
+                        // store the height for resizing later
+                        input.data('height', input.height());
+                    }
+                    
+                    try {
+                        var msglog = chatbox.find('.imjs-msglog');
+                        msglog[0].scrollTop = msglog[0].scrollHeight;
+                    } catch(e) {}
+                    
+                    try { chatbox.find('.imjs-input').focus(); } catch(e) {}
+                }
+            },
+            
+            // === {{{AjaxIM.}}}**{{{bar.closeTab()}}}** ===
+            //
+            // Close a tab and hide any related chatbox, such that
+            // the chatbox can not be reopened without reinitializing
+            // the tab.
+            //
+            // //Note:// {{{this}}}, here, refers to the tab DOM element.
+            closeTab: function() {
+                var tab = $(this).parents('.imjs-tab');
+                tab.css('display', 'none').data('state', 'closed');
+
+                if(self.settings.storageMethod && self.storageReady) {
+                    delete self.chatstore[tab.find('.imjs-chatbox').data('username')];
+                    if(self.storageReady) $.jStore.store(self.storeKey + 'chats', self.chatstore);
+                }
+
+                $(self).trigger('tabToggled', ['closed', tab]);
+
+                self.bar._scrollers();
+
+                return false;
+            },
+            
+            // === {{{AjaxIM.}}}**{{{bar.addTab(label, action, closable)}}}** ===
+            //
+            // Adds a tab to the tab bar, with the label {{{label}}}. When
+            // clicked, it will call a callback function, {{{action}}}. If
+            // {{{action}}} is a string, it is assumed that the string is
+            // referring to a chatbox ID.
+            //
+            // ==== Parameters ====
+            // * {{{label}}} is the text that will be displayed on the tab.\\
+            // * {{{action}}} is the callback function, if it is a non-chatbox
+            // tab, or a string if it //is// a chatbox tab.\\
+            // * {{{closable}}} is a boolean value that determines whether or not
+            // it is possible for a user to close this tab.
+            //
+            // //Note:// New tabs are given an automatically generated ID
+            // in the format of {{{#imjs-tab-[md5 of label]}}}.
+            addTab: function(label, action, closable) {
+                var tab = $('.imjs-tab.imjs-default').clone().insertAfter('#imjs-scroll-right');
+                tab.removeClass('imjs-default')
+                    .attr('id', 'imjs-tab-' + $.md5(label))
+                    .html(tab.html().replace('{label}', label))
+                    .data('state', 'minimized');
+                    
+                var notification = tab.find('.imjs-notification');
+                notification.css('display', 'none')
+                    .data('count', 0)
+                    .data('default-text', notification.html())
+                    .html(notification.html().replace('{count}', '0'));
+                
+                if(closable === false)
+                    tab.find('.imjs-close').eq(0).remove();
+                
+                if(typeof action == 'string') {
+                    //tab.data('chatbox', action);
+                } else {
+                    tab.find('.imjs-chatbox').remove();
+                    tab.click(action);
+                }
+                
+                return tab;
+            },
+            
+            // === {{{AjaxIM.}}}**{{{bar.notification(tab)}}}** ===
+            //
+            // Displays a notification on a tab. Generally, this is called when
+            // a tab is minimized to let the user know that there is an update
+            // for them. The way the notification is displayed depends on the
+            // theme CSS.
+            //
+            // ==== Parameters ====
+            // * {{{tab}}} is the jQuery-selected tab DOM element.
+            notification: function(tab) {
+                var notify = tab.find('.imjs-notification');
+                var notify_count = notify.data('count') + 1;
+                
+                notify.data('count', notify_count)
+                    .html(notify.data('default-text').replace('{count}', notify_count))
+                    .css('display', '');
+            },
+            
+            // === //private// {{{AjaxIM.}}}**{{{bar._scrollers()}}}** ===
+            //
+            // Document me!
+            _scrollers: function() {
+                var needScrollers = false;
+                $('.imjs-tab').filter(function() {
+                    return $(this).data('state') != 'closed'
+                }).css('display', '');
+                
+                $.each(self.chats, function(username, chatbox) {
+                    var tab = chatbox.data('tab');
+                    if(tab.data('state') == 'closed') return true;
+                    
+                    if(tab.position().top > $('#imjs-bar').height()) {
+                        $('.imjs-scroll').css('display', '');
+                        tab.css('display', 'none');
+                        needScrollers = true;
+                    } else {
+                        tab.css('display', '');
+                    }
+                });
+                
+                if(!needScrollers) {
+                    $('.imjs-scroll').css('display', 'none');
+                }
+                
+                if($('#imjs-scroll-left').css('display') != 'none' &&
+                    $('#imjs-scroll-left').position().top > $('#imjs-bar').height()) {
+                    $('#imjs-bar li.imjs-tab:visible').slice(-1).css('display', 'none');
+                }
+                
+                var hiddenLeft = $('#imjs-bar li.imjs-tab:visible').slice(-1)
+                    .nextAll('#imjs-bar li.imjs-tab:hidden')
+                    .not('.imjs-default')
+                    .filter(function() {
+                        return $(this).data('state') != 'closed'
+                    }).length;
+                    
+                var hiddenRight = $('#imjs-bar li.imjs-tab:visible').eq(0)
+                    .prevAll('#imjs-bar li.imjs-tab:hidden')
+                    .not('.imjs-default')
+                    .filter(function() {
+                        return $(this).data('state') != 'closed'
+                    }).length;
+                    
+                $('#imjs-scroll-left').html(hiddenLeft);
+                $('#imjs-scroll-right').html(hiddenRight);
+            }
+        },
+        
+        // == Comet ==
+        //
+        // Comet, or HTTP streaming, holds open a connection between the client and
+        // the server indefinitely. As the server receives new messages or events,
+        // they are passed down to the client in a {{{&lt;script&gt;}}}
+        // tag which calls the {{{AjaxIM.incoming()}}} function. The connection is
+        // opened using either an {{{iframe}}} (in Opera or Internet Explorer) or
+        // an {{{XMLHTTPRequest}}} object. Due to the extra flexibility necessary
+        // with the {{{XMLHTTPRequest}}} object, jQuery's {{{$.ajax}}} is not used.
+        comet: {
+            type: '',
+            obj: null,
+        
+            onbeforeunload: null,
+            onreadystatechange: null,
+            
+            iframe: function() {                
+                if(/loaded|complete/i.test(this.obj.readyState))
+                    throw new Error("IM server not available!");
+            },
+
+            // === {{{AjaxIM.}}}**{{{comet.connect()}}}** ===
+            //
+            // Creates and initializes the object and connection between the server
+            // and the client. For Internet Explorer and Opera, we use an
+            // {{{&lt;iframe&gt;}}} element; for all other browsers, we create an
+            // {{{XMLHTTPRequest}}} object. The server connects to the URI defined
+            // as the "poll" action. This function is called automatically, when
+            // the IM engine is initialized and the {{{AjaxIM.poll()}}} function
+            // is called.
+            connect: function() {
+                var self = _instance;
+                
+                if($.browser.opera || $.browser.msie) {
+                    var iframe = $('<iframe></iframe>');
+                    with(iframe) {
+                        css({
+                            position: 'absolute',
+                            visibility: 'visible',
+                            display: 'block',
+                            left: '-10000px',
+                            top: '-10000px',
+                            width: '1px',
+                            height: '1px'
+                        });
+                        
+                        attr('src', self.actions.poll[1]);
+                        appendTo('body');
+                        
+                        bind('readystatechange',
+                            self.comet.onreadystatechange = function() { self.comet.iframe() });
+                        bind('beforeunload',
+                            self.comet.onbeforeunload = function() { self.comet.disconnect() });
+                    }
+                    
+                    self.comet.type = 'iframe';
+                    self.comet.obj = iframe;
+                } else {
+                    var xhr = new XMLHttpRequest;
+                    var length = 1029;
+                    var code = /^\s*<script[^>]*>parent\.(.+);<\/script><br\s*\/>$/;
+                    
+                    xhr.open('get', self.actions.poll[1], true);
+                    xhr.onreadystatechange = function(){
+                        if(xhr.readyState > 2) {
+                            if(xhr.status == 200) {
+                                responseText = xhr.responseText.substring(length);
+                                length = xhr.responseText.length;
+                                if(responseText != ' ') 
+                                    eval(responseText.replace(code, "$1"));
+                            }
+                            // We need an "else" here. If the state changes to
+                            // "loaded", the user needs to know they're
+                            // disconnected.
+                        }
+                    };
+                    
+                    self.comet.type = 'xhr';
+                    self.comet.obj = xhr;
+                    
+                    addEventListener('beforeunload',
+                        self.comet.beforeunload = function() { self.comet.disconnect(); }, false);
+                    setTimeout(function() { xhr.send(null) }, 10);
+                }
+            },
+
+            // === {{{AjaxIM.}}}**{{{comet.disconnect()}}}** ===
+            //
+            // Disconnect from the server and destroy the connection object. This
+            // function is called before the page unloads, so that we plug up and
+            // potential leaks and free memory.
+            disconnect: function() {
+                var self = _instance.comet;
+                
+                if(!this.type || !this.obj)
+                    return;
+                
+                if(this.type == 'iframe') {
+                    detachEvent('onreadystatechange', this.onreadystatechange);
+                    detachEvent('onbeforeunload', this.onbeforeunload);
+                    this.obj.src = '.';
+                    $(this.obj).remove();
+                } else {
+                    removeEventListener('beforeunload', this.onbeforeunload, false);
+                    this.obj.onreadystatechange = function(){};
+                    this.obj.abort();
+                }
+                
+                delete this.obj;
+            }
+        }
+    })
+        
+    self.bar.initialize();
+    
+    if(prequeue.length) {
+        $.each(prequeue, function() {
+            var func = this[0].split('.');
+            if(func.length > 1)
+                self[func[0]][func[1]].apply(self, this[1]);
+            else
+                self[func[0]].apply(self, this[1]);
+        });
+    }
+    });
+    
+    // == Static functions and variables ==
+    //
+    // The following functions and variables are available outside of an initialized
+    // {{{AjaxIM}}} object.
+    
+    // === {{{AjaxIM.}}}**{{{client}}}** ===
+    //
+    // Once {{{AjaxIM.init()}}} is called, this will be set to the active AjaxIM
+    // object. Only one AjaxIM object instance can exist at a time. This variable
+    // can and should be accessed directly.
+    AjaxIM.client = null;
+    
+    // === {{{AjaxIM.}}}**{{{init(options, actions)}}}** ===
+    //
+    // Initialize the AjaxIM client object and engine. Here, you can define your
+    // options and actions as outlined at the top of this documentation.
+    //
+    // ==== Parameters ====
+    // * {{{options}}} is the hash of custom settings to initialize Ajax IM with.
+    // * {{{actions}}} is the hash of any custom action URLs.
+    AjaxIM.init = function(options, actions) {
+        if(!_instance) {
+            _instance = new AjaxIM(options, actions);
+            AjaxIM.client = _instance;
+        }
+        
+        return _instance;
+    }
+    
+    
+    // === {{{AjaxIM.}}}**{{{request(url, data, successFunc, failureFunc)}}}** ===
+    //
+    // Wrapper around {{{$.jsonp}}}, the JSON-P library for jQuery, and {{{$.ajax}}},
+    // jQuery's ajax library. Allows either function to be called, automatically,
+    // depending on the request's URL array (see {{{AjaxIM.actions}}}).
+    //
+    // ==== Parameters ====
+    // {{{url}}} is the URL of the request.
+    // {{{data}}} are any arguments that go along with the request.
+    // {{{success}}} is a callback function called when a request has completed
+    // without issue.
+    // {{{_ignore_}}} is simply to provide compatability with {{{$.post}}}.
+    // {{{failure}}} is a callback function called when a request hasn't not
+    // completed successfully.
+    AjaxIM.request = function(url, data, successFunc, failureFunc) {
+        if(typeof failureFunc != 'function');
+            failureFunc = function(){};
+
+        $[url[0]]({
+            'url': url[1],
+            'data': data,
+            dataType: (url[0] == 'ajax' ? 'json' : 'jsonp'),
+            type: 'POST',
+            cache: false,
+            timeout: 60000,
+            callback: 'jsonp' + (new Date()).getTime(),
+            success: function(json, textStatus) {
+                successFunc(json);
+            },
+            error: function(xOptions, error) {
+                failureFunc(error);
+            }
+        });
+        
+        // This prevents Firefox from spinning indefinitely
+        // while it waits for a response. Why? Fuck if I know.
+        if(url[0] == 'jsonp' && $.browser.mozilla) {
+            $.jsonp({
+                'url': 'about:',
+                timeout: 0
+            });
+        }
+    };
+    
+    // === {{{AjaxIM.}}}**{{{incoming(data)}}}** ===
+    //
+    // Never call this directly. It is used as a connecting function between
+    // client and server for Comet.
+    //
+    // //Note:// There are two {{{AjaxIM.incoming()}}} functions. This one is a
+    // static function called outside of the initialized AjaxIM object; the other
+    // is only called within the initalized AjaxIM object.
+    AjaxIM.incoming = function(data) {
+        if(!_instance)
+            return false;
+        
+        if(data.length)
+            _instance._parseMessages(data);
+    }
+    
+    // === {{{AjaxIM.}}}**{{{loaded}}}** ===
+    //
+    // If Ajax IM has been loaded with the im.load.js file, this function will be
+    // called when the library is finally loaded and ready for use. Similar to
+    // jQuery's $(document).ready(), but for Ajax IM.
+    AjaxIM.loaded = function() {
+        if(typeof AjaxIMLoadedFunction == 'function') {
+            AjaxIMLoadedFunction();
+            delete AjaxIMLoadedFunction; // clean up the global namespace
+        }
+    };
+    
+    // === {{{AjaxIM.}}}**{{{dateFormat([date,] [mask,] utc)}}}** ===
+    //
+    // Date Format 1.2.3\\
+    // &copy; 2007-2009 Steven Levithan ([[http://blog.stevenlevithan.com/archives/date-time-format|stevenlevithan.com]])\\
+    // MIT license
+    //
+    // Includes enhancements by Scott Trenda
+    // and Kris Kowal ([[http://cixar.com/~kris.kowal/|cixar.com/~kris.kowal/]])
+    //
+    // Accepts a date, a mask, or a date and a mask and returns a formatted version
+    // of the given date.
+    //
+    // ==== Parameters ====
+    // * {{{date}}} is a {{{Date()}}} object. If not specified, the date defaults to the
+    // current date/time.
+    // * {{{mask}}} is a string that defines the formatting of the date. Formatting
+    // options can be found in the
+    // [[http://blog.stevenlevithan.com/archives/date-time-format|Date Format]]
+    // documentation. If not specified, the mask defaults to {{{dateFormat.masks.default}}}.
+    
+    AjaxIM.dateFormat = function () {
+        var token = /d{1,4}|m{1,4}|yy(?:yy)?|([HhMsTt])\1?|[LloSZ]|"[^"]*"|'[^']*'/g,
+            timezone = new RegExp('\b(?:[PMCEA][SDP]T|(?:Pacific|Mountain|Central|Eastern|Atlantic) ' +
+                                  '(?:Standard|Daylight|Prevailing) Time|(?:GMT|UTC)(?:[-+]\d{4})?)\b',
+                                  'g'),
+            timezoneClip = /[^-+\dA-Z]/g,
+            pad = function (val, len) {
+                val = String(val);
+                len = len || 2;
+                while (val.length < len) val = "0" + val;
+                return val;
+            };
+    
+        // Regexes and supporting functions are cached through closure
+        return function (date, mask, utc) {
+            var dF = AjaxIM.dateFormat;
+    
+            // You can't provide utc if you skip other args (use the "UTC:" mask prefix)
+            if (arguments.length == 1 && Object.prototype.toString.call(date) ==
+                  "[object String]" && !/\d/.test(date)) {
+                mask = date;
+                date = undefined;
+            }
+    
+            // Passing date through Date applies Date.parse, if necessary
+            date = date ? new Date(date) : new Date;
+            if (isNaN(date)) throw SyntaxError("invalid date");
+    
+            mask = String(dF.masks[mask] || mask || dF.masks["default"]);
+    
+            // Allow setting the utc argument via the mask
+            if (mask.slice(0, 4) == "UTC:") {
+                mask = mask.slice(4);
+                utc = true;
+            }
+    
+            var _ = utc ? "getUTC" : "get",
+                d = date[_ + "Date"](),
+                D = date[_ + "Day"](),
+                m = date[_ + "Month"](),
+                y = date[_ + "FullYear"](),
+                H = date[_ + "Hours"](),
+                M = date[_ + "Minutes"](),
+                s = date[_ + "Seconds"](),
+                L = date[_ + "Milliseconds"](),
+                o = utc ? 0 : date.getTimezoneOffset(),
+                flags = {
+                    d:    d,
+                    dd:   pad(d),
+                    ddd:  AjaxIM.i18n.dayNames[D],
+                    dddd: AjaxIM.i18n.dayNames[D + 7],
+                    m:    m + 1,
+                    mm:   pad(m + 1),
+                    mmm:  AjaxIM.i18n.monthNames[m],
+                    mmmm: AjaxIM.i18n.monthNames[m + 12],
+                    yy:   String(y).slice(2),
+                    yyyy: y,
+                    h:    H % 12 || 12,
+                    hh:   pad(H % 12 || 12),
+                    H:    H,
+                    HH:   pad(H),
+                    M:    M,
+                    MM:   pad(M),
+                    s:    s,
+                    ss:   pad(s),
+                    l:    pad(L, 3),
+                    L:    pad(L > 99 ? Math.round(L / 10) : L),
+                    t:    H < 12 ? "a"  : "p",
+                    tt:   H < 12 ? "am" : "pm",
+                    T:    H < 12 ? "A"  : "P",
+                    TT:   H < 12 ? "AM" : "PM",
+                    Z:    utc ? "UTC" :
+                            (String(date).match(timezone) || [""])
+                            .pop().replace(timezoneClip, ""),
+                    o:    (o > 0 ? "-" : "+") +
+                            pad(Math.floor(Math.abs(o) / 60) * 100 + Math.abs(o) % 60, 4),
+                    S:    ["th", "st", "nd", "rd"][d % 10 > 3 ?
+                            0 :
+                            (d % 100 - d % 10 != 10) * d % 10]
+                };
+    
+            return mask.replace(token, function ($0) {
+                return $0 in flags ? flags[$0] : $0.slice(1, $0.length - 1);
+            });
+        };
+    }();
+    
+    // Some common format strings
+    AjaxIM.dateFormat.masks = {
+        "default":      "ddd mmm dd yyyy HH:MM:ss",
+        shortDate:      "m/d/yy",
+        mediumDate:     "mmm d, yyyy",
+        longDate:       "mmmm d, yyyy",
+        fullDate:       "dddd, mmmm d, yyyy",
+        shortTime:      "h:MM TT",
+        mediumTime:     "h:MM:ss TT",
+        longTime:       "h:MM:ss TT Z",
+        isoDate:        "yyyy-mm-dd",
+        isoTime:        "HH:MM:ss",
+        isoDateTime:    "yyyy-mm-dd'T'HH:MM:ss",
+        isoUtcDateTime: "UTC:yyyy-mm-dd'T'HH:MM:ss'Z'"
+    };
+
+    // === {{{AjaxIM.}}}**{{{i18n}}}** ===
+    //
+    // Text strings used by Ajax IM. Should you want to translate Ajax IM into
+    // another language, merely change these strings.
+    // 
+    // {{{%s}}} denotes text that will be automatically replaced when the string is
+    // used.
+    AjaxIM.i18n = {
+        dayNames: [
+            "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat",
+            "Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday"
+        ],
+        monthNames: [
+            "Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec",
+            "January", "February", "March", "April", "May", "June", "July", "August", "September",
+            "October", "November", "December"
+        ],
+        
+        chatOffline: '%s signed off.',
+        chatAvailable: '%s became available.',
+        chatAway: '%s went away.',
+        
+        notConnected: 'You are currently not connected or the server is not available. ' +
+                      'Please ensure that you are signed in and try again.',
+        notConnectedTip: 'You are currently not connected.',
+        
+        authInvalid: 'Invalid username or password.',
+        
+        registerPasswordLength: 'Passwords must be more than 4 characters in length.',
+        registerUsernameLength: 'Usernames must be more than 2 characters in length and ' +
+                        ' contain only A-Z, a-z, 0-9, underscores (_) and periods (.).',
+        registerPasswordMatch: 'Entered passwords do not match.',
+        registerUsernameTaken: 'The chosen username is already in use; please choose another.',
+        registerUnknown: 'An unknown error occurred. Please try again.'
+    }
+})(jQuery, false);
diff --git a/addons/web_chat/static/src/js/web_chat.js b/addons/web_chat/static/src/js/web_chat.js
new file mode 100644
index 00000000000..fce64ee6f78
--- /dev/null
+++ b/addons/web_chat/static/src/js/web_chat.js
@@ -0,0 +1,10 @@
+openerp.web_chat = function (openerp) {
+    openerp.web_chat = {};
+    openerp.web_chat.im = new AjaxIM({
+       storageMethod: 'local',
+       pollServer: '/web_chat/pollserver',
+       theme: '/web_chat/static/lib/AjaxIM/themes/default',
+       flashStorage: '/web_chat/static/lib/AjaxIM/js/jStore.Flash.html'
+    });
+    openerp.web_chat.im.login();
+};
diff --git a/addons/web_chat/static/src/web_chat.html b/addons/web_chat/static/src/web_chat.html
deleted file mode 100644
index 5f11f01ee7b..00000000000
--- a/addons/web_chat/static/src/web_chat.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<html>
-<head>
-<script type="text/javascript" src="/web_chat/static/lib/AjaxIM/js/jquery-1.3.2.js"></script>
-<script type="text/javascript" src="/web_chat/static/lib/AjaxIM/js/jquery.jsonp-1.1.0.js"></script>
-<script type="text/javascript" src="/web_chat/static/lib/AjaxIM/js/jquery.jstore-all-min.js"></script>
-<script type="text/javascript" src="/web_chat/static/lib/AjaxIM/js/jquery.md5.js"></script>
-<script type="text/javascript" src="/web_chat/static/lib/AjaxIM/js/im.js"></script>
-</head>
-<body>
-<script>
-var AjaxIM, AjaxIMLoadedFunction;
-$(function() {
-    AjaxIM.init({
-        pollServer: '/web_chat/pollserver',
-        theme: '/web_chat/static/lib/AjaxIM/themes/default',
-        flashStorage: '/web_chat/static/lib/AjaxIM/js/jStore.Flash.html'
-    });
-    AjaxIM.client.login();
-});
-</script>
-</body>
-</html>
-
diff --git a/addons/web_chat/static/src/web_chat.js b/addons/web_chat/static/src/web_chat.js
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/doc/source/addons.rst b/doc/source/addons.rst
index 548e8ad461d..bca568f58df 100644
--- a/doc/source/addons.rst
+++ b/doc/source/addons.rst
@@ -1,6 +1,10 @@
 Developing OpenERP Web Addons
 =============================
 
+An OpenERP Web addon is simply a Python package with an openerp
+descriptor (a ``__openerp__.py`` file) which follows a few structural
+and namespacing rules.
+
 Structure
 ---------
 
@@ -50,6 +54,79 @@ Structure
 ``test/``
   The directories in which all tests for the addon are located.
 
+Some of these are guidelines (and not enforced by code), but it's
+suggested that these be followed. Code which does not fit into these
+categories can go wherever deemed suitable.
+
+Namespacing
+-----------
+
+Python
+++++++
+
+Because addons are also Python packages, they're inherently namespaced
+and nothing special needs to be done on that front.
+
+JavaScript
+++++++++++
+
+The JavaScript side of an addon has to live in the namespace
+``openerp.$addon_name``. For instance, everything created by the addon
+``base`` lives in ``openerp.base``.
+
+The root namespace of the addon is a function which takes a single
+parameter ``openerp``, which is an OpenERP client instance. Objects
+(as well as functions, registry instances, etc...) should be added on
+the correct namespace on that object.
+
+The root function will be called by the OpenERP Web client when
+initializing the addon.
+
+.. code-block:: javascript
+
+    // root namespace of the openerp.example addon
+    /** @namespace */
+    openerp.example = function (openerp) {
+        // basic initialization code (e.g. templates loading)
+        openerp.example.SomeClass = Class.extend(
+            /** @lends openerp.example.SomeClass# */{
+            /**
+             * Description for SomeClass's constructor here
+             *
+             * @constructs
+             */
+            init: function () {
+                // SomeClass initialization code
+            }
+            // rest of SomeClass
+        });
+
+        // access an object in an other addon namespace to replace it
+        openerp.base.SearchView = openerp.base.SearchView.extend({
+            init: function () {
+                this._super.apply(this, arguments);
+                console.log('Search view initialized');
+            }
+        });
+    }
+
+Utility behaviors
+-----------------
+
+JavaScript
+++++++++++
+
+* All javascript objects inheriting from
+  :js:class:`openerp.base.BasicConroller` will have all methods
+  starting with ``on_`` or ``do_`` bound to their ``this``. This means
+  they don't have to be manually bound (via ``_.bind`` or ``$.proxy``)
+  in order to be useable as bound event handlers (event handlers
+  keeping their object as ``this`` rather than taking whatever
+  ``this`` object they were called with).
+
+  Beware that this is only valid for methods starting with ``do_`` and
+  ``on_``, any other method will have to be bound manually.
+
 .. _addons-testing:
 
 Testing
diff --git a/doc/source/getting-started.rst b/doc/source/getting-started.rst
index 49398a725b6..cd7f7ee8926 100644
--- a/doc/source/getting-started.rst
+++ b/doc/source/getting-started.rst
@@ -4,5 +4,7 @@ Getting Started with OpenERP Web
 Installing
 ----------
 
+.. per-distro packaging
+
 Launching
 ---------
diff --git a/doc/source/project.rst b/doc/source/project.rst
index c9cef20af6f..6f9a06b2f0d 100644
--- a/doc/source/project.rst
+++ b/doc/source/project.rst
@@ -212,6 +212,8 @@ OpenERP Web over time
 Release process
 +++++++++++++++
 
+OpenSUSE packaging: http://blog.lowkster.com/2011/04/packaging-python-packages-in-opensuse.html
+
 Roadmap
 +++++++
 
diff --git a/openerpweb/openerpweb.py b/openerpweb/openerpweb.py
index 30c0f03f4ba..8423dc878ab 100644
--- a/openerpweb/openerpweb.py
+++ b/openerpweb/openerpweb.py
@@ -10,6 +10,7 @@ import time
 import traceback
 import uuid
 import xmlrpclib
+import pytz
 
 import cherrypy
 import cherrypy.lib.static
@@ -17,6 +18,7 @@ import simplejson
 
 import nonliterals
 import xmlrpctimeout
+import logging
 
 #-----------------------------------------------------------
 # Globals
@@ -83,10 +85,13 @@ class OpenERPSession(object):
         self._login = False
         self._password = False
         self.model_factory = model_factory
-
+        self._locale = 'en_US'
         self.context = {}
         self.contexts_store = {}
         self.domains_store = {}
+        self._lang = {}
+        self.remote_timezone = 'utc'
+        self.client_timezone = False
 
     def proxy(self, service):
         s = xmlrpctimeout.TimeoutServerProxy('http://%s:%s/xmlrpc/%s' % (self._server, self._port, service), timeout=5)
@@ -101,9 +106,8 @@ class OpenERPSession(object):
         uid = self.proxy('common').login(db, login, password)
         self.bind(db, uid, password)
         self._login = login
-
+        
         if uid: self.get_context()
-
         return uid
 
     def execute(self, model, func, *l, **d):
@@ -130,6 +134,15 @@ class OpenERPSession(object):
         """
         assert self._uid, "The user needs to be logged-in to initialize his context"
         self.context = self.model('res.users').context_get(self.context)
+        
+        self.client_timezone = self.context.get("tz", False)
+        if self.client_timezone:
+            self.remote_timezone = self.execute('common', 'timezone_get')
+            
+        self._locale = self.context.get('lang','en_US')
+        lang_ids = self.execute('res.lang','search', [('code', '=', self._locale)])
+        if lang_ids:
+            self._lang = self.execute('res.lang', 'read',lang_ids[0], [])
         return self.context
 
     @property
@@ -183,7 +196,7 @@ class OpenERPSession(object):
         if isinstance(context_to_eval, dict):
             return context_to_eval
 
-        ctx = context or {}
+        ctx = dict(context or {})
         ctx['context'] = ctx
 
         # if the domain was unpacked from JSON, it needs the current
@@ -239,7 +252,7 @@ class OpenERPSession(object):
         if isinstance(domain, list):
             return domain
 
-        ctx = context or {}
+        ctx = dict(context or {})
         ctx['context'] = ctx
 
         # if the domain was unpacked from JSON, it needs the current
@@ -343,6 +356,8 @@ class JsonRequest(object):
                 }
             }
         except Exception:
+            cherrypy.log("An error occured while handling a json request",
+                         severity=logging.ERROR, traceback=True)
             error = {
                 'code': 300,
                 'message': "OpenERP WebClient Error",
@@ -483,3 +498,4 @@ def main(argv):
     cherrypy.server.subscribe()
     cherrypy.engine.start()
     cherrypy.engine.block()
+