From a35800eb6ded88af50bda6be426b54b593af6c3e Mon Sep 17 00:00:00 2001
From: "Ujjvala Collins (OpenERP)" <uco@tinyerp.com>
Date: Thu, 30 Jun 2011 16:38:42 +0530
Subject: [PATCH] [FIX] account_asset: Fixed label of purchase date field and
 solved error when depreciation lines are not on asset.

bzr revid: uco@tinyerp.com-20110630110842-rcc7dy6rgkpwik8y
---
 addons/account_asset/report/account_asset_report.py       | 6 +++---
 addons/account_asset/report/account_asset_report_view.xml | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/account_asset/report/account_asset_report.py b/addons/account_asset/report/account_asset_report.py
index 00c55b70684..619cf6a9d2b 100644
--- a/addons/account_asset/report/account_asset_report.py
+++ b/addons/account_asset/report/account_asset_report.py
@@ -35,7 +35,7 @@ class asset_asset_report(osv.osv):
                                   ('09', 'September'), ('10', 'October'),\
                                   ('11', 'November'), ('12', 'December')], 'Month', readonly=True),
         'day': fields.char('Day', size=16, readonly=True),
-        'purchase_date': fields.date('Asset Date', required=True),
+        'purchase_date': fields.date('Purchase Date', required=True),
         'depreciation_date': fields.date('Depreciation Date', readonly=True),
         'asset_id': fields.many2one('account.asset.asset', string='Asset', readonly=True),
         'asset_category_id': fields.many2one('account.asset.category',string='Asset category'),
@@ -89,8 +89,8 @@ class asset_asset_report(osv.osv):
                     a.state as state,
                     count(dl.*) as nbr,
                     a.company_id as company_id
-                from account_asset_asset a
-                    left join account_asset_depreciation_line dl on (dl.asset_id=a.id)
+                from account_asset_depreciation_line dl
+                    left join account_asset_asset a on (dl.asset_id=a.id)
                 group by 
                     dl.amount,dl.remaining_value,dl.depreciated_value,dl.asset_id,
                     to_char(a.purchase_date, 'YYYY'),to_char(a.purchase_date, 'MM'),
diff --git a/addons/account_asset/report/account_asset_report_view.xml b/addons/account_asset/report/account_asset_report_view.xml
index f6742a14cef..aaa654872e5 100644
--- a/addons/account_asset/report/account_asset_report_view.xml
+++ b/addons/account_asset/report/account_asset_report_view.xml
@@ -69,7 +69,7 @@
                 <newline/>
                 <group expand="0" string="Extended Filters..." groups="base.group_extended">
                     <field name="partner_id"/>
-                    <field name="purchase_date" string="Asset Purchase Date"/>
+                    <field name="purchase_date"/>
                     <field name="company_id" groups="base.group_multi_company" widget="selection"/>
                 </group>
                 <newline/>