odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[FIX] account: pay and reconcile with creation of move with good type 

bzr revid: mra@mra-laptop-20100618082811-ky4wb3w14f8sd6iw
This commit is contained in:
Mustufa Rangwala 2010-06-18 13:58:11 +05:30
parent 35a8398686
commit d7e0e18d7f
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
addons/account/invoice.py
View File

@ -1077,16 +1077,18 @@ class account_invoice(osv.osv):
amount_currency = False
currency_id = False
pay_journal = self.pool.get('account.journal').read(cr, uid, pay_journal_id, ['type'], context=context)
if invoice.type in ('in_invoice', 'out_invoice'):
if pay_journal['type'] == 'bank':
entry_type = 'bank_pay_voucher' # Bank payment
else:
entry_type = 'pay_voucher' # Cash payment
else:
entry_type = 'cont_voucher'
if invoice.type in ('in_invoice', 'in_refund'):
ref = invoice.reference
entry_type = 'journal_pur_voucher'
if invoice.type == 'in_refund':
entry_type = 'cont_voucher'
else:
ref = self._convert_ref(cr, uid, invoice.number)
entry_type = 'journal_sale_vou'
if invoice.type == 'out_refund':
entry_type = 'cont_voucher'
# Pay attention to the sign for both debit/credit AND amount_currency
l1 = {