Changeset 7ee21d8

Timestamp:

Jul 7, 2014, 9:44:27 PM (11 years ago)

Author:

Alex Dehnert <adehnert@…>

Branches:

master

Children:

b61cf1a

Parents:

2b31097

git-author:

Alex Dehnert <adehnert@…> (07/07/14 21:44:27)

git-committer:

Alex Dehnert <adehnert@…> (07/07/14 21:44:27)

Message:

Allow creating RFPs

Location:

remit/vouchers

Files:

• admin.py (modified) (1 diff)
• models.py (modified) (2 diffs)

remit/vouchers/admin.py

@@ -27 +27 @@
     list_display_links = ('description', )
 
+class RFPAdmin(admin.ModelAdmin):
+    list_display = ('name', 'rfp_number', 'rfp_submit_time', 'payee_type', 'payee_name', 'item_amount', 'item_co', 'item_gl')
+
 admin.site.register(vouchers.models.ReimbursementRequest, ReimbursementRequestAdmin)
 admin.site.register(vouchers.models.Voucher, VoucherAdmin)
+admin.site.register(vouchers.models.RFP, RFPAdmin)

remit/vouchers/models.py

@@ -101 +101 @@
     def convert_to_rfp(self, ):
         rfp = RFP()
+        max_name_len = RFP._meta.get_field_by_name('name')[0].max_length
+        rfp.name = ("%s: %s" % (self.label(), self.name))[:max_name_len]
+        rfp.payee_type = self.recipient_type
+        rfp.payee_name = "%s %s" % (self.check_to_first_name, self.check_to_last_name)
+        rfp.fill_addr(self.check_to_addr)
+        rfp.item_date = self.incurred_time.date()
+        rfp.item_gl = self.expense_area.get_account_number()
+        rfp.item_co = self.budget_area.get_account_number()
+        rfp.item_amount = self.amount
+        rfp.item_desc = self.description
         rfp.save()
         self.create_transfers()
@@ -202 +212 @@
 
 class RFP(models.Model):
-    addr_regex = re.compile(r'^(?P<addr>.+)\n(?P<city>.+), (?P<state>\w\w) (?P<zip>\d{5}(-\d{4})?)$')
+    # Class constants
+    addr_regex = re.compile(r'^(?P<street>.+)\n(?P<city>.+), (?P<state>\w\w) (?P<zip>\d{5}(-\d{4})?)$')
     addr_error = 'Address must two lines: a street address, followed by "<city>, <two letter state abbreviation> <zip>". For non-US addresses, please contact a Treasurer for help.'
 
+    # Fields
     create_time = models.DateTimeField(default=datetime.datetime.now)
+    rfp_submit_time = models.DateTimeField(default=None, null=True, blank=True)
+    rfp_number = models.IntegerField(default=None, null=True, blank=True)
+
+    name = models.CharField(max_length=25, verbose_name='short description', )
+    payee_type = models.CharField(choices=recipient_type_choices, max_length=10, default='other')
+    payee_name = models.CharField(max_length=35, )
+    addr_street = models.CharField(max_length=35, verbose_name='street address', blank=True, )
+    addr_city = models.CharField(max_length=35, verbose_name='city', blank=True, )
+    addr_state = models.CharField(max_length=10, verbose_name='state', blank=True, )
+    addr_zip = models.CharField(max_length=10, verbose_name='zipcode', blank=True, )
+    item_date = models.DateField()
+    item_gl = models.CharField(max_length=10, verbose_name="item's G/L account")
+    item_co = models.CharField(max_length=12, verbose_name="item's cost object")
+    item_amount = models.DecimalField(max_digits=7, decimal_places=2)
+    item_desc = models.TextField()
+    documentation = models.ForeignKey('Documentation', blank=True, null=True, )
+
+    def fill_addr(self, address):
+        match = self.addr_regex.match(address)
+        assert match != None
+        self.addr_street = match.group("street")
+        self.addr_city = match.group("city")
+        self.addr_state = match.group("state")
+        self.addr_zip = match.group("zip")
 
     def __unicode__(self, ):
         return "RFP: %s" % (self.create_time.strftime(settings.SHORT_DATETIME_FORMAT_F), )
+
+    class Meta:
+        verbose_name = "RFP"
 
 class Documentation(models.Model):