diff options
| author | Raphaël Valyi <rvalyi@gmail.com> | 2010-07-25 13:58:26 -0300 |
|---|---|---|
| committer | Raphaël Valyi <rvalyi@gmail.com> | 2010-07-25 13:58:26 -0300 |
| commit | 3bc25fb07ef8aa959d2c7df0b9515e6a3147c0c9 (patch) | |
| tree | a8adcd7b3ad47bab353fcf6a50b11aa6f958b1d6 /addons/project_long_term | |
| parent | 75308e6eb954ec110410a95d732b2939fb9ca73e (diff) | |
[REF] clean up before merge (clean double work diffs)
bzr revid: rvalyi@gmail.com-20100725165826-etg68lktjnt9ih5l
Diffstat (limited to 'addons/project_long_term')
| -rw-r--r-- | addons/project_long_term/project_long_term.py | 2 | ||||
| -rw-r--r-- | addons/project_long_term/project_long_term_view.xml | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/addons/project_long_term/project_long_term.py b/addons/project_long_term/project_long_term.py index fc1fea91311..9371232745b 100644 --- a/addons/project_long_term/project_long_term.py +++ b/addons/project_long_term/project_long_term.py @@ -252,8 +252,6 @@ class project_resource_allocation(osv.osv): 'phase_id_date_start': fields.related('phase_id', 'date_start', type='date', string='Starting Date of the phase'), 'phase_id_date_end': fields.related('phase_id', 'date_end', type='date', string='Ending Date of the phase'), '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, diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml index b338a5bd37a..7d51f79530a 100644 --- a/addons/project_long_term/project_long_term_view.xml +++ b/addons/project_long_term/project_long_term_view.xml @@ -332,4 +332,4 @@ <menuitem action="resource.action_resource_calendar_leave_tree" id="menu_view_resource_calendar_leaves" parent="menu_pm_resources_project1" sequence="1"/> </data> -</openerp>
\ No newline at end of file +</openerp> |