Fixed version conflict

2016-09-23 12:16:31 +05:30
parent 2d4f3bb04a d4321ec18b
commit 6b4eb7f77f
12 changed files with 19 additions and 8 deletions
--- a/erpnext/public/js/controllers/transaction.js
+++ b/erpnext/public/js/controllers/transaction.js
@@ -668,6 +668,7 @@ erpnext.TransactionController = erpnext.taxes_and_totals.extend({
 					me._set_values_for_item_list(r.message);
 					if(item) me.set_gross_profit(item);
 					if(calculate_taxes_and_totals) me.calculate_taxes_and_totals();
+					if(me.frm.doc.apply_discount_on) me.frm.trigger("apply_discount_on")
 				}
 			}
 		});