<field name="name">Project</field>
</record>
+ <!-- Editable My task -->
<record id="view_task_tree" model="ir.ui.view">
<field name="name">project.task.tree</field>
<field name="model">project.task</field>
<field name="type">tree</field>
<field eval="99" name="priority"/>
<field name="arch" type="xml">
- <tree colors="red:date_deadline<current_date;blue:date_deadline==current_date;black:date_deadline>current_date" string="My Tasks">
+ <tree editable="top" colors="red:date_deadline<current_date;blue:date_deadline==current_date;black:date_deadline>current_date" string="My Tasks">
<field name="name"/>
<field name="project_id"/>
<field name="date_deadline"/>
- <field name="planned_hours"/>
- <field name="effective_hours"/>
<field name="priority"/>
+ <field name="planned_hours" widget="float_time"/>
+ <field name="effective_hours" widget="float_time"/>
+ <field name="progress" widget="progressbar"/>
+ <field name="state" invisible="context.get('set_visible',False)"/>
+ <button name="do_cancel" states="draft,open,pending" string="Cancel" type="object" icon="gtk-cancel" help="For cancelling the task"/>
+ <button name="do_open" states="pending,draft,done,cancel" string="Start Task" type="object" icon="gtk-execute" help="For changing to open state" invisible="context.get('set_visible',False)"/>
+ <button groups="base.group_extended" name="%(action_project_task_delegate)d" states="pending,open,draft" string="Delegate" type="action" icon="gtk-sort-descending" help="For changing to delegate state"/>
+ <button name="action_close" states="draft,pending,open" string="Done" type="object" icon="terp-dialog-close" help="For changing to done state"/>
</tree>
</field>
</record>
- <!-- Editable My task -->
- <record id="view_task_tree" model="ir.ui.view">
- <field name="name">project.task.tree</field>
+
+ <record id="view_delegated_task_tree" model="ir.ui.view">
+ <field name="name">project.task.delegated.tree</field>
<field name="model">project.task</field>
<field name="type">tree</field>
<field eval="99" name="priority"/>
<field name="arch" type="xml">
- <tree editable="top" colors="red:date_deadline<current_date;blue:date_deadline==current_date;black:date_deadline>current_date" string="My Tasks">
+ <tree colors="red:date_deadline<current_date" string="My Delegated Tasks">
<field name="name"/>
<field name="project_id"/>
+ <field name="delegated_user_id"/>
<field name="date_deadline"/>
- <field name="planned_hours"/>
- <field name="effective_hours"/>
- <field name="priority"/>
+ <field name="total_hours" widget="float_time"/>
+ <field name="progress" widget="progressbar"/>
+ <field name="state" invisible="context.get('set_visible',False)"/>
+ <button name="do_cancel" states="draft,open,pending" string="Cancel" type="object" icon="gtk-cancel" help="For cancelling the task"/>
+ <button name="do_open" states="pending,draft,done,cancel" string="Start Task" type="object" icon="gtk-execute" help="For changing to open state" invisible="context.get('set_visible',False)"/>
+ <button name="action_close" states="draft,pending,open" string="Done" type="object" icon="gtk-apply" help="For changing to done state"/>
</tree>
</field>
</record>
+
+
<record id="action_view_task_tree" model="ir.actions.act_window">
<field name="name">My Open Tasks</field>
<field name="res_model">project.task</field>
<field name="domain">[('user_id','=',uid),('state','=','open')]</field>
<field name="view_id" ref="view_task_tree"/>
</record>
- <record id="action_view_pending_task_tree" model="ir.actions.act_window">
- <field name="name">My Pending Tasks</field>
+
+ <record id="action_view_delegate_task_tree" model="ir.actions.act_window">
+ <field name="name">My Delegated Tasks</field>
<field name="res_model">project.task</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
- <field name="domain">[('user_id','=',uid),('state','=','pending')]</field>
- <field name="view_id" ref="view_task_tree"/>
+ <field name="domain">[('parent_ids.user_id','=',uid),('state', 'in', ('draft','open','pending'))]</field>
+ <field name="view_id" ref="view_delegated_task_tree"/>
</record>
+
<record id="action_view_task_tree_deadline" model="ir.actions.act_window">
<field name="name">My Task's Deadlines</field>
<field name="res_model">project.task</field>
<field name="view_mode">tree,form</field>
<field name="domain">[('type','=','Project')]</field>
</record>
-
- <!--Actions for deshboard -->
-
- <record id="action_view_project_editable_messages_tree" model="ir.actions.act_window">
- <field name="name">Messages</field>
- <field name="res_model">project.message</field>
- <field name="view_type">form</field>
- <field name="view_mode">tree,form</field>
- <field name="view_id" ref="project.view_project_message_tree"/>
- </record>
-
-<!-- <record id="action_view_project_member_tree" model="ir.actions.act_window">
- <field name="name">Project's Members</field>
- <field name="res_model">resource.resource</field>
- <field name="view_type">form</field>
- <field name="view_mode">tree,form</field>
- <field name="domain">[('resource_type','=','user')]</field>
- <field name="view_id" ref="resource.resource_resource_tree"/>
- </record>-->
-
<record id="board_project_form" model="ir.ui.view">
<field name="name">board.project.form</field>
<field name="model">board.board</field>
<form string="My Board">
<hpaned>
<child1>
- <action colspan="4" name="%(action_view_task_tree)d" string="My Open Tasks" width="510"/>
- <action colspan="4" name="%(action_view_pending_task_tree)d" string="My Pending Tasks" width="510"/>
- </child1>
+ <action colspan="4" height="100" name="%(action_view_task_tree)d" string="My Open Tasks" width="510"/>
+ <action colspan="4" height="100" name="%(action_view_delegate_task_tree)d" string="My Delegated Tasks" width="510"/>
+ </child1>
<child2>
- <vpaned>
- <child1>
- <action colspan="4" name="%(project.action_project_vs_remaining_hours_graph)d" string="Remaining Hours Per Project" />
- </child1>
- <child2>
- <action colspan="4" name="%(project.action_task_by_days_vs_planned_hours_graph)d" string="Planned Hours Per Day" />
- </child2>
- </vpaned>
+ <action colspan="4" height="100" name="%(project.action_project_vs_planned_total_hours_graph)d" string="My Projects: Planned vs Total Hours" />
+ <action colspan="4" height="100" name="%(project.action_project_vs_remaining_hours_graph)d" string="My Remaining Hours by Project" />
</child2>
</hpaned>
</form>
<field name="usage">menu</field>
<field name="view_id" ref="board_project_form"/>
</record>
- <menuitem icon="terp-graph" id="base.dashboard" name="Dashboards" sequence="2" parent="base.reporting_menu"/>
+
<menuitem
id="next_id_86"
- name="Project"
- parent="base.dashboard"/>
+ name="Dashboard"
+ sequence="0"
+ parent="base.menu_project_report"/>
+
<menuitem
action="open_board_project"
icon="terp-graph"
id="menu_board_project"
parent="next_id_86"
sequence="1"/>
+
+ <menuitem
+ icon="terp-project" id="base.menu_main_pm"
+ name="Project" sequence="10" action="open_board_project"/>
+
</data>
</openerp>
projects / odoo / odoo.git / blobdiff