diff --git a/addons/hr_payroll/hr_payroll.py b/addons/hr_payroll/hr_payroll.py index a7984d7c7fa..6454c02a04d 100644 --- a/addons/hr_payroll/hr_payroll.py +++ b/addons/hr_payroll/hr_payroll.py @@ -325,6 +325,17 @@ class payroll_advice(osv.osv): _name = 'hr.payroll.advice' _description = 'Bank Advice Note' + def _get_bank(self, cr, uid, ids, field_name, args, context=None): + res = {} + if context is None: + context = {} + for rec in self.browse(cr, uid, ids, context=context): + if rec.company_id and rec.company_id.partner_id.bank_ids: + res[rec.id] = rec.company_id.partner_id.bank_ids[0].bank.name + else: + res[rec.id] = '' + return res + _columns = { 'register_id':fields.many2one('hr.payroll.register', 'Payroll Register', required=False), 'name':fields.char('Name', size=2048, required=True, readonly=False), @@ -340,6 +351,7 @@ class payroll_advice(osv.osv): 'chaque_nos':fields.char('Chaque Nos', size=256, required=False, readonly=False), 'account_id': fields.many2one('account.account', 'Account', required=True), 'company_id':fields.many2one('res.company', 'Company', required=False), + 'bank': fields.function(_get_bank, method=True, string='Bank', type="char"), } _defaults = { @@ -368,6 +380,18 @@ class payroll_advice(osv.osv): self.write(cr, uid, ids, {'state':'cancel'}, context=context) return True + def onchange_company_id(self, cr, uid, ids, company_id, context=None): + res = {} + if context is None: + context = {} + if company_id: + company = self.pool.get('res.company').browse(cr, uid, company_id, context=context) + res.update({'bank': company.partner_id.bank_ids[0].bank.name}) + return { + 'value':res + } + + payroll_advice() class payroll_advice_line(osv.osv): diff --git a/addons/hr_payroll/hr_payroll_view.xml b/addons/hr_payroll/hr_payroll_view.xml index 8f50302d703..2ad028bd752 100644 --- a/addons/hr_payroll/hr_payroll_view.xml +++ b/addons/hr_payroll/hr_payroll_view.xml @@ -606,7 +606,7 @@ - + @@ -692,11 +692,11 @@ - + company.contribution.select company.contribution search - + @@ -720,7 +720,7 @@ company.contribution form - + - - + + + + + diff --git a/addons/hr_payroll/report/payroll_register.rml b/addons/hr_payroll/report/payroll_register.rml index 13e40b68fe5..10f01c182cd 100644 --- a/addons/hr_payroll/report/payroll_register.rml +++ b/addons/hr_payroll/report/payroll_register.rml @@ -2,7 +2,7 @@ @@ -104,7 +104,7 @@ - + Expanse To @@ -130,7 +130,7 @@ Date - [[o.date]] + [[formatLang(time.strftime('%Y-%m-%d'), date = True)]] @@ -177,22 +177,22 @@ [[ l.employee_id.name ]] - [[l.basic]] + [[formatLang(l.basic)]] - [[l.other_pay]] + [[formatLang(l.other_pay)]] - [[l.allounce]] + [[formatLang(l.allounce)]] - [[l.grows]] + [[formatLang(l.grows)]] - [[l.deduction]] + [[formatLang(l.deduction)]] - [[l.net]] + [[formatLang(l.net)]] @@ -230,7 +230,7 @@ - + For [[company.name]], diff --git a/addons/hr_payroll/report/payslip.rml b/addons/hr_payroll/report/payslip.rml index ede60a9a490..30f20d167c6 100755 --- a/addons/hr_payroll/report/payslip.rml +++ b/addons/hr_payroll/report/payslip.rml @@ -72,15 +72,9 @@ + - - - - - - - @@ -95,15 +89,9 @@ + - - - - - - - @@ -240,18 +228,18 @@ - + - - - - - - + + + + + + - - + + @@ -272,11 +260,11 @@ - + + - [[repeatIn(objects,'o')]] @@ -296,7 +284,7 @@ - + Code @@ -312,7 +300,7 @@ - + Address @@ -322,7 +310,7 @@ - + Email @@ -338,7 +326,7 @@ - + Slip ID @@ -346,12 +334,6 @@ [[ o.number or '' ]] - - Bill No - - - [[ o.move_id and o.move_id.name or '' ]] - PAN No @@ -360,7 +342,7 @@ - + Register @@ -368,17 +350,11 @@ [[ o.register_id and o.register_id.name or '' ]] - - Payment - - - [[ o.payment_id and o.payment_id.name or '' ]] - Designation - [[ o.employee_id.contract_ids and o.employee_id.contract_ids[0].function.name or '' ]] + [[ o.employee_id.contract_ids and o.employee_id.contract_ids[0].job_id.name or '' ]] @@ -515,7 +491,7 @@ - [[repeatIn(get_earnings(o.line_ids),'a') ]][[ a.code or removeParentNode('tr') ]] + [[repeatIn(get_earnings(o.line_ids),'a') ]] [[ a.code or removeParentNode('tr') ]] [[ formatLang(a.total) ]] @@ -669,3 +645,4 @@ + diff --git a/addons/hr_payroll/report/report_payroll_advice.rml b/addons/hr_payroll/report/report_payroll_advice.rml index 00a2d599d0e..d9f8c793a8e 100644 --- a/addons/hr_payroll/report/report_payroll_advice.rml +++ b/addons/hr_payroll/report/report_payroll_advice.rml @@ -64,14 +64,14 @@ - + - + - - + + @@ -81,8 +81,8 @@ - - + + @@ -97,10 +97,10 @@ - - - - + + + + @@ -109,15 +109,15 @@ - - - - + + + + - - + + + - [[repeatIn(objects,'o')]] Payment Advice @@ -132,7 +132,9 @@ - [[ formatLang(o.date,date=True) ]] + + + @@ -147,7 +149,7 @@ - Axis Bank + [[o.bank or 'Bank']] @@ -172,7 +174,7 @@ - [[ o.name ]] for period [[ get_month(o.date)['mname'] ]] + [[ o.name ]] for period [[ get_month(o.date)['mname'] ]] @@ -335,3 +337,4 @@ +