[MERGE] upstream

bzr revid: fme@openerp.com-20130814082058-8hckb7bew6j3wtrg

4 files changed, 186 insertions, 166 deletions

diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js
index db3cb69519f..82cdf46bba8 100644
--- a/addons/web/static/src/js/chrome.js
+++ b/addons/web/static/src/js/chrome.js
@@ -677,6 +677,19 @@ instance.web.Login =  instance.web.Widget.extend({
         if (this.params.login_successful) {
             this.on('login_successful', this, this.params.login_successful);
         }
+        // some cleanup to remove any trace of that last login feature
+        if (typeof(localStorage) != 'undefined') {
+            var toRemove = [];
+            _.each(_.range(localStorage.length), function(i) {
+                var key = localStorage.key(i);
+                if (key.match(/^.*?\|last_password$/)) {
+                    toRemove.push(key);
+                }
+            });
+            _.each(toRemove, function(k) {
+                localStorage.removeItem(k);
+            });
+        }
     },
     start: function() {
         var self = this;
@@ -701,9 +714,6 @@ instance.web.Login =  instance.web.Widget.extend({
                 .always(function() {
                     if (self.selected_db && self.has_local_storage && self.remember_credentials) {
                         self.$("[name=login]").val(localStorage.getItem(self.selected_db + '|last_login') || '');
-                        if (self.session.debug) {
-                            self.$("[name=password]").val(localStorage.getItem(self.selected_db + '|last_password') || '');
-                        }
                     }
                 });
         }
@@ -764,9 +774,6 @@ instance.web.Login =  instance.web.Widget.extend({
         return this.session.session_authenticate(db, login, password).then(function() {
             if (self.has_local_storage && self.remember_credentials) {
                 localStorage.setItem(db + '|last_login', login);
-                if (self.session.debug) {
-                    localStorage.setItem(db + '|last_password', password);
-                }
             }
             self.trigger('login_successful');
         }, function () {
diff --git a/addons/web/static/src/js/dates.js b/addons/web/static/src/js/dates.js
deleted file mode 100644
index 0e3c9ff7874..00000000000
--- a/addons/web/static/src/js/dates.js
+++ /dev/null
@@ -1,159 +0,0 @@
-
-(function() {
-
-var instance = openerp;
-openerp.web.dates = {};
-
-var _t = instance.web._t;
-
-/**
- * Converts a string to a Date javascript object using OpenERP's
- * datetime string format (exemple: '2011-12-01 15:12:35').
- * 
- * The time zone is assumed to be UTC (standard for OpenERP 6.1)
- * and will be converted to the browser's time zone.
- * 
- * @param {String} str A string representing a datetime.
- * @returns {Date}
- */
-instance.web.str_to_datetime = function(str) {
-    if(!str) {
-        return str;
-    }
-    var regex = /^(\d\d\d\d-\d\d-\d\d \d\d:\d\d:\d\d)(?:\.\d+)?$/;
-    var res = regex.exec(str);
-    if ( !res ) {
-        throw new Error(_.str.sprintf(_t("'%s' is not a valid datetime"), str));
-    }
-    var obj = Date.parseExact(res[1] + " UTC", 'yyyy-MM-dd HH:mm:ss zzz');
-    if (! obj) {
-        throw new Error(_.str.sprintf(_t("'%s' is not a valid datetime"), str));
-    }
-    return obj;
-};
-
-/**
- * Converts a string to a Date javascript object using OpenERP's
- * date string format (exemple: '2011-12-01').
- * 
- * As a date is not subject to time zones, we assume it should be
- * represented as a Date javascript object at 00:00:00 in the
- * time zone of the browser.
- * 
- * @param {String} str A string representing a date.
- * @returns {Date}
- */
-instance.web.str_to_date = function(str) {
-    if(!str) {
-        return str;
-    }
-    var regex = /^\d\d\d\d-\d\d-\d\d$/;
-    var res = regex.exec(str);
-    if ( !res ) {
-        throw new Error(_.str.sprintf(_t("'%s' is not a valid date"), str));
-    }
-    var obj = Date.parseExact(str, 'yyyy-MM-dd');
-    if (! obj) {
-        throw new Error(_.str.sprintf(_t("'%s' is not a valid date"), str));
-    }
-    return obj;
-};
-
-/**
- * Converts a string to a Date javascript object using OpenERP's
- * time string format (exemple: '15:12:35').
- * 
- * The OpenERP times are supposed to always be naive times. We assume it is
- * represented using a javascript Date with a date 1 of January 1970 and a
- * time corresponding to the meant time in the browser's time zone.
- * 
- * @param {String} str A string representing a time.
- * @returns {Date}
- */
-instance.web.str_to_time = function(str) {
-    if(!str) {
-        return str;
-    }
-    var regex = /^(\d\d:\d\d:\d\d)(?:\.\d+)?$/;
-    var res = regex.exec(str);
-    if ( !res ) {
-        throw new Error(_.str.sprintf(_t("'%s' is not a valid time"), str));
-    }
-    var obj = Date.parseExact("1970-01-01 " + res[1], 'yyyy-MM-dd HH:mm:ss');
-    if (! obj) {
-        throw new Error(_.str.sprintf(_t("'%s' is not a valid time"), str));
-    }
-    return obj;
-};
-
-/*
- * Left-pad provided arg 1 with zeroes until reaching size provided by second
- * argument.
- *
- * @param {Number|String} str value to pad
- * @param {Number} size size to reach on the final padded value
- * @returns {String} padded string
- */
-var zpad = function(str, size) {
-    str = "" + str;
-    return new Array(size - str.length + 1).join('0') + str;
-};
-
-/**
- * Converts a Date javascript object to a string using OpenERP's
- * datetime string format (exemple: '2011-12-01 15:12:35').
- * 
- * The time zone of the Date object is assumed to be the one of the
- * browser and it will be converted to UTC (standard for OpenERP 6.1).
- * 
- * @param {Date} obj
- * @returns {String} A string representing a datetime.
- */
-instance.web.datetime_to_str = function(obj) {
-    if (!obj) {
-        return false;
-    }
-    return zpad(obj.getUTCFullYear(),4) + "-" + zpad(obj.getUTCMonth() + 1,2) + "-"
-         + zpad(obj.getUTCDate(),2) + " " + zpad(obj.getUTCHours(),2) + ":"
-         + zpad(obj.getUTCMinutes(),2) + ":" + zpad(obj.getUTCSeconds(),2);
-};
-
-/**
- * Converts a Date javascript object to a string using OpenERP's
- * date string format (exemple: '2011-12-01').
- * 
- * As a date is not subject to time zones, we assume it should be
- * represented as a Date javascript object at 00:00:00 in the
- * time zone of the browser.
- * 
- * @param {Date} obj
- * @returns {String} A string representing a date.
- */
-instance.web.date_to_str = function(obj) {
-    if (!obj) {
-        return false;
-    }
-    return zpad(obj.getFullYear(),4) + "-" + zpad(obj.getMonth() + 1,2) + "-"
-         + zpad(obj.getDate(),2);
-};
-
-/**
- * Converts a Date javascript object to a string using OpenERP's
- * time string format (exemple: '15:12:35').
- * 
- * The OpenERP times are supposed to always be naive times. We assume it is
- * represented using a javascript Date with a date 1 of January 1970 and a
- * time corresponding to the meant time in the browser's time zone.
- * 
- * @param {Date} obj
- * @returns {String} A string representing a time.
- */
-instance.web.time_to_str = function(obj) {
-    if (!obj) {
-        return false;
-    }
-    return zpad(obj.getHours(),2) + ":" + zpad(obj.getMinutes(),2) + ":"
-         + zpad(obj.getSeconds(),2);
-};
-    
-})();
diff --git a/addons/web/static/src/js/openerpframework.js b/addons/web/static/src/js/openerpframework.js
index f5f5820f278..2a4bcc50ffd 100644
--- a/addons/web/static/src/js/openerpframework.js
+++ b/addons/web/static/src/js/openerpframework.js
@@ -1244,6 +1244,173 @@ openerp.Mutex = openerp.Class.extend({
     }
 });
 
+/**
+ * Converts a string to a Date javascript object using OpenERP's
+ * datetime string format (exemple: '2011-12-01 15:12:35.832').
+ * 
+ * The time zone is assumed to be UTC (standard for OpenERP 6.1)
+ * and will be converted to the browser's time zone.
+ * 
+ * @param {String} str A string representing a datetime.
+ * @returns {Date}
+ */
+openerp.str_to_datetime = function(str) {
+    if(!str) {
+        return str;
+    }
+    var regex = /^(\d\d\d\d)-(\d\d)-(\d\d) (\d\d):(\d\d):(\d\d(?:\.(\d+))?)$/;
+    var res = regex.exec(str);
+    if ( !res ) {
+        throw new Error("'" + str + "' is not a valid datetime");
+    }
+    var tmp = new Date();
+    tmp.setUTCFullYear(parseFloat(res[1]));
+    tmp.setUTCMonth(parseFloat(res[2]) - 1);
+    tmp.setUTCDate(parseFloat(res[3]));
+    tmp.setUTCHours(parseFloat(res[4]));
+    tmp.setUTCMinutes(parseFloat(res[5]));
+    tmp.setUTCSeconds(parseFloat(res[6]));
+    tmp.setUTCSeconds(parseFloat(res[6]));
+    tmp.setUTCMilliseconds(parseFloat(rpad((res[7] || "").slice(0, 3), 3)));
+    return tmp;
+};
+
+/**
+ * Converts a string to a Date javascript object using OpenERP's
+ * date string format (exemple: '2011-12-01').
+ * 
+ * As a date is not subject to time zones, we assume it should be
+ * represented as a Date javascript object at 00:00:00 in the
+ * time zone of the browser.
+ * 
+ * @param {String} str A string representing a date.
+ * @returns {Date}
+ */
+openerp.str_to_date = function(str) {
+    if(!str) {
+        return str;
+    }
+    var regex = /^(\d\d\d\d)-(\d\d)-(\d\d)$/;
+    var res = regex.exec(str);
+    if ( !res ) {
+        throw new Error("'" + str + "' is not a valid date");
+    }
+    var tmp = new Date();
+    tmp.setFullYear(parseFloat(res[1]));
+    tmp.setMonth(parseFloat(res[2]) - 1);
+    tmp.setDate(parseFloat(res[3]));
+    tmp.setHours(0);
+    tmp.setMinutes(0);
+    tmp.setSeconds(0);
+    return tmp;
+};
+
+/**
+ * Converts a string to a Date javascript object using OpenERP's
+ * time string format (exemple: '15:12:35').
+ * 
+ * The OpenERP times are supposed to always be naive times. We assume it is
+ * represented using a javascript Date with a date 1 of January 1970 and a
+ * time corresponding to the meant time in the browser's time zone.
+ * 
+ * @param {String} str A string representing a time.
+ * @returns {Date}
+ */
+openerp.str_to_time = function(str) {
+    if(!str) {
+        return str;
+    }
+    var regex = /^(\d\d):(\d\d):(\d\d(?:\.(\d+))?)$/;
+    var res = regex.exec(str);
+    if ( !res ) {
+        throw new Error("'" + str + "' is not a valid time");
+    }
+    var tmp = new Date();
+    tmp.setFullYear(1970);
+    tmp.setMonth(0);
+    tmp.setDate(1);
+    tmp.setHours(parseFloat(res[1]));
+    tmp.setMinutes(parseFloat(res[2]));
+    tmp.setSeconds(parseFloat(res[3]));
+    tmp.setMilliseconds(parseFloat(rpad((res[4] || "").slice(0, 3), 3)));
+    return tmp;
+};
+
+/*
+ * Left-pad provided arg 1 with zeroes until reaching size provided by second
+ * argument.
+ *
+ * @param {Number|String} str value to pad
+ * @param {Number} size size to reach on the final padded value
+ * @returns {String} padded string
+ */
+var lpad = function(str, size) {
+    str = "" + str;
+    return new Array(size - str.length + 1).join('0') + str;
+};
+
+var rpad = function(str, size) {
+    str = "" + str;
+    return str + new Array(size - str.length + 1).join('0');
+};
+
+/**
+ * Converts a Date javascript object to a string using OpenERP's
+ * datetime string format (exemple: '2011-12-01 15:12:35').
+ * 
+ * The time zone of the Date object is assumed to be the one of the
+ * browser and it will be converted to UTC (standard for OpenERP 6.1).
+ * 
+ * @param {Date} obj
+ * @returns {String} A string representing a datetime.
+ */
+openerp.datetime_to_str = function(obj) {
+    if (!obj) {
+        return false;
+    }
+    return lpad(obj.getUTCFullYear(),4) + "-" + lpad(obj.getUTCMonth() + 1,2) + "-"
+         + lpad(obj.getUTCDate(),2) + " " + lpad(obj.getUTCHours(),2) + ":"
+         + lpad(obj.getUTCMinutes(),2) + ":" + lpad(obj.getUTCSeconds(),2);
+};
+
+/**
+ * Converts a Date javascript object to a string using OpenERP's
+ * date string format (exemple: '2011-12-01').
+ * 
+ * As a date is not subject to time zones, we assume it should be
+ * represented as a Date javascript object at 00:00:00 in the
+ * time zone of the browser.
+ * 
+ * @param {Date} obj
+ * @returns {String} A string representing a date.
+ */
+openerp.date_to_str = function(obj) {
+    if (!obj) {
+        return false;
+    }
+    return lpad(obj.getFullYear(),4) + "-" + lpad(obj.getMonth() + 1,2) + "-"
+         + lpad(obj.getDate(),2);
+};
+
+/**
+ * Converts a Date javascript object to a string using OpenERP's
+ * time string format (exemple: '15:12:35').
+ * 
+ * The OpenERP times are supposed to always be naive times. We assume it is
+ * represented using a javascript Date with a date 1 of January 1970 and a
+ * time corresponding to the meant time in the browser's time zone.
+ * 
+ * @param {Date} obj
+ * @returns {String} A string representing a time.
+ */
+openerp.time_to_str = function(obj) {
+    if (!obj) {
+        return false;
+    }
+    return lpad(obj.getHours(),2) + ":" + lpad(obj.getMinutes(),2) + ":"
+         + lpad(obj.getSeconds(),2);
+};
+
 openerp.declare = declare;
 
 return openerp;
diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js
index 5c2e7a62062..ecdbaf8b465 100644
--- a/addons/web/static/src/js/views.js
+++ b/addons/web/static/src/js/views.js
@@ -1178,7 +1178,12 @@ instance.web.Sidebar = instance.web.Widget.extend({
         var self = this;
         self.getParent().sidebar_eval_context().done(function (sidebar_eval_context) {
             var ids = self.getParent().get_selected_ids();
-            var domain = self.getParent().get_active_domain();
+            if (self.getParent().get_active_domain) {
+                var domain = self.getParent().get_active_domain();
+            }
+            else {
+                var domain = $.Deferred().resolve(undefined);
+            }
             if (ids.length === 0) {
                 instance.web.dialog($("<div />").text(_t("You must choose at least one record.")), { title: _t("Warning"), modal: true });
                 return false;