diff options
| author | Mustufa Rangwala <mra@mra-laptop> | 2010-07-14 10:07:25 +0530 |
|---|---|---|
| committer | Mustufa Rangwala <mra@mra-laptop> | 2010-07-14 10:07:25 +0530 |
| commit | ba0d8c7e7eafd2b20b8812afbe3602b356e9b581 (patch) | |
| tree | 4c665d66993174a2489fea1c2b06d43bed532ed3 /addons/project_long_term | |
| parent | 00add00037641f1367e781a0a0c7532dbc429ff6 (diff) | |
| parent | 7f5a7ed08908fbfdc1689d3a10965c7af0c16cc2 (diff) | |
[MERGE] merge with trunk addons
bzr revid: mra@mra-laptop-20100714043725-jyu8yjqkrwabrotl
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 | 16 |
2 files changed, 17 insertions, 1 deletions
diff --git a/addons/project_long_term/project_long_term.py b/addons/project_long_term/project_long_term.py index f76ab413e23..f1b4ab804c9 100644 --- a/addons/project_long_term/project_long_term.py +++ b/addons/project_long_term/project_long_term.py @@ -247,6 +247,8 @@ class project_resource_allocation(osv.osv): _columns = { 'resource_id': fields.many2one('resource.resource', 'Resource', required=True), 'phase_id': fields.many2one('project.phase', 'Project Phase', required=True), + '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%)"), } _defaults = { diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml index 4170c0064d0..323e0b13fe2 100644 --- a/addons/project_long_term/project_long_term_view.xml +++ b/addons/project_long_term/project_long_term_view.xml @@ -8,6 +8,20 @@ # Project Resource Allocation # ------------------------------------------------------ + <record id="view_project_resource_allocation_gantt" model="ir.ui.view"> + <field name="name">project.resource.allocation.gantt</field> + <field name="model">project.resource.allocation</field> + <field name="type">gantt</field> + <field name="arch" type="xml"> + <gantt color="phase_id" date_start="phase_id_date_start" date_stop="phase_id_date_end" string="R.A."> + <level object="project.resource" link="resource_id" domain="[]"> + <field name="useability"/> + </level> + </gantt> + </field> + </record> + + <record id="view_project_resource_allocation_form" model="ir.ui.view"> <field name="name">project.resource.allocation.form</field> <field name="model">project.resource.allocation</field> @@ -58,7 +72,7 @@ <field name="name">Resource Allocations</field> <field name="res_model">project.resource.allocation</field> <field name="view_type">form</field> - <field name="view_mode">tree,form</field> + <field name="view_mode">gantt,tree,form</field> <field name="context">{'search_default_resource': 1} </field> <!--<field name="search_view_id" ref="view_project_phase_search"/>--> </record> |