Name
@@ -165,7 +165,7 @@
[[ repeatIn(get_employee(data['form']),'e') ]]
-
+
|
[[ e[0] ]]
@@ -235,17 +235,11 @@
|
-
-
-
-
-
-
[[ repeatIn(get_months_tol(),'t') ]]
-
+
|
Total
@@ -291,12 +285,6 @@
|
-
-
-
-
-
-
diff --git a/addons/l10n_in_hr_payroll/wizard/__init__.py b/addons/l10n_in_hr_payroll/wizard/__init__.py
index 26d42354c53..b08ed5a3f9c 100644
--- a/addons/l10n_in_hr_payroll/wizard/__init__.py
+++ b/addons/l10n_in_hr_payroll/wizard/__init__.py
@@ -19,6 +19,6 @@
#
##############################################################################
-import salary_rule_bymonth
+import hr_salary_employee_bymonth
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/l10n_in_hr_payroll/wizard/salary_rule_bymonth.py b/addons/l10n_in_hr_payroll/wizard/hr_salary_employee_bymonth.py
similarity index 86%
rename from addons/l10n_in_hr_payroll/wizard/salary_rule_bymonth.py
rename to addons/l10n_in_hr_payroll/wizard/hr_salary_employee_bymonth.py
index e09fc1f885f..172824a77cb 100644
--- a/addons/l10n_in_hr_payroll/wizard/salary_rule_bymonth.py
+++ b/addons/l10n_in_hr_payroll/wizard/hr_salary_employee_bymonth.py
@@ -23,15 +23,14 @@ import time
from osv import osv, fields
-class salary_rule_bymonth(osv.osv_memory):
+class hr_salary_employee_bymonth(osv.osv_memory):
- _name = 'salary.rule.month'
- _description = 'Print Monthly Salary Rule Report'
+ _name = 'hr.salary.employee.month'
+ _description = 'Print Hr Salary Employee By Month Report'
_columns = {
'start_date': fields.date('Starting Date', required=True),
'end_date': fields.date('Ending Date', required=True),
'employee_ids': fields.many2many('hr.employee', 'payroll_year_rel', 'payroll_year_id', 'emp_id', 'Employees', required=True),
-# 'rule_id': fields.many2one('hr.salary.rule.category', 'Rule Category', required=True),
}
_defaults = {
@@ -55,13 +54,13 @@ class salary_rule_bymonth(osv.osv_memory):
res = self.read(cr, uid, ids, ['employee_ids', 'start_date', 'end_date'], context=context)
res = res and res[0] or {}
datas['form'] = res
- datas['ids'] = res.get('employee_ids', [])
+ res['employee_ids'] = res.get('employee_ids', [])
return {
'type': 'ir.actions.report.xml',
- 'report_name': 'salary.rule.bymonth',
+ 'report_name': 'salary.employee.bymonth',
'datas': datas,
}
-salary_rule_bymonth()
+hr_salary_employee_bymonth()
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/l10n_in_hr_payroll/wizard/salary_rule_bymonth.xml b/addons/l10n_in_hr_payroll/wizard/hr_salary_employee_bymonth.xml
similarity index 59%
rename from addons/l10n_in_hr_payroll/wizard/salary_rule_bymonth.xml
rename to addons/l10n_in_hr_payroll/wizard/hr_salary_employee_bymonth.xml
index c1386f824be..859506921e7 100644
--- a/addons/l10n_in_hr_payroll/wizard/salary_rule_bymonth.xml
+++ b/addons/l10n_in_hr_payroll/wizard/hr_salary_employee_bymonth.xml
@@ -1,30 +1,30 @@
-
- Salary rule monthly
- salary.rule.month
+
+ Hr monthly Employee Salary
+ hr.salary.employee.month
form
-
-
+
Salary Register
ir.actions.act_window
- salary.rule.month
+ hr.salary.employee.month
form
form
new
@@ -33,14 +33,14 @@
|