Merge branch 'develop' of https://github.com/frappe/erpnext into employee_loan_fixes

This commit is contained in:
Deepesh Garg
2020-04-13 13:20:02 +05:30
123 changed files with 2043 additions and 3629 deletions

View File

@@ -239,7 +239,7 @@ doc_events = {
"on_trash": "erpnext.regional.check_deletion_permission"
},
"Payment Entry": {
"on_submit": ["erpnext.regional.create_transaction_log", "erpnext.accounts.doctype.payment_request.payment_request.make_status_as_paid"],
"on_submit": ["erpnext.regional.create_transaction_log", "erpnext.accounts.doctype.payment_request.payment_request.update_payment_req_status"],
"on_trash": "erpnext.regional.check_deletion_permission"
},
'Address': {