[MERGE] lp:openobject-addons

bzr revid: kjo@tinyerp.com-20120702112750-bxjvfh3cfxc7s5da

diff --cc addons/account/account_installer.xml
Simple merge

diff --cc addons/account/account_view.xml
Simple merge

diff --cc addons/base_calendar/base_calendar_view.xml
Simple merge

diff --cc addons/caldav/wizard/caldav_browse_view.xml
index 3ea1692,8f06ed4..0e9f1ea
--- 1/addons/caldav/wizard/caldav_browse_view.xml
--- 2/addons/caldav/wizard/caldav_browse_view.xml
+++ b/addons/caldav/wizard/caldav_browse_view.xml
@@@ -48,13 -25,16 +48,15 @@@
              <field name="arch" type="xml">
                 <form string="Caldav's host name configuration" version="7.0">
                      <header>
-                        <button name="next_window" string="Next" type="object" icon="gtk-go-forward"/>
+                         <button name="next_window" string="Next" type="object" class="oe_highlight"/>
+                         or
+                         <button string="Cancel" class="oe_link" special="cancel"/>
                      </header>
 -                    <label string="Configure your openerp hostname. For example : " colspan="4"></label>
 -                    <newline/>
 -                    <label string="database.my.openerp.com  or companyserver.com" colspan="4"/>
 -                    <newline/>
 -                    <separator colspan="4"/>
 -                    <field name="host_name"  colspan="4" width="250" />
 +                    <sheet>
 +                        <group>
 +                            <field name="host_name"  colspan="2" width="250" placeholder="For example : database.my.openerp.com or companyserver.com"/>
 +                        </group>
 +                    </sheet>
                 </form>
              </field>
          </record>
@@@ -66,16 -46,15 +68,18 @@@
              <field name="arch" type="xml">
                  <form string="User Preference" version="7.0">
                      <header>
-                         <button name="open_window" string="_Open" type="object" icon="gtk-ok"/>
+                         <button name="open_window" string="_Open" type="object" icon="gtk-ok" class="oe_highlight"/>
+                         or
+                         <button string="Cancel" class="oe_link" special="cancel"/>
                      </header>
 -                    <separator string="" colspan="4"/>
 -                    <field name="service"  colspan="4" width="250" readonly="1"/>
 -                    <field name="collection"  colspan="4" width="250" invisible="1" />
 -                    <field name="calendar"  colspan="4" width="250" domain="[('collection_id','=', collection)]" readonly="1"/>
 -                    <field name="device"  colspan="4" width="250" />
 +                    <sheet>
 +                        <group>
 +                            <field name="service"  colspan="2" readonly="1"/>
 +                            <field name="collection"  colspan="2" invisible="1" />
 +                            <field name="calendar"  colspan="2" domain="[('collection_id','=', collection)]" readonly="1"/>
 +                            <field name="device"  colspan="2"/>
 +                        </group>
 +                    </sheet>
                  </form>
              </field>
          </record>

diff --cc addons/crm/crm_meeting_view.xml
Simple merge

diff --cc addons/crm/crm_view.xml
Simple merge

diff --cc addons/crm/res_partner_view.xml
index c12a62f,19bb151..bfc258a
--- 1/addons/crm/res_partner_view.xml
--- 2/addons/crm/res_partner_view.xml
+++ b/addons/crm/res_partner_view.xml
@@@ -96,12 -96,13 +96,12 @@@
                      <button type="action"
                          string="Schedule a Meeting"
                          name="%(crm.crm_case_categ_meet_create_partner)d"
-                         context="{'search_default_partner_id': [active_id], 'default_duration': 4.0}"/>
+                         context="{'default_partner_id': [active_id], 'default_duration': 4.0}"/>
                      <button type="action" string="Schedule a Call" 
                          name="%(crm.crm_case_categ_phone_create_partner)d" 
 -                        context="{'search_default_partner_id': [active_id], 'default_duration': 1.0}" />
 -                    <button type="action" string="Opportunities"
 -                        context="{'search_default_partner_id': [active_id]}"
 -                        name="%(crm.action_view_crm_partner2opportunity)d" />
 +                        context="{'search_default_partner_id': [active_id], 'default_duration': 1.0, 'default_partner_id': active_id}" />
 +                    <button type="action" string="Opportunity"
 +                        name="%(crm.crm_case_category_act_oppor11)d" context="{'search_default_partner_id': [active_id]}"/>
                  </xpath>
              </field>
          </record>

