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) diff --git a/addons/project_timesheet/project_timesheet.py b/addons/project_timesheet/project_timesheet.py index 7963c30b2be..cd0c64b2d06 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 !'), 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 @@ resource.resource tree,form {} + [('resource_type','=','user')] 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.