Permalink
Browse files

allow text name for transaction receivers

  • Loading branch information...
1 parent 6d252e6 commit 9529dac8b7ee4008856c61d948a39c2f5f622587 @che0 committed Feb 22, 2012
@@ -49,7 +49,7 @@ class GrantAdmin(admin.ModelAdmin):
admin.site.register(models.Grant, GrantAdmin)
class TransactionAdmin(admin.ModelAdmin):
- list_display = ('date', 'other', 'amount', 'description', 'ticket_ids', 'accounting_info')
+ list_display = ('date', 'other_party', 'amount', 'description', 'ticket_ids', 'accounting_info')
list_display_links = ('amount', 'description')
filter_vertical = ('tickets', )
exclude = ('cluster', )
@@ -0,0 +1,140 @@
+# encoding: utf-8
+import datetime
+from south.db import db
+from south.v2 import SchemaMigration
+from django.db import models
+
+class Migration(SchemaMigration):
+
+ def forwards(self, orm):
+
+ # Adding field 'Transaction.other_text'
+ db.add_column('tracker_transaction', 'other_text', self.gf('django.db.models.fields.CharField')(default='', max_length=60, blank=True), keep_default=False)
+
+ # Changing field 'Transaction.other'
+ db.alter_column('tracker_transaction', 'other_id', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['auth.User'], null=True))
+
+
+ def backwards(self, orm):
+
+ # Deleting field 'Transaction.other_text'
+ db.delete_column('tracker_transaction', 'other_text')
+
+ # User chose to not deal with backwards NULL issues for 'Transaction.other'
+ raise RuntimeError("Cannot reverse this migration. 'Transaction.other' and its values cannot be restored.")
+
+
+ models = {
+ 'auth.group': {
+ 'Meta': {'object_name': 'Group'},
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
+ 'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
+ },
+ 'auth.permission': {
+ 'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'},
+ 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+ 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
+ },
+ 'auth.user': {
+ 'Meta': {'object_name': 'User'},
+ 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+ 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
+ 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+ 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+ 'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+ 'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+ 'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+ 'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+ 'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+ 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
+ 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
+ },
+ 'contenttypes.contenttype': {
+ 'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
+ 'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+ 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
+ },
+ 'tracker.cluster': {
+ 'Meta': {'object_name': 'Cluster'},
+ 'id': ('django.db.models.fields.IntegerField', [], {'primary_key': 'True'}),
+ 'more_tickets': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+ 'total_tickets': ('django.db.models.fields.DecimalField', [], {'null': 'True', 'max_digits': '8', 'decimal_places': '2', 'blank': 'True'}),
+ 'total_transactions': ('django.db.models.fields.DecimalField', [], {'null': 'True', 'max_digits': '8', 'decimal_places': '2', 'blank': 'True'})
+ },
+ 'tracker.expediture': {
+ 'Meta': {'object_name': 'Expediture'},
+ 'accounting_info': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
+ 'amount': ('django.db.models.fields.DecimalField', [], {'max_digits': '8', 'decimal_places': '2'}),
+ 'description': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'ticket': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['tracker.Ticket']"})
+ },
+ 'tracker.grant': {
+ 'Meta': {'ordering': "['full_name']", 'object_name': 'Grant'},
+ 'description': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+ 'full_name': ('django.db.models.fields.CharField', [], {'max_length': '80'}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'short_name': ('django.db.models.fields.CharField', [], {'max_length': '16'}),
+ 'slug': ('django.db.models.fields.SlugField', [], {'max_length': '50', 'db_index': 'True'})
+ },
+ 'tracker.mediainfo': {
+ 'Meta': {'object_name': 'MediaInfo'},
+ 'count': ('django.db.models.fields.PositiveIntegerField', [], {'null': 'True', 'blank': 'True'}),
+ 'description': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'ticket': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['tracker.Ticket']"}),
+ 'url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'blank': 'True'})
+ },
+ 'tracker.ticket': {
+ 'Meta': {'ordering': "['-sort_date']", 'object_name': 'Ticket'},
+ 'cluster': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['tracker.Cluster']", 'null': 'True', 'blank': 'True'}),
+ 'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+ 'custom_state': ('django.db.models.fields.CharField', [], {'max_length': '100', 'blank': 'True'}),
+ 'description': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+ 'event_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'payment_status': ('django.db.models.fields.CharField', [], {'default': "'n/a'", 'max_length': '20'}),
+ 'rating_percentage': ('tracker.models.PercentageField', [], {'null': 'True', 'blank': 'True'}),
+ 'requested_text': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+ 'requested_user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']", 'null': 'True', 'blank': 'True'}),
+ 'sort_date': ('django.db.models.fields.DateField', [], {}),
+ 'state': ('django.db.models.fields.CharField', [], {'max_length': '20'}),
+ 'summary': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+ 'supervisor_notes': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+ 'topic': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['tracker.Topic']"}),
+ 'updated': ('django.db.models.fields.DateTimeField', [], {})
+ },
+ 'tracker.topic': {
+ 'Meta': {'ordering': "['name']", 'object_name': 'Topic'},
+ 'admin': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.User']", 'symmetrical': 'False', 'blank': 'True'}),
+ 'description': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+ 'form_description': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+ 'grant': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['tracker.Grant']"}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'name': ('django.db.models.fields.CharField', [], {'max_length': '80'}),
+ 'open_for_tickets': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+ 'ticket_expenses': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+ 'ticket_media': ('django.db.models.fields.BooleanField', [], {'default': 'False'})
+ },
+ 'tracker.transaction': {
+ 'Meta': {'ordering': "['-date']", 'object_name': 'Transaction'},
+ 'accounting_info': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
+ 'amount': ('django.db.models.fields.DecimalField', [], {'max_digits': '8', 'decimal_places': '2'}),
+ 'cluster': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['tracker.Cluster']", 'null': 'True', 'blank': 'True'}),
+ 'date': ('django.db.models.fields.DateField', [], {}),
+ 'description': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'other': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']", 'null': 'True', 'blank': 'True'}),
+ 'other_text': ('django.db.models.fields.CharField', [], {'max_length': '60', 'blank': 'True'}),
+ 'tickets': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['tracker.Ticket']", 'symmetrical': 'False', 'blank': 'True'})
+ }
+ }
+
+ complete_apps = ['tracker']
@@ -274,7 +274,8 @@ def balance(self):
class Transaction(models.Model):
""" One payment to or from the user. """
date = models.DateField(_('date'))
- other = models.ForeignKey('auth.User', verbose_name=_('other party'), help_text=_('The other party; user who sent or received the payment'))
+ other = models.ForeignKey('auth.User', verbose_name=_('other party'), blank=True, null=True, help_text=_('The other party; user who sent or received the payment'))
+ other_text = models.CharField(_('other party (text)'), max_length=60, blank=True, help_text=_('The other party; this text is used when user is not selected'))
amount = models.DecimalField(_('amount'), max_digits=8, decimal_places=2, help_text=_('Payment amount; Positive value means transaction to the user, negative is a transaction from the user'))
description = models.CharField(_('description'), max_length=255, help_text=_('Description of this transaction'))
accounting_info = models.CharField(_('accounting info'), max_length=255, blank=True, help_text=_('Accounting info'))
@@ -287,6 +288,20 @@ def __unicode__(self):
out += ': ' + self.description
return out
+ def other_party(self):
+ if self.other != None:
+ return self.other.username
+ else:
+ return self.other_text
+ other_party.short_description = _('other party')
+
+ def other_party_html(self):
+ if self.other != None:
+ out = '<a href="%s">%s</a>' % (self.other.get_absolute_url(), escape(unicode(self.other)))
+ return mark_safe(out)
+ else:
+ return escape(self.other_text)
+
def ticket_ids(self):
return u', '.join([unicode(t.id) for t in self.tickets.order_by('id')])
@@ -18,7 +18,7 @@
<h2>{% trans "Transactions" %}</h2>
<table><tr><th>{% trans "Date" %}</th><th>{% trans "User" %}</th><th>{% trans "Amount" %}</th><th>{% trans "Description" %}</th><th>{% trans "Tickets" %}</th><th>{% trans "Accounting info" %}</th></tr>
{% for t in cluster.transaction_set.all %}
-<tr><td>{{t.date}}</td><td><a href="{% url user_detail t.other.username %}">{{t.other}}</a></td><td>{{t.amount}} {{t.currency}}</td><td>{{t.description}}</td>
+<tr><td>{{t.date}}</td><td>{{t.other_party_html}}</td><td>{{t.amount}} {{t.currency}}</td><td>{{t.description}}</td>
<td>{% for ticket in t.tickets_by_id %}<a href="{{ticket.get_absolute_url}}" title="{{ticket.summary}} ({{ticket.sort_date}})">{{ticket.id}}</a>{% if not forloop.last %}, {% endif %}{% endfor %}</td>
<td>{{t.accounting_info}}</td></tr>
{% endfor %}
@@ -55,7 +55,7 @@
<p>{% trans "Payment status" %}: {{ticket.get_payment_status_display}}{% if ticket.cluster.more_tickets %} ({% blocktrans with c_id=ticket.cluster.id c_link=ticket.cluster.get_absolute_url cr=ticket.currency total_tickets=ticket.cluster.total_tickets total_transactions=ticket.cluster.total_transactions %}part of <a href="{{c_link}}">cluster {{c_id}}</a>: total tickets {{total_tickets}}&nbsp;{{cr}}, total transactions {{total_transactions}}&nbsp;{{cr}}{% endblocktrans %}){% endif %}</p>
<table><tr><th>{% trans "Date" %}</th><th>{% trans "User" %}</th><th>{% trans "Amount" %}</th><th>{% trans "Description" %}</th><th>{% trans "Accounting info" %}</th></tr>
{% for t in ticket.transaction_set.all %}
-<tr><td>{{t.date}}</td><td><a href="{% url user_detail t.other.username %}">{{t.other}}</a></td><td>{{t.amount}} {{t.currency}}</td><td>{{t.description}}</td><td>{{t.accounting_info}}</td></tr>
+<tr><td>{{t.date}}</td><td>{{t.other_party_html}}</td><td>{{t.amount}} {{t.currency}}</td><td>{{t.description}}</td><td>{{t.accounting_info}}</td></tr>
{% endfor %}
<tr class="total first_total">
<td colspan="2">{% trans "Associated transactions total" %}</td>
@@ -14,7 +14,7 @@
{% if transaction_list %}
<table><tr><th>{% trans "Date" %}</th><th>{% trans "User" %}</th><th>{% trans "Amount" %}</th><th>{% trans "Description" %}</th><th>{% trans "Tickets" %}</th><th>{% trans "Accounting info" %}</th></tr>
{% for t in transaction_list %}
-<tr><td>{{t.date}}</td><td><a href="{% url user_detail t.other.username %}">{{t.other}}</a></td><td>{{t.amount}} {{t.currency}}</td><td>{{t.description}}</td>
+<tr><td>{{t.date}}</td><td>{{t.other_party_html}}</td><td>{{t.amount}} {{t.currency}}</td><td>{{t.description}}</td>
<td>{% for ticket in t.tickets_by_id %}<a href="{{ticket.get_absolute_url}}" title="{{ticket.summary}} ({{ticket.sort_date}})">{{ticket.id}}</a>{% if not forloop.last %}, {% endif %}{% endfor %}</td>
<td>{{t.accounting_info}}</td></tr>
{% endfor %}

0 comments on commit 9529dac

Please sign in to comment.