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

Merge branch 'develop' into exchange_rate_reval_fixes

Browse Source
This commit is contained in:
Deepesh Garg 2021-07-26 19:05:44 +05:30 committed by GitHub
commit b23315a7e6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 24 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
CODEOWNERS
View File

@ -21,13 +21,13 @@ erpnext/quality_management/ @marination @rohitwaghchaure
erpnext/shopping_cart/ @marination erpnext/shopping_cart/ @marination
erpnext/stock/ @marination @rohitwaghchaure @ankush erpnext/stock/ @marination @rohitwaghchaure @ankush
erpnext/crm/ @ruchamahabal erpnext/crm/ @ruchamahabal @pateljannat
erpnext/education/ @ruchamahabal erpnext/education/ @ruchamahabal @pateljannat
erpnext/healthcare/ @ruchamahabal erpnext/healthcare/ @ruchamahabal @pateljannat @chillaranand
erpnext/hr/ @ruchamahabal erpnext/hr/ @ruchamahabal @pateljannat
erpnext/non_profit/ @ruchamahabal erpnext/non_profit/ @ruchamahabal
erpnext/payroll @ruchamahabal erpnext/payroll @ruchamahabal @pateljannat
erpnext/projects/ @ruchamahabal erpnext/projects/ @ruchamahabal @pateljannat
erpnext/controllers @deepeshgarg007 @nextchamp-saqib @rohitwaghchaure @marination erpnext/controllers @deepeshgarg007 @nextchamp-saqib @rohitwaghchaure @marination

3
erpnext/hooks.py
View File

@ -25,7 +25,8 @@ doctype_js = {
"Address": "public/js/address.js", "Address": "public/js/address.js",
"Communication": "public/js/communication.js", "Communication": "public/js/communication.js",
"Event": "public/js/event.js", "Event": "public/js/event.js",
"Newsletter": "public/js/newsletter.js" "Newsletter": "public/js/newsletter.js",
"Contact": "public/js/contact.js"
} }
override_doctype_class = { override_doctype_class = {

16
erpnext/public/js/contact.js Normal file
View File

@ -0,0 +1,16 @@
frappe.ui.form.on("Contact", {
refresh(frm) {
frm.set_query('link_doctype', "links", function() {
return {
query: "frappe.contacts.address_and_contact.filter_dynamic_link_doctypes",
filters: {
fieldtype: ["in", ["HTML", "Text Editor"]],
fieldname: ["in", ["contact_html", "company_description"]],
}
};
});
frm.refresh_field("links");
}
});