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

[IMP]: improve the usability 

bzr revid: mga@tinyerp.com-20101008131845-alqqlb6d97y3s3d5
This commit is contained in:
Mantavya Gajjar 2010-10-08 18:48:45 +05:30
parent 9138707ef7
commit 30efb09f7a
2 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
addons/hr_payroll/hr_payroll.py
View File

@ -1110,7 +1110,7 @@ class hr_payslip(osv.osv):
func = func_pool.read(cr, uid, function, ['line_ids'], context=context)
lines = slip_line_pool.browse(cr, uid, func['line_ids'], context=context)
lines += slip.employee_id.line_ids
#lines += slip.employee_id.line_ids
ad = []
lns = {}
@ -1224,6 +1224,17 @@ class hr_payslip(osv.osv):
'contract_id':contract.id,
'company_id':slip.employee_id.company_id.id
})
for line in slip.employee_id.line_ids:
vals = {
'amount':line.amount,
'slip_id':slip.id,
'employee_id':False,
'function_id':False,
'base':base
}
slip_line_pool.copy(cr, uid, line.id, vals, {})
self.write(cr, uid, [slip.id], update, context=context)
for slip in self.browse(cr, uid, ids, context=context):

13
addons/hr_payroll/hr_payroll_view.xml
View File

@ -87,7 +87,6 @@
<!-- End Passport Views -->
<!-- Employee View -->
<record id="view_employee_bank_form" model="ir.ui.view">
<field name="name">res.partner.bank.form</field>
<field name="model">res.partner.bank</field>
@ -157,7 +156,6 @@
<field name="advantages_gross"/>
<field name="advantages" nolabel="1" colspan="2"/>
</group>
</page>
<page string="Work Permit">
<group col="2" colspan="2">
@ -192,7 +190,7 @@
<field name="line_ids" nolabel="1" colspan="4" string="Salary Structure">
<tree string="Salary Structure" editable="bottom">
<field name="category_id" on_change="onchange_category(category_id)"/>
<field name="sequence"/>
<field name="sequence" groups="base.group_extended"/>
<field name="name"/>
<field name="code"/>
<field name="type"/>
@ -205,7 +203,6 @@
</data>
</field>
</record>
<record id="view_employee_passport_form" model="ir.ui.view">
<field name="name">hr.employee.passport.form</field>
<field name="model">hr.employee</field>
@ -357,7 +354,7 @@
<field name="arch" type="xml">
<tree string="Salary Structure" editable="bottom">
<field name="category_id" on_change="onchange_category(category_id)"/>
<field name="sequence"/>
<field name="sequence" groups="base.group_extended"/>
<field name="name"/>
<field name="code"/>
<field name="type"/>
@ -385,7 +382,7 @@
<field name="type"/>
<field name="amount_type"/>
<field name="amount" on_change="onchange_amount(amount, amount_type)" attrs="{'readonly':[('amount_type','=','func')]}"/>
<field name="sequence"/>
<field name="sequence" groups="base.group_extended"/>
</group>
<group col="2" colspan="2">
<separator colspan="4" string="Company contribution"/>
@ -396,7 +393,7 @@
<field name="line_ids" colspan="4" nolabel="1" attrs="{'readonly':[('amount_type','!=','func')]}">
<tree string="Function Arguments" editable="bottom">
<field name="name"/>
<field name="sequence"/>
<field name="sequence" groups="base.group_extended"/>
<field name="from_val"/>
<field name="to_val"/>
<field name="amount_type"/>
@ -449,7 +446,7 @@
<field name="line_ids" colspan="4" nolabel="1">
<tree string="Salary Structure" editable="bottom">
<field name="category_id" on_change="onchange_category(category_id)"/>
<field name="sequence"/>
<field name="sequence" groups="base.group_extended"/>
<field name="name"/>
<field name="code"/>
<field name="type"/>