nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-02 03:39:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Conflicts:
	accounts/search_criteria/trend_analyzer/trend_analyzer.py
	buying/doctype/purchase_common/purchase_common.js
This commit is contained in:
Anand Doshi
2013-06-21 12:22:52 +05:30
parent cd6dcacc6e 2ef637b346
commit d52b03a8cc
57 changed files with 1572 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
public/js/transaction.js
View File

@@ -70,7 +70,7 @@ erpnext.TransactionController = wn.ui.form.Controller.extend({
},
company: function() {
if(this.frm.doc.company) {
if(this.frm.doc.company && this.frm.fields_dict.currency) {
var me = this;
var company_currency = this.get_company_currency();
$.each(["currency", "price_list_currency"], function(i, fieldname) {
@@ -87,6 +87,9 @@ erpnext.TransactionController = wn.ui.form.Controller.extend({
},
currency: function() {
if(this.frm.doc.currency === this.get_company_currency())
this.frm.set_value("conversion_rate", 1.0);
this.price_list_currency();
},