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

bzr revid: rpa@tinyerp.com-20100603060647-95z70o7eghqg41kh

diff --cc addons/mail_gateway/mail_gateway_view.xml
index a89e435,6114160..b1daeaa
--- 1/addons/mail_gateway/mail_gateway_view.xml
--- 2/addons/mail_gateway/mail_gateway_view.xml
+++ b/addons/mail_gateway/mail_gateway_view.xml
@@@ -8,33 -8,28 +8,33 @@@
              <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">
-                                       <separator string="Attachments" colspan="4"/>
-                                   <field name="attachment_ids" nolabel="1" colspan="4" readonly="1"/>
-                               </page>
-                       </notebook>
+                         </page>
+                         <page string="Attachments">
+                             <separator string="Attachments" colspan="4"/>
+                             <field name="attachment_ids" nolabel="1" colspan="4" readonly="1"/>
+                         </page>
+                     </notebook>
                  </form>
              </field>
          </record>
@@@ -73,38 -68,36 +73,38 @@@
              <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">
-                                                       <separator string="Attachments" colspan="4"/>
-                                                   <field name="attachment_ids" nolabel="1" colspan="4" />
-                                               </page>
-                                       </notebook>
-                               </form>
+                                 </page>
+                                 <page string="Attachments">
+                                     <separator string="Attachments" colspan="4"/>
+                                     <field name="attachment_ids" nolabel="1" colspan="4" />
+                                 </page>
+                             </notebook>
+                         </form>
                      </field>
                      <separator string="Histories" colspan="4"/>
                      <field name="message_ids" nolabel="1" colspan="4" domain="[('history', '=', True)]">