From 6bc2b96d41afcc8d1ea0ffb64a18914cc5681f32 Mon Sep 17 00:00:00 2001
From: "Randhir Mayatra (OpenERP)" <rma@tinyerp.com>
Date: Fri, 19 Oct 2012 15:17:32 +0530
Subject: [PATCH 1/3] [IMP] make changes into pad file for function copy

bzr revid: rma@tinyerp.com-20121019094732-6p7geg6yftaf5lq6
---
 addons/pad/pad.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/pad/pad.py b/addons/pad/pad.py
index 0cbb6107979..dbdc393e043 100644
--- a/addons/pad/pad.py
+++ b/addons/pad/pad.py
@@ -86,7 +86,7 @@ class pad_common(osv.osv_memory):
     def copy(self, cr, uid, id, default=None, context=None):
         if not default:
             default = {}
-        for k,v in self._all_columns:
+        for k,v in self._all_columns.items():
             field = v.column
             if hasattr(field,'pad_content_field'):
                 pad = self.pad_generate_url(cr, uid, context)

From 383040231adff8cbc8af97046179d2ad42e7f97a Mon Sep 17 00:00:00 2001
From: "Randhir Mayatra (OpenERP)" <rma@tinyerp.com>
Date: Fri, 19 Oct 2012 16:18:26 +0530
Subject: [PATCH 2/3] [IMP]change the string of exception in project_timesheet

bzr revid: rma@tinyerp.com-20121019104826-lm2qi3lhs1ov769j
---
 addons/project_timesheet/project_timesheet.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/project_timesheet/project_timesheet.py b/addons/project_timesheet/project_timesheet.py
index 12fac7802c6..11c607f734b 100644
--- a/addons/project_timesheet/project_timesheet.py
+++ b/addons/project_timesheet/project_timesheet.py
@@ -86,7 +86,7 @@ class project_work(osv.osv):
         emp = emp_obj.browse(cr, uid, emp_id[0])
         if not emp.product_id:
             raise osv.except_osv(_('Bad Configuration !'),
-                 _('Please define product on the related employee.\nFill in the timesheet tab of the employee form.'))
+                 _('Please define product and product category property account on the related employee.\nFill in the HR Settings tab of the employee form.'))
 
         if not emp.journal_id:
             raise osv.except_osv(_('Bad Configuration !'),

From 1f4599e97ce600583e6b3d2532d13b6586e94956 Mon Sep 17 00:00:00 2001
From: "Randhir Mayatra (OpenERP)" <rma@tinyerp.com>
Date: Fri, 19 Oct 2012 16:54:39 +0530
Subject: [PATCH 3/3] [IMP]add the domain in resource tree view

bzr revid: rma@tinyerp.com-20121019112439-ibymnbzgnxeic7nu
---
 addons/resource/resource_view.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/resource/resource_view.xml b/addons/resource/resource_view.xml
index 58f7789dc07..f3d45295891 100644
--- a/addons/resource/resource_view.xml
+++ b/addons/resource/resource_view.xml
@@ -195,6 +195,7 @@
             <field name="res_model">resource.resource</field>
             <field name="view_mode">tree,form</field>
             <field name="context">{}</field>
+            <field name="domain">[('resource_type','=','user')]</field>
             <field name="search_view_id" ref="view_resource_resource_search"/>
             <field name="help">Resources allow you to create and manage resources that should be involved in a specific project phase. You can also set their efficiency level and workload based on their weekly working hours.</field>
         </record>