merged with #1024 trunk

bzr revid: jean-baptiste.aubort@camptocamp.com-20080826084217-plshba1mxektp8cf

diff --cc bin/addons/base/base_update.xml
Simple merge

diff --cc bin/addons/base/ir/ir.xml
Simple merge

diff --cc bin/addons/base/module/module_wizard.xml
Simple merge

diff --cc bin/addons/base/res/partner/partner_view.xml
index 4f20ba0,9f625f1..062ccd1
--- 1/bin/addons/base/res/partner/partner_view.xml
--- 2/bin/addons/base/res/partner/partner_view.xml
+++ b/bin/addons/base/res/partner/partner_view.xml
@@@ -3,13 -3,13 +3,13 @@@
      <data>
          <menuitem icon="terp-partner" id="menu_base_partner" name="Partners" sequence="0"/>
          
 -        <menuitem groups="group_admin" id="menu_base_config" name="Configuration" parent="menu_base_partner" sequence="1"/>
 +        <menuitem id="menu_base_config" name="Configuration" parent="menu_base_partner" sequence="1"/>
          
          <!--
-       ================================
-       Function
-       ================================
-       -->
+     ================================
+     Function
+     ================================
+     -->
          <record id="view_partner_function_form" model="ir.ui.view">
              <field name="name">res.partner.function.form</field>
              <field name="model">res.partner.function</field>
@@@ -38,13 -38,13 +38,13 @@@
              <field name="res_model">res.partner.function</field>
              <field name="view_type">form</field>
          </record>
 -        <menuitem action="action_partner_function_form" groups="group_admin" id="menu_partner_function_form" parent="base.menu_base_config"/>
 +        <menuitem action="action_partner_function_form" id="menu_partner_function_form" parent="base.menu_base_config"/>
          
          <!--
-       =====================
-       Partner Address
-       =====================
-       -->
+     =====================
+     Partner Address
+     =====================
+     -->
          <record id="view_partner_address_tree" model="ir.ui.view">
              <field name="name">res.partner.address.tree</field>
              <field name="model">res.partner.address</field>
@@@ -173,13 -173,13 +173,13 @@@
              <field name="res_model">res.partner.title</field>
              <field name="view_type">form</field>
          </record>
 -        <menuitem action="action_partner_title" groups="group_admin" id="menu_partner_title" parent="base.menu_base_config"/>
 +        <menuitem action="action_partner_title" id="menu_partner_title" parent="base.menu_base_config"/>
          
          <!--
-       =======================
-       Partner
-       =======================
-       -->
+     =======================
+     Partner
+     =======================
+     -->
          <record id="view_partner_tree" model="ir.ui.view">
              <field name="name">res.partner.tree</field>
              <field name="model">res.partner</field>

diff --cc bin/addons/base/res/res_user.py
Simple merge

diff --cc bin/osv/orm.py
Simple merge