[IMP] Add support of analytic account into bank statement to be convenient with other method

lp bug: https://launchpad.net/bugs/470359 fixed

bzr revid: joel.grandguillaume@camptocamp.com-20091102115309-qh4zkiio3chsepcs
This commit is contained in:
Joel Grand-Guillaume
2009-11-02 12:53:09 +01:00
parent 61e37654f4
commit 3a3ded3e67
2 changed files with 12 additions and 3 deletions
+11 -3
View File
@@ -170,7 +170,9 @@ class account_bank_statement(osv.osv):
if line.state <> 'valid':
raise osv.except_osv(_('Error !'),
_('The account entries lines are not in valid state.'))
# for bank.statement.lines
# In line we get reconcile_id on bank.ste.rec.
# in bank stat.rec we get line_new_ids on bank.stat.rec.line
for move in st.line_ids:
move_id = account_move_obj.create(cr, uid, {
'journal_id': st.journal_id.id,
@@ -209,7 +211,7 @@ class account_bank_statement(osv.osv):
'period_id': st.period_id.id,
'currency_id': st.currency.id,
}
amount = res_currency_obj.compute(cr, uid, st.currency.id,
company_currency_id, move.amount, context=context,
account=acc_cur)
@@ -245,6 +247,8 @@ class account_bank_statement(osv.osv):
'statement_id': st.id,
'journal_id': st.journal_id.id,
'period_id': st.period_id.id,
# Add analytical account if provided..
'analytic_account_id':newline.analytic_id and newline.analytic_id.id or False,
}, context=context)
# Fill the secondary amount/currency
@@ -491,10 +495,14 @@ class account_bank_statement_reconcile_line(osv.osv):
_name = "account.bank.statement.reconcile.line"
_description = "Statement reconcile line"
_columns = {
'name': fields.char('Description', size=64),
'name': fields.char('Description', size=64, required=True),
'account_id': fields.many2one('account.account', 'Account', required=True),
'line_id': fields.many2one('account.bank.statement.reconcile', 'Reconcile'),
'amount': fields.float('Amount', required=True),
'analytic_id': fields.many2one('account.analytic.account',"Analytic Account")
}
_defaults = {
'name': lambda *a: 'Write-Off',
}
account_bank_statement_reconcile_line()
+1
View File
@@ -417,6 +417,7 @@
<tree editable="bottom" string="Write-Off">
<field name="account_id" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
<field name="amount"/>
<field name="analytic_id" domain="[('type','&lt;&gt;','view')]"/>
<field name="name"/>
</tree>
</field>