[MERGE] [IMP] misc usability improvements

- account: add a name when invoking some journal items views
- calendar: removed an editable in event.type tree view
- phonecalls: removed default searchs in logged / scheduled calls actions, using domain instead; small fix in meeting creation from a phonecall, use partner_ids instead of partner_id
- report_webkit: some menu reordering

bzr revid: tde@openerp.com-20140212102113-torfdhfw2hajpuvm
This commit is contained in:
Thibault Delavallée 2014-02-12 11:21:13 +01:00
commit 42a66f6a72
6 changed files with 12 additions and 7 deletions

View File

@ -495,6 +495,7 @@ class account_bank_statement(osv.osv):
ctx = (context or {}).copy() ctx = (context or {}).copy()
ctx['journal_id'] = self.browse(cr, uid, ids[0], context=context).journal_id.id ctx['journal_id'] = self.browse(cr, uid, ids[0], context=context).journal_id.id
return { return {
'name': _('Journal Items'),
'view_type':'form', 'view_type':'form',
'view_mode':'tree', 'view_mode':'tree',
'res_model':'account.move.line', 'res_model':'account.move.line',

View File

@ -352,6 +352,7 @@ class account_asset_asset(osv.osv):
context = {} context = {}
context.update({'search_default_asset_id': ids, 'default_asset_id': ids}) context.update({'search_default_asset_id': ids, 'default_asset_id': ids})
return { return {
'name': _('Journal Items'),
'view_type': 'form', 'view_type': 'form',
'view_mode': 'tree,form', 'view_mode': 'tree,form',
'res_model': 'account.move.line', 'res_model': 'account.move.line',

View File

@ -9,7 +9,7 @@
<field name="name">Meeting Types Tree</field> <field name="name">Meeting Types Tree</field>
<field name="model">calendar.event.type</field> <field name="model">calendar.event.type</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<tree string="Meeting Types" editable="bottom"> <tree string="Meeting Types">
<field name="name"/> <field name="name"/>
</tree> </tree>
</field> </field>

View File

@ -264,14 +264,16 @@ class crm_phonecall(osv.osv):
Open meeting's calendar view to schedule a meeting on current phonecall. Open meeting's calendar view to schedule a meeting on current phonecall.
:return dict: dictionary value for created meeting view :return dict: dictionary value for created meeting view
""" """
partner_ids = []
phonecall = self.browse(cr, uid, ids[0], context) 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 = self.pool.get('ir.actions.act_window').for_xml_id(cr, uid, 'calendar', 'action_calendar_event', context)
res['context'] = { res['context'] = {
'default_phonecall_id': phonecall.id, '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_user_id': uid,
'default_email_from': phonecall.email_from, 'default_email_from': phonecall.email_from,
'default_state': 'open',
'default_name': phonecall.name, 'default_name': phonecall.name,
} }
return res return res

View File

@ -58,7 +58,7 @@
<field name="view_mode">tree,calendar</field> <field name="view_mode">tree,calendar</field>
<field name="view_id" ref="crm_case_inbound_phone_tree_view"/> <field name="view_id" ref="crm_case_inbound_phone_tree_view"/>
<field name="domain">[]</field> <field name="domain">[]</field>
<field name="context">{'default_state': 'done'}</field> <field name="context">{}</field>
<field name="search_view_id" ref="crm.view_crm_case_phonecalls_filter"/> <field name="search_view_id" ref="crm.view_crm_case_phonecalls_filter"/>
<field name="help" type="html"> <field name="help" type="html">
<p class="oe_view_nocontent_create"> <p class="oe_view_nocontent_create">
@ -106,7 +106,7 @@
<field name="view_mode">tree,calendar</field> <field name="view_mode">tree,calendar</field>
<field name="view_id" ref="crm_case_phone_tree_view"/> <field name="view_id" ref="crm_case_phone_tree_view"/>
<field name="domain">[('state','!=','done')]</field> <field name="domain">[('state','!=','done')]</field>
<field name="context" eval="'{\'default_state\':\'open\'}'"/> <field name="context">{}</field>
<field name="search_view_id" ref="crm.view_crm_case_phonecalls_filter"/> <field name="search_view_id" ref="crm.view_crm_case_phonecalls_filter"/>
<field name="help" type="html"> <field name="help" type="html">
<p class="oe_view_nocontent_create"> <p class="oe_view_nocontent_create">

View File

@ -48,7 +48,8 @@
<field name="view_type">form</field> <field name="view_type">form</field>
<field name="view_mode">tree,form</field> <field name="view_mode">tree,form</field>
</record> </record>
<menuitem action="action_header_img" id="menu_header_img" parent="base.menu_custom" sequence="14"/> <menuitem id="menu_webkit" name="Webkit" parent="base.menu_custom"/>
<menuitem action="action_header_img" id="menu_header_img" parent="menu_webkit" sequence="14"/>
<record id="action_header_webkit" model="ir.actions.act_window"> <record id="action_header_webkit" model="ir.actions.act_window">
<field name="name">Webkit Headers/Footers</field> <field name="name">Webkit Headers/Footers</field>
@ -56,7 +57,7 @@
<field name="view_type">form</field> <field name="view_type">form</field>
<field name="view_mode">tree,form</field> <field name="view_mode">tree,form</field>
</record> </record>
<menuitem action="action_header_webkit" id="menu_header_webkit" parent="base.menu_custom" sequence="14"/> <menuitem action="action_header_webkit" id="menu_header_webkit" parent="menu_webkit" sequence="14"/>
</data> </data>
</openerp> </openerp>