[REM] removed account.asset.board object and its references
bzr revid: bde@tiny2-desktop-20110607105719-fifsqghv2n461znm
This commit is contained in:
bde
@@ -139,7 +139,7 @@ class account_asset_asset(osv.osv):
|
||||
'state':'open'
|
||||
}, context)
|
||||
|
||||
|
||||
|
||||
|
||||
def _amount_residual(self, cr, uid, ids, name, args, context={}):
|
||||
cr.execute("""SELECT
|
||||
@@ -207,7 +207,7 @@ class account_asset_asset(osv.osv):
|
||||
if category_id:
|
||||
category_obj = asset_categ_obj.browse(cr, uid, category_id, context=context)
|
||||
res['value'] = {
|
||||
'method': category_obj.method,
|
||||
'method': category_obj.method,
|
||||
'method_delay': category_obj.method_delay,
|
||||
'method_time': category_obj.method_time,
|
||||
'method_period': category_obj.method_period,
|
||||
@@ -215,7 +215,7 @@ class account_asset_asset(osv.osv):
|
||||
'prorata': category_obj.prorata,
|
||||
}
|
||||
return res
|
||||
|
||||
|
||||
def copy(self, cr, uid, id, default=None, context=None):
|
||||
if default is None:
|
||||
default = {}
|
||||
@@ -486,35 +486,4 @@ class account_asset_history(osv.osv):
|
||||
}
|
||||
account_asset_history()
|
||||
|
||||
class account_asset_board(osv.osv):
|
||||
_name = 'account.asset.board'
|
||||
_description = 'Asset board'
|
||||
_columns = {
|
||||
'name': fields.char('Asset name', size=64, 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),
|
||||
'value_net': fields.float('Net value', required=True, select=1),
|
||||
|
||||
}
|
||||
_auto = False
|
||||
def init(self, cr):
|
||||
cr.execute("""
|
||||
create or replace view account_asset_board as (
|
||||
select
|
||||
min(l.id) as id,
|
||||
min(l.id) as asset_id,
|
||||
0.0 as value_gross,
|
||||
0.0 as value_asset,
|
||||
0.0 as value_asset_cumul,
|
||||
0.0 as value_net
|
||||
from
|
||||
account_move_line l
|
||||
where
|
||||
l.state <> 'draft' and
|
||||
l.asset_id=3
|
||||
)""")
|
||||
account_asset_board()
|
||||
|
||||
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
||||
|
||||
@@ -19,7 +19,7 @@
|
||||
<separator string="Depreciation Dates" colspan="2" />
|
||||
<field name="method_time"/>
|
||||
<field name="method_delay"/>
|
||||
<field name="method_period" attrs="{'invisible':[('method_time','=','end')]}"/>
|
||||
<field name="method_period" attrs="{'invisible':[('method_time','=','end')]}"/>
|
||||
</group>
|
||||
<group colspan="2" col="2">
|
||||
<separator string="Depreciation Method" colspan="2" />
|
||||
@@ -77,11 +77,11 @@
|
||||
<field name="partner_id"/>
|
||||
<field name="purchase_date"/>
|
||||
<separator string="Depreciation duration" colspan="4"/>
|
||||
<button
|
||||
name="%(wizard_asset_modify)d"
|
||||
states="open"
|
||||
string="Change duration"
|
||||
type="action"
|
||||
<button
|
||||
name="%(wizard_asset_modify)d"
|
||||
states="open"
|
||||
string="Change duration"
|
||||
type="action"
|
||||
colspan="2"/>
|
||||
<newline/>
|
||||
<field name="method"/>
|
||||
@@ -118,7 +118,7 @@
|
||||
</page>
|
||||
<page string="Notes">
|
||||
<field name="note" nolabel="1"/>
|
||||
</page>
|
||||
</page>
|
||||
</notebook>
|
||||
<field name="state" readonly="1"/>
|
||||
<group colspan="2" col="2">
|
||||
@@ -162,39 +162,6 @@
|
||||
</field>
|
||||
</record>
|
||||
|
||||
<record model="ir.ui.view" id="view_account_asset_board_form">
|
||||
<field name="name">account.asset.board.form</field>
|
||||
<field name="model">account.asset.board</field>
|
||||
<field name="type">form</field>
|
||||
<field name="arch" type="xml">
|
||||
<form string="Asset board">
|
||||
<field name="name" select="1"/>
|
||||
<field name="asset_id" select="1"/>
|
||||
<field name="value_gross" select="2"/>
|
||||
<field name="value_asset"/>
|
||||
<field name="value_asset_cumul"/>
|
||||
<field name="value_net"/>
|
||||
<field name="test"/>
|
||||
</form>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
<record model="ir.ui.view" id="view_account_asset_board_tree">
|
||||
<field name="name">account.asset.board.tree</field>
|
||||
<field name="model">account.asset.board</field>
|
||||
<field name="type">tree</field>
|
||||
<field name="arch" type="xml">
|
||||
<tree string="Asset board">
|
||||
<field name="name"/>
|
||||
<field name="asset_id"/>
|
||||
<field name="value_gross"/>
|
||||
<field name="value_asset"/>
|
||||
<field name="value_asset_cumul"/>
|
||||
<field name="value_net"/>
|
||||
<field name="test"/>
|
||||
</tree>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
<record model="ir.ui.view" id="view_account_asset_asset_tree">
|
||||
<field name="name">account.asset.asset.tree</field>
|
||||
|
||||
@@ -2,11 +2,9 @@
|
||||
"access_account_asset_category","account.asset.category","model_account_asset_category","account.group_account_user",1,0,0,0
|
||||
"access_account_asset_asset","account.asset.asset","model_account_asset_asset","account.group_account_user",1,0,0,0
|
||||
"access_account_asset_history","account.asset.history","model_account_asset_history","account.group_account_user",1,0,0,0
|
||||
"access_account_asset_board","account.asset.board","model_account_asset_board","account.group_account_user",1,0,0,0
|
||||
"access_account_asset_category_manager","account.asset.category","model_account_asset_category","account.group_account_manager",1,1,1,1
|
||||
"access_account_asset_asset_manager","account.asset.asset","model_account_asset_asset","account.group_account_manager",1,1,1,1
|
||||
"access_account_asset_history_manager","account.asset.history","model_account_asset_history","account.group_account_manager",1,1,1,1
|
||||
"access_account_asset_board_manager","account.asset.board","model_account_asset_board","account.group_account_manager",1,1,1,1
|
||||
"access_account_asset_depreciation_line","account.asset.depreciation.line","model_account_asset_depreciation_line","account.group_account_user",1,0,0,0
|
||||
"access_account_asset_depreciation_line_manager","account.asset.depreciation.line","model_account_asset_depreciation_line","account.group_account_manager",1,1,1,1
|
||||
|
||||
|
||||
|
Reference in New Issue
Block a user