[MERGE] Merged wih main addons.

bzr revid: tde@openerp.com-20120611104147-gnqgnt51taq899su

diff --cc addons/crm/crm_lead.py
Simple merge

diff --cc addons/crm/crm_lead_view.xml
index b2b0242,86a891a..89b8844
--- 1/addons/crm/crm_lead_view.xml
--- 2/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@@ -77,86 -73,78 +77,78 @@@
                      <field name="stage_id" widget="statusbar"
                              on_change="onchange_stage_id(stage_id)"/>
                  </header>
-                 <sheet layout="auto">
-                 <group colspan="4" col="7">
-                     <field name="message_thread_read"/>
-                     <newline/>
-                     <field name="name"/>
-                     <field name="priority"/>
-                     <field name="categ_id"
-                         widget="selection"
-                         domain="[('object_id.model','=','crm.lead')]"/>
-                     <newline />
-                     <field name="user_id" />
-                     <field name="section_id" widget="selection" />
-                     <field name="type" invisible="1"/>
-                 </group>
-                 <notebook colspan="4">
-                 <page string="Lead">
-                     <group colspan="4" col="2">
-                         <field name="partner_name" string="Company Name" />
-                     </group>
-                     <group colspan="2" col="4">
-                         <separator string="Contact" colspan="4" col="4"/>
-                         <field name="contact_name" colspan="4"/>
-                         <newline/>
-                         <field domain="[('domain', '=', 'contact')]" name="title" widget="selection"/>
-                         <field name="function" />
-                         <field name="street" colspan="4"/>
-                         <field name="street2" colspan="4"/>
-                         <field name="zip"/>
-                         <field name="city"/>
-                         <field name="country_id"/>
-                         <field name="state_id"/>
-                     </group>
-                     <group colspan="2" col="3">
-                         <separator string="Communication" colspan="4" col="3"/>
-                         <field name="email_from" widget="email"/>
-                         <newline/>
-                         <field name="phone"/>
-                         <newline/>
-                         <field name="fax"/>
-                         <newline/>
-                         <field name="mobile"/>
-                         <newline/>
-                         <separator string="Links" colspan="4" col="3"/>
-                         <field name="partner_id" string="Customer"/>
-                         <button
-                             name="%(action_crm_lead2partner)d"
-                             icon="terp-partner" type="action"
-                             string="Create"
-                             attrs="{'invisible':[('partner_id','!=',False)]}"/>
-                     </group>
-                     <separator colspan="4" string="Notes"/>
-                     <field name="description" nolabel="1" colspan="4"/>
-                  </page>
-                  <page string="Extra Info">
-                     <group colspan="2" col="2">
-                         <separator string="Categorization" colspan="2" col="2"/>
-                         <field name="company_id"
-                             groups="base.group_multi_company"
-                             widget="selection" colspan="2" />
-                         <field name="type_id" select="1" widget="selection"/>
-                         <field name="channel_id" select="1" widget="selection"/>
-                         <field name="referred"/>
-                         <field name="state" groups="base.group_no_one"/>
-                     </group>
-                     <group colspan="2" col="2">
-                         <separator string="Mailings" colspan="2" col="2"/>
-                         <field name="opt_in" on_change="on_change_opt_in(opt_in)"/>
-                         <field name="opt_out" on_change="on_change_opt_out(opt_out)"/>
-                     </group>
-                     <group colspan="2" col="2" groups="base.group_no_one">
-                         <separator string="Statistics" colspan="2" col="2"/>
-                         <field name="day_open"/>
-                         <field name="day_close"/>
+                 <sheet>
+                     <label for="name" class="oe_form_readonly_hidden" string="Lead Description"/>
+                     <h1><field name="name" placeholder="Describe the lead..."/></h1>
+                     <group>
+                         <group>
+                             <field name="user_id" />
+                             <field name="section_id" widget="selection" />
+                             <field name="type" invisible="1"/>
+                         </group>
+                         <group>
+                             <field name="priority"/>
+                             <field name="categ_id"
+                                 widget="selection"
+                                 domain="[('object_id.model','=','crm.lead')]"/>
+                         </group>
+                         <group>
+                             <field name="partner_name" string="Company Name"/>
+                             <field name="partner_id" string="Customer"/>
+                             <label for="street" string="Address"/>
+                             <div>
+                                 <field name="street" placeholder="Street..."/>
+                                 <field name="street2"/>
+                                 <div>
+                                     <field name="zip" class="oe_form_inline" placeholder="ZIP"/>
+                                     <field name="city" class="oe_form_inline" placeholder="City"/>
+                                 </div>
+                                 <field name="state_id" placeholder="State"/>
+                                 <field name="country_id" placeholder="Country"/>
+                             </div>
+                         </group>
+                         <group>
+                             <field name="contact_name" />
+                             <field name="email_from" widget="email"/>
+                             <field name="function" />
+                             <field domain="[('domain', '=', 'contact')]" name="title"/>
+                             <field name="phone"/>
+                             <field name="mobile"/>
+                             <field name="fax"/>
+                             <!--
+                             This should be integrated in Open Chatter
+                             <button string="Mail"
+                                 name="%(mail.action_email_compose_message_wizard)d"
+                                 icon="terp-mail-message-new" type="action" colspan="1"/>
+                             -->
+                         </group>
                      </group>
