[minor] added get_terms methods to erpnext.utils so that it can be used in non transactional documents (#9037)
diff --git a/erpnext/hr/doctype/offer_letter/offer_letter.js b/erpnext/hr/doctype/offer_letter/offer_letter.js
index 643eaa8..125a425 100755
--- a/erpnext/hr/doctype/offer_letter/offer_letter.js
+++ b/erpnext/hr/doctype/offer_letter/offer_letter.js
@@ -5,8 +5,10 @@
frappe.ui.form.on("Offer Letter", {
select_terms: function(frm) {
- frappe.model.get_value("Terms and Conditions", frm.doc.select_terms, "terms", function(value) {
- frm.set_value("terms", value.terms);
+ erpnext.utils.get_terms(frm.doc.select_terms, frm.doc, function(r) {
+ if(!r.exc) {
+ me.frm.set_value("terms", r.message);
+ }
});
},
diff --git a/erpnext/public/js/controllers/transaction.js b/erpnext/public/js/controllers/transaction.js
index 2d0d83b..6357a52 100644
--- a/erpnext/public/js/controllers/transaction.js
+++ b/erpnext/public/js/controllers/transaction.js
@@ -993,20 +993,12 @@
get_terms: function() {
var me = this;
- if(this.frm.doc.tc_name) {
- return frappe.call({
- method: 'erpnext.setup.doctype.terms_and_conditions.terms_and_conditions.get_terms_and_conditions',
- args: {
- template_name: this.frm.doc.tc_name,
- doc: this.frm.doc
- },
- callback: function(r) {
- if(!r.exc) {
- me.frm.set_value("terms", r.message);
- }
- }
- });
- }
+
+ erpnext.utils.get_terms(this.frm.doc.tc_name, this.frm.doc, function(r) {
+ if(!r.exc) {
+ me.frm.set_value("terms", r.message);
+ }
+ });
},
taxes_and_charges: function() {
diff --git a/erpnext/public/js/utils.js b/erpnext/public/js/utils.js
index 3a2254e..d618fbe 100644
--- a/erpnext/public/js/utils.js
+++ b/erpnext/public/js/utils.js
@@ -104,6 +104,21 @@
}
}
refresh_field(table_fieldname);
+ },
+
+ get_terms: function(tc_name, doc, callback) {
+ if(tc_name) {
+ return frappe.call({
+ method: 'erpnext.setup.doctype.terms_and_conditions.terms_and_conditions.get_terms_and_conditions',
+ args: {
+ template_name: tc_name,
+ doc: doc
+ },
+ callback: function(r) {
+ callback(r)
+ }
+ });
+ }
}
});