Changed the new_form and update_form methods of the JournalEntryData class in testlib.py to receive the next URI as the parameter instead of the constant, so that the JournalEntryData class can move to other places.
This commit is contained in:
parent
165e28441a
commit
c1d9ca284c
@ -26,7 +26,7 @@ import httpx
|
|||||||
from flask import Flask
|
from flask import Flask
|
||||||
|
|
||||||
from test_site import db
|
from test_site import db
|
||||||
from testlib import Accounts, create_test_app, get_client, \
|
from testlib import NEXT_URI, Accounts, create_test_app, get_client, \
|
||||||
match_journal_entry_detail, JournalEntryLineItemData, \
|
match_journal_entry_detail, JournalEntryLineItemData, \
|
||||||
JournalEntryCurrencyData, JournalEntryData, BaseTestData
|
JournalEntryCurrencyData, JournalEntryData, BaseTestData
|
||||||
|
|
||||||
@ -84,14 +84,14 @@ class OffsetTestCase(unittest.TestCase):
|
|||||||
original_line_item=self.data.l_r_or3d)])])
|
original_line_item=self.data.l_r_or3d)])])
|
||||||
|
|
||||||
# Non-existing original line item ID
|
# Non-existing original line item ID
|
||||||
form = journal_entry_data.new_form(self.csrf_token)
|
form = journal_entry_data.new_form(self.csrf_token, NEXT_URI)
|
||||||
form["currency-1-credit-1-original_line_item_id"] = "9999"
|
form["currency-1-credit-1-original_line_item_id"] = "9999"
|
||||||
response = self.client.post(store_uri, data=form)
|
response = self.client.post(store_uri, data=form)
|
||||||
self.assertEqual(response.status_code, 302)
|
self.assertEqual(response.status_code, 302)
|
||||||
self.assertEqual(response.headers["Location"], create_uri)
|
self.assertEqual(response.headers["Location"], create_uri)
|
||||||
|
|
||||||
# The same debit or credit
|
# The same debit or credit
|
||||||
form = journal_entry_data.new_form(self.csrf_token)
|
form = journal_entry_data.new_form(self.csrf_token, NEXT_URI)
|
||||||
form["currency-1-credit-1-original_line_item_id"] \
|
form["currency-1-credit-1-original_line_item_id"] \
|
||||||
= str(self.data.l_p_or1c.id)
|
= str(self.data.l_p_or1c.id)
|
||||||
form["currency-1-credit-1-account_code"] = self.data.l_p_or1c.account
|
form["currency-1-credit-1-account_code"] = self.data.l_p_or1c.account
|
||||||
@ -106,7 +106,8 @@ class OffsetTestCase(unittest.TestCase):
|
|||||||
account.is_need_offset = False
|
account.is_need_offset = False
|
||||||
db.session.commit()
|
db.session.commit()
|
||||||
response = self.client.post(
|
response = self.client.post(
|
||||||
store_uri, data=journal_entry_data.new_form(self.csrf_token))
|
store_uri,
|
||||||
|
data=journal_entry_data.new_form(self.csrf_token, NEXT_URI))
|
||||||
self.assertEqual(response.status_code, 302)
|
self.assertEqual(response.status_code, 302)
|
||||||
self.assertEqual(response.headers["Location"], create_uri)
|
self.assertEqual(response.headers["Location"], create_uri)
|
||||||
with self.app.app_context():
|
with self.app.app_context():
|
||||||
@ -115,7 +116,7 @@ class OffsetTestCase(unittest.TestCase):
|
|||||||
db.session.commit()
|
db.session.commit()
|
||||||
|
|
||||||
# The original line item is also an offset
|
# The original line item is also an offset
|
||||||
form = journal_entry_data.new_form(self.csrf_token)
|
form = journal_entry_data.new_form(self.csrf_token, NEXT_URI)
|
||||||
form["currency-1-credit-1-original_line_item_id"] \
|
form["currency-1-credit-1-original_line_item_id"] \
|
||||||
= str(self.data.l_p_of1d.id)
|
= str(self.data.l_p_of1d.id)
|
||||||
form["currency-1-credit-1-account_code"] = self.data.l_p_of1d.account
|
form["currency-1-credit-1-account_code"] = self.data.l_p_of1d.account
|
||||||
@ -124,21 +125,21 @@ class OffsetTestCase(unittest.TestCase):
|
|||||||
self.assertEqual(response.headers["Location"], create_uri)
|
self.assertEqual(response.headers["Location"], create_uri)
|
||||||
|
|
||||||
# Not the same currency
|
# Not the same currency
|
||||||
form = journal_entry_data.new_form(self.csrf_token)
|
form = journal_entry_data.new_form(self.csrf_token, NEXT_URI)
|
||||||
form["currency-1-code"] = "EUR"
|
form["currency-1-code"] = "EUR"
|
||||||
response = self.client.post(store_uri, data=form)
|
response = self.client.post(store_uri, data=form)
|
||||||
self.assertEqual(response.status_code, 302)
|
self.assertEqual(response.status_code, 302)
|
||||||
self.assertEqual(response.headers["Location"], create_uri)
|
self.assertEqual(response.headers["Location"], create_uri)
|
||||||
|
|
||||||
# Not the same account
|
# Not the same account
|
||||||
form = journal_entry_data.new_form(self.csrf_token)
|
form = journal_entry_data.new_form(self.csrf_token, NEXT_URI)
|
||||||
form["currency-1-credit-1-account_code"] = Accounts.NOTES_RECEIVABLE
|
form["currency-1-credit-1-account_code"] = Accounts.NOTES_RECEIVABLE
|
||||||
response = self.client.post(store_uri, data=form)
|
response = self.client.post(store_uri, data=form)
|
||||||
self.assertEqual(response.status_code, 302)
|
self.assertEqual(response.status_code, 302)
|
||||||
self.assertEqual(response.headers["Location"], create_uri)
|
self.assertEqual(response.headers["Location"], create_uri)
|
||||||
|
|
||||||
# Not exceeding net balance - partially offset
|
# Not exceeding net balance - partially offset
|
||||||
form = journal_entry_data.new_form(self.csrf_token)
|
form = journal_entry_data.new_form(self.csrf_token, NEXT_URI)
|
||||||
form["currency-1-credit-1-amount"] \
|
form["currency-1-credit-1-amount"] \
|
||||||
= str(journal_entry_data.currencies[0].credit[0].amount
|
= str(journal_entry_data.currencies[0].credit[0].amount
|
||||||
+ Decimal("0.01"))
|
+ Decimal("0.01"))
|
||||||
@ -147,7 +148,7 @@ class OffsetTestCase(unittest.TestCase):
|
|||||||
self.assertEqual(response.headers["Location"], create_uri)
|
self.assertEqual(response.headers["Location"], create_uri)
|
||||||
|
|
||||||
# Not exceeding net balance - unmatched
|
# Not exceeding net balance - unmatched
|
||||||
form = journal_entry_data.new_form(self.csrf_token)
|
form = journal_entry_data.new_form(self.csrf_token, NEXT_URI)
|
||||||
form["currency-1-credit-3-amount"] \
|
form["currency-1-credit-3-amount"] \
|
||||||
= str(journal_entry_data.currencies[0].credit[2].amount
|
= str(journal_entry_data.currencies[0].credit[2].amount
|
||||||
+ Decimal("0.01"))
|
+ Decimal("0.01"))
|
||||||
@ -158,14 +159,14 @@ class OffsetTestCase(unittest.TestCase):
|
|||||||
# Not before the original line items
|
# Not before the original line items
|
||||||
old_days = journal_entry_data.days
|
old_days = journal_entry_data.days
|
||||||
journal_entry_data.days = old_days + 1
|
journal_entry_data.days = old_days + 1
|
||||||
form = journal_entry_data.new_form(self.csrf_token)
|
form = journal_entry_data.new_form(self.csrf_token, NEXT_URI)
|
||||||
response = self.client.post(store_uri, data=form)
|
response = self.client.post(store_uri, data=form)
|
||||||
self.assertEqual(response.status_code, 302)
|
self.assertEqual(response.status_code, 302)
|
||||||
self.assertEqual(response.headers["Location"], create_uri)
|
self.assertEqual(response.headers["Location"], create_uri)
|
||||||
journal_entry_data.days = old_days
|
journal_entry_data.days = old_days
|
||||||
|
|
||||||
# Success
|
# Success
|
||||||
form = journal_entry_data.new_form(self.csrf_token)
|
form = journal_entry_data.new_form(self.csrf_token, NEXT_URI)
|
||||||
response = self.client.post(store_uri, data=form)
|
response = self.client.post(store_uri, data=form)
|
||||||
self.assertEqual(response.status_code, 302)
|
self.assertEqual(response.status_code, 302)
|
||||||
journal_entry_id: int \
|
journal_entry_id: int \
|
||||||
@ -194,14 +195,14 @@ class OffsetTestCase(unittest.TestCase):
|
|||||||
journal_entry_data.currencies[0].credit[2].amount = Decimal("600")
|
journal_entry_data.currencies[0].credit[2].amount = Decimal("600")
|
||||||
|
|
||||||
# Non-existing original line item ID
|
# Non-existing original line item ID
|
||||||
form = journal_entry_data.update_form(self.csrf_token)
|
form = journal_entry_data.update_form(self.csrf_token, NEXT_URI)
|
||||||
form["currency-1-credit-1-original_line_item_id"] = "9999"
|
form["currency-1-credit-1-original_line_item_id"] = "9999"
|
||||||
response = self.client.post(update_uri, data=form)
|
response = self.client.post(update_uri, data=form)
|
||||||
self.assertEqual(response.status_code, 302)
|
self.assertEqual(response.status_code, 302)
|
||||||
self.assertEqual(response.headers["Location"], edit_uri)
|
self.assertEqual(response.headers["Location"], edit_uri)
|
||||||
|
|
||||||
# The same debit or credit
|
# The same debit or credit
|
||||||
form = journal_entry_data.update_form(self.csrf_token)
|
form = journal_entry_data.update_form(self.csrf_token, NEXT_URI)
|
||||||
form["currency-1-credit-1-original_line_item_id"] \
|
form["currency-1-credit-1-original_line_item_id"] \
|
||||||
= str(self.data.l_p_or1c.id)
|
= str(self.data.l_p_or1c.id)
|
||||||
form["currency-1-credit-1-account_code"] = self.data.l_p_or1c.account
|
form["currency-1-credit-1-account_code"] = self.data.l_p_or1c.account
|
||||||
@ -217,7 +218,8 @@ class OffsetTestCase(unittest.TestCase):
|
|||||||
account.is_need_offset = False
|
account.is_need_offset = False
|
||||||
db.session.commit()
|
db.session.commit()
|
||||||
response = self.client.post(
|
response = self.client.post(
|
||||||
update_uri, data=journal_entry_data.update_form(self.csrf_token))
|
update_uri,
|
||||||
|
data=journal_entry_data.update_form(self.csrf_token, NEXT_URI))
|
||||||
self.assertEqual(response.status_code, 302)
|
self.assertEqual(response.status_code, 302)
|
||||||
self.assertEqual(response.headers["Location"], edit_uri)
|
self.assertEqual(response.headers["Location"], edit_uri)
|
||||||
with self.app.app_context():
|
with self.app.app_context():
|
||||||
@ -226,7 +228,7 @@ class OffsetTestCase(unittest.TestCase):
|
|||||||
db.session.commit()
|
db.session.commit()
|
||||||
|
|
||||||
# The original line item is also an offset
|
# The original line item is also an offset
|
||||||
form = journal_entry_data.update_form(self.csrf_token)
|
form = journal_entry_data.update_form(self.csrf_token, NEXT_URI)
|
||||||
form["currency-1-credit-1-original_line_item_id"] \
|
form["currency-1-credit-1-original_line_item_id"] \
|
||||||
= str(self.data.l_p_of1d.id)
|
= str(self.data.l_p_of1d.id)
|
||||||
form["currency-1-credit-1-account_code"] = self.data.l_p_of1d.account
|
form["currency-1-credit-1-account_code"] = self.data.l_p_of1d.account
|
||||||
@ -235,21 +237,21 @@ class OffsetTestCase(unittest.TestCase):
|
|||||||
self.assertEqual(response.headers["Location"], edit_uri)
|
self.assertEqual(response.headers["Location"], edit_uri)
|
||||||
|
|
||||||
# Not the same currency
|
# Not the same currency
|
||||||
form = journal_entry_data.update_form(self.csrf_token)
|
form = journal_entry_data.update_form(self.csrf_token, NEXT_URI)
|
||||||
form["currency-1-code"] = "EUR"
|
form["currency-1-code"] = "EUR"
|
||||||
response = self.client.post(update_uri, data=form)
|
response = self.client.post(update_uri, data=form)
|
||||||
self.assertEqual(response.status_code, 302)
|
self.assertEqual(response.status_code, 302)
|
||||||
self.assertEqual(response.headers["Location"], edit_uri)
|
self.assertEqual(response.headers["Location"], edit_uri)
|
||||||
|
|
||||||
# Not the same account
|
# Not the same account
|
||||||
form = journal_entry_data.update_form(self.csrf_token)
|
form = journal_entry_data.update_form(self.csrf_token, NEXT_URI)
|
||||||
form["currency-1-credit-1-account_code"] = Accounts.NOTES_RECEIVABLE
|
form["currency-1-credit-1-account_code"] = Accounts.NOTES_RECEIVABLE
|
||||||
response = self.client.post(update_uri, data=form)
|
response = self.client.post(update_uri, data=form)
|
||||||
self.assertEqual(response.status_code, 302)
|
self.assertEqual(response.status_code, 302)
|
||||||
self.assertEqual(response.headers["Location"], edit_uri)
|
self.assertEqual(response.headers["Location"], edit_uri)
|
||||||
|
|
||||||
# Not exceeding net balance - partially offset
|
# Not exceeding net balance - partially offset
|
||||||
form = journal_entry_data.update_form(self.csrf_token)
|
form = journal_entry_data.update_form(self.csrf_token, NEXT_URI)
|
||||||
form["currency-1-debit-1-amount"] \
|
form["currency-1-debit-1-amount"] \
|
||||||
= str(journal_entry_data.currencies[0].debit[0].amount
|
= str(journal_entry_data.currencies[0].debit[0].amount
|
||||||
+ Decimal("0.01"))
|
+ Decimal("0.01"))
|
||||||
@ -261,7 +263,7 @@ class OffsetTestCase(unittest.TestCase):
|
|||||||
self.assertEqual(response.headers["Location"], edit_uri)
|
self.assertEqual(response.headers["Location"], edit_uri)
|
||||||
|
|
||||||
# Not exceeding net balance - unmatched
|
# Not exceeding net balance - unmatched
|
||||||
form = journal_entry_data.update_form(self.csrf_token)
|
form = journal_entry_data.update_form(self.csrf_token, NEXT_URI)
|
||||||
form["currency-1-debit-3-amount"] \
|
form["currency-1-debit-3-amount"] \
|
||||||
= str(journal_entry_data.currencies[0].debit[2].amount
|
= str(journal_entry_data.currencies[0].debit[2].amount
|
||||||
+ Decimal("0.01"))
|
+ Decimal("0.01"))
|
||||||
@ -275,14 +277,14 @@ class OffsetTestCase(unittest.TestCase):
|
|||||||
# Not before the original line items
|
# Not before the original line items
|
||||||
old_days: int = journal_entry_data.days
|
old_days: int = journal_entry_data.days
|
||||||
journal_entry_data.days = old_days + 1
|
journal_entry_data.days = old_days + 1
|
||||||
form = journal_entry_data.update_form(self.csrf_token)
|
form = journal_entry_data.update_form(self.csrf_token, NEXT_URI)
|
||||||
response = self.client.post(update_uri, data=form)
|
response = self.client.post(update_uri, data=form)
|
||||||
self.assertEqual(response.status_code, 302)
|
self.assertEqual(response.status_code, 302)
|
||||||
self.assertEqual(response.headers["Location"], edit_uri)
|
self.assertEqual(response.headers["Location"], edit_uri)
|
||||||
journal_entry_data.days = old_days
|
journal_entry_data.days = old_days
|
||||||
|
|
||||||
# Success
|
# Success
|
||||||
form = journal_entry_data.update_form(self.csrf_token)
|
form = journal_entry_data.update_form(self.csrf_token, NEXT_URI)
|
||||||
response = self.client.post(update_uri, data=form)
|
response = self.client.post(update_uri, data=form)
|
||||||
self.assertEqual(response.status_code, 302)
|
self.assertEqual(response.status_code, 302)
|
||||||
self.assertEqual(response.headers["Location"],
|
self.assertEqual(response.headers["Location"],
|
||||||
@ -307,21 +309,21 @@ class OffsetTestCase(unittest.TestCase):
|
|||||||
journal_entry_data.currencies[0].credit[1].amount = Decimal("3.4")
|
journal_entry_data.currencies[0].credit[1].amount = Decimal("3.4")
|
||||||
|
|
||||||
# Not the same currency
|
# Not the same currency
|
||||||
form = journal_entry_data.update_form(self.csrf_token)
|
form = journal_entry_data.update_form(self.csrf_token, NEXT_URI)
|
||||||
form["currency-1-code"] = "EUR"
|
form["currency-1-code"] = "EUR"
|
||||||
response = self.client.post(update_uri, data=form)
|
response = self.client.post(update_uri, data=form)
|
||||||
self.assertEqual(response.status_code, 302)
|
self.assertEqual(response.status_code, 302)
|
||||||
self.assertEqual(response.headers["Location"], edit_uri)
|
self.assertEqual(response.headers["Location"], edit_uri)
|
||||||
|
|
||||||
# Not the same account
|
# Not the same account
|
||||||
form = journal_entry_data.update_form(self.csrf_token)
|
form = journal_entry_data.update_form(self.csrf_token, NEXT_URI)
|
||||||
form["currency-1-debit-1-account_code"] = Accounts.NOTES_RECEIVABLE
|
form["currency-1-debit-1-account_code"] = Accounts.NOTES_RECEIVABLE
|
||||||
response = self.client.post(update_uri, data=form)
|
response = self.client.post(update_uri, data=form)
|
||||||
self.assertEqual(response.status_code, 302)
|
self.assertEqual(response.status_code, 302)
|
||||||
self.assertEqual(response.headers["Location"], edit_uri)
|
self.assertEqual(response.headers["Location"], edit_uri)
|
||||||
|
|
||||||
# Not less than offset total - partially offset
|
# Not less than offset total - partially offset
|
||||||
form = journal_entry_data.update_form(self.csrf_token)
|
form = journal_entry_data.update_form(self.csrf_token, NEXT_URI)
|
||||||
form["currency-1-debit-1-amount"] \
|
form["currency-1-debit-1-amount"] \
|
||||||
= str(journal_entry_data.currencies[0].debit[0].amount
|
= str(journal_entry_data.currencies[0].debit[0].amount
|
||||||
- Decimal("0.01"))
|
- Decimal("0.01"))
|
||||||
@ -333,7 +335,7 @@ class OffsetTestCase(unittest.TestCase):
|
|||||||
self.assertEqual(response.headers["Location"], edit_uri)
|
self.assertEqual(response.headers["Location"], edit_uri)
|
||||||
|
|
||||||
# Not less than offset total - fully offset
|
# Not less than offset total - fully offset
|
||||||
form = journal_entry_data.update_form(self.csrf_token)
|
form = journal_entry_data.update_form(self.csrf_token, NEXT_URI)
|
||||||
form["currency-1-debit-2-amount"] \
|
form["currency-1-debit-2-amount"] \
|
||||||
= str(journal_entry_data.currencies[0].debit[1].amount
|
= str(journal_entry_data.currencies[0].debit[1].amount
|
||||||
- Decimal("0.01"))
|
- Decimal("0.01"))
|
||||||
@ -347,21 +349,21 @@ class OffsetTestCase(unittest.TestCase):
|
|||||||
# Not after the offset items
|
# Not after the offset items
|
||||||
old_days: int = journal_entry_data.days
|
old_days: int = journal_entry_data.days
|
||||||
journal_entry_data.days = old_days - 1
|
journal_entry_data.days = old_days - 1
|
||||||
form = journal_entry_data.update_form(self.csrf_token)
|
form = journal_entry_data.update_form(self.csrf_token, NEXT_URI)
|
||||||
response = self.client.post(update_uri, data=form)
|
response = self.client.post(update_uri, data=form)
|
||||||
self.assertEqual(response.status_code, 302)
|
self.assertEqual(response.status_code, 302)
|
||||||
self.assertEqual(response.headers["Location"], edit_uri)
|
self.assertEqual(response.headers["Location"], edit_uri)
|
||||||
journal_entry_data.days = old_days
|
journal_entry_data.days = old_days
|
||||||
|
|
||||||
# Not deleting matched original line items
|
# Not deleting matched original line items
|
||||||
form = journal_entry_data.update_form(self.csrf_token)
|
form = journal_entry_data.update_form(self.csrf_token, NEXT_URI)
|
||||||
del form["currency-1-debit-1-id"]
|
del form["currency-1-debit-1-id"]
|
||||||
response = self.client.post(update_uri, data=form)
|
response = self.client.post(update_uri, data=form)
|
||||||
self.assertEqual(response.status_code, 302)
|
self.assertEqual(response.status_code, 302)
|
||||||
self.assertEqual(response.headers["Location"], edit_uri)
|
self.assertEqual(response.headers["Location"], edit_uri)
|
||||||
|
|
||||||
# Success
|
# Success
|
||||||
form = journal_entry_data.update_form(self.csrf_token)
|
form = journal_entry_data.update_form(self.csrf_token, NEXT_URI)
|
||||||
response = self.client.post(update_uri, data=form)
|
response = self.client.post(update_uri, data=form)
|
||||||
self.assertEqual(response.status_code, 302)
|
self.assertEqual(response.status_code, 302)
|
||||||
self.assertEqual(response.headers["Location"],
|
self.assertEqual(response.headers["Location"],
|
||||||
@ -408,14 +410,14 @@ class OffsetTestCase(unittest.TestCase):
|
|||||||
[])])
|
[])])
|
||||||
|
|
||||||
# Non-existing original line item ID
|
# Non-existing original line item ID
|
||||||
form = journal_entry_data.new_form(self.csrf_token)
|
form = journal_entry_data.new_form(self.csrf_token, NEXT_URI)
|
||||||
form["currency-1-debit-1-original_line_item_id"] = "9999"
|
form["currency-1-debit-1-original_line_item_id"] = "9999"
|
||||||
response = self.client.post(store_uri, data=form)
|
response = self.client.post(store_uri, data=form)
|
||||||
self.assertEqual(response.status_code, 302)
|
self.assertEqual(response.status_code, 302)
|
||||||
self.assertEqual(response.headers["Location"], create_uri)
|
self.assertEqual(response.headers["Location"], create_uri)
|
||||||
|
|
||||||
# The same debit or credit
|
# The same debit or credit
|
||||||
form = journal_entry_data.new_form(self.csrf_token)
|
form = journal_entry_data.new_form(self.csrf_token, NEXT_URI)
|
||||||
form["currency-1-debit-1-original_line_item_id"] \
|
form["currency-1-debit-1-original_line_item_id"] \
|
||||||
= str(self.data.l_r_or1d.id)
|
= str(self.data.l_r_or1d.id)
|
||||||
form["currency-1-debit-1-account_code"] = self.data.l_r_or1d.account
|
form["currency-1-debit-1-account_code"] = self.data.l_r_or1d.account
|
||||||
@ -430,7 +432,8 @@ class OffsetTestCase(unittest.TestCase):
|
|||||||
account.is_need_offset = False
|
account.is_need_offset = False
|
||||||
db.session.commit()
|
db.session.commit()
|
||||||
response = self.client.post(
|
response = self.client.post(
|
||||||
store_uri, data=journal_entry_data.new_form(self.csrf_token))
|
store_uri,
|
||||||
|
data=journal_entry_data.new_form(self.csrf_token, NEXT_URI))
|
||||||
self.assertEqual(response.status_code, 302)
|
self.assertEqual(response.status_code, 302)
|
||||||
self.assertEqual(response.headers["Location"], create_uri)
|
self.assertEqual(response.headers["Location"], create_uri)
|
||||||
with self.app.app_context():
|
with self.app.app_context():
|
||||||
@ -439,7 +442,7 @@ class OffsetTestCase(unittest.TestCase):
|
|||||||
db.session.commit()
|
db.session.commit()
|
||||||
|
|
||||||
# The original line item is also an offset
|
# The original line item is also an offset
|
||||||
form = journal_entry_data.new_form(self.csrf_token)
|
form = journal_entry_data.new_form(self.csrf_token, NEXT_URI)
|
||||||
form["currency-1-debit-1-original_line_item_id"] \
|
form["currency-1-debit-1-original_line_item_id"] \
|
||||||
= str(self.data.l_r_of1c.id)
|
= str(self.data.l_r_of1c.id)
|
||||||
form["currency-1-debit-1-account_code"] = self.data.l_r_of1c.account
|
form["currency-1-debit-1-account_code"] = self.data.l_r_of1c.account
|
||||||
@ -448,21 +451,21 @@ class OffsetTestCase(unittest.TestCase):
|
|||||||
self.assertEqual(response.headers["Location"], create_uri)
|
self.assertEqual(response.headers["Location"], create_uri)
|
||||||
|
|
||||||
# Not the same currency
|
# Not the same currency
|
||||||
form = journal_entry_data.new_form(self.csrf_token)
|
form = journal_entry_data.new_form(self.csrf_token, NEXT_URI)
|
||||||
form["currency-1-code"] = "EUR"
|
form["currency-1-code"] = "EUR"
|
||||||
response = self.client.post(store_uri, data=form)
|
response = self.client.post(store_uri, data=form)
|
||||||
self.assertEqual(response.status_code, 302)
|
self.assertEqual(response.status_code, 302)
|
||||||
self.assertEqual(response.headers["Location"], create_uri)
|
self.assertEqual(response.headers["Location"], create_uri)
|
||||||
|
|
||||||
# Not the same account
|
# Not the same account
|
||||||
form = journal_entry_data.new_form(self.csrf_token)
|
form = journal_entry_data.new_form(self.csrf_token, NEXT_URI)
|
||||||
form["currency-1-debit-1-account_code"] = Accounts.NOTES_PAYABLE
|
form["currency-1-debit-1-account_code"] = Accounts.NOTES_PAYABLE
|
||||||
response = self.client.post(store_uri, data=form)
|
response = self.client.post(store_uri, data=form)
|
||||||
self.assertEqual(response.status_code, 302)
|
self.assertEqual(response.status_code, 302)
|
||||||
self.assertEqual(response.headers["Location"], create_uri)
|
self.assertEqual(response.headers["Location"], create_uri)
|
||||||
|
|
||||||
# Not exceeding net balance - partially offset
|
# Not exceeding net balance - partially offset
|
||||||
form = journal_entry_data.new_form(self.csrf_token)
|
form = journal_entry_data.new_form(self.csrf_token, NEXT_URI)
|
||||||
form["currency-1-debit-1-amount"] \
|
form["currency-1-debit-1-amount"] \
|
||||||
= str(journal_entry_data.currencies[0].debit[0].amount
|
= str(journal_entry_data.currencies[0].debit[0].amount
|
||||||
+ Decimal("0.01"))
|
+ Decimal("0.01"))
|
||||||
@ -471,7 +474,7 @@ class OffsetTestCase(unittest.TestCase):
|
|||||||
self.assertEqual(response.headers["Location"], create_uri)
|
self.assertEqual(response.headers["Location"], create_uri)
|
||||||
|
|
||||||
# Not exceeding net balance - unmatched
|
# Not exceeding net balance - unmatched
|
||||||
form = journal_entry_data.new_form(self.csrf_token)
|
form = journal_entry_data.new_form(self.csrf_token, NEXT_URI)
|
||||||
form["currency-1-debit-3-amount"] \
|
form["currency-1-debit-3-amount"] \
|
||||||
= str(journal_entry_data.currencies[0].debit[2].amount
|
= str(journal_entry_data.currencies[0].debit[2].amount
|
||||||
+ Decimal("0.01"))
|
+ Decimal("0.01"))
|
||||||
@ -482,14 +485,14 @@ class OffsetTestCase(unittest.TestCase):
|
|||||||
# Not before the original line items
|
# Not before the original line items
|
||||||
old_days: int = journal_entry_data.days
|
old_days: int = journal_entry_data.days
|
||||||
journal_entry_data.days = old_days + 1
|
journal_entry_data.days = old_days + 1
|
||||||
form = journal_entry_data.new_form(self.csrf_token)
|
form = journal_entry_data.new_form(self.csrf_token, NEXT_URI)
|
||||||
response = self.client.post(store_uri, data=form)
|
response = self.client.post(store_uri, data=form)
|
||||||
self.assertEqual(response.status_code, 302)
|
self.assertEqual(response.status_code, 302)
|
||||||
self.assertEqual(response.headers["Location"], create_uri)
|
self.assertEqual(response.headers["Location"], create_uri)
|
||||||
journal_entry_data.days = old_days
|
journal_entry_data.days = old_days
|
||||||
|
|
||||||
# Success
|
# Success
|
||||||
form = journal_entry_data.new_form(self.csrf_token)
|
form = journal_entry_data.new_form(self.csrf_token, NEXT_URI)
|
||||||
response = self.client.post(store_uri, data=form)
|
response = self.client.post(store_uri, data=form)
|
||||||
self.assertEqual(response.status_code, 302)
|
self.assertEqual(response.status_code, 302)
|
||||||
journal_entry_id: int \
|
journal_entry_id: int \
|
||||||
@ -518,14 +521,14 @@ class OffsetTestCase(unittest.TestCase):
|
|||||||
journal_entry_data.currencies[0].credit[2].amount = Decimal("900")
|
journal_entry_data.currencies[0].credit[2].amount = Decimal("900")
|
||||||
|
|
||||||
# Non-existing original line item ID
|
# Non-existing original line item ID
|
||||||
form = journal_entry_data.update_form(self.csrf_token)
|
form = journal_entry_data.update_form(self.csrf_token, NEXT_URI)
|
||||||
form["currency-1-debit-1-original_line_item_id"] = "9999"
|
form["currency-1-debit-1-original_line_item_id"] = "9999"
|
||||||
response = self.client.post(update_uri, data=form)
|
response = self.client.post(update_uri, data=form)
|
||||||
self.assertEqual(response.status_code, 302)
|
self.assertEqual(response.status_code, 302)
|
||||||
self.assertEqual(response.headers["Location"], edit_uri)
|
self.assertEqual(response.headers["Location"], edit_uri)
|
||||||
|
|
||||||
# The same debit or credit
|
# The same debit or credit
|
||||||
form = journal_entry_data.update_form(self.csrf_token)
|
form = journal_entry_data.update_form(self.csrf_token, NEXT_URI)
|
||||||
form["currency-1-debit-1-original_line_item_id"] \
|
form["currency-1-debit-1-original_line_item_id"] \
|
||||||
= str(self.data.l_r_or1d.id)
|
= str(self.data.l_r_or1d.id)
|
||||||
form["currency-1-debit-1-account_code"] = self.data.l_r_or1d.account
|
form["currency-1-debit-1-account_code"] = self.data.l_r_or1d.account
|
||||||
@ -541,7 +544,8 @@ class OffsetTestCase(unittest.TestCase):
|
|||||||
account.is_need_offset = False
|
account.is_need_offset = False
|
||||||
db.session.commit()
|
db.session.commit()
|
||||||
response = self.client.post(
|
response = self.client.post(
|
||||||
update_uri, data=journal_entry_data.update_form(self.csrf_token))
|
update_uri,
|
||||||
|
data=journal_entry_data.update_form(self.csrf_token, NEXT_URI))
|
||||||
self.assertEqual(response.status_code, 302)
|
self.assertEqual(response.status_code, 302)
|
||||||
self.assertEqual(response.headers["Location"], edit_uri)
|
self.assertEqual(response.headers["Location"], edit_uri)
|
||||||
with self.app.app_context():
|
with self.app.app_context():
|
||||||
@ -550,7 +554,7 @@ class OffsetTestCase(unittest.TestCase):
|
|||||||
db.session.commit()
|
db.session.commit()
|
||||||
|
|
||||||
# The original line item is also an offset
|
# The original line item is also an offset
|
||||||
form = journal_entry_data.update_form(self.csrf_token)
|
form = journal_entry_data.update_form(self.csrf_token, NEXT_URI)
|
||||||
form["currency-1-debit-1-original_line_item_id"] \
|
form["currency-1-debit-1-original_line_item_id"] \
|
||||||
= str(self.data.l_r_of1c.id)
|
= str(self.data.l_r_of1c.id)
|
||||||
form["currency-1-debit-1-account_code"] = self.data.l_r_of1c.account
|
form["currency-1-debit-1-account_code"] = self.data.l_r_of1c.account
|
||||||
@ -559,21 +563,21 @@ class OffsetTestCase(unittest.TestCase):
|
|||||||
self.assertEqual(response.headers["Location"], edit_uri)
|
self.assertEqual(response.headers["Location"], edit_uri)
|
||||||
|
|
||||||
# Not the same currency
|
# Not the same currency
|
||||||
form = journal_entry_data.update_form(self.csrf_token)
|
form = journal_entry_data.update_form(self.csrf_token, NEXT_URI)
|
||||||
form["currency-1-code"] = "EUR"
|
form["currency-1-code"] = "EUR"
|
||||||
response = self.client.post(update_uri, data=form)
|
response = self.client.post(update_uri, data=form)
|
||||||
self.assertEqual(response.status_code, 302)
|
self.assertEqual(response.status_code, 302)
|
||||||
self.assertEqual(response.headers["Location"], edit_uri)
|
self.assertEqual(response.headers["Location"], edit_uri)
|
||||||
|
|
||||||
# Not the same account
|
# Not the same account
|
||||||
form = journal_entry_data.update_form(self.csrf_token)
|
form = journal_entry_data.update_form(self.csrf_token, NEXT_URI)
|
||||||
form["currency-1-debit-1-account_code"] = Accounts.NOTES_PAYABLE
|
form["currency-1-debit-1-account_code"] = Accounts.NOTES_PAYABLE
|
||||||
response = self.client.post(update_uri, data=form)
|
response = self.client.post(update_uri, data=form)
|
||||||
self.assertEqual(response.status_code, 302)
|
self.assertEqual(response.status_code, 302)
|
||||||
self.assertEqual(response.headers["Location"], edit_uri)
|
self.assertEqual(response.headers["Location"], edit_uri)
|
||||||
|
|
||||||
# Not exceeding net balance - partially offset
|
# Not exceeding net balance - partially offset
|
||||||
form = journal_entry_data.update_form(self.csrf_token)
|
form = journal_entry_data.update_form(self.csrf_token, NEXT_URI)
|
||||||
form["currency-1-debit-1-amount"] \
|
form["currency-1-debit-1-amount"] \
|
||||||
= str(journal_entry_data.currencies[0].debit[0].amount
|
= str(journal_entry_data.currencies[0].debit[0].amount
|
||||||
+ Decimal("0.01"))
|
+ Decimal("0.01"))
|
||||||
@ -585,7 +589,7 @@ class OffsetTestCase(unittest.TestCase):
|
|||||||
self.assertEqual(response.headers["Location"], edit_uri)
|
self.assertEqual(response.headers["Location"], edit_uri)
|
||||||
|
|
||||||
# Not exceeding net balance - unmatched
|
# Not exceeding net balance - unmatched
|
||||||
form = journal_entry_data.update_form(self.csrf_token)
|
form = journal_entry_data.update_form(self.csrf_token, NEXT_URI)
|
||||||
form["currency-1-debit-3-amount"] \
|
form["currency-1-debit-3-amount"] \
|
||||||
= str(journal_entry_data.currencies[0].debit[2].amount
|
= str(journal_entry_data.currencies[0].debit[2].amount
|
||||||
+ Decimal("0.01"))
|
+ Decimal("0.01"))
|
||||||
@ -599,14 +603,14 @@ class OffsetTestCase(unittest.TestCase):
|
|||||||
# Not before the original line items
|
# Not before the original line items
|
||||||
old_days: int = journal_entry_data.days
|
old_days: int = journal_entry_data.days
|
||||||
journal_entry_data.days = old_days + 1
|
journal_entry_data.days = old_days + 1
|
||||||
form = journal_entry_data.update_form(self.csrf_token)
|
form = journal_entry_data.update_form(self.csrf_token, NEXT_URI)
|
||||||
response = self.client.post(update_uri, data=form)
|
response = self.client.post(update_uri, data=form)
|
||||||
self.assertEqual(response.status_code, 302)
|
self.assertEqual(response.status_code, 302)
|
||||||
self.assertEqual(response.headers["Location"], edit_uri)
|
self.assertEqual(response.headers["Location"], edit_uri)
|
||||||
journal_entry_data.days = old_days
|
journal_entry_data.days = old_days
|
||||||
|
|
||||||
# Success
|
# Success
|
||||||
form = journal_entry_data.update_form(self.csrf_token)
|
form = journal_entry_data.update_form(self.csrf_token, NEXT_URI)
|
||||||
response = self.client.post(update_uri, data=form)
|
response = self.client.post(update_uri, data=form)
|
||||||
self.assertEqual(response.status_code, 302)
|
self.assertEqual(response.status_code, 302)
|
||||||
journal_entry_id: int \
|
journal_entry_id: int \
|
||||||
@ -635,21 +639,21 @@ class OffsetTestCase(unittest.TestCase):
|
|||||||
journal_entry_data.currencies[0].credit[1].amount = Decimal("0.9")
|
journal_entry_data.currencies[0].credit[1].amount = Decimal("0.9")
|
||||||
|
|
||||||
# Not the same currency
|
# Not the same currency
|
||||||
form = journal_entry_data.update_form(self.csrf_token)
|
form = journal_entry_data.update_form(self.csrf_token, NEXT_URI)
|
||||||
form["currency-1-code"] = "EUR"
|
form["currency-1-code"] = "EUR"
|
||||||
response = self.client.post(update_uri, data=form)
|
response = self.client.post(update_uri, data=form)
|
||||||
self.assertEqual(response.status_code, 302)
|
self.assertEqual(response.status_code, 302)
|
||||||
self.assertEqual(response.headers["Location"], edit_uri)
|
self.assertEqual(response.headers["Location"], edit_uri)
|
||||||
|
|
||||||
# Not the same account
|
# Not the same account
|
||||||
form = journal_entry_data.update_form(self.csrf_token)
|
form = journal_entry_data.update_form(self.csrf_token, NEXT_URI)
|
||||||
form["currency-1-credit-1-account_code"] = Accounts.NOTES_PAYABLE
|
form["currency-1-credit-1-account_code"] = Accounts.NOTES_PAYABLE
|
||||||
response = self.client.post(update_uri, data=form)
|
response = self.client.post(update_uri, data=form)
|
||||||
self.assertEqual(response.status_code, 302)
|
self.assertEqual(response.status_code, 302)
|
||||||
self.assertEqual(response.headers["Location"], edit_uri)
|
self.assertEqual(response.headers["Location"], edit_uri)
|
||||||
|
|
||||||
# Not less than offset total - partially offset
|
# Not less than offset total - partially offset
|
||||||
form = journal_entry_data.update_form(self.csrf_token)
|
form = journal_entry_data.update_form(self.csrf_token, NEXT_URI)
|
||||||
form["currency-1-debit-1-amount"] \
|
form["currency-1-debit-1-amount"] \
|
||||||
= str(journal_entry_data.currencies[0].debit[0].amount
|
= str(journal_entry_data.currencies[0].debit[0].amount
|
||||||
- Decimal("0.01"))
|
- Decimal("0.01"))
|
||||||
@ -661,7 +665,7 @@ class OffsetTestCase(unittest.TestCase):
|
|||||||
self.assertEqual(response.headers["Location"], edit_uri)
|
self.assertEqual(response.headers["Location"], edit_uri)
|
||||||
|
|
||||||
# Not less than offset total - fully offset
|
# Not less than offset total - fully offset
|
||||||
form = journal_entry_data.update_form(self.csrf_token)
|
form = journal_entry_data.update_form(self.csrf_token, NEXT_URI)
|
||||||
form["currency-1-debit-2-amount"] \
|
form["currency-1-debit-2-amount"] \
|
||||||
= str(journal_entry_data.currencies[0].debit[1].amount
|
= str(journal_entry_data.currencies[0].debit[1].amount
|
||||||
- Decimal("0.01"))
|
- Decimal("0.01"))
|
||||||
@ -675,21 +679,21 @@ class OffsetTestCase(unittest.TestCase):
|
|||||||
# Not after the offset items
|
# Not after the offset items
|
||||||
old_days: int = journal_entry_data.days
|
old_days: int = journal_entry_data.days
|
||||||
journal_entry_data.days = old_days - 1
|
journal_entry_data.days = old_days - 1
|
||||||
form = journal_entry_data.update_form(self.csrf_token)
|
form = journal_entry_data.update_form(self.csrf_token, NEXT_URI)
|
||||||
response = self.client.post(update_uri, data=form)
|
response = self.client.post(update_uri, data=form)
|
||||||
self.assertEqual(response.status_code, 302)
|
self.assertEqual(response.status_code, 302)
|
||||||
self.assertEqual(response.headers["Location"], edit_uri)
|
self.assertEqual(response.headers["Location"], edit_uri)
|
||||||
journal_entry_data.days = old_days
|
journal_entry_data.days = old_days
|
||||||
|
|
||||||
# Not deleting matched original line items
|
# Not deleting matched original line items
|
||||||
form = journal_entry_data.update_form(self.csrf_token)
|
form = journal_entry_data.update_form(self.csrf_token, NEXT_URI)
|
||||||
del form["currency-1-credit-1-id"]
|
del form["currency-1-credit-1-id"]
|
||||||
response = self.client.post(update_uri, data=form)
|
response = self.client.post(update_uri, data=form)
|
||||||
self.assertEqual(response.status_code, 302)
|
self.assertEqual(response.status_code, 302)
|
||||||
self.assertEqual(response.headers["Location"], edit_uri)
|
self.assertEqual(response.headers["Location"], edit_uri)
|
||||||
|
|
||||||
# Success
|
# Success
|
||||||
form = journal_entry_data.update_form(self.csrf_token)
|
form = journal_entry_data.update_form(self.csrf_token, NEXT_URI)
|
||||||
response = self.client.post(update_uri, data=form)
|
response = self.client.post(update_uri, data=form)
|
||||||
self.assertEqual(response.status_code, 302)
|
self.assertEqual(response.status_code, 302)
|
||||||
self.assertEqual(response.headers["Location"],
|
self.assertEqual(response.headers["Location"],
|
||||||
|
@ -259,33 +259,36 @@ class JournalEntryData:
|
|||||||
for line_item in currency.credit:
|
for line_item in currency.credit:
|
||||||
line_item.journal_entry = self
|
line_item.journal_entry = self
|
||||||
|
|
||||||
def new_form(self, csrf_token: str) -> dict[str, str]:
|
def new_form(self, csrf_token: str, next_uri: str) -> dict[str, str]:
|
||||||
"""Returns the journal entry as a creation form.
|
"""Returns the journal entry as a creation form.
|
||||||
|
|
||||||
:param csrf_token: The CSRF token.
|
:param csrf_token: The CSRF token.
|
||||||
|
:param next_uri: The next URI.
|
||||||
:return: The journal entry as a creation form.
|
:return: The journal entry as a creation form.
|
||||||
"""
|
"""
|
||||||
return self.__form(csrf_token, is_update=False)
|
return self.__form(csrf_token, next_uri, is_update=False)
|
||||||
|
|
||||||
def update_form(self, csrf_token: str) -> dict[str, str]:
|
def update_form(self, csrf_token: str, next_uri: str) -> dict[str, str]:
|
||||||
"""Returns the journal entry as an update form.
|
"""Returns the journal entry as an update form.
|
||||||
|
|
||||||
:param csrf_token: The CSRF token.
|
:param csrf_token: The CSRF token.
|
||||||
|
:param next_uri: The next URI.
|
||||||
:return: The journal entry as an update form.
|
:return: The journal entry as an update form.
|
||||||
"""
|
"""
|
||||||
return self.__form(csrf_token, is_update=True)
|
return self.__form(csrf_token, next_uri, is_update=True)
|
||||||
|
|
||||||
def __form(self, csrf_token: str, is_update: bool = False) \
|
def __form(self, csrf_token: str, next_uri: str, is_update: bool = False) \
|
||||||
-> dict[str, str]:
|
-> dict[str, str]:
|
||||||
"""Returns the journal entry as a form.
|
"""Returns the journal entry as a form.
|
||||||
|
|
||||||
:param csrf_token: The CSRF token.
|
:param csrf_token: The CSRF token.
|
||||||
|
:param next_uri: The next URI.
|
||||||
:param is_update: True for an update operation, or False otherwise
|
:param is_update: True for an update operation, or False otherwise
|
||||||
:return: The journal entry as a form.
|
:return: The journal entry as a form.
|
||||||
"""
|
"""
|
||||||
journal_entry_date: date = date.today() - timedelta(days=self.days)
|
journal_entry_date: date = date.today() - timedelta(days=self.days)
|
||||||
form: dict[str, str] = {"csrf_token": csrf_token,
|
form: dict[str, str] = {"csrf_token": csrf_token,
|
||||||
"next": NEXT_URI,
|
"next": next_uri,
|
||||||
"date": journal_entry_date.isoformat()}
|
"date": journal_entry_date.isoformat()}
|
||||||
for i in range(len(self.currencies)):
|
for i in range(len(self.currencies)):
|
||||||
form.update(self.currencies[i].form(i + 1, is_update))
|
form.update(self.currencies[i].form(i + 1, is_update))
|
||||||
|
Loading…
Reference in New Issue
Block a user