merge

country.xml

@@ -56,7 +56,7 @@
             <field name="view" ref="country_view_form"/>
             <field name="act_window" ref="act_country_form"/>
         </record>
-        <menuitem parent="ir.menu_administration" action="act_country_form"
+        <menuitem parent="menu_configuration" action="act_country_form"
             id="menu_country_form"/>
 
         <!--

party.py

@@ -38,10 +38,8 @@ class Party(OSV):
     name = fields.Char('Name', size=None, required=True, select=1,
            states=STATES)
     code = fields.Char('Code', size=None, required=True, select=1,
-            readonly=True, order_field="LPAD(%s.code, " \
-                    "(SELECT code_length FROM relationship_party " \
-                        "ORDER BY code_length DESC LIMIT 1)," \
-                    "'0')")
+            readonly=True, order_field="%(table)s.code_length %(order)s, " \
+                    "%(table)s.code %(order)s")
     code_length = fields.Integer('Code Length', select=1, readonly=True)
     type = fields.Many2One("relationship.party.type", "Type",
            states=STATES)

party.xml

@@ -35,7 +35,7 @@
                     <field name="active" xexpand="0" width="100"/>
                     <notebook colspan="6">
                         <page string="General">
-                            <field name="addresses" mode="form,tree" colspan="4" height="200">
+                            <field name="addresses" mode="form,tree" colspan="4">
                                 <tree string="Addresses" sequence="sequence">
                                     <field name="sequence" tree_invisible="1"/>
                                     <field name="name"/>

relationship.xml

@@ -11,5 +11,9 @@
 
         <menuitem name="Relationship Management" sequence="0" id="menu_relationship"
             icon="tryton-users"/>
+
+        <menuitem name="Configuration" sequence="0" id="menu_configuration"
+            icon="tryton-preferences" groups="res.group_admin"
+            parent="menu_relationship"/>
     </data>
 </tryton>