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

[MERGE] merged kbh branch of usability small changes in account_asset 

bzr revid: qdp-launchpad@openerp.com-20111115134229-qaxwaonngo6u680w
This commit is contained in:
Quentin (OpenERP) 2011-11-15 14:42:29 +01:00
parent 5d4ac9feb3 029d4d3455
commit 13c2e99067
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -47,11 +47,11 @@
<filter string="Year" icon="terp-go-year" name="year"
domain="[('purchase_date','&lt;=', time.strftime('%%Y-%%m-%%d')),('purchase_date','&gt;=',time.strftime('%%Y-01-01'))]"
help="Assets purchased in current year"/>
<separator orientation="vertical"/>
<filter string="This Month" icon="terp-go-month" name="this_month"
<separator orientation="vertical"/>
<filter string="Month" icon="terp-go-month" name="this_month"
domain="[('purchase_date','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('purchase_date','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"
help="Assets purchased in current month"/>
<filter icon="terp-go-month" string="Previous Month" separator="1"
<filter icon="terp-go-month" string="Month-1" separator="1"
domain="[('purchase_date','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('purchase_date','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
help="Assets purchased in last month"/>
<separator orientation="vertical"/>