Rajesh Prajapati (OpenERP) has proposed merging
lp:~openerp-commiter/openobject-addons/trunk-search-imp-project-rpr into
lp:~openerp-dev/openobject-addons/trunk-review_all_search.
Requested reviews:
OpenERP R&D Team (openerp-dev)
For more details, see:
https://code.launchpad.net/~openerp-commiter/openobject-addons/trunk-search-imp-project-rpr/+merge/110227
Hello
I have improve the search view of project_* module.
Thanks
Rajesh Prajapati
--
https://code.launchpad.net/~openerp-commiter/openobject-addons/trunk-search-imp-project-rpr/+merge/110227
Your team OpenERP R&D Team is requested to review the proposed merge of
lp:~openerp-commiter/openobject-addons/trunk-search-imp-project-rpr into
lp:~openerp-dev/openobject-addons/trunk-review_all_search.
=== modified file 'project/project_view.xml'
--- project/project_view.xml 2012-06-13 09:48:49 +0000
+++ project/project_view.xml 2012-06-14 05:18:21 +0000
@@ -132,27 +132,23 @@
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Search Project">
- <group>
+ <field name="complete_name" string="Project Name" filter_domain="[('complete_name','ilike',self)]"/>
+ <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"/>
- <separator orientation="vertical"/>
+ <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."/>
- <separator orientation="vertical"/>
- <field name="name" string="Project Name"/>
- <field name="user_id" string="Project Manager">
- <filter string="Project(s) Manager" domain="[('user_id','=',uid)]" help="Projects in which I am a manager" icon="terp-personal"/>
- </field>
+ <filter string="Project(s) Manager" domain="[('user_id','=',uid)]" help="Projects in which I am a manager" icon="terp-personal"/>
+ <newline />
+ <field name="user_id" string="Project Manager"/>
<field name="partner_id" string="Partner"/>
- </group>
- <newline />
- <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>
+ <newline />
+ <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>
</field>
</record>
@@ -588,35 +584,34 @@
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Tasks">
- <group>
+ <field name="name" string="Tasks" filter_domain="[('name','ilike',self)]"/>
+ <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"/>
- <separator orientation="vertical"/>
- <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="name"/>
<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-" />
+ <newline/>
<field name="project_id"/>
- <field name="user_id">
- <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-" />
- </field>
- </group>
- <newline/>
- <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>
+ <field name="user_id"/>
+ <newline/>
+ <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>
+ <group expand="0" string="Dispaly">
+ <filter string="Deadlines" context="{'deadline_visible': False}" domain="[('date_deadline','<>',False)]" help="Show only tasks having a deadline" icon="terp-gnome-cpu-frequency-applet+"/>
+ </group>
</search>
</field>
</record>
@@ -679,11 +674,9 @@
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Tasks Stages">
- <group>
+ <field name="name" string="Tasks Stages" filter_domain="[('name','ilike',self)]"/>
+ <separator orientation="vertical"/>
<filter icon="terp-check" string="Common" name="common" domain="[('case_default', '=', 1)]" help="Stages common to all projects"/>
- <separator orientation="vertical"/>
- <field name="name"/>
- </group>
</search>
</field>
</record>
=== modified file 'project_gtd/project_gtd_view.xml'
--- project_gtd/project_gtd_view.xml 2012-06-09 15:59:35 +0000
+++ project_gtd/project_gtd_view.xml 2012-06-14 05:18:21 +0000
@@ -111,26 +111,17 @@
<field name="priority">50</field>
<field name="arch" type="xml">
<search string="My Tasks">
+ <field name="name" string="My Tasks" filter_domain="[('name','ilike',self)]"/>
+ <separator orientation="vertical"/>
<filter name="open" string="In Progress" domain="[('state','in',('draft','open'))]" help="In Progress and draft tasks" icon="terp-camera_test"/>
<filter string="Pending" domain="[('state','=','pending')]" context="{'show_delegated':False}" help="Pending Tasks" icon="terp-gtk-media-pause"/>
- <separator orientation="vertical"/>
- <filter
- domain="[('timebox_id','=', False)]"
- help="Tasks having no timebox assigned yet" string="Inbox"/>
- <separator orientation="vertical"/>
- <separator name="gtdsep"/>
- <field name="name"/>
- <field name="context_id" widget="selection"
- context="{'context_show': True}">
- <filter string="Show Context"
- name="context_show"
- context="{'context_show': True}"
- domain="[]" icon="terp-camera_test"
- help="Show the context field"/>
- <filter string="Show Deadlines" context="{'deadline_visible': False}"
- domain="[]" help="Show only tasks having a deadline"
- icon="terp-gnome-cpu-frequency-applet+"/>
- </field>
+ <filter string="Inbox" domain="[('timebox_id','=', False)]" help="Tasks having no timebox assigned yet"/>
+ <newline />
+ <field name="context_id" widget="selection" context="{'context_show': True}"/>
+ <group expand="0" string="Display">
+ <filter string="Show Context" name="context_show" context="{'context_show': True}" domain="[]" icon="terp-camera_test" help="Show the context field"/>
+ <filter string="Show Deadlines" context="{'deadline_visible': False}" domain="[]" help="Show only tasks having a deadline" icon="terp-gnome-cpu-frequency-applet+"/>
+ </group>
</search>
</field>
</record>
=== modified file 'project_issue/project_issue_view.xml'
--- project_issue/project_issue_view.xml 2012-06-11 12:42:11 +0000
+++ project_issue/project_issue_view.xml 2012-06-14 05:18:21 +0000
@@ -10,7 +10,7 @@
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Issue Version">
- <field name="name"/>
+ <field name="name" string="Issue Version" filter_domain="[('name','ilike',self)]"/>
<field name="active"/>
</search>
</field>
@@ -156,42 +156,40 @@
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Issue Tracker Search">
- <group>
+ <field name="name" string="Issue / Partner" filter_domain="['|', '|', ('partner_id','ilike',self), ('email_from','ilike',self), ('name','ilike',self)]"/>
+ <separator orientation="vertical"/>
<filter string="New" icon="terp-document-new" domain="[('state','=','draft')]" help="New Issues"/>
<filter string="To Do" domain="[('state','=','open')]" help="To Do Issues" icon="terp-check"/>
<filter string="Pending" domain="[('state','=','pending')]" help="Pending Issues" icon="terp-gtk-media-pause"/>
- <separator orientation="vertical"/>
- <field name="name" string="Issue / Partner" filter_domain="['|', '|', ('partner_id','ilike',self), ('email_from','ilike',self), ('name','ilike',self)]"/>
- <field name="user_id">
- <filter string="Unassigned Issues" domain="[('user_id','=',False)]" help="Unassigned Issues" icon="terp-personal-" />
- </field>
+ <filter string="Unassigned Issues" domain="[('user_id','=',False)]" help="Unassigned Issues" icon="terp-personal-" />
+ <newline/>
+ <field name="user_id"/>
<field name="project_id"/>
+ <newline/>
<field name="id"/>
- </group>
- <newline/>
- <group expand="0" string="Group By..." >
- <filter string="Responsible" icon="terp-personal"
+ <group expand="0" string="Group By..." >
+ <filter string="Responsible" icon="terp-personal"
domain="[]" context="{'group_by':'user_id'}" />
- <filter string="Partner" icon="terp-partner" domain="[]"
+ <filter string="Partner" icon="terp-partner" domain="[]"
context="{'group_by':'partner_id'}" />
- <separator orientation="vertical"/>
- <filter string="Project" icon="terp-folder-violet" domain="[]"
+ <separator orientation="vertical"/>
+ <filter string="Project" icon="terp-folder-violet" domain="[]"
context="{'group_by':'project_id'}" />
- <filter string="Version" icon="terp-gtk-jump-to-rtl"
+ <filter string="Version" icon="terp-gtk-jump-to-rtl"
domain="[]" context="{'group_by':'version_id'}" />
- <separator orientation="vertical"/>
- <filter string="Category" icon="terp-stock_symbol-selection" domain="[]"
+ <separator orientation="vertical"/>
+ <filter string="Category" icon="terp-stock_symbol-selection" domain="[]"
context="{'group_by':'categ_id'}" />
- <filter string="Priority" icon="terp-rating-rated" domain="[]"
+ <filter string="Priority" icon="terp-rating-rated" domain="[]"
context="{'group_by':'priority'}" />
- <filter string="Stage" icon="terp-stage" domain="[]"
+ <filter string="Stage" icon="terp-stage" domain="[]"
context="{'group_by':'stage_id'}" />
- <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]"
+ <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]"
context="{'group_by':'state'}" />
- <separator orientation="vertical" />
- <filter string="Month" icon="terp-go-month"
+ <separator orientation="vertical" />
+ <filter string="Month" icon="terp-go-month"
domain="[]" context="{'group_by':'create_date'}" help="Creation Month"/>
- </group>
+ </group>
</search>
</field>
</record>
@@ -310,18 +308,16 @@
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Feature Tracker Search">
- <filter icon="terp-go-today" string="Today"
- domain="[('date','=',time.strftime('%%Y-%%m-%%d'))]" help="Today's features"/>
- <separator orientation="vertical"/>
- <group>
- <field name="name" string="Feature description"/>
- <field name="user_id"/>
- <field name="state" groups="base.group_no_one">
+ <field name="name" string="Feature description" filter_domain="[('name','ilike',self)]"/>
+ <separator orientation="vertical"/>
+ <filter icon="terp-go-today" string="Today" domain="[('date','=',time.strftime('%%Y-%%m-%%d'))]" help="Today's features"/>
<filter icon="terp-check" domain="[('state','in',('open','draft'))]" help="Current Features" name="current_feature"/>
<filter icon="terp-camera_test" domain="[('state','=','open')]" help="Open Features"/>
- </field>
+ <newline />
+ <field name="user_id"/>
<field name="project_id" string="Project"/>
- </group>
+ <newline />
+ <field name="state" groups="base.group_no_one"/>
</search>
</field>
</record>
=== modified file 'project_long_term/project_long_term_view.xml'
--- project_long_term/project_long_term_view.xml 2012-06-11 12:42:11 +0000
+++ project_long_term/project_long_term_view.xml 2012-06-14 05:18:21 +0000
@@ -69,18 +69,16 @@
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Planning of Users">
- <group>
<field name="user_id"/>
<field name="phase_id"/>
<field name="project_id"/>
- </group>
- <newline/>
- <group expand="0" string="Group By...">
- <filter name="user" string="User" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
- <separator orientation="vertical"/>
- <filter string="Project" icon="terp-folder-violet" domain="[]" context="{'group_by':'project_id'}"/>
- <filter string="Phase" icon="terp-project" domain="[]" context="{'group_by':'phase_id'}"/>
- </group>
+ <newline/>
+ <group expand="0" string="Group By...">
+ <filter name="user" string="User" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
+ <separator orientation="vertical"/>
+ <filter string="Project" icon="terp-folder-violet" domain="[]" context="{'group_by':'project_id'}"/>
+ <filter string="Phase" icon="terp-project" domain="[]" context="{'group_by':'phase_id'}"/>
+ </group>
</search>
</field>
</record>
@@ -270,27 +268,25 @@
<field name="model">project.phase</field>
<field name="type">search</field>
<field name="arch" type="xml">
- <search string="Project Phases">
- <group>
+ <search string="Project Phases">
+ <field name="name" string="Project Phases" filter_domain="[('name','ilike',self)]"/>
+ <separator orientation="vertical"/>
+ <field name="date_start"/>
+ <field name="date_end"/>
+ <separator orientation="vertical"/>
<filter string="New" domain="[('state','=','draft')]" name="current" help="New Phases" icon="terp-check"/>
<filter string="In Progress" name="Progress" domain="[('state','=','open')]" help="In Progress 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">
- <filter string="My Projects" domain="[('project_id.user_id','=',uid)]" help="My Projects" icon="terp-folder-violet"/>
- </field>
- <field name="date_start"/>
- <field name="date_end"/>
- </group>
- <newline/>
- <group expand="0" string="Group By...">
- <filter string="Project" icon="terp-folder-violet" domain="[]" context="{'group_by':'project_id'}" name="project"/>
- <separator orientation="vertical"/>
- <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
- <separator orientation="vertical"/>
- <filter string="Month" icon="terp-go-month" domain="[]" context="{'group_by':'date_start'}" help="Start Month"/>
- </group>
+ <filter string="My Projects" domain="[('project_id.user_id','=',uid)]" help="My Projects" icon="terp-folder-violet"/>
+ <newline/>
+ <field name="project_id"/>
+ <group expand="0" string="Group By...">
+ <filter string="Project" icon="terp-folder-violet" domain="[]" context="{'group_by':'project_id'}" name="project"/>
+ <separator orientation="vertical"/>
+ <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
+ <separator orientation="vertical"/>
+ <filter string="Month" icon="terp-go-month" domain="[]" context="{'group_by':'date_start'}" help="Start Month"/>
+ </group>
</search>
</field>
</record>
=== modified file 'project_timesheet/project_timesheet_view.xml'
--- project_timesheet/project_timesheet_view.xml 2012-05-22 15:58:15 +0000
+++ project_timesheet/project_timesheet_view.xml 2012-06-14 05:18:21 +0000
@@ -70,8 +70,7 @@
<field name="inherit_id" ref="project.view_project_project_filter"/>
<field name="arch" type="xml">
<xpath expr='//filter[@string="Member"]' position='after'>
- <separator orientation="vertical"/>
- <filter icon="terp-camera_test" string="Billable" domain="[('to_invoice','!=', False)]" help="Billable Project"/>
+ <filter icon="terp-camera_test" string="Billable" domain="[('to_invoice','!=', False)]" help="Billable Project"/>
</xpath>
</field>
</record>
@@ -82,8 +81,8 @@
<field name="inherit_id" ref="account.view_account_analytic_line_filter"/>
<field name="arch" type="xml">
<field name="account_id" position="replace">
- <field name="account_id" string="Analytic account/project" />
- </field>
+ <field name="account_id" string="Analytic account/project" />
+ </field>
</field>
</record>
<record id="view_account_analytic_line_form_inherit_account_id" model="ir.ui.view">
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to : [email protected]
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp
