[IMP] hr_payroll:improved 'hr.employee',commented m2m field i.e. Salary Rules on...

bzr revid: mtr@mtr-20110303103321-ecd9eooj9l6ixlgo

diff --git a/addons/hr_payroll/hr_payroll.py b/addons/hr_payroll/hr_payroll.py
index 2bb3214..ecb8875 100644 (file)
--- a/addons/hr_payroll/hr_payroll.py
+++ b/addons/hr_payroll/hr_payroll.py
@@ -1233,7 +1233,7 @@ class hr_employee(osv.osv):
         'net': fields.function(_calculate_salary, method=True, multi='dc', type='float', string='Net Salary', digits=(14,2)),
         'advantages_net': fields.function(_calculate_salary, method=True, multi='dc', type='float', string='Deductions', digits=(14,2)),
         'advantages_gross': fields.function(_calculate_salary, method=True, multi='dc', type='float', string='Allowances', digits=(14,2)),
-        'emp_sal_rule_ids':fields.many2many('hr.salary.rule', 'hr_emp_salary_rule_rel', 'employee_id', 'rule_id', 'Salary Rules', readonly=False),
+#        'emp_sal_rule_ids':fields.many2many('hr.salary.rule', 'hr_emp_salary_rule_rel', 'employee_id', 'rule_id', 'Salary Rules', readonly=False),
     }
 hr_employee()
 

diff --git a/addons/hr_payroll/hr_payroll_view.xml b/addons/hr_payroll/hr_payroll_view.xml
index 326fa6c..2162f25 100644 (file)
--- a/addons/hr_payroll/hr_payroll_view.xml
+++ b/addons/hr_payroll/hr_payroll_view.xml
@@ -107,11 +107,11 @@
                         </group>
                     </page>
                 </xpath>
-                <xpath expr="/form/notebook/page[@string='Categories']" position="after">
+                <!--<xpath expr="/form/notebook/page[@string='Categories']" position="after">
                        <page string="Salary Rules">
                           <field name="emp_sal_rule_ids" nolabel="1" widget="one2many_list"/>
                        </page>
-                </xpath>
+                </xpath>-->
             </data>
             </field>
         </record>