[MERGE] bug fix

bzr revid: sbh@tinyerp.com-20101125112805-gndlscrzeqikdxxb

addons/crm/crm_phonecall_view.xml

@@ -33,7 +33,7 @@
                 <field name="user_id"/>
                 <field name="categ_id" string="Type"/>
                 <field name="create_date" invisible="1"/>
-                <button string="Opportunity"
+                <button string="Convert to Opportunity"
                     name="%(phonecall2opportunity_act)d"
                     states="draft,open,pending"
                     icon="gtk-index"
@@ -213,7 +213,7 @@
                     icon="terp-call-start"
                     name="%(phonecall_to_phonecall_act)d"
                     type="action"  />
-                <button string="Opportunity"
+                <button string="Convert to Opportunity"
                     name="%(phonecall2opportunity_act)d"
                     states="draft,open,pending"
                     icon="gtk-index"

addons/mail_gateway/mail_gateway.py

@@ -200,7 +200,8 @@ class mailgate_message(osv.osv):
                 action_data = action_pool.read(cr, uid, action_ids[0], context=context)
                 action_data.update({
                     'domain' : "[('id','=',%d)]"%(res_id),
-                    'nodestroy': True
+                    'nodestroy': True,
+                    'context': {}
                     })
         return action_data
 

addons/mail_gateway/res_partner.py

@@ -26,7 +26,7 @@ class res_partner(osv.osv):
     _inherit = 'res.partner'
     _columns = {
         'emails': fields.one2many('mailgate.message', 'partner_id',\
-                                        'Emails', readonly=True),
+                                        'Emails', readonly=True, domain=[('history','=',True)]),
     }
 
 res_partner()

addons/mail_gateway/res_partner_view.xml

@@ -11,7 +11,7 @@
             <field name="inherit_id" ref="base.view_partner_form"/>
             <field name="arch" type="xml">
                  <page string="History" position="inside">
-                      <field name="emails" colspan="4" nolabel="1" domain="[('history', '=', True)]"/>
+                      <field name="emails" colspan="4" nolabel="1"/>
                  </page>
             </field>
        </record>