diff options
| author | Olivier Dony <odo@openerp.com> | 2011-09-24 02:55:47 +0200 |
|---|---|---|
| committer | Olivier Dony <odo@openerp.com> | 2011-09-24 02:55:47 +0200 |
| commit | 253eaa462d3773a6d0cc820ac244df0d4e0c5a67 (patch) | |
| tree | 1fef9c6343af02641bdf080dee6465a4e49a6252 | |
| parent | ccc56996dda8472ecab6e5a71d3cb9ad2ba272cc (diff) | |
[FIX] fix useless and invalid casts in domain fields
The ORM will automatically append 00:00:00 to a date
literal that is being compared with a timestamp field
with operators '>' or '>=', and 23:59:59 if compared
with operators '<' or '<='.
So a trivial domain for 'Today' is:
[('tstamp_field','>=',current_date),('tstamp_field','<=',current_date)]
taking advantage of the current_date helper that
is defined as the current date in YYYY-MM-DD format.
bzr revid: odo@openerp.com-20110924005547-pvgblte6r14so7mw
| -rw-r--r-- | addons/crm_helpdesk/crm_helpdesk_view.xml | 4 | ||||
| -rw-r--r-- | addons/hr_attendance/hr_attendance_view.xml | 2 | ||||
| -rw-r--r-- | addons/mrp/mrp_view.xml | 2 | ||||
| -rw-r--r-- | addons/mrp_operations/mrp_operations_view.xml | 2 | ||||
| -rw-r--r-- | addons/procurement/procurement_view.xml | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/addons/crm_helpdesk/crm_helpdesk_view.xml b/addons/crm_helpdesk/crm_helpdesk_view.xml index 5aea32298b7..f9f5318bfc2 100644 --- a/addons/crm_helpdesk/crm_helpdesk_view.xml +++ b/addons/crm_helpdesk/crm_helpdesk_view.xml @@ -248,13 +248,13 @@ /> <separator orientation="vertical"/> <filter icon="terp-go-today" string="Today" - domain="[('date::date','=',time.strftime('%%Y-%%m-%%d'))]" + domain="[('date','>=',current_date), ('date','<=',current_date)]" help="Todays's Helpdesk Requests" /> <filter icon="terp-go-week" string="7 Days" help="Helpdesk requests during last 7 days" - domain="[('date','<', time.strftime('%%Y-%%m-%%d')), ('date','>=',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]" + domain="[('date','<',current_date), ('date','>=',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]" /> <separator orientation="vertical"/> <field name="name" string="Query"/> diff --git a/addons/hr_attendance/hr_attendance_view.xml b/addons/hr_attendance/hr_attendance_view.xml index 0affdde9e73..7a65ce7f88c 100644 --- a/addons/hr_attendance/hr_attendance_view.xml +++ b/addons/hr_attendance/hr_attendance_view.xml @@ -52,7 +52,7 @@ <search string="Hr Attendance Search"> <filter icon="terp-stock_align_left_24" string="My Attendances" domain="[('employee_id.user_id.id', '=', uid)]" /> <separator orientation="vertical"/> - <filter icon="terp-go-today" string="Today" name="today" domain="[('name::date','=',current_date)]" /> + <filter icon="terp-go-today" string="Today" name="today" domain="[('name','>=',current_date),('name','<=',current_date)]" /> <separator orientation="vertical"/> <field name="employee_id"/> <field name="name"/> diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml index 19e25438cad..a344545748c 100644 --- a/addons/mrp/mrp_view.xml +++ b/addons/mrp/mrp_view.xml @@ -808,7 +808,7 @@ help="Manufacturing Orders which are currently in production."/> <separator orientation="vertical"/> <filter icon="terp-gnome-cpu-frequency-applet+" string="Late" - domain="['&', ('date_planned::date','<', current_date), ('state', 'in', ('draft', 'confirmed', 'ready'))]" + domain="['&', ('date_planned','<', current_date), ('state', 'in', ('draft', 'confirmed', 'ready'))]" help="Production started late" /> <separator orientation="vertical"/> <field name="name"/> diff --git a/addons/mrp_operations/mrp_operations_view.xml b/addons/mrp_operations/mrp_operations_view.xml index a80a1a41a9c..2484345de9a 100644 --- a/addons/mrp_operations/mrp_operations_view.xml +++ b/addons/mrp_operations/mrp_operations_view.xml @@ -140,7 +140,7 @@ domain="[('state','=','pause')]"/> <separator orientation="vertical"/> <filter icon="terp-gnome-cpu-frequency-applet+" string="Late" - domain="['&', ('date_planned::date','<', current_date), ('state', 'in', ('draft', 'confirmed', 'ready'))]" + domain="['&', ('date_planned','<', current_date), ('state', 'in', ('draft', 'confirmed', 'ready'))]" help="Production started late" /> <separator orientation="vertical"/> <field name="name"/> diff --git a/addons/procurement/procurement_view.xml b/addons/procurement/procurement_view.xml index edd82160025..400412298cc 100644 --- a/addons/procurement/procurement_view.xml +++ b/addons/procurement/procurement_view.xml @@ -106,7 +106,7 @@ <filter icon="terp-emblem-important" string="Temporary" name="temp_exceptions" domain="[('state','=','exception'),('message', '=', '')]" help="Temporary Procurement Exceptions"/> <separator orientation="vertical"/> <filter icon="terp-gnome-cpu-frequency-applet+" string="Late" - domain="['&', ('date_planned::date','<', current_date), ('state', 'in', ('draft', 'confirmed'))]" + domain="['&', ('date_planned','<', current_date), ('state', 'in', ('draft', 'confirmed'))]" help="Procurement started late" /> <separator orientation="vertical"/> <field name="origin"/> |