[MERGE] upstream

bzr revid: hmo@tinyerp.com-20120713082841-24eqqtv4gy0d4q3y

diff --combined addons/portal/wizard/portal_wizard_view.xml
index 26de675,55a8404..b903cc5
--- 1/addons/portal/wizard/portal_wizard_view.xml
--- 2/addons/portal/wizard/portal_wizard_view.xml
+++ b/addons/portal/wizard/portal_wizard_view.xml
@@@ -3,7 -3,7 +3,7 @@@
      <data>
          <!-- wizard action on res.partner -->
          <act_window id="partner_wizard_action"
 -            name="Add Portal Access"
 +            name="Portal Access Management"
              src_model="res.partner"
              res_model="res.portal.wizard"
              view_type="form" view_mode="form"
@@@ -12,26 -12,23 +12,24 @@@
  
          <!-- wizard view -->
          <record id="wizard_view" model="ir.ui.view">
 -            <field name="name">Add Portal Access</field>
 +            <field name="name">Portal Access Management</field>
              <field name="model">res.portal.wizard</field>
              <field name="type">form</field>
              <field name="arch" type="xml">
                  <form string="Add Portal Access" version="7.0">
-                     <header>
-                         <button string="Apply"
-                             name="action_manage_portal_access" type="object" class="oe_highlight"  />
-                         or
-                         <button string="Cancel" class="oe_link" special="cancel" />
-                     </header>
 -                    <group col="4">
 +                    <group>
 +                        <field name="partner_id" invisible="1"/>
-                         <field name="portal_id" on_change="onchange_portal_id(partner_id, portal_id)"/>
+                         <field name="portal_id" widget="selection"/>
                      </group>
-                     <separator string="Users"/>
++                    <label for="user_ids"/>
                      <field name="user_ids"/>
-                     <separator string="Message"/>
 -                    <label string="The following text will be included in the welcome email sent to users."/>
 -                    <field name="message"/>
 +                    <field name="message" placeholder="This text will be included in the welcome email sent to users."/>
- 
+                     <footer>
 -                        <button string="Send Invitations"
 -                            name="action_create" type="object" class="oe_highlight"  />
++                        <button string="Apply"
++                            name="action_manage_portal_access" type="object" class="oe_highlight"  />
+                         or
+                         <button string="Cancel" class="oe_link" special="cancel" />    
+                     </footer>
                  </form>
              </field>
          </record>
@@@ -48,7 -45,6 +46,7 @@@
                      <field name="name"/>
                      <field name="user_email"/>
                      <field name="partner_id"/>
 +                    <field name="has_portal_user"/>
                  </tree>
              </field>
          </record>