From 6be7dbb1f730e718a3c56dd64ad450087a0b4bc5 Mon Sep 17 00:00:00 2001
From: "nel@tinyerp.com" <>
Date: Fri, 16 Apr 2010 08:50:22 +0200
Subject: [PATCH] [IMP] views
bzr revid: nel@tinyerp.com-20100416065022-2kxranp2h9wm1s1f
---
addons/board_purchase/board_purchase_view.xml | 4 ++--
addons/hr_evaluation/hr_evaluation_view.xml | 2 +-
addons/hr_evaluation/report/hr_evaluation_report.py | 2 +-
addons/hr_evaluation/report/hr_evaluation_report_view.xml | 3 ++-
addons/hr_holidays/report/hr_holidays_report_view.xml | 3 ++-
addons/project/project_view.xml | 2 --
6 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/addons/board_purchase/board_purchase_view.xml b/addons/board_purchase/board_purchase_view.xml
index d1ac01b9e7f..2370e247eec 100644
--- a/addons/board_purchase/board_purchase_view.xml
+++ b/addons/board_purchase/board_purchase_view.xml
@@ -13,8 +13,8 @@
ir.actions.act_window
purchase.order
form
- [('state','in',('wait','confirmed'))]
tree,form
+ [('date_order','>',time.strftime('%Y-01-01 00:00:00')),('date_order','<',time.strftime('%Y-12-31 23:59:59')), ('state','in',('wait','confirmed'))]
@@ -54,4 +54,4 @@
sequence="4"/>
-
\ No newline at end of file
+
diff --git a/addons/hr_evaluation/hr_evaluation_view.xml b/addons/hr_evaluation/hr_evaluation_view.xml
index 4f529d57073..f0ca1e14db0 100644
--- a/addons/hr_evaluation/hr_evaluation_view.xml
+++ b/addons/hr_evaluation/hr_evaluation_view.xml
@@ -239,7 +239,7 @@
-
+
diff --git a/addons/hr_evaluation/report/hr_evaluation_report.py b/addons/hr_evaluation/report/hr_evaluation_report.py
index 42eee4e3747..0e32969e95a 100644
--- a/addons/hr_evaluation/report/hr_evaluation_report.py
+++ b/addons/hr_evaluation/report/hr_evaluation_report.py
@@ -27,7 +27,7 @@ class hr_evaluation_report(osv.osv):
_auto = False
_rec_name = 'date'
_columns = {
- 'create_date': fields.datetime('Create Date', readonly=True),
+ 'create_date': fields.date('Create Date', readonly=True),
'deadline': fields.date("Deadline", readonly=True),
'request_id': fields.many2one('survey.request','Request_id', readonly=True),
'closed': fields.date("closed", readonly=True),
diff --git a/addons/hr_evaluation/report/hr_evaluation_report_view.xml b/addons/hr_evaluation/report/hr_evaluation_report_view.xml
index ea4c67ba78b..b0e5e065cf0 100644
--- a/addons/hr_evaluation/report/hr_evaluation_report_view.xml
+++ b/addons/hr_evaluation/report/hr_evaluation_report_view.xml
@@ -71,7 +71,7 @@
-
+
@@ -88,6 +88,7 @@
hr.evaluation.report
form
tree
+ {'search_default_employee': 1}
diff --git a/addons/hr_holidays/report/hr_holidays_report_view.xml b/addons/hr_holidays/report/hr_holidays_report_view.xml
index 164b24653d7..e9e0e6aae36 100644
--- a/addons/hr_holidays/report/hr_holidays_report_view.xml
+++ b/addons/hr_holidays/report/hr_holidays_report_view.xml
@@ -69,7 +69,7 @@
-
+
@@ -85,6 +85,7 @@
hr.holidays.report
form
tree,graph
+ {'search_default_employee': 1}
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 4da4cbb91f7..398fbdb86ab 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -157,7 +157,6 @@
[]
- {'search_default_Users':1}
@@ -445,7 +444,6 @@
- {'search_default_user_id': 1}