odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[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
This commit is contained in:
Ujjvala Collins (OpenERP) 2011-06-30 16:38:42 +05:30
parent 3a47f2f84f
commit a35800eb6d
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
addons/account_asset/report/account_asset_report.py
View File

@ -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'),

2
addons/account_asset/report/account_asset_report_view.xml
View File

@ -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/>