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

[IMP] small fixes 

bzr revid: psi@tinyerp.co.in-20110503131750-24xxudj2qs84vy21
This commit is contained in:
psi (Open ERP) 2011-05-03 18:47:50 +05:30
parent 46cf364574
commit fe16882b43
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
addons/hr_payroll/hr_payroll.py
View File

@ -209,7 +209,7 @@ class hr_payslip_run(osv.osv):
_name = 'hr.payslip.run'
_columns = {
'name':fields.char('Name', size=256, required=True),
'slip_ids':fields.one2many('hr.payslip', 'payslip_group_id', 'Payslips', required=False, readonly=True),
'slip_ids':fields.one2many('hr.payslip', 'payslip_run_id', 'Payslips', required=False, readonly=True),
}
hr_payslip_run()
@ -265,7 +265,7 @@ class hr_payslip(osv.osv):
'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="Indicates this payslip has a refund of another"),
'payslip_group_id': fields.many2one('hr.payslip.run', 'Payslip Run', readonly=True, states={'draft': [('readonly', False)]}),
'payslip_run_id': fields.many2one('hr.payslip.run', 'Payslip Run', readonly=True, states={'draft': [('readonly', False)]}),
}
_defaults = {
'date_from': lambda *a: time.strftime('%Y-%m-01'),

6
addons/hr_payroll/hr_payroll_view.xml
View File

@ -288,7 +288,7 @@
<separator colspan="4" string="Other Information"/>
<group col="5" colspan="2">
<field name="company_id" groups="base.group_multi_company" widget="selection"/>
<field name="payslip_group_id"/>
<field name="payslip_run_id"/>
<field name="paid" readonly="1"/>
</group>
<newline/>
@ -607,8 +607,8 @@
</field>
</record>
<record id="hr_payslip_category_form" model="ir.ui.view">
<field name="name">hr.payslip.category.form</field>
<record id="hr_payslip_run_form" model="ir.ui.view">
<field name="name">hr.payslip.run.form</field>
<field name="model">hr.payslip.run</field>
<field name="type">form</field>
<field name="arch" type="xml">

2
addons/hr_payroll/wizard/hr_payroll_payslips_by_employees.py
View File

@ -51,7 +51,7 @@ class hr_payslip_employees(osv.osv_memory):
'name': slip_data['value'].get('name', False),
'struct_id': slip_data['value'].get('struct_id', False),
'contract_id': slip_data['value'].get('contract_id', False),
'payslip_group_id': context.get('active_id', False),
'payslip_run_id': context.get('active_id', False),
}
slip_id = slip_pool.create(cr, uid, res, context=context)
for input in slip_data['value']['input_line_ids']: