nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-01 11:19:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'v12-pre-release' into version-12

Browse Source
This commit is contained in:
Sahil Khan
2020-05-21 15:26:42 +05:30
parent d062a4b6b5 746e879187
commit 3df3842e47
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/__init__.py
View File

@@ -5,7 +5,7 @@ import frappe
from erpnext.hooks import regional_overrides from erpnext.hooks import regional_overrides
from frappe.utils import getdate from frappe.utils import getdate
__version__ = '12.9.0' __version__ = '12.9.1'
def get_default_company(user=None): def get_default_company(user=None):
'''Get default company for user''' '''Get default company for user'''

4
erpnext/patches/v12_0/remove_duplicate_leave_ledger_entries.py
View File

@@ -40,5 +40,5 @@ def get_duplicate_records():
def delete_duplicate_ledger_entries(duplicate_records_list): def delete_duplicate_ledger_entries(duplicate_records_list):
"""Delete duplicate leave ledger entries.""" """Delete duplicate leave ledger entries."""
if duplicate_records_list: if not duplicate_records_list: return
frappe.db.sql(''' DELETE FROM `tabLeave Ledger Entry` WHERE name in {0}'''.format(tuple(duplicate_records_list))) #nosec frappe.db.sql('''DELETE FROM `tabLeave Ledger Entry` WHERE name in %s''', ((tuple(duplicate_records_list)), ))