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

[IMP] hr_timesheet_invoice : Removed all filters related to a date field and added the related date field in the search view. 

bzr revid: mdi@tinyerp.com-20120522072416-00ijo6jf6k0al61p
This commit is contained in:
Divyesh Makwana (Open ERP) 2012-05-22 12:54:16 +05:30
parent 1853da8952
commit a4d9633118
2 changed files with 0 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml
View File

@ -47,18 +47,6 @@
<field name="arch" type="xml">
<search string="Timesheet by user">
<group>
<filter icon="terp-go-year" string="This Year"
domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;',(datetime.date.today()-datetime.timedelta(days=365)).strftime('%%Y-%%m-%%d'))]"
help="Timesheet lines in this year"/>
<filter icon="terp-go-month" string="This Month"
name="month"
domain="[('date','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"
help="Timesheet lines in this month"/>
<filter icon="terp-go-week"
string=" 7 Days "
domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date','&gt;',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"
help="Timesheet lines during last 7 days"/>
<separator orientation="vertical"/>
<field name="user_id" widget="selection">
<filter icon="terp-personal"
string="Non Assigned timesheets to users"
@ -162,10 +150,6 @@
<field name="arch" type="xml">
<search string="Timesheet by user">
<group>
<separator orientation="vertical"/>
<filter icon="terp-go-year" string="This Year" domain="[('name','=',time.strftime('%%Y'))]" help="Timesheet by user in this year"/>
<filter icon="terp-go-month" string="This Month" domain="[('month','=',time.strftime('%%m'))]" help="Timesheet by user in this month"/>
<separator orientation="vertical"/>
<field name="name"/>
<field name="month"/>
<field name="user_id"/>
@ -298,10 +282,6 @@
<field name="arch" type="xml">
<search string="Daily timesheet by account">
<group>
<separator orientation="vertical"/>
<filter icon="terp-go-year" string="This Year" domain="[('name','=',time.strftime('%%Y'))]" help="Daily Timesheets for this year"/>
<filter icon="terp-go-month" string="This Month" domain="[('month','=',time.strftime('%%m'))]" help="Daily Timesheets of this month"/>
<separator orientation="vertical"/>
<field name="name"/>
<field name="month"/>
<field name="account_id" groups="analytic.group_analytic_accounting"/>
@ -370,10 +350,6 @@
<field name="arch" type="xml">
<search string="Timesheet by account">
<group>
<separator orientation="vertical"/>
<filter icon="terp-go-year" string="This Year" domain="[('name','=',time.strftime('%%Y'))]"/>
<filter icon="terp-go-month" string="This Month" domain="[('month','=',time.strftime('%%m'))]"/>
<separator orientation="vertical"/>
<field name="name"/>
<field name="month"/>
<field name="account_id" groups="analytic.group_analytic_accounting"/>

3
addons/hr_timesheet_invoice/report/report_analytic_view.xml
View File

@ -114,9 +114,6 @@
<field name="arch" type="xml">
<search string="Analytic Lines to Invoice">
<group>
<filter string="This Year" icon="terp-go-year" domain="[('name','=',time.localtime()[0])]"/>
<filter string="This Month" icon="terp-go-month" domain="[('month','=',time.localtime()[1])]"/>
<separator orientation="vertical"/>
<field name="name"/>
<field name="month"/>
<field name="product_id"/>