diff options
| author | mra (Open ERP) <mra@tinyerp.com> | 2010-06-01 09:51:47 +0530 |
|---|---|---|
| committer | mra (Open ERP) <mra@tinyerp.com> | 2010-06-01 09:51:47 +0530 |
| commit | b746d3531ef9ab1d9b0a940a0f083fefcd7a4e89 (patch) | |
| tree | 33c60503ead12e8d7aa46f2142c612f1727c4c24 /addons/project_issue | |
| parent | d0f33c1efb6d078ab23e801fed6319db158d97f7 (diff) | |
| parent | a8b4f5b484235436c08402bba66488e1dde6e7b6 (diff) | |
[MERGE] Merge with main branch
bzr revid: mra@tinyerp.com-20100531115020-3ovzr43zgicrphr0
bzr revid: mra@tinyerp.com-20100601042147-1x5sag3tdzk9lkb5
Diffstat (limited to 'addons/project_issue')
| -rw-r--r-- | addons/project_issue/project_issue.py | 2 | ||||
| -rw-r--r-- | addons/project_issue/project_issue_view.xml | 9 |
2 files changed, 10 insertions, 1 deletions
diff --git a/addons/project_issue/project_issue.py b/addons/project_issue/project_issue.py index 795c9883eca..533466f1615 100644 --- a/addons/project_issue/project_issue.py +++ b/addons/project_issue/project_issue.py @@ -113,7 +113,7 @@ class project_issue(osv.osv, crm.crm_case): 'thread_id': fields.many2one('mailgate.thread', 'Thread', required=False), 'id': fields.integer('ID'), 'name': fields.char('Name', size=128, required=True), - 'active': fields.boolean('Active', required=False), + 'active': fields.boolean('Active', required=False), 'create_date': fields.datetime('Creation Date' , readonly=True), 'write_date': fields.datetime('Update Date' , readonly=True), 'date_deadline': fields.date('Deadline'), diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml index 9362e858b1e..483fda01ec1 100644 --- a/addons/project_issue/project_issue_view.xml +++ b/addons/project_issue/project_issue_view.xml @@ -177,6 +177,12 @@ <field name="arch" type="xml"> <search string="Issue Tracker Search"> <group colspan="4" col="20"> + <filter string="Current" domain="[('state','in',('open','draft'))]" help="Draft and Open Issues" icon="terp-project" default="1"/> + <filter string="In Progress" domain="[('state','=','open')]" help="Open Issues" icon="terp-project"/> + <filter string="Pending" domain="[('state','=','pending')]" help="Pending Issues" icon="terp-project"/> + + <separator orientation="vertical"/> + <filter icon="gtk-home" string=" Today " separator="1" domain="[('date','=',time.strftime('%%Y-%%m-%%d'))]" @@ -209,6 +215,9 @@ context="{'group_by':'partner_id'}" /> <filter string="Salesman" icon="terp-crm" domain="[]" context="{'group_by':'user_id'}" /> + <separator orientation="vertical" /> + <filter string="Month" icon="terp-crm" + domain="[]" context="{'group_by':'create_date'}" /> <separator orientation="vertical" /> </group> </search> |