Changed frappe.conn to frappe.db
This commit is contained in:
@@ -13,7 +13,7 @@ class InvalidWarehouseCompany(frappe.ValidationError): pass
|
||||
def get_stock_balance_on(warehouse, posting_date=None):
|
||||
if not posting_date: posting_date = nowdate()
|
||||
|
||||
stock_ledger_entries = frappe.conn.sql("""
|
||||
stock_ledger_entries = frappe.db.sql("""
|
||||
SELECT
|
||||
item_code, stock_value
|
||||
FROM
|
||||
@@ -31,14 +31,14 @@ def get_stock_balance_on(warehouse, posting_date=None):
|
||||
|
||||
def get_latest_stock_balance():
|
||||
bin_map = {}
|
||||
for d in frappe.conn.sql("""SELECT item_code, warehouse, stock_value as stock_value
|
||||
for d in frappe.db.sql("""SELECT item_code, warehouse, stock_value as stock_value
|
||||
FROM tabBin""", as_dict=1):
|
||||
bin_map.setdefault(d.warehouse, {}).setdefault(d.item_code, flt(d.stock_value))
|
||||
|
||||
return bin_map
|
||||
|
||||
def get_bin(item_code, warehouse):
|
||||
bin = frappe.conn.get_value("Bin", {"item_code": item_code, "warehouse": warehouse})
|
||||
bin = frappe.db.get_value("Bin", {"item_code": item_code, "warehouse": warehouse})
|
||||
if not bin:
|
||||
bin_wrapper = frappe.bean([{
|
||||
"doctype": "Bin",
|
||||
@@ -54,7 +54,7 @@ def get_bin(item_code, warehouse):
|
||||
return bin_obj
|
||||
|
||||
def update_bin(args):
|
||||
is_stock_item = frappe.conn.get_value('Item', args.get("item_code"), 'is_stock_item')
|
||||
is_stock_item = frappe.db.get_value('Item', args.get("item_code"), 'is_stock_item')
|
||||
if is_stock_item == 'Yes':
|
||||
bin = get_bin(args.get("item_code"), args.get("warehouse"))
|
||||
bin.update_stock(args)
|
||||
@@ -71,7 +71,7 @@ def get_incoming_rate(args):
|
||||
if args.get("serial_no"):
|
||||
in_rate = get_avg_purchase_rate(args.get("serial_no"))
|
||||
elif args.get("bom_no"):
|
||||
result = frappe.conn.sql("""select ifnull(total_cost, 0) / ifnull(quantity, 1)
|
||||
result = frappe.db.sql("""select ifnull(total_cost, 0) / ifnull(quantity, 1)
|
||||
from `tabBOM` where name = %s and docstatus=1 and is_active=1""", args.get("bom_no"))
|
||||
in_rate = result and flt(result[0][0]) or 0
|
||||
else:
|
||||
@@ -91,13 +91,13 @@ def get_avg_purchase_rate(serial_nos):
|
||||
"""get average value of serial numbers"""
|
||||
|
||||
serial_nos = get_valid_serial_nos(serial_nos)
|
||||
return flt(frappe.conn.sql("""select avg(ifnull(purchase_rate, 0)) from `tabSerial No`
|
||||
return flt(frappe.db.sql("""select avg(ifnull(purchase_rate, 0)) from `tabSerial No`
|
||||
where name in (%s)""" % ", ".join(["%s"] * len(serial_nos)),
|
||||
tuple(serial_nos))[0][0])
|
||||
|
||||
def get_valuation_method(item_code):
|
||||
"""get valuation method from item or default"""
|
||||
val_method = frappe.conn.get_value('Item', item_code, 'valuation_method')
|
||||
val_method = frappe.db.get_value('Item', item_code, 'valuation_method')
|
||||
if not val_method:
|
||||
val_method = get_global_default('valuation_method') or "FIFO"
|
||||
return val_method
|
||||
@@ -148,7 +148,7 @@ def get_valid_serial_nos(sr_nos, qty=0, item_code=''):
|
||||
return valid_serial_nos
|
||||
|
||||
def validate_warehouse_company(warehouse, company):
|
||||
warehouse_company = frappe.conn.get_value("Warehouse", warehouse, "company")
|
||||
warehouse_company = frappe.db.get_value("Warehouse", warehouse, "company")
|
||||
if warehouse_company and warehouse_company != company:
|
||||
frappe.msgprint(_("Warehouse does not belong to company.") + " (" + \
|
||||
warehouse + ", " + company +")", raise_exception=InvalidWarehouseCompany)
|
||||
@@ -182,11 +182,11 @@ def get_buying_amount(voucher_type, voucher_no, item_row, stock_ledger_entries):
|
||||
def reorder_item():
|
||||
""" Reorder item if stock reaches reorder level"""
|
||||
if getattr(frappe.local, "auto_indent", None) is None:
|
||||
frappe.local.auto_indent = cint(frappe.conn.get_value('Stock Settings', None, 'auto_indent'))
|
||||
frappe.local.auto_indent = cint(frappe.db.get_value('Stock Settings', None, 'auto_indent'))
|
||||
|
||||
if frappe.local.auto_indent:
|
||||
material_requests = {}
|
||||
bin_list = frappe.conn.sql("""select item_code, warehouse, projected_qty
|
||||
bin_list = frappe.db.sql("""select item_code, warehouse, projected_qty
|
||||
from tabBin where ifnull(item_code, '') != '' and ifnull(warehouse, '') != ''
|
||||
and exists (select name from `tabItem`
|
||||
where `tabItem`.name = `tabBin`.item_code and
|
||||
@@ -194,14 +194,14 @@ def reorder_item():
|
||||
(ifnull(end_of_life, '')='' or end_of_life > now()))""", as_dict=True)
|
||||
for bin in bin_list:
|
||||
#check if re-order is required
|
||||
item_reorder = frappe.conn.get("Item Reorder",
|
||||
item_reorder = frappe.db.get("Item Reorder",
|
||||
{"parent": bin.item_code, "warehouse": bin.warehouse})
|
||||
if item_reorder:
|
||||
reorder_level = item_reorder.warehouse_reorder_level
|
||||
reorder_qty = item_reorder.warehouse_reorder_qty
|
||||
material_request_type = item_reorder.material_request_type or "Purchase"
|
||||
else:
|
||||
reorder_level, reorder_qty = frappe.conn.get_value("Item", bin.item_code,
|
||||
reorder_level, reorder_qty = frappe.db.get_value("Item", bin.item_code,
|
||||
["re_order_level", "re_order_qty"])
|
||||
material_request_type = "Purchase"
|
||||
|
||||
@@ -209,9 +209,9 @@ def reorder_item():
|
||||
if flt(reorder_level) - flt(bin.projected_qty) > flt(reorder_qty):
|
||||
reorder_qty = flt(reorder_level) - flt(bin.projected_qty)
|
||||
|
||||
company = frappe.conn.get_value("Warehouse", bin.warehouse, "company") or \
|
||||
company = frappe.db.get_value("Warehouse", bin.warehouse, "company") or \
|
||||
frappe.defaults.get_defaults()["company"] or \
|
||||
frappe.conn.sql("""select name from tabCompany limit 1""")[0][0]
|
||||
frappe.db.sql("""select name from tabCompany limit 1""")[0][0]
|
||||
|
||||
material_requests.setdefault(material_request_type, frappe._dict()).setdefault(
|
||||
company, []).append(frappe._dict({
|
||||
@@ -276,7 +276,7 @@ def create_material_request(material_requests):
|
||||
|
||||
if mr_list:
|
||||
if getattr(frappe.local, "reorder_email_notify", None) is None:
|
||||
frappe.local.reorder_email_notify = cint(frappe.conn.get_value('Stock Settings', None,
|
||||
frappe.local.reorder_email_notify = cint(frappe.db.get_value('Stock Settings', None,
|
||||
'reorder_email_notify'))
|
||||
|
||||
if(frappe.local.reorder_email_notify):
|
||||
@@ -288,7 +288,7 @@ def create_material_request(material_requests):
|
||||
def send_email_notification(mr_list):
|
||||
""" Notify user about auto creation of indent"""
|
||||
|
||||
email_list = frappe.conn.sql_list("""select distinct r.parent
|
||||
email_list = frappe.db.sql_list("""select distinct r.parent
|
||||
from tabUserRole r, tabProfile p
|
||||
where p.name = r.parent and p.enabled = 1 and p.docstatus < 2
|
||||
and r.role in ('Purchase Manager','Material Manager')
|
||||
|
||||
Reference in New Issue
Block a user