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

[REV] account: revert 8781286f1c

Browse Source 
Causes a traceback "Expected singleton" when opening the Reconciliation
from the accounting dashboard
This commit is contained in:
Richard Mathot
2018-09-13 11:00:15 +02:00
parent 60c9742dfb
commit cbdb7383e9
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/account/models/account_bank_statement.py
+4 -4
View File
@@ -298,7 +298,7 @@ class AccountBankStatement(models.Model):
WHERE account_id IS NULL AND not exists (select 1 from account_move m where m.statement_line_id = stl.id) WHERE account_id IS NULL AND not exists (select 1 from account_move m where m.statement_line_id = stl.id)
AND company_id = %s AND company_id = %s
""" """
params = (self.company_id.id,) params = (self.env.user.company_id.id,)
if statements: if statements:
sql_query += ' AND stl.statement_id IN %s' sql_query += ' AND stl.statement_id IN %s'
params += (tuple(statements.ids),) params += (tuple(statements.ids),)
@@ -323,7 +323,7 @@ class AccountBankStatement(models.Model):
) )
AND aml.ref IN %s AND aml.ref IN %s
""" """
params = (self.company_id.id, (st_lines_left[0].journal_id.default_credit_account_id.id, st_lines_left[0].journal_id.default_debit_account_id.id), tuple(refs)) params = (self.env.user.company_id.id, (st_lines_left[0].journal_id.default_credit_account_id.id, st_lines_left[0].journal_id.default_debit_account_id.id), tuple(refs))
if statements: if statements:
sql_query += 'AND stl.id IN %s' sql_query += 'AND stl.id IN %s'
params += (tuple(stl_to_assign_partner),) params += (tuple(stl_to_assign_partner),)
@@ -620,7 +620,7 @@ class AccountBankStatementLine(models.Model):
st_line_currency = self.currency_id or self.journal_id.currency_id st_line_currency = self.currency_id or self.journal_id.currency_id
currency = (st_line_currency and st_line_currency != company_currency) and st_line_currency.id or False currency = (st_line_currency and st_line_currency != company_currency) and st_line_currency.id or False
precision = st_line_currency and st_line_currency.decimal_places or company_currency.decimal_places precision = st_line_currency and st_line_currency.decimal_places or company_currency.decimal_places
params = {'company_id': self.company_id.id, params = {'company_id': self.env.user.company_id.id,
'account_payable_receivable': (self.journal_id.default_credit_account_id.id, self.journal_id.default_debit_account_id.id), 'account_payable_receivable': (self.journal_id.default_credit_account_id.id, self.journal_id.default_debit_account_id.id),
'amount': float_round(amount, precision_digits=precision), 'amount': float_round(amount, precision_digits=precision),
'partner_id': self.partner_id.id, 'partner_id': self.partner_id.id,
@@ -671,7 +671,7 @@ class AccountBankStatementLine(models.Model):
st_line_currency = self.currency_id or self.journal_id.currency_id st_line_currency = self.currency_id or self.journal_id.currency_id
currency = (st_line_currency and st_line_currency != company_currency) and st_line_currency.id or False currency = (st_line_currency and st_line_currency != company_currency) and st_line_currency.id or False
precision = st_line_currency and st_line_currency.decimal_places or company_currency.decimal_places precision = st_line_currency and st_line_currency.decimal_places or company_currency.decimal_places
params = {'company_id': self.company_id.id, params = {'company_id': self.env.user.company_id.id,
'account_payable_receivable': (self.journal_id.default_credit_account_id.id, self.journal_id.default_debit_account_id.id), 'account_payable_receivable': (self.journal_id.default_credit_account_id.id, self.journal_id.default_debit_account_id.id),
'amount': float_round(amount, precision_digits=precision), 'amount': float_round(amount, precision_digits=precision),
'partner_id': self.partner_id.id, 'partner_id': self.partner_id.id,