Kuldeep Joshi(OpenERP) has proposed merging
lp:~openerp-dev/openobject-addons/trunk-bug-884208-kjo into
lp:openobject-addons.
Requested reviews:
Bhumika (OpenERP) (sbh-openerp)
Related bugs:
Bug #884208 in OpenERP Addons: "error in project : view error Form view has
duplicate field: resource_calendar_id"
https://bugs.launchpad.net/openobject-addons/+bug/884208
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-bug-884208-kjo/+merge/82501
Add resource_calendar_id field in project.project
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-bug-884208-kjo/+merge/82501
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-addons/trunk-bug-884208-kjo.
=== modified file 'project/project_view.xml'
--- project/project_view.xml 2011-11-16 14:59:58 +0000
+++ project/project_view.xml 2011-11-17 06:20:38 +0000
@@ -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"/>
=== modified file 'project_issue/project_issue.py'
--- project_issue/project_issue.py 2011-11-16 13:17:24 +0000
+++ project_issue/project_issue.py 2011-11-17 06:20:38 +0000
@@ -487,7 +487,6 @@
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)
}
=== modified file 'project_issue/project_issue_view.xml'
--- project_issue/project_issue_view.xml 2011-11-15 10:39:27 +0000
+++ project_issue/project_issue_view.xml 2011-11-17 06:20:38 +0000
@@ -397,20 +397,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>
=== modified file 'project_long_term/project_long_term_view.xml'
--- project_long_term/project_long_term_view.xml 2011-11-14 12:24:10 +0000
+++ project_long_term/project_long_term_view.xml 2011-11-17 06:20:38 +0000
@@ -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
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to : [email protected]
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp
