nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-26 08:24:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: Get outgoing rate of serial no from SLE if serial no already transferred to another company

Browse Source
This commit is contained in:
Nabin Hait
2020-01-02 19:00:32 +05:30
parent 7670f2354a
commit 328c4f9b92
1 changed files with 33 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
erpnext/stock/stock_ledger.py
View File

@@ -212,7 +212,7 @@ class update_entries_after(object):
def get_serialized_values(self, sle): def get_serialized_values(self, sle):
incoming_rate = flt(sle.incoming_rate) incoming_rate = flt(sle.incoming_rate)
actual_qty = flt(sle.actual_qty) actual_qty = flt(sle.actual_qty)
serial_no = cstr(sle.serial_no).split("\n") serial_nos = cstr(sle.serial_no).split("\n")
if incoming_rate < 0: if incoming_rate < 0:
# wrong incoming rate # wrong incoming rate
@@ -224,9 +224,8 @@ class update_entries_after(object):
elif actual_qty < 0: elif actual_qty < 0:
# In case of delivery/stock issue, get average purchase rate # In case of delivery/stock issue, get average purchase rate
# of serial nos of current entry # of serial nos of current entry
stock_value_change = -1 * flt(frappe.get_all("Serial No", outgoing_value = self.get_incoming_value_for_serial_nos(sle, serial_nos)
fields=["sum(purchase_rate)"], stock_value_change = -1 * outgoing_value
filters = {'name': ('in', serial_no)}, as_list=1)[0][0])
new_stock_qty = self.qty_after_transaction + actual_qty new_stock_qty = self.qty_after_transaction + actual_qty
@@ -244,6 +243,36 @@ class update_entries_after(object):
sle.voucher_type, sle.voucher_no, self.allow_zero_rate, sle.voucher_type, sle.voucher_no, self.allow_zero_rate,
currency=erpnext.get_company_currency(sle.company)) currency=erpnext.get_company_currency(sle.company))
def get_incoming_value_for_serial_nos(self, sle, serial_nos):
# get rate from serial nos within same company
all_serial_nos = frappe.get_all("Serial No",
fields=["purchase_rate", "name", "company"],
filters = {'name': ('in', serial_nos)})
incoming_values = sum([flt(d.purchase_rate) for d in all_serial_nos if d.company==sle.company])
# Get rate for serial nos which has been transferred to other company
invalid_serial_nos = [d.name for d in all_serial_nos if d.company!=sle.company]
for serial_no in invalid_serial_nos:
incoming_rate = frappe.db.sql("""
select incoming_rate
from `tabStock Ledger Entry`
where
company = %s
and actual_qty > 0
and (serial_no = %s
or serial_no like %s
or serial_no like %s
or serial_no like %s
)
order by posting_date desc
limit 1
""", (sle.company, serial_no, serial_no+'\n%', '%\n'+serial_no, '%\n'+serial_no+'\n%'))
incoming_values += flt(incoming_rate[0][0]) if incoming_rate else 0
return incoming_values
def get_moving_average_values(self, sle): def get_moving_average_values(self, sle):
actual_qty = flt(sle.actual_qty) actual_qty = flt(sle.actual_qty)
new_stock_qty = flt(self.qty_after_transaction) + actual_qty new_stock_qty = flt(self.qty_after_transaction) + actual_qty