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

[FIX][REF] Refactor method get_default_pay_receive_accounts of account_statement_ext to not reimplement property searching and also stop failure on trunk.

Browse Source
This commit is contained in:
Graeme Gellatly
2014-01-05 21:53:40 +13:00
parent be9717dafd
commit 50f47bc31b
1 changed files with 10 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
account_statement_ext/statement.py
View File

@@ -111,7 +111,7 @@ class AccountStatementProfile(Model):
_constraints = [ _constraints = [
(_check_partner, "You need to put a partner if you tic the 'Force partner on bank move'!", []), (_check_partner, "You need to put a partner if you tic the 'Force partner on bank move'!", []),
] ]
_sql_constraints = [ _sql_constraints = [
('name_uniq', 'unique (name, company_id)', 'The name of the bank statement must be unique !') ('name_uniq', 'unique (name, company_id)', 'The name of the bank statement must be unique !')
] ]
@@ -395,7 +395,7 @@ class AccountBankSatement(Model):
if errors_stack: if errors_stack:
msg = u"\n".join(errors_stack) msg = u"\n".join(errors_stack)
raise osv.except_osv(_('Error'), msg) raise osv.except_osv(_('Error'), msg)
#end changes # end changes
self.write(cr, uid, [st.id], self.write(cr, uid, [st.id],
{'name': st_number, {'name': st_number,
'balance_end_real': st.balance_end}, 'balance_end_real': st.balance_end},
@@ -498,31 +498,15 @@ class AccountBankSatement(Model):
:return: tuple of int/long ID that give account_receivable, account_payable based on :return: tuple of int/long ID that give account_receivable, account_payable based on
company default. company default.
""" """
account_receivable = False
account_payable = False
property_obj = self.pool.get('ir.property')
model_fields_obj = self.pool.get('ir.model.fields')
model_fields_ids = model_fields_obj.search(
cr,
uid,
[('name', 'in', ['property_account_receivable',
'property_account_payable']),
('model', '=', 'res.partner')],
context=context
)
property_ids = property_obj.search(cr,
uid,
[('fields_id', 'in', model_fields_ids),
('res_id', '=', False)],
context=context)
for erp_property in property_obj.browse( property_obj = self.pool.get('ir.property')
cr, uid, property_ids, context=context): account_receivable = property_obj.get(cr, uid, 'property_account_receivable',
if erp_property.fields_id.name == 'property_account_receivable': 'res.partner', context=context)
account_receivable = erp_property.value_reference.id account_payable = property_obj.get(cr, uid, 'property_account_payable',
elif erp_property.fields_id.name == 'property_account_payable': 'res.partner', context=context)
account_payable = erp_property.value_reference.id
return account_receivable, account_payable return (account_receivable and account_receivable.id or False,
account_payable and account_payable.id or False)
def balance_check(self, cr, uid, st_id, journal_type='bank', context=None): def balance_check(self, cr, uid, st_id, journal_type='bank', context=None):
""" """