diff --git a/__init__.py b/__init__.py
index 6e02e439be..2a597bdc0d 100644
--- a/__init__.py
+++ b/__init__.py
@@ -28,5 +28,4 @@
 from category import *
 from partner import *
 from country import *
-from state import *
 from address import *
diff --git a/__tryton__.py b/__tryton__.py
index 5dc8d278aa..7091f89846 100644
--- a/__tryton__.py
+++ b/__tryton__.py
@@ -10,6 +10,7 @@
     "xml" : [
         "category.xml",
         "partner.xml",
+        "country.xml",
         "address.xml",
     ],
 }
diff --git a/address.py b/address.py
index 1244d0d794..e03b78600b 100644
--- a/address.py
+++ b/address.py
@@ -19,10 +19,10 @@ class Address(OSV):
     zip = fields.Char('Zip', change_default=True, size=24,
            states=STATES)
     city = fields.Char('City', size=128, states=STATES)
-    state = fields.Many2One("partner.state", 'State',
-           domain="[('country_id','=',country_id)]", states=STATES)
     country = fields.Many2One('partner.country', 'Country',
            states=STATES)
+    state = fields.Many2One("partner.country.state", 'State',
+           domain="[('country', '=', country)]", states=STATES)
     email = fields.Char('E-Mail', size=64, states=STATES)
     phone = fields.Char('Phone', size=64, states=STATES)
     fax = fields.Char('Fax', size=64, states=STATES)
diff --git a/address.xml b/address.xml
index ff0aeda1a5..22b68f2876 100644
--- a/address.xml
+++ b/address.xml
@@ -30,25 +30,30 @@
                     <label name="type"/>
                     <field name="type"/>
                     <label name="active"/>
-                    <field name="active" invisible="0"/>
+                    <field name="active" invisible="0"
+                        xexpand="0" width="100"/>
                     <label name="street"/>
                     <field name="street"/>
                     <label name="streetbis"/>
                     <field name="streetbis"/>
+                    <newline/>
                     <label name="zip"/>
                     <field name="zip"/>
                     <label name="city"/>
                     <field name="city"/>
+                    <newline/>
                     <label name="country"/>
                     <field name="country" completion="1"/>
                     <label name="state"/>
                     <field name="state"/>
+                    <newline/>
                     <label name="phone"/>
                     <field name="phone"/>
-                    <label name="fax"/>
-                    <field name="fax"/>
                     <label name="mobile"/>
                     <field name="mobile"/>
+                    <newline/>
+                    <label name="fax"/>
+                    <field name="fax"/>
                     <label name="email"/>
                     <field name="email" widget="email"/>
                 </form>
