From ddc19ac369d60f1ea172341a344e5c97b114ef7a Mon Sep 17 00:00:00 2001 From: "Amit (OpenERP)" Date: Thu, 26 Jul 2012 16:41:13 +0530 Subject: [PATCH 1/2] [FIX] hr_payroll : Fixes the duplicate payslip problem lp bug: https://launchpad.net/bugs/1029318 fixed bzr revid: amp@tinyerp.com-20120726111113-0jo81xcclbusdp8g --- addons/hr_payroll/hr_payroll.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/addons/hr_payroll/hr_payroll.py b/addons/hr_payroll/hr_payroll.py index a8bafe43685..ba997f5adec 100644 --- a/addons/hr_payroll/hr_payroll.py +++ b/addons/hr_payroll/hr_payroll.py @@ -318,7 +318,9 @@ class hr_payslip(osv.osv): 'company_id': company_id, 'period_id': False, 'basic_before_leaves': 0.0, - 'basic_amount': 0.0 + 'basic_amount': 0.0, + 'number': '', + 'payslip_run_id': False, }) return super(hr_payslip, self).copy(cr, uid, id, default, context=context) From 6e161afd7d6b182e8352b26cdca51d57173c848a Mon Sep 17 00:00:00 2001 From: "Amit (OpenERP)" Date: Mon, 30 Jul 2012 11:28:04 +0530 Subject: [PATCH 2/2] [FIX] : Fixes the duplicate payslip problem on made payment order field bzr revid: amp@tinyerp.com-20120730055804-lbsgiok0i4uflmgx --- addons/hr_payroll/hr_payroll.py | 1 + 1 file changed, 1 insertion(+) diff --git a/addons/hr_payroll/hr_payroll.py b/addons/hr_payroll/hr_payroll.py index ba997f5adec..0224f7a1042 100644 --- a/addons/hr_payroll/hr_payroll.py +++ b/addons/hr_payroll/hr_payroll.py @@ -321,6 +321,7 @@ class hr_payslip(osv.osv): 'basic_amount': 0.0, 'number': '', 'payslip_run_id': False, + 'paid': False, }) return super(hr_payslip, self).copy(cr, uid, id, default, context=context)