[MERGE] lp:~openerp-dev/openobject-addons/trunk-addons_issue2_hr-rpr

bzr revid: stw@openerp.com-20120801130214-5idx134z30pf21vl
2012-08-01 15:02:14 +02:00
parent acaec8b582 2e4c6523af
commit 1e89c72745
1 changed files with 2 additions and 3 deletions
@@ -659,11 +659,10 @@


        <act_window name="All Children Rules"
-            domain="[('id', 'in', [active_id])]"
+            domain="[('parent_rule_id', '=', active_id)]"
            res_model="hr.salary.rule"
            src_model="hr.salary.rule"
-            view_id="hr_salary_rule_tree"
-            view_type="tree"
+            view_id="hr_salary_rule_list"
            id="act_children_salary_rules"/>

        <!-- payslip runs -->