diff options
Diffstat (limited to 'addons/project_long_term')
| -rw-r--r-- | addons/project_long_term/project_long_term.py | 19 | ||||
| -rw-r--r-- | addons/project_long_term/project_long_term_view.xml | 43 |
2 files changed, 44 insertions, 18 deletions
diff --git a/addons/project_long_term/project_long_term.py b/addons/project_long_term/project_long_term.py index 19d58f101ef..a4df1eb6917 100644 --- a/addons/project_long_term/project_long_term.py +++ b/addons/project_long_term/project_long_term.py @@ -225,13 +225,9 @@ class project(osv.osv): _columns = { 'phase_ids': fields.one2many('project.phase', 'project_id', "Project Phases"), - 'use_phases': fields.boolean('Use Phases', help="Check this field if project manages phases"), 'phase_count': fields.function(_phase_count, type='integer', string="Open Phases"), } - _defaults = { - 'use_phases': True, - } - + def schedule_phases(self, cr, uid, ids, context=None): context = context or {} if type(ids) in (long, int,): @@ -273,6 +269,19 @@ class project(osv.osv): return True project() +class account_analytic_account(osv.osv): + _inherit = 'account.analytic.account' + _description = 'Analytic Account' + _columns = { + 'use_phases': fields.boolean('Phases Planing', help="Check this field if project manages phases"), + } + + 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_phases') + +account_analytic_account() + class project_task(osv.osv): _inherit = "project.task" _columns = { diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml index aaee541c9e6..e313f8944b2 100644 --- a/addons/project_long_term/project_long_term_view.xml +++ b/addons/project_long_term/project_long_term_view.xml @@ -97,6 +97,13 @@ # ------------------------------------------------------ # Project Phase # ------------------------------------------------------ + <act_window id="act_project_phases" + name="Phases" + src_model="project.project" + res_model="project.phase" + view_type="form" + view_mode="tree,form" + context="{'search_default_project_id': [active_id], 'default_project_id': active_id}"/> <record id="project_phase_form" model="ir.ui.view"> <field name="name">Inherit project form : Phase</field> @@ -104,21 +111,15 @@ <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_phases"/> - </field> + <xpath expr='//tr[@name="use_tasks_row"]' position='after'> + <tr> + <td><group><field name="use_phases"/></group></td> + <td><button icon="terp-gtk-go-back-rtl" name="%(act_project_phases)d" string="Phases" type="action" attrs="{'invisible':[('use_phases','=', 0)]}"/></td> + </tr> + </xpath> </field> </record> - <act_window id="act_project_phases" - name="Phases" - src_model="project.project" - res_model="project.phase" - view_type="form" - view_mode="tree,form" - context="{'search_default_project_id': [active_id], 'default_project_id': active_id}" - /> - <record id="view_project_kanban_phase" model="ir.ui.view"> <field name="name">project.project.kanban.inherited</field> <field name="model">project.project</field> @@ -376,6 +377,22 @@ view_mode="tree,form" /> + <record id="analytic_account_inherited_phase_form" model="ir.ui.view"> + <field name="name">account.analytic.account.phase.form.inherit</field> + <field name="model">account.analytic.account</field> + <field name="type">form</field> + <field name="inherit_id" ref="analytic.view_account_analytic_account_form"/> + <field eval="18" name="priority"/> + <field name="arch" type="xml"> + <xpath expr='//separator[@name="project_sep"]' position='replace'> + <separator name="project_sep" string="Project Management" colspan="4"/> <!-- removal of invisible attribute --> + </xpath> + <xpath expr='//separator[@name="project_sep"]' position='after'> + <field name="use_phases"/> + </xpath> + </field> + </record> + # ------------------------------------------------------ # Menu Items # ------------------------------------------------------ @@ -392,7 +409,7 @@ parent="base.menu_project_long_term" sequence="2"/> <menuitem id="menu_pm_users_project1" - name="Resources" parent="project.menu_definitions" sequence="3"/> + name="Resources" parent="base.menu_definitions" sequence="3"/> <menuitem id="menu_phase_schedule" name="Scheduling" parent="base.menu_main_pm" sequence="4" groups="project.group_project_user,project.group_project_manager"/> <menuitem action="resource.action_resource_resource_tree" id="menu_view_resource" parent="menu_pm_users_project1" sequence="2"/> |