From 4365666322dbd8dcd49110a57015d8229493496d Mon Sep 17 00:00:00 2001
From: "Jay Vora (OpenERP)" <jvo@tinyerp.com>
Date: Sat, 7 May 2011 16:54:17 +0530
Subject: [PATCH] [FIX] Fixed warnings and test failures suggested by Buildbot

bzr revid: jvo@tinyerp.com-20110507112417-lf7pgmzy5t9s0ohv
---
 .../test/test_hr_timesheet_sheet.yml          | 20 +++++++++++++++----
 addons/project_mrp/project_procurement.py     |  6 +++---
 2 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/addons/hr_timesheet_sheet/test/test_hr_timesheet_sheet.yml b/addons/hr_timesheet_sheet/test/test_hr_timesheet_sheet.yml
index edab4b2d840..1389908982f 100644
--- a/addons/hr_timesheet_sheet/test/test_hr_timesheet_sheet.yml
+++ b/addons/hr_timesheet_sheet/test/test_hr_timesheet_sheet.yml
@@ -18,6 +18,18 @@
       - base.main_company
       - res_company_openERP
 
+-
+  I create a test user.
+-
+  !record {model: res.users, id: user_hr_timehseet_sheet}:
+      name: HR Timesheet User
+      login: test
+      password: 'test'
+      active: True
+      company_id: res_company_openERP
+      company_ids:
+        - base.main_company
+        - res_company_openERP
 -
   I  create a new employee “Mark Johnson”.
 -
@@ -27,7 +39,7 @@
     gender: male
     marital: hr.hr_employee_marital_status_single
     name: Mark Johnson
-    user_id: base.user_root
+    user_id: user_hr_timehseet_sheet
 
 -
   I create new Timesheet journal for employee.
@@ -69,7 +81,7 @@
     date_to: !eval "'%s-05-31' %(datetime.now().year)"
     name: !eval "'Week-22(%s)' %(datetime.now().year)"
     state: new
-    user_id: base.user_root
+    user_id: user_hr_timehseet_sheet
     employee_id: 'hr_employee_employee0'
 -
   Now , at the time of login, I create Attendances and perform "Sign In" action.
@@ -100,7 +112,7 @@
         amount: -90.00
         product_id: hr_timesheet.product_consultant
         general_account_id: account.a_expense
-        user_id: base.user_root
+        user_id: user_hr_timehseet_sheet
         journal_id: hr_timesheet.analytic_journal
 
 -
@@ -131,7 +143,7 @@
         amount: -90.00
         product_id: hr_timesheet.product_consultant
         general_account_id: account.a_expense
-        user_id: base.user_root
+        user_id: user_hr_timehseet_sheet
         journal_id: hr_timesheet.analytic_journal
 
 -
diff --git a/addons/project_mrp/project_procurement.py b/addons/project_mrp/project_procurement.py
index 828438c2046..baa2d0a3021 100644
--- a/addons/project_mrp/project_procurement.py
+++ b/addons/project_mrp/project_procurement.py
@@ -19,10 +19,10 @@
 #
 ##############################################################################
 
-from osv import fields, osv, orm
+from osv import fields, osv
+
+from tools.translate import _
 
-import tools
-from tools.translate import _ 
 class procurement_order(osv.osv):
     _name = "procurement.order"
     _inherit = "procurement.order"