From af41ee194cc47ba15376486ee33bc43b71cad8bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20van=20der=20Essen?= <fva@openerp.com>
Date: Mon, 1 Oct 2012 14:39:13 +0200
Subject: [PATCH 01/28] [FIX] css: icons overlapping text in notes

bzr revid: fva@openerp.com-20121001123913-nn50tybpc73o1byn
---
 addons/web_kanban/static/src/css/kanban.css  | 9 +++------
 addons/web_kanban/static/src/css/kanban.sass | 7 +++----
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/addons/web_kanban/static/src/css/kanban.css b/addons/web_kanban/static/src/css/kanban.css
index d865213c8a6..6846171a82a 100644
--- a/addons/web_kanban/static/src/css/kanban.css
+++ b/addons/web_kanban/static/src/css/kanban.css
@@ -385,9 +385,6 @@
 .openerp .oe_kanban_view .oe_kanban_card h3:hover, .openerp .oe_kanban_view .oe_kanban_quick_create h3:hover {
   text-decoration: none;
 }
-.openerp .oe_kanban_view .oe_kanban_card .oe_dropdown_kanban, .openerp .oe_kanban_view .oe_kanban_quick_create .oe_dropdown_kanban {
-  margin-top: 4px;
-}
 .openerp .oe_kanban_view .oe_kanban_card .oe_dropdown_kanban .oe_kanban_project_times li, .openerp .oe_kanban_view .oe_kanban_quick_create .oe_dropdown_kanban .oe_kanban_project_times li {
   float: left;
 }
