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

[IMP]: improvement to view, add links to employee for payslip 

[ADD]: add demo data for the contract

bzr revid: mga@tinyerp.com-20101007091900-tglpl048qpffnle8
This commit is contained in:
Mantavya Gajjar 2010-10-07 14:49:00 +05:30
parent e74b9a6f31
commit 1a2015de2c
3 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
addons/hr_payroll/hr_payroll.py
View File

@ -1230,6 +1230,7 @@ class hr_employee(osv.osv):
'bank_account_id':fields.many2one('res.partner.bank', 'Bank Account', domain="[('partner_id','=',partner_id)]", help="Employee bank salary account"),
'line_ids':fields.one2many('hr.payslip.line', 'employee_id', 'Salary Structure', required=False),
'slip_ids':fields.one2many('hr.payslip', 'employee_id', 'Payslips', required=False, readonly=True),
'otherid': fields.char('Other Id', size=64)
}
hr_employee()

7
addons/hr_payroll/hr_payroll_data.xml
View File

@ -126,5 +126,12 @@
<field name="name">Other Taxable Allowance</field>
<field name="sequence" eval="90"/>
</record>
<!-- Contract Wage Types -->
<record id="hr_contract_monthly_basic" model="hr.contract.wage.type">
<field name="name">Monthly Basic Wage</field>
<field name="type">gross</field>
<field name="period_id" ref="hr_contract.hr_contract_wage_type_period_monthly"/>
</record>
</data>
</openerp>

28
addons/hr_payroll/hr_payroll_view.xml
View File

@ -192,24 +192,6 @@
</tree>
</field>
</page>
<page string="Salary Slips" groups="base.group_extended">
<field name="slip_ids" colspan="4" nolabel="1" readonly="True">
<tree colors="blue:state in ('draft');black:state in ('confirm','new','hr_check','accont_check');gray:state in('done','cancel')" string="Payslip">
<field name="number"/>
<field name="name"/>
<field name="date"/>
<field name="register_id"/>
<field name="basic"/>
<field name="allounce"/>
<field name="grows"/>
<field name="deduction"/>
<field name="net"/>
<field name="total_pay" sum="Total Salary Paid"/>
<field name="state"/>
<field name="company_id" groups="base.group_multi_company" widget="selection"/>
</tree>
</field>
</page>
</xpath>
</data>
</field>
@ -223,9 +205,11 @@
<field name="arch" type="xml">
<field name="passport_id" position="replace">
<field name="passport_id"/>
<field name="otherid"/>
</field>
</field>
</record>
<!-- End Employee View -->
<!-- Contract View -->
@ -987,6 +971,14 @@
</form>
</field>
</record>
<!-- Shortcuts -->
<act_window name="Payslips"
domain="[('employee_id', '=', active_id)]"
res_model="hr.payslip"
src_model="hr.employee"
view_id ="eval('view_hr_payslip_tree')"
id="act_hr_employee_payslip_list"/>
</data>
</openerp>