odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[MERGE] payroll: usability 

bzr revid: qdp-launchpad@openerp.com-20110710013513-hvu3brjm502nn2hv
This commit is contained in:
Quentin (OpenERP) 2011-07-10 03:35:13 +02:00
parent cba867fbf5 48c01fbf51
commit ccac68b4a0
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/hr_payroll/hr_payroll.py
View File

@ -278,7 +278,7 @@ class hr_payslip(osv.osv):
'note': fields.text('Description', readonly=True, states={'draft':[('readonly',False)]}),
'contract_id': fields.many2one('hr.contract', 'Contract', required=False, readonly=True, states={'draft': [('readonly', False)]}),
'details_by_salary_rule_category': fields.function(_get_lines_salary_rule_category, method=True, type='one2many', relation='hr.payslip.line', string='Details by Salary Rule Category'),
'credit_note': fields.boolean('Credit Note', help="Indicates this payslip has a refund of another"),
'credit_note': fields.boolean('Credit Note', help="Indicates this payslip has a refund of another", readonly=True, states={'draft': [('readonly', False)]}),
'payslip_run_id': fields.many2one('hr.payslip.run', 'Payslip Run', readonly=True, states={'draft': [('readonly', False)]}),
}
_defaults = {

2
addons/hr_payroll/hr_payroll_view.xml
View File

@ -551,7 +551,7 @@
<field name="category_id"/>
<field name="sequence" />
<field name="active"/>
<field name="appears_on_payslip" attrs="{'readonly':[('company_contribution','=', True)]}" />
<field name="appears_on_payslip"/>
<field name="company_id" widget="selection" groups="base.group_multi_company"/>
</group>
<notebook colspan="6">