Przeglądaj źródła

Merge pull request #2852 from mbauskar/develop

Filtered transaction doctype from link_doctype field in dynamic link and other minor fixes
version-14
Nabin Hait 8 lat temu
committed by GitHub
rodzic
commit
cc426dcbc5
3 zmienionych plików z 5 dodań i 5 usunięć
  1. +2
    -2
      frappe/email/doctype/contact/contact.js
  2. +2
    -2
      frappe/geo/doctype/address/address.js
  3. +1
    -1
      frappe/public/js/frappe/form/footer/timeline_item.html

+ 2
- 2
frappe/email/doctype/contact/contact.js Wyświetl plik

@@ -33,8 +33,8 @@ frappe.ui.form.on("Contact", {
return { return {
query: "frappe.geo.address_and_contact.filter_dynamic_link_doctypes", query: "frappe.geo.address_and_contact.filter_dynamic_link_doctypes",
filters: { filters: {
fieldtype: "Link",
options: frm.doc.doctype,
fieldtype: "HTML",
fieldname: "contact_html",
} }
} }
}); });


+ 2
- 2
frappe/geo/doctype/address/address.js Wyświetl plik

@@ -17,8 +17,8 @@ frappe.ui.form.on("Address", {
return { return {
query: "frappe.geo.address_and_contact.filter_dynamic_link_doctypes", query: "frappe.geo.address_and_contact.filter_dynamic_link_doctypes",
filters: { filters: {
fieldtype: "Link",
options: frm.doc.doctype,
fieldtype: "HTML",
fieldname: "address_html",
} }
} }
}); });


+ 1
- 1
frappe/public/js/frappe/form/footer/timeline_item.html Wyświetl plik

@@ -83,7 +83,7 @@
<i class="octicon octicon-heart like-action <i class="octicon octicon-heart like-action
{% if (!data.liked_by_user) { %} {% if (!data.liked_by_user) { %}
text-extra-muted not-liked text-extra-muted not-liked
{% } %} "
{% } %} fa-fw"
data-doctype="{%= data.doctype %}" data-doctype="{%= data.doctype %}"
data-name="{%= data.name %}"></i> data-name="{%= data.name %}"></i>
<span class="likes-count text-muted"> <span class="likes-count text-muted">


Ładowanie…
Anuluj
Zapisz