Skip to content

Commit

Permalink
fix: sider issues
Browse files Browse the repository at this point in the history
  • Loading branch information
nextchamp-saqib committed Mar 24, 2022
1 parent cf51a0a commit cb4873c
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 11 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -318,13 +318,16 @@ def split_invoices(invoices):
pos_return_docs = [frappe.get_cached_doc("POS Invoice", d.pos_invoice) for d in invoices if d.is_return and d.return_against]
for pos_invoice in pos_return_docs:
for item in pos_invoice.items:
if not item.serial_no: continue
if not item.serial_no:
continue

return_against_is_added = any(d for d in _invoices if d.pos_invoice == pos_invoice.return_against)
if return_against_is_added: break
if return_against_is_added:
break

return_against_is_consolidated = frappe.db.get_value('POS Invoice', pos_invoice.return_against, 'status', cache=True) == 'Consolidated'
if return_against_is_consolidated: break
if return_against_is_consolidated:
break

pos_invoice_row = [d for d in invoices if d.pos_invoice == pos_invoice.return_against]
_invoices.append(pos_invoice_row)
Expand Down
11 changes: 3 additions & 8 deletions erpnext/stock/doctype/serial_no/serial_no.py
Original file line number Diff line number Diff line change
Expand Up @@ -619,14 +619,9 @@ def get_delivered_serial_nos(serial_nos):

SerialNo = frappe.qb.DocType("Serial No")
serial_nos = get_serial_nos(serial_nos)
query = (
frappe.qb
.from_(SerialNo)
.select(SerialNo.name)
.where(
(SerialNo.name.isin(serial_nos))
& (Coalesce(SerialNo.delivery_document_type, "") != "")
)
query = frappe.qb.select(SerialNo.name).from_(SerialNo).where(
(SerialNo.name.isin(serial_nos))
& (Coalesce(SerialNo.delivery_document_type, "") != "")
)

result = query.run()
Expand Down

0 comments on commit cb4873c

Please sign in to comment.