From 832ce4a6e2ce8158b7dade3503933ab939d7e431 Mon Sep 17 00:00:00 2001 From: Mantavya Gajjar Date: Tue, 22 Jun 2010 02:15:23 +0530 Subject: [PATCH] [ADD]: add demo data [FIX]: remove commented code [ADD]: add demo data file to the module descriptor file bzr revid: mga@tinyerp.com-20100621204523-nzkwal4rm7hpvaga --- addons/hr_payroll/__openerp__.py | 4 +- addons/hr_payroll/hr_payroll.py | 21 ------ addons/hr_payroll/hr_payroll_data.xml | 12 +++- addons/hr_payroll/hr_payroll_demo.xml | 92 +++++++++++++++++++++++++++ 4 files changed, 106 insertions(+), 23 deletions(-) create mode 100644 addons/hr_payroll/hr_payroll_demo.xml diff --git a/addons/hr_payroll/__openerp__.py b/addons/hr_payroll/__openerp__.py index 9a5ff2187e2..1d83902d36e 100644 --- a/addons/hr_payroll/__openerp__.py +++ b/addons/hr_payroll/__openerp__.py @@ -39,7 +39,8 @@ 'hr', 'hr_contract', 'hr_holidays', - 'hr_expense' + 'hr_expense', + 'account' ], 'init_xml': [ ], @@ -52,6 +53,7 @@ 'hr_payroll_wizard.xml' ], 'demo_xml': [ + 'hr_payroll_demo.xml' ], 'installable': True, 'active': False, diff --git a/addons/hr_payroll/hr_payroll.py b/addons/hr_payroll/hr_payroll.py index ee24bc3cd21..c8687df870e 100644 --- a/addons/hr_payroll/hr_payroll.py +++ b/addons/hr_payroll/hr_payroll.py @@ -1153,27 +1153,6 @@ class hr_payslip_line(osv.osv): _name = 'hr.payslip.line' _description = 'Payslip Line' -# def _calculate(self, cr, uid, ids, field_names, arg, context): -# res = {} -# obj = {} -# for line in self.browse(cr, uid, ids, context): -# obj['basic'] = line.slip_id.basic -# amount = 0.0 -# -# if line.amount_type == 'per' and line.base: -# print 'XXXXXXXXXXXXXXXX : ', obj -# amount = line.amount * eval(line.base, obj) -# elif line.amount_type in ('fix', 'func'): -# amount = line.amount - -# cd = line.category_id.code.lower() -# obj[cd] = amount -# print 'XXXXXXXXXXXXXXXXXX : ', cd -# -# res[line.id] = amount -# print 'XXXXXXXXXXXX : ', obj -# return res - def onchange_category(self, cr, uid, ids, category_id): seq = 0 res = { diff --git a/addons/hr_payroll/hr_payroll_data.xml b/addons/hr_payroll/hr_payroll_data.xml index 80a66722efc..0a6e0f1afbb 100644 --- a/addons/hr_payroll/hr_payroll_data.xml +++ b/addons/hr_payroll/hr_payroll_data.xml @@ -1,7 +1,16 @@ - + + + Monthly Basic Wage + + basic + 1.80 + + + + HRA allowance House Rant Allowance @@ -108,5 +117,6 @@ allowance Other Taxable Allowance + diff --git a/addons/hr_payroll/hr_payroll_demo.xml b/addons/hr_payroll/hr_payroll_demo.xml new file mode 100644 index 00000000000..97651f9f14b --- /dev/null +++ b/addons/hr_payroll/hr_payroll_demo.xml @@ -0,0 +1,92 @@ + + + + + + + ME + Marketing Executive + + + + per + + + + HRA + + allowance + + House Rant Allowance + + + fix + + + + CA + + allowance + + Convance Allowance + + + fix + + + + PT + + deduction + + Professional Tax + + + per + + + + PF + + deduction + + Provident Fund + + + + + + + + + Bonamy + user + + + + + + First Contract + + + + This is a First Contract + + + + + + + SLIP/001 + + + + + + + + Salary Slip of Bonamy for June-2010 + + + +