nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-22 14:39:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Anand Doshi
2013-08-01 12:10:58 +05:30
parent 74458a93bb 8608f0e9fa
commit ded00de58b
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
accounts/page/voucher_import_tool/voucher_import_tool.js
View File

@@ -33,7 +33,7 @@ wn.pages['voucher-import-tool'].onload = function(wrapper) {
callback: function(fid, filename, r) { callback: function(fid, filename, r) {
wrapper.waiting.toggle(false); wrapper.waiting.toggle(false);
$(wrapper).find(".messages").toggle(true).html( $(wrapper).find(".messages").toggle(true).html(
r.join("<div style='margin:4px; border-top:1px solid #aaa;'></div>")) r.message.join("<div style='margin:4px; border-top:1px solid #aaa;'></div>"))
} }
}); });

2
selling/utils.py
View File

@@ -153,7 +153,7 @@ def _get_price_list_rate(args, item_bean, meta):
from utilities.transaction_base import validate_currency from utilities.transaction_base import validate_currency
validate_currency(args, item_bean.doc, meta) validate_currency(args, item_bean.doc, meta)
return {"ref_rate": flt(base_ref_rate[0].ref_rate * args.plc_conversion_rate / args.conversion_rate)} return {"ref_rate": flt(base_ref_rate[0].ref_rate) * flt(args.plc_conversion_rate) / flt(args.conversion_rate)}
def _get_item_discount(item_group, customer): def _get_item_discount(item_group, customer):
parent_item_groups = [x[0] for x in webnotes.conn.sql("""SELECT parent.name parent_item_groups = [x[0] for x in webnotes.conn.sql("""SELECT parent.name

4
stock/doctype/item_price/item_price.txt
View File

@@ -2,7 +2,7 @@
{ {
"creation": "2013-05-02 16:29:48", "creation": "2013-05-02 16:29:48",
"docstatus": 0, "docstatus": 0,
"modified": "2013-07-10 14:54:09", "modified": "2013-07-31 17:30:34",
"modified_by": "Administrator", "modified_by": "Administrator",
"owner": "Administrator" "owner": "Administrator"
}, },
@@ -49,7 +49,7 @@
"oldfieldname": "ref_rate", "oldfieldname": "ref_rate",
"oldfieldtype": "Currency", "oldfieldtype": "Currency",
"options": "ref_currency", "options": "ref_currency",
"reqd": 0, "reqd": 1,
"search_index": 0 "search_index": 0
}, },
{ {