diff options
| author | Sanjay Gohel (Open ERP) <sgo@tinyerp.com> | 2012-05-07 15:08:23 +0530 |
|---|---|---|
| committer | Sanjay Gohel (Open ERP) <sgo@tinyerp.com> | 2012-05-07 15:08:23 +0530 |
| commit | c755053d13b6ecb1411c17d080e67704dc7eca8f (patch) | |
| tree | 6fdfe2193fed13409d0857e87bca5825654e220a /addons/project_long_term | |
| parent | c43e5dfe7e57e73d60d5e3ca2320ea52958726b2 (diff) | |
| parent | c7742d6e96f2a0db5d37613ce5010cc075517957 (diff) | |
[MERGE]merge with parent branch
bzr revid: sgo@tinyerp.com-20120507093823-d40xegyx7mko0xja
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, 11 insertions, 11 deletions
diff --git a/addons/project_long_term/project_long_term.py b/addons/project_long_term/project_long_term.py index 7806bc0abb9..582a5ed8ef0 100644 --- a/addons/project_long_term/project_long_term.py +++ b/addons/project_long_term/project_long_term.py @@ -217,7 +217,7 @@ project_user_allocation() class project(osv.osv): _inherit = "project.project" - def _open_phase(self, cr, uid, ids, field_name, arg, context=None): + def _phase_count(self, cr, uid, ids, field_name, arg, context=None): open_phase={} phase_pool=self.pool.get('project.phase') for id in ids: @@ -227,12 +227,12 @@ class project(osv.osv): _columns = { 'phase_ids': fields.one2many('project.phase', 'project_id', "Project Phases"), - 'phases' : fields.boolean('Phase',help = "If you check this field Phases are appears in kanban view"), - 'open_phases' : fields.function(_open_phase , type='integer',string="Open Phases"), + 'use_phases' : fields.boolean('Phase',help = "If you check this field Phases are appears in kanban view"), + 'phase_count' : fields.function(_phase_count , type='integer',string="Open Phases"), } _defaults = { - 'phases' : True, + 'use_phases' : True, } def open_phase(self, cr, uid, ids, context=None): #Open the View for the Tasks for the project diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml index 1f258ff2ead..f5dcb48576d 100644 --- a/addons/project_long_term/project_long_term_view.xml +++ b/addons/project_long_term/project_long_term_view.xml @@ -104,8 +104,8 @@ <field name="type">form</field> <field name="inherit_id" ref="project.edit_project"/> <field name="arch" type="xml"> - <xpath expr="//field[@name='task']" position="after"> - <field name="phases"/> + <xpath expr="//field[@name='use_tasks']" position="after"> + <field name="use_phases"/> </xpath> </field> </record> @@ -116,13 +116,13 @@ <field name="type">kanban</field> <field name="inherit_id" ref="project.view_project_kanban"/> <field name="arch" type="xml"> - <field name="task" position="after"> - <field name="phases"/> - <field name="open_phases"/> + <field name="use_tasks" position="after"> + <field name="use_phases"/> + <field name="phase_count"/> </field> <xpath expr="//div[@id='list']" position="inside"> - <t t-if="record.phases.raw_value"> - <a id="4" name="open_phase" class="oe_project_buttons" type="object"><t t-if="record.open_phases.value <= 1">Phase</t><t t-if="record.open_phases.value > 1">Phases</t>(<t t-esc="record.open_phases.value"/>)</a> + <t t-if="record.use_phases.raw_value"> + <a id="4" name="open_phase" class="oe_project_buttons" type="object"><t t-if="record.phase_count.value <= 1">Phase</t><t t-if="record.phase_count.value > 1">Phases</t>(<t t-esc="record.phase_count.value"/>)</a> </t> </xpath> </field> |