nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-31 10:49:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'akhileshdarjee-master' into website-wip

Browse Source
This commit is contained in:
Anand Doshi
2013-09-17 16:09:15 +05:30
parent 8c002491d0 0dc627d9b1
commit 83de391efc
45 changed files with 362 additions and 505 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
selling/utils/__init__.py
View File

@@ -141,20 +141,19 @@ def _get_basic_details(args, item_bean, warehouse_fieldname):
return out
def _get_price_list_rate(args, item_bean, meta):
base_ref_rate = item_bean.doclist.get({
"parentfield": "ref_rate_details",
"price_list": args.selling_price_list,
"ref_currency": args.price_list_currency,
"buying_or_selling": "Selling"})
ref_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='Selling'""",
(args.selling_price_list, args.item_code), as_dict=1)
if not base_ref_rate:
if not ref_rate:
return {}
# found price list rate - now we can validate
from utilities.transaction_base import validate_currency
validate_currency(args, item_bean.doc, meta)
return {"ref_rate": flt(base_ref_rate[0].ref_rate) * flt(args.plc_conversion_rate) / flt(args.conversion_rate)}
return {"ref_rate": flt(ref_rate[0].ref_rate) * flt(args.plc_conversion_rate) / flt(args.conversion_rate)}
def _get_item_discount(item_group, customer):
parent_item_groups = [x[0] for x in webnotes.conn.sql("""SELECT parent.name

5
selling/utils/product.py
View File

@@ -27,8 +27,9 @@ def get_product_info(item_code):
else:
in_stock = -1
price = price_list and webnotes.conn.sql("""select ref_rate, ref_currency from
`tabItem Price` where parent=%s and price_list=%s""",
price = price_list and webnotes.conn.sql("""select ip.ref_rate, pl.ref_currency from
`tabItem Price` ip, `tabPrice List` pl where ip.parent = pl.name and
ip.item_code=%s and ip.parent=%s""",
(item_code, price_list), as_dict=1) or []
price = price and price[0] or None