[IMP] hr_payroll:added default company_id on salary rules

bzr revid: mtr@mtr-20110307094710-px4r3q1ik57h536k

diff --git a/addons/hr_payroll/hr_payroll.py b/addons/hr_payroll/hr_payroll.py
index ccac759..cd48b8d 100644 (file)
--- a/addons/hr_payroll/hr_payroll.py
+++ b/addons/hr_payroll/hr_payroll.py
@@ -1261,6 +1261,9 @@ class hr_salary_rule(osv.osv):
         'sequence': 5,
         'appears_on_payslip': True,
         'active': True,
+        'company_id': lambda self, cr, uid, context: \
+                self.pool.get('res.users').browse(cr, uid, uid,
+                    context=context).company_id.id,
      }
 
 hr_salary_rule()

diff --git a/addons/hr_payroll/hr_payroll_view.xml b/addons/hr_payroll/hr_payroll_view.xml
index eb04ae3..e338609 100644 (file)
--- a/addons/hr_payroll/hr_payroll_view.xml
+++ b/addons/hr_payroll/hr_payroll_view.xml
@@ -597,7 +597,7 @@
                    <field name="code" select="1"/>
                    <field name="active"/>
                    <field name="sequence" />
-                   <field name="company_id" widget="selection"/>
+                   <field name="company_id" widget="selection" groups="base.group_multi_company"/>
                    <field name="appears_on_payslip"/>
                 </group>
                 <group col="6" colspan="6">