diff --cc addons/crm/wizard/crm_phonecall_to_phonecall_view.xml
index 4c07e61,a9819d6..7319c1b
--- 1/addons/crm/wizard/crm_phonecall_to_phonecall_view.xml
--- 2/addons/crm/wizard/crm_phonecall_to_phonecall_view.xml
+++ b/addons/crm/wizard/crm_phonecall_to_phonecall_view.xml
@@@ -11,12 -11,15 +11,13 @@@
              <field name="arch" type="xml">
                  <form string="Schedule/Log a Call" version="7.0">
                      <header>
-                         <button name="action_cancel" string="_Cancel" icon="gtk-cancel" special="cancel" />
-                         <button name="action_schedule" type="object" string="Log Call" icon="gtk-ok" attrs="{'invisible' : [('action', '!=', 'log')]}" />
-                         <button name="action_schedule" type="object" string="Schedule Call" icon="gtk-ok" attrs="{'invisible' : [('action', '!=', 'schedule')]}" />
+                         <button name="action_schedule" type="object" string="Log Call" attrs="{'invisible' : [('action', '!=', 'log')]}" class="oe_highlight"/>
+                         <button name="action_schedule" type="object" string="Schedule Call" attrs="{'invisible' : [('action', '!=', 'schedule')]}" class="oe_highlight"/>
+                         or
+                         <button string="Cancel" class="oe_link" special="cancel" />
                      </header>
                      <group col="4">
 -                        <separator string="Schedule/Log a Call" colspan="4"/>
                          <field name="action"/>
 -                        <separator string="Call Details" colspan="4"/>
                          <field name="name"/>
                          <field name="date" string="Planned Date" attrs="{'invisible': [('action','=','log')]}"/>
                          <field name="partner_id" readonly="True"/>

diff --cc addons/crm_fundraising/crm_fundraising_view.xml
Simple merge

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

diff --cc addons/import_sugarcrm/import_sugarcrm_view.xml
index c0442fb,8dfc984..7188108
--- 1/addons/import_sugarcrm/import_sugarcrm_view.xml
--- 2/addons/import_sugarcrm/import_sugarcrm_view.xml
+++ b/addons/import_sugarcrm/import_sugarcrm_view.xml
@@@ -9,58 -9,76 +9,58 @@@
        <field name="type">form</field>
        <field name="arch" type="xml">
          <form string="Import Data From SugarCRM" version="7.0">
 -          <header>
 -                <button name="import_from_scheduler_all" string="_Schedule Recurrent Imports" type="object" class="oe_highlight"  />
 -                or
 -                <button name="import_all" string="_Import" type="object" class="oe_highlight"  />
 -                or
 -                <button string="Cancel" class="oe_link" special="cancel" />
 -          </header>
 -          <group col="8" >
 -            <group colspan="2" col="2" width="200">
 -              <label colspan="2"  string="Import your data from SugarCRM :"/>
 -              <label colspan="2"  string="" />
 -              <label colspan="2"  string="Use the SugarSoap API URL (read tooltip) and a full access SugarCRM login."/>
 -              <label colspan="2"  string="" />
 -              <label colspan="2"  string="Choose data you want to import. Click 'Import' to get data manually or 'Schedule Reccurent Imports' to get recurrently and automatically data."/>
 -              <label colspan="2"  string="" />
 -              <label colspan="2"  string="If you make recurrent or ponctual import, data already  in OpenERP will be updated by SugarCRM data."/>
 -              <label colspan="2"  string="" />
 -              <label colspan="2"  string="Do not forget the email address to be notified of the success of the import."/>
 -              <label colspan="2" />
 -              <label colspan="2"  string="Online documentation:"/>
 -              <label colspan="2"  string="(Coming Soon)"/>
 -              <label colspan="2"  string=""/>
 -            </group>
 -            <separator string="" orientation="vertical" colspan="1" rowspan="24" />
 -            <group colspan="5">
 -              <separator string="Login Information" colspan="4"/>
 -              <field name="url" colspan="4" widget="url"/>
 -              <field name="username" colspan="4"/>
 -              <field name="password" password="True" colspan="4"/>
 +            <header>
 +                <button name="import_all" string="_Import"
-                         type="object" icon="terp-camera_test"/>
++                        type="object" class="oe_highlight"/>
 +                <button name="import_from_scheduler_all" string="_Schedule Recurrent Imports"
