pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Corrected Reports for board_service

Browse Source 
bzr revid: jvo@tinyerp.com-20090320112818-xdefzc7sau8u9m9c
This commit is contained in:
Jay (Open ERP)
2009-03-20 16:58:18 +05:30
parent bcddc88a05
commit 495b8981c7
5 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/report_account/report_receivable.py
+2 -2
View File
@@ -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()
addons/report_crm/report_crm.py
+4 -4
View File
@@ -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')
)""")
addons/report_sale/report_sale.py
+2 -2
View File
@@ -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()
addons/report_task/report_task.py
+1 -2
View File
@@ -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()
addons/report_timesheet/report_timesheet.py
+3 -3
View File
@@ -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))
)
""" )