pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[FIX] account: account_balance of journals having debit/credit accounts not set

Browse Source 
`default_debit_account_id` and `default_credit_account_id`
are not required.
The code computing the journal account balance should not
rely on the fact it is.

opw-641433
This commit is contained in:
Denis Ledoux
2015-06-03 11:13:03 +02:00
parent 1159a9c354
commit 62876b09f9
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/account/account_journal_dashboard.py
+7 -5
View File
@@ -151,11 +151,13 @@ class account_journal(models.Model):
if not line.journal_entry_ids:
number_to_reconcile += 1
# optimization to read sum of balance from account_move_line
query = """SELECT sum(balance) FROM account_move_line WHERE account_id in (%s, %s);"""
self.env.cr.execute(query, (self.default_debit_account_id.id, self.default_credit_account_id.id))
query_results = self.env.cr.dictfetchall()
if query_results and query_results[0].get('sum') != None:
account_sum = query_results[0].get('sum')
account_ids = tuple(filter(None, [self.default_debit_account_id.id, self.default_credit_account_id.id]))
if account_ids:
query = """SELECT sum(balance) FROM account_move_line WHERE account_id in %s;"""
self.env.cr.execute(query, (account_ids,))
query_results = self.env.cr.dictfetchall()
if query_results and query_results[0].get('sum') != None:
account_sum = query_results[0].get('sum')
#TODO need to check if all invoices are in the same currency than the journal!!!!
elif self.type in ['sale', 'purchase']:
# optimization to find total and sum of invoice that are in draft, open state