audrius/account-reconcile
1
0
Fork 1
mirror of https://github.com/OCA/account-reconcile.git synced 2025-01-20 12:27:39 +02:00
Code Issues Packages Projects Releases Wiki Activity

resolve conflict

Browse Source
This commit is contained in:
Graeme Gellatly
2014-02-02 22:37:44 +13:00
parent d005ec45b0 05d2948ca5
commit 6d9dc88fbe
29 changed files with 899 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
account_statement_ext/statement.py
View File

@@ -223,12 +223,17 @@ class AccountBankSatement(Model):
move of period_id to the statement line
"""
for statement in self.browse(cr, uid, ids, context=context):
# statement.company_id is a related store=True that for some
# reason doesn't work in YAML tests. As a workaround, I unwind it
# to statement.journal_id.company_id here.
if (statement.period_id and
statement.company_id.id != statement.period_id.company_id.id):
statement.journal_id.company_id.id !=
statement.period_id.company_id.id):
return False
for line in statement.line_ids:
if (line.period_id and
statement.company_id.id != line.period_id.company_id.id):
statement.journal_id.company_id.id
!= line.period_id.company_id.id):
return False
return True
@@ -536,12 +541,8 @@ class AccountBankSatement(Model):
import_config = self.pool.get("account.statement.profile").browse(
cr, uid, profile_id, context=context)
journal_id = import_config.journal_id.id
account_id = import_config.journal_id.default_debit_account_id.id
credit_partner_id = import_config.partner_id and import_config.partner_id.id or False
return {'value': {'journal_id': journal_id,
'account_id': account_id,
'balance_check': import_config.balance_check,
'credit_partner_id': credit_partner_id}}
'balance_check': import_config.balance_check}}
class AccountBankSatementLine(Model):