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

fix: consider returned_qty while updating billed_amt

Browse Source 
(cherry picked from commit 63aaa1e357280b24c537a502a479f7bb7a6654e4)
This commit is contained in:
Sagar Sharma 2022-01-12 16:10:57 +05:30 committed by mergify-bot
parent dcd99a82cb
commit b50036c04a
1 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
erpnext/stock/doctype/delivery_note/delivery_note.py
View File

@ -340,15 +340,25 @@ class DeliveryNote(SellingController):
def update_billed_amount_based_on_so(so_detail, update_modified=True): def update_billed_amount_based_on_so(so_detail, update_modified=True):
# Billed against Sales Order directly # Billed against Sales Order directly
billed_against_so = frappe.db.sql("""select sum(amount) from `tabSales Invoice Item` billed_against_so = frappe.db.sql("""select sum(si_item.amount)
where so_detail=%s and (dn_detail is null or dn_detail = '') and docstatus=1""", so_detail) from `tabSales Invoice Item` si_item, `tabSales Invoice` si
where
si_item.parent = si.name
and si_item.so_detail=%s
and (si_item.dn_detail is null or si_item.dn_detail = '')
and si_item.docstatus=1
and si.update_stock = 0
""", so_detail)
billed_against_so = billed_against_so and billed_against_so[0][0] or 0 billed_against_so = billed_against_so and billed_against_so[0][0] or 0
# Get all Delivery Note Item rows against the Sales Order Item row # Get all Delivery Note Item rows against the Sales Order Item row
dn_details = frappe.db.sql("""select dn_item.name, dn_item.amount, dn_item.si_detail, dn_item.parent dn_details = frappe.db.sql("""select dn_item.name, dn_item.amount, dn_item.si_detail, dn_item.parent, dn_item.stock_qty, dn_item.returned_qty
from `tabDelivery Note Item` dn_item, `tabDelivery Note` dn from `tabDelivery Note Item` dn_item, `tabDelivery Note` dn
where dn.name=dn_item.parent and dn_item.so_detail=%s where
and dn.docstatus=1 and dn.is_return = 0 dn.name = dn_item.parent
and dn_item.so_detail=%s
and dn.docstatus=1
and dn.is_return = 0
order by dn.posting_date asc, dn.posting_time asc, dn.name asc""", so_detail, as_dict=1) order by dn.posting_date asc, dn.posting_time asc, dn.name asc""", so_detail, as_dict=1)
updated_dn = [] updated_dn = []
@ -367,7 +377,11 @@ def update_billed_amount_based_on_so(so_detail, update_modified=True):
# Distribute billed amount directly against SO between DNs based on FIFO # Distribute billed amount directly against SO between DNs based on FIFO
if billed_against_so and billed_amt_agianst_dn < dnd.amount: if billed_against_so and billed_amt_agianst_dn < dnd.amount:
pending_to_bill = flt(dnd.amount) - billed_amt_agianst_dn if dnd.returned_qty:
pending_to_bill = flt(dnd.amount) * (dnd.stock_qty - dnd.returned_qty) / dnd.stock_qty
else:
pending_to_bill = flt(dnd.amount)
pending_to_bill -= billed_amt_agianst_dn
if pending_to_bill <= billed_against_so: if pending_to_bill <= billed_against_so:
billed_amt_agianst_dn += pending_to_bill billed_amt_agianst_dn += pending_to_bill
billed_against_so -= pending_to_bill billed_against_so -= pending_to_bill