[merge]

bzr revid: rvalyi@gmail.com-20100710175157-6fesw4ykbsyo2odn

diff --combined addons/project_long_term/project_long_term.py
index 8eaf9c6,f76ab41..2e86426
--- 1/addons/project_long_term/project_long_term.py
--- 2/addons/project_long_term/project_long_term.py
+++ b/addons/project_long_term/project_long_term.py
@@@ -114,7 -114,7 +114,7 @@@ class project_phase(osv.osv)
          'responsible_id': lambda obj,cr,uid,context: uid,
          'state': 'draft',
          'sequence': 10,
-         'product_uom': lambda self,cr,uid,c: self.pool.get('product.uom').search(cr, uid, [('name', '=', 'Day')], context=c)[0]
+         'product_uom': lambda self,cr,uid,c: self.pool.get('product.uom').search(cr, uid, [('name', '=', 'day')], context=c)[0]
      }
      _order = "name"
      _constraints = [
@@@ -248,8 -248,6 +248,8 @@@ class project_resource_allocation(osv.o
          'resource_id': fields.many2one('resource.resource', 'Resource', required=True),
          'phase_id': fields.many2one('project.phase', 'Project Phase', required=True),
          'useability': fields.float('Usability', help="Usability of this resource for this project phase in percentage (=50%)"),
 +        'date_start': fields.related('phase_id', 'date_start', type='datetime', string='Start Date'),
 +        'date_end': fields.related('phase_id', 'date_end', type='datetime', string='End Date'),
      }
      _defaults = {
          'useability': 100,