[MERGE]:project

bzr revid: apa@tinyerp.com-20121025095923-yw7r0pqd5mhz4t6b

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)

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 !'),

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>