odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[FIX] project: Removed parent_id from project to avoid ambiguity. 

lp bug: https://launchpad.net/bugs/697443 fixed

bzr revid: uco@tinyerp.com-20110105124718-ck9vgb1uoqrfj9qb
This commit is contained in:
uco (OpenERP) 2011-01-05 18:17:18 +05:30
parent 861023719c
commit 6c600565a9
4 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
addons/project/project.py
View File

@ -129,7 +129,6 @@ class project(osv.osv):
'priority': fields.integer('Sequence', help="Gives the sequence order when displaying a list of task"),
'warn_manager': fields.boolean('Warn Manager', help="If you check this field, the project manager will receive a request each time a task is completed by his team.", states={'close':[('readonly',True)], 'cancelled':[('readonly',True)]}),
'members': fields.many2many('res.users', 'project_user_rel', 'project_id', 'uid', 'Project Members', help="Project's member. Not used in any computation, just for information purpose.", states={'close':[('readonly',True)], 'cancelled':[('readonly',True)]}),
'parent_id': fields.many2one('project.project', 'Parent Project'),
'tasks': fields.one2many('project.task', 'project_id', "Project tasks"),
'planned_hours': fields.function(_progress_rate, multi="progress", method=True, string='Planned Time', help="Sum of planned hours of all tasks related to this project and its child projects.",
store = {

4
addons/project/project_data.xml
View File

@ -17,13 +17,13 @@
<!--
Resource: project.project
-->
<record id="all_projects_account" model="account.analytic.account">
<field name="name">Projects</field>
<field name="code">3</field>
</record>
<function eval="('default',False,'parent_id', [('project.project', False)], all_projects_account, True, False, False, False, True)" id="parent_project_default_set" model="ir.values" name="set"/>
-->
</data>
</openerp>

4
addons/project/project_demo.xml
View File

@ -241,10 +241,10 @@
</record>
<!-- Projects -->
<record id="all_projects_account" model="project.project">
<!-- <record id="all_projects_account" model="project.project">
<field name="name">Projects</field>
<field name="code">3</field>
</record>
</record> -->
<record id="project_project_9" model="project.project">
<field name="warn_manager">1</field>

4
addons/project/project_view.xml
View File

@ -21,7 +21,7 @@
<form string="Project">
<group colspan="6" col="6">
<field name="name" string="Project Name" select="1"/>
<field name="parent_id" domain="[('id','!=',active_id)]"/>
<field name="parent_id" string="Parent Project" domain="[('id','!=',active_id)]"/>
<field name="user_id" string="Project Manager" select="1" attrs="{'readonly':[('state','in',['close', 'cancelled'])]}"/>
<field name="date_start" string="Start Date" attrs="{'readonly':[('state','in',['close', 'cancelled'])]}"/>
<field name="date" string="End Date" attrs="{'readonly':[('state','in',['close', 'cancelled'])]}"/>
@ -143,7 +143,7 @@
<field name="name" string="Project Name"/>
<field name="user_id" string="Project Manager"/>
<field name="partner_id" string="Partner"/>
<field name="parent_id" invisible="1"/>
<field name="parent_id" string="Parent Project" invisible="1"/>
<field name="planned_hours" widget="float_time"/>
<field name="total_hours" widget="float_time"/>
<field name="effective_hours" widget="float_time"/>