diff options
| author | Mustufa Rangwala <mra@mra-laptop> | 2010-07-15 09:02:43 +0530 |
|---|---|---|
| committer | Mustufa Rangwala <mra@mra-laptop> | 2010-07-15 09:02:43 +0530 |
| commit | e882dd1177aae0ce5bcffaaa4ba59436d417cbe0 (patch) | |
| tree | 8b574ad238f592433e74e8ec76ea93aabe813d00 /addons/project_long_term | |
| parent | ba0d8c7e7eafd2b20b8812afbe3602b356e9b581 (diff) | |
| parent | 70860df207440f3d638ba43bfb28f643c33ca933 (diff) | |
[MERGE] Merge with main branch
bzr revid: mra@mra-laptop-20100714072332-7ycx327rn1jogv68
bzr revid: mra@mra-laptop-20100714092142-9kdl5qtzs3cuc2o1
bzr revid: mra@mra-laptop-20100714110809-p0yvxwry1ra1v6ek
bzr revid: mra@mra-laptop-20100714130841-hoaenqsigi2bx9ce
bzr revid: mra@mra-laptop-20100715033243-5swxnpy11l3m02b2
Diffstat (limited to 'addons/project_long_term')
| -rw-r--r-- | addons/project_long_term/project_long_term.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/addons/project_long_term/project_long_term.py b/addons/project_long_term/project_long_term.py index f1b4ab804c9..e1233bc413e 100644 --- a/addons/project_long_term/project_long_term.py +++ b/addons/project_long_term/project_long_term.py @@ -93,8 +93,8 @@ class project_phase(osv.osv): _columns = { 'name': fields.char("Name", size=64, required=True), - 'date_start': fields.datetime('Start Date', help="Starting Date of the phase"), - 'date_end': fields.datetime('End Date', help="Ending Date of the phase"), + 'date_start': fields.date('Start Date', help="Starting Date of the phase"), + 'date_end': fields.date('End Date', help="Ending Date of the phase"), 'constraint_date_start': fields.datetime('Start Date', help='force the phase to start after this date'), 'constraint_date_end': fields.datetime('End Date', help='force the phase to finish before this date'), 'project_id': fields.many2one('project.project', 'Project', required=True), @@ -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 = [ |