diff --git a/account_statement_base_completion/__openerp__.py b/account_statement_base_completion/__openerp__.py index 36988cac..ffb46563 100644 --- a/account_statement_base_completion/__openerp__.py +++ b/account_statement_base_completion/__openerp__.py @@ -26,7 +26,8 @@ 'maintainer': 'Camptocamp', 'category': 'Finance', 'complexity': 'normal', - 'depends': ['account_statement_ext'], + 'depends': ['account_statement_ext', + 'account_report_company'], 'description': """ The goal of this module is to improve the basic bank statement, help dealing with huge volume of reconciliation by providing basic rules to identify the diff --git a/account_statement_base_completion/statement.py b/account_statement_base_completion/statement.py index ba1771f5..aa7849bf 100644 --- a/account_statement_base_completion/statement.py +++ b/account_statement_base_completion/statement.py @@ -189,13 +189,7 @@ class AccountStatementCompletionRule(orm.Model): res = {} inv = self._find_invoice(cr, uid, line, inv_type, context=context) if inv: - # FIXME use only commercial_partner_id of invoice in 7.1 - # this is for backward compatibility in 7.0 before - # the refactoring of res.partner - if hasattr(inv, 'commercial_partner_id'): - partner_id = inv.commercial_partner_id.id - else: - partner_id = inv.partner_id.id + partner_id = inv.commercial_partner_id.id res = {'partner_id': partner_id, 'account_id': inv.account_id.id, 'type': inv_type} diff --git a/account_statement_transactionid_completion/statement.py b/account_statement_transactionid_completion/statement.py index 109b53cf..cc39f9ae 100644 --- a/account_statement_transactionid_completion/statement.py +++ b/account_statement_transactionid_completion/statement.py @@ -110,16 +110,7 @@ class AccountStatementCompletionRule(Model): elif len(invoice_id) == 1: invoice = invoice_obj.browse(cr, uid, invoice_id[0], context=context) - # if account_report_company is installed, the field to be - # used as partner is the commercial partner; otherwise, - # the basic partner must be used. - # - # This is used to keep consistent behavior from the module - # account_statement_base_completion. - if hasattr(invoice, 'commercial_partner_id'): - res['partner_id'] = invoice.commercial_partner_id.id - else: - res['partner_id'] = invoice.partner_id.id + res['partner_id'] = invoice.commercial_partner_id.id # we want the move to have the same ref than the found # invoice's move, thus it will be easier to link them for the # accountants