From 2f3ae914a6015f40a0f6289bd6b6e67105636c35 Mon Sep 17 00:00:00 2001 From: Kanchan Chauhan Date: Wed, 11 Jan 2017 19:43:16 +0530 Subject: [PATCH] Changes to Salary Register --- erpnext/config/hr.py | 2 +- .../monthly_salary_register.js | 34 ------------------- .../__init__.py | 0 .../salary_register.html} | 4 +-- .../report/salary_register/salary_register.js | 27 +++++++++++++++ .../salary_register.json} | 11 +++--- .../salary_register.py} | 11 +++--- 7 files changed, 40 insertions(+), 49 deletions(-) delete mode 100644 erpnext/hr/report/monthly_salary_register/monthly_salary_register.js rename erpnext/hr/report/{monthly_salary_register => salary_register}/__init__.py (100%) rename erpnext/hr/report/{monthly_salary_register/monthly_salary_register.html => salary_register/salary_register.html} (89%) create mode 100644 erpnext/hr/report/salary_register/salary_register.js rename erpnext/hr/report/{monthly_salary_register/monthly_salary_register.json => salary_register/salary_register.json} (59%) rename erpnext/hr/report/{monthly_salary_register/monthly_salary_register.py => salary_register/salary_register.py} (92%) diff --git a/erpnext/config/hr.py b/erpnext/config/hr.py index 55363abe80..75ebd27cd4 100644 --- a/erpnext/config/hr.py +++ b/erpnext/config/hr.py @@ -232,7 +232,7 @@ def get_data(): { "type": "report", "is_query_report": True, - "name": "Monthly Salary Register", + "name": "Salary Register", "doctype": "Salary Slip" }, { diff --git a/erpnext/hr/report/monthly_salary_register/monthly_salary_register.js b/erpnext/hr/report/monthly_salary_register/monthly_salary_register.js deleted file mode 100644 index a879b39a6c..0000000000 --- a/erpnext/hr/report/monthly_salary_register/monthly_salary_register.js +++ /dev/null @@ -1,34 +0,0 @@ -// Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors -// License: GNU General Public License v3. See license.txt - -frappe.query_reports["Monthly Salary Register"] = { - "filters": [ - { - "fieldname":"from_date", - "label": __("From"), - "fieldtype": "Date", - "default": frappe.datetime.add_months(frappe.datetime.get_today(), -1), - "reqd": 1 - }, - { - "fieldname":"to_date", - "label": __("To"), - "fieldtype": "Date", - "default": frappe.datetime.get_today(), - "reqd": 1 - }, - { - "fieldname":"employee", - "label": __("Employee"), - "fieldtype": "Link", - "options": "Employee" - }, - { - "fieldname":"company", - "label": __("Company"), - "fieldtype": "Link", - "options": "Company", - "default": frappe.defaults.get_user_default("Company") - } - ] -} \ No newline at end of file diff --git a/erpnext/hr/report/monthly_salary_register/__init__.py b/erpnext/hr/report/salary_register/__init__.py similarity index 100% rename from erpnext/hr/report/monthly_salary_register/__init__.py rename to erpnext/hr/report/salary_register/__init__.py diff --git a/erpnext/hr/report/monthly_salary_register/monthly_salary_register.html b/erpnext/hr/report/salary_register/salary_register.html similarity index 89% rename from erpnext/hr/report/monthly_salary_register/monthly_salary_register.html rename to erpnext/hr/report/salary_register/salary_register.html index c77e4e58b8..2a9cd3ebdb 100644 --- a/erpnext/hr/report/monthly_salary_register/monthly_salary_register.html +++ b/erpnext/hr/report/salary_register/salary_register.html @@ -2,8 +2,7 @@ {%= frappe.boot.letter_heads[filters.letter_head || frappe.defaults.get_default("letter_head")] %}

{%= __(report.report_name) %}

-
Fiscal Year: {%= filters.fiscal_year %}
-
Month: {%= filters.month %}
+
From {%= filters.date_range[0] %} to {%= filters.date_range[1] %}
@@ -36,4 +35,3 @@

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

- diff --git a/erpnext/hr/report/salary_register/salary_register.js b/erpnext/hr/report/salary_register/salary_register.js new file mode 100644 index 0000000000..8b0faf5219 --- /dev/null +++ b/erpnext/hr/report/salary_register/salary_register.js @@ -0,0 +1,27 @@ +// Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors +// For license information, please see license.txt + +frappe.query_reports["Salary Register"] = { + "filters": [ + { + "fieldname":"date_range", + "label": __("Date Range"), + "fieldtype": "DateRange", + "default": [frappe.datetime.add_months(get_today(),-1), frappe.datetime.get_today()], + "reqd": 1 + }, + { + "fieldname":"employee", + "label": __("Employee"), + "fieldtype": "Link", + "options": "Employee" + }, + { + "fieldname":"company", + "label": __("Company"), + "fieldtype": "Link", + "options": "Company", + "default": frappe.defaults.get_user_default("Company") + } + ] +} diff --git a/erpnext/hr/report/monthly_salary_register/monthly_salary_register.json b/erpnext/hr/report/salary_register/salary_register.json similarity index 59% rename from erpnext/hr/report/monthly_salary_register/monthly_salary_register.json rename to erpnext/hr/report/salary_register/salary_register.json index d32e71e6ff..116691509e 100644 --- a/erpnext/hr/report/monthly_salary_register/monthly_salary_register.json +++ b/erpnext/hr/report/salary_register/salary_register.json @@ -1,17 +1,18 @@ { "add_total_row": 1, "apply_user_permissions": 1, - "creation": "2013-05-07 18:09:42", + "creation": "2017-01-10 17:36:58.153863", + "disabled": 0, "docstatus": 0, "doctype": "Report", - "idx": 1, + "idx": 0, "is_standard": "Yes", - "modified": "2014-06-03 07:18:17.187018", + "modified": "2017-01-10 17:38:00.832224", "modified_by": "Administrator", "module": "HR", - "name": "Monthly Salary Register", + "name": "Salary Register", "owner": "Administrator", "ref_doctype": "Salary Slip", - "report_name": "Monthly Salary Register", + "report_name": "Salary Register", "report_type": "Script Report" } \ No newline at end of file diff --git a/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py b/erpnext/hr/report/salary_register/salary_register.py similarity index 92% rename from erpnext/hr/report/monthly_salary_register/monthly_salary_register.py rename to erpnext/hr/report/salary_register/salary_register.py index e8d0a0bf2f..1e36b92e22 100644 --- a/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +++ b/erpnext/hr/report/salary_register/salary_register.py @@ -3,12 +3,11 @@ from __future__ import unicode_literals import frappe -from frappe.utils import flt, cstr -from frappe import msgprint, _ +from frappe.utils import flt +from frappe import _ def execute(filters=None): if not filters: filters = {} - salary_slips = get_salary_slips(filters) columns, earning_types, ded_types = get_columns(salary_slips) ss_earning_map = get_ss_earning_map(salary_slips) @@ -58,6 +57,7 @@ def get_columns(salary_slips): return columns, salary_components[_("Earning")], salary_components[_("Deduction")] def get_salary_slips(filters): + filters.update({"from_date": filters.get("date_range")[0], "to_date":filters.get("date_range")[1]}) conditions, filters = get_conditions(filters) salary_slips = frappe.db.sql("""select * from `tabSalary Slip` where docstatus = 1 %s order by employee""" % conditions, filters, as_dict=1) @@ -65,13 +65,12 @@ def get_salary_slips(filters): if not salary_slips: frappe.throw(_("No salary slip found between {0} and {1}").format( filters.get("from_date"), filters.get("to_date"))) - return salary_slips def get_conditions(filters): conditions = "" - if filters.get("from_date"): conditions += " and start_date >= %(from_date)s" - if filters.get("to_date"): conditions += " and end_date <= %(to_date)s" + if filters.get("date_range"): conditions += " and start_date >= %(from_date)s" + if filters.get("date_range"): conditions += " and end_date <= %(to_date)s" if filters.get("company"): conditions += " and company = %(company)s" if filters.get("employee"): conditions += " and employee = %(employee)s"