diff options
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 | 20 | ||||
| -rw-r--r-- | addons/project_long_term/wizard/project_compute_tasks_view.xml | 14 |
3 files changed, 17 insertions, 19 deletions
diff --git a/addons/project_long_term/project_long_term.py b/addons/project_long_term/project_long_term.py index 95e9099f549..212af8a30dc 100644 --- a/addons/project_long_term/project_long_term.py +++ b/addons/project_long_term/project_long_term.py @@ -93,7 +93,7 @@ class project_phase(osv.osv): 'next_phase_ids': fields.many2many('project.phase', 'project_phase_rel', 'prv_phase_id', 'next_phase_id', 'Next Phases'), 'previous_phase_ids': fields.many2many('project.phase', 'project_phase_rel', 'next_phase_id', 'prv_phase_id', 'Previous Phases'), 'sequence': fields.integer('Sequence', help="Gives the sequence order when displaying a list of phases."), - 'duration': fields.float('Duration', required=True), + 'duration': fields.float('Duration', required=True, help="By default in days"), 'product_uom': fields.many2one('product.uom', 'Duration UoM', required=True, help="UoM (Unit of Measure) is the unit of measurement for Duration"), 'task_ids': fields.one2many('project.task', 'phase_id', "Project Tasks"), 'resource_ids': fields.one2many('project.resource.allocation', 'phase_id', "Project Resources"), diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml index a2ecc604ebe..e681b0da57f 100644 --- a/addons/project_long_term/project_long_term_view.xml +++ b/addons/project_long_term/project_long_term_view.xml @@ -47,7 +47,7 @@ </group> <newline/> <group expand="1" string="Group By..." colspan="4" col="20"> - <filter name="resource" string="Resource" icon="terp-project" domain="[]" context="{'group_by':'resource_id'}"/> + <filter name="resource" string="Resource" icon="terp-folder-blue" domain="[]" context="{'group_by':'resource_id'}"/> <filter string="Phase" icon="terp-project" domain="[]" context="{'group_by':'phase_id'}"/> </group> </search> @@ -102,7 +102,7 @@ <field name="state" select="1"/> <button string="Draft" name="set_draft" states="open" icon="gtk-indent"/> <button string="Start Phase" name="set_open" states="pending,draft" icon="gtk-execute"/> - <button string="Done" name="set_done" states="draft,pending,open" icon="gtk-jump-to"/> + <button string="Done" name="set_done" states="draft,pending,open" icon="gtk-apply"/> <button string="Pending" name="set_pending" states="open" icon="gtk-media-pause"/> <button string="Cancel" name="set_cancel" states="draft,open,pending" icon="gtk-cancel"/> </group> @@ -218,23 +218,23 @@ <field name="arch" type="xml"> <search string="Project Phases"> <group colspan="4" col="20"> - <filter string="Current" domain="[('state','in',('open','draft'))]" help="Draft, Open and Pending Phases" icon="terp-project" default="1"/> - <filter string="In Progress" domain="[('state','=','open')]" help="Open Phases" icon="terp-project"/> - <filter string="Pending" domain="[('state','=','pending')]" help="Pending Phases" icon="terp-project"/> + <filter string="Draft" domain="[('state','=','draft')]" help="Draft Phases" icon="terp-check" default="1"/> + <filter string="In Progress" name="Progress" domain="[('state','=','open')]" help="Open Phases" icon="terp-camera_test"/> + <filter string="Pending" domain="[('state','=','pending')]" help="Pending Phases" icon="terp-gtk-media-pause"/> <separator orientation="vertical"/> <field name="name"/> <field name="project_id" widget="selection"> - <filter domain="[('project_id.user_id','=',uid)]" help="My Projects" icon="terp-project"/> + <filter domain="[('project_id.user_id','=',uid)]" help="My Projects" icon="terp-folder-blue"/> </field> <field name="responsible_id" widget="selection"/> <field name="date_start"/> </group> <newline/> <group expand="1" string="Group By..." colspan="4" col="20" groups="base.group_extended"> - <filter string="Project" icon="terp-project" domain="[]" context="{'group_by':'project_id'}"/> - <filter string="State" icon="terp-project" domain="[]" context="{'group_by':'state'}"/> - <filter string="User" icon="terp-project" domain="[]" context="{'group_by':'responsible_id'}"/> - <filter string="Start Date" icon="terp-project" domain="[]" context="{'group_by':'date_start'}"/> + <filter string="Project" icon="terp-folder-blue" domain="[]" context="{'group_by':'project_id'}"/> + <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/> + <filter string="User" icon="terp-personal" domain="[]" context="{'group_by':'responsible_id'}"/> + <filter string="Start Date" icon="terp-gtk-jump-to-ltr" domain="[]" context="{'group_by':'date_start'}"/> </group> </search> </field> 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 c89c83b3058..eff475b4f11 100644 --- a/addons/project_long_term/wizard/project_compute_tasks_view.xml +++ b/addons/project_long_term/wizard/project_compute_tasks_view.xml @@ -8,15 +8,13 @@ <field name="type">form</field> <field name="arch" type="xml"> <form string="Compute Scheduling of Phases"> - <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"/> + <group colspan="4" height="100" width="500"> + <field name="project_id"/> + <group colspan="4" col="6"> + <button icon="gtk-cancel" special="cancel" string="_Cancel"/> + <button icon="gtk-ok" name="compute_date" string="Compute" type="object"/> </group> + </group> </form> </field> </record> |