Merged for financial improvements

bzr revid: hda@tinyerp.com-20091106075143-5y1tyxj41h5f9t1g

diff --cc addons/account/account_bank_statement.py
index 56c4ddb,1e40223..a443151
--- 1/addons/account/account_bank_statement.py
--- 2/addons/account/account_bank_statement.py
+++ b/addons/account/account_bank_statement.py
@@@ -245,6 -247,8 +247,7 @@@ 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
@@@ -495,7 -499,11 +498,10 @@@ class account_bank_statement_reconcile_
          '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()
  
  

diff --cc addons/account/account_move_line.py
Simple merge

diff --cc addons/account/account_view.xml
Simple merge