0
@@ -29,9 +29,12 @@ class EmployeeAdmin(admin.ModelAdmin):
0
 class ProjectInvoiceInline(admin.TabularInline):
0
     model = ProjectInvoice
0
 
0
+class ProjectTimeInline(admin.TabularInline):
0
+    model = ProjectTime
0
+
0
 class ProjectAdmin(admin.ModelAdmin):
0
     list_display = ('name', 'total_invoiced', 'total_cost', 'profit')
0
-    inlines = [ProjectInvoiceInline,]
0
+    inlines = [ProjectInvoiceInline, ProjectTimeInline]
0
     
0
 class ProjectTimeAdmin(admin.ModelAdmin):
0
     list_display = ('employee', 'start_date', 'project', 'hours', 'cost', 'cost_converted')

0
@@ -115,6 +115,9 @@ class Project(models.Model):
0
     name = models.CharField(max_length=100)
0
     active = models.BooleanField(default=True)
0
 
0
+    class Meta:
0
+        ordering = ['-active', 'name']
0
+
0
     def __unicode__(self):
0
         return self.name
0
         
0
@@ -129,7 +132,9 @@ class Project(models.Model):
0
         #TODO aggregate support
0
         total = decimal.Decimal("0.00")
0
         for time in self.projecttime_set.all():
0
-            total += time.cost_converted
0
+           #this test should be in the filter above 
0
+           if time.cost_converted:
0
+                total += time.cost_converted
0
         return total
0
     
0
     def profit(self):
0
@@ -163,6 +168,9 @@ class ProjectTime(models.Model):
0
     cost = models.DecimalField(max_digits=9, decimal_places=2, blank=True, null=True, help_text="Leave blank to automatically calculate")
0
     cost_converted = models.DecimalField(max_digits=9, decimal_places=2, blank=True, null=True, help_text="Cost converted to local currency")
0
 
0
+    class Meta:
0
+        ordering = ['-start_date', 'project']
0
+
0
     def __unicode__(self):
0
         return "%s on %s (%s-%s)" % (self.employee, self.project, self.start_date, self.end_date)
0