[Merge] Merge with trunk addons

[odoo/odoo.git] / addons / crm_claim / crm_claim_view.xml

diff --git a/addons/crm_claim/crm_claim_view.xml b/addons/crm_claim/crm_claim_view.xml
index 7a3dd4c..2b3f883 100644 (file)
--- a/addons/crm_claim/crm_claim_view.xml
+++ b/addons/crm_claim/crm_claim_view.xml
@@ -2,6 +2,10 @@
 <openerp>
     <data>
 
+    <menuitem id="menu_config_claim" name="Claim"
+        groups="base.group_extended"
+        parent="base.menu_base_config" sequence="8" />
+
     <!-- Claims categories  -->
 
     <record id="crm_claim_categ_action" model="ir.actions.act_window">
@@ -13,8 +17,9 @@
         <field name="context">{'object_id':'crm.claim'}</field>
     </record>
 
-    <menuitem action="crm_claim_categ_action"
-        id="menu_crm_case_claim-act" parent="crm.menu_crm_case_categ" />
+    <menuitem action="crm_claim_categ_action" name="Categories"
+        id="menu_crm_case_claim-act" parent="menu_config_claim" />
+
 
     <!-- Claim Stages -->
 
@@ -27,8 +32,8 @@
         <field name="context">{'object_id':'crm.claim'}</field>
     </record>
 
-    <menuitem action="crm_claim_stage_act"
-            id="menu_crm_claim_stage_act" parent="crm.menu_crm_case_stage" />
+     <menuitem action="crm_claim_stage_act" name="Stages"
+            id="menu_crm_claim_stage_act" parent="menu_config_claim" />
 
     <!-- Claim Resource Type -->
 
@@ -41,9 +46,9 @@
         <field name="context">{'object_id':'crm.claim'}</field>
     </record>
 
-    <menuitem action="crm_claim_resource_act"
+     <menuitem action="crm_claim_resource_act" name="Resource Type"
             id="menu_crm_claim_stage_act"
-            parent="crm.menu_crm_case_resource_type" />
+            parent="menu_config_claim" />
 
         <!-- Claims    -->
 
@@ -174,31 +179,38 @@
                    <group colspan="4">
                        <field colspan="4" name="email_cc" string="CC"/>
                    </group>
-                    <field name="message_ids" colspan="4" nolabel="1" mode="form,tree">
-                        <form string="Communication history">
-                            <group col="6" colspan="4">
-                                <field name="date"/>
-                                <field name="email_to"/>
-                                <field name="email_from"/>
-                                                       </group>
-                                   <newline/>
-                                   <field name="description" colspan="4" nolabel="1"/>
-                                   <button colspan="4"
-                                       string="Reply to Last Email"
-                                       name="%(crm.action_crm_send_mail)d"
-                                       context="{'mail':'reply', 'model': 'crm.claim'}"
-                                       icon="gtk-undo" type="action" />
-                               </form>
-                               <tree string="Communication history">
-                                   <field name="description"/>
-                                   <field name="email_to"/>
-                                   <field name="date"/>
-                               </tree>
-                           </field>
-                           <button colspan="4" string="Send New Email"
-                               name="%(crm.action_crm_send_mail)d"
-                               context="{'mail':'new', 'model': 'crm.claim'}"
-                               icon="gtk-go-forward" type="action" />
+                   <field name="message_ids" colspan="4" nolabel="1" mode="form,tree" height="280">
+                                <form string="Communication history">
+                                    <group col="6" colspan="4">
+                                        <field name="date"/>
+                                        <field name="email_to"/>
+                                        <field name="email_from"/>
+                                    </group>
+                                    <notebook colspan="4">
+                                        <page string="Details">
+                                            <field name="description" colspan="4" nolabel="1"/>
+                                        </page>
+                                        <page string="Attachments">
+                                            <field name="attachment_ids" colspan="4" readonly="1" nolabel="1"/>
+                                        </page>
+                                    </notebook>
+                                    <button colspan="4"
+                                    string="Reply to Last Email"
+                                    name="%(crm.action_crm_send_mail)d"
+                                    context="{'mail':'reply', 'model': 'crm.lead'}"
+                                    icon="gtk-undo" type="action" />
+                                </form>
+                                <tree string="Communication history">
+                                    <field name="date"/>
+                                    <field name="email_from" />
+                                    <field name="email_to"/>
+                                    <field name="description"/>
+                                </tree>
+                         </field>
+                   <button colspan="4" string="Send New Email"
+                       name="%(crm.action_crm_send_mail)d"
+                       context="{'mail':'new', 'model': 'crm.claim'}"
+                       icon="gtk-go-forward" type="action" />
                  </page>
                 </notebook>
 
@@ -271,7 +283,7 @@
                    <field name="section_id" select="1"
                        widget="selection"/>
                    <newline/>
-                   <group expand="0" string="Group By..." colspan="10" col="20">
+                   <group expand="1" string="Group By...">
                        <filter string="Deadline" icon="terp-crm"
                            domain="[]"
                            context="{'group_by':'date_deadline'}" />