Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Rushabh Mehta 2013-06-25 11:46:24 +05:30
commit 664ba4001f
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
patches/patch_list.py
View File

@ -200,6 +200,7 @@ patch_list = [
"execute:webnotes.reload_doc('setup', 'doctype', 'item_group') #2013-03-25",
"execute:webnotes.reload_doc('website', 'doctype', 'blog_post') #2013-03-25",
"execute:webnotes.reload_doc('website', 'doctype', 'web_page') #2013-03-25",
"execute:webnotes.reload_doc('setup', 'doctype', 'sales_partner') #2013-06-25",
"execute:webnotes.bean('Style Settings').save() #2013-03-25",
"execute:webnotes.conn.set_value('Email Settings', None, 'send_print_in_body_and_attachment', 1)",
"patches.march_2013.p09_unset_user_type_partner",

2
public/js/transaction.js
View File

@ -138,7 +138,7 @@ erpnext.TransactionController = wn.ui.form.Controller.extend({
var exchange_name = from_currency + "-" + to_currency;
wn.model.with_doc("Currency Exchange", exchange_name, function(name) {
var exchange_doc = wn.model.get_doc("Currency Exchange", exchange_name);
callback(exchange_doc ? flt(exchange_doc.exchange_rate)) : 0);
callback(exchange_doc ? flt(exchange_doc.exchange_rate) : 0);
});
},