=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/period/Period.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/period/Period.java	2014-11-11 11:19:50 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/period/Period.java	2014-11-11 11:46:59 +0000
@@ -119,10 +119,16 @@
     // Logic
     // -------------------------------------------------------------------------
 
+
+    @Override
+    public void setAutoFields()
+    {
+    }
+
     @Override
     public String getUid()
     {
-        return getIsoDate();
+        return uid != null ? uid : getIsoDate();
     }
 
     public String getRealUid()