[FIX]project: add resource_calendar_id field in project.project
lp bug: https://launchpad.net/bugs/884208 fixed bzr revid: kjo@tinyerp.com-20111117061503-4bos5thfpdfubkp0
This commit is contained in:
parent
9f1a608819
commit
7e7cb6c131
|
@ -34,6 +34,7 @@
|
|||
<separator colspan="2" string="Performance"/>
|
||||
<field name="planned_hours" widget="float_time"/>
|
||||
<field name="effective_hours" widget="float_time" />
|
||||
<field name="resource_calendar_id"/>
|
||||
</group>
|
||||
<group col="2" colspan="2" name="misc">
|
||||
<separator colspan="4" string="Miscelleanous"/>
|
||||
|
|
|
@ -480,7 +480,6 @@ project_issue()
|
|||
class project(osv.osv):
|
||||
_inherit = "project.project"
|
||||
_columns = {
|
||||
'resource_calendar_id' : fields.many2one('resource.calendar', 'Working Time', help="Timetable working hours to adjust the gantt diagram report", states={'close':[('readonly',True)], 'cancelled':[('readonly',True)]}),
|
||||
'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)
|
||||
}
|
||||
|
|
|
@ -396,20 +396,6 @@
|
|||
# ------------------------------------------------------
|
||||
# Project
|
||||
# ------------------------------------------------------
|
||||
|
||||
<record id="project.view_project_resource_form1" model="ir.ui.view">
|
||||
<field name="name">Project Resource Calendar View</field>
|
||||
<field name="model">project.project</field>
|
||||
<field name="type">form</field>
|
||||
<field name="inherit_id" ref="project.edit_project"/>
|
||||
<field name="arch" type="xml">
|
||||
<field name="priority" position="after">
|
||||
<field name="resource_calendar_id"/>
|
||||
</field>
|
||||
|
||||
</field>
|
||||
</record>
|
||||
|
||||
<record id="view_project_form_inherited" model="ir.ui.view">
|
||||
<field name="name">project.project.form.inherited</field>
|
||||
<field name="model">project.project</field>
|
||||
|
|
|
@ -273,22 +273,6 @@
|
|||
</record>
|
||||
|
||||
|
||||
# ------------------------------------------------------
|
||||
# Project
|
||||
# ------------------------------------------------------
|
||||
|
||||
<record id="project.view_project_user_form1" model="ir.ui.view">
|
||||
<field name="name">Project Resource Calendar View</field>
|
||||
<field name="model">project.project</field>
|
||||
<field name="type">form</field>
|
||||
<field name="inherit_id" ref="project.edit_project"/>
|
||||
<field name="arch" type="xml">
|
||||
<field name="effective_hours" position="after">
|
||||
<field name="resource_calendar_id"/>
|
||||
</field>
|
||||
|
||||
</field>
|
||||
</record>
|
||||
|
||||
# ------------------------------------------------------
|
||||
# Project Task
|
||||
|
|
Loading…
Reference in New Issue