Index: forms/models.py
===================================================================
--- forms/models.py     (revision 8137)
+++ forms/models.py     (working copy)
@@ -90,7 +90,7 @@
     opts = model._meta
     field_list = []
     for f in opts.fields + opts.many_to_many:
-        if not f.editable:
+        if not f.editable and not f.primary_key:
             continue
         if fields and not f.name in fields:
             continue
@@ -120,7 +120,7 @@
     opts = model._meta
     field_list = []
     for f in opts.fields + opts.many_to_many:
-        if not f.editable:
+        if not f.editable and not f.primary_key:
             continue
         if fields and not f.name in fields:
             continue
@@ -138,7 +138,7 @@
     Returns a Form class for the given list of Django database field instances.
     """
     fields = SortedDict([(f.name, f.formfield())
-                         for f in field_list if f.editable])
+                         for f in field_list if f.editable or f.primary_key])
     return type('FormForFields', (BaseForm,), {'base_fields': fields})
 
 
@@ -161,7 +161,7 @@
     opts = instance._meta
     data = {}
     for f in opts.fields + opts.many_to_many:
-        if not f.editable:
+        if not f.editable and not f.primary_key:
             continue
         if fields and not f.name in fields:
             continue
@@ -195,7 +195,7 @@
     field_list = []
     opts = model._meta
     for f in opts.fields + opts.many_to_many:
-        if not f.editable:
+        if not f.editable and not f.primary_key:
             continue
         if fields and not f.name in fields:
             continue
@@ -378,8 +378,14 @@
 
     def add_fields(self, form, index):
         """Add a hidden field for the object's primary key."""
-        self._pk_field_name = self.model._meta.pk.attname
-        form.fields[self._pk_field_name] = IntegerField(required=False, widget=HiddenInput)
+        if self.model._meta.has_auto_field:
+            self._pk_field_name = self.model._meta.pk.attname
+            form.fields[self._pk_field_name] = IntegerField(required=False, widget=HiddenInput)
+        elif self.model._meta.pk.attname and not self.model._meta.pk.editable:
+               # must have the PK in the inline edits, otherwise, it cannot
+               # save them ..  a generic Field as it can be any unique type
+            self._pk_field_name = self.model._meta.pk.attname
+            form.fields[self._pk_field_name] = Field(required=False, widget=HiddenInput)
         super(BaseModelFormSet, self).add_fields(form, index)
 
 def modelformset_factory(model, form=ModelForm, formfield_callback=lambda f: f.formfield(),