beancounter/evolutions/blank_fields.py beancounter/evolutions/delete_bid.py @@ -1,7 +1,8 @@ from django.contrib import admin from beancounter.models import (Category, BankAccount, AccountTransfer, - Person, Entry, Employee, Project, ProjectTime) + Person, Entry, Employee, Project, ProjectTime, + ProjectInvoice) class CategoryOptions(admin.ModelAdmin): fieldsets = ( @@ -25,8 +26,12 @@ class EmployeeAdmin(admin.ModelAdmin): list_display = ('name', 'gmt_offset', 'rate') search_fields = ('name',) +class ProjectInvoiceInline(admin.TabularInline): + model = ProjectInvoice + class ProjectAdmin(admin.ModelAdmin): list_display = ('name','start_date') + inlines = [ProjectInvoiceInline,] class ProjectTimeAdmin(admin.ModelAdmin): list_display = ('project', 'employee', 'hours', 'cost_converted') beancounter/admin.py @@ -1 +1,5 @@ -SEQUENCE = ['add_bid',] \ No newline at end of file +SEQUENCE = [ + 'add_bid', + 'blank_fields', + 'delete_bid', +] \ No newline at end of file beancounter/evolutions/__init__.py @@ -82,7 +82,7 @@ class Employee(Person): ('elance', 'Elance'), ('other', 'Other'), ) - gmt_offset = models.DecimalField(max_digits=3, decimal_places=1) + gmt_offset = models.DecimalField(max_digits=3, decimal_places=1, null=True, blank=True) skills = TagField() payment_preference = models.CharField(blank=True, max_length=100, choices=PAYMENT_CHOICES) payment_notes = models.TextField(blank=True) @@ -114,11 +114,22 @@ class Project(models.Model): name = models.CharField(max_length=100) employees = models.ManyToManyField(Employee) start_date = models.DateField() - bid = models.DecimalField(max_digits=8, decimal_places=2) active = models.BooleanField(default=True) def __unicode__(self): return self.name + +class ProjectInvoice(models.Model): + """ + Invoice sent for project + + """ + project = models.ForeignKey(Project) + date = models.DateField(default=datetime.date.today()) + amount = models.DecimalField(max_digits=8, decimal_places=2) + + def __unicode__(self): + return "$%s for %s on %s" % (self.amount, self.project, self.date) class ProjectTime(models.Model): beancounter/models.py 3431c1032d66ef29e874b66482b590d1a25a1b48 Peter Baumgartner pete@lincolnloop.com http://github.com/lincolnloop/django-beancounter/commit/e4ceba0f2e7b7cb07b007110926bc02104c52120 e4ceba0f2e7b7cb07b007110926bc02104c52120 2009-01-04T18:00:03-08:00 2009-01-04T18:00:03-08:00 remove bid field, add invoice model e4fbaa0e81156828ee856c1786361a1123a209fc Peter Baumgartner pete@lincolnloop.com