Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

chore: SQL to QB & accomodate Update Items

Browse Source 
- `doc_before_save` does not exist via Update Items (updates stuff in the backend so doc isn't considered unsaved/dirty)
- converted more raw sql to qb and ORM
This commit is contained in:
marination 2022-01-25 19:51:47 +05:30
parent 3f48fc1898
commit f8a5786542
1 changed files with 30 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
erpnext/stock/doctype/packed_item/packed_item.py
View File

@ -42,7 +42,10 @@ def make_packing_list(doc):
def reset_packing_list_if_deleted_items_exist(doc): def reset_packing_list_if_deleted_items_exist(doc):
doc_before_save = doc.get_doc_before_save() doc_before_save = doc.get_doc_before_save()
items_are_deleted = len(doc_before_save.get("items")) != len(doc.get("items")) if doc_before_save:
items_are_deleted = len(doc_before_save.get("items")) != len(doc.get("items"))
else:
items_are_deleted = True
if items_are_deleted: if items_are_deleted:
doc.set("packed_items", []) doc.set("packed_items", [])
@ -112,17 +115,34 @@ def update_packing_list_item(doc, packing_item_code, qty, main_item_row, descrip
pi.serial_no = old_packed_items_map.get((packing_item_code, main_item_row.item_code))[0].serial_no pi.serial_no = old_packed_items_map.get((packing_item_code, main_item_row.item_code))[0].serial_no
pi.warehouse = old_packed_items_map.get((packing_item_code, main_item_row.item_code))[0].warehouse pi.warehouse = old_packed_items_map.get((packing_item_code, main_item_row.item_code))[0].warehouse
def get_packing_item_details(item, company): def get_packing_item_details(item_code, company):
return frappe.db.sql(""" item = frappe.qb.DocType("Item")
select i.item_name, i.is_stock_item, i.description, i.stock_uom, id.default_warehouse item_default = frappe.qb.DocType("Item Default")
from `tabItem` i LEFT JOIN `tabItem Default` id ON id.parent=i.name and id.company=%s query = (
where i.name = %s""", frappe.qb.from_(item)
(company, item), as_dict = 1)[0] .left_join(item_default)
.on(
(item_default.parent == item.name)
& (item_default.company == company)
).select(
item.item_name, item.is_stock_item,
item.description, item.stock_uom,
item_default.default_warehouse
).where(
item.name == item_code
)
)
return query.run(as_dict=True)[0]
def get_packed_item_bin_qty(item, warehouse): def get_packed_item_bin_qty(item, warehouse):
det = frappe.db.sql("""select actual_qty, projected_qty from `tabBin` bin_data = frappe.db.get_values(
where item_code = %s and warehouse = %s""", (item, warehouse), as_dict = 1) "Bin",
return det and det[0] or frappe._dict() fieldname=["actual_qty", "projected_qty"],
filters={"item_code": item, "warehouse": warehouse},
as_dict=True
)
return bin_data[0] if bin_data else {}
def get_old_packed_item_details(old_packed_items): def get_old_packed_item_details(old_packed_items):
old_packed_items_map = {} old_packed_items_map = {}