diff options
| author | Ajay Chauhan (OpenERP) <cha@tinyerp.com> | 2012-10-01 14:47:30 +0530 |
|---|---|---|
| committer | Ajay Chauhan (OpenERP) <cha@tinyerp.com> | 2012-10-01 14:47:30 +0530 |
| commit | d2b51d4e149e8542f77fd2a171d0a4498352be2d (patch) | |
| tree | 0e10ae6b0e694692df4260a65f2b7ac88c9573ca /addons/project_long_term | |
| parent | 826e2b8fdbb267efab4feff67e373e0e0c1c1568 (diff) | |
| parent | 3686a01df372b01dcec9a5438ba9b16256895c5e (diff) | |
[MERGE] merge with lp:openobject-addons
bzr revid: cha@tinyerp.com-20121001091730-q6sbcvj7nu53t91h
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, 2 insertions, 2 deletions
diff --git a/addons/project_long_term/project_long_term.py b/addons/project_long_term/project_long_term.py index 5b88d5209c8..b19238200e5 100644 --- a/addons/project_long_term/project_long_term.py +++ b/addons/project_long_term/project_long_term.py @@ -292,7 +292,7 @@ account_analytic_account() class project_task(osv.osv): _inherit = "project.task" _columns = { - 'phase_id': fields.many2one('project.phase', 'Project Phase'), + 'phase_id': fields.many2one('project.phase', 'Project Phase', domain="[('project_id', '=', project_id)]"), } project_task() diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml index 909f838a0f8..69fe335c1b0 100644 --- a/addons/project_long_term/project_long_term_view.xml +++ b/addons/project_long_term/project_long_term_view.xml @@ -102,7 +102,7 @@ <label for="use_phases"/> </xpath> <xpath expr="//div[@name='buttons']" position='inside'> - <button icon="terp-gtk-go-back-rtl" name="%(act_project_phases)d" + <button name="%(act_project_phases)d" string="Phases" type="action" attrs="{'invisible':[('use_phases','=', 0)]}"/> </xpath> |