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

[FIX] account, account_bank_statement_extensions, point_of_sale : account_bank_statement_extension conflicts with point_of_sale 

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

bzr revid: mdi@tinyerp.com-20120102090833-ytztgr3vsq2jkm4v
This commit is contained in:
Divyesh Makwana (Open ERP) 2012-01-02 14:38:33 +05:30
parent 93ac82f51e
commit 873aaacc50
4 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
addons/account/account_bank_statement.py
View File

@ -468,6 +468,7 @@ class account_bank_statement_line(osv.osv):
required=True),
'statement_id': fields.many2one('account.bank.statement', 'Statement',
select=True, required=True, ondelete='cascade'),
'journal_id': fields.related('statement_id', 'journal_id', type='many2one', relation='account.journal', string='Journal', store=True, readonly=True),
'analytic_account_id': fields.many2one('account.analytic.account', 'Analytic Account'),
'move_ids': fields.many2many('account.move',
'account_bank_statement_line_move_rel', 'statement_line_id','move_id',

3
addons/account_bank_statement_extensions/account_bank_statement.py
View File

@ -111,7 +111,6 @@ class account_bank_statement_line(osv.osv):
help="Code to identify transactions belonging to the same globalisation level within a batch payment"),
'globalisation_amount': fields.related('globalisation_id', 'amount', type='float',
relation='account.bank.statement.line.global', string='Glob. Amount', readonly=True),
'journal_id': fields.related('statement_id', 'journal_id', type='many2one', relation='account.journal', string='Journal', store=True, readonly=True),
'state': fields.selection([('draft', 'Draft'), ('confirm', 'Confirmed')],
'State', required=True, readonly=True),
'counterparty_name': fields.char('Counterparty Name', size=35),
@ -133,4 +132,4 @@ class account_bank_statement_line(osv.osv):
account_bank_statement_line()
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

1
addons/point_of_sale/point_of_sale.py
View File

@ -596,7 +596,6 @@ account_bank_statement()
class account_bank_statement_line(osv.osv):
_inherit = 'account.bank.statement.line'
_columns= {
'journal_id': fields.related('statement_id','journal_id','name', store=True, string='Journal', type='char', size=64),
'pos_statement_id': fields.many2one('pos.order', ondelete='cascade'),
}
account_bank_statement_line()

2
addons/point_of_sale/point_of_sale_demo.xml
View File

@ -108,7 +108,7 @@
<field model="pos.order" name="pos_statement_id" search="[('name', '=', u'POS/019')]"/>
<field name="company_id" ref="base.main_company"/>
<field name="account_id" ref="account.a_recv"/>
<field name="journal_id">Cash Journal - (test)</field>
<field name="journal_id" ref="account.cash_journal"/>
<field eval="[(6,0,[])]" name="move_ids"/>
<field name="date" eval="time.strftime('%Y-%m-%d')"/>
<field eval="450.0" name="amount"/>