@@ -480,10 +477,10 @@
   white-space: nowrap;
 }
 .openerp .oe_kanban_view .oe_dropdown_kanban {
-  position: absolute;
-  top: -8px;
-  right: 3px;
+  float: right;
+  clear: both;
   cursor: pointer;
+  margin-top: -6px;
 }
 .openerp .oe_kanban_view .oe_dropdown_kanban:hover {
   text-decoration: none;
diff --git a/addons/web_kanban/static/src/css/kanban.sass b/addons/web_kanban/static/src/css/kanban.sass
index 8063d9d2cb8..88b60134f24 100644
--- a/addons/web_kanban/static/src/css/kanban.sass
+++ b/addons/web_kanban/static/src/css/kanban.sass
@@ -341,7 +341,6 @@
         h3:hover
             text-decoration: none
         .oe_dropdown_kanban
-            margin-top: 4px
             .oe_kanban_project_times
                 li
                     float: left
@@ -404,10 +403,10 @@
     // }}}
     // KanbanDropDown {{{
     .oe_dropdown_kanban
-        position: absolute
-        top: -8px
-        right: 3px
+        float: right
+        clear: both
         cursor: pointer
+        margin-top: -6px
         &:hover
             text-decoration: none
         .oe_dropdown_menu

From 273904d103c3a13499521b71772d794e5e5d400b Mon Sep 17 00:00:00 2001
From: Christophe Simonis <chs@openerp.com>
Date: Mon, 1 Oct 2012 17:03:05 +0200
Subject: [PATCH 02/28] [IMP] orm: be more vebose when accessing an invalid
 field of browse_record objects

bzr revid: chs@openerp.com-20121001150305-recozdvfc68wc766
---
 openerp/osv/orm.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/openerp/osv/orm.py b/openerp/osv/orm.py
index f324ed67522..47afda39e5e 100644
--- a/openerp/osv/orm.py
+++ b/openerp/osv/orm.py
@@ -51,6 +51,7 @@ import pickle
 import re
 import simplejson
 import time
+import traceback
 import types
 from lxml import etree
 
@@ -373,6 +374,8 @@ class browse_record(object):
             else:
                 error_msg = "Field '%s' does not exist in object '%s'" % (name, self) 
                 self.__logger.warning(error_msg)
+                if self.__logger.isEnabledFor(logging.DEBUG):
+                    self.__logger.debug(''.join(traceback.format_stack()))
                 raise KeyError(error_msg)
 
             # if the field is a classic one or a many2one, we'll fetch all classic and many2one fields

From 5763e40506f9f155e09b2fccbc7ffa4247b02b9b Mon Sep 17 00:00:00 2001
From: Christophe Simonis <chs@openerp.com>
Date: Mon, 1 Oct 2012 17:14:21 +0200
Subject: [PATCH 03/28] [IMP] orm: remove trailing spaces

bzr revid: chs@openerp.com-20121001151421-vdfkzuf864rz8q20
---
 openerp/osv/orm.py | 60 +++++++++++++++++++++++-----------------------
 1 file changed, 30 insertions(+), 30 deletions(-)

diff --git a/openerp/osv/orm.py b/openerp/osv/orm.py
index 47afda39e5e..8b78621db03 100644
--- a/openerp/osv/orm.py
+++ b/openerp/osv/orm.py
@@ -372,7 +372,7 @@ class browse_record(object):
                 else:
                     return attr
             else:
-                error_msg = "Field '%s' does not exist in object '%s'" % (name, self) 
+                error_msg = "Field '%s' does not exist in object '%s'" % (name, self)
                 self.__logger.warning(error_msg)
                 if self.__logger.isEnabledFor(logging.DEBUG):
                     self.__logger.debug(''.join(traceback.format_stack()))
@@ -712,7 +712,7 @@ class BaseModel(object):
 
     def log(self, cr, uid, id, message, secondary=False, context=None):
         return _logger.warning("log() is deprecated. Please use OpenChatter notification system instead of the res.log mechanism.")
-    
+
     def view_init(self, cr, uid, fields_list, context=None):
         """Override this method to do specific things when a view on the object is opened."""
         pass
@@ -902,7 +902,7 @@ class BaseModel(object):
                                     # If new class defines a constraint with
                                     # same function name, we let it override
                                     # the old one.
-                                    
+
                                     new[c2] = c
                                     exist = True
                                     break
@@ -1596,7 +1596,7 @@ class BaseModel(object):
     def user_has_groups(self, cr, uid, groups, context=None):
         """Return true if the user is at least member of one of the groups
            in groups_str. Typically used to resolve ``groups`` attribute
-           in view and model definitions. 
+           in view and model definitions.
 
            :param str groups: comma-separated list of fully-qualified group
                               external IDs, e.g.: ``base.group_user,base.group_system``
@@ -1639,7 +1639,7 @@ class BaseModel(object):
                  the field should be completely removed from the view, as it is
                  completely unavailable for non-members
 
-               :return: True if field should be included in the result of fields_view_get 
+               :return: True if field should be included in the result of fields_view_get
             """
             if node.tag == 'field' and node.get('name') in self._all_columns:
                 column = self._all_columns[node.get('name')].column
@@ -1914,7 +1914,7 @@ class BaseModel(object):
     def _get_default_calendar_view(self, cr, user, context=None):
         """ Generates a default calendar view by trying to infer
         calendar fields from a number of pre-set attribute names
-        
+
         :param cr: database cursor
         :param int user: user id
         :param dict context: connection context
@@ -1993,7 +1993,7 @@ class BaseModel(object):
 
         def raise_view_error(error_msg, child_view_id):
             view, child_view = self.pool.get('ir.ui.view').browse(cr, user, [view_id, child_view_id], context)
-            error_msg = error_msg % {'parent_xml_id': view.xml_id} 
+            error_msg = error_msg % {'parent_xml_id': view.xml_id}
             raise AttributeError("View definition error for inherited view '%s' on model '%s': %s"
                                  %  (child_view.xml_id, self._name, error_msg))
 
@@ -2029,7 +2029,7 @@ class BaseModel(object):
                 if all(node.get(attr) == spec.get(attr) \
                         for attr in spec.attrib
                             if attr not in ('position','version')):
-                    # Version spec should match parent's root element's version 
+                    # Version spec should match parent's root element's version
                     if spec.get('version') and spec.get('version') != source.get('version'):
                         return None
                     return node
@@ -2103,7 +2103,7 @@ class BaseModel(object):
                         raise_view_error("Mismatching view API version for element '%s': %r vs %r in parent view '%%(parent_xml_id)s'" % \
                                             (tag, spec.get('version'), source.get('version')), inherit_id)
                     raise_view_error("Element '%s' not found in parent view '%%(parent_xml_id)s'" % tag, inherit_id)
-                    
+
             return source
 
         def apply_view_inheritance(cr, user, source, inherit_id):
@@ -2318,7 +2318,7 @@ class BaseModel(object):
                                 or ``'='``.
            :param int limit: optional max number of records to return
            :rtype: list
-           :return: list of pairs ``(id,text_repr)`` for all matching records. 
+           :return: list of pairs ``(id,text_repr)`` for all matching records.
         """
         return self._name_search(cr, user, name, args, operator, context, limit)
 
@@ -2448,7 +2448,7 @@ class BaseModel(object):
         # This is useful to implement kanban views for instance, where all columns
         # should be displayed even if they don't contain any record.
 
-        # Grab the list of all groups that should be displayed, including all present groups 
+        # Grab the list of all groups that should be displayed, including all present groups
         present_group_ids = [x[groupby][0] for x in read_group_result if x[groupby]]
         all_groups,folded = self._group_by_full[groupby](self, cr, uid, present_group_ids, domain,
                                                   read_group_order=read_group_order,
@@ -2824,28 +2824,28 @@ class BaseModel(object):
 
     def _m2o_fix_foreign_key(self, cr, source_table, source_field, dest_model, ondelete):
         # Find FK constraint(s) currently established for the m2o field,
-        # and see whether they are stale or not 
+        # and see whether they are stale or not
         cr.execute("""SELECT confdeltype as ondelete_rule, conname as constraint_name,
                              cl2.relname as foreign_table
                       FROM pg_constraint as con, pg_class as cl1, pg_class as cl2,
                            pg_attribute as att1, pg_attribute as att2
-                      WHERE con.conrelid = cl1.oid 
-                        AND cl1.relname = %s 
-                        AND con.confrelid = cl2.oid 
-                        AND array_lower(con.conkey, 1) = 1 
-                        AND con.conkey[1] = att1.attnum 
-                        AND att1.attrelid = cl1.oid 
-                        AND att1.attname = %s 
-                        AND array_lower(con.confkey, 1) = 1 
-                        AND con.confkey[1] = att2.attnum 
-                        AND att2.attrelid = cl2.oid 
-                        AND att2.attname = %s 
+                      WHERE con.conrelid = cl1.oid
+                        AND cl1.relname = %s
+                        AND con.confrelid = cl2.oid
+                        AND array_lower(con.conkey, 1) = 1
+                        AND con.conkey[1] = att1.attnum
+                        AND att1.attrelid = cl1.oid
+                        AND att1.attname = %s
+                        AND array_lower(con.confkey, 1) = 1
+                        AND con.confkey[1] = att2.attnum
+                        AND att2.attrelid = cl2.oid
+                        AND att2.attname = %s
                         AND con.contype = 'f'""", (source_table, source_field, 'id'))
         constraints = cr.dictfetchall()
         if constraints:
             if len(constraints) == 1:
                 # Is it the right constraint?
-                cons, = constraints 
+                cons, = constraints
                 if cons['ondelete_rule'] != POSTGRES_CONFDELTYPES.get((ondelete or 'set null').upper(), 'a')\
                     or cons['foreign_table'] != dest_model._table:
                     _schema.debug("Table '%s': dropping obsolete FK constraint: '%s'",
@@ -3218,7 +3218,7 @@ class BaseModel(object):
 
     def _o2m_raise_on_missing_reference(self, cr, f):
         # TODO this check should be a method on fields.one2many.
-        
+
         other = self.pool.get(f._obj)
         if other:
             # TODO the condition could use fields_get_keys().
@@ -3735,7 +3735,7 @@ class BaseModel(object):
            the length of `ids`, and raise an appropriate exception if it does not.
         """
         if cr.rowcount != len(ids):
-            # Attempt to distinguish record rule restriction vs deleted records, 
+            # Attempt to distinguish record rule restriction vs deleted records,
             # to provide a more specific error message
             cr.execute('SELECT id FROM ' + self._table + ' WHERE id IN %s', (tuple(ids),))
             if cr.rowcount != len(ids):
@@ -3790,13 +3790,13 @@ class BaseModel(object):
                     self._check_record_rules_result_count(cr, uid, sub_ids, operation, context=context)
 
     def _workflow_trigger(self, cr, uid, ids, trigger, context=None):
-        """Call given workflow trigger as a result of a CRUD operation""" 
+        """Call given workflow trigger as a result of a CRUD operation"""
         wf_service = netsvc.LocalService("workflow")
         for res_id in ids:
             getattr(wf_service, trigger)(uid, self._name, res_id, cr)
 
     def _workflow_signal(self, cr, uid, ids, signal, context=None):
-        """Send given workflow signal""" 
+        """Send given workflow signal"""
         wf_service = netsvc.LocalService("workflow")
         for res_id in ids:
             wf_service.trg_validate(uid, self._name, res_id, signal, cr)
@@ -3827,7 +3827,7 @@ class BaseModel(object):
         self.check_access_rights(cr, uid, 'unlink')
 
         ir_property = self.pool.get('ir.property')
-        
+
         # Check if the records are used as default properties.
         domain = [('res_id', '=', False),
                   ('value_reference', 'in', ['%s,%s' % (self._name, i) for i in ids]),
@@ -4955,7 +4955,7 @@ class BaseModel(object):
 
         :return: map of ids to their fully qualified XML ID,
                  defaulting to an empty string when there's none
-                 (to be usable as a function field), 
+                 (to be usable as a function field),
                  e.g.::
 
                      { 'id': 'module.ext_id',

From b7e5519b4c0b4c212ef1268a09dacdfb26b704d8 Mon Sep 17 00:00:00 2001
From: Christophe Simonis <chs@openerp.com>
Date: Mon, 1 Oct 2012 17:37:53 +0200
Subject: [PATCH 04/28] [FIX] orm: handle fields.char() with not size correctly

bzr revid: chs@openerp.com-20121001153753-um68vpz1caojm17r
---
 openerp/osv/orm.py | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/openerp/osv/orm.py b/openerp/osv/orm.py
index 8b78621db03..ec995c6a8cc 100644
--- a/openerp/osv/orm.py
+++ b/openerp/osv/orm.py
@@ -2967,14 +2967,14 @@ class BaseModel(object):
                                 ('numeric', 'float', get_pg_type(f)[1], '::'+get_pg_type(f)[1]),
                                 ('float8', 'float', get_pg_type(f)[1], '::'+get_pg_type(f)[1]),
                             ]
-                            if f_pg_type == 'varchar' and f._type == 'char' and f_pg_size < f.size:
+                            if f_pg_type == 'varchar' and f._type == 'char' and ((f.size is None and f_pg_size) or f_pg_size < f.size):
                                 cr.execute('ALTER TABLE "%s" RENAME COLUMN "%s" TO temp_change_size' % (self._table, k))
                                 cr.execute('ALTER TABLE "%s" ADD COLUMN "%s" %s' % (self._table, k, pg_varchar(f.size)))
                                 cr.execute('UPDATE "%s" SET "%s"=temp_change_size::%s' % (self._table, k, pg_varchar(f.size)))
                                 cr.execute('ALTER TABLE "%s" DROP COLUMN temp_change_size CASCADE' % (self._table,))
                                 cr.commit()
                                 _schema.debug("Table '%s': column '%s' (type varchar) changed size from %s to %s",
-                                    self._table, k, f_pg_size, f.size)
+                                    self._table, k, f_pg_size or 'unlimited', f.size or 'unlimited')
                             for c in casts:
                                 if (f_pg_type==c[0]) and (f._type==c[1]):
                                     if f_pg_type != f_obj_type:
@@ -3207,8 +3207,7 @@ class BaseModel(object):
         # attlen is the number of bytes necessary to represent the type when
         # the type has a fixed size. If the type has a varying size attlen is
         # -1 and atttypmod is the size limit + 4, or -1 if there is no limit.
-        # Thus the query can return a negative size for a unlimited varchar.
-        cr.execute("SELECT c.relname,a.attname,a.attlen,a.atttypmod,a.attnotnull,a.atthasdef,t.typname,CASE WHEN a.attlen=-1 THEN a.atttypmod-4 ELSE a.attlen END as size " \
+        cr.execute("SELECT c.relname,a.attname,a.attlen,a.atttypmod,a.attnotnull,a.atthasdef,t.typname,CASE WHEN a.attlen=-1 THEN (CASE WHEN a.atttypmod=-1 THEN 0 ELSE a.atttypmod-4 END) ELSE a.attlen END as size " \
            "FROM pg_class c,pg_attribute a,pg_type t " \
            "WHERE c.relname=%s " \
            "AND c.oid=a.attrelid " \

From 7d46e337633ff4265642d8a7bf9a8a9157a80c18 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20van=20der=20Essen?= <fva@openerp.com>
Date: Mon, 1 Oct 2012 17:49:16 +0200
Subject: [PATCH 05/28] [IMP] css: animations for kanban notes

bzr revid: fva@openerp.com-20121001154916-r5mq1z4icc54jmgz
---
 addons/web_kanban/static/src/css/kanban.css  |  9 ++++++---
 addons/web_kanban/static/src/css/kanban.sass | 14 ++++++++++++--
 addons/web_kanban/static/src/js/kanban.js    |  6 ++++++
 3 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/addons/web_kanban/static/src/css/kanban.css b/addons/web_kanban/static/src/css/kanban.css
index 6846171a82a..60e8eefcf37 100644
--- a/addons/web_kanban/static/src/css/kanban.css
+++ b/addons/web_kanban/static/src/css/kanban.css
@@ -9,7 +9,6 @@
 .openerp .oe_kanban_view .ui-sortable-placeholder {
   border: 1px solid rgba(0, 0, 0, 0.1);
   visibility: visible !important;
-  height: 60px !important;
 }
 .openerp .oe_kanban_view .ui-sortable-helper {
   -moz-box-shadow: 0 1px 10px rgba(0, 0, 0, 0.3);
@@ -19,6 +18,9 @@
   -webkit-transform: rotate(3deg);
   -o-transform: rotate(3deg);
   -ms-transform: rotate(3deg);
+  -webkit-transition: -webkit-transform 100ms linear;
+  -moz-transition: -moz-transform 100ms linear;
+  transition: transform 100ms linear;
 }
 .openerp .oe_kanban_view .oe_kanban_left {
   float: left;
@@ -364,17 +366,18 @@
   border-bottom-color: rgba(0, 0, 0, 0.3);
   padding: 8px;
   display: block;
+  -webkit-transition: -webkit-transform, -webkit-box-shadow, border 200ms linear;
   -moz-border-radius: 4px;
   -webkit-border-radius: 4px;
   border-radius: 4px;
 }
-.openerp .oe_kanban_view .oe_kanban_card:hover, .openerp .oe_kanban_view .oe_kanban_quick_create:hover {
+.openerp .oe_kanban_view .oe_kanban_card:not(.ui-sortable-helper):hover, .openerp .oe_kanban_view .oe_kanban_quick_create:not(.ui-sortable-helper):hover {
   border: 1px solid #7c7bad;
   -moz-box-shadow: 0 0 4px #7c7bad;
   -webkit-box-shadow: 0 0 4px #7c7bad;
   -box-shadow: 0 0 4px #7c7bad;
 }
-.openerp .oe_kanban_view .oe_kanban_card:hover .oe_dropdown_kanban > span, .openerp .oe_kanban_view .oe_kanban_quick_create:hover .oe_dropdown_kanban > span {
+.openerp .oe_kanban_view .oe_kanban_card:not(.ui-sortable-helper):hover .oe_dropdown_kanban > span, .openerp .oe_kanban_view .oe_kanban_quick_create:not(.ui-sortable-helper):hover .oe_dropdown_kanban > span {
   visibility: visible;
 }
 .openerp .oe_kanban_view .oe_kanban_card h3, .openerp .oe_kanban_view .oe_kanban_quick_create h3 {
diff --git a/addons/web_kanban/static/src/css/kanban.sass b/addons/web_kanban/static/src/css/kanban.sass
index 88b60134f24..1210e9bf640 100644
--- a/addons/web_kanban/static/src/css/kanban.sass
+++ b/addons/web_kanban/static/src/css/kanban.sass
@@ -37,6 +37,13 @@
     -webkit-transform: $transform
     -o-transform: $transform
     -ms-transform: $transform
+
+@mixin transition($transition: all 200ms linear)
+    -webkit-transition: $transition
+    -moz-transition: $transition
+    -ms-transition: $transition
+    -o-transition: $transition
+    transition: $transition
 // }}}
 
 .openerp .oe_kanban_view
@@ -49,10 +56,12 @@
     .ui-sortable-placeholder
         border: 1px solid rgba(0,0,0,0.1)
         visibility: visible !important
-        height: 60px !important
     .ui-sortable-helper
         @include box-shadow(0 1px 10px rgba(0, 0, 0, 0.3))
         @include transform(rotate(3deg))
+        -webkit-transition: -webkit-transform 100ms linear
+        -moz-transition: -moz-transform 100ms linear
+        transition: transform 100ms linear
     .oe_kanban_left
         float: left
     .oe_kanban_right
@@ -328,8 +337,9 @@
         border-bottom-color: rgba(0,0,0,0.3)
         padding: 8px
         display: block
+        -webkit-transition: -webkit-transform, -webkit-box-shadow, border 200ms linear
         @include radius(4px)
-        &:hover
+        &:not(.ui-sortable-helper):hover
             border: 1px solid #7C7BAD
             @include box-shadow(0 0 4px #7C7BAD)
             .oe_dropdown_kanban > span
diff --git a/addons/web_kanban/static/src/js/kanban.js b/addons/web_kanban/static/src/js/kanban.js
index bd36dcbf4ba..d8e93efa580 100644
--- a/addons/web_kanban/static/src/js/kanban.js
+++ b/addons/web_kanban/static/src/js/kanban.js
@@ -309,8 +309,14 @@ instance.web_kanban.KanbanView = instance.web.View.extend({
                     ui.item.find('*').on('click.prevent', function(ev) {
                         return false;
                     });
+                    ui.placeholder.height(ui.item.height());
+                },
+                revert: 150,
+                beforeStop: function(event,ui){
+                    console.log('beforeStop:',ui);
                 },
                 stop: function(event, ui) {
+                    console.log('stop:',ui);
                     var record = ui.item.data('widget');
                     var old_index = self.currently_dragging.index;
                     var new_index = ui.item.index();

From feaa3bf3ab40c40dd64f32916de2194e4cb9d5d0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20van=20der=20Essen?= <fva@openerp.com>
Date: Mon, 1 Oct 2012 19:12:26 +0200
Subject: [PATCH 06/28] [FIX] css: removed bold from active menu items, it made
 the menu wobble

bzr revid: fva@openerp.com-20121001171226-xw275mzmhc43faeu
---
 addons/web/static/src/css/base.css  | 3 +--
 addons/web/static/src/css/base.sass | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index 18db06c44a1..aadc73e3511 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -1081,9 +1081,8 @@
   box-shadow: 0 1px 2px rgba(0, 0, 0, 0.4) inset;
 }
 .openerp .oe_menu > li > .oe_active {
-  background: rgba(0, 0, 0, 0.2);
+  background: rgba(0, 0, 0, 0.3);
   text-shadow: black 0px 0px 3px;
-  font-weight: bold;
   -moz-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.4) inset;
   -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.4) inset;
   box-shadow: 0 1px 2px rgba(0, 0, 0, 0.4) inset;
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index 851d0c3f9c9..818cd7dc450 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -875,9 +875,8 @@ $sheet-max-width: 860px
                     color: white
                     @include box-shadow(0 1px 2px rgba(0,0,0,0.4) inset)
             > .oe_active
-                background: rgba(0,0,0,0.2)
+                background: rgba(0,0,0,0.30)
                 text-shadow: black 0px 0px 3px
-                font-weight: bold
                 @include box-shadow(0 1px 2px rgba(0,0,0,0.4) inset)
 
     .oe_user_menu

From 6664ca2653d47a2856272758a018bdb383668359 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20van=20der=20Essen?= <fva@openerp.com>
Date: Mon, 1 Oct 2012 19:16:10 +0200
Subject: [PATCH 07/28] [FIX] css: disabled required inputs should not be
 highlighted

bzr revid: fva@openerp.com-20121001171610-lyshewqacnl0me7s
---
 addons/web/static/src/css/base.css  | 2 +-
 addons/web/static/src/css/base.sass | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index aadc73e3511..7cd189f8d4b 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -2240,7 +2240,7 @@
 .openerp .oe_form .oe_datepicker_root {
   display: inline-block;
 }
-.openerp .oe_form .oe_form_required input, .openerp .oe_form .oe_form_required select, .openerp .oe_form .oe_form_required textarea {
+.openerp .oe_form .oe_form_required input:not([disabled]), .openerp .oe_form .oe_form_required select:not([disabled]), .openerp .oe_form .oe_form_required textarea:not([disabled]) {
   background-color: #d2d2ff !important;
 }
 .openerp .oe_form .oe_form_invalid input, .openerp .oe_form .oe_form_invalid select, .openerp .oe_form .oe_form_invalid textarea {
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index 818cd7dc450..06890b991dc 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -1772,8 +1772,8 @@ $sheet-max-width: 860px
             display: none
         .oe_datepicker_root
             display: inline-block
-        .oe_form_required
-            input, select, textarea
+        .oe_form_required 
+            input:not([disabled]), select:not([disabled]), textarea:not([disabled])
                 background-color: #D2D2FF !important
         .oe_form_invalid
             input, select, textarea

From a217a94f7fd222f0c8298c3c91a1c75bb9fdd77b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20van=20der=20Essen?= <fva@openerp.com>
Date: Tue, 2 Oct 2012 16:06:44 +0200
Subject: [PATCH 08/28] [IMP] css: display previously implicit 'or' operator in
 the advanced search

bzr revid: fva@openerp.com-20121002140644-3qbx3w0fsgk3vd0v
---
 addons/web/static/src/css/base.css  | 7 +++++++
 addons/web/static/src/css/base.sass | 5 +++++
 addons/web/static/src/xml/base.xml  | 1 +
 3 files changed, 13 insertions(+)

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index 7cd189f8d4b..1220dee986d 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -1842,6 +1842,13 @@
   margin: 0;
   white-space: nowrap;
 }
+.openerp .oe_searchview .oe_searchview_drawer .oe_searchview_advanced li:first-child .searchview_extended_prop_or {
+  visibility: hidden;
+}
+.openerp .oe_searchview .oe_searchview_drawer .oe_searchview_advanced .searchview_extended_prop_or {
+  opacity: 0.5;
+  margin-left: -14px;
+}
 .openerp .oe_searchview .oe_searchview_drawer .oe_opened h4:before {
   content: "▾ ";
   position: relative;
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index 06890b991dc..680ed75abb8 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -1465,6 +1465,11 @@ $sheet-max-width: 860px
                     list-style: none
                     margin: 0
                     white-space: nowrap
+                    &:first-child .searchview_extended_prop_or
+                        visibility: hidden
+                .searchview_extended_prop_or
+                    opacity: 0.5
+                    margin-left: -14px
             .oe_opened
                 h4:before
                     content: "▾ "
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index fdf39633186..a2fb99f2195 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -1485,6 +1485,7 @@
 </div>
 <t t-name="SearchView.extended_search.proposition">
     <li>
+        <span class="searchview_extended_prop_or">or</span>
         <select class="searchview_extended_prop_field">
             <t t-foreach="widget.attrs.fields" t-as="field">
                 <option t-att="{'selected': field === widget.attrs.selected ? 'selected' : null}"

From bb8a62a3b41cb6d459052311c6a0ec05f6a22870 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Tue, 2 Oct 2012 16:13:02 +0200
Subject: [PATCH 09/28] [IMP] Use database uuid as client_id for OpenERP oauth
 provider

bzr revid: fme@openerp.com-20121002141302-dblh6j4eiwikmdoz
---
 addons/auth_oauth/__openerp__.py      | 1 +
 addons/auth_oauth/auth_oauth_data.yml | 6 ++++++
 2 files changed, 7 insertions(+)
 create mode 100644 addons/auth_oauth/auth_oauth_data.yml

diff --git a/addons/auth_oauth/__openerp__.py b/addons/auth_oauth/__openerp__.py
index c8da9c65d4a..1c29ca8c093 100644
--- a/addons/auth_oauth/__openerp__.py
+++ b/addons/auth_oauth/__openerp__.py
@@ -34,6 +34,7 @@ Allow users to login through Google OAuth2.
     'depends': ['base', 'web', 'base_setup'],
     'data': [
         'auth_oauth_data.xml',
+        'auth_oauth_data.yml',
         'auth_oauth_view.xml',
         'security/ir.model.access.csv'
     ],
diff --git a/addons/auth_oauth/auth_oauth_data.yml b/addons/auth_oauth/auth_oauth_data.yml
new file mode 100644
index 00000000000..af43811a560
--- /dev/null
+++ b/addons/auth_oauth/auth_oauth_data.yml
@@ -0,0 +1,6 @@
+-
+  Use database uuid as client_id for OpenERP oauth provider
+-
+  !python {model: ir.config_parameter}: |
+    oauth = self.pool.get('auth.oauth.provider')
+    oauth.write(cr, uid, [ref('provider_openerp')], {'client_id': self.get_param(cr, uid, 'database.uuid')})

From 8b74038f8e25129ac2c1d815b649cf2aa83d4a7e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20van=20der=20Essen?= <fva@openerp.com>
Date: Tue, 2 Oct 2012 17:59:56 +0200
Subject: [PATCH 10/28] [FIX] css: removed gray bar from disabled textarea
 unless they are inline

bzr revid: fva@openerp.com-20121002155956-89h44lbmx2ippji9
---
 addons/web/static/src/css/base.css  | 7 +++----
 addons/web/static/src/css/base.sass | 5 ++---
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index 1220dee986d..f056e992c8d 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -2212,16 +2212,12 @@
   min-width: 60px;
   color: #1f1f1f;
 }
-.openerp .oe_form textarea {
-  height: 32px;
-}
 .openerp .oe_form input[readonly], .openerp .oe_form select[readonly], .openerp .oe_form textarea[readonly], .openerp .oe_form input[disabled], .openerp .oe_form select[disabled] {
   background: #e5e5e5 !important;
   color: #666666;
 }
 .openerp .oe_form textarea[disabled] {
   border: none;
-  border-left: 8px solid #eeeeee;
   padding-left: 8px;
   -moz-box-shadow: none;
   -webkit-box-shadow: none;
@@ -2230,6 +2226,9 @@
   -webkit-border-radius: 0px;
   border-radius: 0px;
 }
+.openerp .oe_form textarea.oe_inline[disabled] {
+  border-left: 8px solid #eeeeee;
+}
 .openerp .oe_form .oe_form_field_url button img {
   vertical-align: top;
 }
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index 680ed75abb8..4a097310a4b 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -1754,17 +1754,16 @@ $sheet-max-width: 860px
             background: white
             min-width: 60px
             color: #1f1f1f
-        textarea
-            height: 32px
         input[readonly], select[readonly], textarea[readonly], input[disabled], select[disabled]
             background: #E5E5E5 !important
             color: #666
         textarea[disabled]
             border: none
-            border-left: 8px solid #eee
             padding-left: 8px
             @include box-shadow(none)
             @include radius(0px)
+        textarea.oe_inline[disabled]
+            border-left: 8px solid #eee
         .oe_form_field_url button img
             vertical-align: top
         .oe_form_field_date,

From 6427f6b4d46c03725ac064f4be000fde3f83788e Mon Sep 17 00:00:00 2001
From: Tejas Tank <tta@openerp.com>
Date: Wed, 3 Oct 2012 18:26:29 +0530
Subject: [PATCH 11/28] [FIX] Data exporting wizard crashes & Export wizard
 buttons.

bzr revid: tta@openerp.com-20121003125629-x6jxmerj5tqc65xp
---
 addons/web/static/src/js/chrome.js      |  2 +-
 addons/web/static/src/js/data_export.js | 18 ++++++++++--------
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js
index bed4a159535..01bfb63a580 100644
--- a/addons/web/static/src/js/chrome.js
+++ b/addons/web/static/src/js/chrome.js
@@ -146,8 +146,8 @@ instance.web.Dialog = instance.web.Widget.extend({
             this.$buttons = $('<div class="ui-dialog-buttonpane ui-widget-content ui-helper-clearfix" />');
             this.$el.dialog("widget").append(this.$buttons);
         }
-        var res = this.start();
         this.dialog_inited = true;
+        var res = this.start();
         return res;
     },
     close: function() {
diff --git a/addons/web/static/src/js/data_export.js b/addons/web/static/src/js/data_export.js
index 29aea6362f7..1353f59d4a5 100644
--- a/addons/web/static/src/js/data_export.js
+++ b/addons/web/static/src/js/data_export.js
@@ -5,7 +5,15 @@ instance.web.DataExport = instance.web.Dialog.extend({
     template: 'ExportTreeView',
     dialog_title: {toString: function () { return _t("Export Data"); }},
     init: function(parent, dataset) {
-        this._super(parent);
+        var self = this;
+        options = {
+            buttons : [
+                {text: _t("Close"), click: function() { self.close(); }},
+                {text: _t("Export To File"), click: function() { self.on_click_export_data(); }}
+            ],
+            close: function(event, ui){ self.close();}
+        }
+        this._super(parent, options);
         this.records = {};
         this.dataset = dataset;
         this.exports = new instance.web.DataSetSearch(
@@ -14,13 +22,7 @@ instance.web.DataExport = instance.web.Dialog.extend({
     start: function() {
         var self = this;
         this._super.apply(this, arguments);
-        this.open({
-            buttons : [
-                {text: _t("Close"), click: function() { self.close(); }},
-                {text: _t("Export To File"), click: function() { self.on_click_export_data(); }}
-            ],
-            close: function(event, ui){ self.close();}
-        });
+        this.open();
         self.$el.removeClass('ui-dialog-content ui-widget-content');
         self.$el.find('#add_field').click(function() {
             if ($('#field-tree-structure tr.ui-selected')) {

From 29a53e19546570b97932d163a0c2d0a2acf4a7ff Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Thu, 4 Oct 2012 09:46:10 +0200
Subject: [PATCH 12/28] [REV] header template extraction

bzr revid: xmo@openerp.com-20121004074610-o2wk9nspzgqjj4y1
---
 addons/web/static/src/xml/base.xml |   6 ----
 doc/images/templates/ui.Header.png | Bin 2844 -> 0 bytes
 doc/index.rst                      |   2 --
 doc/templates.rst                  |  45 -----------------------------
 4 files changed, 53 deletions(-)
 delete mode 100644 doc/images/templates/ui.Header.png
 delete mode 100644 doc/templates.rst

diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index dfe86036c45..cead483ead6 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -2,12 +2,6 @@
 <!-- vim:fdl=1:
 -->
 <templates id="template" xml:space="preserve">
-<t t-name="ui.Header">
-    <header>
-        <t t-raw="__content__"/>
-    </header>
-</t>
-
 <t t-name="EmptyComponent">
     <div></div>
 </t>
diff --git a/doc/images/templates/ui.Header.png b/doc/images/templates/ui.Header.png
deleted file mode 100644
index c5a1e2a8ef87c2d50eaf371dc07152aa436b7820..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2844
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
XZ`l=Lk>W9A*Gr+R3DT%gvqSwCt!a{b

diff --git a/doc/index.rst b/doc/index.rst
index a6d2248cedf..6a0d8dee2d4 100644
--- a/doc/index.rst
+++ b/doc/index.rst
@@ -22,8 +22,6 @@ Contents:
     list-view
     form-notes
 
-    templates
-
     guides/client-action
 
 Indices and tables
diff --git a/doc/templates.rst b/doc/templates.rst
deleted file mode 100644
index 3f7a3a18743..00000000000
--- a/doc/templates.rst
+++ /dev/null
@@ -1,45 +0,0 @@
-.. highlight:: xml
-
-Generic templates
-=================
-
-Generic template names should be prefixed by ``ui.`` to indicate their
-special role.
-
-Global Header: ``ui.Header``
-----------------------------
-
-Role
-++++
-
-This template is mostly dedicated to client actions taking over the
-whole content area, and full-HTML form views (especially those opening
-in the ``inline`` target).
-
-It is used to display a buttons container (and can also be used for
-status bars). The buttons should simply be placed inside the
-``ui.Header`` body.
-
-Arguments
-+++++++++
-
-The template only uses its body as argument.
-
-Example
-+++++++
-
-::
-
-    <t t-call="ui.Header">
-        <button string="Apply" type="object" name="execute" class="oe_highlight"/>
-        or
-        <button string="Cancel" type="object" name="cancel" class="oe_link"/>
-    </t>
-
-This block demonstrates a common pattern in OpenERP views and widgets:
-a highlighted button, and a discard button styled as a link to cancel
-the action:
-
-.. image:: ./images/templates/ui.Header.*
-
-In this case, both buttons are OpenERP action buttons.

From ba97319054728490e4d8a601382dd6fd2ab4f970 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Thu, 4 Oct 2012 10:22:53 +0200
Subject: [PATCH 13/28] [FIX] invalid context

bzr revid: xmo@openerp.com-20121004082253-2i9tz09k0dmbxd39
---
 addons/account/account_invoice_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index 17ebfe1f744..26e18271dc2 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -189,7 +189,7 @@
                     </group>
                     <notebook>
                         <page string="Invoice">
-                            <field context="{'partner_id': partner_id, 'price_type': 'price_type' in dir() and price_type or False, 'type': type}" name="invoice_line">
+                            <field context="{'partner_id': partner_id, 'price_type': context.get('price_type') or False, 'type': type}" name="invoice_line">
                                 <tree string="Invoice lines" editable="bottom">
                                     <field name="product_id"
                                         on_change="product_id_change(product_id, uos_id, quantity, name, parent.type, parent.partner_id, parent.fiscal_position, price_unit, parent.currency_id, context, parent.company_id)"/>

From bc650ac97c23e66df8bd28f208480ef26a47c279 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Thu, 4 Oct 2012 11:13:14 +0200
Subject: [PATCH 14/28] [FIX] bootstrap_translations: leftover handling for
 multiple langs caused error if preferred lang had a hyphen

bzr revid: odo@openerp.com-20121004091314-13nbs4386fimlxd3
---
 addons/web/controllers/main.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/web/controllers/main.py b/addons/web/controllers/main.py
index 356e2960346..bd9f06625bd 100644
--- a/addons/web/controllers/main.py
+++ b/addons/web/controllers/main.py
@@ -685,7 +685,7 @@ class WebClient(openerpweb.Controller):
         # sub-languages (that should only be partially translated) we load the
         # main language PO instead - that should be enough for the login screen.
         if '-' in lang: # RFC2616 uses '-' separators for sublanguages
-            lang = [lang.split('-',1)[0], lang]
+            lang = lang.split('-')[0]
 
         translations_per_module = {}
         for addon_name in mods:

From f29a4057294a6d79c05b198d10b1fff4049136f0 Mon Sep 17 00:00:00 2001
From: "vta vta@openerp.com" <>
Date: Thu, 4 Oct 2012 13:50:11 +0200
Subject: [PATCH 15/28] [FIX] Fixed return type in DataSet.call_button
 controller.

bzr revid: vta@openerp.com-20121004115011-702ut2j0358rw6cq
---
 addons/web/controllers/main.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/web/controllers/main.py b/addons/web/controllers/main.py
index bd9f06625bd..d1feb19e3d1 100644
--- a/addons/web/controllers/main.py
+++ b/addons/web/controllers/main.py
@@ -1209,8 +1209,8 @@ class DataSet(openerpweb.Controller):
     def call_button(self, req, model, method, args, domain_id=None, context_id=None):
         action = self.call_common(req, model, method, args, domain_id, context_id)
         if isinstance(action, dict) and action.get('type') != '':
-            return {'result': clean_action(req, action)}
-        return {'result': False}
+            return clean_action(req, action)
+        return False
 
     @openerpweb.jsonrequest
     def exec_workflow(self, req, model, id, signal):

From c69757aae17c996f48f900e1fe127f9534725f6e Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Thu, 4 Oct 2012 15:28:32 +0200
Subject: [PATCH 16/28] [ADD] Add on_reverse_breadcrumb callback

bzr revid: fme@openerp.com-20121004132832-7qllln1awi4fcot1
---
 addons/web/static/src/js/views.js | 36 ++++++++++++++++++-------------
 1 file changed, 21 insertions(+), 15 deletions(-)

diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js
index 7b5fcc70289..99f4d3e35e8 100644
--- a/addons/web/static/src/js/views.js
+++ b/addons/web/static/src/js/views.js
@@ -99,6 +99,10 @@ instance.web.ActionManager = instance.web.Widget.extend({
         this.select_breadcrumb(index, subindex);
     },
     select_breadcrumb: function(index, subindex) {
+        var next_item = this.breadcrumbs[index + 1];
+        if (next_item && next_item.on_reverse_breadcrumb) {
+            next_item.on_reverse_breadcrumb(this.breadcrumbs[index].widget);
+        }
         for (var i = this.breadcrumbs.length - 1; i >= 0; i--) {
             if (i > index) {
                 if (this.remove_breadcrumb(i) === false) {
@@ -220,14 +224,14 @@ instance.web.ActionManager = instance.web.Widget.extend({
             }
         });
     },
-    do_action: function(action, on_close, clear_breadcrumbs) {
+    do_action: function(action, on_close, clear_breadcrumbs, on_reverse_breadcrumb) {
         if (_.isString(action) && instance.web.client_actions.contains(action)) {
             var action_client = { type: "ir.actions.client", tag: action };
-            return this.do_action(action_client, on_close, clear_breadcrumbs);
+            return this.do_action(action_client, on_close, clear_breadcrumbs, on_reverse_breadcrumb);
         } else if (_.isNumber(action) || _.isString(action)) {
             var self = this;
             return self.rpc("/web/action/load", { action_id: action }).pipe(function(result) {
-                return self.do_action(result.result, on_close, clear_breadcrumbs);
+                return self.do_action(result.result, on_close, clear_breadcrumbs, on_reverse_breadcrumb);
             });
         }
         if (!action.type) {
@@ -249,7 +253,7 @@ instance.web.ActionManager = instance.web.Widget.extend({
             console.error("Action manager can't handle action of type " + action.type, action);
             return $.Deferred().reject();
         }
-        return this[type](action, on_close, clear_breadcrumbs);
+        return this[type](action, on_close, clear_breadcrumbs, on_reverse_breadcrumb);
     },
     null_action: function() {
         this.dialog_stop();
@@ -300,24 +304,24 @@ instance.web.ActionManager = instance.web.Widget.extend({
             return this.inner_widget.appendTo(this.$el);
         }
     },
-    ir_actions_act_window: function (action, on_close, clear_breadcrumbs) {
+    ir_actions_act_window: function (action, on_close, clear_breadcrumbs, on_reverse_breadcrumb) {
         var self = this;
 
         return this.ir_actions_common({
             widget: function () { return new instance.web.ViewManagerAction(self, action); },
             action: action,
             klass: 'oe_act_window',
-            post_process: function (widget) { widget.add_breadcrumb(); }
-        }, on_close, clear_breadcrumbs);
+            post_process: function (widget) { widget.add_breadcrumb(on_reverse_breadcrumb); }
+        }, on_close, clear_breadcrumbs, on_reverse_breadcrumb);
     },
-    ir_actions_client: function (action, on_close, clear_breadcrumbs) {
+    ir_actions_client: function (action, on_close, clear_breadcrumbs, on_reverse_breadcrumb) {
         var self = this;
         var ClientWidget = instance.web.client_actions.get_object(action.tag);
 
         if (!(ClientWidget.prototype instanceof instance.web.Widget)) {
             var next;
             if (next = ClientWidget(this, action.params)) {
-                return this.do_action(next, on_close, clear_breadcrumbs);
+                return this.do_action(next, on_close, clear_breadcrumbs, on_reverse_breadcrumb);
             }
             return $.when();
         }
@@ -329,13 +333,14 @@ instance.web.ActionManager = instance.web.Widget.extend({
             post_process: function(widget) {
                 self.push_breadcrumb({
                     widget: widget,
-                    title: action.name
+                    title: action.name,
+                    on_reverse_breadcrumb: on_reverse_breadcrumb,
                 });
                 if (action.tag !== 'reload') {
                     self.do_push_state({});
                 }
             }
-        }, on_close, clear_breadcrumbs);
+        }, on_close, clear_breadcrumbs, on_reverse_breadcrumb);
     },
     ir_actions_act_window_close: function (action, on_closed) {
         if (!this.dialog && on_closed) {
@@ -343,13 +348,13 @@ instance.web.ActionManager = instance.web.Widget.extend({
         }
         this.dialog_stop();
     },
-    ir_actions_server: function (action, on_closed, clear_breadcrumbs) {
+    ir_actions_server: function (action, on_closed, clear_breadcrumbs, on_reverse_breadcrumb) {
         var self = this;
         this.rpc('/web/action/run', {
             action_id: action.id,
             context: action.context || {}
         }).then(function (action) {
-            self.do_action(action, on_closed, clear_breadcrumbs)
+            self.do_action(action, on_closed, clear_breadcrumbs, on_reverse_breadcrumb)
         });
     },
     ir_actions_report_xml: function(action, on_closed) {
@@ -544,7 +549,7 @@ instance.web.ViewManager =  instance.web.Widget.extend({
     set_title: function(title) {
         this.$el.find('.oe_view_title_text:first').text(title);
     },
-    add_breadcrumb: function() {
+    add_breadcrumb: function(on_reverse_breadcrumb) {
         var self = this;
         var views = [this.active_view || this.views_src[0].view_type];
         this.on_mode_switch.add(function(mode) {
@@ -589,7 +594,8 @@ instance.web.ViewManager =  instance.web.Widget.extend({
                     titles.pop();
                 }
                 return titles;
-            }
+            },
+            on_reverse_breadcrumb: on_reverse_breadcrumb,
         });
     },
     /**

From 1e843a1e83e05172105da26075d1c7cbb2af2218 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Thu, 4 Oct 2012 15:38:15 +0200
Subject: [PATCH 17/28] [FIX] arguments forwarding in Widget#do_action

bzr revid: xmo@openerp.com-20121004133815-vvqn18kntl8z2m3y
---
 addons/web/static/src/js/corelib.js | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/addons/web/static/src/js/corelib.js b/addons/web/static/src/js/corelib.js
index 62ac48f0c61..da7e8b584ef 100644
--- a/addons/web/static/src/js/corelib.js
+++ b/addons/web/static/src/js/corelib.js
@@ -820,9 +820,10 @@ instance.web.Widget = instance.web.Class.extend(instance.web.WidgetMixin, {
      * the action manager can be found amongst the ancestors of the current widget.
      * If that's not the case this method will simply return `false`.
      */
-    do_action: function(action, on_finished) {
-        if (this.getParent()) {
-            return this.getParent().do_action(action, on_finished);
+    do_action: function() {
+        var parent = this.getParent();
+        if (parent) {
+            return parent.do_action.apply(parent, arguments);
         }
         return false;
     },

From ba4e817379f592bd376795fa4f848be45b335d3d Mon Sep 17 00:00:00 2001
From: "vta vta@openerp.com" <>
Date: Thu, 4 Oct 2012 15:40:56 +0200
Subject: [PATCH 18/28] [FIX] Fixed return type in action.load controller.

bzr revid: vta@openerp.com-20121004134056-je53a1m4tpxecho0
---
 addons/web/controllers/main.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/web/controllers/main.py b/addons/web/controllers/main.py
index d1feb19e3d1..d93aef6526c 100644
--- a/addons/web/controllers/main.py
+++ b/addons/web/controllers/main.py
@@ -1622,7 +1622,7 @@ class Action(openerpweb.Controller):
             action = req.session.model(action_type).read([action_id], False, ctx)
             if action:
                 value = clean_action(req, action[0], do_not_eval)
-        return {'result': value}
+        return value
 
     @openerpweb.jsonrequest
     def run(self, req, action_id):

From 37dd0e03195867555e00f0ff069a1a1ee52c46b2 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Thu, 4 Oct 2012 15:52:11 +0200
Subject: [PATCH 19/28] [REV] Revert recent commit on do_action return type,
 broke trunk

bzr revid: odo@openerp.com-20121004135211-txo513kgfbyrjjtz
---
 addons/web/controllers/main.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/web/controllers/main.py b/addons/web/controllers/main.py
index d93aef6526c..d1feb19e3d1 100644
--- a/addons/web/controllers/main.py
+++ b/addons/web/controllers/main.py
@@ -1622,7 +1622,7 @@ class Action(openerpweb.Controller):
             action = req.session.model(action_type).read([action_id], False, ctx)
             if action:
                 value = clean_action(req, action[0], do_not_eval)
-        return value
+        return {'result': value}
 
     @openerpweb.jsonrequest
     def run(self, req, action_id):

From 83a16a237479e45177f9a2d0b638fb52b1b6a128 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Thu, 4 Oct 2012 16:13:51 +0200
Subject: [PATCH 20/28] [IMP] minor modifs in form view for future refactoring

bzr revid: nicolas.vanhoren@openerp.com-20121004141351-4m0bjan8dax2tfcz
---
 addons/web/static/src/js/view_form.js | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index 1c32d5ef63e..68e79d60cea 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -1694,8 +1694,9 @@ instance.web.form.FormWidget = instance.web.Widget.extend(instance.web.form.Invi
      */
     init: function(field_manager, node) {
         this._super(field_manager);
-        this.view = field_manager;
         this.field_manager = field_manager;
+        if (this.field_manager instanceof instance.web.FormView)
+            this.view = this.field_manager;
         this.node = node;
         this.modifiers = JSON.parse(this.node.attrs.modifiers || '{}');
         instance.web.form.InvisibilityChangerMixin.init.call(this, this.field_manager, this.modifiers.invisible);
@@ -2015,11 +2016,11 @@ instance.web.form.AbstractField = instance.web.form.FormWidget.extend(instance.w
     renderElement: function() {
         var self = this;
         this._super();
-        if (this.field.translate) {
+        if (this.field.translate && this.view) {
             this.$el.addClass('oe_form_field_translatable');
             this.$el.find('.oe_field_translate').click(this.on_translate);
         }
-        this.$label = this.view.$el.find('label[for=' + this.id_for_label + ']');
+        this.$label = this.view ? this.view.$el.find('label[for=' + this.id_for_label + ']') : $();
         if (instance.session.debug) {
             this.do_attach_tooltip(this, this.$label[0] || this.$el);
             this.$label.off('dblclick').on('dblclick', function() {
@@ -3879,7 +3880,7 @@ instance.web.form.FieldMany2ManyTags = instance.web.form.AbstractField.extend(in
     },
     render_value: function() {
         var self = this;
-        var dataset = new instance.web.DataSetStatic(this, this.field.relation, self.view.dataset.get_context());
+        var dataset = new instance.web.DataSetStatic(this, this.field.relation, self.build_context());
         var values = self.get("value")
         var handle_names = function(data) {
             var indexed = {};

From 5a108df9b6d3a1cd7a2b2c4f82767c43f37a68c0 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Thu, 4 Oct 2012 16:33:37 +0200
Subject: [PATCH 21/28] Removed usage of view to compute domain

bzr revid: nicolas.vanhoren@openerp.com-20121004143337-hoon3hzh6y1qlfub
---
 addons/web/static/src/js/view_form.js | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index 68e79d60cea..43aac69c3bd 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -44,6 +44,13 @@ instance.web.form.FieldManagerMixin = {
     @return (Deferred) Is resolved after all the values are setted.
     */
     set_values: function(values) {},
+    /**
+    Computes an OpenERP domain.
+
+    @param (list) expression An OpenERP domain.
+    @return (boolean) The computed value of the domain.
+    */
+    compute_domain: function(expression) {},
 };
 
 instance.web.views.add('form', 'instance.web.FormView');
@@ -1109,6 +1116,9 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM
     get_field_value: function(field_name) {
         return this.fields[field_name].get_value();
     },
+    compute_domain: function(expression) {
+        return instance.web.form.compute_domain(expression, this.fields);
+    },
 });
 
 /**
@@ -1641,9 +1651,7 @@ instance.web.form.InvisibilityChangerMixin = {
         this._ic_invisible_modifier = invisible_domain;
         this._ic_field_manager.on("view_content_has_changed", this, function() {
             var result = self._ic_invisible_modifier === undefined ? false :
-                instance.web.form.compute_domain(
-                    self._ic_invisible_modifier,
-                    self._ic_field_manager.fields);
+                self._ic_field_manager.compute_domain(self._ic_invisible_modifier);
             self.set({"invisible": result});
         });
         this.set({invisible: this._ic_invisible_modifier === true, force_invisible: false});
@@ -1738,12 +1746,11 @@ instance.web.form.FormWidget = instance.web.Widget.extend(instance.web.form.Invi
         });
     },
     process_modifiers: function() {
-        var compute_domain = instance.web.form.compute_domain;
         var to_set = {};
         for (var a in this.modifiers) {
             if (!this.modifiers.hasOwnProperty(a)) { continue; }
             if (!_.include(["invisible"], a)) {
-                var val = compute_domain(this.modifiers[a], this.view.fields);
+                var val = this.field_manager.compute_domain(this.modifiers[a]);
                 to_set[a] = val;
             }
         }

From ac827d7325689de88188ee72b0b64b915796660b Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Thu, 4 Oct 2012 16:52:06 +0200
Subject: [PATCH 22/28] removed dependency to view to build context and domains

bzr revid: nicolas.vanhoren@openerp.com-20121004145206-1j9lsidw7g8upssn
---
 addons/web/static/src/js/view_form.js | 50 ++++++++++++++++-----------
 1 file changed, 29 insertions(+), 21 deletions(-)

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index 43aac69c3bd..d2d16550805 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -51,6 +51,14 @@ instance.web.form.FieldManagerMixin = {
     @return (boolean) The computed value of the domain.
     */
     compute_domain: function(expression) {},
+    /**
+    Builds an evaluation context for the resolution of the fields' contexts. Please note
+    the field are only supposed to use this context to evualuate their own, they should not
+    extend it.
+
+    @return (CompoundContext) An OpenERP context.
+    */
+    build_eval_context: function() {},
 };
 
 instance.web.views.add('form', 'instance.web.FormView');
@@ -1119,6 +1127,25 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM
     compute_domain: function(expression) {
         return instance.web.form.compute_domain(expression, this.fields);
     },
+    _build_view_fields_values: function(blacklist) {
+        var a_dataset = this.dataset;
+        var fields_values = this.get_fields_values(blacklist);
+        var active_id = a_dataset.ids[a_dataset.index];
+        _.extend(fields_values, {
+            active_id: active_id || false,
+            active_ids: active_id ? [active_id] : [],
+            active_model: a_dataset.model,
+            parent: {}
+        });
+        if (a_dataset.parent_view) {
+            fields_values.parent = a_dataset.parent_view.get_fields_values([a_dataset.child_name]);
+        }
+        return fields_values;
+    },
+    build_eval_context: function(blacklist) {
+        var a_dataset = this.dataset;
+        return new instance.web.CompoundContext(a_dataset.get_context(), this._build_view_fields_values(blacklist));
+    },
 });
 
 /**
@@ -1779,25 +1806,6 @@ instance.web.form.FormWidget = instance.web.Widget.extend(instance.web.form.Invi
             }, options || {});
         $(trigger).tipsy(options);
     },
-    _build_view_fields_values: function(blacklist) {
-        var a_dataset = this.view.dataset;
-        var fields_values = this.view.get_fields_values(blacklist);
-        var active_id = a_dataset.ids[a_dataset.index];
-        _.extend(fields_values, {
-            active_id: active_id || false,
-            active_ids: active_id ? [active_id] : [],
-            active_model: a_dataset.model,
-            parent: {}
-        });
-        if (a_dataset.parent_view) {
-            fields_values.parent = a_dataset.parent_view.get_fields_values([a_dataset.child_name]);
-        }
-        return fields_values;
-    },
-    _build_eval_context: function(blacklist) {
-        var a_dataset = this.view.dataset;
-        return new instance.web.CompoundContext(a_dataset.get_context(), this._build_view_fields_values(blacklist));
-    },
     /**
      * Builds a new context usable for operations related to fields by merging
      * the fields'context with the action's context.
@@ -1810,7 +1818,7 @@ instance.web.form.FormWidget = instance.web.Widget.extend(instance.web.form.Invi
         }
 
         if (v_context.__ref || true) { //TODO: remove true
-            var fields_values = this._build_eval_context(blacklist);
+            var fields_values = this.field_manager.build_eval_context(blacklist);
             v_context = new instance.web.CompoundContext(v_context).set_eval_context(fields_values);
         }
         return v_context;
@@ -1821,7 +1829,7 @@ instance.web.form.FormWidget = instance.web.Widget.extend(instance.web.form.Invi
         // if there is a domain on the node, overrides the model's domain
         var final_domain = n_domain !== null ? n_domain : f_domain;
         if (!(final_domain instanceof Array) || true) { //TODO: remove true
-            var fields_values = this._build_eval_context();
+            var fields_values = this.field_manager.build_eval_context();
             final_domain = new instance.web.CompoundDomain(final_domain).set_eval_context(fields_values);
         }
         return final_domain;

From aa66a76e773fa8d27a177ffdb469d3d9379c572d Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Thu, 4 Oct 2012 17:28:37 +0200
Subject: [PATCH 23/28] Changed a lot of 'view' usages to fit when the view is
 not disponible

bzr revid: nicolas.vanhoren@openerp.com-20121004152837-2qiul7svgdbflyvo
---
 addons/web/static/src/js/view_form.js | 34 ++++++++++++++-------------
 1 file changed, 18 insertions(+), 16 deletions(-)

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index d2d16550805..58046fb9ff6 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -2900,7 +2900,7 @@ instance.web.form.FieldMany2One = instance.web.form.AbstractField.extend(instanc
                 self.focus();
                 return;
             }
-            var pop = new instance.web.form.FormOpenPopup(self.view);
+            var pop = new instance.web.form.FormOpenPopup(self);
             pop.show_element(
                 self.field.relation,
                 self.get("value"),
@@ -3495,7 +3495,7 @@ instance.web.form.One2ManyViewManager = instance.web.ViewManager.extend({
         }
         var self = this;
         var id = self.o2m.dataset.index !== null ? self.o2m.dataset.ids[self.o2m.dataset.index] : null;
-        var pop = new instance.web.form.FormOpenPopup(self.o2m.view);
+        var pop = new instance.web.form.FormOpenPopup(this);
         pop.show_element(self.o2m.field.relation, id, self.o2m.build_context(), {
             title: _t("Open: ") + self.o2m.string,
             create_function: function(data) {
@@ -3611,7 +3611,7 @@ instance.web.form.One2ManyListView = instance.web.ListView.extend({
     },
     do_activate_record: function(index, id) {
         var self = this;
-        var pop = new instance.web.form.FormOpenPopup(self.o2m.view);
+        var pop = new instance.web.form.FormOpenPopup(self);
         pop.show_element(self.o2m.field.relation, id, self.o2m.build_context(), {
             title: _t("Open: ") + self.o2m.string,
             write_function: function(id, data) {
@@ -3639,7 +3639,10 @@ instance.web.form.One2ManyListView = instance.web.ListView.extend({
         var parent_form = this.o2m.view;
         var self = this;
         this.ensure_saved().pipe(function () {
-            return parent_form.do_save();
+            if (parent_form)
+                return parent_form.do_save();
+            else
+                return $.when();
         }).then(function () {
             self.handle_button(name, id, callback);
         });
@@ -4165,7 +4168,7 @@ instance.web.form.FieldMany2ManyKanban = instance.web.form.AbstractField.extend(
             });
         } else {
             var id = self.dataset.ids[self.dataset.index];
-            var pop = new instance.web.form.FormOpenPopup(self.view);
+            var pop = new instance.web.form.FormOpenPopup(this);
             pop.show_element(self.field.relation, id, self.build_context(), {
                 title: _t("Open: ") + self.string,
                 write_function: function(id, data, options) {
@@ -4627,7 +4630,7 @@ instance.web.form.FieldReference = instance.web.form.AbstractField.extend(instan
     get_field: function(name) {
         if (name === "selection") {
             return {
-                selection: this.view.fields_view.fields[this.name].selection,
+                selection: this.field_manager.get_field(this.name).selection,
                 type: "selection",
             };
         } else if (name === "m2o") {
@@ -4725,9 +4728,10 @@ instance.web.form.FieldBinary = instance.web.form.AbstractField.extend(instance.
     },
     set_filename: function(value) {
         var filename = this.node.attrs.filename;
-        if (this.view.fields[filename]) {
-            this.view.fields[filename].set_value(value);
-            this.view.fields[filename].on_ui_change();
+        if (filename) {
+            var tmp = {};
+            tmp[filename] = value;
+            this.field_manager.set_values(tmp);
         }
     },
     on_clear: function() {
@@ -4769,7 +4773,9 @@ instance.web.form.FieldBinaryFile = instance.web.form.FieldBinary.extend({
         } else {
             this.$el.find('a').show(!!this.get('value'));
             if (this.get('value')) {
-                var show_value = _t("Download") + " " + (this.view.datarecord[this.node.attrs.filename] || '');
+                var show_value = _t("Download")
+                if (this.view)
+                    show_value += " " + (this.view.datarecord[this.node.attrs.filename] || '');
                 this.$el.find('a').text(show_value);
             }
         }
@@ -4781,12 +4787,6 @@ instance.web.form.FieldBinaryFile = instance.web.form.FieldBinary.extend({
         this.$el.find('input').eq(0).val(show_value);
         this.set_filename(name);
     },
-    set_filename: function(value_) {
-        var filename = this.node.attrs.filename;
-        if (this.view.fields[filename]) {
-            this.view.fields[filename].set({value: value_});
-        }
-    },
     on_clear: function() {
         this._super.apply(this, arguments);
         this.$el.find('input').eq(0).val('');
@@ -4835,10 +4835,12 @@ instance.web.form.FieldBinaryImage = instance.web.form.FieldBinary.extend({
         this.set({'value': file_base64});
         this.binary_value = true;
         this.render_value();
+        this.set_filename(name);
     },
     on_clear: function() {
         this._super.apply(this, arguments);
         this.render_value();
+        this.set_filename('');
     }
 });
 

From 18cc6542b63110ec2f63a5c2af14e903c14d5f28 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Thu, 4 Oct 2012 17:34:00 +0200
Subject: [PATCH 24/28] Renammed get_field to get_field_desc

bzr revid: nicolas.vanhoren@openerp.com-20121004153400-odaxckppdi1od6mw
---
 addons/web/static/src/js/view_form.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index 58046fb9ff6..f5e701a5dce 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -30,7 +30,7 @@ instance.web.form.FieldManagerMixin = {
     /**
      * Must return the asked field as in fields_get.
      */
-    get_field: function(field_name) {},
+    get_field_desc: function(field_name) {},
     /**
      * Returns the current value of a field present in the view. See the get_value() method
      * method in FieldInterface for further information.
@@ -1100,7 +1100,7 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM
 
         field.on('focused', null, this.proxy('widgetFocused'))
              .on('blurred', null, this.proxy('widgetBlurred'));
-        if (this.get_field(name).translate) {
+        if (this.get_field_desc(name).translate) {
             this.translatable_fields.push(field);
         }
         field.on('changed_value', this, function() {
@@ -1118,7 +1118,7 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM
             }
         });
     },
-    get_field: function(field_name) {
+    get_field_desc: function(field_name) {
         return this.fields_view.fields[field_name];
     },
     get_field_value: function(field_name) {
@@ -2017,7 +2017,7 @@ instance.web.form.AbstractField = instance.web.form.FormWidget.extend(instance.w
         var self = this
         this._super(field_manager, node);
         this.name = this.node.attrs.name;
-        this.field = this.field_manager.get_field(this.name);
+        this.field = this.field_manager.get_field_desc(this.name);
         this.widget = this.node.attrs.widget;
         this.string = this.node.attrs.string || this.field.string || this.name;
         this.options = JSON.parse(this.node.attrs.options || '{}');
@@ -4630,7 +4630,7 @@ instance.web.form.FieldReference = instance.web.form.AbstractField.extend(instan
     get_field: function(name) {
         if (name === "selection") {
             return {
-                selection: this.field_manager.get_field(this.name).selection,
+                selection: this.field_manager.get_field_desc(this.name).selection,
                 type: "selection",
             };
         } else if (name === "m2o") {

From 8bc67000e62ac8757b1edd31d5db16e515fa2a72 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Thu, 4 Oct 2012 18:14:33 +0200
Subject: [PATCH 25/28] added default field manager

bzr revid: nicolas.vanhoren@openerp.com-20121004161433-pbtx50nk7hg4ihw0
---
 addons/web/static/src/js/view_form.js | 36 +++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index f5e701a5dce..f180311f7a5 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -1565,6 +1565,42 @@ instance.web.form.FormRenderingEngine = instance.web.form.FormRenderingEngineInt
     },
 });
 
+/**
+    Welcome.
+
+    If you read this documentation, it probably means that you were asked to use a form view widget outside of
+    a form view. Before going further, you must understand that those fields were never really created for
+    that usage. Don't think that this class will hold the answer to all your problems, at best it will allow
+    you to hack the system with more style.
+*/
+instance.web.form.DefaultFieldManager = instance.web.CallbackEnabled.extend({
+    init: function(parent, eval_context) {
+        this._super(parent);
+        this.field_descs = {};
+        this.eval_context = eval_context || {};
+    },
+    get_field_desc: function(field_name) {
+        if (this.field_descs[field_name] === undefined) {
+            this.field_descs[field_name] = {
+                string: "I have no name",
+            };
+        }
+        return this.field_descs[field_name];
+    },
+    get_field_value: function(field_name) {
+        return false;
+    },
+    set_values: function(values) {
+        // nothing
+    },
+    compute_domain: function(expression) {
+        return instance.web.form.compute_domain(expression, {});
+    },
+    build_eval_context: function() {
+        return new instance.web.CompoundContext(this.eval_context);
+    },
+});
+
 instance.web.form.FormDialog = instance.web.Dialog.extend({
     init: function(parent, options, view_id, dataset) {
         this._super(parent, options);

From 78e47437f645c5557a7d5d38fd26ba52e1bee8c2 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Thu, 4 Oct 2012 18:29:28 +0200
Subject: [PATCH 26/28] fixed references

bzr revid: nicolas.vanhoren@openerp.com-20121004162928-ge6hggc7zz03r2sc
---
 addons/web/static/src/js/view_form.js | 41 ++++++++++++++-------------
 1 file changed, 21 insertions(+), 20 deletions(-)

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index f180311f7a5..4d69e07489a 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -1573,7 +1573,7 @@ instance.web.form.FormRenderingEngine = instance.web.form.FormRenderingEngineInt
     that usage. Don't think that this class will hold the answer to all your problems, at best it will allow
     you to hack the system with more style.
 */
-instance.web.form.DefaultFieldManager = instance.web.CallbackEnabled.extend({
+instance.web.form.DefaultFieldManager = instance.web.Widget.extend({
     init: function(parent, eval_context) {
         this._super(parent);
         this.field_descs = {};
@@ -1582,11 +1582,17 @@ instance.web.form.DefaultFieldManager = instance.web.CallbackEnabled.extend({
     get_field_desc: function(field_name) {
         if (this.field_descs[field_name] === undefined) {
             this.field_descs[field_name] = {
-                string: "I have no name",
+                string: field_name,
             };
         }
         return this.field_descs[field_name];
     },
+    extend_field_desc: function(fields) {
+        var self = this;
+        _.each(fields, function(v, k) {
+            _.extend(self.get_field_desc(k), v);
+        });
+    },
     get_field_value: function(field_name) {
         return false;
     },
@@ -4606,11 +4612,21 @@ instance.web.form.FieldReference = instance.web.form.AbstractField.extend(instan
     },
     initialize_content: function() {
         var self = this;
-        this.selection = new instance.web.form.FieldSelection(this, { attrs: {
+        var fm = new instance.web.form.DefaultFieldManager(this);
+        fm.extend_field_desc({
+            "selection": {
+                selection: this.field_manager.get_field_desc(this.name).selection,
+                type: "selection",
+            },
+            "m2o": {
+                relation: null,
+                type: "many2one",
+            },
+        });
+        this.selection = new instance.web.form.FieldSelection(fm, { attrs: {
             name: 'selection',
             modifiers: JSON.stringify({readonly: this.get('effective_readonly')}),
         }});
-        this.selection.view = this.view;
         this.selection.on("change:value", this, this.on_selection_changed);
         this.selection.setElement(this.$(".oe_form_view_reference_selection"));
         this.selection.renderElement();
@@ -4619,11 +4635,10 @@ instance.web.form.FieldReference = instance.web.form.AbstractField.extend(instan
             .on('focused', null, function () {self.trigger('focused')})
             .on('blurred', null, function () {self.trigger('blurred')});
 
-        this.m2o = new instance.web.form.FieldMany2One(this, { attrs: {
+        this.m2o = new instance.web.form.FieldMany2One(fm, { attrs: {
             name: 'm2o',
             modifiers: JSON.stringify({readonly: this.get('effective_readonly')}),
         }});
-        this.m2o.view = this.view;
         this.m2o.on("change:value", this, this.data_changed);
         this.m2o.setElement(this.$(".oe_form_view_reference_m2o"));
         this.m2o.renderElement();
@@ -4663,20 +4678,6 @@ instance.web.form.FieldReference = instance.web.form.AbstractField.extend(instan
             this.set({'value': false});
         }
     },
-    get_field: function(name) {
-        if (name === "selection") {
-            return {
-                selection: this.field_manager.get_field_desc(this.name).selection,
-                type: "selection",
-            };
-        } else if (name === "m2o") {
-            return {
-                relation: null,
-                type: "many2one",
-            };
-        }
-        throw Exception("Should not happen");
-    },
 });
 
 instance.web.form.FieldBinary = instance.web.form.AbstractField.extend(instance.web.form.ReinitializeFieldMixin, {

From e7d40e418e25a70e14ff64f39c37576c8ac9fe73 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20van=20der=20Essen?= <fva@openerp.com>
Date: Thu, 4 Oct 2012 18:57:54 +0200
Subject: [PATCH 27/28] [FIX] css: embedded html styling was affecting html
 fields

bzr revid: fva@openerp.com-20121004165754-wg7ngootq5mh2tfq
---
 addons/web/static/src/css/base.css  | 8 ++++----
 addons/web/static/src/css/base.sass | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index a5d24584fc5..165c893933c 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -1197,7 +1197,7 @@
   color: white;
   padding: 2px 4px;
   margin: 1px 6px 0 0;
-  border: 1px solid lightGray;
+  border: 1px solid lightgrey;
   text-shadow: 0 1px 1px rgba(0, 0, 0, 0.2);
   -moz-border-radius: 4px;
   -webkit-border-radius: 4px;
@@ -1222,7 +1222,7 @@
   transform: scale(1.1);
 }
 .openerp .oe_secondary_submenu .oe_active {
-  border-top: 1px solid lightGray;
+  border-top: 1px solid lightgrey;
   border-bottom: 1px solid #dedede;
   text-shadow: 0 1px 1px rgba(0, 0, 0, 0.2);
   -moz-box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.2), inset 0 -1px 3px rgba(40, 40, 40, 0.2);
@@ -2123,7 +2123,7 @@
 }
 .openerp .oe_form .oe_form_label_help[for] span, .openerp .oe_form .oe_form_label[for] span {
   font-size: 80%;
-  color: darkGreen;
+  color: darkgreen;
   vertical-align: top;
   position: relative;
   top: -4px;
@@ -2284,7 +2284,7 @@
   position: relative;
   overflow: hidden;
 }
-.openerp .oe_form .oe_form_field_html {
+.openerp .oe_form .oe_form_embedded_html {
   position: relative;
   width: 600px;
   margin-left: 130px;
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index 5a676deae2e..68446cf777b 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -1811,7 +1811,7 @@ $sheet-max-width: 860px
             > div
                 position: relative
                 overflow: hidden
-        .oe_form_field_html
+        .oe_form_embedded_html
             position: relative
             width: 600px
             margin-left: 130px

From 5a971eca906ea07a126dc6f1d5c468053160fe73 Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Fri, 5 Oct 2012 12:20:03 +0200
Subject: [PATCH 28/28] [FIX] ir: small fix to handle missing models when
 upgrading

bzr revid: rco@openerp.com-20121005102003-16vbr0aive2mbtid
---
 openerp/addons/base/ir/ir_model.py   | 4 +++-
 openerp/addons/base/ir/ir_ui_menu.py | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/openerp/addons/base/ir/ir_model.py b/openerp/addons/base/ir/ir_model.py
index 74589003611..633db6de6a3 100644
--- a/openerp/addons/base/ir/ir_model.py
+++ b/openerp/addons/base/ir/ir_model.py
@@ -557,7 +557,9 @@ class ir_model_access(osv.osv):
             model_name = model
 
         # TransientModel records have no access rights, only an implicit access rule
-        if self.pool.get(model_name).is_transient():
+        if not self.pool.get(model_name):
+            _logger.error('Missing model %s' % (model_name, ))
+        elif self.pool.get(model_name).is_transient():
             return True
 
         # We check if a specific rule exists
diff --git a/openerp/addons/base/ir/ir_ui_menu.py b/openerp/addons/base/ir/ir_ui_menu.py
index 4bbff5479c3..213cff18cc6 100644
--- a/openerp/addons/base/ir/ir_ui_menu.py
+++ b/openerp/addons/base/ir/ir_ui_menu.py
@@ -265,7 +265,7 @@ class ir_ui_menu(osv.osv):
             }
             if menu.action and menu.action.type in ('ir.actions.act_window','ir.actions.client') and menu.action.res_model:
                 obj = self.pool.get(menu.action.res_model)
-                if obj._needaction:
+                if obj and obj._needaction:
                     if menu.action.type=='ir.actions.act_window':
                         dom = menu.action.domain and eval(menu.action.domain, {'uid': uid}) or []
                     else: