[GNUnet-SVN] [taler-bank] branch master updated (79a16b1 -> 6b9df03)

[gnunet]

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

marcello pushed a change to branch master
in repository bank.

    from 79a16b1  remove obsolete information from README
     new 52e913b  fix install-dev
     new 6b9df03  remove leftover from previous (wrong) /reject semantics

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 install-dev.py.in       |  4 +---
 talerbank/app/models.py |  5 -----
 talerbank/app/views.py  | 10 +++-------
 3 files changed, 4 insertions(+), 15 deletions(-)

diff --git a/install-dev.py.in b/install-dev.py.in
index b4cfc6e..214b243 100644
--- a/install-dev.py.in
+++ b/install-dev.py.in
@@ -19,7 +19,7 @@ prefix_path = "%s/lib/python%d.%d/site-packages" % (
 
 current_paths = os.environ.get("PYTHONPATH", "").split(":")
 current_paths.append(prefix_path)
-current_paths.remove("")
+current_paths = [x for x in current_paths if x != ""]
 os.environ["PYTHONPATH"] = ":".join(current_paths)
 
 args = ["pip3", "install", '--install-option=--prefix=%s' % "@prefix@", "-e", 
"."]
@@ -27,5 +27,3 @@ if "@DEBIAN_PIP3_SYSTEM@":
     args.push("@DEBIAN_PIP3_SYSTEM@")
 
 os.execvp("pip3", args)
-
-
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