-                         type="object" icon="gtk-execute" />
-                 <button icon="gtk-cancel" special="cancel" string="_Cancel"/>
++                        type="object" class="oe_highlight" />
++                <button special="cancel" string="_Cancel" class="oe_link"/>
 +            </header>
 +            <sheet>
 +              <group col="8" >
 +                <group colspan="5">
 +                  <separator string="Login Information" colspan="4"/>
 +                  <field name="url" colspan="2" widget="url"/>
 +                  <field name="username" colspan="2"/>
 +                  <field name="password" password="True" colspan="2"/>
  
 -              <group colspan="4">
 -                <group colspan="1" col="2">
 -                  <separator string="Address Book" colspan="2"/>
 -                  <field name="user" />
 -                  <field name= "account" />
 -                  <field name= "contact" />
 -                </group>
 -                <group colspan="1" col="2">
 -                  <separator string="CRM" colspan="2"/>
 -                  <field name="opportunity" />
 -                  <field name= "call" />
 -                  <field name= "meeting" />
 -                  <field name= "claim" />
 -                </group>
 -                <group colspan="1" col="2">
 -                  <separator string="Project" colspan="2"/>
 -                  <field name= "project" />
 -                  <field name= "project_task" />
 -                  <field name= "bug"/>
 -                </group>
 -                <group colspan="1" col="2">
 -                  <separator string="HR" colspan="2"/>
 -                  <field name="employee" />
 -                  <separator string="Document" colspan="2"/>
 -                  <field name="email_history"/>
 -                  <field name= "document" />
 -                </group>
 -              </group>
 +                  <group colspan="4">
 +                    <separator string="Data to Import" colspan="4"/>
 +                    <group colspan="1" col="2">
 +                      <field name="user" />
 +                      <field name= "account" />
 +                      <field name= "contact" />
 +                    </group>
 +                    <group colspan="1" col="2">
 +                      <field name="opportunity" />
 +                      <field name= "call" />
 +                      <field name= "meeting" />
 +                      <field name= "claim" />
 +                    </group>
 +                    <group colspan="1" col="2">
 +                      <field name= "project" />
 +                      <field name= "project_task" />
 +                      <field name= "bug"/>
 +                    </group>
 +                    <group colspan="1" col="2">
 +                      <field name="employee" />
 +                      <field name="email_history"/>
 +                      <field name= "document" />
 +                    </group>
 +                  </group>
  
 -              <group colspan="4">
 -                <separator string="Email Notification When Import is Finished" colspan="4"/>
 -                <field name="email_from" widget="email" string="Email Address to Notify" colspan="4"/>
 -              </group>
 +                  <group colspan="4">
 +                    <separator string="Email Notification When Import is Finished" colspan="2"/>
 +                    <field name="email_from" widget="email" string="Email Address to Notify" colspan="2"/>
 +                  </group>
  
 -              <group colspan="4" groups="base.group_no_one">
 -                <separator string="Multi Instance Management" colspan="4"/>
 -                <field name="instance_name" colspan="4"/>
 +                  <group colspan="4" groups="base.group_no_one">
 +                    <separator string="Multi Instance Management" colspan="4"/>
 +                    <field name="instance_name" colspan="2"/>
 +                </group>
 +              </group>
                </group>
 -            </group>
 -          </group>
 +          </sheet>
          </form>
        </field>
      </record>

diff --cc addons/product/product_view.xml
Simple merge

diff --cc addons/project_long_term/project_long_term_view.xml
Simple merge

diff --cc addons/sale/sale_view.xml
Simple merge

diff --cc addons/stock/stock_view.xml
Simple merge

diff --cc addons/wiki/wiki_view.xml
index 584ec21,840692e..7418056
--- 1/addons/wiki/wiki_view.xml
--- 2/addons/wiki/wiki_view.xml
+++ b/addons/wiki/wiki_view.xml
@@@ -129,20 -129,11 +129,18 @@@
              <field name="arch" type="xml">
                  <form string="Wiki" version="7.0">
                      <sheet>
 -                        <group col="6" colspan="4">
 -                            <field name="name" colspan="6"/>
 -                            <field name="group_id" string="Topic" on_change="onchange_group_id(group_id, text_area)"/>
 -                            <field name="parent_id" domain="[('group_id','=',group_id)]"/>
 -                            <field name="section"/>                        
 +                        <div class="oe_title">
 +                            <label for="name" class="oe_edit_only"/>
 +                                <h1><field name="name" select="1" /></h1>
 +                            <label for="group_id" class="oe_edit_only"/>
 +                            <h2>
 +                            <field name="group_id" string="Topic" select="1" on_change="onchange_group_id(group_id, text_area)"/></h2>
 +                        </div>
 +                        <group>
 +                            <group>
 +                                <field name="parent_id" domain="[('group_id','=',group_id)]"/>
 +                                <field name="section"/>
 +                            </group>
-                             <group>
-                             </group>
                          </group>
                          <notebook colspan="4">
                              <page string="Content">