nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-04 04:39:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: travis

Browse Source
This commit is contained in:
Rohit Waghchaure
2023-03-31 09:03:54 +05:30
parent f704eb7581
commit d3ceb07936
29 changed files with 1238 additions and 744 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
erpnext/stock/stock_ledger.py
View File

@@ -27,7 +27,6 @@ from erpnext.stock.doctype.bin.bin import update_qty as update_bin_qty
from erpnext.stock.doctype.stock_reservation_entry.stock_reservation_entry import (
get_sre_reserved_qty_for_item_and_warehouse as get_reserved_stock,
)
from erpnext.stock.serial_batch_bundle import BatchNoValuation, SerialNoValuation
from erpnext.stock.utils import (
get_incoming_outgoing_rate_for_cancel,
get_or_make_bin,
@@ -692,22 +691,7 @@ class update_entries_after(object):
sle.outgoing_rate = get_incoming_rate_for_inter_company_transfer(sle)
if sle.serial_and_batch_bundle:
if frappe.get_cached_value("Item", sle.item_code, "has_serial_no"):
SerialNoValuation(
sle=sle,
sle_self=self,
wh_data=self.wh_data,
warehouse=sle.warehouse,
item_code=sle.item_code,
)
else:
BatchNoValuation(
sle=sle,
sle_self=self,
wh_data=self.wh_data,
warehouse=sle.warehouse,
item_code=sle.item_code,
)
self.calculate_valuation_for_serial_batch_bundle(sle)
else:
if sle.voucher_type == "Stock Reconciliation" and not sle.batch_no:
# assert
@@ -759,6 +743,18 @@ class update_entries_after(object):
elif current_qty == 0:
sle.is_cancelled = 1
def calculate_valuation_for_serial_batch_bundle(self, sle):
doc = frappe.get_cached_doc("Serial and Batch Bundle", sle.serial_and_batch_bundle)
doc.set_incoming_rate(save=True)
doc.calculate_qty_and_amount(save=True)
self.wh_data.stock_value = round_off_if_near_zero(self.wh_data.stock_value + doc.total_amount)
self.wh_data.qty_after_transaction += doc.total_qty
if self.wh_data.qty_after_transaction:
self.wh_data.valuation_rate = self.wh_data.stock_value / self.wh_data.qty_after_transaction
def validate_negative_stock(self, sle):
"""
validate negative stock for entries current datetime onwards
@@ -1425,6 +1421,8 @@ def get_valuation_rate(
serial_and_batch_bundle=None,
):
from erpnext.stock.serial_batch_bundle import BatchNoValuation
if not company:
company = frappe.get_cached_value("Warehouse", warehouse, "company")