[MERGE] with trunk

bzr revid: fka@tinyerp.com-20130607132054-b1595ydnrggy03hg
bzr revid: fka@tinyerp.com-20130610052452-4ot0hi3eddjb615h
bzr revid: fka@tinyerp.com-20130613045949-crjrg8yok7xv6zmm

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

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

diff --cc addons/account/project/project_view.xml
Simple merge

diff --cc addons/document_page/document_page_view.xml
Simple merge

diff --cc addons/hr/hr_view.xml
Simple merge

diff --cc addons/hr_expense/hr_expense_view.xml
Simple merge

diff --cc addons/mrp/mrp_view.xml
Simple merge

diff --cc addons/project_issue/project_issue_view.xml
index 3f3147b,46caba0..125a953
--- 1/addons/project_issue/project_issue_view.xml
--- 2/addons/project_issue/project_issue_view.xml
+++ b/addons/project_issue/project_issue_view.xml
@@@ -68,15 -68,16 +68,16 @@@
                      <label for="categ_ids" class="oe_edit_only"/>
                      <field name="categ_ids" widget="many2many_tags"/>
                      <group>
-                         <group groups="base.group_user">
+                         <group>
                              <field name="user_id" 
 -                                context="{'default_groups_ref': ['base.group_user', 'project.group_project_user']}"/>
 +                                context="{'default_groups_ref': ['project.group_project_user']}"/>
                              <field name="partner_id"  on_change="onchange_partner_id(partner_id, email_from)"/>
                              <field name="email_from"/>
-                             <label for="project_id" groups="base.group_user"/>
-                             <div groups="base.group_user">
+                             <label for="project_id"/>
+                             <div>
                                  <field name="project_id" on_change="on_change_project(project_id)" class="oe_inline" context="{'default_use_issues':1}"/>
-                                 <button name="case_escalate" string="⇒ Escalate" type="object" states="draft,open,pending" class="oe_link"/>
+                                 <button name="case_escalate" string="⇒ Escalate" type="object" states="draft,open,pending" class="oe_link"
+                                         groups="base.group_user"/>
                              </div>
                          </group>
                          <group>

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

diff --cc addons/purchase/purchase_view.xml
Simple merge