Changeset 82211ea for remit/vouchers

Timestamp:

Apr 19, 2010, 6:53:39 AM (15 years ago)

Author:

Alex Dehnert <adehnert@…>

Branches:

master, client

Children:

dbb39a2

Parents:

e5caf62

git-author:

Alex Dehnert <adehnert@…> (04/19/10 06:53:39)

git-committer:

Alex Dehnert <adehnert@…> (04/19/10 06:53:39)

Message:

Keep track of some more dates (Trac: #19)

Location:

remit/vouchers

Files:

• admin.py (modified) (1 diff)
• import_budget.py (modified) (1 diff)
• migrations/0006_add-dates.py (added)
• models.py (modified) (4 diffs)
• views.py (modified) (3 diffs)

remit/vouchers/admin.py

@@ -16 +16 @@
 
     fieldsets = [
-        ('Expense details', {'fields': ['name', 'description', 'amount', 'budget_area', 'budget_term', ] }),
-        ('Request metadata', {'fields': ['submitter', 'request_time', 'approval_time', 'approval_status', 'printing_time', ]}),
+        ('Expense details', {'fields': ['name', 'description', 'amount', 'budget_area', 'budget_term', 'incurred_time', ] }),
+        ('Request metadata', {'fields': ['submitter', 'request_time', 'approval_time', 'approval_status', ]}),
         ('Recipient', {'fields': ['check_to_first_name', 'check_to_last_name', 'check_to_email', 'check_to_addr', ] }),
     ]

remit/vouchers/import_budget.py

@@ -119 +119 @@
             finance_core.models.make_transfer(
                 item_name, amount, budget_layer,
-                term, budget_source, line_item_obj, desc=desc)
+                term, budget_source, line_item_obj, desc=desc,
+                incurred_time=None,
+            )
 
 

remit/vouchers/models.py

@@ -25 +25 @@
     budget_term = models.ForeignKey(BudgetTerm)
     expense_area = models.ForeignKey(BudgetArea, related_name='as_expense_area') # ~GL
+    incurred_time = models.DateTimeField(default=datetime.datetime.now, help_text='Time the item or service was purchased')
     request_time = models.DateTimeField(default=datetime.datetime.now)
     approval_time = models.DateTimeField(blank=True, null=True,)
     approval_status = models.IntegerField(default=0, choices=APPROVAL_STATES)
-    printing_time = models.DateTimeField(blank=True, null=True,)
     name = models.CharField(max_length=50, verbose_name='short description', )
     description = models.TextField(blank=True, verbose_name='long description', )
     documentation = models.ForeignKey('Documentation', null=True, )
+    voucher       = models.ForeignKey('Voucher',       null=True, )
 
     class Meta:
@@ -73 +74 @@
             self.expense_area,
             self.description,
+            self.incurred_time,
         )
         self.approval_status = 1
         self.approval_time = datetime.datetime.now()
+        self.voucher = voucher
         self.save()
 
@@ -94 +97 @@
     gl = models.IntegerField()
     processed = models.BooleanField()
+    process_time = models.DateTimeField(blank=True, null=True,)
     documentation = models.ForeignKey('Documentation', blank=True, null=True, )
 
@@ -105 +109 @@
         lst = lst + ['']*(3-len(lst))
         return lst
+
+    def mark_processed(self, ):
+        self.process_time = datetime.datetime.now()
+        self.processed = True
+        self.save()
 
     def __unicode__(self, ):

remit/vouchers/views.py

@@ -25 +25 @@
             'name',
             'description',
+            'incurred_time',
             'amount',
             'budget_area',
@@ -33 +34 @@
             'check_to_addr',
         )
+
 
 class CommitteesField(ModelChoiceField):
@@ -327 +329 @@
     if mark:
         for voucher in lst:
-            voucher.processed = True
-            voucher.save()
+            voucher.mark_processed()
 
     return response