[MERGE]

bzr revid: apa@tinyerp.com-20120731051835-xr1r5vqiq7bcsapd

2 files changed, 37 insertions, 6 deletions

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index c7c2fc1a64e..12443e70880 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -302,7 +302,7 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM
         this._super();
     },
     on_record_loaded: function(record) {
-        var self = this, set_values = [];
+        var self = this, defs = [];
         if (!record) {
             this.set({ 'title' : undefined });
             this.do_warn("Form", "The record could not be found in the database.", true);
@@ -310,7 +310,19 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM
         }
         this.datarecord = record;
         this._actualize_mode();
-        this.set({ 'title' : record.id ? record.name : "New record" });
+
+        var titleDef = $.Deferred();
+        if (record.id) {
+            this.dataset.name_get(record.id).then(function(names) {
+                self.set({ 'title' : names[0][1] });
+            }).always(function() {
+                titleDef.resolve();
+            });
+        } else {
+            this.set({ 'title' : "New record" });
+            titleDef.resolve();
+        }
+        defs.push(titleDef);
 
         if (this.qweb) {
             this.kill_current_form();
@@ -322,9 +334,9 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM
         _(this.fields).each(function (field, f) {
             field._dirty_flag = false;
             var result = field.set_value(self.datarecord[f] || false);
-            set_values.push(result);
+            defs.push(result);
         });
-        return $.when.apply(null, set_values).pipe(function() {
+        return $.when.apply(null, defs).pipe(function() {
             if (!record.id) {
                 // New record: Second pass in order to trigger the onchanges
                 // respecting the fields order defined in the view
diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js
index 2e22b8b64c5..e47981a4284 100644
--- a/addons/web/static/src/js/views.js
+++ b/addons/web/static/src/js/views.js
@@ -505,6 +505,7 @@ instance.web.ViewManager =  instance.web.Widget.extend({
         });
         this.getParent().push_breadcrumb({
             widget: this,
+            action: this.action,
             show: function(index, $e) {
                 var view_to_select = views[index];
                 self.$element.show();
@@ -513,9 +514,27 @@ instance.web.ViewManager =  instance.web.Widget.extend({
                 }
             },
             get_title: function() {
-                return _.map(views, function(v) {
-                    return self.views[v].controller.get('title');
+                var id;
+                var currentIndex;
+                _.each(self.getParent().breadcrumbs, function(bc, i) {
+                    if (bc.widget === self) {
+                        currentIndex = i;
+                    }
+                });
+                var next = self.getParent().breadcrumbs.slice(currentIndex + 1)[0];
+                var titles = _.map(views, function(v) {
+                    var controller = self.views[v].controller;
+                    if (v === 'form') {
+                        id = controller.datarecord.id;
+                    }
+                    return controller.get('title');
                 });
+                if (next && next.action.res_id && self.active_view === 'form' && self.model === next.action.res_model && id === next.action.res_id) {
+                    // If the current active view is a formview and the next item in the breadcrumbs
+                    // is an action on same object (model / res_id), then we omit the current formview's title
+                    titles.pop();
+                }
+                return titles;
             }
         });
     },