diff --git a/partner.py b/partner.py
index 4956059232..911867359d 100644
--- a/partner.py
+++ b/partner.py
@@ -24,15 +24,17 @@ class Partner(OSV):
     _description = __doc__
     _name = "partner.partner"
 
-    name = fields.Char('Name', size=128, required=True, select=1,
+    name = fields.Char('Name', size=None, required=True, select=1,
            states=STATES)
+    code = fields.Char('Code', size=None, required=True, select=1,
+            readonly=True)
     type = fields.Many2One("partner.partner.type", "Type",
            states=STATES)
     lang = fields.Many2One("ir.lang", 'Language',
            states=STATES)
-    vat = fields.Char('VAT',size=32 ,help="Value Added Tax number",
+    vat = fields.Char('VAT',size=None, help="Value Added Tax number",
            states=STATES)
-    website = fields.Char('Website',size=64,
+    website = fields.Char('Website',size=None,
            states=STATES)
     addresses = fields.One2Many('partner.address', 'partner',
            'Addresses',states=STATES)
@@ -45,14 +47,21 @@ class Partner(OSV):
     def __init__(self):
         super(Partner, self).__init__()
         self._sql_constraints = [
-            ('name_uniq', 'unique (name)',
-             'The name of the partner must be unique!')
+            ('code_uniq', 'UNIQUE(code)',
+             'The code of the partner must be unique!')
         ]
         self._order.insert(0, ('name', 'ASC'))
 
     def default_active(self, cursor, user, context=None):
         return 1
 
+    def create(self, cursor, user, values, context=None):
+        values = values.copy()
+        values['code'] = self.pool.get('ir.sequence').get(
+                cursor, user, 'partner.partner')
+        return super(Partner, self).create(cursor, user, values,
+                context=context)
+
     def address_get(self, cursor, user, partner_id, type=None, context=None):
         """
         Try to find an address for the given type, if no type match
diff --git a/partner.xml b/partner.xml
index 6770656c01..47dbf684d6 100644
--- a/partner.xml
+++ b/partner.xml
@@ -7,6 +7,7 @@
             <field name="arch" type="xml">
                 <![CDATA[
                 <tree string="Partners">
+                    <field name="code" select="1"/>
                     <field name="name" select="1"/>
                     <field name="type" select="2"/>
                     <field name="lang" select="2"/>
@@ -22,12 +23,14 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <![CDATA[
-                <form string="Partner">
+                <form string="Partner" col="6">
                     <label name="name"/>
                     <field name="name" xexpand="1"/>
+                    <label name="code"/>
+                    <field name="code"/>
                     <label name="active"/>
                     <field name="active" xexpand="0" width="100"/>
-                    <notebook colspan="4">
+                    <notebook colspan="6">
                         <page string="General">
                             <field name="addresses" mode="form,tree" colspan="4">
                                 <tree string="Addresses" sequence="sequence">
@@ -172,5 +175,13 @@
             <field name="perm_create" eval="True"/>
             <field name="perm_unlink" eval="True"/>
         </record>
+        <record model="ir.sequence.type" id="sequence_type_partner">
+            <field name="name">Partner</field>
+            <field name="code">partner.partner</field>
+        </record>
+        <record model="ir.sequence" id="sequence_partner">
+            <field name="name">Partner</field>
+            <field name="code">partner.partner</field>
+        </record>
     </data>
 </tryton>