nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-26 16:34:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

[usability] item price moved to price list

Browse Source
This commit is contained in:
Akhilesh Darjee
2013-09-11 13:05:24 +05:30
parent 881a47f5c7
commit db59ffb76d
32 changed files with 129 additions and 289 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
buying/doctype/purchase_common/purchase_common.js
View File

@@ -24,16 +24,6 @@ erpnext.buying.BuyingController = erpnext.TransactionController.extend({
filters: { 'buying_or_selling': "Buying" }
}
});
this.frm.set_query("price_list_currency", function() {
return{
query: "controllers.queries.get_price_list_currency",
filters: {
'price_list': me.frm.doc.buying_price_list,
'buying_or_selling': "Buying"
}
}
});
}
$.each([["supplier", "supplier"],
@@ -152,7 +142,7 @@ erpnext.buying.BuyingController = erpnext.TransactionController.extend({
},
buying_price_list: function() {
this.get_price_list_currency("buying");
this.get_price_list_currency("Buying");
},
import_ref_rate: function(doc, cdt, cdn) {

13
buying/utils.py
View File

@@ -89,12 +89,15 @@ def _get_price_list_rate(args, item_bean, meta):
# try fetching from price list
if args.buying_price_list and args.price_list_currency:
price_list_rate = item_bean.doclist.get({
"parentfield": "ref_rate_details",
"price_list": args.buying_price_list,
"ref_currency": args.price_list_currency,
"buying_or_selling": "Buying"})
price_list_rate = webnotes.conn.sql("""select ip.ref_rate from `tabItem Price` ip,
`tabPrice List` pl where ip.parent = pl.name and ip.parent=%s and
ip.item_code=%s and pl.buying_or_selling='Buying'""",
(args.buying_price_list, args.item_code), as_dict=1)
if price_list_rate:
from utilities.transaction_base import validate_currency
validate_currency(args, item_bean.doc, meta)
out.import_ref_rate = \
flt(price_list_rate[0].ref_rate * args.plc_conversion_rate / args.conversion_rate)