diff --git a/addons/hr/hr.py b/addons/hr/hr.py index fddbabc1901..a2c4ee3805b 100644 --- a/addons/hr/hr.py +++ b/addons/hr/hr.py @@ -66,16 +66,6 @@ class hr_employee_category(osv.osv): hr_employee_category() -class hr_employee_marital_status(osv.osv): - _name = "hr.employee.marital.status" - _description = "Employee Marital Status" - _columns = { - 'name': fields.char('Marital Status', size=32, required=True, translate=True), - 'description': fields.text('Status Description'), - } - -hr_employee_marital_status() - class hr_job(osv.osv): def _no_of_employee(self, cr, uid, ids, name, args, context=None): @@ -141,7 +131,7 @@ class hr_employee(osv.osv): 'identification_id': fields.char('Identification No', size=32), 'otherid': fields.char('Other Id', size=64), 'gender': fields.selection([('male', 'Male'),('female', 'Female')], 'Gender'), - 'marital': fields.many2one('hr.employee.marital.status', 'Marital Status'), + 'marital': fields.selection([('single', 'Single'), ('married', 'Married'), ('widower', 'Widower'), ('divorced', 'Divorced')], 'Marital Status'), 'department_id':fields.many2one('hr.department', 'Department'), 'address_id': fields.many2one('res.partner.address', 'Working Address'), 'address_home_id': fields.many2one('res.partner.address', 'Home Address'), diff --git a/addons/hr/hr_data.xml b/addons/hr/hr_data.xml index ae8e30b23f0..adb6efbd1d7 100644 --- a/addons/hr/hr_data.xml +++ b/addons/hr/hr_data.xml @@ -2,20 +2,6 @@ - - - Single - - - Married - - - Divorced - - - Widower - - Administrator diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml index 96f753b4153..9f50ed5852d 100644 --- a/addons/hr/hr_view.xml +++ b/addons/hr/hr_view.xml @@ -48,7 +48,7 @@ - + @@ -164,47 +164,6 @@ - - - - hr.hr.employee.marital.status.tree - hr.employee.marital.status - tree - - - - - - - - - hr.hr.employee.marital.status - hr.employee.marital.status - form - -
- - - - - -
- - - Marital Status - hr.employee.marital.status - form - tree,form - - - - - + + Basic + + BASIC + + none + code + result = contract.wage + + + + Gross + + GROSS + + none + code + result = heads['BASIC'] + ('ALW' in heads and heads['ALW'] or 0.0) + + + + Net + + NET + + none + code + result = heads['BASIC'] + ('ALW' in heads and heads['ALW'] or 0.0) + ('DED' in heads and heads['DED'] or 0.0) + + + + + + + BASE + Base for new structures + + +
diff --git a/addons/hr_payroll/hr_payroll_demo.xml b/addons/hr_payroll/hr_payroll_demo.xml index 229eb9de482..03a692f328e 100644 --- a/addons/hr_payroll/hr_payroll_demo.xml +++ b/addons/hr_payroll/hr_payroll_demo.xml @@ -9,8 +9,7 @@ contract.wage HRA - - + House Rent Allowance @@ -19,30 +18,27 @@ fix CA - - + Conveyance Allowance fix - + PT - - + Professional Tax percentage - + contract.wage PF - - + Provident Fund @@ -53,6 +49,7 @@ Marketing Executive + @@ -67,7 +64,7 @@ - First Contract + Marketing Executive Contract diff --git a/addons/hr_payroll/hr_payroll_view.xml b/addons/hr_payroll/hr_payroll_view.xml index 18ce2cbcf12..9449523929b 100644 --- a/addons/hr_payroll/hr_payroll_view.xml +++ b/addons/hr_payroll/hr_payroll_view.xml @@ -85,7 +85,15 @@ - + + + + + + + + + @@ -188,10 +196,11 @@ + - + @@ -203,6 +212,8 @@ + + @@ -270,7 +281,8 @@