mirror of
https://github.com/eitchtee/WYGIWYH.git
synced 2026-11-14 12:53:53 +01:00
fix(transactions): apply the form amount to a paid transaction converted into a recurring transaction
This commit is contained in:
1 parent
8b896cf31f
commit
35ef1dd716
2 files changed
+4
-5
No files matched your search
@@ -976,9 +976,7 @@ class RecurringTransaction(models.Model):
|
||||
existing_transaction.category = self.category
|
||||
existing_transaction.notes = self.notes if self.add_notes_to_transaction else ""
|
||||
existing_transaction.recurring_transaction = self
|
||||
|
||||
if not existing_transaction.is_paid: # Don't update value for paid transactions
|
||||
existing_transaction.amount = self.amount
|
||||
existing_transaction.amount = self.amount
|
||||
|
||||
existing_transaction.save()
|
||||
existing_transaction.tags.set(self.tags(manager="all_objects").all())
|
||||
|
||||
@@ -275,8 +275,9 @@ class TransactionConvertViewTests(TestCase):
|
||||
recurring = RecurringTransaction.all_objects.get()
|
||||
self.transaction.refresh_from_db()
|
||||
self.assertEqual(self.transaction.recurring_transaction, recurring)
|
||||
# Paid amount is preserved
|
||||
self.assertEqual(self.transaction.amount, 50)
|
||||
# The form's amount applies even though the original was paid
|
||||
self.assertEqual(self.transaction.amount, 60)
|
||||
self.assertTrue(self.transaction.is_paid)
|
||||
self.assertEqual(
|
||||
recurring.transactions.filter(date=date(2030, 1, 15)).count(), 1
|
||||
)
|
||||
|
||||
Reference in new issue
Block a user