[MERGE] Mutiple web issue fixed merge lp:~openerp-dev/openobject-addons/trunk-addons2...

bzr revid: jam@tinyerp.com-20121123103117-zmig1z5omwux27j3

diff --cc addons/hr/hr_view.xml
index 4464dce,285a508..769e025
--- 1/addons/hr/hr_view.xml
--- 2/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@@ -236,7 -237,7 +237,7 @@@
              <field name="name">Subordinate Hierarchy</field>
              <field name="type">ir.actions.act_window</field>
              <field name="res_model">hr.employee</field>
-             <field name="domain">[('id','in',active_ids)]</field>
 -            <field name="domain">[('parent_id','=',False)]</field>
++            <field name="domain">[('parent_id','=',False),('id','in',active_ids)]</field>
              <field name="view_type">tree</field>
              <field name="view_id" ref="view_partner_tree2"/>
          </record>