Compare commits
3 Commits
f29cb00aec
...
2969e83afe
Author | SHA1 | Date | |
---|---|---|---|
2969e83afe | |||
a732656746 | |||
1daed940b6 |
@ -2,6 +2,14 @@ Change Log
|
|||||||
==========
|
==========
|
||||||
|
|
||||||
|
|
||||||
|
Version 1.5.2
|
||||||
|
-------------
|
||||||
|
|
||||||
|
Released 2023/4/30
|
||||||
|
|
||||||
|
* Fixed the error of the net balance in the unmatched offset list.
|
||||||
|
|
||||||
|
|
||||||
Version 1.5.1
|
Version 1.5.1
|
||||||
-------------
|
-------------
|
||||||
|
|
||||||
|
@ -24,7 +24,7 @@ from flask_sqlalchemy import SQLAlchemy
|
|||||||
|
|
||||||
from accounting.utils.user import UserUtilityInterface
|
from accounting.utils.user import UserUtilityInterface
|
||||||
|
|
||||||
VERSION: str = "1.5.1"
|
VERSION: str = "1.5.2"
|
||||||
"""The package version."""
|
"""The package version."""
|
||||||
db: SQLAlchemy = SQLAlchemy()
|
db: SQLAlchemy = SQLAlchemy()
|
||||||
"""The database instance."""
|
"""The database instance."""
|
||||||
|
@ -123,15 +123,13 @@ class OffsetMatcher:
|
|||||||
.options(selectinload(JournalEntryLineItem.currency),
|
.options(selectinload(JournalEntryLineItem.currency),
|
||||||
selectinload(JournalEntryLineItem.journal_entry)).all()
|
selectinload(JournalEntryLineItem.journal_entry)).all()
|
||||||
for line_item in self.line_items:
|
for line_item in self.line_items:
|
||||||
line_item.is_offset = line_item.id in net_balances
|
line_item.is_offset = line_item.id not in net_balances
|
||||||
self.unapplied = [x for x in self.line_items
|
self.unapplied = [x for x in self.line_items if not x.is_offset]
|
||||||
if x.is_offset]
|
|
||||||
for line_item in self.unapplied:
|
for line_item in self.unapplied:
|
||||||
line_item.net_balance = line_item.amount \
|
line_item.net_balance = line_item.amount \
|
||||||
if net_balances[line_item.id] is None \
|
if net_balances[line_item.id] is None \
|
||||||
else net_balances[line_item.id]
|
else net_balances[line_item.id]
|
||||||
self.unmatched = [x for x in self.line_items
|
self.unmatched = [x for x in self.line_items if x.is_offset]
|
||||||
if not x.is_offset]
|
|
||||||
self.__populate_accumulated_balances()
|
self.__populate_accumulated_balances()
|
||||||
|
|
||||||
def __populate_accumulated_balances(self) -> None:
|
def __populate_accumulated_balances(self) -> None:
|
||||||
|
Loading…
Reference in New Issue
Block a user