From 18f0f55d388cedd885a437125708d817b59210b8 Mon Sep 17 00:00:00 2001 From: "Amit Bhavsar (Open ERP)" Date: Fri, 14 Oct 2011 15:58:45 +0530 Subject: [PATCH] [usability2],add demo data in account asset bzr revid: amb@tinyerp.com-20111014102845-vmc2r5fvj2w2wgnt --- addons/account_asset/account_asset_demo.xml | 24 +++++++++++++++++++ addons/account_asset/account_asset_invoice.py | 3 +++ addons/account_asset/account_asset_view.xml | 15 ++++++++++++ 3 files changed, 42 insertions(+) diff --git a/addons/account_asset/account_asset_demo.xml b/addons/account_asset/account_asset_demo.xml index 004526b1022..8357329a26f 100644 --- a/addons/account_asset/account_asset_demo.xml +++ b/addons/account_asset/account_asset_demo.xml @@ -13,6 +13,30 @@ Fixed Assets + + + + + + Sale + + + + + + + + Purchase + + + + + + + + Both + + diff --git a/addons/account_asset/account_asset_invoice.py b/addons/account_asset/account_asset_invoice.py index 167502cb09f..a01298719cf 100644 --- a/addons/account_asset/account_asset_invoice.py +++ b/addons/account_asset/account_asset_invoice.py @@ -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) diff --git a/addons/account_asset/account_asset_view.xml b/addons/account_asset/account_asset_view.xml index d28579a6c1a..a47df1e5236 100644 --- a/addons/account_asset/account_asset_view.xml +++ b/addons/account_asset/account_asset_view.xml @@ -212,6 +212,21 @@ + # ------------------------------------------------------ + # Account invoice + # ------------------------------------------------------ + + account.invoice.search.inherit + account.invoice + search + + + + + + + +