<?xml version="1.0" encoding="utf-8"?>
<openerp>
<data>
- <menuitem icon="terp-project" id="base.menu_main_pm" name="Project Management"/>
+ <menuitem icon="terp-project" id="base.menu_main_pm" name="Project Management" sequence="1"/>
<menuitem id="menu_project_management" name="Project Management" parent="base.menu_main_pm" sequence="1"/>
<menuitem id="menu_definitions" name="Configuration" parent="base.menu_main_pm" sequence="60"/>
</group>
<notebook colspan="4">
<page string="Administration">
- <field name="warn_manager"/>
- <field name="company_id" select="1" groups="base.group_multi_company" widget="selection"/>
- <field name="priority"/>
- <field name="resource_calendar_id"/>
- <field name="active" select="2"/>
- <newline/>
- <field name="planned_hours" widget="float_time"/>
- <field name="effective_hours" widget="float_time"/>
+ <group col="2" colspan="2">
+ <separator colspan="2" string="Scheduling"/>
+ <field name="priority"/>
+ <field name="active" select="2"/>
+ </group>
+ <group col="2" colspan="2">
+ <separator colspan="2" string="Performance"/>
+ <field name="planned_hours" widget="float_time"/>
+ <field name="effective_hours" widget="float_time"/>
+ </group>
+ <group col="2" colspan="2" name="misc">
+ <separator colspan="2" string="Miscelleanous"/>
+ <field name="company_id" select="1" groups="base.group_multi_company" widget="selection"/>
+ <field name="warn_manager"/>
+ </group>
<newline/>
<separator colspan="4" string="Project's members"/>
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Search Project">
- <group col='8' colspan='4'>
- <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" string="Project Name" select='1'/>
- <field name="partner_id" string="Partner" select='1'/>
- <field name="state" select="1"/>
+ <group col='15' colspan='4'>
+ <filter icon="terp-project" string="Open" domain="[('state', '=', 'open')]" help="Open Projects" default="1"/>
+ <filter icon="terp-project" string="Pending" domain="[('state', '=', 'pending')]" help="Pending Projects"/>
+ <separator orientation="vertical"/>
+ <filter icon="terp-project" string="Manager" domain="[('user_id', '=', uid)]" help="Projects in which I am a manager."/>
+ <filter icon="terp-project" string="Member" domain="['|',('user_id', '=', uid),('members', '=', uid)]" help="Projects in which I am a member." default="1"/>
+ <separator orientation="vertical"/>
+ <filter icon="terp-project" string="Templates" domain="[('state','=','template')]" help="Template Projects"/>
+ <separator orientation="vertical"/>
+ <field name="name" string="Project Name"/>
+ <field name="user_id" string="Project Manager"/>
+ <field name="partner_id" string="Partner"/>
+ <field name="state"/>
</group>
</search>
</field>
<field name="field_parent">child_ids</field>
<field name="arch" type="xml">
<tree string="Projects">
+ <field name="sequence" invisible="1"/>
<field name="name" string="Project Name"/>
<field name="user_id" string="Project Manager"/>
<field name="partner_id" string="Partner"/>
</field>
</record>
- <record id="view_my_project" model="ir.ui.view">
- <field name="name">project.project.tree</field>
- <field name="model">project.project</field>
- <field name="type">tree</field>
- <field name="field_parent">child_ids</field>
- <field name="arch" type="xml">
- <tree string="My projects">
- <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"/>
- <field name="state"/>
- </tree>
- </field>
- </record>
-
- <record id="open_view_my_project_open" model="ir.actions.act_window">
- <field name="name">Projects Structure</field>
- <field name="res_model">project.project</field>
- <field name="view_type">tree</field>
- <field name="domain">[('parent_id','=',False)]</field>
- <field name="view_id" ref="view_my_project"/>
- </record>
- <!--<menuitem
- action="open_view_my_project_open"
- id="menu_open_view_my_project_open"
- parent="project.menu_all_project"/>-->
-
- <!-- Wizard for compute remaining hours -->
-
<record id="view_config_compute_remaining" model="ir.ui.view">
<field name="name">Compute Remaining Hours </field>
<field name="model">config.compute.remaining</field>
<form string="Task edition">
<group colspan="6" col="6">
<field name="name" select="1"/>
- <field name="project_id" required="1" select="1"/>
+ <field name="project_id" required="1" select="1" domain="['|',('user_id','=',uid),('members','=',uid)]"/>
<field name="total_hours" widget="float_time"/>
<field name="date_deadline" select="2"/>
<field name="user_id" select="1"/>
name="planned_hours"
widget="float_time"
attrs="{'readonly':[('state','!=','draft')]}"
- on_change="onchange_planned(planned_hours,effective_hours,date_start,occupation_rate)"/>
+ on_change="onchange_planned(planned_hours, effective_hours)"/>
<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>
<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')]}">
+ <field colspan="4" height="150" name="child_ids" nolabel="1">
<tree string="Delegated tasks">
<field name="name"/>
<field name="user_id"/>
<separator string="Dates" colspan="2"/>
<field name="date_start"/>
<field name="date_end"/>
- <field name="occupation_rate"/>
</group>
<separator string="Miscelleanous" colspan="4"/>
<field name="partner_id" select="2"/>
<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" invisible="1"/>
<field name="name"/>
- <field name="project_id" icon="gtk-indent" invisible="context.get('set_visible',False)"/>
+ <field name="planned_hours" widget="float_time" on_change="onchange_planned(planned_hours, effective_hours)" invisible="not context.get('set_visible',False)"/>
+ <field name="project_id" icon="gtk-indent" domain="['|',('user_id','=',uid),('members','=',uid)]"/>
<field name="user_id"/>
- <field name="remaining_hours" widget="float_time" sum="Remaining Hours" invisible="context.get('set_visible',False)"/>
+ <field name="delegated_user_id" invisible="context.get('show_delegated', True)"/>
+ <field name="remaining_hours" widget="float_time" sum="Remaining Hours" invisible="context.get('set_visible',False)"/>
<field name="date_deadline" invisible="context.get('set_visible',False)"/>
<field name="type" groups="base.group_extended" invisible="context.get('set_visible',False)"/>
<field name="date_start" invisible="1"/>
help="Change Type"/>
<field name="progress" widget="progressbar" invisible="context.get('set_visible',False)"/>
<field name="state" invisible="context.get('set_visible',False)"/>
- <button name="do_open" states="pending,draft" 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="%(wizard_delegate_task)d" states="pending,open,draft" string="Delegate" type="action" icon="gtk-execute" help="For changing to delegate state" />
- <button name="%(wizard_close_task)d" states="pending,open" string="Done" type="action" icon="gtk-jump-to" help="For changing to done state"/>
- <button name="do_cancel" states="draft,open,pending" string="Cancel" type="object" icon="gtk-cancel" help="For cancelling the task"/>
- </tree>
- </field>
- </record>
-
- <record id="view_task_tree3" model="ir.ui.view">
- <field name="name">project.task.tree</field>
- <field name="model">project.task</field>
- <field name="type">tree</field>
- <field eval="2" name="priority"/>
- <field name="arch" type="xml">
- <tree editable="top" 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="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="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"/>
+ <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="%(wizard_delegate_task)d" states="pending,open,draft" string="Delegate" type="action" icon="gtk-execute" help="For changing to delegate state"/>
- <button name="%(wizard_close_task)d" states="pending,open" string="Done" type="action" icon="gtk-jump-to" help="For changing to done state"/>
+ <button name="%(wizard_close_task)d" states="draft,pending,open" string="Done" type="action" icon="gtk-jump-to" help="For changing to done state"/>
<button name="do_cancel" states="draft,open,pending" string="Cancel" type="object" icon="gtk-cancel" help="For cancelling the task"/>
</tree>
</field>
<field name="arch" type="xml">
<search string="Task Edition">
<group col="20" colspan="4">
- <filter string="Current" domain="[('state','in',('open','draft'))]" help="Open and Draft Tasks" icon="terp-project" default="1"/>
+ <filter string="Current" domain="[('state','in',('open','draft'))]" help="Draft, Open and Pending Tasks" icon="terp-project" default="1"/>
<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"/>
+ <filter string="Pending" domain="[('state','=','pending')]" context="{'show_delegated':False}" help="Pending Tasks" icon="terp-project"/>
<separator orientation="vertical"/>
<filter string="Deadlines" domain="[('date_deadline','<>',False)]" help="Show only tasks having a deadline" icon="terp-project"/>
<separator orientation="vertical"/>
<field name="name" select="1"/>
<field name="project_id" select="1" widget="selection" default="context.get('project_id', False)">
- <filter domain="[('manager_id','=',False)]" help="Unassigned Project" icon="terp-project"/>
+ <filter domain="[('project_id.user_id','=',uid)]" help="My Projects" icon="terp-project"/>
+ <filter domain="[('project_id','=',False)]" help="Tasks not assigned to a project" icon="terp-project"/>
</field>
<field name="user_id" select="1" widget="selection">
<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>
+ <newline/>
<group expand="1" string="Group By..." colspan="4" col="20">
- <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 Stage" icon="terp-project" domain="[]" context="{'group_by':'type'}"/>
- <filter string="By State" icon="terp-project" domain="[]" context="{'group_by':'state'}"/>
+ <filter string="Users" icon="terp-project" domain="[]" context="{'group_by':'user_id'}"/>
+ <filter string="Project" icon="terp-project" domain="[]" context="{'group_by':'project_id'}"/>
+ <filter string="Stage" icon="terp-project" domain="[]" context="{'group_by':'type'}"/>
+ <filter string="State" icon="terp-project" domain="[]" context="{'group_by':'state'}"/>
<separator orientation="vertical"/>
+ <filter string="Deadline" icon="terp-project" domain="[]" context="{'group_by':'date_deadline'}"/>
<filter string="Start Date" icon="terp-project" domain="[]" context="{'group_by':'date_start'}"/>
<filter string="End Date" icon="terp-project" domain="[]" context="{'group_by':'date_end'}"/>
</group>
<field eval="18" name="priority"/>
<field name="arch" type="xml">
<field name="password" position="after">
- <field name="context_project_id" completion="1"/>
+ <field name="context_project_id" completion="1" widget="selection"/>
</field>
</field>
</record>
<field eval="18" name="priority"/>
<field name="arch" type="xml">
<page string="Current Activity" position="inside">
- <field name="context_project_id" completion="1" />
+ <field name="context_project_id" completion="1" widget="selection" context="{'user_prefence':True}"/>
</page>
</field>
</record>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Messages">
- <group colspan="6">
- <field name="subject" select="1" string="Title"/>
+ <group colspan="6">
+ <field name="subject" select="1"/>
<field name="project_id"/>
- <field name="user_id" select="1"/>
- <field name="date" select="2"/>
- </group>
- <separator string="Description" colspan="4"/>
- <field name="description" nolabel="1" colspan="4"/>
- </form>
+ <field name="user_id" select="1"/>
+ <field name="date" select="2"/>
+ </group>
+ <separator string="Description" colspan="4"/>
+ <field name="description" nolabel="1" colspan="4"/>
+ </form>
</field>
</record>
<field name="type">tree</field>
<field name="arch" type="xml">
<tree string="Messages">
- <field name="subject" select="1"/>
- <field name="description" select="1"/>
- <field name="project_id" select="1"/>
- <field name="date" select="1"/>
- <field name="user_id" select="1"/>
+ <field name="subject" select="1"/>
+ <field name="user_id" select="1"/>
+ <field name="project_id" select="1"/>
+ <field name="date" select="1"/>
</tree>
</field>
</record>
+ <record id="view_project_message_search" model="ir.ui.view">
+ <field name="name">project.message.search</field>
+ <field name="model">project.message</field>
+ <field name="type">search</field>
+ <field name="arch" type="xml">
+ <search string="Messages">
+ <group col="20" colspan="4">
+ <filter domain="[('date','>=',time.strftime('%%Y-%%m-01'))]" icon="terp-project" string="This Month" />
+ <filter domain="[('date', '=', time.strftime('%%Y-%%m-%%d'))]" icon="terp-project" string="Today" />
+
+ <separator orientation="vertical"/>
+ <field name="subject"/>
+ <field name="project_id" select="1" widget="selection"/>
+ <field name="user_id" select="1" widget="selection">
+ <filter domain="[('user_id','=',uid)]" help="My Message" icon="gtk-execute" default="1"/>
+ </field>
+ </group>
+ <newline/>
+ <group expand="1" string="Group By..." colspan="4" col="20">
+ <filter string="Project" icon="terp-project" domain="[]" context="{'group_by':'project_id'}"/>
+ <filter string="User" icon="terp-project" domain="[]" context="{'group_by':'user_id'}"/>
+ <filter string="Date" icon="terp-project" domain="[]" context="{'group_by':'date'}"/>
+ </group>
+ </search>
+ </field>
+ </record>
+
<record id="action_view_project_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="view_project_message_tree"/>
+ <field name="search_view_id" ref="view_project_message_search"/>
</record>
<!--<menuitem id="menu_message_main" name="Message" parent="base.menu_main_pm"/>-->
projects / odoo / odoo.git / blobdiff