Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop' into item-image-alt

Browse Source
This commit is contained in:
Shivam Mishra 2020-08-07 09:15:00 +00:00 committed by GitHub
commit b7a24ad95b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
erpnext/accounts/doctype/payment_entry/payment_entry.js
View File

@ -42,7 +42,8 @@ frappe.ui.form.on('Payment Entry', {
frm.set_query("bank_account", function() { frm.set_query("bank_account", function() {
return { return {
filters: { filters: {
is_company_account: 1 is_company_account: 1,
company: frm.doc.company
} }
} }
}); });

1
erpnext/patches.txt
View File

@ -679,7 +679,6 @@ erpnext.patches.v12_0.fix_quotation_expired_status
erpnext.patches.v12_0.update_appointment_reminder_scheduler_entry erpnext.patches.v12_0.update_appointment_reminder_scheduler_entry
erpnext.patches.v12_0.rename_pos_closing_doctype erpnext.patches.v12_0.rename_pos_closing_doctype
erpnext.patches.v13_0.replace_pos_payment_mode_table 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.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 erpnext.patches.v13_0.patch_to_fix_reverse_linking_in_additional_salary_encashment_and_incentive
execute:frappe.reload_doc("HR", "doctype", "Employee Advance") execute:frappe.reload_doc("HR", "doctype", "Employee Advance")

21
erpnext/patches/v12_0/retain_permission_rules_for_video_doctype.py
View File

@ -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()