diff options
Diffstat (limited to 'addons/project_issue')
| -rw-r--r-- | addons/project_issue/project_issue.py | 19 | ||||
| -rw-r--r-- | addons/project_issue/project_issue_view.xml | 26 |
2 files changed, 36 insertions, 9 deletions
diff --git a/addons/project_issue/project_issue.py b/addons/project_issue/project_issue.py index ad6e7afdbcc..976a706ac54 100644 --- a/addons/project_issue/project_issue.py +++ b/addons/project_issue/project_issue.py @@ -591,14 +591,9 @@ class project(osv.osv): _columns = { 'project_escalation_id' : fields.many2one('project.project','Project Escalation', help='If any issue is escalated from the current Project, it will be listed under the project selected here.', states={'close':[('readonly',True)], 'cancelled':[('readonly',True)]}), 'reply_to' : fields.char('Reply-To Email Address', size=256), - 'use_issues' : fields.boolean('Use Issues', help="Check this field if this project manages issues"), 'issue_count': fields.function(_issue_count, type='integer'), } - _defaults = { - 'use_issues': True, - } - def _check_escalation(self, cr, uid, ids, context=None): project_obj = self.browse(cr, uid, ids[0], context=context) if project_obj.project_escalation_id: @@ -611,4 +606,18 @@ class project(osv.osv): ] project() +class account_analytic_account(osv.osv): + _inherit = 'account.analytic.account' + _description = 'Analytic Account' + + _columns = { + 'use_issues' : fields.boolean('Issues Tracking', help="Check this field if this project manages issues"), + } + + def _trigger_project_creation(self, cr, uid, vals, context=None): + res = super(account_analytic_account, self)._trigger_project_creation(cr, uid, vals, context=context) + return res or vals.get('use_issues') + +account_analytic_account() + # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml index 1d8fe6b2509..0cbde2a2020 100644 --- a/addons/project_issue/project_issue_view.xml +++ b/addons/project_issue/project_issue_view.xml @@ -2,7 +2,7 @@ <openerp> <data> - <menuitem id="menu_project_confi" name="Issues" parent="project.menu_definitions" sequence="2"/> + <menuitem id="menu_project_confi" name="Issues" parent="base.menu_definitions" sequence="2"/> <record model="ir.ui.view" id="project_issue_version_search_view"> <field name="name">Issue Version</field> @@ -340,9 +340,12 @@ <field name="type">form</field> <field name="inherit_id" ref="project.edit_project"/> <field name="arch" type="xml"> - <field name="use_tasks" position="after"> - <field name="use_issues"/> - </field> + <xpath expr='//tr[@name="use_tasks_row"]' position='after'> + <tr> + <td><group><field name="use_issues"/></group></td> + <td><button icon="terp-gtk-go-back-rtl" name="%(act_project_project_2_project_issue_all)d" string="Issues" type="action" attrs="{'invisible':[('use_issues','=', 0)]}"/></td> + </tr> + </xpath> <field name="priority" position="before"> <field name="project_escalation_id"/> <field name="reply_to"/> @@ -367,5 +370,20 @@ </xpath> </field> </record> + <record id="analytic_account_inherited_issue_form" model="ir.ui.view"> + <field name="name">account.analytic.account.issue.form.inherit</field> + <field name="model">account.analytic.account</field> + <field name="type">form</field> + <field name="inherit_id" ref="project.analytic_account_inherited_form"/> + <field eval="18" name="priority"/> + <field name="arch" type="xml"> + <xpath expr='//separator[@name="project_sep"]' position='replace'> + <separator colspan="4" string="Project Management" name="project_sep"/> <!-- removal of invisible attribute --> + </xpath> + <xpath expr='//separator[@name="project_sep"]' position='after'> + <field name="use_issues" /> + </xpath> + </field> + </record> </data> </openerp> |