Merge pull request #2852 from mbauskar/develop
Filtered transaction doctype from link_doctype field in dynamic link and other minor fixes
This commit is contained in:
commit
cc426dcbc5
3 changed files with 5 additions and 5 deletions
|
|
@ -33,8 +33,8 @@ frappe.ui.form.on("Contact", {
|
|||
return {
|
||||
query: "frappe.geo.address_and_contact.filter_dynamic_link_doctypes",
|
||||
filters: {
|
||||
fieldtype: "Link",
|
||||
options: frm.doc.doctype,
|
||||
fieldtype: "HTML",
|
||||
fieldname: "contact_html",
|
||||
}
|
||||
}
|
||||
});
|
||||
|
|
|
|||
|
|
@ -17,8 +17,8 @@ frappe.ui.form.on("Address", {
|
|||
return {
|
||||
query: "frappe.geo.address_and_contact.filter_dynamic_link_doctypes",
|
||||
filters: {
|
||||
fieldtype: "Link",
|
||||
options: frm.doc.doctype,
|
||||
fieldtype: "HTML",
|
||||
fieldname: "address_html",
|
||||
}
|
||||
}
|
||||
});
|
||||
|
|
|
|||
|
|
@ -83,7 +83,7 @@
|
|||
<i class="octicon octicon-heart like-action
|
||||
{% if (!data.liked_by_user) { %}
|
||||
text-extra-muted not-liked
|
||||
{% } %} "
|
||||
{% } %} fa-fw"
|
||||
data-doctype="{%= data.doctype %}"
|
||||
data-name="{%= data.name %}"></i>
|
||||
<span class="likes-count text-muted">
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue