[MERGE] bugfix for assert error: Human Resources/Configuration/Human Resources/Employees/Categories of Employee/Categories structure

while open the employee view form above menu and try to filter results, i am getting this assertion error.

bzr revid: qdp-launchpad@openerp.com-20110530165804-h46rxi92qxzljr8w
This commit is contained in:
Quentin (OpenERP)
2011-05-30 18:58:04 +02:00
+7 -6
View File
@@ -157,12 +157,12 @@
<menuitem action="open_view_employee_list_my" id="menu_open_view_employee_list_my" sequence="3" parent="menu_hr_main"/>
<record id="ir_ui_view_sc_employee" model="ir.ui.view_sc">
<field name="name">Employees</field>
<field name="resource">ir.ui.menu</field>
<field name="user_id" ref="base.user_root"/>
<field name="res_id" ref="hr.menu_open_view_employee_list_my"/>
</record>
<record id="ir_ui_view_sc_employee" model="ir.ui.view_sc">
<field name="name">Employees</field>
<field name="resource">ir.ui.menu</field>
<field name="user_id" ref="base.user_root"/>
<field name="res_id" ref="hr.menu_open_view_employee_list_my"/>
</record>
<!--
=======================
@@ -216,6 +216,7 @@
<field name="model">hr.employee</field>
<field name="type">tree</field>
<field name="field_parent">child_ids</field>
<field eval="20" name="priority"/>
<field name="arch" type="xml">
<tree string="Employees">
<field name="name"/>