pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[REF] account_asset: code refactoring

Browse Source 
bzr revid: qdp-launchpad@openerp.com-20110330202106-nhafsz4kkj0y227f
This commit is contained in:
Quentin (OpenERP)
2011-03-30 22:21:06 +02:00
parent d33e675009
commit 0e1ff44344
2 changed files with 209 additions and 157 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/account_asset/account_asset.py
Executable → Regular
+173 -114
View File
@@ -29,12 +29,30 @@ class account_asset_category(osv.osv):
#'code': fields.char('Reference', size=16, select=1),
'note': fields.text('Note'),
#'type': fields.selection([('direct','Direct'),('indirect','Indirect')], 'Depr. method type', select=2, required=True),
'account_asset_id': fields.many2one('account.account', 'Asset account', required=True),
'account_actif_id': fields.many2one('account.account', 'Depreciation account', required=True),
'account_asset_id': fields.many2one('account.account', 'Asset Account', required=True),
'account_depreciation_id': fields.many2one('account.account', 'Depreciation Account', required=True),
'journal_id': fields.many2one('account.journal', 'Journal', required=True),
'company_id': fields.many2one('res.company', 'Company'),
}
account_asset_category()
#class one2many_mod_asset(fields.one2many):
#
# def get(self, cr, obj, ids, name, user=None, offset=0, context=None, values=None):
# print "ici!! boum"
# if context is None:
# context = {}
# if not values:
# values = {}
# res = {}
# for id in ids:
# res[id] = []
# #compute depreciation board
# depreciation_line_ids = obj.pool.get('account.asset.asset').compute_depreciation_board(cr, user, ids, context=context)
# for key, value in depreciation_line_ids.items():
# #write values on asset
# obj.pool.get(self._obj).write(cr, user, key, {'depreciation_line_ids': [6,0,value]})
# return depreciation_line_ids
class account_asset_asset(osv.osv):
_name = 'account.asset.asset'
@@ -57,16 +75,31 @@ class account_asset_asset(osv.osv):
else:
return False
def compute_depreciation_board(self, cr, uid, ids, context=None):
#FIXME: change into a fields.function
for asset in self.browse(cr, uid, ids, context=context):
#res[asset.id] = []
undone_dotation_number = asset.method_delay - len(asset.account_move_line_ids) + 1
amount = asset.value_residual
for i in range(1,undone_dotation_number+1):
if i == 1:
amount = asset.value_residual
else:
if asset.method == 'linear':
amount = asset.value_residual / undone_dotation_number
else:
amount = asset.value_residual * asset.method_progress_factor
#res[asset.id].append([self.pool.get('account.asset.depreciation.line').create(cr, uid, {'amount': amount, 'asset_id': asset.id, 'sequence':i, 'name': str(asset.id) +'/'+ str(i)})])
self.pool.get('account.asset.depreciation.line').create(cr, uid, {'amount': amount, 'asset_id': asset.id, 'sequence':i, 'name': str(asset.id) +'/'+ str(i)})
return True
def validate(self, cr, uid, ids, context={}):
for asset in self.browse(cr, uid, ids, context):
for prop in asset.property_ids:
if prop.state=='draft':
self.pool.get('account.asset.property').write(cr, uid, [prop.id], {'state':'open'}, context)
return self.write(cr, uid, ids, {
'state':'normal'
}, context)
def _amount_total(self, cr, uid, ids, name, args, context={}):
#FIXME: function not working²
id_set=",".join(map(str,ids))
cr.execute("""SELECT l.asset_id,abs(SUM(l.debit-l.credit)) AS amount FROM
account_move_line l
@@ -75,27 +108,61 @@ class account_asset_asset(osv.osv):
for id in ids:
res.setdefault(id, 0.0)
return res
def _amount_residual(self, cr, uid, ids, name, args, context={}):
#FIXME: function not working
id_set=",".join(map(str,ids))
cr.execute("""SELECT
r.asset_property_id,SUM(abs(l.debit-l.credit)) AS amount
FROM
account_move_asset_entry_rel r
LEFT JOIN
account_move_line l on (r.move_id=l.id)
WHERE
r.asset_property_id IN ("""+id_set+") GROUP BY r.asset_property_id ")
res=dict(cr.fetchall())
for prop in self.browse(cr, uid, ids, context):
res[prop.id] = prop.value_total - res.get(prop.id, 0.0)
for id in ids:
res.setdefault(id, 0.0)
return res
_columns = {
'name': fields.char('Asset', size=64, required=True, select=1),
'code': fields.char('Reference ', size=16, select=1),
'purch_valu': fields.float('Purchase value ', required=True, size=16, select=1),
'currency': fields.many2one('res.currency','Currency',required=True,size=5,select=1),
'company': fields.many2one('res.company', 'Company', required=True,size=5,select=1),
'purchase_value': fields.float('Purchase value ', required=True, size=16, select=1),
'currency_id': fields.many2one('res.currency','Currency',required=True,size=5,select=1),
'company_id': fields.char('Company',size=16, select=1), #FIXME: fields.many2one !!
'note': fields.text('Note'),
'category_id': fields.many2one('account.asset.category', 'Asset category',required=True, change_default=True),
'localisation': fields.char('Localisation', size=32, select=2),
'sequence': fields.integer('Sequence'),
'parent_id': fields.many2one('account.asset.asset', 'Parent asset'),
'child_ids': fields.one2many('account.asset.asset', 'parent_id', 'Child assets'),
'date': fields.date('Date', required=True),
'parent_id': fields.many2one('account.asset.asset', 'Parent Asset'),
'child_ids': fields.one2many('account.asset.asset', 'parent_id', 'Children Assets'),
'date': fields.date('Purchase Date', required=True), #FIXME: date is not displayed currently
'period_id': fields.many2one('account.period', 'Period', required=True, readonly=True, states={'draft':[('readonly',False)]}),
'state': fields.selection([('view','View'),('draft','Draft'),('normal','Normal'),('close','Close')], 'Global state', required=True),
'active': fields.boolean('Active', select=2),
'partner_id': fields.many2one('res.partner', 'Partner'),
'entry_ids': fields.one2many('account.move.line', 'asset_id', 'Entries', readonly=True, states={'draft':[('readonly',False)]}),
'property_ids': fields.one2many('account.asset.property', 'asset_id', 'Asset method name', readonly=True, states={'draft':[('readonly',False)]}),
'value_total': fields.function(_amount_total, method=True, digits=(16,2),string='Total value'),
'test': fields.one2many('account.move.line', 'asset_id', 'Entries', readonly=True, states={'draft':[('readonly',False)]}),
'partner_id': fields.many2one('res.partner', 'Partner'),#FIXME: not displayed
'account_move_line_ids': fields.one2many('account.move.line', 'asset_id', 'Entries', readonly=True, states={'draft':[('readonly',False)]}),
'journal_analytic_id': fields.many2one('account.analytic.journal', 'Analytic journal'),#FIXME: do not display if not in group analytic accounting
'account_analytic_id': fields.many2one('account.analytic.account', 'Analytic account'),#FIXME: do not display if not in group analytic accounting
'method': fields.selection([('linear','Linear'),('progressif','Progressive')], 'Computation method', required=True, readonly=True, states={'draft':[('readonly',False)]}),
'method_delay': fields.integer('During', readonly=True, states={'draft':[('readonly',False)]}), #FIXME: improve label
'method_period': fields.integer('Depre. all', readonly=True, states={'draft':[('readonly',False)]}), #FIXME: improve label
'method_end': fields.date('Ending date'),
#
# 'entry_asset_ids': fields.many2many('account.move.line', 'account_move_asset_entry_rel', 'asset_property_id', 'move_id', 'Asset Entries'),
# 'board_ids': fields.one2many('account.asset.board', 'asset_id', 'Asset board'),
#
'value_total': fields.function(_amount_total, method=True, digits=(16,2),string='Gross Value'),
# 'property_ids': fields.one2many('account.asset.property', 'asset_id', 'Asset method name', readonly=True, states={'draft':[('readonly',False)]}),
'method_progress_factor': fields.float('Progressif Factor', readonly=True, states={'draft':[('readonly',False)]}),
'value_residual': fields.function(_amount_residual, method=True, digits=(16,2), string='Residual Value'),
'method_time': fields.selection([('delay','Delay'),('end','Ending Period')], 'Time Method', required=True, readonly=True, states={'draft':[('readonly',False)]}),
'prorata':fields.boolean('Prorata Temporis', Readonly="True", help='Si l amortissement se realise après le 1 janvier'),
'history_ids': fields.one2many('account.asset.property.history', 'asset_id', 'History', readonly=True),
'depreciation_line_ids': fields.one2many('account.asset.depreciation.line', 'asset_id', 'Depreciation Lines', readonly=True,),
}
_defaults = {
'code': lambda obj, cr, uid, context: obj.pool.get('ir.sequence').get(cr, uid, 'account.asset.code'),
@@ -116,6 +183,7 @@ class account_asset_asset(osv.osv):
return current_period
def _compute_move(self, cr, uid, property, period, context={}):
#FIXME: fucntion not working
result = []
total = 0.0
for move in property.asset_id.entry_ids:
@@ -125,6 +193,7 @@ class account_asset_asset(osv.osv):
total += move.debit
total += -move.credit
periods = (len(property.entry_asset_ids)/2) - property.method_delay
if periods==1:
amount = total
else:
@@ -168,111 +237,101 @@ class account_asset_asset(osv.osv):
'entry_asset_ids': [(4, id2, False),(4,id,False)]
})
if property.method_delay - (len(property.entry_asset_ids)/2)<=1:
self.pool.get('account.asset.property')._close(cr, uid, property, context)
#self.pool.get('account.asset.property')._close(cr, uid, property, context)
return result
return result
def _compute_entries(self, cr, uid, asset, period_id, context={}):
#FIXME: function not working
result = []
date_start = self.pool.get('account.period').browse(cr, uid, period_id, context).date_start
for property in asset.property_ids:
if property.state=='open':
period = self._compute_period(cr, uid, property, context)
if period and (period.date_start<=date_start):
result += self._compute_move(cr, uid, property, period, context)
#date_start = self.pool.get('account.period').browse(cr, uid, period_id, context).date_start
#for property in asset.property_ids:
# if property.state=='open':
# period = self._compute_period(cr, uid, property, context)
# if period and (period.date_start<=date_start):
# result += self._compute_move(cr, uid, property, period, context)
return result
account_asset_asset()
class account_asset_property(osv.osv):
def _amount_total(self, cr, uid, ids, name, args, context={}):
id_set=",".join(map(str,ids))
cr.execute("""SELECT l.asset_id,abs(SUM(l.debit-l.credit)) AS amount FROM
account_asset_property p
left join
account_move_line l on (p.asset_id=l.asset_id)
WHERE p.id IN ("""+id_set+") GROUP BY l.asset_id ")
res=dict(cr.fetchall())
for id in ids:
res.setdefault(id, 0.0)
return res
def _amount_residual(self, cr, uid, ids, name, args, context={}):
id_set=",".join(map(str,ids))
cr.execute("""SELECT
r.asset_property_id,SUM(abs(l.debit-l.credit)) AS amount
FROM
account_move_asset_entry_rel r
LEFT JOIN
account_move_line l on (r.move_id=l.id)
WHERE
r.asset_property_id IN ("""+id_set+") GROUP BY r.asset_property_id ")
res=dict(cr.fetchall())
for prop in self.browse(cr, uid, ids, context):
res[prop.id] = prop.value_total - res.get(prop.id, 0.0)
for id in ids:
res.setdefault(id, 0.0)
return res
def _close(self, cr, uid, property, context={}):
if property.state<>'close':
self.pool.get('account.asset.property').write(cr, uid, [property.id], {
'state': 'close'
})
property.state='close'
ok = property.asset_id.state=='open'
for prop in property.asset_id.property_ids:
ok = ok and prop.state=='close'
self.pool.get('account.asset.asset').write(cr, uid, [property.asset_id.id], {
'state': 'close'
}, context)
return True
_name = 'account.asset.property'
_description = 'Asset property'
class account_asset_depreciation_line(osv.osv):
_name = 'account.asset.depreciation.line'
_description = 'Asset depreciation line'
_columns = {
'name': fields.char('Method name', size=64, select=1),
'type': fields.selection([('direct','Direct'),('indirect','Indirect')], 'Depr. method type', select=2, required=True),
'name': fields.char('Depreciation Name', size=64, required=True, select=1),
'sequence': fields.integer('Sequence of the depreciation', required=True),
'asset_id': fields.many2one('account.asset.asset', 'Asset', required=True),
'account_asset_id': fields.many2one('account.account', 'Asset account', required=True),
'account_actif_id': fields.many2one('account.account', 'Depreciation account', required=True),
'journal_id': fields.many2one('account.journal', 'Journal', required=True),
'journal_analytic_id': fields.many2one('account.analytic.journal', 'Analytic journal'),
'account_analytic_id': fields.many2one('account.analytic.account', 'Analytic account'),
'method': fields.selection([('linear','Linear'),('progressif','Progressive')], 'Computation method', required=True, readonly=True, states={'draft':[('readonly',False)]}),
'purchasedate': fields.date('Purchase date', required=True),
'method_progress_factor': fields.float('Progressif factor', readonly=True, states={'draft':[('readonly',False)]}),
'method_time': fields.selection([('delay','Delay'),('end','Ending period')], 'Time method', required=True, readonly=True, states={'draft':[('readonly',False)]}),
'method_delay': fields.integer('During', readonly=True, states={'draft':[('readonly',False)]}),
'method_period': fields.integer('Depre. all', readonly=True, states={'draft':[('readonly',False)]}),
'method_end': fields.date('Ending date'),
'prorata':fields.boolean('Prorata Temporis', Readonly="True", help='Si l amortissement se realise après le 1 janvier'),
'date': fields.date('Date created'),
#'test': fields.one2many('account.pre', 'asset_id', readonly=True, states={'draft':[('readonly',False)]}),
'entry_asset_ids': fields.many2many('account.move.line', 'account_move_asset_entry_rel', 'asset_property_id', 'move_id', 'Asset Entries'),
'board_ids': fields.one2many('account.asset.board', 'asset_id', 'Asset board'),
'value_total': fields.function(_amount_total, method=True, digits=(16,2),string='Gross value'),
'value_residual': fields.function(_amount_residual, method=True, digits=(16,2), string='Residual value'),
'state': fields.selection([('draft','Draft'), ('open','Open'), ('close','Close')], 'State', required=True),
'history_ids': fields.one2many('account.asset.property.history', 'asset_property_id', 'History', readonly=True)
# 'parent_id': fields.many2one('account.asset.asset', 'Parent asset'),
# 'partner_id': fields.many2one('res.partner', 'Partner'),
# 'note': fields.text('Note'),
'amount': fields.float('Depreciation amount', required=True),
}
_defaults = {
'type': lambda obj, cr, uid, context: 'direct',
'state': lambda obj, cr, uid, context: 'draft',
'method': lambda obj, cr, uid, context: 'linear',
'method_time': lambda obj, cr, uid, context: 'delay',
'method_progress_factor': lambda obj, cr, uid, context: 0.3,
'method_delay': lambda obj, cr, uid, context: 5,
'method_period': lambda obj, cr, uid, context: 12,
'date': lambda obj, cr, uid, context: time.strftime('%Y-%m-%d')
}
account_asset_property()
account_asset_depreciation_line()
#class account_asset_property(osv.osv):
# def _amount_total(self, cr, uid, ids, name, args, context={}):
# id_set=",".join(map(str,ids))
# cr.execute("""SELECT l.asset_id,abs(SUM(l.debit-l.credit)) AS amount FROM
# account_asset_property p
# left join
# account_move_line l on (p.asset_id=l.asset_id)
# WHERE p.id IN ("""+id_set+") GROUP BY l.asset_id ")
# res=dict(cr.fetchall())
# for id in ids:
# res.setdefault(id, 0.0)
# return res
#
# def _close(self, cr, uid, property, context={}):
# if property.state<>'close':
# self.pool.get('account.asset.property').write(cr, uid, [property.id], {
# 'state': 'close'
# })
# property.state='close'
# ok = property.asset_id.state=='open'
# for prop in property.asset_id.property_ids:
# ok = ok and prop.state=='close'
# self.pool.get('account.asset.asset').write(cr, uid, [property.asset_id.id], {
# 'state': 'close'
# }, context)
# return True
#
# _name = 'account.asset.property'
# _description = 'Asset property'
# _columns = {
# 'name': fields.char('Method name', size=64, select=1),
# 'type': fields.selection([('direct','Direct'),('indirect','Indirect')], 'Depr. method type', select=2, required=True),
# 'asset_id': fields.many2one('account.asset.asset', 'Asset', required=True),
# 'account_asset_id': fields.many2one('account.account', 'Asset account', required=True),
# 'account_actif_id': fields.many2one('account.account', 'Depreciation account', required=True),
# 'journal_id': fields.many2one('account.journal', 'Journal', required=True),
# 'journal_analytic_id': fields.many2one('account.analytic.journal', 'Analytic journal'),
# 'account_analytic_id': fields.many2one('account.analytic.account', 'Analytic account'),
#
# 'method': fields.selection([('linear','Linear'),('progressif','Progressive')], 'Computation method', required=True, readonly=True, states={'draft':[('readonly',False)]}),
# 'method_delay': fields.integer('During', readonly=True, states={'draft':[('readonly',False)]}),
# 'method_period': fields.integer('Depre. all', readonly=True, states={'draft':[('readonly',False)]}),
# 'method_end': fields.date('Ending date'),
#
# 'date': fields.date('Date created'),
# #'test': fields.one2many('account.pre', 'asset_id', readonly=True, states={'draft':[('readonly',False)]}),
# 'entry_asset_ids': fields.many2many('account.move.line', 'account_move_asset_entry_rel', 'asset_property_id', 'move_id', 'Asset Entries'),
# 'board_ids': fields.one2many('account.asset.board', 'asset_id', 'Asset board'),
#
# 'value_total': fields.function(_amount_total, method=True, digits=(16,2),string='Gross value'),
# 'state': fields.selection([('draft','Draft'), ('open','Open'), ('close','Close')], 'State', required=True),
# 'history_ids': fields.one2many('account.asset.property.history', 'asset_property_id', 'History', readonly=True)
## 'parent_id': fields.many2one('account.asset.asset', 'Parent asset'),
## 'partner_id': fields.many2one('res.partner', 'Partner'),
## 'note': fields.text('Note'),
#
# }
# _defaults = {
# 'type': lambda obj, cr, uid, context: 'direct',
# 'state': lambda obj, cr, uid, context: 'draft',
# 'method': lambda obj, cr, uid, context: 'linear',
# 'method_time': lambda obj, cr, uid, context: 'delay',
# 'method_progress_factor': lambda obj, cr, uid, context: 0.3,
# 'method_delay': lambda obj, cr, uid, context: 5,
# 'method_period': lambda obj, cr, uid, context: 12,
# 'date': lambda obj, cr, uid, context: time.strftime('%Y-%m-%d')
# }
#account_asset_property()
class account_move_line(osv.osv):
_inherit = 'account.move.line'
@@ -304,7 +363,7 @@ class account_asset_property_history(osv.osv):
'name': fields.char('History name', size=64, select=1),
'user_id': fields.many2one('res.users', 'User', required=True),
'date': fields.date('Date', required=True),
'asset_property_id': fields.many2one('account.asset.property', 'Method', required=True),
'asset_id': fields.many2one('account.asset.asset', 'Asset', required=True),
'method_delay': fields.integer('Number of interval'),
'method_period': fields.integer('Period per interval'),
'method_end': fields.date('Ending date'),
@@ -322,7 +381,7 @@ class account_asset_board(osv.osv):
_description = 'Asset board'
_columns = {
'name': fields.char('Asset name', size=64, required=True, select=1),
'asset_id': fields.many2one('account.asset.property', 'Asset', required=True, select=1),
'asset_id': fields.many2one('account.asset.asset', 'Asset', required=True, select=1),
'value_gross': fields.float('Gross value', required=True, select=1),
'value_asset': fields.float('Asset Value', required=True, select=1),
'value_asset_cumul': fields.float('Cumul. value', required=True, select=1),
addons/account_asset/account_asset_view.xml
Executable → Regular
+36 -43
View File
@@ -9,13 +9,19 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Asset category">
<field name="name" select="1"/>
<!-- <field name="code" select="1"/>-->
<field name="note" colspan="4"/>
<field name="account_asset_id"/>
<field name="account_actif_id"/>
<group col="6" colspan="4">
<field name="name" select="1" colspan="4"/>
<field name="company_id" groups="base.group_multi_company"/>
<newline/>
<field name="journal_id"/>
<!-- <field name="type"/>-->
<field name="account_asset_id"/>
<field name="account_depreciation_id"/>
</group>
<!--<field name="code" select="1"/>-->
<separator string="Note"/>
<field name="note" colspan="4" nolabel="1"/>
<!--<field name="type"/>-->
</form>
</field>
</record>
@@ -26,14 +32,13 @@
<field name="type">tree</field>
<field name="arch" type="xml">
<tree string="Asset category">
<!-- <field name="code"/>-->
<field name="name"/>
<separator string="Accounts information" colspan="4"/>
<field name="account_asset_id"/>
<field name="account_actif_id"/>
<!--<field name="code"/>-->
<field name="journal_id"/>
<!-- <field name="type"/>-->
<field name="account_asset_id"/>
<field name="account_depreciation_id"/>
<field name="company_id" groups="base.group_multi_company"/>
<!--<field name="type"/>-->
</tree>
</field>
</record>
@@ -49,7 +54,7 @@
action="action_account_asset_category_form"/>
<record model="ir.ui.view" id="view_account_asset_property_tree">
<!-- <record model="ir.ui.view" id="view_account_asset_property_tree">
<field name="name">account.asset.property.tree</field>
<field name="model">account.asset.property</field>
<field name="type">tree</field>
@@ -64,7 +69,7 @@
</tree>
</field>
</record>
-->
<record model="ir.ui.view" id="view_account_asset_asset_form">
@@ -73,29 +78,25 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Asset">
<group col="6" colspan="4" >
<group col="6" colspan="4">
<field name="name" select="1"/>
<field name="category_id" select="1"/>
<field name="code" select="1"/>
<field name="purch_valu" select="1"/>
<field name="currency" select="1"/>
<field name="company" select="1" />
<field name="purchase_value" select="1"/>
<field name="currency_id" select="1"/>
<field name="company_id" select="1"/>
</group>
<!-- <field name="period_id" select="2"/>-->
<field name="property_ids" colspan="4" nolabel="1" mode="form,tree">
<form string="Depreciation methods">
<!-- <field name="name" select="1" colspan="4"/>-->
<!--<separator string="Methods" colspan="4"/>-->
<notebook colspan="4">
<page string="Depreciation">
<separator string="Other information" colspan="4"/>
<!--<field name="partner_id" select="2"/>
<field name="parent_id" select="2"/>-->
<!--<field name="note" colspan="4" nolabel="1"/>-->
<field name="parent_id" select="2"/>
<field name="note" colspan="4" nolabel="1"/>
-->
<separator string="Accounts information" colspan="4"/>
<field name="account_analytic_id"/>
<field name="journal_analytic_id"/>
@@ -103,7 +104,6 @@
<field name="name" select="1" colspan="2"/>-->
<separator string="Depreciation duration" colspan="4"/>
<field name="method"/>
<field name="purchasedate"/>
<field name="method_progress_factor"/>
<newline/>
<field name="prorata" colspan="1"/>
@@ -123,36 +123,30 @@
<field name="method_end"/> -->
</page>
<page string="History">
<field name="entry_asset_ids" colspan="4" nolabel="1" readonly="1"/>
<field name="account_move_line_ids" colspan="4" nolabel="1" readonly="1"/>
<field name="history_ids" colspan="4" nolabel="1" readonly="1"/>
</page>
<!--<page string="Change history">
<field name="history_ids" colspan="4" nolabel="1" readonly="1"/>
</page>-->
<page string="Depreciation board">
<field name="value_total"/>
<field name="value_residual"/>
<!--<field name="test"/>-->
<field name="depreciation_line_ids" colspan="4" nolabel="1">
<tree>
<field name="name"/>
<field name="sequence"/>
<field name="amount"/></tree>
</field>
<button type="object" name="compute_depreciation_board" string="Compute"/>
</page>
<page string="Notes">
<field name="note"/>
</page>
</notebook>
<button name="%(wizard_asset_close)d" states="open" colspan="2" string="Close method" type="action"/>
</form>
</field>
<field name="state" readonly="1"/>
<group colspan="2" col="2">
<button name="validate" states="draft" string="Confirm asset" type="object"/>
</group>
<!-- </page>-->
<!--<page string="Entries">
<field name="entry_ids" colspan="4" nolabel="1"/>
</page>
-->
</form>
</field>
</record>
@@ -276,7 +270,6 @@
<field name="res_model">account.asset.asset</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
<field name="domain">[('state','=','normal')]</field>
</record>
<menuitem
parent="menu_finance_Assets"