nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-29 09:54:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: (ux) set jv voucher type depending on mode of payment (#21412)

Browse Source
This commit is contained in:
Saqib
2020-04-26 09:41:02 +05:30
committed by GitHub
parent 9fc78e44ea
commit 7fedff260d
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
erpnext/hr/doctype/employee_advance/employee_advance.py
View File

@@ -136,9 +136,18 @@ def make_bank_entry(dt, dn):
def make_return_entry(employee, company, employee_advance_name, def make_return_entry(employee, company, employee_advance_name,
return_amount, advance_account, mode_of_payment=None): return_amount, advance_account, mode_of_payment=None):
return_account = get_default_bank_cash_account(company, account_type='Cash', mode_of_payment = mode_of_payment) return_account = get_default_bank_cash_account(company, account_type='Cash', mode_of_payment = mode_of_payment)
mode_of_payment_type = ''
if mode_of_payment:
mode_of_payment_type = frappe.get_cached_value('Mode of Payment', mode_of_payment, 'type')
if mode_of_payment_type not in ["Cash", "Bank"]:
# if mode of payment is General then it unset the type
mode_of_payment_type = None
je = frappe.new_doc('Journal Entry') je = frappe.new_doc('Journal Entry')
je.posting_date = nowdate() je.posting_date = nowdate()
je.voucher_type = 'Bank Entry' # if mode of payment is Bank then voucher type is Bank Entry
je.voucher_type = '{} Entry'.format(mode_of_payment_type) if mode_of_payment_type else 'Cash Entry'
je.company = company je.company = company
je.remark = 'Return against Employee Advance: ' + employee_advance_name je.remark = 'Return against Employee Advance: ' + employee_advance_name