diff --git a/category.xml b/category.xml
index f5eace1a70..49fdd8d921 100644
--- a/category.xml
+++ b/category.xml
@@ -7,7 +7,7 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <![CDATA[
-                <form string="Partner categories">
+                <form string="Category">
                     <label name="name"/>
                     <field name="name"/>
                     <label name="active"/>
@@ -24,7 +24,7 @@
             <field name="field_childs">childs</field>
             <field name="arch" type="xml">
                 <![CDATA[
-                <tree string="Partner Categories">
+                <tree string="Categories">
                     <field name="name" select="1"/>
                     <field name="active" select="2" invisible="1"/>
                 </tree>
diff --git a/country.py b/country.py
index e4dd67eef6..fa3d314af0 100644
--- a/country.py
+++ b/country.py
@@ -5,15 +5,16 @@ STATES = {
 
 
 class Country(OSV):
-    'Partner Country'
+    'Country'
     _name = 'partner.country'
     _description = __doc__
     _order='code'
     name = fields.Char('Country Name', size=64,
-           help='The full name of the country.', required=True)
+           help='The full name of the country.', required=True, translate=True)
     code = fields.Char('Country Code', size=2,
            help='The ISO country code in two chars.\n'
            'You can use this field for quick search.', required=True)
+    state = fields.One2Many('partner.country.state', 'country', 'State')
     _sql_constraints = [
         ('name_uniq', 'unique (name)',
          'The name of the country must be unique !'),
@@ -48,3 +49,28 @@ class Country(OSV):
                 context=context)
 
 Country()
+
+
+class State(OSV):
+    "State"
+    _name = 'partner.country.state'
+    _description = __doc__
+    _order = 'code'
+    country = fields.Many2One('partner.country', 'Country',
+            required=True)
+    name = fields.Char('State Name', size=64, required=True)
+    code = fields.Char('State Code', size=3, required=True)
+
+    def create(self, cursor, user, vals, context=None):
+        if 'code' in vals:
+            vals['code'] = vals['code'].upper()
+        return super(State, self).create(cursor, user, vals,
+                context=context)
+
+    def write(self, cursor, user, ids, vals, context=None):
+        if 'code' in vals:
+            vals['code'] = vals['code'].upper()
+        return super(State, self).write(cursor, user, ids, vals,
+                context=context)
+
+State()
diff --git a/country.xml b/country.xml
new file mode 100644
index 0000000000..83f2b18837
--- /dev/null
+++ b/country.xml
@@ -0,0 +1,1279 @@
+<?xml version="1.0"?>
+<tryton>
+    <data>
+        <menuitem name="Partner" id="menu_partner_admin"
+            parent="ir.menu_administration"/>
+        <record model="ir.ui.view" id="country_view_form">
+            <field name="model">partner.country</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <![CDATA[
+                <form string="Country">
+                    <label name="name"/>
+                    <field name="name"/>
+                    <label name="code"/>
+                    <field name="code"/>
+                    <separator name="state" colspan="4"/>
+                    <field name="state" colspan="4">
+                        <form string="State">
+                            <label name="name"/>
+                            <field name="name"/>
+                            <label name="code"/>
+                            <field name="code"/>
+                        </form>
+                        <tree string="States">
+                            <field name="name"/>
+                            <field name="code"/>
+                        </tree>
+                    </field>
+                </form>
+                ]]>
+            </field>
+        </record>
+        <record model="ir.ui.view" id="country_view_tree">
+            <field name="model">partner.country</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <![CDATA[
+                <tree string="Countries">
+                    <field name="name" select="1"/>
+                    <field name="code" select="1"/>
+                </tree>
+                ]]>
+            </field>
+        </record>
+        <record model="ir.action.act_window" id="act_country_form">
+            <field name="name">Countries</field>
+            <field name="res_model">partner.country</field>
+            <field name="view_type">form</field>
+        </record>
+        <record model="ir.action.act_window.view" id="act_country_form_view1">
+            <field name="sequence" eval="10"/>
+            <field name="view" ref="country_view_tree"/>
+            <field name="act_window" ref="act_country_form"/>
+        </record>
+        <record model="ir.action.act_window.view" id="act_country_form_view2">
+            <field name="sequence" eval="20"/>
+            <field name="view" ref="country_view_form"/>
+            <field name="act_window" ref="act_country_form"/>
+        </record>
+        <menuitem parent="menu_partner_admin" action="act_country_form"
+            id="menu_country_form"/>
+        <record model="partner.country" id="ad">
+            <field name="name">Andorra, Principality of</field>
+            <field name="code">ad</field>
+        </record>
+        <record model="partner.country" id="ae">
+            <field name="name">United Arab Emirates</field>
+            <field name="code">ae</field>
+        </record>
+        <record model="partner.country" id="af">
+            <field name="name">Afghanistan, Islamic State of</field>
+            <field name="code">af</field>
+        </record>
+        <record model="partner.country" id="ag">
+            <field name="name">Antigua and Barbuda</field>
+            <field name="code">ag</field>
+        </record>
+        <record model="partner.country" id="ai">
+            <field name="name">Anguilla</field>
+            <field name="code">ai</field>
+        </record>
+        <record model="partner.country" id="al">
+            <field name="name">Albania</field>
+            <field name="code">al</field>
+        </record>
+        <record model="partner.country" id="am">
+            <field name="name">Armenia</field>
+            <field name="code">am</field>
+        </record>
+        <record model="partner.country" id="an">
+            <field name="name">Netherlands Antilles</field>
+            <field name="code">an</field>
+        </record>
+        <record model="partner.country" id="ao">
+            <field name="name">Angola</field>
+            <field name="code">ao</field>
+        </record>
+        <record model="partner.country" id="aq">
+            <field name="name">Antarctica</field>
+            <field name="code">aq</field>
+        </record>
+        <record model="partner.country" id="ar">
+            <field name="name">Argentina</field>
+            <field name="code">ar</field>
+        </record>
+        <record model="partner.country" id="as">
+            <field name="name">American Samoa</field>
+            <field name="code">as</field>
+        </record>
+        <record model="partner.country" id="at">
+            <field name="name">Austria</field>
+            <field name="code">at</field>
+        </record>
+        <record model="partner.country" id="au">
+            <field name="name">Australia</field>
+            <field name="code">au</field>
+        </record>
+        <record model="partner.country" id="aw">
+            <field name="name">Aruba</field>
+            <field name="code">aw</field>
+        </record>
+        <record model="partner.country" id="az">
+            <field name="name">Azerbaidjan</field>
+            <field name="code">az</field>
+        </record>
+        <record model="partner.country" id="ba">
+            <field name="name">Bosnia-Herzegovina</field>
+            <field name="code">ba</field>
+        </record>
+        <record model="partner.country" id="bb">
+            <field name="name">Barbados</field>
+            <field name="code">bb</field>
+        </record>
+        <record model="partner.country" id="bd">
+            <field name="name">Bangladesh</field>
+            <field name="code">bd</field>
+        </record>
+        <record model="partner.country" id="be">
+            <field name="name">Belgium</field>
+            <field name="code">be</field>
+        </record>
+        <record model="partner.country" id="bf">
+            <field name="name">Burkina Faso</field>
+            <field name="code">bf</field>
+        </record>
+        <record model="partner.country" id="bg">
+            <field name="name">Bulgaria</field>
+            <field name="code">bg</field>
+        </record>
+        <record model="partner.country" id="bh">
+            <field name="name">Bahrain</field>
+            <field name="code">bh</field>
+        </record>
+        <record model="partner.country" id="bi">
+            <field name="name">Burundi</field>
+            <field name="code">bi</field>
+        </record>
+        <record model="partner.country" id="bj">
+            <field name="name">Benin</field>
+            <field name="code">bj</field>
+        </record>
+        <record model="partner.country" id="bm">
+            <field name="name">Bermuda</field>
+            <field name="code">bm</field>
+        </record>
+        <record model="partner.country" id="bn">
+            <field name="name">Brunei Darussalam</field>
+            <field name="code">bn</field>
+        </record>
+        <record model="partner.country" id="bo">
+            <field name="name">Bolivia</field>
+            <field name="code">bo</field>
+        </record>
+        <record model="partner.country" id="br">
+            <field name="name">Brazil</field>
+            <field name="code">br</field>
+        </record>
+        <record model="partner.country" id="bs">
+            <field name="name">Bahamas</field>
+            <field name="code">bs</field>
+        </record>
+        <record model="partner.country" id="bt">
+            <field name="name">Bhutan</field>
+            <field name="code">bt</field>
+        </record>
+        <record model="partner.country" id="bv">
+            <field name="name">Bouvet Island</field>
+            <field name="code">bv</field>
+        </record>
+        <record model="partner.country" id="bw">
+            <field name="name">Botswana</field>
+            <field name="code">bw</field>
+        </record>
+        <record model="partner.country" id="by">
+            <field name="name">Belarus</field>
+            <field name="code">by</field>
+        </record>
+        <record model="partner.country" id="bz">
+            <field name="name">Belize</field>
+            <field name="code">bz</field>
+        </record>
+        <record model="partner.country" id="ca">
+            <field name="name">Canada</field>
+            <field name="code">ca</field>
+        </record>
+        <record model="partner.country" id="cc">
+            <field name="name">Cocos (Keeling) Islands</field>
+            <field name="code">cc</field>
+        </record>
+        <record model="partner.country" id="cf">
+            <field name="name">Central African Republic</field>
+            <field name="code">cf</field>
+        </record>
+        <record model="partner.country" id="cd">
+            <field name="name">Congo, The Democratic Republic of the</field>
+            <field name="code">cd</field>
+        </record>
+        <record model="partner.country" id="cg">
+            <field name="name">Congo</field>
+            <field name="code">cg</field>
+        </record>
+        <record model="partner.country" id="ch">
+            <field name="name">Suisse</field>
+            <field name="code">ch</field>
+        </record>
+        <record model="partner.country" id="ci">
+            <field name="name">Ivory Coast (Cote D'Ivoire)</field>
+            <field name="code">ci</field>
+        </record>
+        <record model="partner.country" id="ck">
+            <field name="name">Cook Islands</field>
+            <field name="code">ck</field>
+        </record>
+        <record model="partner.country" id="cl">
+            <field name="name">Chile</field>
+            <field name="code">cl</field>
+        </record>
+        <record model="partner.country" id="cm">
+            <field name="name">Cameroon</field>
+            <field name="code">cm</field>
+        </record>
+        <record model="partner.country" id="cn">
+            <field name="name">China</field>
+            <field name="code">cn</field>
+        </record>
+        <record model="partner.country" id="co">
+            <field name="name">Colombia</field>
+            <field name="code">co</field>
+        </record>
+        <record model="partner.country" id="cr">
+            <field name="name">Costa Rica</field>
+            <field name="code">cr</field>
+        </record>
+        <record model="partner.country" id="cs">
+            <field name="name">Serbia and Montenegro</field>
+            <field name="code">cs</field>
+        </record>
+        <record model="partner.country" id="cu">
+            <field name="name">Cuba</field>
+            <field name="code">cu</field>
+        </record>
+        <record model="partner.country" id="cv">
+            <field name="name">Cape Verde</field>
+            <field name="code">cv</field>
+        </record>
+        <record model="partner.country" id="cx">
+            <field name="name">Christmas Island</field>
+            <field name="code">cx</field>
+        </record>
+        <record model="partner.country" id="cy">
+            <field name="name">Cyprus</field>
+            <field name="code">cy</field>
+        </record>
+        <record model="partner.country" id="cz">
+            <field name="name">Czech Republic</field>
+            <field name="code">cz</field>
+        </record>
+        <record model="partner.country" id="de">
+            <field name="name">Germany</field>
+            <field name="code">de</field>
+        </record>
+        <record model="partner.country" id="dj">
+            <field name="name">Djibouti</field>
+            <field name="code">dj</field>
+        </record>
+        <record model="partner.country" id="dk">
+            <field name="name">Denmark</field>
+            <field name="code">dk</field>
+        </record>
+        <record model="partner.country" id="dm">
+            <field name="name">Dominica</field>
+            <field name="code">dm</field>
+        </record>
+        <record model="partner.country" id="do">
+            <field name="name">Dominican Republic</field>
+            <field name="code">do</field>
+        </record>
+        <record model="partner.country" id="dz">
+            <field name="name">Algeria</field>
+            <field name="code">dz</field>
+        </record>
+        <record model="partner.country" id="ec">
+            <field name="name">Ecuador</field>
+            <field name="code">ec</field>
+        </record>
+        <record model="partner.country" id="ee">
+            <field name="name">Estonia</field>
+            <field name="code">ee</field>
+        </record>
+        <record model="partner.country" id="eg">
+            <field name="name">Egypt</field>
+            <field name="code">eg</field>
+        </record>
+        <record model="partner.country" id="eh">
+            <field name="name">Western Sahara</field>
+            <field name="code">eh</field>
+        </record>
+        <record model="partner.country" id="er">
+            <field name="name">Eritrea</field>
+            <field name="code">er</field>
+        </record>
+        <record model="partner.country" id="es">
+            <field name="name">Spain</field>
+            <field name="code">es</field>
+        </record>
+        <record model="partner.country" id="et">
+            <field name="name">Ethiopia</field>
+            <field name="code">et</field>
+        </record>
+        <record model="partner.country" id="fi">
+            <field name="name">Finland</field>
+            <field name="code">fi</field>
+        </record>
+        <record model="partner.country" id="fj">
+            <field name="name">Fiji</field>
+            <field name="code">fj</field>
+        </record>
+        <record model="partner.country" id="fk">
+            <field name="name">Falkland Islands</field>
+            <field name="code">fk</field>
+        </record>
+        <record model="partner.country" id="fm">
+            <field name="name">Micronesia</field>
+            <field name="code">fm</field>
+        </record>
+        <record model="partner.country" id="fo">
+            <field name="name">Faroe Islands</field>
+            <field name="code">fo</field>
+        </record>
+        <record model="partner.country" id="fr">
+            <field name="name">France</field>
+            <field name="code">fr</field>
+        </record>
+        <record model="partner.country" id="ga">
+            <field name="name">Gabon</field>
+            <field name="code">ga</field>
+        </record>
+        <record model="partner.country" id="gd">
+            <field name="name">Grenada</field>
+            <field name="code">gd</field>
+        </record>
+        <record model="partner.country" id="ge">
+            <field name="name">Georgia</field>
+            <field name="code">ge</field>
+        </record>
+        <record model="partner.country" id="gf">
+            <field name="name">French Guyana</field>
+            <field name="code">gf</field>
+        </record>
+        <record model="partner.country" id="gh">
+            <field name="name">Ghana</field>
+            <field name="code">gh</field>
+        </record>
+        <record model="partner.country" id="gi">
+            <field name="name">Gibraltar</field>
+            <field name="code">gi</field>
+        </record>
+        <record model="partner.country" id="gl">
+            <field name="name">Greenland</field>
+            <field name="code">gl</field>
+        </record>
+        <record model="partner.country" id="gm">
+            <field name="name">Gambia</field>
+            <field name="code">gm</field>
+        </record>
+        <record model="partner.country" id="gn">
+            <field name="name">Guinea</field>
+            <field name="code">gn</field>
+        </record>
+        <record model="partner.country" id="gp">
+            <field name="name">Guadeloupe (French)</field>
+            <field name="code">gp</field>
+        </record>
+        <record model="partner.country" id="gq">
+            <field name="name">Equatorial Guinea</field>
+            <field name="code">gq</field>
+        </record>
+        <record model="partner.country" id="gr">
+            <field name="name">Greece</field>
+            <field name="code">gr</field>
+        </record>
+        <record model="partner.country" id="gs">
+            <field name="name">S. Georgia &amp; S. Sandwich Isls.</field>
+            <field name="code">gs</field>
+        </record>
+        <record model="partner.country" id="gt">
+            <field name="name">Guatemala</field>
+            <field name="code">gt</field>
+        </record>
+        <record model="partner.country" id="gu">
+            <field name="name">Guam (USA)</field>
+            <field name="code">gu</field>
+        </record>
+        <record model="partner.country" id="gw">
+            <field name="name">Guinea Bissau</field>
+            <field name="code">gw</field>
+        </record>
+        <record model="partner.country" id="gy">
+            <field name="name">Guyana</field>
+            <field name="code">gy</field>
+        </record>
+        <record model="partner.country" id="hk">
+            <field name="name">Hong Kong</field>
+            <field name="code">hk</field>
+        </record>
+        <record model="partner.country" id="hm">
+            <field name="name">Heard and McDonald Islands</field>
+            <field name="code">hm</field>
+        </record>
+        <record model="partner.country" id="hn">
+            <field name="name">Honduras</field>
+            <field name="code">hn</field>
+        </record>
+        <record model="partner.country" id="hr">
+            <field name="name">Croatia</field>
+            <field name="code">hr</field>
+        </record>
+        <record model="partner.country" id="ht">
+            <field name="name">Haiti</field>
+            <field name="code">ht</field>
+        </record>
+        <record model="partner.country" id="hu">
+            <field name="name">Hungary</field>
+            <field name="code">hu</field>
+        </record>
+        <record model="partner.country" id="id">
+            <field name="name">Indonesia</field>
+            <field name="code">id</field>
+        </record>
+        <record model="partner.country" id="ie">
+            <field name="name">Ireland</field>
+            <field name="code">ie</field>
+        </record>
+        <record model="partner.country" id="il">
+            <field name="name">Israel</field>
+            <field name="code">il</field>
+        </record>
+        <record model="partner.country" id="in">
+            <field name="name">India</field>
+            <field name="code">in</field>
+        </record>
+        <record model="partner.country" id="io">
+            <field name="name">British Indian Ocean Territory</field>
+            <field name="code">io</field>
+        </record>
+        <record model="partner.country" id="iq">
+            <field name="name">Iraq</field>
+            <field name="code">iq</field>
+        </record>
+        <record model="partner.country" id="ir">
+            <field name="name">Iran</field>
+            <field name="code">ir</field>
+        </record>
+        <record model="partner.country" id="is">
+            <field name="name">Iceland</field>
+            <field name="code">is</field>
+        </record>
+        <record model="partner.country" id="it">
+            <field name="name">Italy</field>
+            <field name="code">it</field>
+        </record>
+        <record model="partner.country" id="jm">
+            <field name="name">Jamaica</field>
+            <field name="code">jm</field>
+        </record>
+        <record model="partner.country" id="jo">
+            <field name="name">Jordan</field>
+            <field name="code">jo</field>
+        </record>
+        <record model="partner.country" id="jp">
+            <field name="name">Japan</field>
+            <field name="code">jp</field>
+        </record>
+        <record model="partner.country" id="ke">
+            <field name="name">Kenya</field>
+            <field name="code">ke</field>
+        </record>
+        <record model="partner.country" id="kg">
+            <field name="name">Kyrgyz Republic (Kyrgyzstan)</field>
+            <field name="code">kg</field>
+        </record>
+        <record model="partner.country" id="kh">
+            <field name="name">Cambodia, Kingdom of</field>
+            <field name="code">kh</field>
+        </record>
+        <record model="partner.country" id="ki">
+            <field name="name">Kiribati</field>
+            <field name="code">ki</field>
+        </record>
+        <record model="partner.country" id="km">
+            <field name="name">Comoros</field>
+            <field name="code">km</field>
+        </record>
+        <record model="partner.country" id="kn">
+            <field name="name">Saint Kitts &amp; Nevis Anguilla</field>
+            <field name="code">kn</field>
+        </record>
+        <record model="partner.country" id="kp">
+            <field name="name">North Korea</field>
+            <field name="code">kp</field>
+        </record>
+        <record model="partner.country" id="kr">
+            <field name="name">South Korea</field>
+            <field name="code">kr</field>
+        </record>
+        <record model="partner.country" id="kw">
+            <field name="name">Kuwait</field>
+            <field name="code">kw</field>
+        </record>
+        <record model="partner.country" id="ky">
+            <field name="name">Cayman Islands</field>
+            <field name="code">ky</field>
+        </record>
+        <record model="partner.country" id="kz">
+            <field name="name">Kazakhstan</field>
+            <field name="code">kz</field>
+        </record>
+        <record model="partner.country" id="la">
+            <field name="name">Laos</field>
+            <field name="code">la</field>
+        </record>
+        <record model="partner.country" id="lb">
+            <field name="name">Lebanon</field>
+            <field name="code">lb</field>
+        </record>
+        <record model="partner.country" id="lc">
+            <field name="name">Saint Lucia</field>
+            <field name="code">lc</field>
+        </record>
+        <record model="partner.country" id="li">
+            <field name="name">Liechtenstein</field>
+            <field name="code">li</field>
+        </record>
+        <record model="partner.country" id="lk">
+            <field name="name">Sri Lanka</field>
+            <field name="code">lk</field>
+        </record>
+        <record model="partner.country" id="lr">
+            <field name="name">Liberia</field>
+            <field name="code">lr</field>
+        </record>
+        <record model="partner.country" id="ls">
+            <field name="name">Lesotho</field>
+            <field name="code">ls</field>
+        </record>
+        <record model="partner.country" id="lt">
+            <field name="name">Lithuania</field>
+            <field name="code">lt</field>
+        </record>
+        <record model="partner.country" id="lu">
+            <field name="name">Luxembourg</field>
+            <field name="code">lu</field>
+        </record>
+        <record model="partner.country" id="lv">
+            <field name="name">Latvia</field>
+            <field name="code">lv</field>
+        </record>
+        <record model="partner.country" id="ly">
+            <field name="name">Libya</field>
+            <field name="code">ly</field>
+        </record>
+        <record model="partner.country" id="ma">
+            <field name="name">Morocco</field>
+            <field name="code">ma</field>
+        </record>
+        <record model="partner.country" id="mc">
+            <field name="name">Monaco</field>
+            <field name="code">mc</field>
+        </record>
+        <record model="partner.country" id="md">
+            <field name="name">Moldavia</field>
+            <field name="code">md</field>
+        </record>
+        <record model="partner.country" id="mg">
+            <field name="name">Madagascar</field>
+            <field name="code">mg</field>
+        </record>
+        <record model="partner.country" id="mh">
+            <field name="name">Marshall Islands</field>
+            <field name="code">mh</field>
+        </record>
+        <record model="partner.country" id="mk">
+            <field name="name">Macedonia</field>
+            <field name="code">mk</field>
+        </record>
+        <record model="partner.country" id="ml">
+            <field name="name">Mali</field>
+            <field name="code">ml</field>
+        </record>
+        <record model="partner.country" id="mm">
+            <field name="name">Myanmar</field>
+            <field name="code">mm</field>
+        </record>
+        <record model="partner.country" id="mn">
+            <field name="name">Mongolia</field>
+            <field name="code">mn</field>
+        </record>
+        <record model="partner.country" id="mo">
+            <field name="name">Macau</field>
+            <field name="code">mo</field>
+        </record>
+        <record model="partner.country" id="mp">
+            <field name="name">Northern Mariana Islands</field>
+            <field name="code">mp</field>
+        </record>
+        <record model="partner.country" id="mq">
+            <field name="name">Martinique (French)</field>
+            <field name="code">mq</field>
+        </record>
+        <record model="partner.country" id="mr">
+            <field name="name">Mauritania</field>
+            <field name="code">mr</field>
+        </record>
+        <record model="partner.country" id="ms">
+            <field name="name">Montserrat</field>
+            <field name="code">ms</field>
+        </record>
+        <record model="partner.country" id="mt">
+            <field name="name">Malta</field>
+            <field name="code">mt</field>
+        </record>
+        <record model="partner.country" id="mu">
+            <field name="name">Mauritius</field>
+            <field name="code">mu</field>
+        </record>
+        <record model="partner.country" id="mv">
+            <field name="name">Maldives</field>
+            <field name="code">mv</field>
+        </record>
+        <record model="partner.country" id="mw">
+            <field name="name">Malawi</field>
+            <field name="code">mw</field>
+        </record>
+        <record model="partner.country" id="mx">
+            <field name="name">Mexico</field>
+            <field name="code">mx</field>
+        </record>
+        <record model="partner.country" id="my">
+            <field name="name">Malaysia</field>
+            <field name="code">my</field>
+        </record>
+        <record model="partner.country" id="mz">
+            <field name="name">Mozambique</field>
+            <field name="code">mz</field>
+        </record>
+        <record model="partner.country" id="na">
+            <field name="name">Namibia</field>
+            <field name="code">na</field>
+        </record>
+        <record model="partner.country" id="nc">
+            <field name="name">New Caledonia (French)</field>
+            <field name="code">nc</field>
+        </record>
+        <record model="partner.country" id="ne">
+            <field name="name">Niger</field>
+            <field name="code">ne</field>
+        </record>
+        <record model="partner.country" id="nf">
+            <field name="name">Norfolk Island</field>
+            <field name="code">nf</field>
+        </record>
+        <record model="partner.country" id="ng">
+            <field name="name">Nigeria</field>
+            <field name="code">ng</field>
+        </record>
+        <record model="partner.country" id="ni">
+            <field name="name">Nicaragua</field>
+            <field name="code">ni</field>
+        </record>
+        <record model="partner.country" id="nl">
+            <field name="name">Netherlands</field>
+            <field name="code">nl</field>
+        </record>
+        <record model="partner.country" id="no">
+            <field name="name">Norway</field>
+            <field name="code">no</field>
+        </record>
+        <record model="partner.country" id="np">
+            <field name="name">Nepal</field>
+            <field name="code">np</field>
+        </record>
+        <record model="partner.country" id="nr">
+            <field name="name">Nauru</field>
+            <field name="code">nr</field>
+        </record>
+        <record model="partner.country" id="nt">
+            <field name="name">Neutral Zone</field>
+            <field name="code">nt</field>
+        </record>
+        <record model="partner.country" id="nu">
+            <field name="name">Niue</field>
+            <field name="code">nu</field>
+        </record>
+        <record model="partner.country" id="nz">
+            <field name="name">New Zealand</field>
+            <field name="code">nz</field>
+        </record>
+        <record model="partner.country" id="om">
+            <field name="name">Oman</field>
+            <field name="code">om</field>
+        </record>
+        <record model="partner.country" id="pa">
+            <field name="name">Panama</field>
+            <field name="code">pa</field>
+        </record>
+        <record model="partner.country" id="pe">
+            <field name="name">Peru</field>
+            <field name="code">pe</field>
+        </record>
+        <record model="partner.country" id="pf">
+            <field name="name">Polynesia (French)</field>
+            <field name="code">pf</field>
+        </record>
+        <record model="partner.country" id="pg">
+            <field name="name">Papua New Guinea</field>
+            <field name="code">pg</field>
+        </record>
+        <record model="partner.country" id="ph">
+            <field name="name">Philippines</field>
+            <field name="code">ph</field>
+        </record>
+        <record model="partner.country" id="pk">
+            <field name="name">Pakistan</field>
+            <field name="code">pk</field>
+        </record>
+        <record model="partner.country" id="pl">
+            <field name="name">Poland</field>
+            <field name="code">pl</field>
+        </record>
+        <record model="partner.country" id="pm">
+            <field name="name">Saint Pierre and Miquelon</field>
+            <field name="code">pm</field>
+        </record>
+        <record model="partner.country" id="pn">
+            <field name="name">Pitcairn Island</field>
+            <field name="code">pn</field>
+        </record>
+        <record model="partner.country" id="pr">
+            <field name="name">Puerto Rico</field>
+            <field name="code">pr</field>
+        </record>
+        <record model="partner.country" id="pt">
+            <field name="name">Portugal</field>
+            <field name="code">pt</field>
+        </record>
+        <record model="partner.country" id="pw">
+            <field name="name">Palau</field>
+            <field name="code">pw</field>
+        </record>
+        <record model="partner.country" id="py">
+            <field name="name">Paraguay</field>
+            <field name="code">py</field>
+        </record>
+        <record model="partner.country" id="qa">
+            <field name="name">Qatar</field>
+            <field name="code">qa</field>
+        </record>
+        <record model="partner.country" id="re">
+            <field name="name">Reunion (French)</field>
+            <field name="code">re</field>
+        </record>
+        <record model="partner.country" id="ro">
+            <field name="name">Romania</field>
+            <field name="code">ro</field>
+        </record>
+        <record model="partner.country" id="ru">
+            <field name="name">Russian Federation</field>
+            <field name="code">ru</field>
+        </record>
+        <record model="partner.country" id="rw">
+            <field name="name">Rwanda</field>
+            <field name="code">rw</field>
+        </record>
+        <record model="partner.country" id="sa">
+            <field name="name">Saudi Arabia</field>
+            <field name="code">sa</field>
+        </record>
+        <record model="partner.country" id="sb">
+            <field name="name">Solomon Islands</field>
+            <field name="code">sb</field>
+        </record>
+        <record model="partner.country" id="sc">
+            <field name="name">Seychelles</field>
+            <field name="code">sc</field>
+        </record>
+        <record model="partner.country" id="sd">
+            <field name="name">Sudan</field>
+            <field name="code">sd</field>
+        </record>
+        <record model="partner.country" id="se">
+            <field name="name">Sweden</field>
+            <field name="code">se</field>
+        </record>
+        <record model="partner.country" id="sg">
+            <field name="name">Singapore</field>
+            <field name="code">sg</field>
+        </record>
+        <record model="partner.country" id="sh">
+            <field name="name">Saint Helena</field>
+            <field name="code">sh</field>
+        </record>
+        <record model="partner.country" id="si">
+            <field name="name">Slovenia</field>
+            <field name="code">si</field>
+        </record>
+        <record model="partner.country" id="sj">
+            <field name="name">Svalbard and Jan Mayen Islands</field>
+            <field name="code">sj</field>
+        </record>
+        <record model="partner.country" id="sk">
+            <field name="name">Slovak Republic</field>
+            <field name="code">sk</field>
+        </record>
+        <record model="partner.country" id="sl">
+            <field name="name">Sierra Leone</field>
+            <field name="code">sl</field>
+        </record>
+        <record model="partner.country" id="sm">
+            <field name="name">San Marino</field>
+            <field name="code">sm</field>
+        </record>
+        <record model="partner.country" id="sn">
+            <field name="name">Senegal</field>
+            <field name="code">sn</field>
+        </record>
+        <record model="partner.country" id="so">
+            <field name="name">Somalia</field>
+            <field name="code">so</field>
+        </record>
+        <record model="partner.country" id="sr">
+            <field name="name">Suriname</field>
+            <field name="code">sr</field>
+        </record>
+        <record model="partner.country" id="st">
+            <field name="name">Saint Tome (Sao Tome) and Principe</field>
+            <field name="code">st</field>
+        </record>
+        <record model="partner.country" id="sv">
+            <field name="name">El Salvador</field>
+            <field name="code">sv</field>
+        </record>
+        <record model="partner.country" id="sy">
+            <field name="name">Syria</field>
+            <field name="code">sy</field>
+        </record>
+        <record model="partner.country" id="sz">
+            <field name="name">Swaziland</field>
+            <field name="code">sz</field>
+        </record>
+        <record model="partner.country" id="tc">
+            <field name="name">Turks and Caicos Islands</field>
+            <field name="code">tc</field>
+        </record>
+        <record model="partner.country" id="td">
+            <field name="name">Chad</field>
+            <field name="code">td</field>
+        </record>
+        <record model="partner.country" id="tf">
+            <field name="name">French Southern Territories</field>
+            <field name="code">tf</field>
+        </record>
+        <record model="partner.country" id="tg">
+            <field name="name">Togo</field>
+            <field name="code">tg</field>
+        </record>
+        <record model="partner.country" id="th">
+            <field name="name">Thailand</field>
+            <field name="code">th</field>
+        </record>
+        <record model="partner.country" id="tj">
+            <field name="name">Tadjikistan</field>
+            <field name="code">tj</field>
+        </record>
+        <record model="partner.country" id="tk">
+            <field name="name">Tokelau</field>
+            <field name="code">tk</field>
+        </record>
+        <record model="partner.country" id="tm">
+            <field name="name">Turkmenistan</field>
+            <field name="code">tm</field>
+        </record>
+        <record model="partner.country" id="tn">
+            <field name="name">Tunisia</field>
+            <field name="code">tn</field>
+        </record>
+        <record model="partner.country" id="to">
+            <field name="name">Tonga</field>
+            <field name="code">to</field>
+        </record>
+        <record model="partner.country" id="tp">
+            <field name="name">East Timor</field>
+            <field name="code">tp</field>
+        </record>
+        <record model="partner.country" id="tr">
+            <field name="name">Turkey</field>
+            <field name="code">tr</field>
+        </record>
+        <record model="partner.country" id="tt">
+            <field name="name">Trinidad and Tobago</field>
+            <field name="code">tt</field>
+        </record>
+        <record model="partner.country" id="tv">
+            <field name="name">Tuvalu</field>
+            <field name="code">tv</field>
+        </record>
+        <record model="partner.country" id="tw">
+            <field name="name">Taiwan</field>
+            <field name="code">tw</field>
+        </record>
+        <record model="partner.country" id="tz">
+            <field name="name">Tanzania</field>
+            <field name="code">tz</field>
+        </record>
+        <record model="partner.country" id="ua">
+            <field name="name">Ukraine</field>
+            <field name="code">ua</field>
+        </record>
+        <record model="partner.country" id="ug">
+            <field name="name">Uganda</field>
+            <field name="code">ug</field>
+        </record>
+        <record model="partner.country" id="uk">
+            <field name="name">United Kingdom</field>
+            <field name="code">uk</field>
+        </record>
+        <record model="partner.country" id="um">
+            <field name="name">USA Minor Outlying Islands</field>
+            <field name="code">um</field>
+        </record>
+        <record model="partner.country" id="us">
+            <field name="name">United States</field>
+            <field name="code">us</field>
+        </record>
+        <record model="partner.country" id="uy">
+            <field name="name">Uruguay</field>
+            <field name="code">uy</field>
+        </record>
+        <record model="partner.country" id="uz">
+            <field name="name">Uzbekistan</field>
+            <field name="code">uz</field>
+        </record>
+        <record model="partner.country" id="va">
+            <field name="name">Holy See (Vatican City State)</field>
+            <field name="code">va</field>
+        </record>
+        <record model="partner.country" id="vc">
+            <field name="name">Saint Vincent &amp; Grenadines</field>
+            <field name="code">vc</field>
+        </record>
+        <record model="partner.country" id="ve">
+            <field name="name">Venezuela</field>
+            <field name="code">ve</field>
+        </record>
+        <record model="partner.country" id="vg">
+            <field name="name">Virgin Islands (British)</field>
+            <field name="code">vg</field>
+        </record>
+        <record model="partner.country" id="vi">
+            <field name="name">Virgin Islands (USA)</field>
+            <field name="code">vi</field>
+        </record>
+        <record model="partner.country" id="vn">
+            <field name="name">Vietnam</field>
+            <field name="code">vn</field>
+        </record>
+        <record model="partner.country" id="vu">
+            <field name="name">Vanuatu</field>
+            <field name="code">vu</field>
+        </record>
+        <record model="partner.country" id="wf">
+            <field name="name">Wallis and Futuna Islands</field>
+            <field name="code">wf</field>
+        </record>
+        <record model="partner.country" id="ws">
+            <field name="name">Samoa</field>
+            <field name="code">ws</field>
+        </record>
+        <record model="partner.country" id="ye">
+            <field name="name">Yemen</field>
+            <field name="code">ye</field>
+        </record>
+        <record model="partner.country" id="yt">
+            <field name="name">Mayotte</field>
+            <field name="code">yt</field>
+        </record>
+        <record model="partner.country" id="yu">
+            <field name="name">Yugoslavia</field>
+            <field name="code">yu</field>
+        </record>
+        <record model="partner.country" id="za">
+            <field name="name">South Africa</field>
+            <field name="code">za</field>
+        </record>
+        <record model="partner.country" id="zm">
+            <field name="name">Zambia</field>
+            <field name="code">zm</field>
+        </record>
+        <record model="partner.country" id="zw">
+            <field name="name">Zimbabwe</field>
+            <field name="code">zw</field>
+        </record>
+        <!-- USA States -->
+        <record model="partner.country.state" id="us-al">
+            <field name="name">Alabama</field>
+            <field name="code">al</field>
+            <field name="country" ref="us"/>
+        </record>
+        <record model="partner.country.state" id="us-ak">
+            <field name="name">Alaska</field>
+            <field name="code">ak</field>
+            <field name="country" ref="us"/>
+        </record>
+        <record model="partner.country.state" id="us-az">
+            <field name="name">Arizona</field>
+            <field name="code">az</field>
+            <field name="country" ref="us"/>
+        </record>
+        <record model="partner.country.state" id="us-ar">
+            <field name="name">Arkansas</field>
+            <field name="code">ar</field>
+            <field name="country" ref="us"/>
+        </record>
+        <record model="partner.country.state" id="us-ca">
+            <field name="name">California</field>
+            <field name="code">ca</field>
+            <field name="country" ref="us"/>
+        </record>
+        <record model="partner.country.state" id="us-co">
+            <field name="name">Colorado</field>
+            <field name="code">co</field>
+            <field name="country" ref="us"/>
+        </record>
+        <record model="partner.country.state" id="us-ct">
+            <field name="name">Connecticut</field>
+            <field name="code">ct</field>
+            <field name="country" ref="us"/>
+        </record>
+        <record model="partner.country.state" id="us-dc">
+            <field name="name">District of Columbia</field>
+            <field name="code">dc</field>
+            <field name="country" ref="us"/>
+        </record>
+        <record model="partner.country.state" id="us-de">
+            <field name="name">Delaware</field>
+            <field name="code">de</field>
+            <field name="country" ref="us"/>
+        </record>
+        <record model="partner.country.state" id="us-fl">
+            <field name="name">Florida</field>
+            <field name="code">fl</field>
+            <field name="country" ref="us"/>
+        </record>
+        <record model="partner.country.state" id="us-ga">
+            <field name="name">Georgia</field>
+            <field name="code">ga</field>
+            <field name="country" ref="us"/>
+        </record>
+        <record model="partner.country.state" id="us-hi">
+            <field name="name">Hawaii</field>
+            <field name="code">hi</field>
+            <field name="country" ref="us"/>
+        </record>
+        <record model="partner.country.state" id="us-id">
+            <field name="name">Idaho</field>
+            <field name="code">id</field>
+            <field name="country" ref="us"/>
+        </record>
+        <record model="partner.country.state" id="us-il">
+            <field name="name">Illinois</field>
+            <field name="code">il</field>
+            <field name="country" ref="us"/>
+        </record>
+        <record model="partner.country.state" id="us-in">
+            <field name="name">Indiana</field>
+            <field name="code">in</field>
+            <field name="country" ref="us"/>
+        </record>
+        <record model="partner.country.state" id="us-ia">
+            <field name="name">Iowa</field>
+            <field name="code">ia</field>
+            <field name="country" ref="us"/>
+        </record>
+        <record model="partner.country.state" id="us-ks">
+            <field name="name">Kansas</field>
+            <field name="code">ks</field>
+            <field name="country" ref="us"/>
+        </record>
+        <record model="partner.country.state" id="us-ky">
+            <field name="name">Kentucky</field>
+            <field name="code">ky</field>
+            <field name="country" ref="us"/>
+        </record>
+        <record model="partner.country.state" id="us-la">
+            <field name="name">Louisiana</field>
+            <field name="code">la</field>
+            <field name="country" ref="us"/>
+        </record>
+        <record model="partner.country.state" id="us-me">
+            <field name="name">Maine</field>
+            <field name="code">me</field>
+            <field name="country" ref="us"/>
+        </record>
+        <record model="partner.country.state" id="us-md">
+            <field name="name">Maryland</field>
+            <field name="code">md</field>
+            <field name="country" ref="us"/>
+        </record>
+        <record model="partner.country.state" id="us-ma">
+            <field name="name">Massachusetts</field>
+            <field name="code">ma</field>
+            <field name="country" ref="us"/>
+        </record>
+        <record model="partner.country.state" id="us-mi">
+            <field name="name">Michigan</field>
+            <field name="code">mi</field>
+            <field name="country" ref="us"/>
+        </record>
+        <record model="partner.country.state" id="us-mn">
+            <field name="name">Minnesota</field>
+            <field name="code">mn</field>
+            <field name="country" ref="us"/>
+        </record>
+        <record model="partner.country.state" id="us-ms">
+            <field name="name">Mississippi</field>
+            <field name="code">ms</field>
+            <field name="country" ref="us"/>
+        </record>
+        <record model="partner.country.state" id="us-mo">
+            <field name="name">Missouri</field>
+            <field name="code">mo</field>
+            <field name="country" ref="us"/>
+        </record>
+        <record model="partner.country.state" id="us-mt">
+            <field name="name">Montana</field>
+            <field name="code">mt</field>
+            <field name="country" ref="us"/>
+        </record>
+        <record model="partner.country.state" id="us-ne">
+            <field name="name">Nebraska</field>
+            <field name="code">ne</field>
+            <field name="country" ref="us"/>
+        </record>
+        <record model="partner.country.state" id="us-nv">
+            <field name="name">Nevada</field>
+            <field name="code">nv</field>
+            <field name="country" ref="us"/>
+        </record>
+        <record model="partner.country.state" id="us-nh">
+            <field name="name">New Hampshire</field>
+            <field name="code">nh</field>
+            <field name="country" ref="us"/>
+        </record>
+        <record model="partner.country.state" id="us-nj">
+            <field name="name">New Jersey</field>
+            <field name="code">nj</field>
+            <field name="country" ref="us"/>
+        </record>
+        <record model="partner.country.state" id="us-nm">
+            <field name="name">New Mexico</field>
+            <field name="code">nm</field>
+            <field name="country" ref="us"/>
+        </record>
+        <record model="partner.country.state" id="us-ny">
+            <field name="name">New York</field>
+            <field name="code">ny</field>
+            <field name="country" ref="us"/>
+        </record>
+        <record model="partner.country.state" id="us-nc">
+            <field name="name">North Carolina</field>
+            <field name="code">nc</field>
+            <field name="country" ref="us"/>
+        </record>
+        <record model="partner.country.state" id="us-nd">
+            <field name="name">North Dakota</field>
+            <field name="code">nd</field>
+            <field name="country" ref="us"/>
+        </record>
+        <record model="partner.country.state" id="us-oh">
+            <field name="name">Ohio</field>
+            <field name="code">oh</field>
+            <field name="country" ref="us"/>
+        </record>
+        <record model="partner.country.state" id="us-ok">
+            <field name="name">Oklahoma</field>
+            <field name="code">ok</field>
+            <field name="country" ref="us"/>
+        </record>
+        <record model="partner.country.state" id="us-or">
+            <field name="name">Oregon</field>
+            <field name="code">or</field>
+            <field name="country" ref="us"/>
+        </record>
+        <record model="partner.country.state" id="us-pa">
+            <field name="name">Pennsylvania</field>
+            <field name="code">pa</field>
+            <field name="country" ref="us"/>
+        </record>
+        <record model="partner.country.state" id="us-ri">
+            <field name="name">Rhode Island</field>
+            <field name="code">ri</field>
+            <field name="country" ref="us"/>
+        </record>
+        <record model="partner.country.state" id="us-sc">
+            <field name="name">South Carolina</field>
+            <field name="code">sc</field>
+            <field name="country" ref="us"/>
+        </record>
+        <record model="partner.country.state" id="us-sd">
+            <field name="name">South Dakota</field>
+            <field name="code">sd</field>
+            <field name="country" ref="us"/>
+        </record>
+        <record model="partner.country.state" id="us-tn">
+            <field name="name">Tennessee</field>
+            <field name="code">tn</field>
+            <field name="country" ref="us"/>
+        </record>
+        <record model="partner.country.state" id="us-tx">
+            <field name="name">Texas</field>
+            <field name="code">tx</field>
+            <field name="country" ref="us"/>
+        </record>
+        <record model="partner.country.state" id="us-ut">
+            <field name="name">Utah</field>
+            <field name="code">ut</field>
+            <field name="country" ref="us"/>
+        </record>
+        <record model="partner.country.state" id="us-vt">
+            <field name="name">Vermont</field>
+            <field name="code">vt</field>
+            <field name="country" ref="us"/>
+        </record>
+        <record model="partner.country.state" id="us-va">
+            <field name="name">Virginia</field>
+            <field name="code">va</field>
+            <field name="country" ref="us"/>
+        </record>
+        <record model="partner.country.state" id="us-wa">
+            <field name="name">Washington</field>
+            <field name="code">wa</field>
+            <field name="country" ref="us"/>
+        </record>
+        <record model="partner.country.state" id="us-wv">
+            <field name="name">West Virginia</field>
+            <field name="code">wv</field>
+            <field name="country" ref="us"/>
+        </record>
+        <record model="partner.country.state" id="us-wi">
+            <field name="name">Wisconsin</field>
+            <field name="code">wi</field>
+            <field name="country" ref="us"/>
+        </record>
+        <record model="partner.country.state" id="us-wy">
+            <field name="name">Wyoming</field>
+            <field name="code">wy</field>
+            <field name="country" ref="us"/>
+        </record>
+    </data>
+</tryton>
diff --git a/partner.xml b/partner.xml
index 5516cf46ef..dd8c9205af 100644
--- a/partner.xml
+++ b/partner.xml
@@ -24,7 +24,9 @@
                 <![CDATA[
                 <form string="Partners">
                     <label name="name"/>
-                    <field name="name"/>
+                    <field name="name" xexpand="1"/>
+                    <label name="active"/>
+                    <field name="active" xexpand="0" width="100"/>
                     <notebook colspan="4">
                         <page string="General">
                             <field name="addresses" mode="form,tree" colspan="4">
@@ -34,25 +36,30 @@
                                     <label name="type"/>
                                     <field name="type"/>
                                     <label name="active"/>
-                                    <field name="active" invisible="0"/>
+                                    <field name="active" invisible="0"
+                                        xexpand="0" width="100"/>
                                     <label name="street"/>
                                     <field name="street"/>
                                     <label name="streetbis"/>
                                     <field name="streetbis"/>
+                                    <newline/>
                                     <label name="zip"/>
                                     <field name="zip"/>
                                     <label name="city"/>
                                     <field name="city"/>
+                                    <newline/>
                                     <label name="country"/>
                                     <field name="country" completion="1"/>
                                     <label name="state"/>
                                     <field name="state"/>
+                                    <newline/>
                                     <label name="phone"/>
                                     <field name="phone"/>
-                                    <label name="fax"/>
-                                    <field name="fax"/>
                                     <label name="mobile"/>
                                     <field name="mobile"/>
+                                    <newline/>
+                                    <label name="fax"/>
+                                    <field name="fax"/>
                                     <label name="email"/>
                                     <field name="email" widget="email"/>
                                 </form>
@@ -66,8 +73,6 @@
                             </field>
                             <label name="lang"/>
                             <field name="lang" widget="selection"/>
-                            <label name="active"/>
-                            <field name="active"/>
                             <separator string="Categories" colspan="4"/>
                             <field name="categories" colspan="4"/>
                         </page>
diff --git a/state.py b/state.py
deleted file mode 100644
index 20829a0be2..0000000000
--- a/state.py
+++ /dev/null
@@ -1,30 +0,0 @@
-from trytond.osv import fields, OSV
-STATES = {
-    'readonly': "active == False"
-}
-
-
-class State(OSV):
-    "Country state"
-    _name = 'partner.state'
-    _description = __doc__
-    _order = 'code'
-    country = fields.Many2One('partner.country', 'Country',
-            required=True)
-    name = fields.Char('State Name', size=64, required=True)
-    code = fields.Char('State Code', size=3, required=True)
-
-    def create(self, cursor, user, vals, context=None):
-        if 'code' in vals:
-            vals['code'] = vals['code'].upper()
-        return super(CountryState, self).create(cursor, user, vals,
-                context=context)
-
-    def write(self, cursor, user, ids, vals, context=None):
-        if 'code' in vals:
-            vals['code'] = vals['code'].upper()
-        return super(CountryState, self).write(cursor, user, ids, vals,
-                context=context)
-
-State()
-