diff --git a/erpnext/hr/report/monthly_salary_register/monthly_salary_register.html b/erpnext/hr/report/monthly_salary_register/monthly_salary_register.html new file mode 100644 index 0000000000..c77e4e58b8 --- /dev/null +++ b/erpnext/hr/report/monthly_salary_register/monthly_salary_register.html @@ -0,0 +1,39 @@ +
+ {%= frappe.boot.letter_heads[filters.letter_head || frappe.defaults.get_default("letter_head")] %} +
+

{%= __(report.report_name) %}

+
Fiscal Year: {%= filters.fiscal_year %}
+
Month: {%= filters.month %}
+
+ + + + {% for(var i=1, l=report.columns.length; i{%= report.columns[i].label %} + {% } %} + + + + {% for(var j=0, k=data.length; j + {% for(var i=1, l=report.columns.length; i + {% var fieldname = report.columns[i].field; %} + {% if (i > 10) { %} + {%= format_currency(row[fieldname]) %} + {% } else { %} + {% if (!is_null(row[fieldname])) { %} + {%= row[fieldname] %} + {% } %} + {% } %} + + {% } %} + + {% } %} + +
+

Printed On {%= dateutil.str_to_user(dateutil.get_datetime_as_string()) %}

+ diff --git a/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py b/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py index f384917e8b..33f3784bc7 100644 --- a/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +++ b/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py @@ -17,7 +17,7 @@ def execute(filters=None): data = [] for ss in salary_slips: - row = [ss.employee, ss.employee_name, ss.branch, ss.department, ss.designation, + row = [ss.name, ss.employee, ss.employee_name, ss.branch, ss.department, ss.designation, ss.company, ss.month, ss.leave_withut_pay, ss.payment_days] for e in earning_types: @@ -36,7 +36,7 @@ def execute(filters=None): def get_columns(salary_slips): columns = [ - _("Employee") + ":Link/Employee:120", _("Employee Name") + "::140", _("Branch") + ":Link/Branch:120", + _("Salary Slip ID") + ":Link/Salary Slip:150",_("Employee") + ":Link/Employee:120", _("Employee Name") + "::140", _("Branch") + ":Link/Branch:120", _("Department") + ":Link/Department:120", _("Designation") + ":Link/Designation:120", _("Company") + ":Link/Company:120", _("Month") + "::80", _("Leave Without Pay") + ":Float:130", _("Payment Days") + ":Float:120"