Renamed Net total to Total and dynamic label
diff --git a/erpnext/public/js/controllers/accounts.js b/erpnext/public/js/controllers/accounts.js
index c8bb86c..8911832 100644
--- a/erpnext/public/js/controllers/accounts.js
+++ b/erpnext/public/js/controllers/accounts.js
@@ -85,7 +85,7 @@
});
// For customizing print
-cur_frm.pformat.print_total = function(doc) { return ''; }
+cur_frm.pformat.total = function(doc) { return ''; }
cur_frm.pformat.discount_amount = function(doc) { return ''; }
cur_frm.pformat.grand_total = function(doc) { return ''; }
cur_frm.pformat.rounded_total = function(doc) { return ''; }
@@ -116,8 +116,8 @@
out +='<table class="noborder" style="width:100%">';
- if(!print_hide('print_total')) {
- out += make_row('Net Total', doc.print_total, 1);
+ if(!print_hide('total')) {
+ out += make_row('Total', doc.total, 1);
}
// Discount Amount on net total
diff --git a/erpnext/public/js/controllers/taxes_and_totals.js b/erpnext/public/js/controllers/taxes_and_totals.js
index 603b147..4018742 100644
--- a/erpnext/public/js/controllers/taxes_and_totals.js
+++ b/erpnext/public/js/controllers/taxes_and_totals.js
@@ -179,16 +179,16 @@
calculate_net_total: function() {
var me = this;
- this.frm.doc.print_total = this.frm.doc.base_print_total = this.frm.doc.net_total = this.frm.doc.base_net_total = 0.0;
+ this.frm.doc.total = this.frm.doc.base_total = this.frm.doc.net_total = this.frm.doc.base_net_total = 0.0;
$.each(this.frm.doc["items"] || [], function(i, item) {
- me.frm.doc.print_total += item.amount;
- me.frm.doc.base_print_total += item.base_amount;
+ me.frm.doc.total += item.amount;
+ me.frm.doc.base_total += item.base_amount;
me.frm.doc.net_total += item.net_amount;
me.frm.doc.base_net_total += item.base_net_amount;
});
- frappe.model.round_floats_in(this.frm.doc, ["print_total", "base_print_total", "net_total", "base_net_total"]);
+ frappe.model.round_floats_in(this.frm.doc, ["total", "base_total", "net_total", "base_net_total"]);
},
calculate_taxes: function() {