[GNUnet-SVN] [taler-bank] 02/02: remove leftover from previous (wrong) /reject semantics

[gnunet]

This is an automated email from the git hooks/post-receive script.

marcello pushed a commit to branch master
in repository bank.

commit 6b9df03fdf7eac1bdcc0f9ddbcda6dcc9b3f3d6d
Author: Marcello Stanisci <address@hidden>
AuthorDate: Thu Dec 14 11:22:05 2017 +0100

    remove leftover from previous (wrong) /reject semantics
---
 talerbank/app/models.py |  5 -----
 talerbank/app/views.py  | 10 +++-------
 2 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/talerbank/app/models.py b/talerbank/app/models.py
index 4abfcda..f8c5c47 100644
--- a/talerbank/app/models.py
+++ b/talerbank/app/models.py
@@ -80,8 +80,3 @@ class BankTransaction(models.Model):
     subject = models.CharField(default="(no subject given)", max_length=200)
     date = models.DateTimeField(auto_now=True, db_index=True)
     cancelled = models.BooleanField(default=False)
-    reimburses = models.ForeignKey("BankTransaction",
-                                   on_delete=models.CASCADE,
-                                   related_name="reimburser",
-                                   default=None,
-                                   null=True)
diff --git a/talerbank/app/views.py b/talerbank/app/views.py
index a0f66d8..725715c 100644
--- a/talerbank/app/views.py
+++ b/talerbank/app/views.py
@@ -348,7 +348,6 @@ def extract_history(account):
         entry = dict(
             row_id=item.id,
             cancelled=item.cancelled,
-            reimburses=item.reimburses,
             sign=sign,
             amount=item.amount.stringify(
                 settings.TALER_DIGITS, pretty=True),
@@ -609,8 +608,7 @@ def wire_transfer(amount,
     def wire_transfer_internal(amount,
                                debit_account,
                                credit_account,
-                               subject,
-                               reimburses=None):
+                               subject):
         LOGGER.info("%s => %s, %s, %s" %
                     (debit_account.account_no,
                      credit_account.account_no,
@@ -624,8 +622,7 @@ def wire_transfer(amount,
             amount=amount,
             credit_account=credit_account,
             debit_account=debit_account,
-            subject=subject,
-            reimburses=reimburses)
+            subject=subject)
         if debit_account.debit:
             debit_account.amount.add(amount)
 
@@ -676,8 +673,7 @@ def wire_transfer(amount,
             amount,
             debit_account,
             credit_account,
-            subject,
-            kwargs.get("reimburses", None))
+            subject)
     except (CurrencyMismatch, BadFormatAmount) as exc:
         err_cb(exc, JsonResponse({"error": "internal server error"},
                                  status=500))

-- 
To stop receiving notification emails like this one, please contact
address@hidden