diff --git a/addons/project/report/project_report.py b/addons/project/report/project_report.py index e099b4544aa..c417abd4280 100644 --- a/addons/project/report/project_report.py +++ b/addons/project/report/project_report.py @@ -31,16 +31,15 @@ class report_project_task_user(osv.osv): 'day': fields.char('Day', size=128, readonly=True), 'year': fields.char('Year',size=64,required=False, readonly=True), 'user_id':fields.many2one('res.users', 'User', readonly=True), - 'date_start': fields.datetime('Starting Date',readonly=True), + 'date_start': fields.date('Starting Date',readonly=True), 'no_of_days': fields.integer('#Days', size=128, readonly=True), 'description': fields.text('Description',readonly=True), - 'date_end': fields.datetime('Ending Date',readonly=True), + 'date_end': fields.date('Ending Date',readonly=True), 'date_deadline': fields.date('Deadline',readonly=True), 'project_id':fields.many2one('project.project', 'Project', readonly=True), 'hours_planned': fields.float('Planned Hours', readonly=True), 'hours_effective': fields.float('Effective Hours', readonly=True), 'hours_delay': fields.float('Avg. Plan.-Eff.', readonly=True), -# 'closing_days': fields.char('Avg Closing Delay', size=64, readonly=True), 'closing_days': fields.float('Avg Closing Delay', digits=(16,2), readonly=True, group_operator="avg", help="Number of Days to close the task"), @@ -102,7 +101,6 @@ class report_project_task_user(osv.osv): t.state, date_trunc('day',t.date_end), to_date(to_char(t.date_deadline, 'dd-MM-YYYY'),'dd-MM-YYYY'), - date_trunc('day',t.date_start), t.company_id, t.partner_id, t.type, diff --git a/addons/project/report/project_report_view.xml b/addons/project/report/project_report_view.xml index 7990d7ab1aa..97c7778a729 100644 --- a/addons/project/report/project_report_view.xml +++ b/addons/project/report/project_report_view.xml @@ -102,19 +102,21 @@ help ="Non assigned tasks to projects" domain="[('project_id','=',False"/> + - + + + + + - - + + - - - diff --git a/addons/stock/report/report_stock_picking_view.xml b/addons/stock/report/report_stock_picking_view.xml index da5bdba6abf..281d60336c8 100644 --- a/addons/stock/report/report_stock_picking_view.xml +++ b/addons/stock/report/report_stock_picking_view.xml @@ -56,13 +56,13 @@ - - + + help="Picking in last 30 days"/> @@ -70,30 +70,32 @@ - + - + + - + + - + - +