diff options
Diffstat (limited to 'addons/project/project_view.xml')
| -rw-r--r-- | addons/project/project_view.xml | 92 |
1 files changed, 42 insertions, 50 deletions
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml index cc6f5b05ad8..ae86f9712a3 100644 --- a/addons/project/project_view.xml +++ b/addons/project/project_view.xml @@ -155,28 +155,21 @@ <field name="type">search</field> <field name="arch" type="xml"> <search string="Search Project"> - <group> - <field name="complete_name" string="Project Name"/> - <separator orientation="vertical"/> - <filter icon="terp-mail-message-new" - string="Inbox" help="Unread messages" - name="needaction_pending" - domain="[('needaction_pending','=',True)]"/> - <separator orientation="vertical"/> - <filter icon="terp-check" string="Open" name="Current" domain="[('state', '=','open')]" help="Open Projects"/> - <filter icon="gtk-media-pause" string="Pending" name="Pending" domain="[('state', '=','pending')]" help="Pending Projects"/> - <filter icon="gtk-media-pause" string="Template" name="Template" domain="[('state', '=','template')]" help="Templates of Projects"/> - <filter icon="terp-personal+" string="Member" domain="['|',('user_id', '=', uid),('members', '=', uid)]" help="Projects in which I am a member."/> - <filter string="Project(s) Manager" domain="[('user_id','=',uid)]" help="Projects in which I am a manager" icon="terp-personal"/> - <separator orientation="vertical"/> - <field name="user_id" string="Project Manager"/> - <field name="partner_id" string="Partner"/> - </group> - <newline/> + <field name="complete_name" string="Project Name"/> + <filter icon="terp-mail-message-new" string="Inbox" help="Unread messages" name="needaction_pending" domain="[('needaction_pending','=',True)]"/> + <separator/> + <filter icon="terp-check" string="Open" name="Current" domain="[('state', '=','open')]" help="Open Projects"/> + <filter icon="gtk-media-pause" string="Pending" name="Pending" domain="[('state', '=','pending')]" help="Pending Projects"/> + <filter icon="gtk-media-pause" string="Template" name="Template" domain="[('state', '=','template')]" help="Templates of Projects"/> + <separator/> + <filter icon="terp-personal+" string="Member" domain="['|',('user_id', '=', uid),('members', '=', uid)]" help="Projects in which I am a member."/> + <separator/> + <filter string="Project(s) Manager" domain="[('user_id','=',uid)]" help="Projects in which I am a manager" icon="terp-personal"/> + <field name="user_id" string="Project Manager"/> + <field name="partner_id" string="Partner"/> <group expand="0" string="Group By..."> <filter string="Manager" name="Manager" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/> <filter string="Partner" name="Partner" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/> - <separator orientation="vertical"/> <filter string="Parent" name="Parent" help="Parent" icon="terp-folder-blue" domain = "[]" context="{'group_by':'parent_id'}"/> </group> </search> @@ -431,6 +424,9 @@ <field name="progress" widget="progressbar" groups="project.group_time_work_estimation_tasks"/> </group> + <group> + <field name="categ_ids" widget="many2many_tags"/> + </group> </group> <notebook> <page string="Description"> @@ -512,6 +508,7 @@ <field name="date_deadline"/> <field name="message_summary"/> <field name="needaction_pending"/> + <field name="categ_ids"/> <templates> <t t-name="kanban-box"> <div t-attf-class="oe_kanban_color_#{kanban_getcolor(record.color.raw_value)} oe_kanban_card oe_kanban_global_click"> @@ -554,6 +551,13 @@ <t t-esc="Math.round(record.remaining_hours.raw_value)"/> </span> </div> + <div class="oe_kanban_footer_left" style="margin-top:5px;"> + <div class="oe_left oe_tags"> + <t t-foreach="record.categ_ids.raw_value" t-as="categ_id"> + <span class="oe_tag" t-att-data-categ_id="categ_id"></span> + </t> + </div> + </div> </div> <div class="oe_clear"></div> </div> @@ -633,37 +637,28 @@ <field name="type">search</field> <field name="arch" type="xml"> <search string="Tasks"> - <group> - <field name="name" string="Tasks"/> - <separator orientation="vertical"/> - <filter icon="terp-mail-message-new" - string="Inbox" help="Unread messages" - name="needaction_pending" - domain="[('needaction_pending','=',True)]"/> - <separator orientation="vertical"/> - <filter name="draft" string="New" domain="[('state','=','draft')]" help="New Tasks" icon="terp-check"/> - <filter name="open" string="In Progress" domain="[('state','=','open')]" help="In Progress Tasks" icon="terp-camera_test"/> - <filter string="Pending" domain="[('state','=','pending')]" context="{'show_delegated':False}" help="Pending Tasks" icon="terp-gtk-media-pause"/> - <filter name="project" string="Project" domain="[('project_id.user_id','=',uid)]" help="My Projects" icon="terp-check"/> - <filter string="My Tasks" domain="[('user_id','=',uid)]" help="My Tasks" icon="terp-personal"/> - <filter string="Unassigned Tasks" domain="[('user_id','=',False)]" help="Unassigned Tasks" icon="terp-personal-"/> - <filter string="Deadlines" context="{'deadline_visible': False}" domain="[('date_deadline','<>',False)]" - help="Show only tasks having a deadline" icon="terp-gnome-cpu-frequency-applet+"/> - <separator orientation="vertical"/> - <field name="project_id"/> - <field name="user_id"/> - </group> - <newline/> + <field name="name" string="Tasks"/> + <filter icon="terp-mail-message-new" string="Inbox" help="Unread messages" name="needaction_pending" domain="[('needaction_pending','=',True)]"/> + <separator/> + <filter name="draft" string="New" domain="[('state','=','draft')]" help="New Tasks" icon="terp-check"/> + <filter name="open" string="In Progress" domain="[('state','=','open')]" help="In Progress Tasks" icon="terp-camera_test"/> + <filter string="Pending" domain="[('state','=','pending')]" context="{'show_delegated':False}" help="Pending Tasks" icon="terp-gtk-media-pause"/> + <separator/> + <filter name="My project" string="Project" domain="[('project_id.user_id','=',uid)]" help="My Projects" icon="terp-check"/> + <separator/> + <filter string="My Tasks" domain="[('user_id','=',uid)]" help="My Tasks" icon="terp-personal"/> + <filter string="Unassigned Tasks" domain="[('user_id','=',False)]" help="Unassigned Tasks" icon="terp-personal-"/> + <separator/> + <filter string="Deadlines" context="{'deadline_visible': False}" domain="[('date_deadline','<>',False)]" + help="Show only tasks having a deadline" icon="terp-gnome-cpu-frequency-applet+"/> + <field name="project_id"/> + <field name="user_id"/> <group expand="0" string="Group By..."> <filter string="Users" name="group_user_id" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/> - <separator orientation="vertical"/> <filter string="Project" name="group_project_id" icon="terp-folder-violet" domain="[]" context="{'group_by':'project_id'}"/> - <separator orientation="vertical"/> <filter string="Stage" name="group_stage_id" icon="terp-stage" domain="[]" context="{'group_by':'stage_id'}"/> <filter string="Status" name="group_state" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/> - <separator orientation="vertical"/> <filter string="Deadline" icon="terp-gnome-cpu-frequency-applet+" domain="[]" context="{'group_by':'date_deadline'}"/> - <separator orientation="vertical" groups="base.group_no_one"/> <filter string="Start Date" icon="terp-go-month" domain="[]" context="{'group_by':'date_start'}" groups="base.group_no_one"/> <filter string="End Date" icon="terp-go-month" domain="[]" context="{'group_by':'date_end'}" groups="base.group_no_one"/> </group> @@ -745,11 +740,8 @@ <field name="type">search</field> <field name="arch" type="xml"> <search string="Tasks Stages"> - <group> - <field name="name" string="Tasks Stages"/> - <separator orientation="vertical"/> - <filter icon="terp-check" string="Common" name="common" domain="[('case_default', '=', 1)]" help="Stages common to all projects"/> - </group> + <field name="name" string="Tasks Stages"/> + <filter icon="terp-check" string="Common" name="common" domain="[('case_default', '=', 1)]" help="Stages common to all projects"/> </search> </field> </record> @@ -820,7 +812,7 @@ </field> </record> - <!-- User Form--> + <!-- User Form --> <act_window context="{'search_default_user_id': [active_id], 'default_user_id': active_id}" domain="[('state', '<>', 'cancelled'),('state', '<>', 'done')]" id="act_res_users_2_project_task_opened" name="Assigned Tasks" res_model="project.task" src_model="res.users" view_mode="tree,form,gantt,calendar,graph" view_type="form"/> </data> |