@@ -30,7 +30,7 @@ class ProjectInvoiceInline(admin.TabularInline): model = ProjectInvoice class ProjectAdmin(admin.ModelAdmin): - list_display = ('name','start_date', 'total_invoiced', 'total_cost', 'profit') + list_display = ('name', 'total_invoiced', 'total_cost', 'profit') inlines = [ProjectInvoiceInline,] class ProjectTimeAdmin(admin.ModelAdmin): beancounter/admin.py @@ -114,7 +114,6 @@ class Employee(Person): class Project(models.Model): name = models.CharField(max_length=100) employees = models.ManyToManyField(Employee) - start_date = models.DateField() active = models.BooleanField(default=True) def __unicode__(self): @@ -167,6 +166,13 @@ class ProjectTime(models.Model): def __unicode__(self): return "%s on %s (%s-%s)" % (self.employee, self.project, self.start_date, self.end_date) + + def save(self, force_insert=False, force_update=False): + if not self.cost: + self.cost = self.hours * self.employee.hourly_rate + if not self.cost_converted and self.employee.currency == "USD": + self.cost_converted = self.cost + super(ProjectTime, self).save(force_insert, force_update) class Entry(models.Model): beancounter/models.py 5b15796cec3a3f638bfa427bee88b4ac46d88c99 Peter Baumgartner pete@lincolnloop.com http://github.com/lincolnloop/django-beancounter/commit/f9ffe2cd6008a99f8646f577afc7081c3a05035c f9ffe2cd6008a99f8646f577afc7081c3a05035c 2009-01-05T16:58:35-08:00 2009-01-05T16:58:35-08:00 auto-populate cost e70caf29bc8e7e84df4c74a185d99b60e84fad50 Peter Baumgartner pete@lincolnloop.com