From 89d9c9407d5053db138e2a673c5b06b632dbafba Mon Sep 17 00:00:00 2001 From: "Ujjvala Collins (OpenERP)" Date: Mon, 27 Jun 2011 16:21:05 +0530 Subject: [PATCH] [FIX] account_asset: Changed order by id for history changes. Improved indentations. Changed field types. bzr revid: uco@tinyerp.com-20110627105105-33w6pup1elslw542 --- addons/account_asset/__openerp__.py | 2 +- addons/account_asset/account_asset.py | 2 +- .../account_asset/wizard/account_asset_change_duration.py | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/addons/account_asset/__openerp__.py b/addons/account_asset/__openerp__.py index c922c6c6715..b1240a21baf 100755 --- a/addons/account_asset/__openerp__.py +++ b/addons/account_asset/__openerp__.py @@ -42,7 +42,7 @@ "wizard/account_asset_change_duration_view.xml", "account_asset_view.xml", "account_asset_invoice_view.xml", - "account_asset_report_view.xml", + "account_asset_report_view.xml", "report/account_asset_report_view.xml", #modif ], diff --git a/addons/account_asset/account_asset.py b/addons/account_asset/account_asset.py index f686c2dbb83..3484f6ecc4f 100644 --- a/addons/account_asset/account_asset.py +++ b/addons/account_asset/account_asset.py @@ -524,7 +524,7 @@ class account_asset_history(osv.osv): 'method_end': fields.date('Ending date'), 'note': fields.text('Note'), } - _order = 'create_date desc' + _order = 'id desc' _defaults = { 'date': lambda *args: time.strftime('%Y-%m-%d'), 'user_id': lambda self,cr, uid,ctx: uid diff --git a/addons/account_asset/wizard/account_asset_change_duration.py b/addons/account_asset/wizard/account_asset_change_duration.py index 9abe8519851..fe9274fb101 100755 --- a/addons/account_asset/wizard/account_asset_change_duration.py +++ b/addons/account_asset/wizard/account_asset_change_duration.py @@ -20,7 +20,7 @@ ############################################################################## import time -from osv import osv,fields +from osv import osv, fields class asset_modify(osv.osv_memory): _name = 'asset.modify' @@ -28,8 +28,8 @@ class asset_modify(osv.osv_memory): _columns = { 'name': fields.char('Reason', size=64, required=True), - 'method_delay': fields.float('Number of interval'), - 'method_period': fields.float('Period per interval'), + 'method_delay': fields.integer('Number of Depreciation'), + 'method_period': fields.integer('Period Length'), 'method_end': fields.date('Ending date'), 'note': fields.text('Notes'), }