[MERGE] merged polishing of lunch analysis view
bzr revid: qdp-launchpad@openerp.com-20111116121352-k9ptec7svzj5yyup
This commit is contained in:
commit
1d55b18914
|
@ -371,9 +371,11 @@
|
|||
<field name="arch" type="xml">
|
||||
<search string="Box Amount by User">
|
||||
<group>
|
||||
<filter icon="terp-go-year" string=" Year "
|
||||
<filter icon="terp-go-year" string=" Year " name="year"
|
||||
domain="[('date','<=', time.strftime('%%Y-%%m-%%d')),('date','>=',time.strftime('%%Y-01-01'))]"
|
||||
help="Box amount in current year"/>
|
||||
<separator orientation="vertical"/>
|
||||
|
||||
<filter icon="terp-go-month" string=" Month "
|
||||
name="month"
|
||||
domain="[('date','<=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('date','>=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"
|
||||
|
@ -402,6 +404,7 @@
|
|||
<field name="res_model">report.lunch.amount</field>
|
||||
<field name="view_type">form</field>
|
||||
<field name="view_mode">tree,form</field>
|
||||
<field name="context">{'search_default_year': 1,"search_default_month":1}</field>
|
||||
<field name="search_view_id" ref="view_report_lunch_amount_search"/>
|
||||
</record>
|
||||
|
||||
|
|
Loading…
Reference in New Issue