[FIX] account_voucher: bank statement reconciliation for refund invoices
bzr revid: dle@openerp.com-20140324144518-pnjtlxpuz63bq6ig
This commit is contained in:
parent
04f632820b
commit
98ca1ab200
|
@ -741,13 +741,17 @@ class account_voucher(osv.osv):
|
||||||
|
|
||||||
total_credit = 0.0
|
total_credit = 0.0
|
||||||
total_debit = 0.0
|
total_debit = 0.0
|
||||||
account_type = 'receivable'
|
account_type = None
|
||||||
|
if context.get('account_id'):
|
||||||
|
account_type = self.pool['account.account'].browse(cr, uid, context['account_id'], context=context).type
|
||||||
if ttype == 'payment':
|
if ttype == 'payment':
|
||||||
account_type = 'payable'
|
if not account_type:
|
||||||
|
account_type = 'payable'
|
||||||
total_debit = price or 0.0
|
total_debit = price or 0.0
|
||||||
else:
|
else:
|
||||||
total_credit = price or 0.0
|
total_credit = price or 0.0
|
||||||
account_type = 'receivable'
|
if not account_type:
|
||||||
|
account_type = 'receivable'
|
||||||
|
|
||||||
if not context.get('move_line_ids', False):
|
if not context.get('move_line_ids', False):
|
||||||
ids = move_line_pool.search(cr, uid, [('state','=','valid'), ('account_id.type', '=', account_type), ('reconcile_id', '=', False), ('partner_id', '=', partner_id)], context=context)
|
ids = move_line_pool.search(cr, uid, [('state','=','valid'), ('account_id.type', '=', account_type), ('reconcile_id', '=', False), ('partner_id', '=', partner_id)], context=context)
|
||||||
|
@ -836,9 +840,9 @@ class account_voucher(osv.osv):
|
||||||
else:
|
else:
|
||||||
default['value']['line_dr_ids'].append(rs)
|
default['value']['line_dr_ids'].append(rs)
|
||||||
|
|
||||||
if ttype == 'payment' and len(default['value']['line_cr_ids']) > 0:
|
if len(default['value']['line_cr_ids']) > 0:
|
||||||
default['value']['pre_line'] = 1
|
default['value']['pre_line'] = 1
|
||||||
elif ttype == 'receipt' and len(default['value']['line_dr_ids']) > 0:
|
elif len(default['value']['line_dr_ids']) > 0:
|
||||||
default['value']['pre_line'] = 1
|
default['value']['pre_line'] = 1
|
||||||
default['value']['writeoff_amount'] = self._compute_writeoff_amount(cr, uid, default['value']['line_dr_ids'], default['value']['line_cr_ids'], price, ttype)
|
default['value']['writeoff_amount'] = self._compute_writeoff_amount(cr, uid, default['value']['line_dr_ids'], default['value']['line_cr_ids'], price, ttype)
|
||||||
return default
|
return default
|
||||||
|
|
|
@ -213,10 +213,10 @@
|
||||||
<field name="inherit_id" ref="account.view_bank_statement_form"/>
|
<field name="inherit_id" ref="account.view_bank_statement_form"/>
|
||||||
<field name="arch" type="xml">
|
<field name="arch" type="xml">
|
||||||
<xpath expr="//page[@name='statement_line_ids']/field[@name='line_ids']/tree/field[@name='amount']" position="after">
|
<xpath expr="//page[@name='statement_line_ids']/field[@name='line_ids']/tree/field[@name='amount']" position="after">
|
||||||
<field name="voucher_id" string="" widget="many2onebutton" options="{'label':{'create':'Reconcile','edit':'Edit Reconciliation'}}" context="{'line_type': type, 'default_type': amount < 0 and 'payment' or 'receipt', 'type': amount < 0 and 'payment' or 'receipt', 'default_partner_id': partner_id, 'default_journal_id': parent.journal_id, 'default_amount': abs(amount), 'default_reference': ref, 'default_date': date, 'default_name': name, 'default_active': False}"/>
|
<field name="voucher_id" string="" widget="many2onebutton" options="{'label':{'create':'Reconcile','edit':'Edit Reconciliation'}}" context="{'line_type': type, 'default_type': amount < 0 and 'payment' or 'receipt', 'type': amount < 0 and 'payment' or 'receipt', 'default_partner_id': partner_id, 'default_journal_id': parent.journal_id, 'default_amount': abs(amount), 'default_reference': ref, 'default_date': date, 'default_name': name, 'default_active': False, 'account_id': account_id}"/>
|
||||||
</xpath>
|
</xpath>
|
||||||
<xpath expr="//page[@name='statement_line_ids']/field[@name='line_ids']/form/group/field[@name='sequence']" position="before">
|
<xpath expr="//page[@name='statement_line_ids']/field[@name='line_ids']/form/group/field[@name='sequence']" position="before">
|
||||||
<field name="voucher_id" widget="many2onebutton" options="{'label':{'create':'Reconcile','edit':'Edit Reconciliation'}}" context="{'line_type': type, 'default_type': amount < 0 and 'payment' or 'receipt', 'type': amount < 0 and 'payment' or 'receipt', 'default_partner_id': partner_id, 'default_journal_id': parent.journal_id, 'default_amount': abs(amount), 'default_reference': ref, 'default_date': date, 'default_name': name, 'default_active': False}"/>
|
<field name="voucher_id" widget="many2onebutton" options="{'label':{'create':'Reconcile','edit':'Edit Reconciliation'}}" context="{'line_type': type, 'default_type': amount < 0 and 'payment' or 'receipt', 'type': amount < 0 and 'payment' or 'receipt', 'default_partner_id': partner_id, 'default_journal_id': parent.journal_id, 'default_amount': abs(amount), 'default_reference': ref, 'default_date': date, 'default_name': name, 'default_active': False, 'account_id': account_id}"/>
|
||||||
</xpath>
|
</xpath>
|
||||||
<field name="amount" position="attributes">
|
<field name="amount" position="attributes">
|
||||||
<attribute name="on_change">onchange_amount(amount)</attribute>
|
<attribute name="on_change">onchange_amount(amount)</attribute>
|
||||||
|
@ -230,7 +230,7 @@
|
||||||
<field name="inherit_id" ref="account.view_bank_statement_form2"/>
|
<field name="inherit_id" ref="account.view_bank_statement_form2"/>
|
||||||
<field name="arch" type="xml">
|
<field name="arch" type="xml">
|
||||||
<xpath expr="//page/field[@name='line_ids']/tree/field[@name='amount']" position="after">
|
<xpath expr="//page/field[@name='line_ids']/tree/field[@name='amount']" position="after">
|
||||||
<field name="voucher_id" context="{'line_type': type, 'default_type': amount < 0 and 'payment' or 'receipt', 'type': amount < 0 and 'payment' or 'receipt', 'default_partner_id': partner_id, 'default_journal_id': parent.journal_id, 'default_amount': abs(amount), 'default_reference': ref, 'default_date': date, 'default_name': name}"/>
|
<field name="voucher_id" context="{'line_type': type, 'default_type': amount < 0 and 'payment' or 'receipt', 'type': amount < 0 and 'payment' or 'receipt', 'default_partner_id': partner_id, 'default_journal_id': parent.journal_id, 'default_amount': abs(amount), 'default_reference': ref, 'default_date': date, 'default_name': name, 'account_id': account_id}"/>
|
||||||
</xpath>
|
</xpath>
|
||||||
</field>
|
</field>
|
||||||
</record>
|
</record>
|
||||||
|
@ -241,7 +241,7 @@
|
||||||
<field name="inherit_id" ref="account.view_bank_statement_form2"/>
|
<field name="inherit_id" ref="account.view_bank_statement_form2"/>
|
||||||
<field name="arch" type="xml">
|
<field name="arch" type="xml">
|
||||||
<xpath expr="//page/field[@name='line_ids']/form/group/field[@name='amount']" position="after">
|
<xpath expr="//page/field[@name='line_ids']/form/group/field[@name='amount']" position="after">
|
||||||
<field name="voucher_id" context="{'line_type': type, 'default_type': amount < 0 and 'payment' or 'receipt', 'type': amount < 0 and 'payment' or 'receipt', 'default_partner_id': partner_id, 'default_journal_id': parent.journal_id, 'default_amount': abs(amount), 'default_reference': ref, 'default_date': date, 'default_name': name}"/>
|
<field name="voucher_id" context="{'line_type': type, 'default_type': amount < 0 and 'payment' or 'receipt', 'type': amount < 0 and 'payment' or 'receipt', 'default_partner_id': partner_id, 'default_journal_id': parent.journal_id, 'default_amount': abs(amount), 'default_reference': ref, 'default_date': date, 'default_name': name, 'account_id': account_id}"/>
|
||||||
</xpath>
|
</xpath>
|
||||||
</field>
|
</field>
|
||||||
</record>
|
</record>
|
||||||
|
|
Loading…
Reference in New Issue