diff --git a/addons/account/account_bank_statement.py b/addons/account/account_bank_statement.py index d437074023a..cf8bb5133fd 100644 --- a/addons/account/account_bank_statement.py +++ b/addons/account/account_bank_statement.py @@ -495,6 +495,7 @@ class account_bank_statement(osv.osv): ctx = (context or {}).copy() ctx['journal_id'] = self.browse(cr, uid, ids[0], context=context).journal_id.id return { + 'name': _('Journal Items'), 'view_type':'form', 'view_mode':'tree', 'res_model':'account.move.line', diff --git a/addons/account_asset/account_asset.py b/addons/account_asset/account_asset.py index 6792682fdbe..f4e5d17a8e0 100644 --- a/addons/account_asset/account_asset.py +++ b/addons/account_asset/account_asset.py @@ -352,6 +352,7 @@ class account_asset_asset(osv.osv): context = {} context.update({'search_default_asset_id': ids, 'default_asset_id': ids}) return { + 'name': _('Journal Items'), 'view_type': 'form', 'view_mode': 'tree,form', 'res_model': 'account.move.line', diff --git a/addons/calendar/calendar_view.xml b/addons/calendar/calendar_view.xml index 01c4b596592..ddcf41af352 100644 --- a/addons/calendar/calendar_view.xml +++ b/addons/calendar/calendar_view.xml @@ -9,7 +9,7 @@ Meeting Types Tree calendar.event.type - + diff --git a/addons/crm/crm_phonecall.py b/addons/crm/crm_phonecall.py index 71654912ac0..19bc98c585a 100644 --- a/addons/crm/crm_phonecall.py +++ b/addons/crm/crm_phonecall.py @@ -264,14 +264,16 @@ class crm_phonecall(osv.osv): Open meeting's calendar view to schedule a meeting on current phonecall. :return dict: dictionary value for created meeting view """ + partner_ids = [] phonecall = self.browse(cr, uid, ids[0], context) + if phonecall.partner_id and phonecall.partner_id.email: + partner_ids.append(phonecall.partner_id.id) res = self.pool.get('ir.actions.act_window').for_xml_id(cr, uid, 'calendar', 'action_calendar_event', context) res['context'] = { 'default_phonecall_id': phonecall.id, - 'default_partner_id': phonecall.partner_id and phonecall.partner_id.id or False, + 'default_partner_ids': partner_ids, 'default_user_id': uid, 'default_email_from': phonecall.email_from, - 'default_state': 'open', 'default_name': phonecall.name, } return res diff --git a/addons/crm/crm_phonecall_menu.xml b/addons/crm/crm_phonecall_menu.xml index 294e2b1702d..6380f80c89f 100644 --- a/addons/crm/crm_phonecall_menu.xml +++ b/addons/crm/crm_phonecall_menu.xml @@ -58,7 +58,7 @@ tree,calendar [] - {'default_state': 'done'} + {}

@@ -106,7 +106,7 @@ tree,calendar [('state','!=','done')] - + {}

diff --git a/addons/report_webkit/header_view.xml b/addons/report_webkit/header_view.xml index 30407f89385..833e813ba4e 100644 --- a/addons/report_webkit/header_view.xml +++ b/addons/report_webkit/header_view.xml @@ -48,7 +48,8 @@ form tree,form - + + Webkit Headers/Footers @@ -56,7 +57,7 @@ form tree,form - +