Merge lp:~joao-gama/openerp-mgmtsystem/6.1-bug-1091420-mgmtsystem_action into lp:openerp-mgmtsystem/6.1

Proposed by Joao Alfredo Gama Batista
Status: Merged
Merged at revision: 28
Proposed branch: lp:~joao-gama/openerp-mgmtsystem/6.1-bug-1091420-mgmtsystem_action
Merge into: lp:openerp-mgmtsystem/6.1
Diff against target: 49 lines (+20/-18)
1 file modified
mgmtsystem_action/mgmtsystem_action.xml (+20/-18)
To merge this branch: bzr merge lp:~joao-gama/openerp-mgmtsystem/6.1-bug-1091420-mgmtsystem_action
Reviewer Review Type Date Requested Status
Maxime Chambreuil (http://www.savoirfairelinux.com) Approve
Joao Alfredo Gama Batista Needs Resubmitting
Review via email: mp+140298@code.launchpad.net

Description of the change

View re-organization.

To post a comment you must log in.
Revision history for this message
Maxime Chambreuil (http://www.savoirfairelinux.com) (max3903) wrote :

Can you remove commented line on line 13?

review: Needs Fixing
29. By Joao Alfredo Gama Batista

[FIX] Code clean-up

Revision history for this message
Joao Alfredo Gama Batista (joao-gama) wrote :

> Can you remove commented line on line 13?
Done!

review: Needs Resubmitting
Revision history for this message
Maxime Chambreuil (http://www.savoirfairelinux.com) (max3903) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'mgmtsystem_action/mgmtsystem_action.xml'
2--- mgmtsystem_action/mgmtsystem_action.xml 2012-08-20 18:34:19 +0000
3+++ mgmtsystem_action/mgmtsystem_action.xml 2012-12-17 22:16:21 +0000
4@@ -89,25 +89,27 @@
5 <field name="date"/>
6 <field name="email_cc" size="512" attrs="{'invisible': [('email_from', '=', False)]}"/>
7 </group>
8- <field name="subject" colspan="4" widget="char" attrs="{'invisible': [('email_from', '=', False)]}" size="512"/>
9- <field name="body_text" colspan="4" attrs="{'invisible': [('email_from', '!=', False)]}"/>
10+ <group col="2" colspan="4">
11+ <field name="subject" widget="char" attrs="{'invisible': [('email_from', '=', False)]}" size="512"/>
12+ </group>
13 </group>
14- <notebook colspan="4">
15- <page string="Details" attrs="{'invisible': [('email_from', '=', False)]}">
16- <field name="body_text" colspan="4" nolabel="1"/>
17- <group attrs="{'invisible': [('email_from', '=', False)]}">
18- <button colspan="4" string="Reply"
19- name="%(mail.action_email_compose_message_wizard)d"
20- context="{'mail.compose.message.mode':'reply'}"
21- icon="terp-mail-replied" type="action"/>
22- </group>
23-
24- </page>
25- <page string="Attachments" attrs="{'invisible': [('email_from', '=', False)]}">
26- <field name="attachment_ids" colspan="4" readonly="1" nolabel="1"/>
27- </page>
28- </notebook>
29- </form>
30+ <notebook colspan="4">
31+ <page string="Details">
32+ <field name="body_text" colspan="4" nolabel="1"/>
33+ <group attrs="{'invisible': [('email_from', '=', False)]}">
34+ <button colspan="4" string="Reply"
35+ name="%(mail.action_email_compose_message_wizard)d"
36+ context="{'mail.compose.message.mode':'reply'}"
37+ icon="terp-mail-replied" type="action"/>
38+ </group>
39+
40+ </page>
41+ <page string="Attachments" attrs="{'invisible': [('email_from', '=', False)]}">
42+ <field name="attachment_ids" colspan="4" readonly="1" nolabel="1"/>
43+ </page>
44+
45+ </notebook>
46+ </form>
47 </field>
48 <button string="Add Internal Note"
49 name="%(crm.action_crm_add_note)d"

Subscribers

People subscribed via source and target branches