Merge branch 'master' of github.com:webnotes/erpnext

This commit is contained in:
Akhilesh Darjee
2013-10-18 15:28:15 +05:30
8 changed files with 19 additions and 25 deletions

View File

@@ -210,8 +210,7 @@ erpnext.TransactionController = erpnext.stock.StockController.extend({
this.frm.doc.plc_conversion_rate !== this.frm.doc.conversion_rate) {
this.frm.set_value("plc_conversion_rate", this.frm.doc.conversion_rate);
}
this.calculate_taxes_and_totals();
if(flt(this.frm.doc.conversion_rate)>0.0) this.calculate_taxes_and_totals();
},
get_price_list_currency: function(buying_or_selling) {