pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[MERGE] lp:884208 remove duplicate field resource_calendar_id in project views

Browse Source 
bzr revid: rco@openerp.com-20111129123513-0dr0hjfgbmd6ot2o
This commit is contained in:
Raphael Collet
2011-11-29 13:35:13 +01:00
parent fac6c3538e 5dff282049
commit d4c39164c5
5 changed files with 2 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/project/project_view.xml
+1
View File
@@ -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"/>
addons/project_issue/project_issue.py
-1
View File
@@ -487,7 +487,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)
}
addons/project_issue/project_issue_view.xml
-13
View File
@@ -398,19 +398,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>
addons/project_long_term/__openerp__.py
+1 -1
View File
@@ -26,7 +26,7 @@
"website": "http://www.openerp.com",
"category": "Project Management",
"images": ["images/project_phase_form.jpeg","images/project_phases.jpeg", "images/resources_allocation.jpeg"],
"depends": ["resource", "project"],
"depends": ["project"],
"description": """
Long Term Project management module that tracks planning, scheduling, resources allocation.
===========================================================================================
addons/project_long_term/project_long_term_view.xml
-17
View File
@@ -273,23 +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
# ------------------------------------------------------