Merge branch 'develop' into item-image-alt
diff --git a/erpnext/accounts/doctype/payment_entry/payment_entry.js b/erpnext/accounts/doctype/payment_entry/payment_entry.js
index adfaade..9fc44bc 100644
--- a/erpnext/accounts/doctype/payment_entry/payment_entry.js
+++ b/erpnext/accounts/doctype/payment_entry/payment_entry.js
@@ -42,7 +42,8 @@
frm.set_query("bank_account", function() {
return {
filters: {
- is_company_account: 1
+ is_company_account: 1,
+ company: frm.doc.company
}
}
});
@@ -1049,4 +1050,4 @@
});
}
},
-})
\ No newline at end of file
+})
diff --git a/erpnext/patches.txt b/erpnext/patches.txt
index 3bd4169..ae20d9e 100644
--- a/erpnext/patches.txt
+++ b/erpnext/patches.txt
@@ -679,7 +679,6 @@
erpnext.patches.v12_0.update_appointment_reminder_scheduler_entry
erpnext.patches.v12_0.rename_pos_closing_doctype
erpnext.patches.v13_0.replace_pos_payment_mode_table
-erpnext.patches.v12_0.retain_permission_rules_for_video_doctype
erpnext.patches.v12_0.remove_duplicate_leave_ledger_entries #2020-05-22
erpnext.patches.v13_0.patch_to_fix_reverse_linking_in_additional_salary_encashment_and_incentive
execute:frappe.reload_doc("HR", "doctype", "Employee Advance")
diff --git a/erpnext/patches/v12_0/retain_permission_rules_for_video_doctype.py b/erpnext/patches/v12_0/retain_permission_rules_for_video_doctype.py
deleted file mode 100644
index ca8a13b..0000000
--- a/erpnext/patches/v12_0/retain_permission_rules_for_video_doctype.py
+++ /dev/null
@@ -1,21 +0,0 @@
-from __future__ import unicode_literals
-import frappe
-
-def execute():
- # to retain the roles and permissions from Education Module
- # after moving doctype to core
- permissions = frappe.db.sql("""
- SELECT
- *
- FROM
- `tabDocPerm`
- WHERE
- parent='Video'
- """, as_dict=True)
-
- frappe.reload_doc('core', 'doctype', 'video')
- doc = frappe.get_doc('DocType', 'Video')
- doc.permissions = []
- for perm in permissions:
- doc.append('permissions', perm)
- doc.save()