Merge remote-tracking branch 'odoo/7.0' into 7.0

Conflicts: addons/analytic/analytic_view.xml
OCA · Mar 4, 2015 · 44a991a · 44a991a
2 parents 9f40468 + 56f3f01
commit 44a991a
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/addons/analytic/analytic_view.xml b/addons/analytic/analytic_view.xml
@@ -29,7 +29,7 @@
                                 <field name="type" invisible="context.get('default_type', False)"/>
                                 <field name="template_id" on_change="on_change_template(template_id,context)" domain="[('type','=','template')]" attrs="{'invisible': [('type','in',['view', 'normal','template'])]}" context="{'default_type' : 'template'}"/>
                                 <field name="code"/>
-                                <field name="parent_id" on_change="on_change_parent(parent_id)"/>
+                                <field name="parent_id" on_change="on_change_parent(parent_id)" />
                                 <field name="company_id" on_change="on_change_company(company_id)" widget="selection" groups="base.group_multi_company" attrs="{'required': [('type','&lt;&gt;','view')]}"/>
                             </group>
                         </group>

diff --git a/addons/board/board.py b/addons/board/board.py
@@ -23,7 +23,7 @@
 from operator import itemgetter
 from textwrap import dedent
 
-from openerp import tools
+from openerp import tools, SUPERUSER_ID
 from openerp.osv import fields, osv
 
 class board_board(osv.osv):
@@ -144,7 +144,7 @@ def board_create(self, cr, uid, ids, context=None):
             ''')
         }, context=context)
 
-        menu_id = self.pool.get('ir.ui.menu').create(cr, uid, {
+        menu_id = self.pool.get('ir.ui.menu').create(cr, SUPERUSER_ID, {
             'name': this.name,
             'parent_id': this.menu_parent_id.id,
             'action': 'ir.actions.act_window,%s' % (action_id,)

diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py
@@ -349,6 +349,7 @@ def on_change_partner(self, cr, uid, ids, partner_id, context=None):
             partner = self.pool.get('res.partner').browse(cr, uid, partner_id, context=context)
             values = {
                 'partner_name' : partner.name,
+                'title': partner.title and partner.title.id or False,
                 'street' : partner.street,
                 'street2' : partner.street2,
                 'city' : partner.city,
@@ -359,6 +360,7 @@ def on_change_partner(self, cr, uid, ids, partner_id, context=None):
                 'mobile' : partner.mobile,
                 'fax' : partner.fax,
                 'zip': partner.zip,
+                'function': partner.function,
             }
         return {'value' : values}