diff --git a/category.py b/category.py
index 8788ac6817..4010a369f2 100644
--- a/category.py
+++ b/category.py
@@ -14,7 +14,7 @@ class Category(OSV):
            states=STATES)
     parent = fields.Many2One('partner.category', 'Parent Category',
            select=1, states=STATES)
-    complete_name = fields.Function('complete_name',
+    complete_name = fields.Function('get_complete_name',
            type="char", string='Name', states=STATES)
     childs = fields.One2Many('partner.category', 'parent',
        'Childs Category', states=STATES)
@@ -30,7 +30,7 @@ class Category(OSV):
     def default_active(self, cursor, user, context=None):
         return 1
 
-    def complete_name(self, cursor, user, obj_id, name, value, arg,
+    def get_complete_name(self, cursor, user, obj_id, name, value, arg,
             context=None):
         res = self.name_get(cursor, user, ids, context)
         return dict(res)
diff --git a/category.xml b/category.xml
index dababb2e1c..0f04bce1c2 100644
--- a/category.xml
+++ b/category.xml
@@ -78,5 +78,29 @@
         </record>
         <menuitem name="New category" parent="menu_category_tree"
               action="act_category_form2" id="menu_category_form2"/>
+
+        <record model="res.group" id="group_partner_admin">
+            <field name="name">Partner administration</field>
+        </record>
+        <record model="res.user" id="res.user_admin">
+            <field name="groups" eval="[(4, ref('group_partner_admin'))]"/>
+        </record>
+
+        <record model="ir.model.access" id="access_partner_category">
+            <field name="model" search="[('model', '=', 'partner.category')]"/>
+            <field name="perm_read" eval="True"/>
+            <field name="perm_write" eval="False"/>
+            <field name="perm_create" eval="False"/>
+            <field name="perm_unlink" eval="False"/>
+        </record>
+        <record model="ir.model.access" id="access_partner_category_admin">
+            <field name="model" search="[('model', '=', 'partner.category')]"/>
+            <field name="group" ref="group_partner_admin"/>
+            <field name="perm_read" eval="True"/>
+            <field name="perm_write" eval="True"/>
+            <field name="perm_create" eval="True"/>
+            <field name="perm_unlink" eval="True"/>
+        </record>
+
     </data>
 </tryton>
diff --git a/country.xml b/country.xml
index 83f2b18837..6935895533 100644
--- a/country.xml
+++ b/country.xml
@@ -1275,5 +1275,38 @@
             <field name="code">wy</field>
             <field name="country" ref="us"/>
         </record>
+
+        <record model="ir.model.access" id="access_country">
+            <field name="model" search="[('model', '=', 'partner.country')]"/>
+            <field name="perm_read" eval="True"/>
+            <field name="perm_write" eval="False"/>
+            <field name="perm_create" eval="False"/>
+            <field name="perm_unlink" eval="False"/>
+        </record>
+        <record model="ir.model.access" id="access_country_admin">
+            <field name="model" search="[('model', '=', 'partner.country')]"/>
+            <field name="group" ref="res.group_admin"/>
+            <field name="perm_read" eval="True"/>
+            <field name="perm_write" eval="True"/>
+            <field name="perm_create" eval="True"/>
+            <field name="perm_unlink" eval="True"/>
+        </record>
+
+        <record model="ir.model.access" id="access_country_state">
+            <field name="model" search="[('model', '=', 'partner.country.state')]"/>
+            <field name="perm_read" eval="True"/>
+            <field name="perm_write" eval="False"/>
+            <field name="perm_create" eval="False"/>
+            <field name="perm_unlink" eval="False"/>
+        </record>
+        <record model="ir.model.access" id="access_country_state_admin">
+            <field name="model" search="[('model', '=', 'partner.country.state')]"/>
+            <field name="group" ref="res.group_admin"/>
+            <field name="perm_read" eval="True"/>
+            <field name="perm_write" eval="True"/>
+            <field name="perm_create" eval="True"/>
+            <field name="perm_unlink" eval="True"/>
+        </record>
+
     </data>
 </tryton>
diff --git a/partner.xml b/partner.xml
index 96fcfdca59..a158cc9f3d 100644
--- a/partner.xml
+++ b/partner.xml
@@ -38,6 +38,8 @@
                                     <field name="active"/>
                                 </tree>
                             </field>
+                            <label name="type"/>
+                            <field name="type" select="2"/>
                             <label name="lang"/>
                             <field name="lang" widget="selection"/>
                             <separator string="Categories" colspan="4"/>