diff --git a/openerp/addons/base/res/res_company_view.xml b/openerp/addons/base/res/res_company_view.xml index dbeabb2cde5f6e913983311b6395ac0b3055f3fc..bec08c4880d304727382c88d05984966aeba5771 100644 --- a/openerp/addons/base/res/res_company_view.xml +++ b/openerp/addons/base/res/res_company_view.xml @@ -111,14 +111,6 @@ <field name="help">Create and manage the companies that will be managed by Odoo from here. Shops or subsidiaries can be created and maintained from here.</field> </record> <menuitem action="action_res_company_form" id="menu_action_res_company_form" parent="base.menu_users" groups="base.group_light_multi_company"/> - <record id="action_res_company_tree" model="ir.actions.act_window"> - <field name="name">Company's Structure</field> - <field name="type">ir.actions.act_window</field> - <field name="res_model">res.company</field> - <field name="domain">[('parent_id','=',False)]</field> - <field name="view_type">tree</field> - </record> - <menuitem action="action_res_company_tree" groups="base.group_multi_company" id="menu_action_res_company_tree" parent="base.menu_users" sequence="2"/> <record id="ir_open_company" model="ir.values"> <field eval="'tree_but_open'" name="key2"/> diff --git a/openerp/addons/base/tests/test_ir_values.py b/openerp/addons/base/tests/test_ir_values.py index ad8dee616b77222cc2d524d0ade34563d666e550..c59f93a2db09bfa04bd8e76391e73eb34bf222d2 100644 --- a/openerp/addons/base/tests/test_ir_values.py +++ b/openerp/addons/base/tests/test_ir_values.py @@ -53,7 +53,6 @@ class test_ir_values(common.TransactionCase): act_id_1 = self.ref('base.act_values_form_action') act_id_2 = self.ref('base.act_values_form_defaults') act_id_3 = self.ref('base.action_res_company_form') - act_id_4 = self.ref('base.action_res_company_tree') ir_values = self.registry('ir.values') ir_values.set(self.cr, self.uid, 'action', 'tree_but_open', 'OnDblClick Action', ['unexisting_model'], 'ir.actions.act_window,%d' % act_id_1, isobject=True) @@ -63,7 +62,6 @@ class test_ir_values(common.TransactionCase): reports = self.registry('ir.actions.report.xml').browse(self.cr, self.uid, report_ids, {}) report_id = [report.id for report in reports if not report.groups_id][0] # assume at least one ir_values.set(self.cr, self.uid, 'action', 'client_print_multi', 'Nice Report', ['unexisting_model'], 'ir.actions.report.xml,%d' % report_id, isobject=True) - ir_values.set(self.cr, self.uid, 'action', 'client_action_relate', 'Related Stuff', ['unexisting_model'], 'ir.actions.act_window,%d' % act_id_4, isobject=True) # Replace one action binding to set a new name. @@ -96,12 +94,5 @@ class test_ir_values(common.TransactionCase): assert actions[0][1] == 'Nice Report', 'Bound action does not match definition' assert isinstance(actions[0][2], dict) and actions[0][2]['id'] == report_id, 'Bound action does not match definition' - actions = ir_values.get(self.cr, self.uid, 'action', 'client_action_relate', ['unexisting_model']) - assert len(actions) == 1, "Mismatching number of bound actions" - assert len(actions[0]) == 3, "Malformed action definition" - assert actions[0][1] == 'Related Stuff', 'Bound action does not match definition' - assert isinstance(actions[0][2], dict) and actions[0][2]['id'] == act_id_4, 'Bound action does not match definition' - - if __name__ == '__main__': unittest2.main()