[IMP/MERGE]

bzr revid: apa@tinyerp.com-20120327124723-iw94ropknw5t86rs
This commit is contained in:
Amit Patel (OpenERP)
2012-03-27 18:17:23 +05:30
+11 -10
View File
@@ -19,7 +19,7 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Project">
<group colspan="4" col="8">
<group colspan="4" col="6">
<field name="name" string="Project Name" select="1"/>
<field name="analytic_account_id" invisible="1" required="0"/>
<field name="parent_id" string="Parent" domain="[('id','!=',analytic_account_id)]" context="{'current_model': 'project.project'}"/>
@@ -30,12 +30,19 @@
</group>
<notebook colspan="4">
<page string="Administration">
<group col="2" colspan="2" name="kanban">
<separator colspan="2" string="Project Management"/>
<!--<group col="2" colspan="2" name="kanban">-->
<field name="task"/>
<!--</group>-->
</group>
<group col="2" colspan="2">
<separator colspan="2" string="Performance"/>
<separator colspan="4" string="Performance"/>
<field name="planned_hours" widget="float_time"/>
<field name="effective_hours" widget="float_time" />
<field name="resource_calendar_id"/>
</group>
<newline/>
<group col="2" colspan="2" name="misc">
<separator colspan="4" string="Miscelleanous"/>
<field name="company_id" select="1" groups="base.group_multi_company" widget="selection" required="1"/>
@@ -43,12 +50,6 @@
<field name="priority"/>
<field name="active" attrs="{'invisible':[('state','in',['open', 'pending', 'template'])]}"/>
</group>
<separator colspan="2" string="Kanban Configuration"/>
<newline/>
<group col="4" colspan="2" name="kanban">
<!--<separator colspan="2" string="Kanban Configuration"/>-->
<field name="task"/>
</group>
<newline/>
<separator colspan="4"/>
<group col="9" colspan="8">
@@ -630,10 +631,10 @@
<menuitem id="menu_tasks_config" name="GTD" parent="project.menu_definitions" sequence="1"/>
<menuitem id="menu_project_config_project" name="Projects and Stages" parent="menu_definitions" sequence="1"/>
<menuitem id="menu_project_config_project" name="Stages" parent="menu_definitions" sequence="1"/>
<menuitem action="open_task_type_form" id="menu_task_types_view" parent="menu_project_config_project" sequence="2" groups="base.group_no_one"/>
<menuitem action="open_view_project_all" id="menu_open_view_project_all" parent="menu_project_config_project" sequence="1" groups="base.group_no_one"/>
<menuitem action="open_view_project_all" id="menu_projects" name="Projects" parent="menu_project_management" sequence="1"/>
<act_window context="{'search_default_user_id': [active_id], 'default_user_id': active_id}" id="act_res_users_2_project_project" name="User's projects" res_model="project.project" src_model="res.users" view_mode="tree,form" view_type="form"/>