diff options
| author | Purnendu Singh (OpenERP) <psi@tinyerp.com> | 2012-06-19 10:31:00 +0530 |
|---|---|---|
| committer | Purnendu Singh (OpenERP) <psi@tinyerp.com> | 2012-06-19 10:31:00 +0530 |
| commit | 2e3728db210cdfc8c69029dce9da5ce1ff300bc8 (patch) | |
| tree | da04e9f28f53653f756178683e70dc97455f4c38 /addons/project_long_term | |
| parent | d75a9c002333296b2f8fcd232d6555399ed0e0c3 (diff) | |
| parent | 8662748bf6950735f1e6236b973fbf3c35cc33d3 (diff) | |
[MERGE] merge with main addons
bzr revid: psi@tinyerp.com-20120619050100-26hsypt5z491kbje
Diffstat (limited to 'addons/project_long_term')
4 files changed, 3 insertions, 5 deletions
diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml index 3286e9a4c3d..f2901ad7650 100644 --- a/addons/project_long_term/project_long_term_view.xml +++ b/addons/project_long_term/project_long_term_view.xml @@ -213,7 +213,7 @@ </group> </group> <separator string="Force Assigned Users"/> - <field name="user_force_ids"/> + <field name="user_force_ids" widget="many2many_tags" /> <separator string="Previous Phases"/> <field name="previous_phase_ids"/> <separator string="Next Phases"/> diff --git a/addons/project_long_term/wizard/project_compute_phases.py b/addons/project_long_term/wizard/project_compute_phases.py index 4a66cecf9cd..85ab158e0b2 100644 --- a/addons/project_long_term/wizard/project_compute_phases.py +++ b/addons/project_long_term/wizard/project_compute_phases.py @@ -28,7 +28,7 @@ class project_compute_phases(osv.osv_memory): 'target_project': fields.selection([ ('all', 'Compute All My Projects'), ('one', 'Compute a Single Project'), - ], 'Schedule', required=True), + ], 'Action', required=True), 'project_id': fields.many2one('project.project', 'Project') } _defaults = { diff --git a/addons/project_long_term/wizard/project_compute_phases_view.xml b/addons/project_long_term/wizard/project_compute_phases_view.xml index bf2c51e41e6..37c7256cb7c 100644 --- a/addons/project_long_term/wizard/project_compute_phases_view.xml +++ b/addons/project_long_term/wizard/project_compute_phases_view.xml @@ -10,9 +10,8 @@ <form string="Schedule Phases" version="7.0"> <header> <button icon="gtk-ok" name="check_selection" string="C_ompute" type="object"/> - <button icon="gtk-cancel" special="cancel" string="_Cancel"/> </header> - <group string="Schedule Phases"> + <group> <field name="target_project"/> <field name="project_id" attrs="{'invisible':[('target_project','=','all')], 'required':[('target_project','!=','all')]}"/> </group> diff --git a/addons/project_long_term/wizard/project_compute_tasks_view.xml b/addons/project_long_term/wizard/project_compute_tasks_view.xml index ac30a3aa6d9..3ceac7e9a9e 100644 --- a/addons/project_long_term/wizard/project_compute_tasks_view.xml +++ b/addons/project_long_term/wizard/project_compute_tasks_view.xml @@ -10,7 +10,6 @@ <form string="Schedule Tasks" version="7.0"> <header> <button icon="gtk-ok" name="compute_date" string="C_ompute" type="object"/> - <button icon="gtk-cancel" special="cancel" string="_Cancel"/> </header> <group> <field name="project_id"/> |