-                  </page>
-                 </notebook>
+                     <notebook colspan="4">
+                     <page string="Notes">
+                         <field name="description"/>
+                     </page>
+                     <page string="Extra Info">
+                         <group>
+                             <group string="Categorization">
+                                 <field name="company_id"
+                                     groups="base.group_multi_company"
+                                     widget="selection" colspan="2" />
+                                 <field name="type_id" widget="selection"/>
+                                 <field name="channel_id" widget="selection"/>
+                                 <field name="referred"/>
+                                 <field name="state" groups="base.group_no_one"/>
+                             </group>
+                             <group string="Mailings">
+                                 <field name="opt_in" on_change="on_change_opt_in(opt_in)"/>
+                                 <field name="opt_out" on_change="on_change_opt_out(opt_out)"/>
+                             </group>
+                         </group>
+                     </page>
+                     </notebook>
                  </sheet>
 -                <div class="oe_form_bottom">
 +                <footer>
                      <field name="message_ids" widget="ThreadView"/>
 -                </div>
 +                </footer>
              </form>
          </field>
          </record>

diff --cc addons/hr_recruitment/hr_recruitment_view.xml
Simple merge

diff --cc addons/mail/mail_message_view.xml
index 0891399,1f7ec22..362748f
--- 1/addons/mail/mail_message_view.xml
--- 2/addons/mail/mail_message_view.xml
+++ b/addons/mail/mail_message_view.xml
@@@ -117,29 -96,26 +119,25 @@@
                                  <field name="email_bcc" attrs="{'invisible':[('email_bcc', '=', False)]}"/>
                                  <field name="reply_to" attrs="{'invisible':[('reply_to', '=', False)]}"/>
                              </group>
-                             <group col="4" colspan="2">
-                                 <separator string="Message Details" colspan="4"/>
+                             <group col="4" string="Message Details">
                                  <field name="model"/>
 -                                <button name="open_document" string="Open" type="object" icon="gtk-jump-to" colspan="2"/>
 +                                <button name="open_document" string="Open" type="object" icon="gtk-jump-to" colspan="2"
 +                                    attrs="{'invisible':['|', ('model', '=', ''), ('res_id', '=', False)]}"/>
                                  <field name="res_id"/>
 -                                <field name="message_id" colspan="4" attrs="{'invisible':[('message_id', '=', False)]}"/>
 -                                <field name="references" colspan="4" widget="char" size="512" attrs="{'invisible':[('references', '=', False)]}"/>
                              </group>
-                             <notebook colspan="4">
+                             <notebook>
 -                                <page string="Body (Rich)" attrs="{'invisible':[('subtype','=','plain')]}">
 +                                <page string="Body (Rich)" attrs="{'invisible':[('content_subtype','=','plain')]}">
-                                     <field name="body_html" widget="text_html" nolabel="1" colspan="4"/>
+                                     <field name="body_html" widget="text_html"/>
                                  </page>
                                  <page string="Body (Plain)">
-                                     <field name="body_text" colspan="4" widget="text" nolabel="1"/>
+                                     <field name="body_text" widget="text"/>
                                  </page>
                              </notebook>
-                             <separator string="" colspan="4"/>
-                             <group col="6" colspan="6">
+                             <group col="5">
                                  <field name="state" colspan="2"/>
 -                                <field name="subtype" attrs="{'invisible':[('subtype', '=', False)]}"/>
 +                                <field name="content_subtype" attrs="{'invisible':[('content_subtype', '=', False)]}"/>
-                                 <group colspan="2">
-                                     <button name="%(action_email_compose_message_wizard)d" string="Reply" type="action" icon="terp-mail-replied"
+                                 <button name="%(action_email_compose_message_wizard)d" string="Reply" type="action" icon="terp-mail-replied"
                                      context="{'mail.compose.message.mode':'reply', 'message_id':active_id}" states='received,sent,exception,cancel'/>
-                                 </group>
                              </group>
                          </page>
                          <page string="Attachments">

diff --cc addons/project/project.py
Simple merge