Merge branch 'responsive' of github.com:webnotes/erpnext into responsive
This commit is contained in:
commit
664ba4001f
@ -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",
|
||||
|
@ -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);
|
||||
});
|
||||
},
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user