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

Proposed by Kuldeep Joshi(OpenERP)
Status: Merged
Merged at revision: 6055
Proposed branch: lp:~openerp-dev/openobject-addons/trunk-bug-900239-kjo
Merge into: lp:openobject-addons
Diff against target: 20 lines (+2/-1)
1 file modified
email_template/email_template_view.xml (+2/-1)
To merge this branch: bzr merge lp:~openerp-dev/openobject-addons/trunk-bug-900239-kjo
Reviewer Review Type Date Requested Status
Fabien (Open ERP) Disapprove
Bhumika Shrimali (community) Approve
Review via email: mp+84567@code.launchpad.net

Description of the change

Change the tree and search view by adding the mail_server_id field

To post a comment you must log in.
Revision history for this message
Bhumika Shrimali (sbh-openerp) :
review: Approve
Revision history for this message
Fabien (Open ERP) (fp-tinyerp) wrote :

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

review: Disapprove

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'email_template/email_template_view.xml'
2--- email_template/email_template_view.xml 2011-11-05 01:59:22 +0000
3+++ email_template/email_template_view.xml 2011-12-06 06:21:06 +0000
4@@ -110,6 +110,7 @@
5 <field name="arch" type="xml">
6 <tree string="Templates">
7 <field name="model_id"/>
8+ <field name="mail_server_id"/>
9 <field name="name"/>
10 <field name="subject"/>
11 <field name="email_from"/>
12@@ -138,7 +139,7 @@
13 </group>
14 <newline/>
15 <group expand="0" string="Group by...">
16- <filter string="SMTP Server" domain="[]" context="{'group_by':'smtp_server_id'}" icon="terp-folder-orange"/>
17+ <filter string="SMTP Server" domain="[]" context="{'group_by':'mail_server_id'}" icon="terp-folder-orange"/>
18 <separator orientation="vertical"/>
19 <filter string="Model" domain="[]" context="{'group_by':'model_id'}" icon="terp-accessories-archiver"/>
20 </group>

Subscribers

People subscribed via source and target branches

to all changes: