diff options
| author | Martin Trigaux <mat@openerp.com> | 2013-05-15 13:17:55 +0200 |
|---|---|---|
| committer | Martin Trigaux <mat@openerp.com> | 2013-05-15 13:17:55 +0200 |
| commit | 23b50c8da1a5eb9fdbe4f90cbd7e1b545efcb3c1 (patch) | |
| tree | 7c081137d430fcd82b7f890038c39e3334d17f17 /addons/project_issue | |
| parent | 5aeaef4c3286a83fb8638ee6b507c0381e24e7cc (diff) | |
| parent | b5b6dfbbf0e3defc9a823ddb7ecc8aaeb9f07c0b (diff) | |
[MERGE] sync with latest trunk
bzr revid: mat@openerp.com-20130515111755-af33z1frq6jc6hpo
Diffstat (limited to 'addons/project_issue')
| -rw-r--r-- | addons/project_issue/project_issue_view.xml | 5 | ||||
| -rw-r--r-- | addons/project_issue/report/project_issue_report_view.xml | 2 | ||||
| -rw-r--r-- | addons/project_issue/test/subscribe_issue.yml | 5 |
3 files changed, 6 insertions, 6 deletions
diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml index f888ff9da77..f15355e9cc8 100644 --- a/addons/project_issue/project_issue_view.xml +++ b/addons/project_issue/project_issue_view.xml @@ -146,7 +146,7 @@ <field name="model">project.issue</field> <field name="arch" type="xml"> <search string="Issue Tracker Search"> - <field name="name" string="Issue" filter_domain="['|', '|',('description','ilike',self),('email_from','ilike',self),('name','ilike',self)]"/> + <field name="name" string="Issue" filter_domain="['|', '|', '|', ('partner_id','child_of',self), ('description','ilike',self),('email_from','ilike',self),('name','ilike',self)]"/> <field name="id"/> <filter icon="terp-mail-message-new" string="Unread Messages" name="message_unread" domain="[('message_unread','=',True)]"/> <separator/> @@ -154,10 +154,11 @@ <filter string="To Do" domain="[('state','=','open')]" help="To Do Issues" icon="terp-check"/> <separator/> <filter string="Unassigned Issues" domain="[('user_id','=',False)]" help="Unassigned Issues" icon="terp-personal-"/> - <field name="partner_id"/> + <separator/> <field name="user_id"/> <field name="project_id"/> <field name="categ_ids"/> + <field name="partner_id" filter_domain="[('partner_id', 'child_of', self)]"/> <group expand="0" string="Group By..." > <filter string="Responsible" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/> <filter string="Contact" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/> diff --git a/addons/project_issue/report/project_issue_report_view.xml b/addons/project_issue/report/project_issue_report_view.xml index e56c6612e0d..a885dcd8a7f 100644 --- a/addons/project_issue/report/project_issue_report_view.xml +++ b/addons/project_issue/report/project_issue_report_view.xml @@ -55,7 +55,7 @@ <filter icon="terp-dialog-close" string="Done" domain="[('state','=','done')]"/> <field name="project_id"/> <field name="user_id"/> - <field name="partner_id"/> + <field name="partner_id" filter_domain="[('partner_id', 'child_of', self)]"/> <field name="version_id"/> <group expand="1" string="Group By..."> <filter string="Assigned to" name="Responsible" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}" /> diff --git a/addons/project_issue/test/subscribe_issue.yml b/addons/project_issue/test/subscribe_issue.yml index 9f16dc80b97..af81ff4d295 100644 --- a/addons/project_issue/test/subscribe_issue.yml +++ b/addons/project_issue/test/subscribe_issue.yml @@ -2,8 +2,7 @@ In Order to test process of Issue in OpenERP, Custmer send the issue by email. - !python {model: mail.thread}: | - from openerp import addons - request_file = open(addons.get_module_resource('project_issue','test', 'issue.eml'),'rb') + request_file = open(openerp.modules.module.get_module_resource('project_issue','test', 'issue.eml'),'rb') request_message = request_file.read() self.message_process(cr, uid, 'project.issue', request_message) - @@ -14,4 +13,4 @@ assert issue_ids and len(issue_ids), "issue is not created after getting request" issue = self.browse(cr, uid, issue_ids[0], context=context) assert not issue.partner_id, "Customer should be a new" - assert issue.name == "Error in the account module", "Subject does not match"
\ No newline at end of file + assert issue.name == "Error in the account module", "Subject does not match" |