Minor fix for moving average
diff --git a/erpnext/stock/stock_ledger.py b/erpnext/stock/stock_ledger.py
index f1ba94e..a2614d7 100644
--- a/erpnext/stock/stock_ledger.py
+++ b/erpnext/stock/stock_ledger.py
@@ -6,6 +6,7 @@
from frappe import _
from frappe.utils import cint, flt, cstr, now
from erpnext.stock.utils import get_valuation_method
+from erpnext.controllers.stock_controller import get_valuation_rate
import json
# future reposting
@@ -106,8 +107,7 @@
stock_queue = [[qty_after_transaction, valuation_rate]]
else:
if valuation_method == "Moving Average":
- if flt(sle.actual_qty) > 0:
- valuation_rate = get_moving_average_values(qty_after_transaction, sle, valuation_rate)
+ valuation_rate = get_moving_average_values(qty_after_transaction, sle, valuation_rate)
else:
valuation_rate = get_fifo_values(qty_after_transaction, sle, stock_queue)
@@ -256,19 +256,18 @@
incoming_rate = flt(sle.incoming_rate)
actual_qty = flt(sle.actual_qty)
- if not incoming_rate:
- # If wrong incoming rate
- incoming_rate = valuation_rate
+ if flt(sle.actual_qty) > 0:
+ if qty_after_transaction < 0 and not valuation_rate:
+ # if negative stock, take current valuation rate as incoming rate
+ valuation_rate = incoming_rate
- elif qty_after_transaction < 0 and not valuation_rate:
- # if negative stock, take current valuation rate as incoming rate
- valuation_rate = incoming_rate
+ new_stock_qty = abs(qty_after_transaction) + actual_qty
+ new_stock_value = (abs(qty_after_transaction) * valuation_rate) + (actual_qty * incoming_rate)
- new_stock_qty = abs(qty_after_transaction) + actual_qty
- new_stock_value = (abs(qty_after_transaction) * valuation_rate) + (actual_qty * incoming_rate)
-
- if new_stock_qty:
- valuation_rate = new_stock_value / flt(new_stock_qty)
+ if new_stock_qty:
+ valuation_rate = new_stock_value / flt(new_stock_qty)
+ elif not valuation_rate:
+ valuation_rate = get_valuation_rate(sle.item_code, sle.warehouse)
return abs(valuation_rate)
@@ -321,7 +320,6 @@
def intialize_stock_queue(stock_queue, item_code, warehouse):
if not stock_queue:
- from erpnext.controllers.stock_controller import get_valuation_rate
estimated_val_rate = get_valuation_rate(item_code, warehouse)
stock_queue.append([0, estimated_val_rate])
diff --git a/erpnext/utilities/repost_stock.py b/erpnext/utilities/repost_stock.py
index b5eec23..7d9423d 100644
--- a/erpnext/utilities/repost_stock.py
+++ b/erpnext/utilities/repost_stock.py
@@ -211,15 +211,14 @@
def repost_all_stock_vouchers():
vouchers = frappe.db.sql("""select distinct voucher_type, voucher_no
- from `tabStock Ledger Entry` order by posting_date, posting_time, name""")
+ from `tabStock Ledger Entry`
+ order by posting_date, posting_time, name""")
- print len(vouchers)
rejected = []
- # vouchers = [["Delivery Note", "DN00060"]]
i = 0
for voucher_type, voucher_no in vouchers:
i+=1
- print i
+ print i, "/", len(vouchers)
try:
for dt in ["Stock Ledger Entry", "GL Entry"]:
frappe.db.sql("""delete from `tab%s` where voucher_type=%s and voucher_no=%s"""%
@@ -228,8 +227,8 @@
doc = frappe.get_doc(voucher_type, voucher_no)
if voucher_type=="Stock Entry" and doc.purpose in ["Manufacture", "Repack"]:
doc.get_stock_and_rate(force=1)
- # elif voucher_type=="Purchase Receipt":
- # doc.create_raw_materials_supplied("pr_raw_material_details")
+ elif voucher_type=="Purchase Receipt" and doc.is_subcontracted == "Yes":
+ doc.validate()
doc.update_stock_ledger()
doc.make_gl_entries(repost_future_gle=False, allow_negative_stock=True)