diff options
| author | Ajay Chauhan (OpenERP) <cha@tinyerp.com> | 2012-10-23 10:49:57 +0530 |
|---|---|---|
| committer | Ajay Chauhan (OpenERP) <cha@tinyerp.com> | 2012-10-23 10:49:57 +0530 |
| commit | 74ee6c9c8f2fe3d87c8e5cfce81a30e2152a8ad8 (patch) | |
| tree | 7d116c42424dd56469997d981e7ebbf074d6743d /addons/project_issue | |
| parent | 3d9e153cd088943b3595c21a405e2232ffd79711 (diff) | |
| parent | c55438e695d03854ebf1b82aa0d6b33b3dc278f0 (diff) | |
[MERGE] merge with lp:openobject-addons
bzr revid: cha@tinyerp.com-20121023051957-v8mdl714cnne8y2y
Diffstat (limited to 'addons/project_issue')
| -rw-r--r-- | addons/project_issue/project_issue.py | 3 | ||||
| -rw-r--r-- | addons/project_issue/project_issue_view.xml | 18 |
2 files changed, 9 insertions, 12 deletions
diff --git a/addons/project_issue/project_issue.py b/addons/project_issue/project_issue.py index 9e434078d2f..1cb5b20edbd 100644 --- a/addons/project_issue/project_issue.py +++ b/addons/project_issue/project_issue.py @@ -275,7 +275,6 @@ class project_issue(base_stage, osv.osv): 'active': 1, 'partner_id': lambda s, cr, uid, c: s._get_default_partner(cr, uid, c), 'email_from': lambda s, cr, uid, c: s._get_default_email(cr, uid, c), - 'state': 'draft', 'stage_id': lambda s, cr, uid, c: s._get_default_stage_id(cr, uid, c), 'section_id': lambda s, cr, uid, c: s._get_default_section_id(cr, uid, c), 'company_id': lambda s, cr, uid, c: s.pool.get('res.company')._company_default_get(cr, uid, 'crm.helpdesk', context=c), @@ -332,7 +331,7 @@ class project_issue(base_stage, osv.osv): }) vals = { 'task_id': new_task_id, - 'state':'pending' + 'stage_id': self.stage_find(cr, uid, [bug], bug.project_id.id, [('state', '=', 'pending')], context=context), } self.convert_to_task_send_note(cr, uid, [bug.id], context=context) case_obj.write(cr, uid, [bug.id], vals, context=context) diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml index 4cd9e2c19ff..6ff5388ce4a 100644 --- a/addons/project_issue/project_issue_view.xml +++ b/addons/project_issue/project_issue_view.xml @@ -11,7 +11,7 @@ <field name="type">ir.actions.server</field> <field name="model_id" ref="model_project_issue"/> <field name="state">code</field> - <field name="code">self.message_check_and_set_unread(cr, uid, context.get('active_ids'), context=context)</field> + <field name="code">self.message_mark_as_unread(cr, uid, context.get('active_ids'), context=context)</field> </record> <record id="action_project_issue_unread" model="ir.values"> <field name="name">action_project_issue_unread</field> @@ -29,7 +29,7 @@ <field name="type">ir.actions.server</field> <field name="model_id" ref="model_project_issue"/> <field name="state">code</field> - <field name="code">self.message_check_and_set_read(cr, uid, context.get('active_ids'), context=context)</field> + <field name="code">self.message_mark_as_read(cr, uid, context.get('active_ids'), context=context)</field> </record> <record id="action_project_issue_read" model="ir.values"> <field name="name">action_project_issue_read</field> @@ -95,14 +95,12 @@ <field name="arch" type="xml"> <form string="Issue" version="7.0"> <header> - <span groups="base.group_user"> - <button name="case_close" string="Done" type="object" - states="open"/> - <button name="case_close" string="Done" type="object" - states="draft,pending"/> - <button name="case_cancel" string="Cancel" type="object" - states="draft,open,pending"/> - </span> + <button name="case_close" string="Done" type="object" + states="open" groups="base.group_user"/> + <button name="case_close" string="Done" type="object" + states="draft,pending" groups="base.group_user"/> + <button name="case_cancel" string="Cancel" type="object" + states="draft,open,pending" groups="base.group_user"/> <field name="stage_id" widget="statusbar" clickable="True"/> </header> <sheet string="Issue"> |