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

[IMP]account: account bank statement - usability 

bzr revid: ara@tinyerp.com-20110105072008-tan84dkar44plbls
This commit is contained in:
ARA (OpenERP) 2011-01-05 12:50:08 +05:30
parent dd88dc5dd5
commit 707b2780b4
2 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
addons/account/account_bank_statement.py
View File

@ -405,17 +405,25 @@ account_bank_statement()
class account_bank_statement_line(osv.osv):
def onchange_partner_id(self, cr, uid, partner_id, type, context={}):
part = self.pool.get('res.partner').browse(cr, uid, partner_id, context=context)
if not part.supplier and not part.customer :
def onchange_partner_id(self, cr, uid, ids, partner_id, context=None):
obj_partner = self.pool.get('res.partner')
if context is None:
context = {}
if not partner_id:
return {}
part = obj_partner.browse(cr, uid, partner_id, context=context)
if not part.supplier and not part.customer:
type = 'general'
elif part.supplier == True and part.customer == True :
elif part.supplier and part.customer:
type = 'general'
else:
if part.supplier == True :
if part.supplier == True:
type = 'supplier'
if part.customer == True :
if part.customer == True:
type = 'customer'
res_type = self.onchange_type(cr, uid, ids, partner_id=partner_id, type=type, context=context)
if res_type['value'] and res_type['value'].get('account_id', False):
return {'value': {'type': type, 'account_id': res_type['value']['account_id']}}
return {'value': {'type': type}}
def onchange_type(self, cr, uid, line_id, partner_id, type, context=None):
@ -427,8 +435,6 @@ class account_bank_statement_line(osv.osv):
return res
account_id = False
line = self.browse(cr, uid, line_id, context=context)
type=self.onchange_partner_id(cr, uid, partner_id=partner_id, type=type)
res.update({'value': {'type':type['value']['type']}})
if not line or (line and not line[0].account_id):
part = obj_partner.browse(cr, uid, partner_id, context=context)
if type == 'supplier':

10
addons/account/account_view.xml
View File

@ -565,7 +565,7 @@
<field name="date" groups="base.group_extended"/>
<field name="name"/>
<field name="ref"/>
<field name="partner_id" on_change="onchange_type(partner_id, type)"/>
<field name="partner_id" on_change="onchange_partner_id(partner_id)"/>
<field name="type" on_change="onchange_type(partner_id, type)"/>
<field domain="[('journal_id','=',parent.journal_id)]" name="account_id"/>
<field name="analytic_account_id" groups="analytic.group_analytic_accounting" domain="[('company_id', '=', parent.company_id), ('type', '&lt;&gt;', 'view')]"/>
@ -575,7 +575,7 @@
<field name="date"/>
<field name="name"/>
<field name="ref"/>
<field name="partner_id" on_change="onchange_type(partner_id, type)"/>
<field name="partner_id" on_change="onchange_partner_id(partner_id)"/>
<field name="type" on_change="onchange_type(partner_id, type)"/>
<field domain="[('journal_id', '=', parent.journal_id), ('type', '&lt;&gt;', 'view')]" name="account_id"/>
<field name="analytic_account_id" groups="analytic.group_analytic_accounting" domain="[('company_id', '=', parent.company_id), ('type', '&lt;&gt;', 'view')]"/>
@ -2633,7 +2633,7 @@ action = self.pool.get('res.config').next(cr, uid, [], context)
<field name="date" groups="base.group_extended"/>
<field name="name"/>
<field name="ref"/>
<field name="partner_id" on_change="onchange_type(partner_id, type)"/>
<field name="partner_id" on_change="onchange_partner_id(partner_id)"/>
<field name="type" on_change="onchange_type(partner_id, type)"/>
<field domain="[('journal_id','=',parent.journal_id)]" name="account_id"/>
<field name="analytic_account_id" groups="analytic.group_analytic_accounting" />
@ -2642,12 +2642,12 @@ action = self.pool.get('res.config').next(cr, uid, [], context)
<form string="Statement lines">
<field name="date"/>
<field name="name"/>
<field name="ref"/>
<field name="partner_id" on_change="onchange_partner_id(partner_id)"/>
<field name="type" on_change="onchange_type(partner_id, type)"/>
<field name="partner_id" on_change="onchange_type(partner_id, type)"/>
<field domain="[('journal_id', '=', parent.journal_id), ('type', '&lt;&gt;', 'view')]" name="account_id"/>
<field name="analytic_account_id" groups="analytic.group_analytic_accounting" />
<field name="amount"/>
<field name="ref"/>
<field name="sequence"/>
<separator colspan="4" string="Notes"/>
<field colspan="4" name="note" nolabel="1"/>