diff options
| author | nel@tinyerp.com <> | 2010-06-02 14:36:20 +0200 |
|---|---|---|
| committer | nel@tinyerp.com <> | 2010-06-02 14:36:20 +0200 |
| commit | e77be4ba2e88ff069f8d9b4f679be0414751be05 (patch) | |
| tree | 12f845f3929f8993c2d1a2368e9a02895d163590 /addons/project_long_term/wizard | |
| parent | e4dde6638e305400232ebe4df0f132f0896e8dd6 (diff) | |
| parent | 4fd3157f4bbb35987f5f4edc39b584eb3a313049 (diff) | |
[MERGE]
bzr revid: nel@tinyerp.com-20100602123620-t2jta52ime913zq3
Diffstat (limited to 'addons/project_long_term/wizard')
4 files changed, 30 insertions, 18 deletions
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 4b4e01a72a9..0a3b2e12336 100644 --- a/addons/project_long_term/wizard/project_compute_phases_view.xml +++ b/addons/project_long_term/wizard/project_compute_phases_view.xml @@ -8,16 +8,22 @@ <field name="type">form</field> <field name="arch" type="xml"> <form string="Compute Scheduling of Phases"> - <field name="target_project" /> - <newline /> - <group colspan="4" col="6" attrs="{'invisible':[('target_project','=','all')]}"> - <field name="project_id"/> - </group> - <separator colspan="4"/> - <group colspan="4" col="6"> <!-- Improve me --> - <button icon="gtk-cancel" special="cancel" string="_Cancel"/> - <button icon="gtk-ok" name="check_selection" string="_Compute" type="object"/> - </group> + <group height="170" width="500"> + <group colspan="4" col="4"> + <label colspan="4" string="This wizard will schedule phases for all or specified project" /> + <newline /> + <field name="target_project" colspan="4"/> + </group> + <newline /> + <group colspan="4" col="6" attrs="{'invisible':[('target_project','=','all')]}"> + <field name="project_id"/> + </group> + <separator colspan="4"/> + <group colspan="4" col="6"> <!-- Improve me --> + <button icon="gtk-cancel" special="cancel" string="_Cancel"/> + <button icon="gtk-ok" name="check_selection" string="_Compute" type="object"/> + </group> + </group> </form> </field> </record> @@ -34,7 +40,7 @@ </record> <menuitem id="menu_compute_phase" name="Compute Phase Scheduling" - parent="base.menu_pm_planning" action="action_project_compute_phases"/> + parent="menu_phase_schedule" action="action_project_compute_phases"/> </data> </openerp>
\ No newline at end of file diff --git a/addons/project_long_term/wizard/project_compute_tasks.py b/addons/project_long_term/wizard/project_compute_tasks.py index b86f9d862c9..9f2eb707c60 100644 --- a/addons/project_long_term/wizard/project_compute_tasks.py +++ b/addons/project_long_term/wizard/project_compute_tasks.py @@ -136,7 +136,7 @@ class project_compute_tasks(osv.osv_memory): 'user_id': user_id[0]}, context=ctx) loop_no +=1 - return {} #improve me => Task Scheduling completed successfully => give this msg at end of wizard + return {} project_compute_tasks() # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file 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 3b03f20fe1e..c89c83b3058 100644 --- a/addons/project_long_term/wizard/project_compute_tasks_view.xml +++ b/addons/project_long_term/wizard/project_compute_tasks_view.xml @@ -8,7 +8,11 @@ <field name="type">form</field> <field name="arch" type="xml"> <form string="Compute Scheduling of Phases"> - <field name="project_id"/> + <group colspan="4" col="4"> + <label colspan="4" string="This wizard will schedule start date, end date, and assign user to tasks for specified project" /> + <newline /> + <field colspan="4" name="project_id"/> + </group> <group colspan="4" col="6"> <button icon="gtk-cancel" special="cancel" string="_Cancel"/> <button icon="gtk-ok" name="compute_date" string="Compute" type="object"/> @@ -29,7 +33,7 @@ </record> <menuitem id="menu_compute_tasks" name="Compute Task Scheduling" - parent="base.menu_pm_planning" action="action_project_compute_tasks"/> + parent="menu_phase_schedule" action="action_project_compute_tasks"/> </data> </openerp>
\ No newline at end of file diff --git a/addons/project_long_term/wizard/project_schedule_tasks_view.xml b/addons/project_long_term/wizard/project_schedule_tasks_view.xml index 1011f366aa5..f17d573185d 100644 --- a/addons/project_long_term/wizard/project_schedule_tasks_view.xml +++ b/addons/project_long_term/wizard/project_schedule_tasks_view.xml @@ -8,10 +8,12 @@ <field name="type">form</field> <field name="arch" type="xml"> <form string="Schedule Tasks"> - <label string="Task Scheduling completed successfully."/> - <group colspan="4" col="6"> - <button icon="gtk-ok" colspan="4" special="cancel" string="_Ok"/> - </group> + <group height="90" width="250"> + <label string="Task Scheduling completed successfully."/> + <group colspan="4" col="6"> + <button icon="gtk-ok" colspan="4" special="cancel" string="_Ok"/> + </group> + </group> </form> </field> </record> |