From 495b8981c77bfb8bc9ce65055a222b944a7a98d8 Mon Sep 17 00:00:00 2001 From: "Jay (Open ERP)" Date: Fri, 20 Mar 2009 16:58:18 +0530 Subject: [PATCH] Corrected Reports for board_service bzr revid: jvo@tinyerp.com-20090320112818-xdefzc7sau8u9m9c --- addons/report_account/report_receivable.py | 4 ++-- addons/report_crm/report_crm.py | 8 ++++---- addons/report_sale/report_sale.py | 4 ++-- addons/report_task/report_task.py | 3 +-- addons/report_timesheet/report_timesheet.py | 6 +++--- 5 files changed, 12 insertions(+), 13 deletions(-) diff --git a/addons/report_account/report_receivable.py b/addons/report_account/report_receivable.py index 9ad1d7a2aef..1cb353b9f07 100644 --- a/addons/report_account/report_receivable.py +++ b/addons/report_account/report_receivable.py @@ -197,9 +197,9 @@ class report_invoice_created(osv.osv): from account_invoice inv where - (to_date(to_char(inv.create_date, 'YYYY-MM-dd'),'YYYY-MM-dd') < CURRENT_DATE) + (to_date(to_char(inv.create_date, 'YYYY-MM-dd'),'YYYY-MM-dd') <= CURRENT_DATE) AND - (to_date(to_char(inv.create_date, 'YYYY-MM-dd'),'YYYY-MM-dd') >= (CURRENT_DATE-15)) + (to_date(to_char(inv.create_date, 'YYYY-MM-dd'),'YYYY-MM-dd') > (CURRENT_DATE-15)) )""") report_invoice_created() diff --git a/addons/report_crm/report_crm.py b/addons/report_crm/report_crm.py index cc5cf55a4de..30bf015188e 100644 --- a/addons/report_crm/report_crm.py +++ b/addons/report_crm/report_crm.py @@ -193,17 +193,17 @@ class report_crm_case_service_dashboard(osv.osv): from crm_case cse where - ((to_date(to_char(cse.date_closed, 'YYYY-MM-dd'),'YYYY-MM-dd') < CURRENT_DATE) + ((to_date(to_char(cse.date_closed, 'YYYY-MM-dd'),'YYYY-MM-dd') <= CURRENT_DATE) AND - (to_date(to_char(cse.date_closed, 'YYYY-MM-dd'),'YYYY-MM-dd') >= (CURRENT_DATE-15)) + (to_date(to_char(cse.date_closed, 'YYYY-MM-dd'),'YYYY-MM-dd') > (CURRENT_DATE-15)) AND cse.state='done') OR - ((to_date(to_char(cse.create_date, 'YYYY-MM-dd'),'YYYY-MM-dd') < CURRENT_DATE) + ((to_date(to_char(cse.create_date, 'YYYY-MM-dd'),'YYYY-MM-dd') <= CURRENT_DATE) AND - (to_date(to_char(cse.create_date, 'YYYY-MM-dd'),'YYYY-MM-dd') >= (CURRENT_DATE-15)) + (to_date(to_char(cse.create_date, 'YYYY-MM-dd'),'YYYY-MM-dd') > (CURRENT_DATE-15)) AND cse.state='open') )""") diff --git a/addons/report_sale/report_sale.py b/addons/report_sale/report_sale.py index 5407d8df57c..7cf5b9e6204 100644 --- a/addons/report_sale/report_sale.py +++ b/addons/report_sale/report_sale.py @@ -166,9 +166,9 @@ class report_sale_order_created(osv.osv): from sale_order sale where - (to_date(to_char(sale.create_date, 'YYYY-MM-dd'),'YYYY-MM-dd') < CURRENT_DATE) + (to_date(to_char(sale.create_date, 'YYYY-MM-dd'),'YYYY-MM-dd') <= CURRENT_DATE) AND - (to_date(to_char(sale.create_date, 'YYYY-MM-dd'),'YYYY-MM-dd') >= (CURRENT_DATE-15)) + (to_date(to_char(sale.create_date, 'YYYY-MM-dd'),'YYYY-MM-dd') > (CURRENT_DATE-15)) )""") report_sale_order_created() diff --git a/addons/report_task/report_task.py b/addons/report_task/report_task.py index 6006f3f61f5..5fa73654094 100644 --- a/addons/report_task/report_task.py +++ b/addons/report_task/report_task.py @@ -91,7 +91,7 @@ class report_closed_task(osv.osv): from project_task tsk where - (tsk.date_close < CURRENT_DATE AND tsk.date_close >= (CURRENT_DATE-15)) + (tsk.date_close <= CURRENT_DATE AND tsk.date_close > (CURRENT_DATE-15)) ) ''') report_closed_task() @@ -151,7 +151,6 @@ class report_timesheet_task_user(osv.osv): select to_char(h.name,'YYYY-MM-01') as name, to_char(h.name,'MM') as m_id from hr_timesheet_sheet_sheet_day h) as months) """) - report_timesheet_task_user() diff --git a/addons/report_timesheet/report_timesheet.py b/addons/report_timesheet/report_timesheet.py index 70674b91640..3bea79c5289 100644 --- a/addons/report_timesheet/report_timesheet.py +++ b/addons/report_timesheet/report_timesheet.py @@ -192,8 +192,8 @@ class report_random_timsheet(osv.osv): where (dept.id = dept_user.department_id AND dept_user.user_id=line.user_id AND line.user_id is not null) AND (dept.manager_id = """ + str(uid) + """ ) - AND (line.date < CURRENT_DATE AND line.date >= (CURRENT_DATE-3)) - ORDER BY line.name LIMIT 10 + AND (line.date <= CURRENT_DATE AND line.date > (CURRENT_DATE-3)) + LIMIT 10 ) """ ) @@ -230,7 +230,7 @@ class random_timesheet_lines(osv.osv): from account_analytic_line line where - (line.date < CURRENT_DATE AND line.date >= (CURRENT_DATE-15)) + (line.date <= CURRENT_DATE AND line.date > (CURRENT_DATE-15)) ) """ )