From 2a7f04c40c32af99d7d8216eb3906682eb9e28c0 Mon Sep 17 00:00:00 2001 From: "Khushboo Bhatt (Open ERP)" Date: Tue, 7 Aug 2012 11:43:29 +0530 Subject: [PATCH 1/2] [IMP]l10n_in_hr_payroll:batch_id field added on advice and use it as batch reference bzr revid: kbh@tinyerp.com-20120807061329-jtrwqgpzs4fg0kir --- addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py | 2 ++ addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml | 1 + 2 files changed, 3 insertions(+) diff --git a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py index 975d51a5306..2fddafde6e6 100644 --- a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py +++ b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py @@ -122,6 +122,7 @@ class payroll_advice(osv.osv): 'neft': fields.boolean('NEFT Transaction', help="Check this box if your company use online transfer for salary"), 'company_id':fields.many2one('res.company', 'Company', required=True, readonly=True, states={'draft': [('readonly', False)]}), 'bank_id':fields.many2one('res.bank', 'Bank', readonly=True, states={'draft': [('readonly', False)]}, help="Select the Bank from which the salary is going to be paid"), + 'batch_id': fields.many2one('hr.payslip.run', 'Batch', readonly=True) } _defaults = { @@ -238,6 +239,7 @@ class hr_payslip_run(osv.osv): if run.available_advice: raise osv.except_osv(_('Error !'), _("Payment advice already exists for %s, 'Set to Draft' to create a new advice.") %(run.name)) advice_data = { + 'batch_id': run.id, 'company_id': users[0].company_id.id, 'name': run.name, 'date': run.date_end, diff --git a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml index c31e7d527e7..4af0995fa92 100644 --- a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml +++ b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml @@ -136,6 +136,7 @@ + From 28a28a425cae868aa7af4684b251aaee30daed5f Mon Sep 17 00:00:00 2001 From: "Khushboo Bhatt (Open ERP)" Date: Tue, 7 Aug 2012 14:12:01 +0530 Subject: [PATCH 2/2] [ADD]l10n_in_hr_payroll:batch_id field added in search view bzr revid: kbh@tinyerp.com-20120807084201-sp61nrnqx4bvfcm9 --- addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml index 4af0995fa92..c6aa9edc29c 100644 --- a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml +++ b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml @@ -161,6 +161,7 @@ +