From a6ef1d4a428674b71710c84590dcccc1b89f82b4 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Fri, 28 Sep 2012 11:50:35 +0200
Subject: [PATCH 01/77] [IMP] mrp: cleaning of stock move name

bzr revid: qdp-launchpad@openerp.com-20120928095035-w1g06od25auo52ev
---
 addons/mrp/mrp.py | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/addons/mrp/mrp.py b/addons/mrp/mrp.py
index 049c7c712fb..c14b852d08e 100644
--- a/addons/mrp/mrp.py
+++ b/addons/mrp/mrp.py
@@ -902,12 +902,11 @@ class mrp_production(osv.osv):
         # Internal shipment is created for Stockable and Consumer Products
         if production_line.product_id.type not in ('product', 'consu'):
             return False
-        move_name = _('PROD: %s') % production.name
         source_location_id = production.location_src_id.id
         if not destination_location_id:
             destination_location_id = source_location_id
         return stock_move.create(cr, uid, {
-                        'name': move_name,
+                        'name': production.name,
                         'picking_id': shipment_id,
                         'product_id': production_line.product_id.id,
                         'product_qty': production_line.product_qty,
@@ -957,9 +956,8 @@ class mrp_production(osv.osv):
         stock_move = self.pool.get('stock.move')
         source_location_id = production.product_id.product_tmpl_id.property_stock_production.id
         destination_location_id = production.location_dest_id.id
-        move_name = _('PROD: %s') + production.name
         data = {
-            'name': move_name,
+            'name': production.name,
             'date': production.date_planned,
             'product_id': production.product_id.id,
             'product_qty': production.product_qty,
@@ -982,12 +980,11 @@ class mrp_production(osv.osv):
         # Internal shipment is created for Stockable and Consumer Products
         if production_line.product_id.type not in ('product', 'consu'):
             return False
-        move_name = _('PROD: %s') % production.name
         destination_location_id = production.product_id.product_tmpl_id.property_stock_production.id
         if not source_location_id:
             source_location_id = production.location_src_id.id
         move_id = stock_move.create(cr, uid, {
-            'name': move_name,
+            'name': production.name,
             'date': production.date_planned,
             'product_id': production_line.product_id.id,
             'product_qty': production_line.product_qty,

From 20bf037ea40d38f600a7166ea948b81840c613a0 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Fri, 28 Sep 2012 11:54:58 +0200
Subject: [PATCH 02/77] [IMP] sale: added a test to verify the the product
 onchange in sale order line was correctly triggered

bzr revid: qdp-launchpad@openerp.com-20120928095458-vjwd4xt0nun8lfjx
---
 addons/sale/test/sale_order_demo.yml | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/addons/sale/test/sale_order_demo.yml b/addons/sale/test/sale_order_demo.yml
index 05109efbea2..5b1c08bb5e1 100644
--- a/addons/sale/test/sale_order_demo.yml
+++ b/addons/sale/test/sale_order_demo.yml
@@ -7,8 +7,12 @@
     payment_term: account.account_payment_term
 -
   !record {model: sale.order.line, id: line}:
-    name : 'LCD Monitor'
     order_id: sale_order_test1
     product_id: product.product_product_7
-    price_unit: 190.50
     product_uom_qty: 8
+-
+  I verify that the onchange was correctly triggered
+-
+  !assert {model: sale.order.line, id: sale.line, string: The onchange function of product was not correctly triggered}:
+    - l.name == '17” LCD Monitor'
+    - l.price_unit == 1350.0

From 6251b57b39ac2a01d907f1f5f6fccf13a0319830 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Fri, 28 Sep 2012 12:15:31 +0200
Subject: [PATCH 03/77] [IMP] sale_stock: added a test to verify the the
 product onchange in sale order line was correctly triggered

bzr revid: qdp-launchpad@openerp.com-20120928101531-sw1r2d5tc034ie23
---
 addons/sale_stock/__openerp__.py              |  1 +
 addons/sale_stock/sale_stock.py               |  2 +-
 addons/sale_stock/sale_stock_view.xml         |  6 ++---
 .../sale_stock/test/sale_order_onchange.yml   | 24 +++++++++++++++++++
 4 files changed, 29 insertions(+), 4 deletions(-)
 create mode 100644 addons/sale_stock/test/sale_order_onchange.yml

diff --git a/addons/sale_stock/__openerp__.py b/addons/sale_stock/__openerp__.py
index 2a670000581..10773b44a3f 100644
--- a/addons/sale_stock/__openerp__.py
+++ b/addons/sale_stock/__openerp__.py
@@ -61,6 +61,7 @@ You can choose flexible invoicing methods:
     'test': ['test/cancel_order_sale_stock.yml',
              'test/picking_order_policy.yml',
              'test/prepaid_order_policy.yml',
+             'test/sale_order_onchange.yml',
              ],
     'installable': True,
     'auto_install': True,
diff --git a/addons/sale_stock/sale_stock.py b/addons/sale_stock/sale_stock.py
index a48b766f3bb..aea39590152 100644
--- a/addons/sale_stock/sale_stock.py
+++ b/addons/sale_stock/sale_stock.py
@@ -625,7 +625,7 @@ class sale_order_line(osv.osv):
                 uom = False
         if not uom2:
             uom2 = product_obj.uom_id
-            
+
         compare_qty = float_compare(product_obj.virtual_available * uom2.factor, qty * product_obj.uom_id.factor, precision_rounding=product_obj.uom_id.rounding)
         if (product_obj.type=='product') and int(compare_qty) == -1 \
           and (product_obj.procure_method=='make_to_stock'):
diff --git a/addons/sale_stock/sale_stock_view.xml b/addons/sale_stock/sale_stock_view.xml
index 7efb2849a52..09a8cd51af8 100644
--- a/addons/sale_stock/sale_stock_view.xml
+++ b/addons/sale_stock/sale_stock_view.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <openerp>
     <data>
-        
+
         <record id="view_sale_shop_form_inherit" model="ir.ui.view">
             <field name="name">sale.shop.inherit.form</field>
             <field name="model">sale.shop</field>
@@ -13,7 +13,7 @@
                 </xpath>
             </field>
         </record>
-        
+
          <record id="view_shop_tree_inherit" model="ir.ui.view">
              <field name="name">sale.shop.sale.stock</field>
              <field name="model">sale.shop</field>
@@ -41,7 +41,7 @@
                    </xpath>
                    <xpath expr="//button[@name='action_view_invoice']" position="after">
                        <button name="action_view_delivery" string="View Delivery Order" type="object" class="oe_highlight"
-                           attrs="{'invisible': ['|','|','|',('picking_ids','=',False),('picking_ids','=',[]), ('state', 'not in', ('progress','manual')),('shipped','=',True)]}"/>                   </xpath>                   
+                           attrs="{'invisible': ['|','|','|',('picking_ids','=',False),('picking_ids','=',[]), ('state', 'not in', ('progress','manual')),('shipped','=',True)]}"/>                   </xpath>
                     <xpath expr="//button[@name='action_cancel']" position="after">
                         <button name="ship_cancel" states="shipping_except" string="Cancel"/>
                     </xpath>
diff --git a/addons/sale_stock/test/sale_order_onchange.yml b/addons/sale_stock/test/sale_order_onchange.yml
new file mode 100644
index 00000000000..4561742976e
--- /dev/null
+++ b/addons/sale_stock/test/sale_order_onchange.yml
@@ -0,0 +1,24 @@
+-
+  In order to test the onchange of the Sale Order, I create a product
+-
+  !record {model: product.product, id: product_onchange1}:
+    name: 'Devil Worship Book'
+    list_price: 66.6
+    procure_method: 'make_to_order'
+-
+  Now i create a sale order that uses my new product
+-
+  !record {model: sale.order, id: sale_order_onchange1}:
+    partner_id: base.res_partner_2
+-
+  !record {model: sale.order.line, id: line_onchange}:
+    order_id: sale_order_onchange1
+    product_id: sale_stock.product_onchange1
+    product_uom_qty: 10
+-
+  I verify that the onchange of product on sale order line was correctly triggered
+-
+  !assert {model: sale.order.line, id: sale.line, string: The onchange function of product was not correctly triggered}:
+    - l.name == 'Devil Worship Book'
+    - l.price_unit == 66.6
+    - l.type == 'make_to_order'

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 04/77] [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 6c8ed08bf3457838d06c49ef4bc40e786124aaee Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Mon, 1 Oct 2012 16:27:35 +0200
Subject: [PATCH 05/77] [IMP] yaml processing: fixed the creation of record
 through yaml files in order to use the views and on_change() functions that
 match the initial fields_view_get().

bzr revid: qdp-launchpad@openerp.com-20121001142735-bvqx48fbt9lyesjw
---
 openerp/tools/yaml_import.py | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/openerp/tools/yaml_import.py b/openerp/tools/yaml_import.py
index 14b857cd658..f88f253c0f2 100644
--- a/openerp/tools/yaml_import.py
+++ b/openerp/tools/yaml_import.py
@@ -313,13 +313,14 @@ class YamlInterpreter(object):
             #context = self.get_context(record, self.eval_context)
             #TOFIX: record.context like {'withoutemployee':True} should pass from self.eval_context. example: test_project.yml in project module
             context = record.context
+            fields_view_get_result = False
             if view_id:
                 varg = view_id
                 if view_id is True: varg = False
-                view = model.fields_view_get(self.cr, SUPERUSER_ID, varg, 'form', context)
-                view_id = etree.fromstring(view['arch'].encode('utf-8'))
+                fields_view_get_result = model.fields_view_get(self.cr, SUPERUSER_ID, varg, 'form', context)
+                view_id = etree.fromstring(fields_view_get_result['arch'].encode('utf-8'))
 
-            record_dict = self._create_record(model, fields, view_id, default=default)
+            record_dict = self._create_record(model, fields, view_id, default=default, fields_view_get=fields_view_get_result)
             _logger.debug("RECORD_DICT %s" % record_dict)
             id = self.pool.get('ir.model.data')._update(self.cr, SUPERUSER_ID, record.model, \
                     self.module, record_dict, record.id, noupdate=self.isnoupdate(record), mode=self.mode, context=context)
@@ -327,7 +328,7 @@ class YamlInterpreter(object):
             if config.get('import_partial'):
                 self.cr.commit()
 
-    def _create_record(self, model, fields, view=False, parent={}, default=True):
+    def _create_record(self, model, fields, view=False, parent={}, default=True, fields_view_get=None):
         if view is not False:
             defaults = default and model._add_missing_default_values(self.cr, SUPERUSER_ID, {}, context=self.context) or {}
             fg = model.fields_get(self.cr, SUPERUSER_ID, context=self.context)
@@ -359,12 +360,14 @@ class YamlInterpreter(object):
                     view2 = None
                     # if the form view is not inline, we call fields_view_get
                     if (view is not False) and (fg[field_name]['type']=='one2many'):
-                        view2 = view.find("field[@name='%s']/form"%(field_name,))
+                        tmp = fields_view_get['fields'][field_name]['views']
+                        if tmp.has_key('form'):
+                            view2 = tmp.get('form')
                         if not view2:
                             view2 = self.pool.get(fg[field_name]['relation']).fields_view_get(self.cr, SUPERUSER_ID, False, 'form', self.context)
-                            view2 = etree.fromstring(view2['arch'].encode('utf-8'))
+                        view2 = etree.fromstring(view2['arch'].encode('utf-8'))
 
-                    field_value = self._eval_field(model, field_name, fields[field_name], view2, parent=record_dict, default=default)
+                    field_value = self._eval_field(model, field_name, fields[field_name], view2, parent=record_dict, default=default, fields_view_get=fields_view_get)
                     record_dict[field_name] = field_value
                     #if (field_name in defaults) and defaults[field_name] == field_value:
                     #    print '*** You can remove these lines:', field_name, field_value
@@ -409,7 +412,7 @@ class YamlInterpreter(object):
         for field_name, expression in fields.items():
             if field_name in record_dict:
                 continue
-            field_value = self._eval_field(model, field_name, expression, default=False)
+            field_value = self._eval_field(model, field_name, expression, default=False, fields_view_get=fields_view_get)
             record_dict[field_name] = field_value
 
         return record_dict
@@ -440,7 +443,7 @@ class YamlInterpreter(object):
     def process_eval(self, node):
         return eval(node.expression, self.eval_context)
 
-    def _eval_field(self, model, field_name, expression, view=False, parent={}, default=True):
+    def _eval_field(self, model, field_name, expression, view=False, parent={}, default=True, fields_view_get=None):
         # TODO this should be refactored as something like model.get_field() in bin/osv
         if field_name in model._columns:
             column = model._columns[field_name]
@@ -461,7 +464,7 @@ class YamlInterpreter(object):
             value = self.get_id(expression)
         elif column._type == "one2many":
             other_model = self.get_model(column._obj)
-            value = [(0, 0, self._create_record(other_model, fields, view, parent, default=default)) for fields in expression]
+            value = [(0, 0, self._create_record(other_model, fields, view, parent, default=default, fields_view_get=fields_view_get)) for fields in expression]
         elif column._type == "many2many":
             ids = [self.get_id(xml_id) for xml_id in expression]
             value = [(6, 0, ids)]

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 06/77] [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 07/77] [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 08/77] [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 7812c73354d9ca924c109b3c6331bfbe1986f388 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Mon, 1 Oct 2012 17:38:06 +0200
Subject: [PATCH 09/77] [IMP] yaml processing: improved previous patch by
 replacing the old parameter view with the result of fields_view_get()
 directly, to avoid having an extra parameter a bit useless

bzr revid: qdp-launchpad@openerp.com-20121001153806-k40ly5vdzh1v3hv3
---
 openerp/tools/yaml_import.py | 30 ++++++++++++++----------------
 1 file changed, 14 insertions(+), 16 deletions(-)

diff --git a/openerp/tools/yaml_import.py b/openerp/tools/yaml_import.py
index f88f253c0f2..a5de5873908 100644
--- a/openerp/tools/yaml_import.py
+++ b/openerp/tools/yaml_import.py
@@ -313,14 +313,13 @@ class YamlInterpreter(object):
             #context = self.get_context(record, self.eval_context)
             #TOFIX: record.context like {'withoutemployee':True} should pass from self.eval_context. example: test_project.yml in project module
             context = record.context
-            fields_view_get_result = False
+            view_info = False
             if view_id:
                 varg = view_id
                 if view_id is True: varg = False
-                fields_view_get_result = model.fields_view_get(self.cr, SUPERUSER_ID, varg, 'form', context)
-                view_id = etree.fromstring(fields_view_get_result['arch'].encode('utf-8'))
+                view_info = model.fields_view_get(self.cr, SUPERUSER_ID, varg, 'form', context)
 
-            record_dict = self._create_record(model, fields, view_id, default=default, fields_view_get=fields_view_get_result)
+            record_dict = self._create_record(model, fields, view_info, default=default)
             _logger.debug("RECORD_DICT %s" % record_dict)
             id = self.pool.get('ir.model.data')._update(self.cr, SUPERUSER_ID, record.model, \
                     self.module, record_dict, record.id, noupdate=self.isnoupdate(record), mode=self.mode, context=context)
@@ -328,7 +327,8 @@ class YamlInterpreter(object):
             if config.get('import_partial'):
                 self.cr.commit()
 
-    def _create_record(self, model, fields, view=False, parent={}, default=True, fields_view_get=None):
+    def _create_record(self, model, fields, view_info=False, parent={}, default=True):
+        view = view_info and etree.fromstring(view_info['arch'].encode('utf-8')) or False
         if view is not False:
             defaults = default and model._add_missing_default_values(self.cr, SUPERUSER_ID, {}, context=self.context) or {}
             fg = model.fields_get(self.cr, SUPERUSER_ID, context=self.context)
@@ -357,17 +357,15 @@ class YamlInterpreter(object):
                 field_name = el.attrib['name']
                 assert field_name in fg, "The field '%s' is defined in the form view but not on the object '%s'!" % (field_name, model._name)
                 if field_name in fields:
-                    view2 = None
+                    one2many_form_view = None
                     # if the form view is not inline, we call fields_view_get
                     if (view is not False) and (fg[field_name]['type']=='one2many'):
-                        tmp = fields_view_get['fields'][field_name]['views']
-                        if tmp.has_key('form'):
-                            view2 = tmp.get('form')
-                        if not view2:
-                            view2 = self.pool.get(fg[field_name]['relation']).fields_view_get(self.cr, SUPERUSER_ID, False, 'form', self.context)
-                        view2 = etree.fromstring(view2['arch'].encode('utf-8'))
+                        one2many_form_view = view_info['fields'][field_name]['views'].get('form')
+                        if not one2many_form_view:
+                            one2many_form_view = self.pool.get(fg[field_name]['relation']).fields_view_get(self.cr, SUPERUSER_ID, False, 'form', self.context)
 
-                    field_value = self._eval_field(model, field_name, fields[field_name], view2, parent=record_dict, default=default, fields_view_get=fields_view_get)
+                    view_info = one2many_form_view or view_info
+                    field_value = self._eval_field(model, field_name, fields[field_name], view_info, parent=record_dict, default=default)
                     record_dict[field_name] = field_value
                     #if (field_name in defaults) and defaults[field_name] == field_value:
                     #    print '*** You can remove these lines:', field_name, field_value
@@ -412,7 +410,7 @@ class YamlInterpreter(object):
         for field_name, expression in fields.items():
             if field_name in record_dict:
                 continue
-            field_value = self._eval_field(model, field_name, expression, default=False, fields_view_get=fields_view_get)
+            field_value = self._eval_field(model, field_name, expression, default=False)
             record_dict[field_name] = field_value
 
         return record_dict
@@ -443,7 +441,7 @@ class YamlInterpreter(object):
     def process_eval(self, node):
         return eval(node.expression, self.eval_context)
 
-    def _eval_field(self, model, field_name, expression, view=False, parent={}, default=True, fields_view_get=None):
+    def _eval_field(self, model, field_name, expression, view_info=False, parent={}, default=True):
         # TODO this should be refactored as something like model.get_field() in bin/osv
         if field_name in model._columns:
             column = model._columns[field_name]
@@ -464,7 +462,7 @@ class YamlInterpreter(object):
             value = self.get_id(expression)
         elif column._type == "one2many":
             other_model = self.get_model(column._obj)
-            value = [(0, 0, self._create_record(other_model, fields, view, parent, default=default, fields_view_get=fields_view_get)) for fields in expression]
+            value = [(0, 0, self._create_record(other_model, fields, view_info, parent, default=default)) for fields in expression]
         elif column._type == "many2many":
             ids = [self.get_id(xml_id) for xml_id in expression]
             value = [(6, 0, ids)]

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 10/77] [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 2b07b4e35c5ee619eaf93a7bb4fb14a37e55fb0e Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Mon, 1 Oct 2012 18:08:54 +0200
Subject: [PATCH 11/77] [FIX] sale, sale_stock: yaml tests on
 product_id_change() + fix in that same function (type is defined in
 sale_stock now)

bzr revid: qdp-launchpad@openerp.com-20121001160854-7d2xew5pol6u27b2
---
 addons/sale/sale.py                            |  1 -
 addons/sale/sale_view.xml                      |  5 ++---
 addons/sale/test/sale_order_demo.yml           | 14 ++++++--------
 addons/sale_stock/test/sale_order_onchange.yml | 14 ++++++--------
 4 files changed, 14 insertions(+), 20 deletions(-)

diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index 96f44d353d6..f9dc3c62281 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -899,7 +899,6 @@ class sale_order_line(osv.osv):
         fpos = fiscal_position and self.pool.get('account.fiscal.position').browse(cr, uid, fiscal_position) or False
         if update_tax: #The quantity only have changed
             result['tax_id'] = self.pool.get('account.fiscal.position').map_tax(cr, uid, fpos, product_obj.taxes_id)
-            result.update({'type': product_obj.procure_method})
 
         if not flag:
             result['name'] = self.pool.get('product.product').name_get(cr, uid, [product_obj.id], context=context_partner)[0][1]
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 23d2c556f40..620991d8053 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -200,8 +200,7 @@
                                             <field name="product_id"
                                                 context="{'partner_id':parent.partner_id, 'quantity':product_uom_qty, 'pricelist':parent.pricelist_id, 'shop':parent.shop_id, 'uom':product_uom}"
                                                 groups="base.group_user"
-                                                on_change="product_id_change(parent.pricelist_id,product_id,product_uom_qty,product_uom,product_uos_qty,product_uos,name,parent.partner_id, False, True, parent.date_order,  False, parent.fiscal_position, False, context)"/>
-                                            <label for="product_uom_qty"/>
+                                                on_change="product_id_change(parent.pricelist_id, product_id, product_uom_qty, product_uom, product_uos_qty, product_uos, name, parent.partner_id, False, True, parent.date_order, False, parent.fiscal_position, False, context)"/>
                                             <div>
                                                 <field
                                                     context="{'partner_id':parent.partner_id, 'quantity':product_uom_qty, 'pricelist':parent.pricelist_id, 'shop':parent.shop_id, 'uom':product_uom}"
@@ -237,7 +236,7 @@
                                         <field name="invoice_lines"/>
                                     </div>
                                 </form>
-                                <tree string="Sales Order Lines" editable="bottom">
+                                <tree string="Sales Order Lines">
                                     <field name="sequence" widget="handle"/>
                                     <field name="state" invisible="1"/>
                                     <field name="th_weight" invisible="1"/>
diff --git a/addons/sale/test/sale_order_demo.yml b/addons/sale/test/sale_order_demo.yml
index 5b1c08bb5e1..7e5a223e8b0 100644
--- a/addons/sale/test/sale_order_demo.yml
+++ b/addons/sale/test/sale_order_demo.yml
@@ -5,14 +5,12 @@
     partner_id: base.res_partner_2
     note: Invoice after delivery
     payment_term: account.account_payment_term
--
-  !record {model: sale.order.line, id: line}:
-    order_id: sale_order_test1
-    product_id: product.product_product_7
-    product_uom_qty: 8
+    order_line: 
+      - product_id: product.product_product_7
+        product_uom_qty: 8
 -
   I verify that the onchange was correctly triggered
 -
-  !assert {model: sale.order.line, id: sale.line, string: The onchange function of product was not correctly triggered}:
-    - l.name == '17” LCD Monitor'
-    - l.price_unit == 1350.0
+  !assert {model: sale.order, id: sale.sale_order_test1, string: The onchange function of product was not correctly triggered}:
+    - order_line[0].name == u'[LCD17] 17\u201d LCD Monitor'
+    - order_line[0].price_unit == 1350.0
diff --git a/addons/sale_stock/test/sale_order_onchange.yml b/addons/sale_stock/test/sale_order_onchange.yml
index 4561742976e..015e857ec58 100644
--- a/addons/sale_stock/test/sale_order_onchange.yml
+++ b/addons/sale_stock/test/sale_order_onchange.yml
@@ -10,15 +10,13 @@
 -
   !record {model: sale.order, id: sale_order_onchange1}:
     partner_id: base.res_partner_2
--
-  !record {model: sale.order.line, id: line_onchange}:
-    order_id: sale_order_onchange1
-    product_id: sale_stock.product_onchange1
-    product_uom_qty: 10
+    order_line:
+      - product_id: sale_stock.product_onchange1
+        product_uom_qty: 10
 -
   I verify that the onchange of product on sale order line was correctly triggered
 -
   !assert {model: sale.order.line, id: sale.line, string: The onchange function of product was not correctly triggered}:
-    - l.name == 'Devil Worship Book'
-    - l.price_unit == 66.6
-    - l.type == 'make_to_order'
+    - order_line[0].name == u'Devil Worship Book'
+    - order_line[0].price_unit == 66.6
+    - order_line[0].type == 'make_to_order'

From 5d26741491ff271d4ff8446ad89986c6f249e773 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Mon, 1 Oct 2012 18:19:54 +0200
Subject: [PATCH 12/77] [FIX] sale_stock: fixed yalm test

bzr revid: qdp-launchpad@openerp.com-20121001161954-hswnchflp7sh0ynb
---
 addons/sale_stock/test/sale_order_onchange.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/sale_stock/test/sale_order_onchange.yml b/addons/sale_stock/test/sale_order_onchange.yml
index 015e857ec58..1026e5627c3 100644
--- a/addons/sale_stock/test/sale_order_onchange.yml
+++ b/addons/sale_stock/test/sale_order_onchange.yml
@@ -16,7 +16,7 @@
 -
   I verify that the onchange of product on sale order line was correctly triggered
 -
-  !assert {model: sale.order.line, id: sale.line, string: The onchange function of product was not correctly triggered}:
+  !assert {model: sale.order, id: sale_order_onchange1, string: The onchange function of product was not correctly triggered}:
     - order_line[0].name == u'Devil Worship Book'
     - order_line[0].price_unit == 66.6
     - order_line[0].type == 'make_to_order'

From bbe269b7687eadc4eb1f118190b09dcb66e85979 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Mon, 1 Oct 2012 18:59:44 +0200
Subject: [PATCH 13/77] [FIX] sale: editable=bottom on order_line in sale.order
 (previously wrongly commited)

bzr revid: qdp-launchpad@openerp.com-20121001165944-5pe0ndtyyt0klhlj
---
 addons/sale/sale_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 620991d8053..c8e0908b326 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -236,7 +236,7 @@
                                         <field name="invoice_lines"/>
                                     </div>
                                 </form>
-                                <tree string="Sales Order Lines">
+                                <tree string="Sales Order Lines" editable="bottom">
                                     <field name="sequence" widget="handle"/>
                                     <field name="state" invisible="1"/>
                                     <field name="th_weight" invisible="1"/>

From 90b90bb01e93f578abd482db0ebc6be985aa2ede Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Mon, 1 Oct 2012 19:09:20 +0200
Subject: [PATCH 14/77] [FIX] sale_stock: product_id_change fix

bzr revid: qdp-launchpad@openerp.com-20121001170920-fv2ueuyecml908gi
---
 addons/sale_stock/sale_stock.py | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/addons/sale_stock/sale_stock.py b/addons/sale_stock/sale_stock.py
index aea39590152..dfd310fce3a 100644
--- a/addons/sale_stock/sale_stock.py
+++ b/addons/sale_stock/sale_stock.py
@@ -610,14 +610,18 @@ class sale_order_line(osv.osv):
             lang=lang, update_tax=update_tax, date_order=date_order, packaging=packaging, fiscal_position=fiscal_position, flag=flag, context=context)
 
         if not product:
-            return {'value': {'th_weight': 0, 'product_packaging': False,
-                'product_uos_qty': qty}, 'domain': {'product_uom': [],
-                   'product_uos': []}}
+            res['value'].update({'product_packaging': False})
+            return res
+
+        #update of result obtained in super function
         res_packing = self.product_packaging_change(cr, uid, ids, pricelist, product, qty, uom, partner_id, packaging, context=context)
         res['value'].update(res_packing.get('value', {}))
         warning_msgs = res_packing.get('warning') and res_packing['warning']['message'] or ''
         product_obj = product_obj.browse(cr, uid, product, context=context)
         res['value']['delay'] = (product_obj.sale_delay or 0.0)
+        res['value']['type'] = product_obj.type
+
+        #check if product is available, and if not: raise an error
         uom2 = False
         if uom:
             uom2 = product_uom_obj.browse(cr, uid, uom)
@@ -625,7 +629,6 @@ class sale_order_line(osv.osv):
                 uom = False
         if not uom2:
             uom2 = product_obj.uom_id
-
         compare_qty = float_compare(product_obj.virtual_available * uom2.factor, qty * product_obj.uom_id.factor, precision_rounding=product_obj.uom_id.rounding)
         if (product_obj.type=='product') and int(compare_qty) == -1 \
           and (product_obj.procure_method=='make_to_stock'):
@@ -634,7 +637,8 @@ class sale_order_line(osv.osv):
                      max(0,product_obj.virtual_available), product_obj.uom_id.name,
                      max(0,product_obj.qty_available), product_obj.uom_id.name)
             warning_msgs += _("Not enough stock ! : ") + warn_msg + "\n\n"
-        # get unit price
+
+        #update of warning messages
         if warning_msgs:
             warning = {
                        'title': _('Configuration Error!'),

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 15/77] [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 48a8367968fb897b0778eb094033458ea399b361 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Mon, 1 Oct 2012 19:13:41 +0200
Subject: [PATCH 16/77] [FIX] sale_stock: stupid wrong field used

bzr revid: qdp-launchpad@openerp.com-20121001171341-dj97xdjw9qu0nkxr
---
 addons/sale_stock/sale_stock.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/sale_stock/sale_stock.py b/addons/sale_stock/sale_stock.py
index dfd310fce3a..e079386b15d 100644
--- a/addons/sale_stock/sale_stock.py
+++ b/addons/sale_stock/sale_stock.py
@@ -619,7 +619,7 @@ class sale_order_line(osv.osv):
         warning_msgs = res_packing.get('warning') and res_packing['warning']['message'] or ''
         product_obj = product_obj.browse(cr, uid, product, context=context)
         res['value']['delay'] = (product_obj.sale_delay or 0.0)
-        res['value']['type'] = product_obj.type
+        res['value']['type'] = product_obj.procure_method
 
         #check if product is available, and if not: raise an error
         uom2 = False

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 17/77] [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 fa852bab333fba81f8665a89ba15e55a2a801c48 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Tue, 2 Oct 2012 14:04:05 +0200
Subject: [PATCH 18/77] [FIX] yaml_import: don't erase the initial
 fields_view_get() result with the fields_view get of the first one2many fiel,
 other wise things get wrong -_-

bzr revid: qdp-launchpad@openerp.com-20121002120405-hvy4ltgrjzesndox
---
 openerp/tools/yaml_import.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/openerp/tools/yaml_import.py b/openerp/tools/yaml_import.py
index a5de5873908..9ab034e55e6 100644
--- a/openerp/tools/yaml_import.py
+++ b/openerp/tools/yaml_import.py
@@ -364,8 +364,7 @@ class YamlInterpreter(object):
                         if not one2many_form_view:
                             one2many_form_view = self.pool.get(fg[field_name]['relation']).fields_view_get(self.cr, SUPERUSER_ID, False, 'form', self.context)
 
-                    view_info = one2many_form_view or view_info
-                    field_value = self._eval_field(model, field_name, fields[field_name], view_info, parent=record_dict, default=default)
+                    field_value = self._eval_field(model, field_name, fields[field_name], one2many_form_view or view_info, parent=record_dict, default=default)
                     record_dict[field_name] = field_value
                     #if (field_name in defaults) and defaults[field_name] == field_value:
                     #    print '*** You can remove these lines:', field_name, field_value

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 19/77] [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 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 20/77] [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 261e33f74092373052b3ed0af385bb63e228f5e9 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Tue, 2 Oct 2012 18:00:55 +0200
Subject: [PATCH 21/77] [FIX] yaml_import: the parent default values must be
 complete before calling the onchanges()

bzr revid: qdp-launchpad@openerp.com-20121002160055-ew4377e7jcqlgzv7
---
 openerp/tools/yaml_import.py | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/openerp/tools/yaml_import.py b/openerp/tools/yaml_import.py
index 9ab034e55e6..45e8f1f627f 100644
--- a/openerp/tools/yaml_import.py
+++ b/openerp/tools/yaml_import.py
@@ -335,7 +335,7 @@ class YamlInterpreter(object):
         else:
             defaults = {}
             fg = {}
-        record_dict = {}
+        record_dict = defaults.copy()
         fields = fields or {}
 
         def process_val(key, val):
@@ -368,9 +368,6 @@ class YamlInterpreter(object):
                     record_dict[field_name] = field_value
                     #if (field_name in defaults) and defaults[field_name] == field_value:
                     #    print '*** You can remove these lines:', field_name, field_value
-                elif (field_name in defaults):
-                    if (field_name not in record_dict):
-                        record_dict[field_name] = process_val(field_name, defaults[field_name])
                 else:
                     continue
 

From bc0e25938a67680852cfed187e0ec0270aacb957 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Wed, 3 Oct 2012 10:23:06 +0200
Subject: [PATCH 22/77] [FIX] yaml import: if a field has a default value, we
 must call its on_change()

bzr revid: qdp-launchpad@openerp.com-20121003082306-ml0nodz6ubriwtpi
---
 openerp/tools/yaml_import.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/openerp/tools/yaml_import.py b/openerp/tools/yaml_import.py
index 45e8f1f627f..e11347763d2 100644
--- a/openerp/tools/yaml_import.py
+++ b/openerp/tools/yaml_import.py
@@ -368,7 +368,9 @@ class YamlInterpreter(object):
                     record_dict[field_name] = field_value
                     #if (field_name in defaults) and defaults[field_name] == field_value:
                     #    print '*** You can remove these lines:', field_name, field_value
-                else:
+
+                #if field_name has a default value or a value is given in the yaml file, we must call its on_change()
+                elif field_name not in defaults:
                     continue
 
                 if not el.attrib.get('on_change', False):
@@ -385,7 +387,7 @@ class YamlInterpreter(object):
 
                 ctx = record_dict.copy()
                 ctx['context'] = self.context
-                ctx['uid'] = 1
+                ctx['uid'] = SUPERUSER_ID
                 ctx['parent'] = parent2(parent)
                 for a in fg:
                     if a not in ctx:

From 558ad0616a4fef54ec290ef1967ab0d0ac083260 Mon Sep 17 00:00:00 2001
From: "Vidhin Mehta (OpenERP)" <vme@tinyerp.com>
Date: Wed, 3 Oct 2012 16:04:28 +0530
Subject: [PATCH 23/77] [IMP]remove callbacks from call method and improve
 related code.

bzr revid: vme@tinyerp.com-20121003103428-fnr942tzl065rcei
---
 addons/web/static/src/js/data.js                    | 4 ++--
 addons/web/static/test/fulltest/dataset.js          | 4 ++--
 addons/web_view_editor/static/src/js/view_editor.js | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/addons/web/static/src/js/data.js b/addons/web/static/src/js/data.js
index 2b82e618203..cf4b29ab56b 100644
--- a/addons/web/static/src/js/data.js
+++ b/addons/web/static/src/js/data.js
@@ -586,8 +586,8 @@ instance.web.DataSet =  instance.web.CallbackEnabled.extend({
      * @param {Function} error_callback
      * @returns {$.Deferred}
      */
-    call: function (method, args, callback, error_callback) {
-        return this._model.call(method, args).then(callback, error_callback);
+    call: function (method, args) {
+        return this._model.call(method, args);
     },
     /**
      * Calls an arbitrary method, with more crazy
diff --git a/addons/web/static/test/fulltest/dataset.js b/addons/web/static/test/fulltest/dataset.js
index d276f4e2494..f7e64fba53e 100644
--- a/addons/web/static/test/fulltest/dataset.js
+++ b/addons/web/static/test/fulltest/dataset.js
@@ -82,14 +82,14 @@ $(document).ready(function () {
     });
     t.test('call', function (openerp) {
         var ds = new openerp.web.DataSet({session: openerp.session}, 'mod');
-        t.expect(ds.call('frob', ['a', 'b', 42]), function (r) {
+        t.expect(ds.call('frob', ['a', 'b', 42]).then(function (r) {
             strictEqual(r.method, 'frob');
 
             strictEqual(r.args.length, 3);
             deepEqual(r.args, ['a', 'b', 42]);
 
             ok(_.isEmpty(r.kwargs));
-        });
+        }));
     });
     t.test('name_get').then(function (openerp) {
         var ds = new openerp.web.DataSet({session: openerp.session}, 'mod');
diff --git a/addons/web_view_editor/static/src/js/view_editor.js b/addons/web_view_editor/static/src/js/view_editor.js
index 73d07efd5c0..e65f0ab5d38 100644
--- a/addons/web_view_editor/static/src/js/view_editor.js
+++ b/addons/web_view_editor/static/src/js/view_editor.js
@@ -136,7 +136,7 @@ instance.web_view_editor.ViewEditor =   instance.web.Widget.extend({
         var field_dataset = new instance.web.DataSetSearch(this, this.model, null, null);
         var model_dataset = new instance.web.DataSetSearch(this, 'ir.model', null, null);
         var view_string = "", field_name = false, self = this;
-        field_dataset.call( 'fields_get', [],  function(fields) {
+        field_dataset.call( 'fields_get', []).then(function(fields) {
             _.each(['name', 'x_name'], function(value) {
                 if (_.include(_.keys(fields), value)) {
                     field_name = value;
@@ -539,7 +539,7 @@ instance.web_view_editor.ViewEditor =   instance.web.Widget.extend({
             var value = _.has(_CHILDREN, element) ? element : _.str.include(html_tag, element)?"html_tag":false; 
             property_to_check.push(value);
         });
-        field_dataset.call( 'fields_get', [],  function(result) {
+        field_dataset.call( 'fields_get', []).then(function(result) {
             var fields = _.keys(result);
             fields.push(" "),fields.sort();
             self.on_add_node(property_to_check, fields);

From 30069a02398c4f9de698c6fcc43bc4958aa1d960 Mon Sep 17 00:00:00 2001
From: ggh-openerp <ggh@tinyerp.com>
Date: Wed, 3 Oct 2012 17:58:36 +0530
Subject: [PATCH 24/77] [IMP]In rpc method remove callback and modify relate
 code

bzr revid: ggh@tinyerp.com-20121003122836-36g8ijxdcjwgntjl
---
 addons/web/static/src/js/chrome.js            | 10 +++++-----
 addons/web/static/src/js/corelib.js           |  6 +++---
 addons/web/static/src/js/coresetup.js         |  4 ++--
 addons/web/static/src/js/data_export.js       |  8 ++++----
 addons/web/static/src/js/search.js            |  2 +-
 addons/web/static/src/js/view_form.js         |  4 ++--
 addons/web/static/src/js/view_list.js         |  2 +-
 addons/web/static/src/js/view_tree.js         |  2 +-
 addons/web/static/src/js/views.js             |  6 +++---
 addons/web_calendar/static/src/js/calendar.js |  2 +-
 addons/web_diagram/static/src/js/diagram.js   |  3 +--
 11 files changed, 24 insertions(+), 25 deletions(-)

diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js
index bed4a159535..985912d57bf 100644
--- a/addons/web/static/src/js/chrome.js
+++ b/addons/web/static/src/js/chrome.js
@@ -392,7 +392,7 @@ instance.web.DatabaseManager = instance.web.Widget.extend({
     do_create: function(form) {
         var self = this;
         var fields = $(form).serializeArray();
-        self.rpc("/web/database/create", {'fields': fields}, function(result) {
+        self.rpc("/web/database/create", {'fields': fields}).then(function(result) {
             var form_obj = self.to_object(fields);
             var client_action = {
                 type: 'ir.actions.client',
@@ -418,7 +418,7 @@ instance.web.DatabaseManager = instance.web.Widget.extend({
         if (!db || !confirm("Do you really want to delete the database: " + db + " ?")) {
             return;
         }
-        self.rpc("/web/database/drop", {'fields': fields}, function(result) {
+        self.rpc("/web/database/drop", {'fields': fields}).then(function(result) {
             if (result.error) {
                 self.display_error(result);
                 return;
@@ -481,7 +481,7 @@ instance.web.DatabaseManager = instance.web.Widget.extend({
         var self = this;
         self.rpc("/web/database/change_password", {
             'fields': $(form).serializeArray()
-        }, function(result) {
+        }).then(function(result) {
             if (result.error) {
                 self.display_error(result);
                 return;
@@ -660,7 +660,7 @@ instance.web.ChangePassword =  instance.web.Widget.extend({
             submitHandler: function (form) {
                 self.rpc("/web/session/change_password",{
                     'fields': $(form).serializeArray()
-                }, function(result) {
+                }).then(function(result) {
                     if (result.error) {
                         self.display_error(result);
                         return;
@@ -1165,7 +1165,7 @@ instance.web.EmbeddedClient = instance.web.Client.extend({
         var self = this;
         return $.when(this._super()).pipe(function() {
             return instance.session.session_authenticate(self.dbname, self.login, self.key, true).pipe(function() {
-                return self.rpc("/web/action/load", { action_id: self.action_id }, function(result) {
+                return self.rpc("/web/action/load", { action_id: self.action_id }).then(function(result) {
                     var action = result.result;
                     action.flags = _.extend({
                         //views_switcher : false,
diff --git a/addons/web/static/src/js/corelib.js b/addons/web/static/src/js/corelib.js
index 62ac48f0c61..d6dfac963e0 100644
--- a/addons/web/static/src/js/corelib.js
+++ b/addons/web/static/src/js/corelib.js
@@ -841,7 +841,7 @@ instance.web.Widget = instance.web.Class.extend(instance.web.WidgetMixin, {
     rpc: function(url, data, success, error) {
         var def = $.Deferred().then(success, error);
         var self = this;
-        instance.session.rpc(url, data). then(function() {
+        instance.session.rpc(url, data).then(function() {
             if (!self.isDestroyed())
                 def.resolve.apply(def, arguments);
         }, function() {
@@ -1299,7 +1299,7 @@ instance.web.JsonRPC = instance.web.CallbackEnabled.extend({
      * @param {Function} error_callback function to execute on RPC call failure
      * @returns {jQuery.Deferred} jquery-provided ajax deferred
      */
-    rpc: function(url, params, success_callback, error_callback) {
+    rpc: function(url, params) {
         var self = this;
         // url can be an $.ajax option object
         if (_.isString(url)) {
@@ -1358,7 +1358,7 @@ instance.web.JsonRPC = instance.web.CallbackEnabled.extend({
                     self.on_rpc_error(error, event);
                 }
             });
-        }).then(success_callback, error_callback).promise();
+        });
         return deferred;
     },
     /**
diff --git a/addons/web/static/src/js/coresetup.js b/addons/web/static/src/js/coresetup.js
index ea160d6faee..7134c068ec3 100644
--- a/addons/web/static/src/js/coresetup.js
+++ b/addons/web/static/src/js/coresetup.js
@@ -19,9 +19,9 @@ instance.web.Session = instance.web.JsonRPC.extend( /** @lends instance.web.Sess
         this.name = instance._session_id;
         this.qweb_mutex = new $.Mutex();
     },
-    rpc: function(url, params, success_callback, error_callback) {
+    rpc: function(url, params) {
         params.session_id = this.session_id;
-        return this._super(url, params, success_callback, error_callback);
+        return this._super(url, params);
     },
     /**
      * Setup a sessionm
diff --git a/addons/web/static/src/js/data_export.js b/addons/web/static/src/js/data_export.js
index 29aea6362f7..a06e9ccb155 100644
--- a/addons/web/static/src/js/data_export.js
+++ b/addons/web/static/src/js/data_export.js
@@ -49,7 +49,7 @@ instance.web.DataExport = instance.web.Dialog.extend({
             self.rpc("/web/export/get_fields", {
                 model: self.dataset.model,
                 import_compat: Boolean(import_comp)
-            }, function (records) {
+            }).then(function (records) {
                 got_fields.resolve();
                 self.on_show_data(records);
             });
@@ -57,7 +57,7 @@ instance.web.DataExport = instance.web.Dialog.extend({
 
         return $.when(
             got_fields,
-            this.rpc('/web/export/formats', {}, this.do_setup_export_formats),
+            this.rpc('/web/export/formats', {}).then(this.do_setup_export_formats),
             this.show_exports_list());
     },
     do_setup_export_formats: function (formats) {
@@ -91,7 +91,7 @@ instance.web.DataExport = instance.web.Dialog.extend({
                 self.$el.find('#fields_list option').remove();
                 var export_id = self.$el.find('#saved_export_list option:selected').val();
                 if (export_id) {
-                    self.rpc('/web/export/namelist', {'model': self.dataset.model, export_id: parseInt(export_id)}, self.do_load_export_field);
+                    self.rpc('/web/export/namelist', {'model': self.dataset.model, export_id: parseInt(export_id)}).then(self.do_load_export_field);
                 }
             });
             self.$el.find('#delete_export_list').click(function() {
@@ -181,7 +181,7 @@ instance.web.DataExport = instance.web.Dialog.extend({
                 import_compat: Boolean(import_comp),
                 parent_field_type : record['field_type'],
                 exclude: exclude_fields
-            }, function(results) {
+            }).then(function(results) {
                 record.loaded = true;
                 self.on_show_data(results, record.id);
             });
diff --git a/addons/web/static/src/js/search.js b/addons/web/static/src/js/search.js
index 01bc0c76c87..63d6574dd82 100644
--- a/addons/web/static/src/js/search.js
+++ b/addons/web/static/src/js/search.js
@@ -1693,7 +1693,7 @@ instance.web.search.Advanced = instance.web.search.Input.extend({
             });
         return $.when(
             this._super(),
-            this.rpc("/web/searchview/fields_get", {model: this.view.model}, function(data) {
+            this.rpc("/web/searchview/fields_get", {model: this.view.model}).then(function(data) {
                 self.fields = _.extend({
                     id: { string: 'ID', type: 'id' }
                 }, data.fields);
diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index bf6b869482b..af11ce27bda 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -4417,7 +4417,7 @@ instance.web.form.SelectCreatePopup = instance.web.form.AbstractFormPopup.extend
             self.rpc('/web/session/eval_domain_and_context', {
                 domains: [],
                 contexts: [this.context]
-            }, function (results) {
+            }).then(function (results) {
                 var search_defaults = {};
                 _.each(results.context, function (value_, key) {
                     var match = /^search_default_(.*)$/.exec(key);
@@ -4485,7 +4485,7 @@ instance.web.form.SelectCreatePopup = instance.web.form.AbstractFormPopup.extend
             domains: domains || [],
             contexts: contexts || [],
             group_by_seq: groupbys || []
-        }, function (results) {
+        }).then(function (results) {
             self.view_list.do_search(results.domain, results.context, results.group_by);
         });
     },
diff --git a/addons/web/static/src/js/view_list.js b/addons/web/static/src/js/view_list.js
index fd34ffddb7b..7457ca5ef67 100644
--- a/addons/web/static/src/js/view_list.js
+++ b/addons/web/static/src/js/view_list.js
@@ -482,7 +482,7 @@ instance.web.ListView = instance.web.View.extend( /** @lends instance.web.ListVi
                 view_type: "tree",
                 context: this.dataset.get_context(context),
                 toolbar: !!this.options.$sidebar
-            }, callback);
+            }).then(callback);
         }
     },
     /**
diff --git a/addons/web/static/src/js/view_tree.js b/addons/web/static/src/js/view_tree.js
index e0493a446e2..05760420ba8 100644
--- a/addons/web/static/src/js/view_tree.js
+++ b/addons/web/static/src/js/view_tree.js
@@ -45,7 +45,7 @@ instance.web.TreeView = instance.web.View.extend(/** @lends instance.web.TreeVie
             view_type: "tree",
             toolbar: this.view_manager ? !!this.view_manager.sidebar : false,
             context: this.dataset.get_context()
-        }, this.on_loaded);
+        }).then(this.on_loaded);
     },
     /**
      * Returns the list of fields needed to correctly read objects.
diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js
index 2fff0e7b683..c80b111fdc8 100644
--- a/addons/web/static/src/js/views.js
+++ b/addons/web/static/src/js/views.js
@@ -648,7 +648,7 @@ instance.web.ViewManager =  instance.web.Widget.extend({
             domains: [this.action.domain || []].concat(domains || []),
             contexts: [action_context].concat(contexts || []),
             group_by_seq: groupbys || []
-        }, function (results) {
+        }).then(function (results) {
             self.dataset._model = new instance.web.Model(
                 self.dataset.model, results.context, results.domain);
             var groupby = results.group_by.length
@@ -1054,7 +1054,7 @@ instance.web.Sidebar = instance.web.Widget.extend({
             self.rpc("/web/action/load", {
                 action_id: item.action.id,
                 context: additional_context
-            }, function(result) {
+            }).then(function(result) {
                 result.result.context = _.extend(result.result.context || {},
                     additional_context);
                 result.result.flags = result.result.flags || {};
@@ -1233,7 +1233,7 @@ instance.web.View = instance.web.Widget.extend({
             args.push(context);
             return dataset.call_button(action_data.name, args).then(handler);
         } else if (action_data.type=="action") {
-            return this.rpc('/web/action/load', { action_id: action_data.name, context: context, do_not_eval: true}, handler);
+            return this.rpc('/web/action/load', { action_id: action_data.name, context: context, do_not_eval: true}).then(handler);
         } else  {
             return dataset.exec_workflow(record_id, action_data.name).then(handler);
         }
diff --git a/addons/web_calendar/static/src/js/calendar.js b/addons/web_calendar/static/src/js/calendar.js
index 644a35f7fad..81533413312 100644
--- a/addons/web_calendar/static/src/js/calendar.js
+++ b/addons/web_calendar/static/src/js/calendar.js
@@ -41,7 +41,7 @@ instance.web_calendar.CalendarView = instance.web.View.extend({
     },
     start: function() {
         this._super();
-        return this.rpc("/web/view/load", {"model": this.model, "view_id": this.view_id, "view_type":"calendar", 'toolbar': false}, this.on_loaded);
+        return this.rpc("/web/view/load", {"model": this.model, "view_id": this.view_id, "view_type":"calendar", 'toolbar': false}).then(this.on_loaded);
     },
     destroy: function() {
         scheduler.clearAll();
diff --git a/addons/web_diagram/static/src/js/diagram.js b/addons/web_diagram/static/src/js/diagram.js
index 543cc6a9c12..508aeb30563 100644
--- a/addons/web_diagram/static/src/js/diagram.js
+++ b/addons/web_diagram/static/src/js/diagram.js
@@ -105,8 +105,7 @@ instance.web.DiagramView = instance.web.View.extend({
         });
 
         this.rpc(
-            '/web_diagram/diagram/get_diagram_info',params,
-            function(result) {
+            '/web_diagram/diagram/get_diagram_info',params).then(function(result) {
                 self.draw_diagram(result);
             }
         );

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 25/77] [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 a3d648f319d29f244f2b8026c031a6b4e70a0398 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Wed, 3 Oct 2012 17:58:20 +0200
Subject: [PATCH 26/77] [FIX] account_voucher: fix amount_currency on writeoff
 line + fixed/improved yaml tests

bzr revid: qdp-launchpad@openerp.com-20121003155820-7ozaoklt042b7i6i
---
 addons/account_voucher/account_voucher.py     |  4 +++-
 addons/account_voucher/test/case1_usd_usd.yml | 14 +++++++++++++-
 addons/account_voucher/test/case4_cad_chf.yml |  4 ++--
 3 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/addons/account_voucher/account_voucher.py b/addons/account_voucher/account_voucher.py
index 36aa8660bc4..8bb8fe4d9b3 100644
--- a/addons/account_voucher/account_voucher.py
+++ b/addons/account_voucher/account_voucher.py
@@ -667,6 +667,7 @@ class account_voucher(osv.osv):
 
         #voucher line creation
         for line in account_move_lines:
+
             if _remove_noise_in_o2m():
                 continue
 
@@ -1183,6 +1184,7 @@ class account_voucher(osv.osv):
                 account_id = voucher_brw.partner_id.property_account_receivable.id
             else:
                 account_id = voucher_brw.partner_id.property_account_payable.id
+            sign = voucher_brw.type == 'payment' and -1 or 1
             move_line = {
                 'name': write_off_name or name,
                 'account_id': account_id,
@@ -1191,7 +1193,7 @@ class account_voucher(osv.osv):
                 'date': voucher_brw.date,
                 'credit': diff > 0 and diff or 0.0,
                 'debit': diff < 0 and -diff or 0.0,
-                'amount_currency': company_currency <> current_currency and voucher_brw.writeoff_amount or False,
+                'amount_currency': company_currency <> current_currency and (sign * -1 * voucher_brw.writeoff_amount) or False,
                 'currency_id': company_currency <> current_currency and current_currency or False,
                 'analytic_account_id': voucher_brw.analytic_id and voucher_brw.analytic_id.id or False,
             }
diff --git a/addons/account_voucher/test/case1_usd_usd.yml b/addons/account_voucher/test/case1_usd_usd.yml
index b706e6f0644..300d565f229 100644
--- a/addons/account_voucher/test/case1_usd_usd.yml
+++ b/addons/account_voucher/test/case1_usd_usd.yml
@@ -216,6 +216,10 @@
             assert move_line.credit == 63.00, "Debtor account has wrong entry."
         elif move_line.amount_currency == 10.00:
             assert move_line.debit == 9.00, "Writeoff amount is wrong."
+        elif move_line.amount_currency == 240.00:
+            assert move_line.debit == 216.00, "Bank entry is wrong."
+        else:
+            assert False, "Unrecognized journal entry"
 -
   I check the residual amount of Invoice1, should be 20 in amount_currency
 -
@@ -237,7 +241,7 @@
 -
   On the first April, I create the second voucher of payment with values 45 USD, journal USD, 
 -
-  !record {model: account.voucher, id: account_voucher_2_case1}:
+  !record {model: account.voucher, id: account_voucher_2_case1, view: view_vendor_receipt_form}:
     account_id: account.cash
     amount: 45.0
     company_id: base.main_company
@@ -323,8 +327,16 @@
             assert move_line.debit == 4.75, "Writeoff amount is wrong."
         elif move_line.debit == 11.5 and move_line.account_id.reconcile:
             assert move_line.amount_currency == 0.0 and move_line.reconcile_id.id == reconcile_a, "Exchange difference entry for the invoice of 100$ is wrong"
+        elif move_line.credit == 11.5:
+            assert move_line.amount_currency == 0.0
         elif move_line.debit == 31.0 and move_line.account_id.reconcile:
             assert move_line.amount_currency == 0.0 and move_line.reconcile_id.id == reconcile_b, "Exchange difference entry for the invoice of 200$ is wrong"
+        elif move_line.credit == 31.0:
+            assert move_line.amount_currency == 0.0
+        elif move_line.amount_currency == 45.00:
+            assert move_line.debit == 42.75, "Bank entry is wrong."
+        else:
+            assert False, "Unrecognized journal entry"
 -
   I check the residual amount of Invoice1, should be 0 in residual currency and 0 in amount_residual and paid
 -
diff --git a/addons/account_voucher/test/case4_cad_chf.yml b/addons/account_voucher/test/case4_cad_chf.yml
index a78669c95ef..a2b252497cd 100644
--- a/addons/account_voucher/test/case4_cad_chf.yml
+++ b/addons/account_voucher/test/case4_cad_chf.yml
@@ -164,7 +164,7 @@
 -
   I check that my currency rate difference is correct. 0 in debit with no amount_currency
 -
-  I check that my writeoff is correct. 11.05 credit and 13.26 amount_currency
+  I check that my writeoff is correct. 11.05 credit and -13.26 amount_currency
 -
   !python {model: account.voucher}: |
     voucher = self.search(cr, uid, [('name', '=', 'First payment: Case 4'), ('partner_id', '=', ref('base.res_partner_19'))])
@@ -179,7 +179,7 @@
         elif move_line.debit == 0.00 and move_line.credit == 0.00:
             assert move_line.amount_currency == 0.00, "Incorrect Currency Difference."
         elif move_line.credit == 10.61:
-            assert move_line.amount_currency == 13.26, "Writeoff amount is wrong."
+            assert move_line.amount_currency == -13.26, "Writeoff amount is wrong."
         else:
             assert False, "Wrong entry"
 -

From 147da38fa446ee959a4162a94d8a9fa25a500be1 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Thu, 4 Oct 2012 11:02:40 +0200
Subject: [PATCH 27/77] [REV] put back the label for product_uom_qty in sale
 order line, wrongly removed in a previous commit

bzr revid: qdp-launchpad@openerp.com-20121004090240-gckfbpgpymtcxixz
---
 addons/sale/sale_view.xml             | 1 +
 addons/sale_stock/sale_stock_view.xml | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 2291c015ad3..59b06cd22c0 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -201,6 +201,7 @@
                                                 context="{'partner_id':parent.partner_id, 'quantity':product_uom_qty, 'pricelist':parent.pricelist_id, 'shop':parent.shop_id, 'uom':product_uom}"
                                                 groups="base.group_user"
                                                 on_change="product_id_change(parent.pricelist_id, product_id, product_uom_qty, product_uom, product_uos_qty, product_uos, name, parent.partner_id, False, True, parent.date_order, False, parent.fiscal_position, False, context)"/>
+                                            <label for="product_uom_qty"/>
                                             <div>
                                                 <field
                                                     context="{'partner_id':parent.partner_id, 'quantity':product_uom_qty, 'pricelist':parent.pricelist_id, 'shop':parent.shop_id, 'uom':product_uom}"
diff --git a/addons/sale_stock/sale_stock_view.xml b/addons/sale_stock/sale_stock_view.xml
index 09a8cd51af8..8962c21dc6e 100644
--- a/addons/sale_stock/sale_stock_view.xml
+++ b/addons/sale_stock/sale_stock_view.xml
@@ -41,7 +41,8 @@
                    </xpath>
                    <xpath expr="//button[@name='action_view_invoice']" position="after">
                        <button name="action_view_delivery" string="View Delivery Order" type="object" class="oe_highlight"
-                           attrs="{'invisible': ['|','|','|',('picking_ids','=',False),('picking_ids','=',[]), ('state', 'not in', ('progress','manual')),('shipped','=',True)]}"/>                   </xpath>
+                           attrs="{'invisible': ['|','|','|',('picking_ids','=',False),('picking_ids','=',[]), ('state', 'not in', ('progress','manual')),('shipped','=',True)]}"/>
+                   </xpath>
                     <xpath expr="//button[@name='action_cancel']" position="after">
                         <button name="ship_cancel" states="shipping_except" string="Cancel"/>
                     </xpath>

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 28/77] [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 29/77] [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 3d1b4398bfe3d3c27988f9e27f0d856c6f2ef154 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Thu, 4 Oct 2012 13:56:17 +0200
Subject: [PATCH 30/77] [REf] yaml_import.py: refactoring of _create_record()

bzr revid: qdp-launchpad@openerp.com-20121004115617-ihb4j3tdeco68vob
---
 openerp/tools/yaml_import.py | 111 +++++++++++++++++------------------
 1 file changed, 55 insertions(+), 56 deletions(-)

diff --git a/openerp/tools/yaml_import.py b/openerp/tools/yaml_import.py
index f7f5f63173a..9c7b8721a1d 100644
--- a/openerp/tools/yaml_import.py
+++ b/openerp/tools/yaml_import.py
@@ -328,16 +328,6 @@ class YamlInterpreter(object):
                 self.cr.commit()
 
     def _create_record(self, model, fields, view_info=False, parent={}, default=True):
-        view = view_info and etree.fromstring(view_info['arch'].encode('utf-8')) or False
-        if view is not False:
-            defaults = default and model._add_missing_default_values(self.cr, SUPERUSER_ID, {}, context=self.context) or {}
-            fg = model.fields_get(self.cr, SUPERUSER_ID, context=self.context)
-        else:
-            defaults = {}
-            fg = {}
-        record_dict = defaults.copy()
-        fields = fields or {}
-
         def process_val(key, val):
             if fg[key]['type']=='many2one':
                 if type(val) in (tuple,list):
@@ -349,61 +339,70 @@ class YamlInterpreter(object):
                     val = map(lambda x: (0,0,x), val)
             return val
 
-        # Process all on_change calls
-        nodes = (view is not False) and [view] or []
-        while nodes:
-            el = nodes.pop(0)
-            if el.tag=='field':
-                field_name = el.attrib['name']
-                assert field_name in fg, "The field '%s' is defined in the form view but not on the object '%s'!" % (field_name, model._name)
-                if field_name in fields:
-                    one2many_form_view = None
-                    # if the form view is not inline, we call fields_view_get
-                    if (view is not False) and (fg[field_name]['type']=='one2many'):
-                        one2many_form_view = view_info['fields'][field_name]['views'].get('form')
-                        if not one2many_form_view:
-                            one2many_form_view = self.pool.get(fg[field_name]['relation']).fields_view_get(self.cr, SUPERUSER_ID, False, 'form', self.context)
+        view = view_info and etree.fromstring(view_info['arch'].encode('utf-8')) or False
+        fields = fields or {}
+        if view is not False:
+            defaults = default and model._add_missing_default_values(self.cr, SUPERUSER_ID, fields, context=self.context) or {}
+            fg = view_info['fields']
+            # copy the default values in record_dict, only if they are in the view (because that's what the client does)
+            # the other default values will be added later on by the create().
+            record_dict = dict([(key, val) for key, val in defaults.items() if key in fg])
+            # Process all on_change calls
+            nodes = [view]
+            while nodes:
+                el = nodes.pop(0)
+                if el.tag=='field':
+                    field_name = el.attrib['name']
+                    assert field_name in fg, "The field '%s' is defined in the form view but not on the object '%s'!" % (field_name, model._name)
+                    if field_name in fields:
+                        one2many_form_view = None
+                        # if the form view is not inline, we call fields_view_get
+                        if (view is not False) and (fg[field_name]['type']=='one2many'):
+                            one2many_form_view = view_info['fields'][field_name]['views'].get('form')
+                            if not one2many_form_view:
+                                one2many_form_view = self.pool.get(fg[field_name]['relation']).fields_view_get(self.cr, SUPERUSER_ID, False, 'form', self.context)
 
-                    field_value = self._eval_field(model, field_name, fields[field_name], one2many_form_view or view_info, parent=record_dict, default=default)
-                    record_dict[field_name] = field_value
-                    #if (field_name in defaults) and defaults[field_name] == field_value:
-                    #    print '*** You can remove these lines:', field_name, field_value
+                        field_value = self._eval_field(model, field_name, fields[field_name], one2many_form_view or view_info, parent=record_dict, default=default)
+                        record_dict[field_name] = field_value
+                        #if (field_name in defaults) and defaults[field_name] == field_value:
+                        #    print '*** You can remove these lines:', field_name, field_value
 
-                #if field_name has a default value or a value is given in the yaml file, we must call its on_change()
-                elif field_name not in defaults:
-                    continue
+                    #if field_name has a default value or a value is given in the yaml file, we must call its on_change()
+                    elif field_name not in defaults:
+                        continue
 
-                if not el.attrib.get('on_change', False):
-                    continue
-                match = re.match("([a-z_1-9A-Z]+)\((.*)\)", el.attrib['on_change'])
-                assert match, "Unable to parse the on_change '%s'!" % (el.attrib['on_change'], )
+                    if not el.attrib.get('on_change', False):
+                        continue
+                    match = re.match("([a-z_1-9A-Z]+)\((.*)\)", el.attrib['on_change'])
+                    assert match, "Unable to parse the on_change '%s'!" % (el.attrib['on_change'], )
 
-                # creating the context
-                class parent2(object):
-                    def __init__(self, d):
-                        self.d = d
-                    def __getattr__(self, name):
-                        return self.d.get(name, False)
+                    # creating the context
+                    class parent2(object):
+                        def __init__(self, d):
+                            self.d = d
+                        def __getattr__(self, name):
+                            return self.d.get(name, False)
 
-                ctx = record_dict.copy()
-                ctx['context'] = self.context
-                ctx['uid'] = SUPERUSER_ID
-                ctx['parent'] = parent2(parent)
-                for a in fg:
-                    if a not in ctx:
-                        ctx[a]=process_val(a, defaults.get(a, False))
+                    ctx = record_dict.copy()
+                    ctx['context'] = self.context
+                    ctx['uid'] = SUPERUSER_ID
+                    ctx['parent'] = parent2(parent)
+                    for a in fg:
+                        if a not in ctx:
+                            ctx[a]=process_val(a, defaults.get(a, False))
 
-                # Evaluation args
-                args = map(lambda x: eval(x, ctx), match.group(2).split(','))
-                result = getattr(model, match.group(1))(self.cr, SUPERUSER_ID, [], *args)
-                for key, val in (result or {}).get('value', {}).items():
-                    if key not in fields:
-                        assert key in fg, "The returning field '%s' from your on_change call '%s' does not exist on the object '%s'" % (key, match.group(1), model._name)
+                    # Evaluation args
+                    args = map(lambda x: eval(x, ctx), match.group(2).split(','))
+                    result = getattr(model, match.group(1))(self.cr, SUPERUSER_ID, [], *args)
+                    for key, val in (result or {}).get('value', {}).items():
+                        assert key in fg, "The returning field '%s' from your on_change call '%s' does not exist on the object '%s' or in its view named '%s'" % (key, match.group(1), model._name, view_info['name'])
                         record_dict[key] = process_val(key, val)
                         #if (key in fields) and record_dict[key] == process_val(key, val):
                         #    print '*** You can remove these lines:', key, val
-            else:
-                nodes = list(el) + nodes
+                else:
+                    nodes = list(el) + nodes
+        else:
+            record_dict = {}
 
         for field_name, expression in fields.items():
             if field_name in record_dict:

From 74f061ebee8d0cb07f979ae920702cc2dd674f6c Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Thu, 4 Oct 2012 14:15:22 +0200
Subject: [PATCH 31/77] [IMP] yaml_import.py: comments and documentation
 improved for _create_record()

bzr revid: qdp-launchpad@openerp.com-20121004121522-ytttm7xulvo8i1wz
---
 openerp/tools/yaml_import.py | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/openerp/tools/yaml_import.py b/openerp/tools/yaml_import.py
index 9c7b8721a1d..4132e5d9e9c 100644
--- a/openerp/tools/yaml_import.py
+++ b/openerp/tools/yaml_import.py
@@ -328,6 +328,18 @@ class YamlInterpreter(object):
                 self.cr.commit()
 
     def _create_record(self, model, fields, view_info=False, parent={}, default=True):
+        """
+        This function process the !record tag in yalm files. It simulates the record creation through an xml
+        view (either specified on the !record tag or the default one for this object), including the calls to
+        on_change() functions.
+        :param model: browseable object
+        :param fields: dictonary mapping the field names and their values
+        :param view_info: result of fields_view_get() called on the object
+        :param parent: dictionary containing the values already computed for the parent, in case of one2many fields
+        :param default: boolean flag depicting if the default values must be added to the process or not
+        :return: dictionary mapping the field names and their values to use when calling the create() function
+        :rtype: dict
+        """
         def process_val(key, val):
             if fg[key]['type']=='many2one':
                 if type(val) in (tuple,list):
@@ -347,6 +359,7 @@ class YamlInterpreter(object):
             # copy the default values in record_dict, only if they are in the view (because that's what the client does)
             # the other default values will be added later on by the create().
             record_dict = dict([(key, val) for key, val in defaults.items() if key in fg])
+
             # Process all on_change calls
             nodes = [view]
             while nodes:
@@ -356,9 +369,10 @@ class YamlInterpreter(object):
                     assert field_name in fg, "The field '%s' is defined in the form view but not on the object '%s'!" % (field_name, model._name)
                     if field_name in fields:
                         one2many_form_view = None
-                        # if the form view is not inline, we call fields_view_get
                         if (view is not False) and (fg[field_name]['type']=='one2many'):
+                            # for one2many fields, we want to eval them using the inline form view defined on the parent
                             one2many_form_view = view_info['fields'][field_name]['views'].get('form')
+                            # if the form view is not defined inline, we call fields_view_get()
                             if not one2many_form_view:
                                 one2many_form_view = self.pool.get(fg[field_name]['relation']).fields_view_get(self.cr, SUPERUSER_ID, False, 'form', self.context)
 

From 9255d5d3ef5feef89156634816705db160e21261 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Thu, 4 Oct 2012 14:24:18 +0200
Subject: [PATCH 32/77] [REF] yaml_import.py: some doc and error messagse
 improved

bzr revid: qdp-launchpad@openerp.com-20121004122418-a93kll1v7kqfrfc2
---
 openerp/tools/yaml_import.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/openerp/tools/yaml_import.py b/openerp/tools/yaml_import.py
index 4132e5d9e9c..a6642fd5fd4 100644
--- a/openerp/tools/yaml_import.py
+++ b/openerp/tools/yaml_import.py
@@ -336,8 +336,8 @@ class YamlInterpreter(object):
         :param fields: dictonary mapping the field names and their values
         :param view_info: result of fields_view_get() called on the object
         :param parent: dictionary containing the values already computed for the parent, in case of one2many fields
-        :param default: boolean flag depicting if the default values must be added to the process or not
-        :return: dictionary mapping the field names and their values to use when calling the create() function
+        :param default: boolean flag depicting if the default values must be processed too or not
+        :return: dictionary mapping the field names and their values, ready to use when calling the create() function
         :rtype: dict
         """
         def process_val(key, val):
@@ -409,7 +409,7 @@ class YamlInterpreter(object):
                     args = map(lambda x: eval(x, ctx), match.group(2).split(','))
                     result = getattr(model, match.group(1))(self.cr, SUPERUSER_ID, [], *args)
                     for key, val in (result or {}).get('value', {}).items():
-                        assert key in fg, "The returning field '%s' from your on_change call '%s' does not exist on the object '%s' or in its view named '%s'" % (key, match.group(1), model._name, view_info['name'])
+                        assert key in fg, "The returning field '%s' from your on_change call '%s' does not exist either on the object '%s', either in the view '%s' used for the creation" % (key, match.group(1), model._name, view_info['name'])
                         record_dict[key] = process_val(key, val)
                         #if (key in fields) and record_dict[key] == process_val(key, val):
                         #    print '*** You can remove these lines:', key, val

From 154675f4ad07ee2afa958abbe822c41298eb0ac6 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Thu, 4 Oct 2012 15:02:24 +0200
Subject: [PATCH 33/77] [FIX] base: onchange_type should return only the big
 image, not the medium or the small

bzr revid: qdp-launchpad@openerp.com-20121004130224-t9wcp1bn0014px3f
---
 openerp/addons/base/res/res_partner.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openerp/addons/base/res/res_partner.py b/openerp/addons/base/res/res_partner.py
index bb698c2d212..c5c95276b16 100644
--- a/openerp/addons/base/res/res_partner.py
+++ b/openerp/addons/base/res/res_partner.py
@@ -301,7 +301,7 @@ class res_partner(osv.osv, format_address):
 
     def onchange_type(self, cr, uid, ids, is_company, context=None):
         # get value as for an onchange on the image
-        value = tools.image_get_resized_images(self._get_default_image(cr, uid, is_company, context), return_big=True)
+        value = tools.image_get_resized_images(self._get_default_image(cr, uid, is_company, context), return_big=True, return_medium=False, return_small=False)
         value['title'] = False
         if is_company:
             value['parent_id'] = False

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 34/77] [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 35/77] [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 36/77] [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 37/77] [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 38/77] [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 d95af40a60c8b128b327046c4501d28c6aaaf228 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Thu, 4 Oct 2012 16:24:48 +0200
Subject: [PATCH 39/77] [FIX] fixed views that have an onchange function
 returning a field which is not in the view

bzr revid: qdp-launchpad@openerp.com-20121004142448-a90p3785a2l95rqc
---
 addons/event/event_view.xml   | 4 ++++
 addons/survey/survey_view.xml | 4 +++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index 6ad8fb20467..ddc0f1d1d90 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -136,6 +136,7 @@
                                     <field name="type" on_change="onchange_event_type(type,context)"/>
                                     <field name="date_begin"/>
                                     <field name="date_end"/>
+                                    <field name="company_id" groups="base.group_multi_company"/>
                                 </group>
                             </group>
                         </div>
@@ -475,6 +476,9 @@
                                 <field name="create_date"/>
                                 <field name="date_closed"/>
                             </group>
+                            <group>
+                                <field name="company_id" groups="base.group_multi_company"/>
+                            </group>
                         </group>
                     </sheet>
                     <div class="oe_chatter">
diff --git a/addons/survey/survey_view.xml b/addons/survey/survey_view.xml
index 01d6098df55..0247a205700 100644
--- a/addons/survey/survey_view.xml
+++ b/addons/survey/survey_view.xml
@@ -1125,7 +1125,8 @@
                     <field name="date_deadline"/>
                     <field name="survey_id"/>
                     <field name="user_id" on_change="on_change_user(user_id)"/>
-                     <field name="response" readonly="1"/>
+                    <field name="email"/>
+                    <field name="response" readonly="1"/>
                     </group>
                     </sheet>
                 </form>
@@ -1139,6 +1140,7 @@
                 <tree string="Evaluation Plan Phase" colors="red:date_deadline&lt;current_date">
                     <field name="date_deadline"/>
                     <field name="user_id"/>
+                    <field name="email"/>
                     <field name="survey_id"/>
                     <field name="response" />
                     <field name="state" />

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 40/77] 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 41/77] 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 c8c7c87c9810dd576f4613b8f81b2b88305ecb0c Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Thu, 4 Oct 2012 17:01:50 +0200
Subject: [PATCH 42/77] [REF] event, removed unused code: onchange_event()

bzr revid: qdp-launchpad@openerp.com-20121004150150-ykotagukkehq62mj
---
 addons/event/event.py       | 16 ----------------
 addons/event/event_view.xml |  5 +----
 2 files changed, 1 insertion(+), 20 deletions(-)

diff --git a/addons/event/event.py b/addons/event/event.py
index 0eb2dda8312..d86fd92d054 100644
--- a/addons/event/event.py
+++ b/addons/event/event.py
@@ -435,22 +435,6 @@ class event_registration(osv.osv):
             'phone':contact_id.phone,
             }}
 
-    def onchange_event(self, cr, uid, ids, event_id, context=None):
-        """This function returns value of Product Name, Unit Price based on Event.
-        """
-        if context is None:
-            context = {}
-        if not event_id:
-            return {}
-        event_obj = self.pool.get('event.event')
-        data_event =  event_obj.browse(cr, uid, event_id, context=context)
-        return {'value':
-                    {'event_begin_date': data_event.date_begin,
-                     'event_end_date': data_event.date_end,
-                     'company_id': data_event.company_id and data_event.company_id.id or False,
-                    }
-               }
-
     def onchange_partner_id(self, cr, uid, ids, part, context=None):
         res_obj = self.pool.get('res.partner')
         data = {}
diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index ddc0f1d1d90..b9a815e49e1 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -453,7 +453,7 @@
                     <sheet string="Registration">
                         <label for="event_id" class="oe_edit_only"/>
                         <h1>
-                            <field name="event_id" on_change="onchange_event(event_id, context)" domain="[('state','in',('draft','confirm'))]"/>
+                            <field name="event_id" domain="[('state','in',('draft','confirm'))]"/>
                         </h1>
                         <group>
                             <group>
@@ -476,9 +476,6 @@
                                 <field name="create_date"/>
                                 <field name="date_closed"/>
                             </group>
-                            <group>
-                                <field name="company_id" groups="base.group_multi_company"/>
-                            </group>
                         </group>
                     </sheet>
                     <div class="oe_chatter">

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 43/77] 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 44/77] 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 e143ca2a5b953f7c9ead480089b501c4982b9424 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Thu, 4 Oct 2012 17:40:32 +0200
Subject: [PATCH 45/77] =?UTF-8?q?[FIX]=20yaml=5Fimport:=20on=20=5Fcreate?=
 =?UTF-8?q?=5Frecord,=20when=20we=20gather=20the=20default=20values=20on?=
 =?UTF-8?q?=20the=20object=20we=20can't=20use=20base.main=5Fcompany=C2=B4?=
 =?UTF-8?q?=20in=20the=20yaml=20file=20and=20it's=20not=20compatible=20wit?=
 =?UTF-8?q?h=20the=20function)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

bzr revid: qdp-launchpad@openerp.com-20121004154032-qyq5gdur383bfxl9
---
 openerp/tools/yaml_import.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/openerp/tools/yaml_import.py b/openerp/tools/yaml_import.py
index a6642fd5fd4..029e6d2c798 100644
--- a/openerp/tools/yaml_import.py
+++ b/openerp/tools/yaml_import.py
@@ -354,8 +354,10 @@ class YamlInterpreter(object):
         view = view_info and etree.fromstring(view_info['arch'].encode('utf-8')) or False
         fields = fields or {}
         if view is not False:
-            defaults = default and model._add_missing_default_values(self.cr, SUPERUSER_ID, fields, context=self.context) or {}
             fg = view_info['fields']
+            # gather the default values on the object. (Can't use `fields´ as parameter instead of {} because we may
+            # have references like `base.main_company´ in the yaml file and it's not compatible with the function)
+            defaults = default and model._add_missing_default_values(self.cr, SUPERUSER_ID, {}, context=self.context) or {}
             # copy the default values in record_dict, only if they are in the view (because that's what the client does)
             # the other default values will be added later on by the create().
             record_dict = dict([(key, val) for key, val in defaults.items() if key in fg])

From bcbf69225f62d6c0a41662df06cebe3ec01e42e1 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Thu, 4 Oct 2012 18:00:10 +0200
Subject: [PATCH 46/77] [FIX] crm: fixed view that have an onchange function
 returning a field which is not in the view

bzr revid: qdp-launchpad@openerp.com-20121004160010-9vk5ox9nzivzkmak
---
 addons/crm/crm_phonecall_view.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/crm/crm_phonecall_view.xml b/addons/crm/crm_phonecall_view.xml
index ea20624d738..c610913febf 100644
--- a/addons/crm/crm_phonecall_view.xml
+++ b/addons/crm/crm_phonecall_view.xml
@@ -140,6 +140,7 @@
                         <field name="duration" widget="float_time"/>
                         <field name="section_id" colspan="1" widget="selection"/>
                         <field name="partner_id" on_change="onchange_partner_id(partner_id)"/>
+                        <field name="email_from" invisible="1"/> <!--not needed because of the chatter, thus invisible, but must be in the view as it's returned by onchange_partner_id()-->
                         <field name="categ_id" widget="selection"
                             domain="[('object_id.model', '=', 'crm.phonecall')]"/>
                         <field name="partner_mobile"/>

From 98566ddccc3d8606630fd765377e031ef2d8daac Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Thu, 4 Oct 2012 18:01:36 +0200
Subject: [PATCH 47/77] [IMP] account: small improvement in yaml test

bzr revid: qdp-launchpad@openerp.com-20121004160136-kxi2sfdk4on8rilo
---
 addons/account/test/account_supplier_invoice.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/account/test/account_supplier_invoice.yml b/addons/account/test/account_supplier_invoice.yml
index 9c5ce2dea3e..02c3d367050 100644
--- a/addons/account/test/account_supplier_invoice.yml
+++ b/addons/account/test/account_supplier_invoice.yml
@@ -21,7 +21,7 @@
 -
   I create a supplier invoice
 -
-  !record {model: account.invoice, id: account_invoice_supplier0}:
+  !record {model: account.invoice, id: account_invoice_supplier0, view: invoice_supplier_form}:
     account_id: account.a_pay
     check_total: 3000.0
     company_id: base.main_company

From bdb4945d8080120dd32dd947114b8a0327f50a5d Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Thu, 4 Oct 2012 18:07:27 +0200
Subject: [PATCH 48/77] [FIX] account: fixed view that have an onchange
 function returning a field which is not in the view

bzr revid: qdp-launchpad@openerp.com-20121004160727-2y2ip152tjz25t23
---
 addons/account/account_bank_statement.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/addons/account/account_bank_statement.py b/addons/account/account_bank_statement.py
index b4fc2388a68..8b2a9aff257 100644
--- a/addons/account/account_bank_statement.py
+++ b/addons/account/account_bank_statement.py
@@ -461,10 +461,9 @@ class account_bank_statement(osv.osv):
             return {}
         balance_start = self._compute_balance_end_real(cr, uid, journal_id, context=context)
 
-        journal_data = self.pool.get('account.journal').read(cr, uid, journal_id, ['default_debit_account_id', 'company_id'], context=context)
-        account_id = journal_data['default_debit_account_id']
+        journal_data = self.pool.get('account.journal').read(cr, uid, journal_id, ['company_id'], context=context)
         company_id = journal_data['company_id']
-        return {'value': {'balance_start': balance_start, 'account_id': account_id, 'company_id': company_id}}
+        return {'value': {'balance_start': balance_start, 'company_id': company_id}}
 
     def unlink(self, cr, uid, ids, context=None):
         stat = self.read(cr, uid, ids, ['state'], context=context)

From e3321610ed83be729471f9700dcadff423caf50b Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Thu, 4 Oct 2012 18:10:09 +0200
Subject: [PATCH 49/77] [FIX] hr_holidays: fixed view that have an onchange
 function returning a field which is not in the view

bzr revid: qdp-launchpad@openerp.com-20121004161009-w4sv2vjweklqj73o
---
 addons/hr_holidays/hr_holidays.py       | 7 -------
 addons/hr_holidays/hr_holidays_view.xml | 4 ++--
 2 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/addons/hr_holidays/hr_holidays.py b/addons/hr_holidays/hr_holidays.py
index 306e5201829..b48f0786704 100644
--- a/addons/hr_holidays/hr_holidays.py
+++ b/addons/hr_holidays/hr_holidays.py
@@ -212,13 +212,6 @@ class hr_holidays(osv.osv):
         }
         return result
 
-    def onchange_status_id(self, cr, uid, ids, status_id, context=None):
-        double_validation = False
-        if status_id:
-            holiday_status = self.pool.get('hr.holidays.status').browse(cr, uid, status_id, context=context)
-            double_validation = holiday_status.double_validation
-        return {'value': {'double_validation': double_validation}}
-
     def set_to_draft(self, cr, uid, ids, context=None):
         self.write(cr, uid, ids, {
             'state': 'draft',
diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index 347e2b17ca5..ae85b03fcaf 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -100,7 +100,7 @@
                     <group>
                         <group>
                             <field name="name" attrs="{'readonly':[('state','!=','draft'),('state','!=','confirm')]}"/>
-                            <field name="holiday_status_id" on_change="onchange_status_id(holiday_status_id)" context="{'employee_id':employee_id}"/>
+                            <field name="holiday_status_id" context="{'employee_id':employee_id}"/>
                             <label for="number_of_days_temp" string="Duration"/>
                             <div>
                                 <group col="3">
@@ -145,7 +145,7 @@
                     <group>
                         <group>
                             <field name="name" required="1" attrs="{'readonly':[('state','!=','draft'),('state','!=','confirm')]}"/>
-                            <field name="holiday_status_id" on_change="onchange_status_id(holiday_status_id)" context="{'employee_id':employee_id}"/>
+                            <field name="holiday_status_id" context="{'employee_id':employee_id}"/>
                             <field name="number_of_days_temp"/>
                         </group>
                         <group>

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 50/77] 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 003e5ebffbe7ed1eefb3c9d8a4ee56f08c24dd5b Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Thu, 4 Oct 2012 18:15:42 +0200
Subject: [PATCH 51/77] [FIX] account_voucher: fixed spurious yaml test

bzr revid: qdp-launchpad@openerp.com-20121004161542-n1lacefk1jbr8ccl
---
 addons/account_voucher/test/account_voucher.yml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/addons/account_voucher/test/account_voucher.yml b/addons/account_voucher/test/account_voucher.yml
index 2ea6c0b7890..f8e20f496e5 100644
--- a/addons/account_voucher/test/account_voucher.yml
+++ b/addons/account_voucher/test/account_voucher.yml
@@ -1,7 +1,8 @@
 -
   In order to check account voucher module in OpenERP I create a customer voucher
 -
-  !record {model: account.voucher, id: account_voucher_voucherforaxelor0}:
+  !record {model: account.voucher, id: account_voucher_voucherforaxelor0, view: view_sale_receipt_form}:
+    type: sale
     account_id: account.cash
     amount: 1000.0
     company_id: base.main_company
@@ -47,7 +48,8 @@
 -
   Now I create a Vendor Voucher
 -
-  !record {model: account.voucher, id: account_voucher_voucheraxelor0, view: False}:
+  !record {model: account.voucher, id: account_voucher_voucheraxelor0, view: view_voucher_filter_vendor}:
+    type: purchase
     account_id: account.cash
     amount: 1000.0
     company_id: base.main_company

From 28208c7f5c3805f5b283248a9f29aa51d84dfa03 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Thu, 4 Oct 2012 18:26:11 +0200
Subject: [PATCH 52/77] [FIX] analytic: fixed view that have an onchange
 function returning a field which is not in the view

bzr revid: qdp-launchpad@openerp.com-20121004162611-mzjh291l4rlwwk4m
---
 addons/analytic/analytic.py       | 2 +-
 addons/analytic/analytic_view.xml | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/addons/analytic/analytic.py b/addons/analytic/analytic.py
index ff09349b8a2..d71b480f799 100644
--- a/addons/analytic/analytic.py
+++ b/addons/analytic/analytic.py
@@ -163,7 +163,7 @@ class account_analytic_account(osv.osv):
         'date': fields.date('Date End', select=True),
         'company_id': fields.many2one('res.company', 'Company', required=False), #not required because we want to allow different companies to use the same chart of account, except for leaf accounts.
         'state': fields.selection([('template', 'Template'),('draft','New'),('open','In Progress'), ('cancelled', 'Cancelled'),('pending','To Renew'),('close','Closed')], 'Status', required=True,),
-        'currency_id': fields.function(_currency, fnct_inv=_set_company_currency,
+        'currency_id': fields.function(_currency, fnct_inv=_set_company_currency, #the currency_id field is readonly except if it's a view account and if there is no company
             store = {
                 'res.company': (_get_analytic_account, ['currency_id'], 10),
             }, string='Currency', type='many2one', relation='res.currency'),
diff --git a/addons/analytic/analytic_view.xml b/addons/analytic/analytic_view.xml
index 51f5428002f..e434332f26b 100644
--- a/addons/analytic/analytic_view.xml
+++ b/addons/analytic/analytic_view.xml
@@ -24,6 +24,7 @@
                                 <field name="partner_id" on_change="on_change_partner_id(partner_id, name)" attrs="{'required':[('type','=','contract')]}"/>
                                 <field name="manager_id"/>
                                 <field name="code"/>
+                                <field name="currency_id" attrs="{'invisible': ['|',('type', &lt;&gt;, 'view'), ('company_id', &lt;&gt;, False)]}"/>
                             </group>
                             <group>
                                 <field name="type"/>

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 53/77] 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 627ddd3dddc20f219c824b571826452a2a4971cf Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Thu, 4 Oct 2012 18:33:20 +0200
Subject: [PATCH 54/77] [FIX] event: fixed view that have an onchange function
 returning a field which is not in the view

bzr revid: qdp-launchpad@openerp.com-20121004163320-vhsuoj6i39hzlmrj
---
 addons/event/event_view.xml | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index b9a815e49e1..1e5747e07c9 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -141,6 +141,17 @@
                             </group>
                         </div>
                         <notebook>
+                            <page string="Email Configuration" groups="base.extended">
+                                <group>
+                                    <field name="reply_to"/>
+                                    <group>
+                                        <field name="email_registration_id"/>
+                                    </group>
+                                    <group>
+                                        <field name="email_confirmation_id"/>
+                                    </group>
+                                </group>
+                            </page>
                             <page string="Event Description">
                                 <field name="note" colspan="4" nolabel="1"/>
                             </page>

From f7ead41764a189df9964a570a04b4ac657df2b0c Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Thu, 4 Oct 2012 18:48:34 +0200
Subject: [PATCH 55/77] [FIX] account_voucher: fixed view that have an onchange
 function returning a field which is not in the view

bzr revid: qdp-launchpad@openerp.com-20121004164834-bjs76n10wt3k5c1w
---
 addons/account_voucher/voucher_sales_purchase_view.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/addons/account_voucher/voucher_sales_purchase_view.xml b/addons/account_voucher/voucher_sales_purchase_view.xml
index 5bcecfa268e..eb03eefcb83 100644
--- a/addons/account_voucher/voucher_sales_purchase_view.xml
+++ b/addons/account_voucher/voucher_sales_purchase_view.xml
@@ -80,6 +80,7 @@
                             <field name="date" on_change="onchange_date(date, currency_id, currency_id, amount, company_id, context)"/>
                             <field name="name"/>
                             <field name="paid" invisible="1"/>
+                            <field name="paid_amount_in_company_currency" invisible="1"/>
                             <field name="currency_id" invisible="1"/>
                         </group>
                         <field name="type" invisible="True"/>
@@ -235,6 +236,7 @@
                                 widget="selection"
                                 on_change="onchange_journal(journal_id, line_dr_ids, tax_id, partner_id, date, amount, type, company_id, context)"
                                 groups="account.group_account_user"/>
+                            <field name="paid_amount_in_company_currency" invisible="1"/>
                         </group>
                     </group>
                     <notebook>

From 34a2c5e7a87fe4fcade3027ce82d609d0fba5720 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Thu, 4 Oct 2012 18:52:40 +0200
Subject: [PATCH 56/77] [TRY] sale: attempt to fix a problem related to
 onchange() call that returns a value for a field we are not seeing in the
 form view (because of groups attr)

bzr revid: qdp-launchpad@openerp.com-20121004165240-7sr4wdi072hy6uuk
---
 addons/sale/sale_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 59b06cd22c0..fab994d89cf 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -177,7 +177,7 @@
                             <field name="partner_id" on_change="onchange_partner_id(partner_id)" domain="[('customer','=',True)]" context="{'search_default_customer':1}"/>
                             <field name="partner_invoice_id" groups="sale.group_delivery_invoice_address"/>
                             <field name="partner_shipping_id" groups="sale.group_delivery_invoice_address"/>
-                            <field name="project_id" context="{'partner_id':partner_id, 'pricelist_id':pricelist_id, 'default_name':name}" groups="sale.group_analytic_accounting" domain="[('type','in',['view','normal','contract'])]"/>
+                            <field name="project_id" context="{'partner_id':partner_id, 'pricelist_id':pricelist_id, 'default_name':name}" domain="[('type','in',['view','normal','contract'])]"/> <!-- TODO: REVERT ME. -->
                         </group>
                         <group>
                             <field name="date_order"/>

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 57/77] [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 fbaa849e8201b1887833a9a161e6d421fe2df6fb Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Thu, 4 Oct 2012 19:02:01 +0200
Subject: [PATCH 58/77] [FIX] account_voucher: fixed view that have an onchange
 function returning a field which is not in the view

bzr revid: qdp-launchpad@openerp.com-20121004170201-lo2pm2dti00zahtz
---
 addons/account_voucher/voucher_sales_purchase_view.xml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/addons/account_voucher/voucher_sales_purchase_view.xml b/addons/account_voucher/voucher_sales_purchase_view.xml
index eb03eefcb83..d5bebd0e558 100644
--- a/addons/account_voucher/voucher_sales_purchase_view.xml
+++ b/addons/account_voucher/voucher_sales_purchase_view.xml
@@ -95,6 +95,9 @@
                                     <field name="account_analytic_id" groups="analytic.group_analytic_accounting"/>
                                 </tree>
                             </field>
+                            <!-- TODO: onchange_partner_id() should not returns line_dr_ids for type sale, and not line_cr_ids for type purchase -->
+                            <!-- in the meanwhile, bellow line must be there because the field must be present in the view if the onchange returns a value for it-->
+                            <field name="line_dr_ids" invisible="1"/>
 			                <group>
                                 <field name="narration" placeholder="Internal Notes" nolabel="1"/>
                                 <group class="oe_subtotal_footer oe_right">
@@ -249,6 +252,9 @@
                                     <field name="account_analytic_id" groups="analytic.group_analytic_accounting"/>
                                 </tree>
                             </field>
+                            <!-- TODO: onchange_partner_id() should not returns line_dr_ids for type sale, and not line_cr_ids for type purchase -->
+                            <!-- in the meanwhile, bellow line must be there because the field must be present in the view if the onchange returns a value for it-->
+                            <field name="line_cr_ids" invisible="1"/>
                             <group>
                                 <field name="narration" placeholder="Internal Notes" nolabel="1"/>
                                 <group class="oe_subtotal_footer oe_right">

From 5dacf35d16f4d37618d4d9c19e10bc8ff325c1ef Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Thu, 4 Oct 2012 19:05:06 +0200
Subject: [PATCH 59/77] [FIX] account_voucher: fixed view that have an onchange
 function returning a field which is not in the view

bzr revid: qdp-launchpad@openerp.com-20121004170506-3a8l6qjmvsclzx7d
---
 addons/account_voucher/voucher_sales_purchase_view.xml | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/addons/account_voucher/voucher_sales_purchase_view.xml b/addons/account_voucher/voucher_sales_purchase_view.xml
index d5bebd0e558..aa17cd2997a 100644
--- a/addons/account_voucher/voucher_sales_purchase_view.xml
+++ b/addons/account_voucher/voucher_sales_purchase_view.xml
@@ -95,9 +95,10 @@
                                     <field name="account_analytic_id" groups="analytic.group_analytic_accounting"/>
                                 </tree>
                             </field>
-                            <!-- TODO: onchange_partner_id() should not returns line_dr_ids for type sale, and not line_cr_ids for type purchase -->
-                            <!-- in the meanwhile, bellow line must be there because the field must be present in the view if the onchange returns a value for it-->
+                            <!-- TODO: onchange_partner_id() should not returns [pre_line,line_dr_ids] for type sale, and not [pre_line,line_cr_ids] for type purchase -->
+                            <!-- in the meanwhile, bellow lines must be there because the fields must be present in the view if the onchange returns a value for them-->
                             <field name="line_dr_ids" invisible="1"/>
+                            <field name="pre_line" invisible="1"/>
 			                <group>
                                 <field name="narration" placeholder="Internal Notes" nolabel="1"/>
                                 <group class="oe_subtotal_footer oe_right">
@@ -252,9 +253,10 @@
                                     <field name="account_analytic_id" groups="analytic.group_analytic_accounting"/>
                                 </tree>
                             </field>
-                            <!-- TODO: onchange_partner_id() should not returns line_dr_ids for type sale, and not line_cr_ids for type purchase -->
-                            <!-- in the meanwhile, bellow line must be there because the field must be present in the view if the onchange returns a value for it-->
+                            <!-- TODO: onchange_partner_id() should not returns [pre_line,line_dr_ids] for type sale, and not [pre_line,line_cr_ids] for type purchase -->
+                            <!-- in the meanwhile, bellow lines must be there because the fields must be present in the view if the onchange returns a value for them-->
                             <field name="line_cr_ids" invisible="1"/>
+                            <field name="pre_line" invisible="1"/>
                             <group>
                                 <field name="narration" placeholder="Internal Notes" nolabel="1"/>
                                 <group class="oe_subtotal_footer oe_right">

From df78f29db74c4c4dd31db7488cc92bfd776dc86e Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Thu, 4 Oct 2012 19:12:45 +0200
Subject: [PATCH 60/77] [FIX] account_voucher: fixed view that have an onchange
 function returning a field which is not in the view

bzr revid: qdp-launchpad@openerp.com-20121004171245-xvvqlqomkd1pcqvw
---
 .../account_voucher/test/account_voucher_report.yml  |  2 +-
 addons/account_voucher/test/sales_receipt.yml        |  2 +-
 .../account_voucher/voucher_sales_purchase_view.xml  | 12 ++++++++----
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/addons/account_voucher/test/account_voucher_report.yml b/addons/account_voucher/test/account_voucher_report.yml
index 3996e0c27e4..a87e4f0fc2a 100644
--- a/addons/account_voucher/test/account_voucher_report.yml
+++ b/addons/account_voucher/test/account_voucher_report.yml
@@ -1,7 +1,7 @@
 -
   Demo for Account Voucher
 -
-  !record {model: account.voucher, id: account_voucher_voucheraxelor0again}:
+  !record {model: account.voucher, id: account_voucher_voucheraxelor0again, view: view_sale_receipt_form}:
     account_id: account.cash
     company_id: base.main_company
     journal_id: account.bank_journal
diff --git a/addons/account_voucher/test/sales_receipt.yml b/addons/account_voucher/test/sales_receipt.yml
index f39d784bd42..7cd82eecaff 100644
--- a/addons/account_voucher/test/sales_receipt.yml
+++ b/addons/account_voucher/test/sales_receipt.yml
@@ -1,7 +1,7 @@
 - 
   Creating a Voucher Receipt for partner Seagate with amount 30000.0
 - 
-  !record {model: account.voucher, id: account_voucher_seagate_0}:
+  !record {model: account.voucher, id: account_voucher_seagate_0, view: view_sale_receipt_form}:
     account_id: account.a_recv
     amount: 30000.0
     company_id: base.main_company
diff --git a/addons/account_voucher/voucher_sales_purchase_view.xml b/addons/account_voucher/voucher_sales_purchase_view.xml
index aa17cd2997a..38b0bbefd18 100644
--- a/addons/account_voucher/voucher_sales_purchase_view.xml
+++ b/addons/account_voucher/voucher_sales_purchase_view.xml
@@ -95,10 +95,12 @@
                                     <field name="account_analytic_id" groups="analytic.group_analytic_accounting"/>
                                 </tree>
                             </field>
-                            <!-- TODO: onchange_partner_id() should not returns [pre_line,line_dr_ids] for type sale, and not [pre_line,line_cr_ids] for type purchase -->
+                            <!-- TODO: onchange_partner_id() should not returns [line_ids, pre_line, line_dr_ids...] for type sale, and not [line_ids, pre_line, line_cr_ids,...] for type purchase -->
                             <!-- in the meanwhile, bellow lines must be there because the fields must be present in the view if the onchange returns a value for them-->
-                            <field name="line_dr_ids" invisible="1"/>
                             <field name="pre_line" invisible="1"/>
+                            <field name="line_ids" invisible="1"/>
+                            <field name="payment_rate" invisible="1"/>
+                            <field name="line_dr_ids" invisible="1"/>
 			                <group>
                                 <field name="narration" placeholder="Internal Notes" nolabel="1"/>
                                 <group class="oe_subtotal_footer oe_right">
@@ -253,10 +255,12 @@
                                     <field name="account_analytic_id" groups="analytic.group_analytic_accounting"/>
                                 </tree>
                             </field>
-                            <!-- TODO: onchange_partner_id() should not returns [pre_line,line_dr_ids] for type sale, and not [pre_line,line_cr_ids] for type purchase -->
+                            <!-- TODO: onchange_partner_id() should not returns [line_ids, pre_line, line_dr_ids...] for type sale, and not [line_ids, pre_line, line_cr_ids,...] for type purchase -->
                             <!-- in the meanwhile, bellow lines must be there because the fields must be present in the view if the onchange returns a value for them-->
-                            <field name="line_cr_ids" invisible="1"/>
                             <field name="pre_line" invisible="1"/>
+                            <field name="line_ids" invisible="1"/>
+                            <field name="payment_rate" invisible="1"/>
+                            <field name="line_cr_ids" invisible="1"/>
                             <group>
                                 <field name="narration" placeholder="Internal Notes" nolabel="1"/>
                                 <group class="oe_subtotal_footer oe_right">

From 0b66a6854bf7bbb7a5e77ec3c15eec79661eb4bc Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Fri, 5 Oct 2012 09:53:56 +0200
Subject: [PATCH 61/77] [FIX] account_voucher: fixed errors in yalm tests due
 to value returned for a field not present in the view

bzr revid: qdp-launchpad@openerp.com-20121005075356-857hfyqcrdjjv04r
---
 addons/account_voucher/account_voucher.py     | 22 ++++++++++++++++---
 .../account_voucher/account_voucher_view.xml  |  1 +
 .../test/account_voucher_report.yml           |  1 +
 .../voucher_sales_purchase_view.xml           | 14 +-----------
 4 files changed, 22 insertions(+), 16 deletions(-)

diff --git a/addons/account_voucher/account_voucher.py b/addons/account_voucher/account_voucher.py
index ccb4f952310..5f48a8020c4 100644
--- a/addons/account_voucher/account_voucher.py
+++ b/addons/account_voucher/account_voucher.py
@@ -547,6 +547,20 @@ class account_voucher(osv.osv):
         vals = self.recompute_payment_rate(cr, uid, ids, res, currency_id, date, ttype, journal_id, amount, context=context)
         for key in vals.keys():
             res[key].update(vals[key])
+        #TODO: onchange_partner_id() should not returns [pre_line, line_dr_ids, payment_rate...] for type sale, and not 
+        # [pre_line, line_cr_ids, payment_rate...] for type purchase.
+        # We should definitively split account.voucher object in two and make distinct on_change functions. In the 
+        # meanwhile, bellow lines must be there because the fields aren't present in the view, what crashes if the 
+        # onchange returns a value for them
+        print "TTYPE", ttype
+        if ttype == 'sale':
+            del(res['value']['line_dr_ids'])
+            del(res['value']['pre_line'])
+            del(res['value']['payment_rate'])
+        elif ttype == 'purchase':
+            del(res['value']['line_cr_ids'])
+            del(res['value']['pre_line'])
+            del(res['value']['payment_rate'])
         return res
 
     def recompute_voucher_lines(self, cr, uid, ids, partner_id, journal_id, price, currency_id, ttype, date, context=None):
@@ -588,7 +602,7 @@ class account_voucher(osv.osv):
 
         #set default values
         default = {
-            'value': {'line_ids': [] ,'line_dr_ids': [] ,'line_cr_ids': [] ,'pre_line': False,},
+            'value': {'line_dr_ids': [] ,'line_cr_ids': [] ,'pre_line': False,},
         }
 
         #drop existing lines
@@ -772,8 +786,10 @@ class account_voucher(osv.osv):
         if account_id and account_id.tax_ids:
             tax_id = account_id.tax_ids[0].id
 
-        vals = self.onchange_price(cr, uid, ids, line_ids, tax_id, partner_id, context)
-        vals['value'].update({'tax_id':tax_id,'amount': amount})
+        vals = {'value':{} }
+        if ttype in ('sale', 'purchase'):
+            vals = self.onchange_price(cr, uid, ids, line_ids, tax_id, partner_id, context)
+            vals['value'].update({'tax_id':tax_id,'amount': amount})
         currency_id = False
         if journal.currency:
             currency_id = journal.currency.id
diff --git a/addons/account_voucher/account_voucher_view.xml b/addons/account_voucher/account_voucher_view.xml
index 5e26c366778..f8bab444453 100644
--- a/addons/account_voucher/account_voucher_view.xml
+++ b/addons/account_voucher/account_voucher_view.xml
@@ -34,6 +34,7 @@
             </field>
         </record>
 
+        <!-- where and when is this view used?? -->
         <record model="ir.ui.view" id="view_voucher_form">
             <field name="name">account.voucher.form</field>
             <field name="model">account.voucher</field>
diff --git a/addons/account_voucher/test/account_voucher_report.yml b/addons/account_voucher/test/account_voucher_report.yml
index a87e4f0fc2a..60dc4103553 100644
--- a/addons/account_voucher/test/account_voucher_report.yml
+++ b/addons/account_voucher/test/account_voucher_report.yml
@@ -2,6 +2,7 @@
   Demo for Account Voucher
 -
   !record {model: account.voucher, id: account_voucher_voucheraxelor0again, view: view_sale_receipt_form}:
+    type: sale
     account_id: account.cash
     company_id: base.main_company
     journal_id: account.bank_journal
diff --git a/addons/account_voucher/voucher_sales_purchase_view.xml b/addons/account_voucher/voucher_sales_purchase_view.xml
index 38b0bbefd18..4c388730644 100644
--- a/addons/account_voucher/voucher_sales_purchase_view.xml
+++ b/addons/account_voucher/voucher_sales_purchase_view.xml
@@ -72,6 +72,7 @@
                     <h1><label for="number" string="Sale Receipt"/> <field name="number" class="oe_inline" readonly="1"/></h1>
                     <group>
                         <group>
+                            <field name="type" invisible="True"/>
                             <field name="partner_id" domain="[('customer','=',True)]" on_change="onchange_partner_id(partner_id, journal_id, amount, currency_id, type, date, context)" string="Customer" context="{'search_default_customer':1, 'show_address': 1}" options='{"always_reload": true}'/>
                             <field name="company_id" widget="selection" groups="base.group_multi_company"/>
                         </group>
@@ -83,7 +84,6 @@
                             <field name="paid_amount_in_company_currency" invisible="1"/>
                             <field name="currency_id" invisible="1"/>
                         </group>
-                        <field name="type" invisible="True"/>
                     </group>
                     <notebook>
                         <page string="Sales Information">
@@ -95,12 +95,6 @@
                                     <field name="account_analytic_id" groups="analytic.group_analytic_accounting"/>
                                 </tree>
                             </field>
-                            <!-- TODO: onchange_partner_id() should not returns [line_ids, pre_line, line_dr_ids...] for type sale, and not [line_ids, pre_line, line_cr_ids,...] for type purchase -->
-                            <!-- in the meanwhile, bellow lines must be there because the fields must be present in the view if the onchange returns a value for them-->
-                            <field name="pre_line" invisible="1"/>
-                            <field name="line_ids" invisible="1"/>
-                            <field name="payment_rate" invisible="1"/>
-                            <field name="line_dr_ids" invisible="1"/>
 			                <group>
                                 <field name="narration" placeholder="Internal Notes" nolabel="1"/>
                                 <group class="oe_subtotal_footer oe_right">
@@ -255,12 +249,6 @@
                                     <field name="account_analytic_id" groups="analytic.group_analytic_accounting"/>
                                 </tree>
                             </field>
-                            <!-- TODO: onchange_partner_id() should not returns [line_ids, pre_line, line_dr_ids...] for type sale, and not [line_ids, pre_line, line_cr_ids,...] for type purchase -->
-                            <!-- in the meanwhile, bellow lines must be there because the fields must be present in the view if the onchange returns a value for them-->
-                            <field name="pre_line" invisible="1"/>
-                            <field name="line_ids" invisible="1"/>
-                            <field name="payment_rate" invisible="1"/>
-                            <field name="line_cr_ids" invisible="1"/>
                             <group>
                                 <field name="narration" placeholder="Internal Notes" nolabel="1"/>
                                 <group class="oe_subtotal_footer oe_right">

From 8c4a842c3de9971f690e3d4d7911ca6146ab09df Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Fri, 5 Oct 2012 09:56:19 +0200
Subject: [PATCH 62/77] [FIX] analytic: bad syntax in domain expression

bzr revid: qdp-launchpad@openerp.com-20121005075619-c3xdk4mak49j62i0
---
 addons/analytic/analytic_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/analytic/analytic_view.xml b/addons/analytic/analytic_view.xml
index e434332f26b..0bb009e72b0 100644
--- a/addons/analytic/analytic_view.xml
+++ b/addons/analytic/analytic_view.xml
@@ -24,7 +24,7 @@
                                 <field name="partner_id" on_change="on_change_partner_id(partner_id, name)" attrs="{'required':[('type','=','contract')]}"/>
                                 <field name="manager_id"/>
                                 <field name="code"/>
-                                <field name="currency_id" attrs="{'invisible': ['|',('type', &lt;&gt;, 'view'), ('company_id', &lt;&gt;, False)]}"/>
+                                <field name="currency_id" attrs="{'invisible': ['|',('type', '&lt;&gt;', 'view'), ('company_id', '&lt;&gt;', False)]}"/>
                             </group>
                             <group>
                                 <field name="type"/>

From f2cc9b9f5e2c7d1f742bfea65842ded1ad139d65 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Fri, 5 Oct 2012 10:53:55 +0200
Subject: [PATCH 63/77] [FIX] account_payment: fixed error in yalm tests due to
 value returned for a field not present in the view

bzr revid: qdp-launchpad@openerp.com-20121005085355-92vao01nusvl1ik5
---
 .../account_payment_populate_statement.py      | 18 +++++++++---------
 addons/account_voucher/account_voucher.py      |  1 -
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/addons/account_payment/wizard/account_payment_populate_statement.py b/addons/account_payment/wizard/account_payment_populate_statement.py
index ecfd4988329..fffe6c17b92 100644
--- a/addons/account_payment/wizard/account_payment_populate_statement.py
+++ b/addons/account_payment/wizard/account_payment_populate_statement.py
@@ -86,24 +86,24 @@ class account_payment_populate_statement(osv.osv_memory):
                         'name': line.name,
                         'partner_id': line.partner_id.id,
                         'journal_id': statement.journal_id.id,
-                        'account_id': result.get('account_id', statement.journal_id.default_credit_account_id.id),
+                        'account_id': result['value'].get('account_id', statement.journal_id.default_credit_account_id.id),
                         'company_id': statement.company_id.id,
                         'currency_id': statement.currency.id,
                         'date': line.date or time.strftime('%Y-%m-%d'),
                         'amount': abs(amount),
-                        'period_id': statement.period_id.id
+                        'period_id': statement.period_id.id,
                 }
                 voucher_id = voucher_obj.create(cr, uid, voucher_res, context=context)
-                voucher_line_dict =  False
-                if result['value']['line_ids']:
-                    for line_dict in result['value']['line_ids']:
-                        move_line = move_line_obj.browse(cr, uid, line_dict['move_line_id'], context)
-                        if line.move_line_id.move_id.id == move_line.move_id.id:
-                            voucher_line_dict = line_dict
+
+                voucher_line_dict =  {}
+                for line_dict in result['value']['line_cr_ids'] + result['value']['line_dr_ids']:
+                    move_line = move_line_obj.browse(cr, uid, line_dict['move_line_id'], context)
+                    if line.move_line_id.move_id.id == move_line.move_id.id:
+                        voucher_line_dict = line_dict
+
                 if voucher_line_dict:
                     voucher_line_dict.update({'voucher_id': voucher_id})
                     voucher_line_obj.create(cr, uid, voucher_line_dict, context=context)
-
                 st_line_id = statement_line_obj.create(cr, uid, {
                     'name': line.order_id.reference or '?',
                     'amount': - amount,
diff --git a/addons/account_voucher/account_voucher.py b/addons/account_voucher/account_voucher.py
index 5f48a8020c4..423026251c2 100644
--- a/addons/account_voucher/account_voucher.py
+++ b/addons/account_voucher/account_voucher.py
@@ -552,7 +552,6 @@ class account_voucher(osv.osv):
         # We should definitively split account.voucher object in two and make distinct on_change functions. In the 
         # meanwhile, bellow lines must be there because the fields aren't present in the view, what crashes if the 
         # onchange returns a value for them
-        print "TTYPE", ttype
         if ttype == 'sale':
             del(res['value']['line_dr_ids'])
             del(res['value']['pre_line'])

From 1e14590784fad6debde410fd8325b1f55103e9d3 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Fri, 5 Oct 2012 11:15:16 +0200
Subject: [PATCH 64/77] [FIX] sale, sale_stock, sale_analytic_plans: fixed
 error in yalm tests or sale_mrp if sale_analytic_plans was installed before,
 due to value returned for a field not present in the view (project_id). Moved
 back onchange_shop_id into sale module from sale_stock

bzr revid: qdp-launchpad@openerp.com-20121005091516-y7typs1hep5exd3q
---
 addons/sale/sale.py                               | 10 ++++++++++
 addons/sale/sale_view.xml                         |  2 +-
 addons/sale_analytic_plans/sale_analytic_plans.py | 10 ++++++++++
 addons/sale_stock/sale_stock.py                   | 10 ----------
 4 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index d975eb2fabc..34f3c536917 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -50,6 +50,16 @@ class sale_order(osv.osv):
     _inherit = ['mail.thread', 'ir.needaction_mixin']
     _description = "Sales Order"
 
+    def onchange_shop_id(self, cr, uid, ids, shop_id, context=None):
+        v = {}
+        if shop_id:
+            shop = self.pool.get('sale.shop').browse(cr, uid, shop_id, context=context)
+            if shop.project_id.id:
+                v['project_id'] = shop.project_id.id
+            if shop.pricelist_id.id:
+                v['pricelist_id'] = shop.pricelist_id.id
+        return {'value': v}
+
     def copy(self, cr, uid, id, default=None, context=None):
         if not default:
             default = {}
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index fab994d89cf..3d63b99f66e 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -181,7 +181,7 @@
                         </group>
                         <group>
                             <field name="date_order"/>
-                            <field name="shop_id" invisible="1"/>
+                            <field name="shop_id" groups="base.extended" on_change="onchange_shop_id(shop_id, context)" widget="selection"/>
                             <field name="client_order_ref"/>
                             <field domain="[('type','=','sale')]" name="pricelist_id" groups="product.group_sale_pricelist" on_change="onchange_pricelist_id(pricelist_id,order_line)"/>
                         </group>
diff --git a/addons/sale_analytic_plans/sale_analytic_plans.py b/addons/sale_analytic_plans/sale_analytic_plans.py
index b8ccc44079d..32ddf4838e0 100644
--- a/addons/sale_analytic_plans/sale_analytic_plans.py
+++ b/addons/sale_analytic_plans/sale_analytic_plans.py
@@ -39,4 +39,14 @@ class sale_order_line(osv.osv):
 
 sale_order_line()
 
+class sale_order(osv.osv):
+    _inherit = "sale.order"
+
+    def onchange_shop_id(self, cr, uid, ids, shop_id, context=None):
+        # Remove the project_id from the result of super() call, if any, as this field is not in the view anymore
+        res = super(sale_order, self).onchange_shop_id(cr, uid, ids, shopd_id, context=context)
+        if res.get('value',{}).get('project_id'):
+            del(res['value']['porject_id'])
+        return {'value': res}
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/sale_stock/sale_stock.py b/addons/sale_stock/sale_stock.py
index 51e0b23656e..ce6894318c4 100644
--- a/addons/sale_stock/sale_stock.py
+++ b/addons/sale_stock/sale_stock.py
@@ -165,16 +165,6 @@ class sale_order(osv.osv):
 
         return osv.osv.unlink(self, cr, uid, unlink_ids, context=context)
 
-    def onchange_shop_id(self, cr, uid, ids, shop_id):
-        v = {}
-        if shop_id:
-            shop = self.pool.get('sale.shop').browse(cr, uid, shop_id)
-            v['project_id'] = shop.project_id.id
-            # Que faire si le client a une pricelist a lui ?
-            if shop.pricelist_id.id:
-                v['pricelist_id'] = shop.pricelist_id.id
-        return {'value': v}
-
     def action_view_delivery(self, cr, uid, ids, context=None):
         '''
         This function returns an action that display existing delivery orders of given sale order ids. It can either be a in a list or in a form view, if there is only one delivery order to show.

From dcb8a9e44182e766d80f5a36ea368a66654a23fd Mon Sep 17 00:00:00 2001
From: "vta vta@openerp.com" <>
Date: Fri, 5 Oct 2012 13:30:46 +0200
Subject: [PATCH 65/77] [FIX] Fixed more r.result issues.

bzr revid: vta@openerp.com-20121005113046-mwgb0pvm4bcgf875
---
 addons/web/controllers/main.py     | 2 +-
 addons/web/static/src/js/chrome.js | 8 ++++----
 addons/web/static/src/js/views.js  | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

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):
diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js
index 01bfb63a580..fe5812a9dd9 100644
--- a/addons/web/static/src/js/chrome.js
+++ b/addons/web/static/src/js/chrome.js
@@ -886,8 +886,8 @@ instance.web.UserMenu =  instance.web.Widget.extend({
         var self = this;
         if (!this.getParent().has_uncommitted_changes()) {
             self.rpc("/web/action/load", { action_id: "base.action_res_users_my" }, function(result) {
-                result.result.res_id = instance.session.uid;
-                self.getParent().action_manager.do_action(result.result);
+                result.res_id = instance.session.uid;
+                self.getParent().action_manager.do_action(result);
             });
         }
     },
@@ -1121,7 +1121,7 @@ instance.web.WebClient = instance.web.Client.extend({
         var self = this;
         return this.rpc("/web/action/load", { action_id: options.action_id })
             .pipe(function (result) {
-                var action = result.result;
+                var action = result;
                 if (options.needaction) {
                     action.context.search_default_needaction_pending = true;
                 }
@@ -1166,7 +1166,7 @@ instance.web.EmbeddedClient = instance.web.Client.extend({
         return $.when(this._super()).pipe(function() {
             return instance.session.session_authenticate(self.dbname, self.login, self.key, true).pipe(function() {
                 return self.rpc("/web/action/load", { action_id: self.action_id }, function(result) {
-                    var action = result.result;
+                    var action = result;
                     action.flags = _.extend({
                         //views_switcher : false,
                         search_view : false,
diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js
index 99f4d3e35e8..a166865476a 100644
--- a/addons/web/static/src/js/views.js
+++ b/addons/web/static/src/js/views.js
@@ -231,7 +231,7 @@ instance.web.ActionManager = instance.web.Widget.extend({
         } 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, on_reverse_breadcrumb);
+                return self.do_action(result, on_close, clear_breadcrumbs, on_reverse_breadcrumb);
             });
         }
         if (!action.type) {
@@ -1223,7 +1223,7 @@ instance.web.View = instance.web.Widget.extend({
         };
 
         if (action_data.special) {
-            return handler({result: {"type":"ir.actions.act_window_close"}});
+            return handler({"type":"ir.actions.act_window_close"});
         } else if (action_data.type=="object") {
             var args = [[record_id]], additional_args = [];
             if (action_data.args) {

From 5677716100f81621f1b16300dd2fa972dd377dbd Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Fri, 5 Oct 2012 11:19:13 +0200
Subject: [PATCH 66/77] [IMP] minor modification in field reference

bzr revid: nicolas.vanhoren@openerp.com-20121005091913-35dxdxb3q315mcp1
---
 addons/web/static/src/js/view_form.js | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index 4d69e07489a..23077d19ad3 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -4601,18 +4601,14 @@ instance.web.form.FieldReference = instance.web.form.AbstractField.extend(instan
         }
     },
     destroy_content: function() {
-        if (this.selection) {
-            this.selection.destroy();
-            this.selection = undefined;
-        }
-        if (this.m2o) {
-            this.m2o.destroy();
-            this.m2o = undefined;
+        if (this.fm) {
+            this.fm.destroy();
         }
     },
     initialize_content: function() {
         var self = this;
         var fm = new instance.web.form.DefaultFieldManager(this);
+        this.fm = fm;
         fm.extend_field_desc({
             "selection": {
                 selection: this.field_manager.get_field_desc(this.name).selection,

From cd55ed1a0888e445635ecfb823a6eec2e528732f Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Fri, 5 Oct 2012 11:28:21 +0200
Subject: [PATCH 67/77] [FIX] sale_mrp: error in yaml test

bzr revid: qdp-launchpad@openerp.com-20121005092821-hdljhcpjb1wrz290
---
 addons/sale_mrp/test/sale_mrp.yml | 25 ++++++-------------------
 1 file changed, 6 insertions(+), 19 deletions(-)

diff --git a/addons/sale_mrp/test/sale_mrp.yml b/addons/sale_mrp/test/sale_mrp.yml
index 0962e1fa1ff..6fd64301af2 100644
--- a/addons/sale_mrp/test/sale_mrp.yml
+++ b/addons/sale_mrp/test/sale_mrp.yml
@@ -117,26 +117,13 @@
     proc_ids = self.search(cr, uid, [('origin','=',so.name) and ('state','=','running')])
     assert proc_ids, _('Procurement is not in the running state!')
 -
-  I verify that a manufacturing order has been generated
+  I verify that a manufacturing order has been generated, and that its name and reference are correct
 -
   !python {model: sale.order}: |
+    mnf_obj = self.pool.get('mrp.production')
     so = self.browse(cr, uid, ref("sale_order_so0"))
-    mnf_obj=self.pool.get('mrp.production')
-    mnf_id=mnf_obj.search(cr, uid, [('origin','=',so.name)])
+    mnf_id = mnf_obj.search(cr, uid, [('origin','=',so.name)])
     assert mnf_id, _('Manufacturing order has not been generated')
--
-  I verify that a 'Sale Name' field of Manufacturing order gets bind with the value
--
-  !python {model: sale.order}: |
-    so = self.browse(cr, uid, ref("sale_order_so0"))
-    mnf_obj=self.pool.get('mrp.production')
-    mnf_id=mnf_obj.search(cr, uid, [('sale_name','=',so.name)])
-    assert mnf_id, _('Sale Name is not bind with the value')
--
-  I verify that a 'Sale Reference' field of Manufacturing order gets bind with the value
--
-  !python {model: sale.order}: |
-    so = self.browse(cr, uid, ref("sale_order_so0"))
-    mnf_obj=self.pool.get('mrp.production')
-    mnf_id=mnf_obj.search(cr, uid, [('sale_ref','=',so.client_order_ref)])
-    assert mnf_id, _('Sale Reference is not bind with the value')
+    mo = mnf_obj.browse(cr, uid, mnf_id)[0]
+    assert mo.sale_name == so.name, 'Wrong Name for the Manufacturing Order. Expected %s, Got %s' % (so.name, mo.name)
+    assert mo.sale_ref == so.client_order_ref, 'Wrong Sale Reference for the Manufacturing Order'

From 8f9a8c547864976846ac91941f548a1acccb2956 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Fri, 5 Oct 2012 11:36:54 +0200
Subject: [PATCH 68/77] [FIX] sale_analytic_plans: typo

bzr revid: qdp-launchpad@openerp.com-20121005093654-uiwdyhfd6wb5syyz
---
 addons/sale_analytic_plans/sale_analytic_plans.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/sale_analytic_plans/sale_analytic_plans.py b/addons/sale_analytic_plans/sale_analytic_plans.py
index 32ddf4838e0..a16a0078f9f 100644
--- a/addons/sale_analytic_plans/sale_analytic_plans.py
+++ b/addons/sale_analytic_plans/sale_analytic_plans.py
@@ -44,7 +44,7 @@ class sale_order(osv.osv):
 
     def onchange_shop_id(self, cr, uid, ids, shop_id, context=None):
         # Remove the project_id from the result of super() call, if any, as this field is not in the view anymore
-        res = super(sale_order, self).onchange_shop_id(cr, uid, ids, shopd_id, context=context)
+        res = super(sale_order, self).onchange_shop_id(cr, uid, ids, shop_id, context=context)
         if res.get('value',{}).get('project_id'):
             del(res['value']['porject_id'])
         return {'value': res}

From bf6a041ce5aea6baa445af50c5b6ef37c9783eaf Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Fri, 5 Oct 2012 12:06:33 +0200
Subject: [PATCH 69/77] [FIX] sale_analytic_plans: fixed onchange_shop_id()

bzr revid: qdp-launchpad@openerp.com-20121005100633-ryfhjv3gz54m9a2l
---
 addons/sale_analytic_plans/sale_analytic_plans.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/sale_analytic_plans/sale_analytic_plans.py b/addons/sale_analytic_plans/sale_analytic_plans.py
index a16a0078f9f..872e8b0bffc 100644
--- a/addons/sale_analytic_plans/sale_analytic_plans.py
+++ b/addons/sale_analytic_plans/sale_analytic_plans.py
@@ -46,7 +46,7 @@ class sale_order(osv.osv):
         # Remove the project_id from the result of super() call, if any, as this field is not in the view anymore
         res = super(sale_order, self).onchange_shop_id(cr, uid, ids, shop_id, context=context)
         if res.get('value',{}).get('project_id'):
-            del(res['value']['porject_id'])
-        return {'value': res}
+            del(res['value']['project_id'])
+        return res
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

From 3d6a06a319883c3ebb6255a1cac981592f5cb296 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Fri, 5 Oct 2012 12:12:35 +0200
Subject: [PATCH 70/77] [IMP] small improvement to default field manager

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

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index 23077d19ad3..b9612eba65d 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -1578,6 +1578,10 @@ instance.web.form.DefaultFieldManager = instance.web.Widget.extend({
         this._super(parent);
         this.field_descs = {};
         this.eval_context = eval_context || {};
+        this.set({
+            display_invalid_fields: false,
+            actual_mode: 'create',
+        });
     },
     get_field_desc: function(field_name) {
         if (this.field_descs[field_name] === undefined) {

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 71/77] [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:

From a4fbe4dec890a208250cd506b0add6eb0afd0292 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Fri, 5 Oct 2012 13:48:46 +0200
Subject: [PATCH 72/77] [IMP] improved modifiers calculus

bzr revid: nicolas.vanhoren@openerp.com-20121005114846-ddc3fqpftu3k8iob
---
 addons/web/static/src/js/view_form.js | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index b9612eba65d..3fbd089e166 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -1784,11 +1784,13 @@ instance.web.form.FormWidget = instance.web.Widget.extend(instance.web.form.Invi
 
         this.field_manager.on("view_content_has_changed", this, this.process_modifiers);
 
-        this.set({required: this.modifiers['required'] === true});
+        this.set({
+            required: false,
+            readonly: false,
+        });
         // some events to make the property "effective_readonly" sync automatically with "readonly" and
         // "mode" on field_manager
         var self = this;
-        this.set({"readonly": this.modifiers['readonly'] === true});
         var test_effective_readonly = function() {
             self.set({"effective_readonly": self.get("readonly") || self.field_manager.get("actual_mode") === "view"});
         };
@@ -1797,6 +1799,7 @@ instance.web.form.FormWidget = instance.web.Widget.extend(instance.web.form.Invi
         test_effective_readonly.call(this);
     },
     renderElement: function() {
+        this.process_modifiers();
         this._super();
         this.$el.addClass(this.node.attrs["class"] || "");
     },
@@ -3979,6 +3982,7 @@ instance.web.form.FieldMany2Many = instance.web.form.AbstractField.extend({
     disable_utility_classes: true,
     init: function(field_manager, node) {
         this._super(field_manager, node);
+        this.set({"value": []});
         this.is_loaded = $.Deferred();
         this.initial_is_loaded = this.is_loaded;
         this.is_setted = $.Deferred();

From 6046f9f226691d4a9fa65465f7e859b288e652b1 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Fri, 5 Oct 2012 14:06:53 +0200
Subject: [PATCH 73/77] [REF] yaml_import: comments refactoring

bzr revid: qdp-launchpad@openerp.com-20121005120653-jyq8352trvki24uc
---
 openerp/tools/yaml_import.py | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/openerp/tools/yaml_import.py b/openerp/tools/yaml_import.py
index 029e6d2c798..7e1c7152b0f 100644
--- a/openerp/tools/yaml_import.py
+++ b/openerp/tools/yaml_import.py
@@ -328,17 +328,16 @@ class YamlInterpreter(object):
                 self.cr.commit()
 
     def _create_record(self, model, fields, view_info=False, parent={}, default=True):
-        """
-        This function process the !record tag in yalm files. It simulates the record creation through an xml
-        view (either specified on the !record tag or the default one for this object), including the calls to
-        on_change() functions.
-        :param model: browseable object
-        :param fields: dictonary mapping the field names and their values
-        :param view_info: result of fields_view_get() called on the object
-        :param parent: dictionary containing the values already computed for the parent, in case of one2many fields
-        :param default: boolean flag depicting if the default values must be processed too or not
-        :return: dictionary mapping the field names and their values, ready to use when calling the create() function
-        :rtype: dict
+        """This function processes the !record tag in yalm files. It simulates the record creation through an xml
+            view (either specified on the !record tag or the default one for this object), including the calls to
+            on_change() functions.
+            :param model: model instance
+            :param fields: dictonary mapping the field names and their values
+            :param view_info: result of fields_view_get() called on the object
+            :param parent: dictionary containing the values already computed for the parent, in case of one2many fields
+            :param default: if True, the default values must be processed too or not
+            :return: dictionary mapping the field names and their values, ready to use when calling the create() function
+            :rtype: dict
         """
         def process_val(key, val):
             if fg[key]['type']=='many2one':
@@ -358,6 +357,7 @@ class YamlInterpreter(object):
             # gather the default values on the object. (Can't use `fields´ as parameter instead of {} because we may
             # have references like `base.main_company´ in the yaml file and it's not compatible with the function)
             defaults = default and model._add_missing_default_values(self.cr, SUPERUSER_ID, {}, context=self.context) or {}
+
             # copy the default values in record_dict, only if they are in the view (because that's what the client does)
             # the other default values will be added later on by the create().
             record_dict = dict([(key, val) for key, val in defaults.items() if key in fg])

From 050f8daa8c2c37df585e04f6175c050de6bfed7f Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Fri, 5 Oct 2012 15:55:28 +0200
Subject: [PATCH 74/77] [FIX] problem with calculation of modifiers

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

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index 3fbd089e166..3319177d325 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -1212,7 +1212,7 @@ instance.web.form.FormRenderingEngine = instance.web.form.FormRenderingEngineInt
 
         this.$form.appendTo(this.$target);
 
-        _.each(this.fields_to_init, function($elem) {
+        var ws = _.map(this.fields_to_init, function($elem) {
             var name = $elem.attr("name");
             if (!self.fvg.fields[name]) {
                 throw new Error("Field '" + name + "' specified in view could not be found.");
@@ -1228,7 +1228,10 @@ instance.web.form.FormRenderingEngine = instance.web.form.FormRenderingEngineInt
             }
             self.alter_field(w);
             self.view.register_field(w, $elem.attr("name"));
-            w.replace($elem);
+            return [w, $elem];
+        });
+        _.each(ws, function(w) {
+            w[0].replace(w[1]);
         });
         _.each(this.tags_to_init, function($elem) {
             var tag_name = $elem[0].tagName.toLowerCase();

From a280aa6d81288bed3bf7756c20826153a3a4c69f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20van=20der=20Essen?= <fva@openerp.com>
Date: Fri, 5 Oct 2012 16:08:31 +0200
Subject: [PATCH 75/77] [FIX] removed blue background for readonly fields,
 fixed css errors as reported by firefox

bzr revid: fva@openerp.com-20121005140831-ssp03115gu7zy1ge
---
 addons/web/static/src/css/base.css                  | 2 +-
 addons/web/static/src/css/base.sass                 | 2 +-
 addons/web_calendar/static/src/css/web_calendar.css | 1 -
 addons/web_diagram/static/src/css/base_diagram.css  | 2 +-
 4 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index 165c893933c..14496fe3522 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -2246,7 +2246,7 @@
 .openerp .oe_form .oe_datepicker_root {
   display: inline-block;
 }
-.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]) {
+.openerp .oe_form .oe_form_required input:not([disabled]):not([readonly]), .openerp .oe_form .oe_form_required select:not([disabled]):not([readonly]), .openerp .oe_form .oe_form_required textarea:not([disabled]):not([readonly]) {
   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 68446cf777b..784f93d94cf 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -1780,7 +1780,7 @@ $sheet-max-width: 860px
         .oe_datepicker_root
             display: inline-block
         .oe_form_required 
-            input:not([disabled]), select:not([disabled]), textarea:not([disabled])
+            input:not([disabled]):not([readonly]), select:not([disabled]):not([readonly]), textarea:not([disabled]):not([readonly])
                 background-color: #D2D2FF !important
         .oe_form_invalid
             input, select, textarea
diff --git a/addons/web_calendar/static/src/css/web_calendar.css b/addons/web_calendar/static/src/css/web_calendar.css
index 52ea63e787e..9cfc2f777bd 100644
--- a/addons/web_calendar/static/src/css/web_calendar.css
+++ b/addons/web_calendar/static/src/css/web_calendar.css
@@ -997,7 +997,6 @@ div.openerp .dhx_cal_editor textarea {
 }
 .openerp .dhx_cal_event_selected{
     background-color: #757575;
-    color: ffffff;
 }
 /* Agenda week end */
 .openerp .dhx_scale_bar_header {
diff --git a/addons/web_diagram/static/src/css/base_diagram.css b/addons/web_diagram/static/src/css/base_diagram.css
index 8d0a418f52e..6de8b5deb8a 100644
--- a/addons/web_diagram/static/src/css/base_diagram.css
+++ b/addons/web_diagram/static/src/css/base_diagram.css
@@ -49,5 +49,5 @@
     -ms-user-select: none;
     -o-user-select: none;
     user-select: none;
-};
+}
 

From 46c83756dad86dfea2391bd33e5c5c4d09fac800 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Fri, 5 Oct 2012 16:36:06 +0200
Subject: [PATCH 76/77] [FIX] analytic: fix crash when trying to set
 currency_id to False in an analytic account

bzr revid: qdp-launchpad@openerp.com-20121005143606-1evrpd8g3drg0v8m
---
 addons/analytic/analytic.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/addons/analytic/analytic.py b/addons/analytic/analytic.py
index d71b480f799..1ce483a26cd 100644
--- a/addons/analytic/analytic.py
+++ b/addons/analytic/analytic.py
@@ -125,7 +125,8 @@ class account_analytic_account(osv.osv):
             if account.company_id:
                 if account.company_id.currency_id.id != value:
                     raise osv.except_osv(_('Error!'), _("If you set a company, the currency selected has to be the same as it's currency. \nYou can remove the company belonging, and thus change the currency, only on analytic account of type 'view'. This can be really usefull for consolidation purposes of several companies charts with different currencies, for example."))
-        return cr.execute("""update account_analytic_account set currency_id=%s where id=%s""", (value, account.id, ))
+        if value:
+            return cr.execute("""update account_analytic_account set currency_id=%s where id=%s""", (value, account.id, ))
 
     def _currency(self, cr, uid, ids, field_name, arg, context=None):
         result = {}

From 5e31fdf8a2684d2c645f57ce8f8baa8e79bba85b Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Mon, 8 Oct 2012 09:32:09 +0200
Subject: [PATCH 77/77] [IMP] wizard messages

bzr revid: fp@tinyerp.com-20121008073209-53rvs8dp5o3vxmb8
---
 addons/account/wizard/account_invoice_state_view.xml | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/addons/account/wizard/account_invoice_state_view.xml b/addons/account/wizard/account_invoice_state_view.xml
index 11703a4f259..eb636f61b50 100644
--- a/addons/account/wizard/account_invoice_state_view.xml
+++ b/addons/account/wizard/account_invoice_state_view.xml
@@ -6,7 +6,12 @@
             <field name="model">account.invoice.confirm</field>
             <field name="arch" type="xml">
                 <form string="Confirm Draft Invoices" version="7.0">
-                    <separator string="Confirm Draft Invoices"/>
+                    <p class="oe_grey">
+                        Once draft invoices are confirmed, you will not be able
+                        to modify them. The invoices will receive a unique
+                        number and journal items will be created in your chart
+                        of accounts.
+                    </p>
                     <footer>
                         <button string="Confirm Invoices" name="invoice_confirm" type="object" default_focus="1" class="oe_highlight"/>
                         or
@@ -27,7 +32,6 @@
             <field name="model">account.invoice.cancel</field>
             <field name="arch" type="xml">
                 <form string="Cancel Selected Invoices" version="7.0">
-                    <separator string="Cancel Selected Invoices"/>
                     <footer>
                         <button string="Cancel Invoices" name="invoice_cancel" type="object" default_focus="1" class="oe_highlight"/>
                         or