schuetz3/schuetz3-erpnext
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[minor] added get_terms methods to erpnext.utils so that it can be used in non transactional documents (#9037)

Browse Source
This commit is contained in:
Makarand Bauskar
2017-05-26 21:32:33 +05:30
committed by Nabin Hait
parent 4b12896941
commit 157c334737
3 changed files with 25 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
erpnext/public/js/controllers/transaction.js
View File

@@ -993,20 +993,12 @@ erpnext.TransactionController = erpnext.taxes_and_totals.extend({
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() {