merge upstream

bzr revid: chs@openerp.com-20111117125432-zhfrcyrtwy9b9cv8
bzr revid: chs@openerp.com-20111118132606-6gh7zmrx7606w8fv

8 files changed, 144 insertions, 103 deletions

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index c061353d113..d8f31af1d35 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -809,33 +809,33 @@ label.error {
     also on the first and last children of the first and last row
  */
 .openerp .oe-listview table.oe-listview-content {
-    -webkit-border-radius: 7px;
-    -moz-border-radius: 7px;
-    border-radius: 7px;
+    -webkit-border-radius: 4px;
+    -moz-border-radius: 4px;
+    border-radius: 4px;
 }
 .openerp .oe-listview table.oe-listview-content thead tr:first-child th:first-child {
-    -webkit-border-top-left-radius: 7px;
-    -moz-border-radius-topleft: 7px;
-    border-top-left-radius: 7px;
+    -webkit-border-top-left-radius: 4px;
+    -moz-border-radius-topleft: 4px;
+    border-top-left-radius: 4px;
 }
 .openerp .oe-listview table.oe-listview-content thead tr:first-child th:last-child {
-    -webkit-border-top-right-radius: 7px;
-    -moz-border-radius-topright: 7px;
-    border-top-right-radius: 7px;
+    -webkit-border-top-right-radius: 4px;
+    -moz-border-radius-topright: 4px;
+    border-top-right-radius: 4px;
 }
 .openerp .oe-listview table.oe-listview-content tfoot tr:last-child th:first-child,
 .openerp .oe-listview table.oe-listview-content tfoot tr:last-child td:first-child,
 .openerp .oe-listview table.oe-listview-content tbody:last-child tr:last-child th:first-child {
-    -webkit-border-bottom-left-radius: 7px;
-    -moz-border-radius-bottomleft: 7px;
-    border-bottom-left-radius: 7px;
+    -webkit-border-bottom-left-radius: 4px;
+    -moz-border-radius-bottomleft: 4px;
+    border-bottom-left-radius: 4px;
 }
 .openerp .oe-listview table.oe-listview-content tfoot tr:last-child th:last-child,
 .openerp .oe-listview table.oe-listview-content tfoot tr:last-child td:last-child,
 .openerp .oe-listview table.oe-listview-content tbody:last-child tr:last-child td:last-child {
-    -webkit-border-bottom-right-radius: 7px;
-    -moz-border-radius-bottomright: 7px;
-    border-bottom-right-radius: 7px;
+    -webkit-border-bottom-right-radius: 4px;
+    -moz-border-radius-bottomright: 4px;
+    border-bottom-right-radius: 4px;
 }
 
 /* Notebook */
@@ -967,20 +967,25 @@ label.error {
 .openerp .oe_forms textarea {
     resize:vertical;
 }
-.openerp .oe_forms input[type="text"], .openerp .oe_forms input[type="password"], .openerp .oe_forms select, .openerp .oe_forms .button {
+.openerp .oe_forms input[type="text"], .openerp .oe_forms input[type="password"], .openerp .oe_forms select, .openerp .oe_forms .oe_button {
     height: 22px;
 }
 .openerp .oe_forms input.field_datetime {
     min-width: 11em;
 }
-.openerp .oe_forms.oe_frame .oe_datepicker_root {
-    width: 100%;
-}
-.openerp .oe_forms .button {
+.openerp .oe_forms .oe_button {
     color: #4c4c4c;
     white-space: nowrap;
+    min-width: 100%;
+    width: 100%;
 }
-.openerp .oe_forms .button span {
+@-moz-document url-prefix() {
+    /* Strange firefox behaviour on width: 100% + white-space: nowrap */
+    .openerp .oe_forms .oe_button {
+        width: auto;
+    }
+}
+.openerp .oe_forms .oe_button span {
     position: relative;
     vertical-align: top;
 }
@@ -989,13 +994,20 @@ label.error {
     cursor: pointer;
     right: 5px;
     top: 3px;
+    z-index: 2;
+}
+.openerp .oe_datepicker_container {
+    position: absolute;
+    top: 0;
+    right: 0;
+    display: none;
 }
 .openerp .oe_datepicker_root {
     position: relative;
     display: inline-block;
 }
-.openerp .oe_datepicker_root input[type="text"] {
-    min-width: 160px;
+.openerp .oe_forms.oe_frame .oe_datepicker_root {
+    width: 100%;
 }
 .openerp .oe_input_icon_disabled {
     position: absolute;
@@ -1003,7 +1015,7 @@ label.error {
     opacity: 0.5;
     filter:alpha(opacity=50);
     right: 5px;
-    top: 5px;
+    top: 3px;
 }
 .openerp img.oe_field_translate {
     margin-left: -21px;
diff --git a/addons/web/static/src/js/core.js b/addons/web/static/src/js/core.js
index 113b83f57dc..e3f85a92503 100644
--- a/addons/web/static/src/js/core.js
+++ b/addons/web/static/src/js/core.js
@@ -125,7 +125,11 @@ openerp.web.callback = function(obj, method) {
                 callback.callback_chain.splice(i, 1);
                 i -= 1;
             }
-            r = c.callback.apply(c.self, c.args.concat(args));
+            var result = c.callback.apply(c.self, c.args.concat(args));
+            if (c.callback === method) {
+                // return the result of the original method
+                r = result;
+            }
             // TODO special value to stop the chain
             // openerp.web.callback_stop
         }
@@ -374,6 +378,7 @@ openerp.web.Connection = openerp.web.CallbackEnabled.extend( /** @lends openerp.
         this.rpc_mode = (this.server == hostname) ? "oe-json" : "oe-jsonp";
         this.session_id = false;
         this.uid = false;
+        this.username = false;
         this.user_context= {};
         this.db = false;
         this.module_loading = $.Deferred();
@@ -525,10 +530,13 @@ openerp.web.Connection = openerp.web.CallbackEnabled.extend( /** @lends openerp.
         var self = this;
         var params = { db: db, login: login, password: password };
         return this.rpc("/web/session/login", params, function(result) {
-            self.session_id = result.session_id;
-            self.uid = result.uid;
-            self.user_context = result.context;
-            self.db = result.db;
+            _.extend(self, {
+                session_id: result.session_id,
+                uid: result.uid,
+                user_context: result.context,
+                db: result.db,
+                username: result.login
+            });
             self.session_save();
 
             self.on_session_valid(success_callback);
@@ -544,9 +552,12 @@ openerp.web.Connection = openerp.web.CallbackEnabled.extend( /** @lends openerp.
         var self = this;
         this.session_id = this.get_cookie('session_id');
         return this.rpc("/web/session/get_session_info", {}).then(function(result) {
-            self.uid = result.uid;
-            self.user_context = result.context;
-            self.db = result.db;
+            _.extend(self, {
+                uid: result.uid,
+                user_context: result.context,
+                db: result.db,
+                username: result.login
+            });
             if (self.uid)
                 self.on_session_valid(continuation);
             else
diff --git a/addons/web/static/src/js/data.js b/addons/web/static/src/js/data.js
index e783f374dce..69d8fd9ddfd 100644
--- a/addons/web/static/src/js/data.js
+++ b/addons/web/static/src/js/data.js
@@ -316,7 +316,7 @@ openerp.web.DataSet =  openerp.web.Widget.extend( /** @lends openerp.web.DataSet
             def.reject();
         } else {
             fields = fields || false;
-            return this.read_ids([this.ids[this.index]], fields).then(function(records) {
+            this.read_ids([this.ids[this.index]], fields).then(function(records) {
                 def.resolve(records[0]);
             }, function() {
                 def.reject.apply(def, arguments);
diff --git a/addons/web/static/src/js/formats.js b/addons/web/static/src/js/formats.js
index 23d8a2c24e0..3151b34636b 100644
--- a/addons/web/static/src/js/formats.js
+++ b/addons/web/static/src/js/formats.js
@@ -76,7 +76,13 @@ openerp.web.format_value = function (value, descriptor, value_if_empty) {
     if (typeof value === 'number' && isNaN(value)) {
         value = false;
     }
+    //noinspection FallthroughInSwitchStatementJS
     switch (value) {
+        case '':
+            if (descriptor.type === 'char') {
+                return '';
+            }
+            console.warn('Field', descriptor, 'had an empty string as value, treating as false...');
         case false:
         case Infinity:
         case -Infinity:
diff --git a/addons/web/static/src/js/search.js b/addons/web/static/src/js/search.js
index c82584e87f8..f95801975b5 100644
--- a/addons/web/static/src/js/search.js
+++ b/addons/web/static/src/js/search.js
@@ -41,7 +41,11 @@ openerp.web.SearchView = openerp.web.Widget.extend(/** @lends openerp.web.Search
         if (this.headless) {
             this.ready.resolve();
         } else {
-            this.rpc("/web/searchview/load", {"model": this.model, "view_id":this.view_id}, this.on_loaded);
+            this.rpc("/web/searchview/load", {
+                model: this.model,
+                view_id: this.view_id,
+                context: this.dataset.get_context()
+            }, this.on_loaded);
         }
         return this.ready.promise();
     },
diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index 75ffb514892..d833b7471c6 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -140,7 +140,7 @@ openerp.web.FormView = openerp.web.View.extend( /** @lends openerp.web.FormView#
             // null index means we should start a new record
             promise = this.on_button_new();
         } else {
-            promise = this.dataset.read_index(_.keys(this.fields_view.fields), this.on_record_loaded);
+            promise = this.dataset.read_index(_.keys(this.fields_view.fields)).pipe(this.on_record_loaded);
         }
         this.$element.show();
         if (this.sidebar) {
@@ -155,6 +155,8 @@ openerp.web.FormView = openerp.web.View.extend( /** @lends openerp.web.FormView#
         }
     },
     on_record_loaded: function(record) {
+        var self = this,
+            deferred_stack = $.Deferred.queue();
         if (!record) {
             throw("Form: No record received");
         }
@@ -172,33 +174,41 @@ openerp.web.FormView = openerp.web.View.extend( /** @lends openerp.web.FormView#
         this.$form_header.find('.oe_form_on_readonly').toggle(this.readonly);
         this.$form_header.find('.oe_form_on_editable').toggle(!this.readonly);
         this.datarecord = record;
-        for (var f in this.fields) {
-            var field = this.fields[f];
+
+        _(this.fields).each(function (field, f) {
             field.dirty = false;
-            field.set_value(this.datarecord[f] || false);
-            field.validate();
-        }
-        if (!record.id) {
-            // New record: Second pass in order to trigger the onchanges
-            this.show_invalid = false;
-            for (var f in record) {
-                var field = this.fields[f];
-                if (field) {
-                    field.dirty = true;
-                    this.do_onchange(field);
+            var result = field.set_value(self.datarecord[f] || false);
+            if (result && _.isFunction(result.promise)) {
+                deferred_stack.push(result);
+            }
+            $.when(result).then(function() {
+                field.validate();
+            });
+        });
+        deferred_stack.push('force resolution if no fields');
+        return deferred_stack.then(function() {
+            if (!record.id) {
+                // New record: Second pass in order to trigger the onchanges
+                self.show_invalid = false;
+                for (var f in record) {
+                    var field = self.fields[f];
+                    if (field) {
+                        field.dirty = true;
+                        self.do_onchange(field);
+                    }
                 }
             }
-        }
-        this.on_form_changed();
-        this.initial_mutating_lock.resolve();
-        this.show_invalid = true;
-        this.do_update_pager(record.id == null);
-        if (this.sidebar) {
-            this.sidebar.attachments.do_update();
-        }
-        if (this.default_focus_field && !this.embedded_view) {
-            this.default_focus_field.focus();
-        }
+            self.on_form_changed();
+            self.initial_mutating_lock.resolve();
+            self.show_invalid = true;
+            self.do_update_pager(record.id == null);
+            if (self.sidebar) {
+                self.sidebar.attachments.do_update();
+            }
+            if (self.default_focus_field && !self.embedded_view) {
+                self.default_focus_field.focus();
+            }
+        });
     },
     on_form_changed: function() {
         for (var w in this.widgets) {
@@ -354,12 +364,13 @@ openerp.web.FormView = openerp.web.View.extend( /** @lends openerp.web.FormView#
                 var keys = _.keys(self.fields_view.fields);
                 $.when(self.do_set_editable()).then(function() {
                     if (keys.length) {
-                        self.dataset.default_get(keys).then(self.on_record_loaded).then(function() {
+                        self.dataset.default_get(keys).pipe(self.on_record_loaded).then(function() {
                             def.resolve();
                         });
                     } else {
-                        self.on_record_loaded({});
-                        def.resolve();
+                        self.on_record_loaded({}).then(function() {
+                            def.resolve();
+                        });
                     }
                 });
             }
@@ -476,8 +487,8 @@ openerp.web.FormView = openerp.web.View.extend( /** @lends openerp.web.FormView#
             // should not happen in the server, but may happen for internal purpose
             return $.Deferred().reject();
         } else {
-            this.reload();
-            return $.when(r).then(success);
+            return $.when(this.reload()).pipe(function () {
+                return $.when(r).then(success); }, null);
         }
     },
     /**
@@ -524,7 +535,7 @@ openerp.web.FormView = openerp.web.View.extend( /** @lends openerp.web.FormView#
             if (self.dataset.index == null || self.dataset.index < 0) {
                 return $.when(self.on_button_new());
             } else {
-                return self.dataset.read_index(_.keys(self.fields_view.fields), self.on_record_loaded);
+                return self.dataset.read_index(_.keys(self.fields_view.fields)).pipe(self.on_record_loaded);
             }
         };
         this.reload_lock = this.reload_lock.pipe(act, act);
@@ -550,12 +561,9 @@ openerp.web.FormView = openerp.web.View.extend( /** @lends openerp.web.FormView#
         });
     },
     is_dirty: function() {
-        for (var f in this.fields) {
-            if (this.fields[f].is_dirty()) {
-                return true;
-            }
-        }
-        return false;
+        return _.any(this.fields, function (value) {
+            return value.is_dirty();
+        });
     },
     is_interactible_record: function() {
         var id = this.datarecord.id;
@@ -1353,54 +1361,58 @@ openerp.web.DateTimeWidget = openerp.web.Widget.extend({
     template: "web.datetimepicker",
     jqueryui_object: 'datetimepicker',
     type_of_date: "datetime",
+    init: function(parent) {
+        this._super(parent);
+        this.name = parent.name;
+    },
     start: function() {
         var self = this;
-        this.$element.find('input').change(this.on_change);
+        this.$input = this.$element.find('input.oe_datepicker_master');
+        this.$input_picker = this.$element.find('input.oe_datepicker_container');
+        this.$input.change(this.on_change);
         this.picker({
             onSelect: this.on_picker_select,
             changeMonth: true,
             changeYear: true,
             showWeek: true,
-            showButtonPanel: false
+            showButtonPanel: true
         });
         this.$element.find('img.oe_datepicker_trigger').click(function() {
             if (!self.readonly) {
                 self.picker('setDate', self.value ? openerp.web.auto_str_to_date(self.value) : new Date());
-                self.$element.find('.oe_datepicker').toggle();
+                self.$input_picker.show();
+                self.picker('show');
+                self.$input_picker.hide();
             }
         });
-        this.$element.find('.ui-datepicker-inline').removeClass('ui-widget-content ui-corner-all');
-        this.$element.find('button.oe_datepicker_close').click(function() {
-            self.$element.find('.oe_datepicker').hide();
-        });
         this.set_readonly(false);
         this.value = false;
     },
     picker: function() {
-        return $.fn[this.jqueryui_object].apply(this.$element.find('.oe_datepicker_container'), arguments);
+        return $.fn[this.jqueryui_object].apply(this.$input_picker, arguments);
     },
     on_picker_select: function(text, instance) {
         var date = this.picker('getDate');
-        this.$element.find('input').val(date ? this.format_client(date) : '').change();
+        this.$input.val(date ? this.format_client(date) : '').change();
     },
     set_value: function(value) {
         this.value = value;
-        this.$element.find('input').val(value ? this.format_client(value) : '');
+        this.$input.val(value ? this.format_client(value) : '');
     },
     get_value: function() {
         return this.value;
     },
     set_value_from_ui: function() {
-        var value = this.$element.find('input').val() || false;
+        var value = this.$input.val() || false;
         this.value = this.parse_client(value);
     },
     set_readonly: function(readonly) {
         this.readonly = readonly;
-        this.$element.find('input').attr('disabled', this.readonly);
+        this.$input.attr('disabled', this.readonly);
         this.$element.find('img.oe_datepicker_trigger').toggleClass('oe_input_icon_disabled', readonly);
     },
     is_valid: function(required) {
-        var value = this.$element.find('input').val();
+        var value = this.$input.val();
         if (value === "") {
             return !required;
         } else {
@@ -1413,7 +1425,7 @@ openerp.web.DateTimeWidget = openerp.web.Widget.extend({
         }
     },
     focus: function() {
-        this.$element.find('input').focus();
+        this.$input.focus();
     },
     parse_client: function(v) {
         return openerp.web.parse_value(v, {"widget": this.type_of_date});
@@ -1430,11 +1442,7 @@ openerp.web.DateTimeWidget = openerp.web.Widget.extend({
 
 openerp.web.DateWidget = openerp.web.DateTimeWidget.extend({
     jqueryui_object: 'datepicker',
-    type_of_date: "date",
-    on_picker_select: function(text, instance) {
-        this._super(text, instance);
-        this.$element.find('.oe_datepicker').hide();
-    }
+    type_of_date: "date"
 });
 
 openerp.web.form.FieldDatetime = openerp.web.form.Field.extend({
@@ -2112,7 +2120,7 @@ openerp.web.form.FieldOne2Many = openerp.web.form.Field.extend({
     },
     reload_current_view: function() {
         var self = this;
-        self.is_loaded = self.is_loaded.pipe(function() {
+        return self.is_loaded = self.is_loaded.pipe(function() {
             var view = self.viewmanager.views[self.viewmanager.active_view].controller;
             if(self.viewmanager.active_view === "list") {
                 return view.reload_content();
@@ -2185,8 +2193,8 @@ openerp.web.form.FieldOne2Many = openerp.web.form.Field.extend({
         if (this.dataset.index === null && this.dataset.ids.length > 0) {
             this.dataset.index = 0;
         }
-        self.reload_current_view();
-        this.is_setted.resolve();
+        self.is_setted.resolve();
+        return self.reload_current_view();
     },
     get_value: function() {
         var self = this;
diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js
index d348b2d7240..eff94b95ad7 100644
--- a/addons/web/static/src/js/views.js
+++ b/addons/web/static/src/js/views.js
@@ -210,7 +210,7 @@ session.web.ViewManager =  session.web.Widget.extend(/** @lends session.web.View
                     sidebar_id : self.element_id + '_sidebar_' + view.view_type,
                     action : self.action,
                     action_views_ids : views_ids
-                }, self.flags, view.options || {})
+                }, self.flags, self.flags[view.view_type] || {}, view.options || {})
             });
             views_ids[view.view_type] = view.view_id;
         });
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index beb7fc528a3..24defe23e2e 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -714,7 +714,7 @@
 </t>
 <t t-name="Widget">
     Unhandled widget
-    <t t-raw="console.log('Unhandled widget', widget)"/>
+    <t t-js="dict">console.warn('Unhandled widget', dict.widget);</t>
 </t>
 <t t-name="WidgetFrame">
     <table border="0" width="100%" cellpadding="0" cellspacing="0" class="oe_frame oe_forms">
@@ -907,13 +907,13 @@
 </t>
 <t t-name="web.datetimepicker">
     <div class="oe_datepicker_root">
-        <input type="text" size="1" style="width: 100%"/>
+        <input type="text" size="1" style="width: 100%"
+            t-att-name="widget.name"
+            t-attf-class="oe_datepicker_master field_#{widget.type_of_date}"
+        />
         <img class="oe_input_icon oe_datepicker_trigger" t-att-src='widget.session.server + "/web/static/src/img/ui/field_calendar.png"'
              title="Select date" width="16" height="16" border="0"/>
-        <div class="oe_datepicker ui-widget-content ui-corner-all" style="display: none; position: absolute; z-index: 1;">
-            <div class="oe_datepicker_container"/>
-            <button type="button" class="oe_datepicker_close ui-state-default ui-priority-primary ui-corner-all" style="float: right;">Done</button>
-        </div>
+        <input type="text" size="1" class="oe_datepicker_container" disabled="disabled"/>
     </div>
 </t>
 <t t-name="FieldSelection">
@@ -1081,7 +1081,7 @@
     </table>
 </t>
 <t t-name="WidgetButton">
-    <button type="button" style="width: 100%" class="button">
+    <button type="button" class="oe_button">
         <img t-if="widget.node.attrs.icon" t-att-src="widget.session.server + '/web/static/src/img/icons/' + widget.node.attrs.icon + '.png'" width="16" height="16"/>
         <span t-if="widget.string"><t t-esc="widget.string"/></span>
     </button>
@@ -1163,8 +1163,8 @@
         t-att-title="attrs.help"
         t-att-class="classes.join(' ')"
         t-att-autofocus="attrs.default_focus === '1' ? 'autofocus' : undefined">
-    <img t-if="attrs.icon" t-att-src="widget.session.server + '/web/static/src/img/icons/' + attrs.icon + '.png'" width="16" height="16"/>
-    <br t-if="attrs.icon and attrs.string"/>
+    <img t-att-src="widget.session.server + '/web/static/src/img/icons/' + (attrs.icon || 'gtk-home') + '.png'" width="16" height="16"/>
+    <br t-if="attrs.string"/>
     <t t-esc="attrs.string"/>
 </button>
 <span t-name="SearchView.filters" class="filter_label_group"