Odoo Addons (MOVED TO GITHUB)

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

  1. trunk-bug-917516-kjo
  2. Merge into trunk
Proposed by Kuldeep Joshi(OpenERP)
Status: Merged
Merged at revision: 6397
Proposed branch: lp:~openerp-dev/openobject-addons/trunk-bug-917516-kjo
Merge into: lp:openobject-addons
Diff against target: 21 lines (+2/-2)
1 file modified
email_template/email_template_view.xml (+2/-2)
To merge this branch: bzr merge lp:~openerp-dev/openobject-addons/trunk-bug-917516-kjo
Reviewer Review Type Date Requested Status
Raphael Collet (OpenERP) (community) Approve
Bhumika Shrimali Pending
Review via email: mp+88835@code.launchpad.net

Description of the change

email_template : set the colspan

To post a comment you must log in.
Revision history for this message
Raphael Collet (OpenERP) (rco-openerp) :
review: Approve

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-12-19 23:00:20 +0000
3+++ email_template/email_template_view.xml 2012-01-17 10:58:25 +0000
4@@ -24,7 +24,7 @@
5 <group col="2" colspan="2">
6 <separator string="Options" colspan="2"/>
7 <field name="lang" colspan="4" />
8- <field name="user_signature" colspan="4" />
9+ <field name="user_signature" colspan="2" />
10 </group>
11 <group col="2" colspan="2">
12 <separator colspan="2" string="Email Content"/>
13@@ -79,7 +79,7 @@
14 <group colspan="2" col="2" groups="base.group_extended">
15 <separator string="Advanced Options" colspan="2"/>
16 <field name="mail_server_id"/>
17- <field name="track_campaign_item" colspan="4"/>
18+ <field name="track_campaign_item" colspan="2"/>
19 <field name="message_id"/>
20 <field name="auto_delete"/>
21 </group>

Subscribers

People subscribed via source and target branches

to all changes: