diff options
| author | rpa (Open ERP) <rpa@tinyerp.com> | 2010-05-26 10:55:57 +0530 |
|---|---|---|
| committer | rpa (Open ERP) <rpa@tinyerp.com> | 2010-05-26 10:55:57 +0530 |
| commit | d2d4de0e9ae77eeccd1aeb3e463961fe402661fe (patch) | |
| tree | a093977784be2f577c2d9e0f1e8a4f30b28048bf /addons/project_issue | |
| parent | a108da0f141e0e44775a0d1c4174dc61c62d8d76 (diff) | |
| parent | 5f936d961cf42db4312a840caedc7be7c18c27cf (diff) | |
[MERGE]: Merge with lp:~openerp-dev/openobject-addons/trunk-dev-addons2
bzr revid: rpa@tinyerp.com-20100526052557-dyzbpqk5josm6n0w
Diffstat (limited to 'addons/project_issue')
| -rw-r--r-- | addons/project_issue/project_issue_view.xml | 2 | ||||
| -rw-r--r-- | addons/project_issue/report/project_issue_report_view.xml | 68 |
2 files changed, 35 insertions, 35 deletions
diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml index 68f58c78edb..fe03a6572fc 100644 --- a/addons/project_issue/project_issue_view.xml +++ b/addons/project_issue/project_issue_view.xml @@ -203,7 +203,7 @@ <field name="project_id" select="1" widget="selection" string="Project"/> </group> <newline/> - <group expand="1" string="Group By..." colspan="16"> + <group expand="1" string="Group By..." colspan="16" groups="base.group_extended"> <filter string="Stage" icon="terp-crm" domain="[]" context="{'group_by':'stage_id'}" /> <filter string="Priority" icon="terp-crm" domain="[]" diff --git a/addons/project_issue/report/project_issue_report_view.xml b/addons/project_issue/report/project_issue_report_view.xml index 5729698392f..5694d33993b 100644 --- a/addons/project_issue/report/project_issue_report_view.xml +++ b/addons/project_issue/report/project_issue_report_view.xml @@ -96,38 +96,6 @@ <field name="user_id" select="1" widget="selection"/> </group> <newline/> - <group expand="1" string="Extended options..." colspan="10" col="12"> - <filter icon="terp-sale" - string="Done" - domain="[('state','=','done')]"/> - - <filter icon="terp-sale" - string="Cancel" - domain="[('state','=','cancel')]"/> - <group> - <separator orientation="vertical"/> - <field name="project_id" widget="selection" /> - <field name="priority" /> - <separator orientation="vertical"/> - <field name="type_id" widget="selection" domain="[('object_id.model', '=', 'project.issue')]"/> - <field name="task_id"/> - <separator orientation="vertical"/> - <field name="assigned_to" widget="selection"> - <filter icon="terp-crm" help = "Project Issue Assigned To Me" domain="[('assigned_to','=',uid)]" /> - <filter icon="terp-crm" help="Non Assigned Project Issue" domain="[('assigned_to','=',False)]"/> - </field> - <newline/> - <field name="categ_id" widget="selection" domain="[('object_id.model', '=', 'project.issue')]"/> - <field name="stage_id" widget="selection" domain="[('object_id.model', '=', 'project.issue')]" /> - <separator orientation="vertical"/> - <field name="partner_id" /> - <field name="canal_id" widget="selection"/> - <separator orientation="vertical"/> - <field name="date_closed" string="Date Closed"/> - </group> - - </group> - <newline/> <group expand="1" string="Group By..." colspan="4" col="8"> <filter string="User" name="User" icon="terp-sale" domain="[]" context="{'group_by':'user_id'}" /> @@ -146,7 +114,7 @@ <filter string="Category" icon="terp-sale" domain="[]" context="{'group_by':'categ_id'}" /> - + <filter string="Stage" icon="terp-sale" domain="[]" context="{'group_by':'stage_id'}"/> <separator orientation="vertical"/> <filter string="Project" icon="terp-sale" domain="[]" context="{'group_by':'project_id'}" /> @@ -158,7 +126,7 @@ <filter string="Assigned To" icon="terp-sale" domain="[]" context="{'group_by':'assigned_to'}"/> <filter string="Partner" icon="terp-sale" domain="[]" context="{'group_by':'partner_id'}"/> <filter string="Channel" icon="terp-sale" domain="[]" context="{'group_by':'canal_id'}"/> - + <separator orientation="vertical" /> <filter string="Day" icon="terp-sale" domain="[]" context="{'group_by':'day'}"/> @@ -170,6 +138,38 @@ domain="[]" context="{'group_by':'name'}" /> </group> + <newline/> + <group expand="0" string="Extended options..." colspan="10" col="12" groups="base.group_extended"> + <filter icon="terp-sale" + string="Done" + domain="[('state','=','done')]"/> + + <filter icon="terp-sale" + string="Cancel" + domain="[('state','=','cancel')]"/> + <group> + <separator orientation="vertical"/> + <field name="project_id" widget="selection" /> + <field name="priority" /> + <separator orientation="vertical"/> + <field name="type_id" widget="selection" domain="[('object_id.model', '=', 'project.issue')]"/> + <field name="task_id"/> + <separator orientation="vertical"/> + <field name="assigned_to" widget="selection"> + <filter icon="terp-crm" help = "Project Issue Assigned To Me" domain="[('assigned_to','=',uid)]" /> + <filter icon="terp-crm" help="Non Assigned Project Issue" domain="[('assigned_to','=',False)]"/> + </field> + <newline/> + <field name="categ_id" widget="selection" domain="[('object_id.model', '=', 'project.issue')]"/> + <field name="stage_id" widget="selection" domain="[('object_id.model', '=', 'project.issue')]" /> + <separator orientation="vertical"/> + <field name="partner_id" /> + <field name="canal_id" widget="selection"/> + <separator orientation="vertical"/> + <field name="date_closed" string="Date Closed"/> + </group> + + </group> </search> </field> </record> |