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

[merge] lp:~openerp-dev/openobject-addons/trunk-addons9-accounting-apa-customer-payment-sgo 

bzr revid: jam@tinyerp.com-20120913112859-333bb6fs2f925clr
This commit is contained in:
Jigar Amin - OpenERP 2012-09-13 16:58:59 +05:30
parent 1ff7c428e5 54eac9c851
commit e18762e891
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
addons/account/partner_view.xml
View File

@ -102,8 +102,10 @@
</group>
<field name="bank_ids">
<form string="Bank account" version="7.0">
<field name="state"/>
<field name="acc_number"/>
<group>
<field name="state" class="oe_inline"/>
<field name="acc_number" class="oe_inline"/>
</group>
<group>
<group name="owner" string="Bank Account Owner">
<field name="partner_id" on_change="onchange_partner_id(partner_id)"/>

6
addons/account_voucher/account_voucher.py
View File

@ -1375,8 +1375,14 @@ class account_voucher_line(osv.osv):
'company_id': fields.related('voucher_id','company_id', relation='res.company', type='many2one', string='Company', store=True, readonly=True),
'currency_id': fields.function(_currency_id, string='Currency', type='many2one', relation='res.currency', readonly=True),
}
def _default_account_id(self, cr, uid, ids, context=None):
prop = self.pool.get('ir.property').get(cr, uid, 'property_account_income_categ', 'product.category', context=context)
return prop and prop.id or False
_defaults = {
'name': '',
'account_id':_default_account_id
}
def onchange_reconcile(self, cr, uid, ids, reconcile, amount, amount_unreconciled, context=None):