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

[usability2],add demo data in account asset 

bzr revid: amb@tinyerp.com-20111014102845-vmc2r5fvj2w2wgnt
This commit is contained in:
Amit Bhavsar (Open ERP) 2011-10-14 15:58:45 +05:30
parent 9ceaf4fdf3
commit 18f0f55d38
3 changed files with 42 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
addons/account_asset/account_asset_demo.xml
View File

@ -13,6 +13,30 @@
<field name="name">Fixed Assets</field>
</record>
<record id="account_asset_category_sale" model="account.asset.category">
<field name="account_expense_depreciation_id" ref="account.a_expense"/>
<field name="account_asset_id" ref="account.xfa"/>
<field name="account_depreciation_id" ref="account.xfa"/>
<field name="journal_id" ref="account.expenses_journal"/>
<field name="name">Sale</field>
</record>
<record id="account_asset_category_purchase" model="account.asset.category">
<field name="account_expense_depreciation_id" ref="account.a_expense"/>
<field name="account_asset_id" ref="account.xfa"/>
<field name="account_depreciation_id" ref="account.xfa"/>
<field name="journal_id" ref="account.expenses_journal"/>
<field name="name">Purchase</field>
</record>
<record id="account_asset_category_both" model="account.asset.category">
<field name="account_expense_depreciation_id" ref="account.a_expense"/>
<field name="account_asset_id" ref="account.xfa"/>
<field name="account_depreciation_id" ref="account.xfa"/>
<field name="journal_id" ref="account.expenses_journal"/>
<field name="name">Both</field>
</record>
<!--
Assets Demo
-->

3
addons/account_asset/account_asset_invoice.py
View File

@ -24,6 +24,9 @@ from osv import osv, fields
class account_invoice(osv.osv):
_inherit = 'account.invoice'
_columns = {
'category_id': fields.many2one('account.asset.category', 'Asset category', required=True, change_default=True, readonly=True, states={'draft':[('readonly',False)]}),
}
def line_get_convert(self, cr, uid, x, part, date, context=None):
res = super(account_invoice, self).line_get_convert(cr, uid, x, part, date, context=context)
res['asset_id'] = x.get('asset_id', False)

15
addons/account_asset/account_asset_view.xml
View File

@ -212,6 +212,21 @@
</field>
</record>
# ------------------------------------------------------
# Account invoice
# ------------------------------------------------------
<record id="view_account_invoice_search_inherit" model="ir.ui.view">
<field name="name">account.invoice.search.inherit</field>
<field name="model">account.invoice</field>
<field name="type">search</field>
<field name="inherit_id" ref="account.view_account_invoice_filter"/>
<field name="arch" type="xml">
<xpath expr="group/field[@name='period_id']" position="after">
<field name="category_id"/>
</xpath>
</field>
</record>
<!--
Asset History
-->