diff --git a/addons/account_asset/account_asset.py b/addons/account_asset/account_asset.py index 8cfb4f2afff..c02ad58ccea 100644 --- a/addons/account_asset/account_asset.py +++ b/addons/account_asset/account_asset.py @@ -2,7 +2,7 @@ ############################################################################## # # OpenERP, Open Source Management Solution -# Copyright (C) 2004-2009 Tiny SPRL (). +# Copyright (C) 2004-2010 Tiny SPRL (). # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as diff --git a/addons/account_asset/account_asset_invoice.py b/addons/account_asset/account_asset_invoice.py index 8fbcd4053a2..705ca364915 100755 --- a/addons/account_asset/account_asset_invoice.py +++ b/addons/account_asset/account_asset_invoice.py @@ -2,7 +2,7 @@ ############################################################################## # # OpenERP, Open Source Management Solution -# Copyright (C) 2004-2009 Tiny SPRL (). +# Copyright (C) 2004-2010 Tiny SPRL (). # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as diff --git a/addons/account_asset/report/account_asset_report.py b/addons/account_asset/report/account_asset_report.py index 1b80b120631..bf244f30985 100644 --- a/addons/account_asset/report/account_asset_report.py +++ b/addons/account_asset/report/account_asset_report.py @@ -2,7 +2,7 @@ ############################################################################## # # OpenERP, Open Source Management Solution -# Copyright (C) 2004-2009 Tiny SPRL (). +# Copyright (C) 2004-2010 Tiny SPRL (). # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -27,49 +27,53 @@ class asset_asset_report(osv.osv): _description = "Assets Analysis" _auto = False _columns = { - 'name': fields.char('Year', size=64, required=False, readonly=True), + 'name': fields.char('Year', size=16, required=False, readonly=True), 'month':fields.selection([('01', 'January'), ('02', 'February'), \ ('03', 'March'), ('04', 'April'),\ ('05', 'May'), ('06', 'June'), \ ('07', 'July'), ('08', 'August'),\ ('09', 'September'), ('10', 'October'),\ ('11', 'November'), ('12', 'December')], 'Month', readonly=True), - 'day': fields.char('Day', size=128, readonly=True), - 'date': fields.date('Depreciation Date', readonly=True), + 'day': fields.char('Day', size=16, readonly=True), 'purchase_date': fields.date('Asset Date', required=True), 'asset_id': fields.many2one('account.asset.asset', string='Asset', readonly=True), 'asset_category_id': fields.many2one('account.asset.category',string='Asset category'), + 'partner_id': fields.many2one('res.partner', 'Partner', readonly=True), 'state': fields.selection([('draft','Draft'),('open','Running'),('close','Close')], 'state', required=True, readonly=True), 'remaining_value': fields.float('Amount to Depreciate', required=True, readonly=True), 'depreciated_value': fields.float('Amount Already Depreciated', required=True, readonly=True), - 'depreciation_date': fields.date('Depreciation Date', size=64, readonly=True), 'move_check': fields.boolean('Posted', readonly=True), - 'nbr':fields.integer('# of Depreciation Lines', readonly=True), + 'nbr': fields.integer('# of Depreciation Lines', readonly=True), + 'company_id': fields.many2one('res.company', 'Company', readonly=True), } def init(self, cr): tools.drop_view_if_exists(cr, 'asset_asset_report') cr.execute(""" create or replace view asset_asset_report as ( - select + select min(dl.id) as id, to_char(a.purchase_date, 'YYYY') as name, to_char(a.purchase_date, 'MM') as month, to_char(a.purchase_date, 'YYYY-MM-DD') as day, - to_date(dl.depreciation_date, 'YYYY-MM-DD') as date, a.purchase_date as purchase_date, - sum(dl.remaining_value) as remaining_value, - sum(dl.depreciated_value) as depreciated_value, + dl.amount as remaining_value, dl.move_check as move_check, dl.asset_id as asset_id, a.category_id as asset_category_id, + a.partner_id as partner_id, a.state as state, - count(dl.*) as nbr + count(dl.*) as nbr, + a.company_id as company_id from account_asset_depreciation_line dl left join account_asset_asset a on (dl.asset_id=a.id) group by - dl.asset_id, dl.depreciation_date, dl.move_check, a.state, a.category_id, a.purchase_date + dl.asset_id, dl.move_check, a.state, + a.category_id, a.partner_id, a.purchase_date, dl.amount, + a.company_id, a.purchase_value, a.salvage_value )""") asset_asset_report() + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/account_asset/report/account_asset_report_view.xml b/addons/account_asset/report/account_asset_report_view.xml index d615463a977..4a84f641589 100644 --- a/addons/account_asset/report/account_asset_report_view.xml +++ b/addons/account_asset/report/account_asset_report_view.xml @@ -13,19 +13,16 @@ - - - - + asset.asset.report.graph asset.asset.report graph @@ -47,7 +44,7 @@ - + + + + + + + @@ -81,13 +84,13 @@ - Assets Analysis - asset.asset.report - form - tree,graph - - {'search_default_asset_category':1, 'search_default_posted':1, 'group_by':[], 'group_by_no_leaf':1} - From this report, you can have an overview on all depreciation. The tool search can also be used to personalise your Assets reports and so, match this analysis to your needs; + Assets Analysis + asset.asset.report + form + tree,graph + + {'search_default_asset_category':1, 'search_default_posted':1, 'search_default_purchase_date': time.strftime('%Y-01-01'), 'group_by':[], 'group_by_no_leaf':1} + From this report, you can have an overview on all depreciation. The tool search can also be used to personalise your Assets reports and so, match this analysis to your needs;