diff --git a/addons/account/report/account_analytic_entries_report_view.xml b/addons/account/report/account_analytic_entries_report_view.xml index ee7bc934ce3..2020b56d1fe 100644 --- a/addons/account/report/account_analytic_entries_report_view.xml +++ b/addons/account/report/account_analytic_entries_report_view.xml @@ -20,9 +20,7 @@ - - - + diff --git a/addons/account/report/account_entries_report.py b/addons/account/report/account_entries_report.py index 41e4ff59278..2a8049ba403 100644 --- a/addons/account/report/account_entries_report.py +++ b/addons/account/report/account_entries_report.py @@ -37,14 +37,8 @@ class account_entries_report(osv.osv): 'debit': fields.float('Debit', readonly=True), 'credit': fields.float('Credit', readonly=True), 'balance': fields.float('Balance', readonly=True), - 'day': fields.char('Day', size=128, readonly=True), - 'year': fields.char('Year', size=4, readonly=True), - 'date': fields.date('Date', size=128, readonly=True), 'currency_id': fields.many2one('res.currency', 'Currency', readonly=True), 'amount_currency': fields.float('Amount Currency', digits_compute=dp.get_precision('Account'), readonly=True), - 'month':fields.selection([('01','January'), ('02','February'), ('03','March'), ('04','April'), - ('05','May'), ('06','June'), ('07','July'), ('08','August'), ('09','September'), - ('10','October'), ('11','November'), ('12','December')], 'Month', readonly=True), 'period_id': fields.many2one('account.period', 'Period', readonly=True), 'account_id': fields.many2one('account.account', 'Account', readonly=True), 'journal_id': fields.many2one('account.journal', 'Journal', readonly=True), @@ -53,7 +47,7 @@ class account_entries_report(osv.osv): 'product_uom_id': fields.many2one('product.uom', 'Product Unit of Measure', readonly=True), 'move_state': fields.selection([('draft','Unposted'), ('posted','Posted')], 'Status', readonly=True), 'move_line_state': fields.selection([('draft','Unbalanced'), ('valid','Valid')], 'State of Move Line', readonly=True), - 'reconcile_id': fields.many2one('account.move.reconcile', readonly=True), + 'reconcile_id': fields.many2one('account.move.reconcile', 'Reconciliation number', readonly=True), 'partner_id': fields.many2one('res.partner','Partner', readonly=True), 'analytic_account_id': fields.many2one('account.analytic.account', 'Analytic Account', readonly=True), 'quantity': fields.float('Products Quantity', digits=(16,2), readonly=True), @@ -123,9 +117,6 @@ class account_entries_report(osv.osv): am.state as move_state, l.state as move_line_state, l.reconcile_id as reconcile_id, - to_char(am.date, 'YYYY') as year, - to_char(am.date, 'MM') as month, - to_char(am.date, 'YYYY-MM-DD') as day, l.partner_id as partner_id, l.product_id as product_id, l.product_uom_id as product_uom_id, diff --git a/addons/account/report/account_entries_report_view.xml b/addons/account/report/account_entries_report_view.xml index dbff131388d..f52717d5c73 100644 --- a/addons/account/report/account_entries_report_view.xml +++ b/addons/account/report/account_entries_report_view.xml @@ -18,9 +18,6 @@ - - - diff --git a/addons/account/report/account_invoice_report_view.xml b/addons/account/report/account_invoice_report_view.xml index 1aaf2ff98e8..3fcae5d711b 100644 --- a/addons/account/report/account_invoice_report_view.xml +++ b/addons/account/report/account_invoice_report_view.xml @@ -86,9 +86,7 @@ - - - + diff --git a/addons/account_voucher/report/account_voucher_sales_receipt.py b/addons/account_voucher/report/account_voucher_sales_receipt.py index 246cd8b47e8..b615143567d 100644 --- a/addons/account_voucher/report/account_voucher_sales_receipt.py +++ b/addons/account_voucher/report/account_voucher_sales_receipt.py @@ -28,11 +28,6 @@ class sale_receipt_report(osv.osv): _rec_name = 'date' _columns = { 'date': fields.date('Date', readonly=True), - 'year': fields.char('Year', size=4, readonly=True), - 'day': fields.char('Day', size=128, readonly=True), - 'month': fields.selection([('01','January'), ('02','February'), ('03','March'), ('04','April'), - ('05','May'), ('06','June'), ('07','July'), ('08','August'), ('09','September'), - ('10','October'), ('11','November'), ('12','December')], 'Month', readonly=True), 'currency_id': fields.many2one('res.currency', 'Currency', readonly=True), 'journal_id': fields.many2one('account.journal', 'Journal', readonly=True), 'partner_id': fields.many2one('res.partner', 'Partner', readonly=True), @@ -69,9 +64,6 @@ class sale_receipt_report(osv.osv): create or replace view sale_receipt_report as ( select min(avl.id) as id, av.date as date, - to_char(av.date, 'YYYY') as year, - to_char(av.date, 'MM') as month, - to_char(av.date, 'YYYY-MM-DD') as day, av.partner_id as partner_id, aj.currency as currency_id, av.journal_id as journal_id, @@ -107,9 +99,6 @@ class sale_receipt_report(osv.osv): group by av.date, av.id, - to_char(av.date, 'YYYY'), - to_char(av.date, 'MM'), - to_char(av.date, 'YYYY-MM-DD'), av.partner_id, aj.currency, av.journal_id, diff --git a/addons/account_voucher/report/account_voucher_sales_receipt_view.xml b/addons/account_voucher/report/account_voucher_sales_receipt_view.xml index a6e153573e7..78af9d28fc5 100644 --- a/addons/account_voucher/report/account_voucher_sales_receipt_view.xml +++ b/addons/account_voucher/report/account_voucher_sales_receipt_view.xml @@ -1,34 +1,7 @@ - - + sale.receipt.report.graph sale.receipt.report @@ -65,9 +38,7 @@ - - - + diff --git a/addons/crm/report/crm_lead_report.py b/addons/crm/report/crm_lead_report.py index 2b46be9d042..82c68be92fe 100644 --- a/addons/crm/report/crm_lead_report.py +++ b/addons/crm/report/crm_lead_report.py @@ -91,7 +91,7 @@ class crm_lead_report(osv.osv): date(c.date_open) as opening_date, date(c.date_closed) as date_closed, - date_trunc('day',c.date_last_stage_update) as date_last_stage_update, + c.date_last_stage_update as date_last_stage_update, c.user_id, c.probability, @@ -107,7 +107,7 @@ class crm_lead_report(osv.osv): c.country_id, c.planned_revenue, c.planned_revenue*(c.probability/100) as probable_revenue, - date_trunc('day',c.create_date) as create_date, + c.create_date as create_date, extract('epoch' from (c.date_closed-c.create_date))/(3600*24) as delay_close, abs(extract('epoch' from (c.date_deadline - c.date_closed))/(3600*24)) as delay_expected, extract('epoch' from (c.date_open-c.create_date))/(3600*24) as delay_open diff --git a/addons/crm/report/crm_phonecall_report.py b/addons/crm/report/crm_phonecall_report.py index 137bda575b6..ac22130964b 100644 --- a/addons/crm/report/crm_phonecall_report.py +++ b/addons/crm/report/crm_phonecall_report.py @@ -55,7 +55,6 @@ class crm_phonecall_report(osv.osv): 'partner_id': fields.many2one('res.partner', 'Partner' , readonly=True), 'company_id': fields.many2one('res.company', 'Company', readonly=True), 'opening_date': fields.date('Opening Date', readonly=True, select=True), - 'creation_date': fields.date('Creation Date', readonly=True, select=True), 'date_closed': fields.date('Close Date', readonly=True, select=True), } @@ -69,9 +68,8 @@ class crm_phonecall_report(osv.osv): create or replace view crm_phonecall_report as ( select id, - to_char(c.create_date, 'YYYY-MM-DD') as creation_date, - to_char(c.date_open, 'YYYY-MM-DD') as opening_date, - to_char(c.date_closed, 'YYYY-mm-dd') as date_closed, + date(c.date_open) as opening_date, + date(c.date_closed) as date_closed, c.state, c.user_id, c.section_id, @@ -81,7 +79,7 @@ class crm_phonecall_report(osv.osv): c.company_id, c.priority, 1 as nbr, - date_trunc('day',c.create_date) as create_date, + c.create_date as create_date, extract('epoch' from (c.date_closed-c.create_date))/(3600*24) as delay_close, extract('epoch' from (c.date_open-c.create_date))/(3600*24) as delay_open from diff --git a/addons/crm/report/crm_phonecall_report_view.xml b/addons/crm/report/crm_phonecall_report_view.xml index 41af35df6b3..acadbd9c029 100644 --- a/addons/crm/report/crm_phonecall_report_view.xml +++ b/addons/crm/report/crm_phonecall_report_view.xml @@ -41,7 +41,6 @@ - @@ -53,9 +52,7 @@ - - - + diff --git a/addons/crm_claim/report/crm_claim_report.py b/addons/crm_claim/report/crm_claim_report.py index 4323b7024d3..2855cc427a0 100644 --- a/addons/crm_claim/report/crm_claim_report.py +++ b/addons/crm_claim/report/crm_claim_report.py @@ -37,19 +37,12 @@ class crm_claim_report(osv.osv): _description = "CRM Claim Report" _columns = { - 'name': fields.char('Year', required=False, readonly=True), 'user_id':fields.many2one('res.users', 'User', readonly=True), 'section_id':fields.many2one('crm.case.section', 'Section', readonly=True), 'nbr': fields.integer('# of Cases', readonly=True), - 'month':fields.selection([('01', 'January'), ('02', 'February'), \ - ('03', 'March'), ('04', 'April'),\ - ('05', 'May'), ('06', 'June'), \ - ('07', 'July'), ('08', 'August'),\ - ('09', 'September'), ('10', 'October'),\ - ('11', 'November'), ('12', 'December')], 'Month', readonly=True), 'company_id': fields.many2one('res.company', 'Company', readonly=True), 'create_date': fields.datetime('Create Date', readonly=True, select=True), - 'day': fields.char('Day', size=128, readonly=True), + 'claim_date': fields.datetime('Claim Date', readonly=True), 'delay_close': fields.float('Delay to close', digits=(16,2),readonly=True, group_operator="avg",help="Number of Days to close the case"), 'stage_id': fields.many2one ('crm.case.stage', 'Stage', readonly=True,domain="[('section_ids','=',section_id)]"), 'categ_id': fields.many2one('crm.case.categ', 'Category',\ @@ -76,11 +69,9 @@ class crm_claim_report(osv.osv): create or replace view crm_claim_report as ( select min(c.id) as id, - to_char(c.date, 'YYYY') as name, - to_char(c.date, 'MM') as month, - to_char(c.date, 'YYYY-MM-DD') as day, - to_char(c.date_closed, 'YYYY-MM-DD') as date_closed, - to_char(c.date_deadline, 'YYYY-MM-DD') as date_deadline, + c.date as claim_date, + date(c.date_closed) as date_closed, + c.date_deadline as date_deadline, c.user_id, c.stage_id, c.section_id, @@ -90,13 +81,13 @@ class crm_claim_report(osv.osv): count(*) as nbr, c.priority as priority, c.type_action as type_action, - date_trunc('day',c.create_date) as create_date, + c.create_date as create_date, avg(extract('epoch' from (c.date_closed-c.create_date)))/(3600*24) as delay_close, (SELECT count(id) FROM mail_message WHERE model='crm.claim' AND res_id=c.id) AS email, extract('epoch' from (c.date_deadline - c.date_closed))/(3600*24) as delay_expected from crm_claim c - group by to_char(c.date, 'YYYY'), to_char(c.date, 'MM'),to_char(c.date, 'YYYY-MM-DD'),\ + group by c.date,\ c.user_id,c.section_id, c.stage_id,\ c.categ_id,c.partner_id,c.company_id,c.create_date, c.priority,c.type_action,c.date_deadline,c.date_closed,c.id diff --git a/addons/crm_claim/report/crm_claim_report_view.xml b/addons/crm_claim/report/crm_claim_report_view.xml index 06de0ceee92..cf365d06df6 100644 --- a/addons/crm_claim/report/crm_claim_report_view.xml +++ b/addons/crm_claim/report/crm_claim_report_view.xml @@ -53,9 +53,7 @@ - - - + diff --git a/addons/crm_helpdesk/report/crm_helpdesk_report.py b/addons/crm_helpdesk/report/crm_helpdesk_report.py index f7180ef0908..590cadb0fed 100644 --- a/addons/crm_helpdesk/report/crm_helpdesk_report.py +++ b/addons/crm_helpdesk/report/crm_helpdesk_report.py @@ -39,17 +39,11 @@ class crm_helpdesk_report(osv.osv): _auto = False _columns = { - 'name': fields.char('Year', required=False, readonly=True), + 'date': fields.datetime('Date', readonly=True), 'user_id':fields.many2one('res.users', 'User', readonly=True), 'section_id':fields.many2one('crm.case.section', 'Section', readonly=True), 'nbr': fields.integer('# of Cases', readonly=True), 'state': fields.selection(AVAILABLE_STATES, 'Status', readonly=True), - 'month':fields.selection([('01', 'January'), ('02', 'February'), \ - ('03', 'March'), ('04', 'April'),\ - ('05', 'May'), ('06', 'June'), \ - ('07', 'July'), ('08', 'August'),\ - ('09', 'September'), ('10', 'October'),\ - ('11', 'November'), ('12', 'December')], 'Month', readonly=True), 'delay_close': fields.float('Delay to Close',digits=(16,2),readonly=True, group_operator="avg"), 'partner_id': fields.many2one('res.partner', 'Partner' , readonly=True), 'company_id': fields.many2one('res.company', 'Company', readonly=True), @@ -64,7 +58,6 @@ class crm_helpdesk_report(osv.osv): 'create_date': fields.date('Creation Date' , readonly=True, select=True), 'date_closed': fields.date('Close Date', readonly=True, select=True), 'delay_expected': fields.float('Overpassed Deadline',digits=(16,2),readonly=True, group_operator="avg"), - 'day': fields.char('Day', size=128, readonly=True), 'email': fields.integer('# Emails', size=128, readonly=True), } @@ -80,11 +73,9 @@ class crm_helpdesk_report(osv.osv): create or replace view crm_helpdesk_report as ( select min(c.id) as id, - to_char(c.date, 'YYYY') as name, - to_char(c.date, 'MM') as month, - to_char(c.date, 'YYYY-MM-DD') as day, - to_char(c.create_date, 'YYYY-MM-DD') as create_date, - to_char(c.date_closed, 'YYYY-mm-dd') as date_closed, + c.date as date, + date(c.create_date) as create_date, + date(c.date_closed) as date_closed, c.state, c.user_id, c.section_id, @@ -102,7 +93,7 @@ class crm_helpdesk_report(osv.osv): from crm_helpdesk c where c.active = 'true' - group by to_char(c.date, 'YYYY'), to_char(c.date, 'MM'),to_char(c.date, 'YYYY-MM-DD'),\ + group by c.date,\ c.state, c.user_id,c.section_id,c.priority,\ c.partner_id,c.company_id,c.date_deadline,c.create_date,c.date,c.date_closed,\ c.categ_id,c.channel_id,c.planned_cost,c.id diff --git a/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml b/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml index a70c38f9b25..e37d9970c05 100644 --- a/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml +++ b/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml @@ -49,9 +49,7 @@ - - - + diff --git a/addons/crm_partner_assign/report/crm_lead_report.py b/addons/crm_partner_assign/report/crm_lead_report.py index af6d146e1df..58ef013d60d 100644 --- a/addons/crm_partner_assign/report/crm_lead_report.py +++ b/addons/crm_partner_assign/report/crm_lead_report.py @@ -48,7 +48,6 @@ class crm_lead_report_assign(osv.osv): 'stage_id': fields.many2one ('crm.case.stage', 'Stage', domain="[('section_ids', '=', section_id)]"), 'partner_id': fields.many2one('res.partner', 'Customer' , readonly=True), 'opening_date': fields.date('Opening Date', readonly=True), - 'creation_date': fields.date('Creation Date', readonly=True), 'date_closed': fields.date('Close Date', readonly=True), 'nbr': fields.integer('# of Cases', readonly=True), 'company_id': fields.many2one('res.company', 'Company', readonly=True), @@ -69,9 +68,8 @@ class crm_lead_report_assign(osv.osv): CREATE OR REPLACE VIEW crm_lead_report_assign AS ( SELECT c.id, - to_char(c.create_date, 'YYYY-MM-DD') as creation_date, - to_char(c.date_open, 'YYYY-MM-DD') as opening_date, - to_char(c.date_closed, 'YYYY-mm-dd') as date_closed, + date(c.date_open) as opening_date, + date(c.date_closed) as date_closed, c.date_assign, c.user_id, c.probability, @@ -89,7 +87,7 @@ class crm_lead_report_assign(osv.osv): p.date as partner_date, c.planned_revenue*(c.probability/100) as probable_revenue, 1 as nbr, - date_trunc('day',c.create_date) as create_date, + c.create_date as create_date, extract('epoch' from (c.write_date-c.create_date))/(3600*24) as delay_close, extract('epoch' from (c.date_deadline - c.date_closed))/(3600*24) as delay_expected, extract('epoch' from (c.date_open-c.create_date))/(3600*24) as delay_open diff --git a/addons/crm_partner_assign/report/crm_lead_report_view.xml b/addons/crm_partner_assign/report/crm_lead_report_view.xml index 0cbfac50f87..22897962b7b 100644 --- a/addons/crm_partner_assign/report/crm_lead_report_view.xml +++ b/addons/crm_partner_assign/report/crm_lead_report_view.xml @@ -18,7 +18,6 @@ - @@ -35,9 +34,7 @@ - - - + diff --git a/addons/event/report/report_event_registration_view.xml b/addons/event/report/report_event_registration_view.xml index faa484d5667..8df4a032fee 100644 --- a/addons/event/report/report_event_registration_view.xml +++ b/addons/event/report/report_event_registration_view.xml @@ -41,9 +41,7 @@ - - - + - - + diff --git a/addons/hr_evaluation/report/hr_evaluation_report.py b/addons/hr_evaluation/report/hr_evaluation_report.py index 32ec3f43734..163562bfc72 100644 --- a/addons/hr_evaluation/report/hr_evaluation_report.py +++ b/addons/hr_evaluation/report/hr_evaluation_report.py @@ -31,14 +31,9 @@ class hr_evaluation_report(osv.Model): 'create_date': fields.date('Create Date', readonly=True), 'delay_date': fields.float('Delay to Start', digits=(16, 2), readonly=True), 'overpass_delay': fields.float('Overpassed Deadline', digits=(16, 2), readonly=True), - 'day': fields.char('Day', size=128, readonly=True), 'deadline': fields.date("Deadline", readonly=True), 'request_id': fields.many2one('survey.user_input', 'Request_id', readonly=True), 'closed': fields.date("closed", readonly=True), - 'year': fields.char('Year', size=4, readonly=True), - 'month': fields.selection([('01', 'January'), ('02', 'February'), ('03', 'March'), ('04', 'April'), - ('05', 'May'), ('06', 'June'), ('07', 'July'), ('08', 'August'), ('09', 'September'), - ('10', 'October'), ('11', 'November'), ('12', 'December')], 'Month', readonly=True), 'plan_id': fields.many2one('hr_evaluation.plan', 'Plan', readonly=True), 'employee_id': fields.many2one('hr.employee', "Employee", readonly=True), 'rating': fields.selection([ @@ -73,16 +68,13 @@ class hr_evaluation_report(osv.Model): create or replace view hr_evaluation_report as ( select min(l.id) as id, - date_trunc('day',s.create_date) as create_date, - to_char(s.create_date, 'YYYY-MM-DD') as day, + date(s.create_date) as create_date, s.employee_id, l.request_id, s.plan_id, s.rating, s.date as deadline, s.date_close as closed, - to_char(s.create_date, 'YYYY') as year, - to_char(s.create_date, 'MM') as month, count(l.*) as nbr, s.state, avg(extract('epoch' from age(s.create_date,CURRENT_DATE)))/(3600*24) as delay_date, @@ -93,10 +85,6 @@ class hr_evaluation_report(osv.Model): hr_evaluation_evaluation s on (s.id=l.evaluation_id) GROUP BY s.create_date, - date_trunc('day',s.create_date), - to_char(s.create_date, 'YYYY-MM-DD'), - to_char(s.create_date, 'YYYY'), - to_char(s.create_date, 'MM'), s.state, s.employee_id, s.date, diff --git a/addons/hr_evaluation/report/hr_evaluation_report_view.xml b/addons/hr_evaluation/report/hr_evaluation_report_view.xml index 073e648fe98..5793aa6d206 100644 --- a/addons/hr_evaluation/report/hr_evaluation_report_view.xml +++ b/addons/hr_evaluation/report/hr_evaluation_report_view.xml @@ -35,9 +35,7 @@ - - - + diff --git a/addons/hr_expense/report/hr_expense_report.py b/addons/hr_expense/report/hr_expense_report.py index 667d9fba07d..531f5348357 100644 --- a/addons/hr_expense/report/hr_expense_report.py +++ b/addons/hr_expense/report/hr_expense_report.py @@ -32,11 +32,7 @@ class hr_expense_report(osv.osv): _rec_name = 'date' _columns = { 'date': fields.date('Date ', readonly=True), - 'year': fields.char('Year', size=4, readonly=True), - 'day': fields.char('Day', size=128, readonly=True), - 'month':fields.selection([('01','January'), ('02','February'), ('03','March'), ('04','April'), - ('05','May'), ('06','June'), ('07','July'), ('08','August'), ('09','September'), - ('10','October'), ('11','November'), ('12','December')], 'Month', readonly=True), + 'create_date': fields.datetime('Creation Date', readonly=True), 'product_id':fields.many2one('product.product', 'Product', readonly=True), 'journal_id': fields.many2one('account.journal', 'Force Journal', readonly=True), 'product_qty':fields.float('Qty', readonly=True), @@ -70,17 +66,15 @@ class hr_expense_report(osv.osv): create or replace view hr_expense_report as ( select min(l.id) as id, - date_trunc('day',s.date) as date, + s.date as date, + s.create_date as create_date, s.employee_id, s.journal_id, s.currency_id, - to_date(to_char(s.date_confirm, 'dd-MM-YYYY'),'dd-MM-YYYY') as date_confirm, - to_date(to_char(s.date_valid, 'dd-MM-YYYY'),'dd-MM-YYYY') as date_valid, + s.date_confirm as date_confirm, + s.date_valid as date_valid, s.user_valid as user_id, s.department_id, - to_char(date_trunc('day',s.create_date), 'YYYY') as year, - to_char(date_trunc('day',s.create_date), 'MM') as month, - to_char(date_trunc('day',s.create_date), 'YYYY-MM-DD') as day, avg(extract('epoch' from age(s.date_valid,s.date)))/(3600*24) as delay_valid, avg(extract('epoch' from age(s.date_valid,s.date_confirm)))/(3600*24) as delay_confirm, l.product_id as product_id, @@ -97,12 +91,10 @@ class hr_expense_report(osv.osv): left join hr_expense_expense s on (s.id=l.expense_id) left join product_uom u on (u.id=l.uom_id) group by - date_trunc('day',s.date), - to_char(date_trunc('day',s.create_date), 'YYYY'), - to_char(date_trunc('day',s.create_date), 'MM'), - to_char(date_trunc('day',s.create_date), 'YYYY-MM-DD'), - to_date(to_char(s.date_confirm, 'dd-MM-YYYY'),'dd-MM-YYYY'), - to_date(to_char(s.date_valid, 'dd-MM-YYYY'),'dd-MM-YYYY'), + s.date, + s.create_date, + s.date_confirm, + s.date_valid, l.product_id, l.analytic_account, s.currency_id, diff --git a/addons/hr_expense/report/hr_expense_report_view.xml b/addons/hr_expense/report/hr_expense_report_view.xml index 5655b965f7c..bf44d5e27a2 100644 --- a/addons/hr_expense/report/hr_expense_report_view.xml +++ b/addons/hr_expense/report/hr_expense_report_view.xml @@ -43,9 +43,7 @@ - - - + diff --git a/addons/hr_recruitment/report/hr_recruitment_report.py b/addons/hr_recruitment/report/hr_recruitment_report.py index e83b0d2cc3e..cef98c5a3de 100644 --- a/addons/hr_recruitment/report/hr_recruitment_report.py +++ b/addons/hr_recruitment/report/hr_recruitment_report.py @@ -61,11 +61,8 @@ class hr_recruitment_report(osv.Model): select min(s.id) as id, s.create_date as date_create, - date_trunc('day',s.date_closed) as date_closed, - date_trunc('day',s.date_last_stage_update) as date_last_stage_update, - to_char(s.create_date, 'YYYY') as year, - to_char(s.create_date, 'MM') as month, - to_char(s.create_date, 'YYYY-MM-DD') as day, + date(s.date_closed) as date_closed, + s.date_last_stage_update as date_last_stage_update, s.partner_id, s.company_id, s.user_id, @@ -84,8 +81,6 @@ class hr_recruitment_report(osv.Model): count(*) as nbr from hr_applicant s group by - date_trunc('day',s.create_date), - date_trunc('day',s.date_closed), s.date_open, s.create_date, s.write_date, diff --git a/addons/hr_recruitment/report/hr_recruitment_report_view.xml b/addons/hr_recruitment/report/hr_recruitment_report_view.xml index db3e15d10b8..633d53c3728 100644 --- a/addons/hr_recruitment/report/hr_recruitment_report_view.xml +++ b/addons/hr_recruitment/report/hr_recruitment_report_view.xml @@ -67,10 +67,7 @@ - - - - + diff --git a/addons/hr_timesheet/report/hr_timesheet_report.py b/addons/hr_timesheet/report/hr_timesheet_report.py index 3ed396feefa..9b20f6978e7 100644 --- a/addons/hr_timesheet/report/hr_timesheet_report.py +++ b/addons/hr_timesheet/report/hr_timesheet_report.py @@ -8,11 +8,6 @@ class hr_timesheet_report(osv.osv): _description = "Timesheet" _auto = False _columns = { - 'year': fields.char('Year',size=64,required=False, readonly=True), - 'day': fields.char('Day', size=128, readonly=True), - 'month':fields.selection([('01','January'), ('02','February'), ('03','March'), ('04','April'), - ('05','May'), ('06','June'), ('07','July'), ('08','August'), ('09','September'), - ('10','October'), ('11','November'), ('12','December')], 'Month',readonly=True), 'date': fields.date('Date', readonly=True), 'name': fields.char('Description', size=64,readonly=True), 'product_id' : fields.many2one('product.product', 'Product',readonly=True), @@ -29,9 +24,6 @@ class hr_timesheet_report(osv.osv): select_str = """ SELECT min(hat.id) as id, aal.date as date, - to_char(aal.date, 'YYYY-MM-DD') as day, - to_char(aal.date,'YYYY') as year, - to_char(aal.date,'MM') as month, sum(aal.amount) as cost, sum(aal.unit_amount) as quantity, aal.account_id as account_id, diff --git a/addons/hr_timesheet/report/hr_timesheet_report_view.xml b/addons/hr_timesheet/report/hr_timesheet_report_view.xml index ec97447d7ff..0c9b5560ca4 100644 --- a/addons/hr_timesheet/report/hr_timesheet_report_view.xml +++ b/addons/hr_timesheet/report/hr_timesheet_report_view.xml @@ -35,9 +35,7 @@ - - - + @@ -48,7 +46,7 @@ hr.timesheet.report form graph - {'search_default_year':1,'search_default_month':1,'search_default_group_user_id':1,'group_by_no_leaf':1,'group_by':[]} + {'search_default_group_user_id':1,'group_by_no_leaf':1,'group_by':[]} report.membership - @@ -24,10 +23,8 @@ domain="[]" context="{'group_by':'membership_state'}"/> - - + @@ -38,7 +35,6 @@ report.membership - @@ -51,7 +47,7 @@ form graph - {"search_default_year":1,"search_default_member":1, 'search_default_Revenue':1, 'search_default_this_month':1, 'search_default_salesman':1,'group_by_no_leaf':1} + {"search_default_start_date":1,"search_default_member":1, 'search_default_Revenue':1, 'search_default_this_month':1, 'search_default_salesman':1,'group_by_no_leaf':1} - - - + diff --git a/addons/point_of_sale/report/pos_order_report_view.xml b/addons/point_of_sale/report/pos_order_report_view.xml index 1d0b31f6c37..281c39f8fbc 100644 --- a/addons/point_of_sale/report/pos_order_report_view.xml +++ b/addons/point_of_sale/report/pos_order_report_view.xml @@ -37,9 +37,7 @@ - - - + diff --git a/addons/project/report/project_report.py b/addons/project/report/project_report.py index 4a38e57ad9a..7dcccb13de1 100644 --- a/addons/project/report/project_report.py +++ b/addons/project/report/project_report.py @@ -65,11 +65,10 @@ class report_project_task_user(osv.osv): SELECT (select 1 ) AS nbr, t.id as id, - date_trunc('day',t.date_start) as date_start, - date_trunc('day',t.date_end) as date_end, - date_trunc('day',t.date_last_stage_update) as date_last_stage_update, - to_date(to_char(t.date_deadline, 'dd-MM-YYYY'),'dd-MM-YYYY') as date_deadline, --- sum(cast(to_char(date_trunc('day',t.date_end) - date_trunc('day',t.date_start),'DD') as int)) as no_of_days, + date(t.date_start) as date_start, + date(t.date_end) as date_end, + date(t.date_last_stage_update) as date_last_stage_update, + t.date_deadline as date_deadline, abs((extract('epoch' from (t.write_date-t.date_start)))/(3600*24)) as no_of_days, t.user_id, t.reviewer_id, diff --git a/addons/project/report/project_report_view.xml b/addons/project/report/project_report_view.xml index f720473fb99..408d0001482 100644 --- a/addons/project/report/project_report_view.xml +++ b/addons/project/report/project_report_view.xml @@ -64,9 +64,7 @@ - - - + diff --git a/addons/project_issue/report/project_issue_report.py b/addons/project_issue/report/project_issue_report.py index 5ac7b6e48c6..2ab9b1a0da4 100644 --- a/addons/project_issue/report/project_issue_report.py +++ b/addons/project_issue/report/project_issue_report.py @@ -29,13 +29,10 @@ class project_issue_report(osv.osv): _auto = False _columns = { - 'name': fields.char('Year', size=64, required=False, readonly=True), 'section_id':fields.many2one('crm.case.section', 'Sale Team', readonly=True), - 'month':fields.selection(fields.date.MONTHS, 'Month', readonly=True), 'company_id': fields.many2one('res.company', 'Company', readonly=True), - 'day': fields.char('Day', size=128, readonly=True), 'opening_date': fields.date('Date of Opening', readonly=True), - 'creation_date': fields.date('Creation Date', readonly=True), + 'create_date': fields.date('Create Date', readonly=True), 'date_closed': fields.date('Date of Closing', readonly=True), 'date_last_stage_update': fields.date('Last Stage Update', readonly=True), 'stage_id': fields.many2one('project.task.type', 'Stage'), @@ -63,18 +60,15 @@ class project_issue_report(osv.osv): CREATE OR REPLACE VIEW project_issue_report AS ( SELECT c.id as id, - to_char(c.create_date, 'YYYY') as name, - to_char(c.create_date, 'MM') as month, - to_char(c.create_date, 'YYYY-MM-DD') as day, - to_char(c.date_open, 'YYYY-MM-DD') as opening_date, - to_char(c.create_date, 'YYYY-MM-DD') as creation_date, - date_trunc('day',c.date_last_stage_update) as date_last_stage_update, + date(c.date_open) as opening_date, + date(c.create_date) as create_date, + date(c.date_last_stage_update) as date_last_stage_update, c.user_id, c.working_hours_open, c.working_hours_close, c.section_id, c.stage_id, - to_char(c.date_closed, 'YYYY-mm-dd') as date_closed, + date(c.date_closed) as date_closed, c.company_id as company_id, c.priority as priority, c.project_id as project_id, @@ -83,7 +77,6 @@ class project_issue_report(osv.osv): c.partner_id, c.channel, c.task_id, - date_trunc('day',c.create_date) as create_date, c.day_open as delay_open, c.day_close as delay_close, (SELECT count(id) FROM mail_message WHERE model='project.issue' AND res_id=c.id) AS email diff --git a/addons/project_issue/report/project_issue_report_view.xml b/addons/project_issue/report/project_issue_report_view.xml index 8de0e7e47bc..3382c6e3625 100644 --- a/addons/project_issue/report/project_issue_report_view.xml +++ b/addons/project_issue/report/project_issue_report_view.xml @@ -34,7 +34,6 @@ project.issue.report - @@ -54,9 +53,7 @@ - - - + diff --git a/addons/purchase/report/purchase_report.py b/addons/purchase/report/purchase_report.py index 2483f79410c..d5a660667a6 100644 --- a/addons/purchase/report/purchase_report.py +++ b/addons/purchase/report/purchase_report.py @@ -68,7 +68,7 @@ class purchase_report(osv.osv): create or replace view purchase_report as ( select min(l.id) as id, - s.date_order as date, + date(s.date_order) as date, s.state, s.date_approve, s.minimum_planned_date as expected_date, diff --git a/addons/purchase/report/purchase_report_view.xml b/addons/purchase/report/purchase_report_view.xml index d2bdb45f834..3db4144a9a3 100644 --- a/addons/purchase/report/purchase_report_view.xml +++ b/addons/purchase/report/purchase_report_view.xml @@ -47,9 +47,7 @@ - - - +