diff --git a/addons/account_asset/account_asset.py b/addons/account_asset/account_asset.py index 65af420646b..b09644f1e90 100644 --- a/addons/account_asset/account_asset.py +++ b/addons/account_asset/account_asset.py @@ -125,7 +125,7 @@ class account_asset_asset(osv.osv): def validate(self, cr, uid, ids, context={}): return self.write(cr, uid, ids, { - 'state':'normal' + 'state':'open' }, context) def _amount_total(self, cr, uid, ids, name, args, context={}): @@ -168,7 +168,7 @@ class account_asset_asset(osv.osv): 'parent_id': fields.many2one('account.asset.asset', 'Parent Asset'), 'child_ids': fields.one2many('account.asset.asset', 'parent_id', 'Children Assets'), 'purchase_date': fields.date('Purchase Date', required=True), - 'state': fields.selection([('view','View'),('draft','Draft'),('normal','Normal'),('close','Close')], 'state', required=True), + 'state': fields.selection([('draft','Draft'),('open','Running'),('close','Close')], 'state', required=True), 'active': fields.boolean('Active', select=2), 'partner_id': fields.many2one('res.partner', 'Partner'), @@ -302,7 +302,7 @@ class account_asset_depreciation_line(osv.osv): 'depreciated_value': fields.float('Amount Already Depreciated', required=True), 'depreciation_date': fields.char('Depreciation Date', size=64, select=1), 'move_id': fields.many2one('account.move', 'Depreciation Entry'), - 'move_check': fields.function(_get_move_check, method=True, type='boolean', string='Move Included', store=True) + 'move_check': fields.function(_get_move_check, method=True, type='boolean', string='Posted', store=True) } def create_move(self, cr, uid,ids, context=None): diff --git a/addons/account_asset/account_asset_view.xml b/addons/account_asset/account_asset_view.xml index 3a431c1f6ec..cc4d035f985 100644 --- a/addons/account_asset/account_asset_view.xml +++ b/addons/account_asset/account_asset_view.xml @@ -81,8 +81,8 @@ - - + + @@ -97,7 +97,7 @@ -