diff options
| author | Stephane Wirtel <stw@openerp.com> | 2011-09-14 11:39:37 +0200 |
|---|---|---|
| committer | Stephane Wirtel <stw@openerp.com> | 2011-09-14 11:39:37 +0200 |
| commit | 8eb4f30d90a013fc3930daaa380dcece25b1ba05 (patch) | |
| tree | 4342a6a88cb4724879f867bae0796bf7a41b5647 /addons/project_issue/project_issue_view.xml | |
| parent | abb380c9e35cab11d3b093c20f7beb2149c665b7 (diff) | |
| parent | 958002eadb22f385762a6a67337e349bb9849b14 (diff) | |
[MERGE] lp:~openerp-dev/openobject-addons/trunk-usability-project-userid-insteadof-assignedto-tta
bzr revid: stw@openerp.com-20110914093937-p8hn65x5sc8ixod2
Diffstat (limited to 'addons/project_issue/project_issue_view.xml')
| -rw-r--r-- | addons/project_issue/project_issue_view.xml | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml index 0bf171d6aeb..ce66320897a 100644 --- a/addons/project_issue/project_issue_view.xml +++ b/addons/project_issue/project_issue_view.xml @@ -55,8 +55,7 @@ <field name="name"/> <field name="project_id" required="True" on_change="on_change_project(project_id)"/> <field name="categ_id" widget="selection" domain="[('object_id.model', '=', 'project.issue')]"/> - <field name="user_id" invisible="1" /> - <field name="assigned_to"/> + <field name="user_id"/> <field name="version_id" colspan="2" widget="selection"/> <group colspan="2" col="4"> <field name="type_id" string="Resolution" /> @@ -188,7 +187,7 @@ <button name="prev_type" string="Previous" type="object" icon="gtk-go-back" help="Change to Previous Stage"/> <button name="next_type" string="Next" type="object" icon="gtk-go-forward" help="Change to Next Stage"/> <field name="version_id" widget="selection"/> - <field name="assigned_to"/> + <field name="user_id"/> <field name="progress" widget="progressbar" attrs="{'invisible':[('task_id','=',False)]}"/> <field name="state"/> <button name="case_cancel" string="Cancel" states="draft,open,pending" type="object" icon="gtk-cancel"/> @@ -215,9 +214,12 @@ <filter string="To Do" domain="[('state','=','open')]" help="To Do Issues" icon="terp-camera_test"/> <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="assigned_to"> - <filter domain="[('assigned_to','=',False)]" help="Unassigned Issues" icon="terp-personal-" separator="1"/> + <filter icon="terp-go-today" string="Today" separator="1" domain="[('create_date','>=',time.strftime('%%Y-%%m-%%d')),('create_date','<', (datetime.date.today() + datetime.timedelta (days = 1)).strftime('%%Y-%%m-%%d'))]" help="Today's bugs" /> + <separator orientation="vertical"/> + <field name="name"/> + <field name="partner_id" groups="base.group_extended"/> + <field name="user_id"> + <filter domain="[('user_id','=',False)]" help="Unassigned Issues" icon="terp-personal-" separator="1"/> </field> <field name="project_id"/> <field name="id"/> @@ -225,7 +227,7 @@ <newline/> <group expand="0" string="Group By..." groups="base.group_extended"> <filter string="Responsible" icon="terp-personal" - domain="[]" context="{'group_by':'assigned_to'}" /> + domain="[]" context="{'group_by':'user_id'}" /> <filter string="Partner" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}" /> <separator orientation="vertical"/> @@ -256,7 +258,7 @@ <field name="type">calendar</field> <field name="priority" eval="2"/> <field name="arch" type="xml"> - <calendar string="Issues" date_start="date" color="assigned_to" date_delay="duration"> + <calendar string="Issues" date_start="date" color="user_id" date_delay="duration"> <field name="name"/> <field name="partner_id"/> </calendar> @@ -281,7 +283,7 @@ <button name="prev_type" string="Previous" type="object" icon="gtk-go-back" help="Change to Previous Stage"/> <button name="next_type" string="Next" type="object" icon="gtk-go-forward" help="Change to Next Stage"/> <field name="version_id"/> - <field name="assigned_to"/> + <field name="user_id"/> <field name="state"/> <button name="case_cancel" string="Cancel" states="draft,open,pending" type="object" icon="gtk-cancel"/> <button name="case_close" string="Done" states="open,draft,pending" type="object" icon="gtk-jump-to"/> @@ -304,7 +306,7 @@ <separator orientation="vertical"/> <group> <field name="name" select='1' string="Feature description"/> - <field name="assigned_to" select="1"/> + <field name="user_id" select="1"/> <field name="state" select="1"> <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"/> |
