Merge lp:~openerp-dev/openobject-addons/trunk-bug-900239-kjo into lp:openobject-addons

[Kuldeep Joshi(OpenERP)]

Change the tree and search view by adding the mail_server_id field

[Bhumika Shrimali (sbh-openerp)]

review: Approve

[Fabien (Open ERP) (fp-tinyerp)]

you should have added invisible="1". I fixed it.

review: Disapprove

=== modified file 'email_template/email_template_view.xml'
--- email_template/email_template_view.xml	2011-11-05 01:59:22 +0000
+++ email_template/email_template_view.xml	2011-12-06 06:21:06 +0000
@@ -110,6 +110,7 @@
             <field name="arch" type="xml">
                 <tree string="Templates">
                     <field name="model_id"/>
+                    <field name="mail_server_id"/>
                     <field name="name"/>
                     <field name="subject"/>
                     <field name="email_from"/>
@@ -138,7 +139,7 @@
                     </group>
                     <newline/>
                     <group expand="0" string="Group by...">
-                        <filter string="SMTP Server" domain="[]" context="{'group_by':'smtp_server_id'}" icon="terp-folder-orange"/>
+                        <filter string="SMTP Server" domain="[]" context="{'group_by':'mail_server_id'}" icon="terp-folder-orange"/>
                         <separator orientation="vertical"/>
                         <filter string="Model" domain="[]" context="{'group_by':'model_id'}" icon="terp-accessories-archiver"/>
                     </group>