Changeset 82211ea


Ignore:
Timestamp:
Apr 19, 2010, 6:53:39 AM (16 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
Files:
2 added
6 edited

Legend:

Unmodified
Added
Removed

  • remit/finance_core/models.py

    ree82431 r82211ea  
    33import treebeard.mp_tree
    44
     5import datetime
    56
    67class BudgetArea(treebeard.mp_tree.MP_Node):
    … …  
    144145    name = models.CharField(max_length=40)
    145146    desc = models.TextField(blank=True)
     147    incurred_time  = models.DateTimeField(default=datetime.datetime.now, help_text='Time the item or service was purchased')
     148    tx_create_time = models.DateTimeField(default=datetime.datetime.now)
    146149
    147150    def __unicode__(self,):
    … …  
    149152
    150153def make_transfer(name, amount,
    151     layer, budget_term, from_area, to_area, desc, ):
     154    layer, budget_term, from_area, to_area, desc,
     155    incurred_time, ):
    152156    tx = Transaction(
    153157        name=name,
    154158        desc=desc,
     159        incurred_time=incurred_time,
    155160    )
    156161    tx.save()

  • remit/remit_templates/vouchers/ReimbursementRequest_review.html

    rb34d568 r82211ea  
    6767</tr>
    6868<tr>
    69     <th>Printing Time</th>
    70     <td>{{rr.printing_time}}</td>
     69    <th>Voucher Processing Time</th>
     70    {%if rr.voucher%}
     71    {%if rr.voucher.process_time%}
     72    <td>{{rr.voucher.process_time}}</td>
     73    {%else%}
     74    <td>Not yet processed</td>
     75    {%endif%}
     76    {%else%}
     77    <td>Not yet approved</td>
     78    {%endif%}
    7179</tr>
    7280</table>

  • remit/vouchers/admin.py

    rc020a3b r82211ea  
    1616
    1717    fieldsets = [
    18         ('Expense details', {'fields': ['name', 'description', 'amount', 'budget_area', 'budget_term', ] }),
    19         ('Request metadata', {'fields': ['submitter', 'request_time', 'approval_time', 'approval_status', 'printing_time', ]}),
     18        ('Expense details', {'fields': ['name', 'description', 'amount', 'budget_area', 'budget_term', 'incurred_time', ] }),
     19        ('Request metadata', {'fields': ['submitter', 'request_time', 'approval_time', 'approval_status', ]}),
    2020        ('Recipient', {'fields': ['check_to_first_name', 'check_to_last_name', 'check_to_email', 'check_to_addr', ] }),
    2121    ]

  • remit/vouchers/import_budget.py

    r92ca60e r82211ea  
    119119            finance_core.models.make_transfer(
    120120                item_name, amount, budget_layer,
    121                 term, budget_source, line_item_obj, desc=desc)
     121                term, budget_source, line_item_obj, desc=desc,
     122                incurred_time=None,
     123            )
    122124
    123125

  • remit/vouchers/models.py

    r36d2293 r82211ea  
    2525    budget_term = models.ForeignKey(BudgetTerm)
    2626    expense_area = models.ForeignKey(BudgetArea, related_name='as_expense_area') # ~GL
     27    incurred_time = models.DateTimeField(default=datetime.datetime.now, help_text='Time the item or service was purchased')
    2728    request_time = models.DateTimeField(default=datetime.datetime.now)
    2829    approval_time = models.DateTimeField(blank=True, null=True,)
    2930    approval_status = models.IntegerField(default=0, choices=APPROVAL_STATES)
    30     printing_time = models.DateTimeField(blank=True, null=True,)
    3131    name = models.CharField(max_length=50, verbose_name='short description', )
    3232    description = models.TextField(blank=True, verbose_name='long description', )
    3333    documentation = models.ForeignKey('Documentation', null=True, )
     34    voucher       = models.ForeignKey('Voucher',       null=True, )
    3435
    3536    class Meta:
    … …  
    7374            self.expense_area,
    7475            self.description,
     76            self.incurred_time,
    7577        )
    7678        self.approval_status = 1
    7779        self.approval_time = datetime.datetime.now()
     80        self.voucher = voucher
    7881        self.save()
    7982
    … …  
    9497    gl = models.IntegerField()
    9598    processed = models.BooleanField()
     99    process_time = models.DateTimeField(blank=True, null=True,)
    96100    documentation = models.ForeignKey('Documentation', blank=True, null=True, )
    97101
    … …  
    105109        lst = lst + ['']*(3-len(lst))
    106110        return lst
     111
     112    def mark_processed(self, ):
     113        self.process_time = datetime.datetime.now()
     114        self.processed = True
     115        self.save()
    107116
    108117    def __unicode__(self, ):

  • remit/vouchers/views.py

    r6f24604 r82211ea  
    2525            'name',
    2626            'description',
     27            'incurred_time',
    2728            'amount',
    2829            'budget_area',
    … …  
    3334            'check_to_addr',
    3435        )
     36
    3537
    3638class CommitteesField(ModelChoiceField):
    … …  
    327329    if mark:
    328330        for voucher in lst:
    329             voucher.processed = True
    330             voucher.save()
     331            voucher.mark_processed()
    331332
    332333    return response
Note: See TracChangeset for help on using the changeset viewer.