diff options
Diffstat (limited to 'addons/project/project_view.xml')
| -rw-r--r-- | addons/project/project_view.xml | 188 |
1 files changed, 58 insertions, 130 deletions
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml index c7cfee65d20..cee6d9ac2e2 100644 --- a/addons/project/project_view.xml +++ b/addons/project/project_view.xml @@ -30,11 +30,11 @@ <field name="arch" type="xml"> <form string="Project"> <group colspan="6" col="6"> - <field name="name" select="1"/> - <field name="parent_id"/> - <field name="manager" select="1"/> + <field name="name" string="Project Name" select="1"/> + <field name="parent_id" string="Parent Project"/> + <field name="user_id" string="Project Manager" select="1"/> <field name="date_start"/> - <field name="date_end"/> + <field name="date"/> <field name="progress_rate" widget="progressbar"/> </group> <notebook colspan="4"> @@ -42,14 +42,14 @@ <field name="warn_manager"/> <field name="company_id" select="1" groups="base.group_multi_company" widget="selection"/> <field name="priority"/> - <field name="timesheet_id"/> + <field name="resource_calendar_id"/> <field name="active" select="2"/> <field name="planned_hours" widget="float_time"/> <field name="effective_hours" widget="float_time"/> - <field name="category_id" select="2" context="{'default_name':name}"/> + <newline/> <separator colspan="4" string="Project's members"/> - <field colspan="4" name="members" nolabel="1"/> + <field colspan="4" name="resource_ids" nolabel="1"/> <group col="9" colspan="8"> <field name="state" select="1"/> <button name="set_template" string="Set as Template" type="object" states="open" icon="gtk-convert"/> @@ -83,25 +83,12 @@ <label string="Date Stop: %%(date_stop)s"/> </group> </page> - <page string="Tasks"> - <field name="tasks" nolabel="1" attrs="{'readonly':[('state','in',['cancelled','done'])]}"> - <tree colors="grey:state in ('cancelled','done');blue:remaining_hours<0;red:bool(date_deadline) and (date_deadline<current_date) and (state in ('draft','open'));black:state not in ('cancelled','done')" string="Tasks"> - <!-- <tree string="Tasks">--> - <field name="sequence"/> - <field name="name"/> - <field name="user_id"/> - <field name="date_deadline"/> - <field name="planned_hours" sum="Planned" widget="float_time"/> - <field name="delay_hours" sum="Delay" widget="float_time"/> - <field name="progress" widget="progressbar"/> - <field name="priority"/> - <field name="state"/> - <field name="remaining_hours" invisible="1"/> - </tree> - </field> + <page string="Tasks" groups="base.group_extended"> + <separator string="Task Types"/> + <field nolabel="1" name="type_ids" colspan="4"/> </page> <page string="Notes"> - <field colspan="4" name="notes" nolabel="1"/> + <field colspan="4" name="description" nolabel="1"/> </page> </notebook> <newline/> @@ -115,9 +102,9 @@ <field name="priority" eval="5"/> <field name="arch" type="xml"> <tree string="Projects"> - <field name="complete_name"/> - <field name="manager"/> - <field name="partner_id"/> + <field name="complete_name" string="Project Name"/> + <field name="user_id" string="Project Manager"/> + <field name="partner_id" string="Partner"/> <field name="effective_hours" widget="float_time"/> <field name="total_hours" widget="float_time"/> <field name="state"/> @@ -132,11 +119,11 @@ <field name="arch" type="xml"> <search string="Search Project"> <group col='8' colspan='4'> - <filter icon="terp-project" string="My Projects" domain="[('manager', '=', uid)]" help="My Projects"/> + <filter icon="terp-project" string="My Projects" domain="[('user_id', '=', uid)]" help="My Projects"/> <filter icon="terp-project" string="Templates" domain="[('state','=','template')]" help="Template Projects"/> <separator orientation="vertical"/> - <field name="name" select='1'/> - <field name="partner_id" select='1'/> + <field name="name" string="Project Name" select='1'/> + <field name="partner_id" string="Partner" select='1'/> <field name="state" select="1"/> </group> </search> @@ -147,12 +134,12 @@ <field name="name">project.project.tree</field> <field name="model">project.project</field> <field name="type">tree</field> - <field name="field_parent">child_id</field> + <field name="field_parent">child_ids</field> <field name="arch" type="xml"> <tree string="Projects"> - <field name="name"/> - <field name="manager"/> - <field name="partner_id"/> + <field name="name" string="Project Name"/> + <field name="user_id" string="Project Manager"/> + <field name="partner_id" string="Partner"/> <field name="planned_hours" widget="float_time"/> <field name="total_hours" widget="float_time"/> <field name="effective_hours" widget="float_time"/> @@ -216,11 +203,11 @@ <field name="name">project.project.tree</field> <field name="model">project.project</field> <field name="type">tree</field> - <field name="field_parent">child_id</field> + <field name="field_parent">child_ids</field> <field name="arch" type="xml"> <tree string="My projects"> - <field name="name"/> - <field name="partner_id"/> + <field name="name" string="Project Name"/> + <field name="partner_id" string="Partner"/> <field name="planned_hours" widget="float_time"/> <field name="effective_hours" widget="float_time"/> <field name="progress_rate" widget="progressbar"/> @@ -281,7 +268,10 @@ <field name="name" select="1"/> <field name="project_id" required="1" select="1"/> <field name="total_hours" widget="float_time"/> + <field name="date_start"/> <field name="date_deadline" select="2"/> + <field name="occupation_rate"/> + <field name="date_end"/> <field name="user_id" select="1"/> <field name="progress" widget="progressbar"/> </group> @@ -292,7 +282,7 @@ name="planned_hours" widget="float_time" attrs="{'readonly':[('state','!=','draft')]}" - on_change="onchange_planned(planned_hours,effective_hours)"/> + on_change="onchange_planned(planned_hours,effective_hours,date_start,occupation_rate)"/> <field name="remaining_hours" select="2" widget="float_time" attrs="{'readonly':[('state','!=','draft')]}" colspan="2"/> <button name="%(action_config_compute_remaining)d" string="Review" type="action" colspan="1" target="new" states="open,pending" icon="gtk-edit"/> </group> @@ -304,10 +294,10 @@ <field colspan="4" name="description" nolabel="1" select="2" attrs="{'readonly':[('state','=','done')]}" widget="text_wiki"/> <field colspan="4" name="work_ids" nolabel="1" attrs="{'readonly':[('state','in',['draft','done'])]}"> <tree string="Task Work" editable="top"> - <field name="date" /> - <field name="user_id" /> - <field name="hours" widget="float_time" /> <field name="name" /> + <field name="hours" widget="float_time" /> + <field name="user_id" /> + <field name="date" /> </tree> </field> <newline/> @@ -320,12 +310,12 @@ <button groups="base.group_extended" name="%(wizard_delegate_task)d" states="pending,open" string="Delegate" type="action" icon="gtk-sort-descending"/> <button name="%(wizard_close_task)d" states="pending,open" string="Done" type="action" icon="gtk-jump-to"/> <button name="do_cancel" states="draft,open,pending" string="Cancel" type="object" icon="gtk-cancel"/> - </group> </page> <page groups="base.group_extended" string="Delegations"> - <field name="parent_id"/> - <newline/> + <separator string="Parent Tasks" colspan="4"/> + <field colspan="4" height="150" name="parent_ids" nolabel="1"/> + <separator string="Delegated tasks" colspan="4"/> <field colspan="4" height="150" name="child_ids" nolabel="1" attrs="{'readonly':[('state','!=','draft')]}"> <tree string="Delegated tasks"> <field name="name"/> @@ -339,6 +329,7 @@ </field> <field colspan="4" name="history" nolabel="1"/> </page> + <page groups="base.group_extended" string="Extra Info" attrs="{'readonly':[('state','=','done')]}"> <group colspan="2" col="2"> <separator string="Planning" colspan="2"/> @@ -347,14 +338,17 @@ </group> <group colspan="2" col="2"> <separator string="Dates" colspan="2"/> - <field name="date_start" select="2"/> <field name="date_close" select="2"/> </group> <separator string="Miscelleanous" colspan="4"/> - <field name="type" widget="selection"/> + <field name="partner_id" select="2"/> <field name="company_id" select="1" groups="base.group_multi_company" widget="selection"/> + <group col="4" colspan="2"> + <field name="type" widget="selection" /> + <button name="prev_type" string="Previous" type="object" icon="gtk-go-back" help="Change to Previous Type"/> + <button name="next_type" string="Next" type="object" icon="gtk-go-forward" help="Change to Next Type"/> + </group> <field name="active" select="2"/> - <field name="partner_id" select="2"/> <separator colspan="4" string="Notes"/> <field colspan="4" name="notes" nolabel="1"/> </page> @@ -369,12 +363,14 @@ <field eval="2" name="priority"/> <field name="arch" type="xml"> <tree colors="grey:state in ('cancelled','done');blue:remaining_hours<0;red:bool(date_deadline) and (date_deadline<current_date) and (state in ('draft','open'));black:state not in ('cancelled','done')" string="Tasks"> - <field name="sequence" string="Seq."/> + <field name="sequence" invisible="1"/> <field name="name"/> <field name="project_id" icon="gtk-indent"/> <field name="user_id"/> <field name="date_deadline"/> <field name="remaining_hours" widget="float_time"/> + <field name="type"/> + <button name="next_type" states="draft,open,pending" string="Change Type" type="object" icon="gtk-go-forward" help="Change Type"/> <field name="progress" widget="progressbar"/> <field name="state"/> <button name="do_open" states="pending,draft" string="Start Task" type="object" icon="gtk-execute" help="For changing to open state"/> @@ -474,19 +470,21 @@ <field name="type">search</field> <field name="arch" type="xml"> <search string="Task Edition"> - <group col="8" colspan="4"> + <group col="20" colspan="4"> + <filter string="By Users" icon="terp-project" domain="[]" context="{'group_by':'user_id'}"/> + <filter string="By Project" icon="terp-project" domain="[]" context="{'group_by':'project_id'}"/> + <filter string="By Type" icon="terp-project" domain="[]" context="{'group_by':'type'}"/> + <separator orientation="vertical"/> <filter string="Draft" domain="[('state','=','draft')]" help="Draft Tasks" icon="terp-project"/> - <filter string="Open" domain="[('state','=','open')]" help="Open Tasks" icon="terp-project"/> + <filter string="In Progress" domain="[('state','=','open')]" help="Open Tasks" icon="terp-project"/> <filter string="Pending" domain="[('state','=','pending')]" help="Pending Tasks" icon="terp-project"/> <separator orientation="vertical"/> <field name="name" select="1"/> <field name="project_id" select="1" widget="selection"> <filter domain="[('manager_id','=',False)]" help="Unassigned Project" icon="terp-project"/> </field> - </group> - <group col="4" colspan="1"> <field name="user_id" select="1" widget="selection"> - <filter domain="[('user_id','=',uid)]" help="My Tasks" icon="gtk-execute"/> + <filter domain="[('user_id','=',uid)]" help="My Tasks" icon="gtk-execute" default="1"/> <filter domain="[('user_id','=',False)]" help="Unassigned Tasks" icon="gtk-execute" separator="1"/> </field> </group> @@ -495,70 +493,18 @@ </record> <record id="action_view_task" model="ir.actions.act_window"> - <field name="name">All Tasks</field> + <field name="name">Tasks</field> <field name="res_model">project.task</field> <field name="view_type">form</field> <field name="view_mode">tree,form,calendar,gantt,graph</field> <field eval="False" name="view_id"/> <field eval="True" name="filter"/> + <field name="view_id" ref="view_task_tree2"/> <field name="search_view_id" ref="view_task_search_form"/> </record> <!--<menuitem action="action_view_task" id="menu_action_view_task" parent="project.menu_tasks"/> --> <menuitem action="action_view_task" id="menu_action_view_task" parent="project.menu_project_management" name="Tasks"/> - <record id="action_view_task_department" model="ir.actions.act_window"> - <field name="name">My Department Tasks</field> - <field name="res_model">project.task</field> - <field name="view_type">form</field> - <field name="view_mode">tree,form,calendar,gantt,graph</field> - <field eval="True" name="filter"/> - <field name="domain">[('user_id', 'child_of', [uid])]</field> - <field eval="True" name="filter"/> - <field name="search_view_id" ref="view_task_search_form"/> - </record> - - <record id="action_view_task5_departments_pending" model="ir.actions.act_window"> - <field name="name">My Department's Pending Tasks</field> - <field name="res_model">project.task</field> - <field name="view_type">form</field> - <field name="view_mode">tree,form,calendar,graph</field> - <field name="domain">[('user_id', 'child_of', [uid]),('state','=','pending')]</field> - <field name="view_id" ref="my_pending_task"/> - <field name="filter" eval="True"/> - <field name="search_view_id" ref="view_task_search_form"/> - </record> - - <record id="action_view_task5_departments_prog" model="ir.actions.act_window"> - <field name="name">My Department's Current Tasks</field> - <field name="res_model">project.task</field> - <field name="view_type">form</field> - <field name="view_mode">tree,form,calendar,graph</field> - <field eval="True" name="filter"/> - <field name="domain">[('user_id', 'child_of', [uid]),('state','in',('open','draft'))]</field> - <field name="filter" eval="True"/> - <field name="search_view_id" ref="view_task_search_form"/> - </record> - - <record id="action_view_task5_departments_prog_prog" model="ir.actions.act_window"> - <field name="name">My Department's Tasks in Progress</field> - <field name="res_model">project.task</field> - <field name="view_type">form</field> - <field name="view_mode">tree,form,calendar,graph</field> - <field name="domain">[('user_id', 'child_of', [uid]),('state','=','open')]</field> - <field name="filter" eval="True"/> - <field name="search_view_id" ref="view_task_search_form"/> - </record> - - <record id="action_view_task5_departments_prog_draft" model="ir.actions.act_window"> - <field name="name">My Department's Draft Tasks</field> - <field name="res_model">project.task</field> - <field name="view_type">form</field> - <field name="view_mode">tree,form,calendar,graph</field> - <field name="domain">[('user_id', 'child_of', [uid]),('state','=','draft')]</field> - <field name="filter" eval="True"/> - <field name="search_view_id" ref="view_task_search_form"/> - </record> - <record id="action_view_task_overpassed_draft" model="ir.actions.act_window"> <field name="name">Overpassed Tasks</field> <field name="res_model">project.task</field> @@ -569,26 +515,6 @@ <field name="search_view_id" ref="view_task_search_form"/> </record> - <record id="action_view_task6_prog" model="ir.actions.act_window"> - <field name="name">Tasks in Progress</field> - <field name="res_model">project.task</field> - <field name="view_type">form</field> - <field name="view_mode">tree,form,calendar,graph,gantt</field> - <field name="filter" eval="True"/> - <field name="search_view_id" ref="view_task_search_form"/> - <field name="domain">[('state','=','open')]</field> - </record> -menu_main - <record id="action_view_task7" model="ir.actions.act_window"> - <field name="name">Unassigned Tasks</field> - <field name="res_model">project.task</field> - <field name="view_type">form</field> - <field name="view_mode">tree,form,calendar,graph,gantt</field> - <field name="domain">[('user_id', '=', False)]</field> - <field name="filter" eval="True"/> - <field name="search_view_id" ref="view_task_search_form"/> - </record> - <!-- Opening task when double clicking on project --> <record id="dblc_proj" model="ir.actions.act_window"> <field name="res_model">project.task</field> @@ -613,7 +539,8 @@ menu_main <field name="type">form</field> <field name="arch" type="xml"> <form string="Task type"> - <field colspan="4" name="name" select="1"/> + <field name="name" select="1"/> + <field name="sequence"/> <field colspan="4" name="description" select="1"/> </form> </field> @@ -624,6 +551,7 @@ menu_main <field name="type">tree</field> <field name="arch" type="xml"> <tree string="Task type"> + <field name="sequence"/> <field name="name"/> </tree> </field> @@ -636,7 +564,7 @@ menu_main </record> <menuitem action="open_task_type_form" id="menu_task_types" parent="project.menu_definitions"/> - <act_window domain="[('manager', '=', active_id)]" id="act_res_users_2_project_project" name="User's projects" res_model="project.project" src_model="res.users" view_mode="tree,form" view_type="form"/> + <act_window domain="[('user_id', '=', active_id)]" id="act_res_users_2_project_project" name="User's projects" res_model="project.project" src_model="res.users" view_mode="tree,form" view_type="form"/> <act_window domain="[('project_id', '=', active_id)]" @@ -650,7 +578,7 @@ menu_main <act_window domain="[('project_id', '=', active_id)]" id="act_project_project_2_project_task_all" - name="All Tasks" + name="Tasks" res_model="project.task" src_model="project.project" view_mode="tree,form,calendar,graph" |