diff options
| author | Raphaël Valyi <rvalyi@gmail.com> | 2010-07-14 14:38:05 -0300 |
|---|---|---|
| committer | Raphaël Valyi <rvalyi@gmail.com> | 2010-07-14 14:38:05 -0300 |
| commit | dd61b8576bd0060a4cc4711dfac7d4b09ba42e6e (patch) | |
| tree | 6f9cf31b130b5f406c11b3ddd1cf4122520836fe /addons/project_long_term | |
| parent | 36e5bb3c39f177514e441e9fdde76cd72568e129 (diff) | |
| parent | 0f74edc455e7ed12e4c98a6c9311e91290b9ef70 (diff) | |
[merge]
bzr revid: rvalyi@gmail.com-20100714173805-d3hm1z0snbm5ovqq
Diffstat (limited to 'addons/project_long_term')
| -rw-r--r-- | addons/project_long_term/project_long_term.py | 8 | ||||
| -rw-r--r-- | addons/project_long_term/project_long_term_view.xml | 14 |
2 files changed, 19 insertions, 3 deletions
diff --git a/addons/project_long_term/project_long_term.py b/addons/project_long_term/project_long_term.py index 2e86426401d..0ecdcc69a2e 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 = [ @@ -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%)"), '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'), diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml index 6fb26c26fe6..323f81b795e 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> |