Merge pull request #35032 from saurabh6790/salary-register-report-fix
chore: set correct currency symbol in salary register for multi-currency salary slip
This commit is contained in:
Saurabh
@@ -8,222 +8,325 @@ from frappe.utils import flt
|
|||||||
|
|
||||||
import erpnext
|
import erpnext
|
||||||
|
|
||||||
|
salary_slip = frappe.qb.DocType("Salary Slip")
|
||||||
|
salary_detail = frappe.qb.DocType("Salary Detail")
|
||||||
|
salary_component = frappe.qb.DocType("Salary Component")
|
||||||
|
|
||||||
|
|
||||||
def execute(filters=None):
|
def execute(filters=None):
|
||||||
if not filters:
|
if not filters:
|
||||||
filters = {}
|
filters = {}
|
||||||
|
|
||||||
currency = None
|
currency = None
|
||||||
if filters.get("currency"):
|
if filters.get("currency"):
|
||||||
currency = filters.get("currency")
|
currency = filters.get("currency")
|
||||||
company_currency = erpnext.get_company_currency(filters.get("company"))
|
company_currency = erpnext.get_company_currency(filters.get("company"))
|
||||||
|
|
||||||
salary_slips = get_salary_slips(filters, company_currency)
|
salary_slips = get_salary_slips(filters, company_currency)
|
||||||
if not salary_slips:
|
if not salary_slips:
|
||||||
return [], []
|
return [], []
|
||||||
|
|
||||||
columns, earning_types, ded_types = get_columns(salary_slips)
|
earning_types, ded_types = get_earning_and_deduction_types(salary_slips)
|
||||||
ss_earning_map = get_ss_earning_map(salary_slips, currency, company_currency)
|
columns = get_columns(earning_types, ded_types)
|
||||||
ss_ded_map = get_ss_ded_map(salary_slips, currency, company_currency)
|
|
||||||
|
ss_earning_map = get_salary_slip_details(salary_slips, currency, company_currency, "earnings")
|
||||||
|
ss_ded_map = get_salary_slip_details(salary_slips, currency, company_currency, "deductions")
|
||||||
|
|
||||||
doj_map = get_employee_doj_map()
|
doj_map = get_employee_doj_map()
|
||||||
|
|
||||||
data = []
|
data = []
|
||||||
for ss in salary_slips:
|
for ss in salary_slips:
|
||||||
row = [
|
row = {
|
||||||
ss.name,
|
"salary_slip_id": ss.name,
|
||||||
ss.employee,
|
"employee": ss.employee,
|
||||||
ss.employee_name,
|
"employee_name": ss.employee_name,
|
||||||
doj_map.get(ss.employee),
|
"data_of_joining": doj_map.get(ss.employee),
|
||||||
ss.branch,
|
"branch": ss.branch,
|
||||||
ss.department,
|
"department": ss.department,
|
||||||
ss.designation,
|
"designation": ss.designation,
|
||||||
ss.company,
|
"company": ss.company,
|
||||||
ss.start_date,
|
"start_date": ss.start_date,
|
||||||
ss.end_date,
|
"end_date": ss.end_date,
|
||||||
ss.leave_without_pay,
|
"leave_without_pay": ss.leave_without_pay,
|
||||||
ss.payment_days,
|
"payment_days": ss.payment_days,
|
||||||
]
|
"currency": currency or company_currency,
|
||||||
|
"total_loan_repayment": ss.total_loan_repayment,
|
||||||
|
}
|
||||||
|
|
||||||
if ss.branch is not None:
|
update_column_width(ss, columns)
|
||||||
columns[3] = columns[3].replace("-1", "120")
|
|
||||||
if ss.department is not None:
|
|
||||||
columns[4] = columns[4].replace("-1", "120")
|
|
||||||
if ss.designation is not None:
|
|
||||||
columns[5] = columns[5].replace("-1", "120")
|
|
||||||
if ss.leave_without_pay is not None:
|
|
||||||
columns[9] = columns[9].replace("-1", "130")
|
|
||||||
|
|
||||||
for e in earning_types:
|
for e in earning_types:
|
||||||
row.append(ss_earning_map.get(ss.name, {}).get(e))
|
row.update({frappe.scrub(e): ss_earning_map.get(ss.name, {}).get(e)})
|
||||||
|
|
||||||
if currency == company_currency:
|
|
||||||
row += [flt(ss.gross_pay) * flt(ss.exchange_rate)]
|
|
||||||
else:
|
|
||||||
row += [ss.gross_pay]
|
|
||||||
|
|
||||||
for d in ded_types:
|
for d in ded_types:
|
||||||
row.append(ss_ded_map.get(ss.name, {}).get(d))
|
row.update({frappe.scrub(d): ss_ded_map.get(ss.name, {}).get(d)})
|
||||||
|
|
||||||
row.append(ss.total_loan_repayment)
|
|
||||||
|
|
||||||
if currency == company_currency:
|
if currency == company_currency:
|
||||||
row += [
|
row.update(
|
||||||
flt(ss.total_deduction) * flt(ss.exchange_rate),
|
{
|
||||||
flt(ss.net_pay) * flt(ss.exchange_rate),
|
"gross_pay": flt(ss.gross_pay) * flt(ss.exchange_rate),
|
||||||
]
|
"total_deduction": flt(ss.total_deduction) * flt(ss.exchange_rate),
|
||||||
|
"net_pay": flt(ss.net_pay) * flt(ss.exchange_rate),
|
||||||
|
}
|
||||||
|
)
|
||||||
|
|
||||||
else:
|
else:
|
||||||
row += [ss.total_deduction, ss.net_pay]
|
row.update(
|
||||||
row.append(currency or company_currency)
|
{"gross_pay": ss.gross_pay, "total_deduction": ss.total_deduction, "net_pay": ss.net_pay}
|
||||||
|
)
|
||||||
|
|
||||||
data.append(row)
|
data.append(row)
|
||||||
|
|
||||||
return columns, data
|
return columns, data
|
||||||
|
|
||||||
|
|
||||||
def get_columns(salary_slips):
|
def get_earning_and_deduction_types(salary_slips):
|
||||||
"""
|
salary_component_and_type = {_("Earning"): [], _("Deduction"): []}
|
||||||
|
|
||||||
|
for salary_compoent in get_salary_components(salary_slips):
|
||||||
|
component_type = get_salary_component_type(salary_compoent[0])
|
||||||
|
salary_component_and_type[_(component_type)].append(salary_compoent[0])
|
||||||
|
|
||||||
|
return sorted(salary_component_and_type[_("Earning")]), sorted(
|
||||||
|
salary_component_and_type[_("Deduction")]
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
def update_column_width(ss, columns):
|
||||||
|
if ss.branch is not None:
|
||||||
|
columns[3].update({"width": 120})
|
||||||
|
if ss.department is not None:
|
||||||
|
columns[4].update({"width": 120})
|
||||||
|
if ss.designation is not None:
|
||||||
|
columns[5].update({"width": 120})
|
||||||
|
if ss.leave_without_pay is not None:
|
||||||
|
columns[9].update({"width": 120})
|
||||||
|
|
||||||
|
|
||||||
|
def get_columns(earning_types, ded_types):
|
||||||
columns = [
|
columns = [
|
||||||
_("Salary Slip ID") + ":Link/Salary Slip:150",
|
{
|
||||||
_("Employee") + ":Link/Employee:120",
|
"label": _("Salary Slip ID"),
|
||||||
_("Employee Name") + "::140",
|
"fieldname": "salary_slip_id",
|
||||||
_("Date of Joining") + "::80",
|
"fieldtype": "Link",
|
||||||
_("Branch") + ":Link/Branch:120",
|
"options": "Salary Slip",
|
||||||
_("Department") + ":Link/Department:120",
|
"width": 150,
|
||||||
_("Designation") + ":Link/Designation:120",
|
},
|
||||||
_("Company") + ":Link/Company:120",
|
{
|
||||||
_("Start Date") + "::80",
|
"label": _("Employee"),
|
||||||
_("End Date") + "::80",
|
"fieldname": "employee",
|
||||||
_("Leave Without Pay") + ":Float:130",
|
"fieldtype": "Link",
|
||||||
_("Payment Days") + ":Float:120",
|
"options": "Employee",
|
||||||
_("Currency") + ":Link/Currency:80"
|
"width": 120,
|
||||||
]
|
},
|
||||||
"""
|
{
|
||||||
columns = [
|
"label": _("Employee Name"),
|
||||||
_("Salary Slip ID") + ":Link/Salary Slip:150",
|
"fieldname": "employee_name",
|
||||||
_("Employee") + ":Link/Employee:120",
|
"fieldtype": "Data",
|
||||||
_("Employee Name") + "::140",
|
"width": 140,
|
||||||
_("Date of Joining") + "::80",
|
},
|
||||||
_("Branch") + ":Link/Branch:-1",
|
{
|
||||||
_("Department") + ":Link/Department:-1",
|
"label": _("Date of Joining"),
|
||||||
_("Designation") + ":Link/Designation:120",
|
"fieldname": "data_of_joining",
|
||||||
_("Company") + ":Link/Company:120",
|
"fieldtype": "Date",
|
||||||
_("Start Date") + "::80",
|
"width": 80,
|
||||||
_("End Date") + "::80",
|
},
|
||||||
_("Leave Without Pay") + ":Float:50",
|
{
|
||||||
_("Payment Days") + ":Float:120",
|
"label": _("Branch"),
|
||||||
|
"fieldname": "branch",
|
||||||
|
"fieldtype": "Link",
|
||||||
|
"options": "Branch",
|
||||||
|
"width": -1,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"label": _("Department"),
|
||||||
|
"fieldname": "department",
|
||||||
|
"fieldtype": "Link",
|
||||||
|
"options": "Department",
|
||||||
|
"width": -1,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"label": _("Designation"),
|
||||||
|
"fieldname": "designation",
|
||||||
|
"fieldtype": "Link",
|
||||||
|
"options": "Designation",
|
||||||
|
"width": 120,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"label": _("Company"),
|
||||||
|
"fieldname": "company",
|
||||||
|
"fieldtype": "Link",
|
||||||
|
"options": "Company",
|
||||||
|
"width": 120,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"label": _("Start Date"),
|
||||||
|
"fieldname": "start_date",
|
||||||
|
"fieldtype": "Data",
|
||||||
|
"width": 80,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"label": _("End Date"),
|
||||||
|
"fieldname": "end_date",
|
||||||
|
"fieldtype": "Data",
|
||||||
|
"width": 80,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"label": _("Leave Without Pay"),
|
||||||
|
"fieldname": "leave_without_pay",
|
||||||
|
"fieldtype": "Float",
|
||||||
|
"width": 50,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"label": _("Payment Days"),
|
||||||
|
"fieldname": "payment_days",
|
||||||
|
"fieldtype": "Float",
|
||||||
|
"width": 120,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"label": _("Currency"),
|
||||||
|
"fieldname": "currency",
|
||||||
|
"fieldtype": "Link",
|
||||||
|
"options": "Currency",
|
||||||
|
"hidden": 1,
|
||||||
|
},
|
||||||
]
|
]
|
||||||
|
|
||||||
salary_components = {_("Earning"): [], _("Deduction"): []}
|
for earning in earning_types:
|
||||||
|
columns.append(
|
||||||
|
{
|
||||||
|
"label": earning,
|
||||||
|
"fieldname": frappe.scrub(earning),
|
||||||
|
"fieldtype": "Currency",
|
||||||
|
"options": "currency",
|
||||||
|
"width": 120,
|
||||||
|
}
|
||||||
|
)
|
||||||
|
|
||||||
for component in frappe.db.sql(
|
columns.append(
|
||||||
"""select distinct sd.salary_component, sc.type
|
{
|
||||||
from `tabSalary Detail` sd, `tabSalary Component` sc
|
"label": _("Gross Pay"),
|
||||||
where sc.name=sd.salary_component and sd.amount != 0 and sd.parent in (%s)"""
|
"fieldname": "gross_pay",
|
||||||
% (", ".join(["%s"] * len(salary_slips))),
|
"fieldtype": "Currency",
|
||||||
tuple([d.name for d in salary_slips]),
|
"options": "currency",
|
||||||
as_dict=1,
|
"width": 120,
|
||||||
):
|
}
|
||||||
salary_components[_(component.type)].append(component.salary_component)
|
)
|
||||||
|
|
||||||
columns = (
|
for deduction in ded_types:
|
||||||
columns
|
columns.append(
|
||||||
+ [(e + ":Currency:120") for e in salary_components[_("Earning")]]
|
{
|
||||||
+ [_("Gross Pay") + ":Currency:120"]
|
"label": deduction,
|
||||||
+ [(d + ":Currency:120") for d in salary_components[_("Deduction")]]
|
"fieldname": frappe.scrub(deduction),
|
||||||
+ [
|
"fieldtype": "Currency",
|
||||||
_("Loan Repayment") + ":Currency:120",
|
"options": "currency",
|
||||||
_("Total Deduction") + ":Currency:120",
|
"width": 120,
|
||||||
_("Net Pay") + ":Currency:120",
|
}
|
||||||
|
)
|
||||||
|
|
||||||
|
columns.extend(
|
||||||
|
[
|
||||||
|
{
|
||||||
|
"label": _("Loan Repayment"),
|
||||||
|
"fieldname": "total_loan_repayment",
|
||||||
|
"fieldtype": "Currency",
|
||||||
|
"options": "currency",
|
||||||
|
"width": 120,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"label": _("Total Deduction"),
|
||||||
|
"fieldname": "total_deduction",
|
||||||
|
"fieldtype": "Currency",
|
||||||
|
"options": "currency",
|
||||||
|
"width": 120,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"label": _("Net Pay"),
|
||||||
|
"fieldname": "net_pay",
|
||||||
|
"fieldtype": "Currency",
|
||||||
|
"options": "currency",
|
||||||
|
"width": 120,
|
||||||
|
},
|
||||||
]
|
]
|
||||||
)
|
)
|
||||||
|
|
||||||
return columns, salary_components[_("Earning")], salary_components[_("Deduction")]
|
return columns
|
||||||
|
|
||||||
|
|
||||||
|
def get_salary_components(salary_slips):
|
||||||
|
return (
|
||||||
|
frappe.qb.from_(salary_detail)
|
||||||
|
.where((salary_detail.amount != 0) & (salary_detail.parent.isin([d.name for d in salary_slips])))
|
||||||
|
.select(salary_detail.salary_component)
|
||||||
|
.distinct()
|
||||||
|
).run(as_list=True)
|
||||||
|
|
||||||
|
|
||||||
|
def get_salary_component_type(salary_component):
|
||||||
|
return frappe.db.get_value("Salary Component", salary_component, "type", cache=True)
|
||||||
|
|
||||||
|
|
||||||
def get_salary_slips(filters, company_currency):
|
def get_salary_slips(filters, company_currency):
|
||||||
filters.update({"from_date": filters.get("from_date"), "to_date": filters.get("to_date")})
|
doc_status = {"Draft": 0, "Submitted": 1, "Cancelled": 2}
|
||||||
conditions, filters = get_conditions(filters, company_currency)
|
|
||||||
salary_slips = frappe.db.sql(
|
query = frappe.qb.from_(salary_slip).select(salary_slip.star)
|
||||||
"""select * from `tabSalary Slip` where %s
|
|
||||||
order by employee"""
|
if filters.get("docstatus"):
|
||||||
% conditions,
|
query = query.where(salary_slip.docstatus == doc_status[filters.get("docstatus")])
|
||||||
filters,
|
|
||||||
as_dict=1,
|
if filters.get("from_date"):
|
||||||
)
|
query = query.where(salary_slip.start_date >= filters.get("from_date"))
|
||||||
|
|
||||||
|
if filters.get("to_date"):
|
||||||
|
query = query.where(salary_slip.end_date <= filters.get("to_date"))
|
||||||
|
|
||||||
|
if filters.get("company"):
|
||||||
|
query = query.where(salary_slip.company == filters.get("company"))
|
||||||
|
|
||||||
|
if filters.get("employee"):
|
||||||
|
query = query.where(salary_slip.employee == filters.get("employee"))
|
||||||
|
|
||||||
|
if filters.get("currency") and filters.get("currency") != company_currency:
|
||||||
|
query = query.where(salary_slip.currency == filters.get("currency"))
|
||||||
|
|
||||||
|
salary_slips = query.run(as_dict=1)
|
||||||
|
|
||||||
return salary_slips or []
|
return salary_slips or []
|
||||||
|
|
||||||
|
|
||||||
def get_conditions(filters, company_currency):
|
|
||||||
conditions = ""
|
|
||||||
doc_status = {"Draft": 0, "Submitted": 1, "Cancelled": 2}
|
|
||||||
|
|
||||||
if filters.get("docstatus"):
|
|
||||||
conditions += "docstatus = {0}".format(doc_status[filters.get("docstatus")])
|
|
||||||
|
|
||||||
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("company"):
|
|
||||||
conditions += " and company = %(company)s"
|
|
||||||
if filters.get("employee"):
|
|
||||||
conditions += " and employee = %(employee)s"
|
|
||||||
if filters.get("currency") and filters.get("currency") != company_currency:
|
|
||||||
conditions += " and currency = %(currency)s"
|
|
||||||
|
|
||||||
return conditions, filters
|
|
||||||
|
|
||||||
|
|
||||||
def get_employee_doj_map():
|
def get_employee_doj_map():
|
||||||
return frappe._dict(
|
employee = frappe.qb.DocType("Employee")
|
||||||
frappe.db.sql(
|
|
||||||
"""
|
result = (frappe.qb.from_(employee).select(employee.name, employee.date_of_joining)).run()
|
||||||
SELECT
|
|
||||||
employee,
|
return frappe._dict(result)
|
||||||
date_of_joining
|
|
||||||
FROM `tabEmployee`
|
|
||||||
"""
|
|
||||||
)
|
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
def get_ss_earning_map(salary_slips, currency, company_currency):
|
def get_salary_slip_details(salary_slips, currency, company_currency, component_type):
|
||||||
ss_earnings = frappe.db.sql(
|
salary_slips = [ss.name for ss in salary_slips]
|
||||||
"""select sd.parent, sd.salary_component, sd.amount, ss.exchange_rate, ss.name
|
|
||||||
from `tabSalary Detail` sd, `tabSalary Slip` ss where sd.parent=ss.name and sd.parent in (%s)"""
|
|
||||||
% (", ".join(["%s"] * len(salary_slips))),
|
|
||||||
tuple([d.name for d in salary_slips]),
|
|
||||||
as_dict=1,
|
|
||||||
)
|
|
||||||
|
|
||||||
ss_earning_map = {}
|
result = (
|
||||||
for d in ss_earnings:
|
frappe.qb.from_(salary_slip)
|
||||||
ss_earning_map.setdefault(d.parent, frappe._dict()).setdefault(d.salary_component, 0.0)
|
.join(salary_detail)
|
||||||
|
.on(salary_slip.name == salary_detail.parent)
|
||||||
|
.where((salary_detail.parent.isin(salary_slips)) & (salary_detail.parentfield == component_type))
|
||||||
|
.select(
|
||||||
|
salary_detail.parent,
|
||||||
|
salary_detail.salary_component,
|
||||||
|
salary_detail.amount,
|
||||||
|
salary_slip.exchange_rate,
|
||||||
|
)
|
||||||
|
).run(as_dict=1)
|
||||||
|
|
||||||
|
ss_map = {}
|
||||||
|
|
||||||
|
for d in result:
|
||||||
|
ss_map.setdefault(d.parent, frappe._dict()).setdefault(d.salary_component, 0.0)
|
||||||
if currency == company_currency:
|
if currency == company_currency:
|
||||||
ss_earning_map[d.parent][d.salary_component] += flt(d.amount) * flt(
|
ss_map[d.parent][d.salary_component] += flt(d.amount) * flt(
|
||||||
d.exchange_rate if d.exchange_rate else 1
|
d.exchange_rate if d.exchange_rate else 1
|
||||||
)
|
)
|
||||||
else:
|
else:
|
||||||
ss_earning_map[d.parent][d.salary_component] += flt(d.amount)
|
ss_map[d.parent][d.salary_component] += flt(d.amount)
|
||||||
|
|
||||||
return ss_earning_map
|
return ss_map
|
||||||
|
|
||||||
|
|
||||||
def get_ss_ded_map(salary_slips, currency, company_currency):
|
|
||||||
ss_deductions = frappe.db.sql(
|
|
||||||
"""select sd.parent, sd.salary_component, sd.amount, ss.exchange_rate, ss.name
|
|
||||||
from `tabSalary Detail` sd, `tabSalary Slip` ss where sd.parent=ss.name and sd.parent in (%s)"""
|
|
||||||
% (", ".join(["%s"] * len(salary_slips))),
|
|
||||||
tuple([d.name for d in salary_slips]),
|
|
||||||
as_dict=1,
|
|
||||||
)
|
|
||||||
|
|
||||||
ss_ded_map = {}
|
|
||||||
for d in ss_deductions:
|
|
||||||
ss_ded_map.setdefault(d.parent, frappe._dict()).setdefault(d.salary_component, 0.0)
|
|
||||||
if currency == company_currency:
|
|
||||||
ss_ded_map[d.parent][d.salary_component] += flt(d.amount) * flt(
|
|
||||||
d.exchange_rate if d.exchange_rate else 1
|
|
||||||
)
|
|
||||||
else:
|
|
||||||
ss_ded_map[d.parent][d.salary_component] += flt(d.amount)
|
|
||||||
|
|
||||||
return ss_ded_map
|
|
||||||
|
|||||||
Reference in New Issue
Block a user