[MERGE]: Merge with lp:~openerp-dev/openobject-addons/trunk-dev-addons2

[odoo/odoo.git] / addons / mail_gateway / mail_gateway_view.xml

diff --git a/addons/mail_gateway/mail_gateway_view.xml b/addons/mail_gateway/mail_gateway_view.xml
index 6114160..b1daeaa 100644 (file)
--- a/addons/mail_gateway/mail_gateway_view.xml
+++ b/addons/mail_gateway/mail_gateway_view.xml
@@ -8,21 +8,26 @@
             <field name="arch" type="xml">
                 <form string="mailgate message">
                     <group colspan="4" col="6">
-                        <field name="name" required="1" select="1"/>
-                        <field name="date" required="1" select="1"/>
-                        <field name="user_id" string="Responsible" select="1"/>
-                    </group>
+                           <field name="name" required="1" select="1"/>
+                           <field name="date" required="1" select="1"/>
+                           <field name="user_id" string="Responsible" select="1"/>
+                       </group>
                     <notebook colspan="4">
-                        <page string="Details">
-                            <group col="4" colspan="4">
-                                <separator string="Email Details" colspan="4"/>
-                                <field name="email_from" />
-                                <field name="email_to" />
-                                <field name="email_cc" />
-                                <field name="email_bcc" />
+                           <page string="Details">
+                               <group col="2" colspan="2">
+                                       <separator string="Email Details" colspan="4"/>
+                                           <field name="email_from" />
+                                           <field name="email_to" />
+                                           <field name="email_cc" />
+                                           <field name="email_bcc" invisible="1"/>
+                                      </group>
+                                      <group col="2" colspan="2">
+                                <separator string="Message Details" colspan="4"/>
+                                    <field name="model" readonly="1"/>
+                                    <field name="res_id"  readonly="1"/>
                                 <field name="message_id" />
                            </group>
-                           <separator string="Description" colspan="4"/>
+                                      <separator string="Description" colspan="4"/>
                             <field name="description" nolabel="1" colspan="4" />
                         </page>
                         <page string="Attachments">
@@ -68,28 +73,30 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Mailgateway Thread">
-                    <field name="thread" select="1"/>
+                    <group col="6" colspan="4">
+                        <field name="thread" select="1" colspan="3"/>
+                    </group>
                     <separator string="Logs" colspan="4"/>
                     <field name="log_ids" nolabel="1" colspan="4" domain="[('history', '=', True)]">
-                        <tree string="Mailgateway Logs">
-                            <field name="name" select="1" />
-                            <field name="date" />
-                        </tree>
-                        <form string="Mailgate Logs">
-                            <field name="name" />
-                            <field name="date" />
-                            <field name="user_id" />
-                            <field name="message_id" />
-                            <notebook colspan="4">
-                                <page string="Email Details">
-                                    <group col="4" colspan="4">
-                                        <separator string="Email Details" colspan="4"/>
-                                        <field name="email_from" />
-                                        <field name="email_to" />
-                                        <field name="email_cc" />
-                                        <field name="email_bcc" />
-                                   </group>
-                                   <separator string="Description" colspan="4"/>
+                       <tree string="Mailgateway Logs">
+                                   <field name="name" select="1" />
+                                   <field name="date" />
+                               </tree>
+                           <form string="Mailgate Logs">
+                                   <field name="name" />
+                                   <field name="date" />
+                                   <field name="user_id" />
+                                   <field name="message_id" />
+                                   <notebook colspan="4">
+                                           <page string="Email Details">
+                                               <group col="4" colspan="4">
+                                                       <separator string="Email Details" colspan="4"/>
+                                                           <field name="email_from" />
+                                                           <field name="email_to" />
+                                                           <field name="email_cc" />
+                                                           <field name="email_bcc" />
+                                                      </group>
+                                                      <separator string="Description" colspan="4"/>
                                     <field name="description" nolabel="1" colspan="4" />
                                 </page>
                                 <page string="Attachments">
@@ -145,33 +152,38 @@
         </record>
 
         <record model="ir.actions.act_window" id="action_view_mailgate_thread">
-            <field name="name">Mailgateway Threads</field>
-            <field name="res_model">mailgate.thread</field>
+               <field name="name">Mailgateway Threads</field>
+               <field name="res_model">mailgate.thread</field>
+               <field name="view_mode">tree,form</field>
+               <field name="view_type">form</field>
+               <field name="view_id" ref="view_mailgate_thread_tree"/>
+           </record>
+
+               <record model="ir.actions.act_window.view" id="action_view_mailgate_thread_view1">
+               <field name="sequence" eval="1"/>
+               <field name="view_mode">tree</field>
+               <field name="view_id" ref="view_mailgate_thread_tree"/>
+               <field name="act_window_id" ref="action_view_mailgate_thread"/>
+           </record>
+           <record model="ir.actions.act_window.view" id="action_view_mailgate_thread_view2">
+               <field name="sequence" eval="2"/>
+               <field name="view_mode">form</field>
+               <field name="view_id" ref="view_mailgate_thread_form"/>
+               <field name="act_window_id" ref="action_view_mailgate_thread"/>
+           </record>
+        
+        <!--        Mailgateway message action-->
+        <record model="ir.actions.act_window" id="action_view_mailgate_message">
+            <field name="name">Mailgateway Messages</field>
+            <field name="res_model">mailgate.message</field>
             <field name="view_mode">tree,form</field>
             <field name="view_type">form</field>
-            <field name="view_id" ref="view_mailgate_thread_tree"/>
-        </record>
-
-        <record model="ir.actions.act_window.view" id="action_view_mailgate_thread_view1">
-            <field name="sequence" eval="1"/>
-            <field name="view_mode">tree</field>
-            <field name="view_id" ref="view_mailgate_thread_tree"/>
-            <field name="act_window_id" ref="action_view_mailgate_thread"/>
+            <field name="view_id" ref="view_mailgate_message_tree"/>
         </record>
-        <record model="ir.actions.act_window.view" id="action_view_mailgate_thread_view2">
-            <field name="sequence" eval="2"/>
-            <field name="view_mode">form</field>
-            <field name="view_id" ref="view_mailgate_thread_form"/>
-            <field name="act_window_id" ref="action_view_mailgate_thread"/>
-        </record>
-
-
-         <!-- <menuitem id="base.menu_crm_configuration" name="Cases"
-            parent="base.menu_base_config" sequence="0"/>
+        
+        <menuitem id="menu_mailgate_message" name="Mailgateway Messages" action="action_view_mailgate_message"
+               parent="base.menu_base_config"  sequence="20"/>
 
-        <menuitem id="menu_mailgate_thread" name="Mailgateway Threads" action="action_view_mailgate_thread"
-            parent="base.menu_crm_configuration"  sequence="20"/>
-            -->
         <act_window domain="[('partner_id', '=', active_id), ('history', '=', True)]"
             id="act_res_partner_emails" name="Emails"
             res_model="mailgate.message"
@@ -180,4 +192,4 @@
             />
 
     </data>
-</openerp>
\ No newline at end of file
+</openerp>