[MERGE] merge from trunk payroll

bzr revid: mra@mra-laptop-20110411122559-8s7vnahm7jguta5d

diff --cc addons/hr_payroll/hr_payroll.py
index 5937bb7,6725b28..2f1dbe9
--- 1/addons/hr_payroll/hr_payroll.py
--- 2/addons/hr_payroll/hr_payroll.py
+++ b/addons/hr_payroll/hr_payroll.py
@@@ -227,8 -246,9 +227,8 @@@ class hr_payslip(osv.osv)
          'paid': fields.boolean('Made Payment Order ? ', required=False, readonly=True, states={'draft': [('readonly', False)]}),
          'note': fields.text('Description'),
          'contract_id': fields.many2one('hr.contract', 'Contract', required=False, readonly=True, states={'draft': [('readonly', False)]}),
 +        'details_by_salary_head': fields.function(_get_lines_salary_head, method=True, type='one2many', relation='hr.payslip.line', string='Details by Salary Head'),
-         'credit_note': fields.boolean('Credit Note', help="It indicates that the payslip has been refunded", readonly=True),
+         'credit_note': fields.boolean('Credit Note', help="Indicates this payslip has a refund of another"),
 -       #TODO put me back
 -       # 'details_by_salary_head': fields.function(_get_salary_rules, method=True, type='one2many', relation='hr.salary.rule', string='Details by Salary Head', multi='details_by_salary_head'),
      }
      _defaults = {
          'date_from': lambda *a: time.strftime('%Y-%m-01'),

diff --cc addons/hr_payroll/hr_payroll_view.xml
Simple merge