[IMP]

bzr revid: han@tinyerp.com-20110805124001-eekluj7lsllns6l4

diff --git a/addons/crm/crm_opportunity_view.xml b/addons/crm/crm_opportunity_view.xml
index 9fc8774..0c8225c 100644 (file)
--- a/addons/crm/crm_opportunity_view.xml
+++ b/addons/crm/crm_opportunity_view.xml
@@ -57,13 +57,6 @@
                                     string="Contact"
                                     on_change="onchange_partner_address_id(partner_address_id, email_from)"
                                     colspan="1" />
-                                <group col="3" colspan="2">
-                                    <field name="email_from" string="Email" />
-                                    <button string="Send Email"
-                                    name="%(crm.action_crm_send_mail)d"
-                                    context="{'mail':'new', 'model': 'crm.lead'}"
-                                    icon="terp-mail-message-new" type="action" />
-                                </group>
                                     <field name="phone"/>
 
                             </group>
@@ -135,10 +128,40 @@
                                        <field name="optout" on_change="on_change_optout(optout)"/>
                             </group>
                         </page>
-
-                        <page string="Communication &amp; History" groups="base.group_extended">
+                        <page string="Extra Info" groups="base.group_extended">
+                            <group col="2" colspan="2">
+                                <separator string="Dates" colspan="2"/>
+                                <field name="create_date"/>
+                                <field name="write_date"/>
+                                <field name="date_closed"/>
+                                <field name="date_open"/>
+                            </group>
+                            <group col="2" colspan="2">
+                                <separator string="Misc" colspan="2"/>
+                                <field name="active"/>
+                                <field name="day_open"/>
+                                <field name="day_close"/>
+                                <field name="referred"/>
+                            </group>
+                            <separator colspan="4" string="References"/>
+                            <field name="ref"/>
+                            <field name="ref2"/>
+                        </page>
+                        </notebook>
+                        <group colspan="4">
+                            <group col="3" colspan="2">
+                                <field colspan="4" name="email_cc" string="Global CC" widget="char" size="512"/>
+                            </group>
+                            <newline/>
+                            <group col="3" colspan="2">
+                                    <field name="email_from" string="Email" />
+                                    <button string="Send Email"
+                                    name="%(crm.action_crm_send_mail)d"
+                                    context="{'mail':'new', 'model': 'crm.lead'}"
+                                    icon="terp-mail-message-new" type="action" />
+                             </group>
                             <field name="message_ids" colspan="4" nolabel="1" mode="tree,form">
-                                <tree string="Note">
+                            <tree string="Note">
                                     <field name="display_text" string="History Information"/>
                                     <field name="history" invisible="1"/>
                                     <button
@@ -184,29 +207,6 @@
                                 name="%(crm.action_crm_send_mail)d"
                                 context="{'mail':'new', 'model': 'crm.lead'}"
                                 icon="terp-mail-message-new" type="action" />
-                        </page>
-                        <page string="Extra Info" groups="base.group_extended">
-                            <group col="2" colspan="2">
-                                <separator string="Dates" colspan="2"/>
-                                <field name="create_date"/>
-                                <field name="write_date"/>
-                                <field name="date_closed"/>
-                                <field name="date_open"/>
-                            </group>
-                            <group col="2" colspan="2">
-                                <separator string="Misc" colspan="2"/>
-                                <field name="active"/>
-                                <field name="day_open"/>
-                                <field name="day_close"/>
-                                <field name="referred"/>
-                            </group>
-                            <separator colspan="4" string="References"/>
-                            <field name="ref"/>
-                            <field name="ref2"/>
-                        </page>
-                        </notebook>
-                        <group colspan="4">
-                            <field colspan="4" name="email_cc" string="Global CC" widget="char" size="512"/>
                         </group>
                     </form>
                 </field>