Compare commits
	
		
			4 Commits
		
	
	
		
			v0.11.0
			...
			5ae1ab95ae
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| 5ae1ab95ae | |||
| 7a5b3b78fc | |||
| 7df4051452 | |||
| 85084c68fd | 
@@ -13,7 +13,7 @@ sys.path.insert(0, os.path.abspath('../../src/'))
 | 
				
			|||||||
project = 'Mia! Accounting'
 | 
					project = 'Mia! Accounting'
 | 
				
			||||||
copyright = '2023, imacat'
 | 
					copyright = '2023, imacat'
 | 
				
			||||||
author = 'imacat'
 | 
					author = 'imacat'
 | 
				
			||||||
release = '0.11.0'
 | 
					release = '0.11.1'
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# -- General configuration ---------------------------------------------------
 | 
					# -- General configuration ---------------------------------------------------
 | 
				
			||||||
# https://www.sphinx-doc.org/en/master/usage/configuration.html#general-configuration
 | 
					# https://www.sphinx-doc.org/en/master/usage/configuration.html#general-configuration
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -17,7 +17,7 @@
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
[metadata]
 | 
					[metadata]
 | 
				
			||||||
name = mia-accounting
 | 
					name = mia-accounting
 | 
				
			||||||
version = 0.11.0
 | 
					version = 0.11.1
 | 
				
			||||||
author = imacat
 | 
					author = imacat
 | 
				
			||||||
author_email = imacat@mail.imacat.idv.tw
 | 
					author_email = imacat@mail.imacat.idv.tw
 | 
				
			||||||
description = The Mia! Accounting project.
 | 
					description = The Mia! Accounting project.
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -137,6 +137,7 @@ class AccountCollector:
 | 
				
			|||||||
            .join(JournalEntry).join(Account)\
 | 
					            .join(JournalEntry).join(Account)\
 | 
				
			||||||
            .filter(*conditions)\
 | 
					            .filter(*conditions)\
 | 
				
			||||||
            .group_by(Account.id, Account.base_code, Account.no)\
 | 
					            .group_by(Account.id, Account.base_code, Account.no)\
 | 
				
			||||||
 | 
					            .having(balance_func != 0)\
 | 
				
			||||||
            .order_by(Account.base_code, Account.no)
 | 
					            .order_by(Account.base_code, Account.no)
 | 
				
			||||||
        account_balances: list[sa.Row] \
 | 
					        account_balances: list[sa.Row] \
 | 
				
			||||||
            = db.session.execute(select_balance).all()
 | 
					            = db.session.execute(select_balance).all()
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -269,6 +269,7 @@ class IncomeStatement(BaseReport):
 | 
				
			|||||||
            .join(JournalEntry).join(Account)\
 | 
					            .join(JournalEntry).join(Account)\
 | 
				
			||||||
            .filter(*conditions)\
 | 
					            .filter(*conditions)\
 | 
				
			||||||
            .group_by(Account.id)\
 | 
					            .group_by(Account.id)\
 | 
				
			||||||
 | 
					            .having(balance_func != 0)\
 | 
				
			||||||
            .order_by(Account.base_code, Account.no)
 | 
					            .order_by(Account.base_code, Account.no)
 | 
				
			||||||
        balances: list[sa.Row] = db.session.execute(select_balances).all()
 | 
					        balances: list[sa.Row] = db.session.execute(select_balances).all()
 | 
				
			||||||
        accounts: dict[int, Account] \
 | 
					        accounts: dict[int, Account] \
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -191,6 +191,7 @@ class TrialBalance(BaseReport):
 | 
				
			|||||||
            .join(JournalEntry).join(Account)\
 | 
					            .join(JournalEntry).join(Account)\
 | 
				
			||||||
            .filter(*conditions)\
 | 
					            .filter(*conditions)\
 | 
				
			||||||
            .group_by(Account.id)\
 | 
					            .group_by(Account.id)\
 | 
				
			||||||
 | 
					            .having(balance_func != 0)\
 | 
				
			||||||
            .order_by(Account.base_code, Account.no)
 | 
					            .order_by(Account.base_code, Account.no)
 | 
				
			||||||
        balances: list[sa.Row] = db.session.execute(select_balances).all()
 | 
					        balances: list[sa.Row] = db.session.execute(select_balances).all()
 | 
				
			||||||
        accounts: dict[int, Account] \
 | 
					        accounts: dict[int, Account] \
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user