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

fifo part of stock reconciliation

Browse Source
This commit is contained in:
Nabin Hait 2013-01-07 19:35:20 +05:30
parent 9d0f636c46
commit 418d580a8b
1 changed files with 52 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
stock/doctype/stock_reconciliation/stock_reconciliation.py
View File

@ -117,8 +117,11 @@ class DocType:
return rate != "" and (flt(rate) - flt(previous_sle.get("valuation_rate"))) or 0.0 return rate != "" and (flt(rate) - flt(previous_sle.get("valuation_rate"))) or 0.0
def _get_incoming_rate(qty, valuation_rate, previous_qty, previous_valuation_rate): def _get_incoming_rate(qty, valuation_rate, previous_qty, previous_valuation_rate):
return (qty * valuation_rate - previous_qty * previous_valuation_rate) \ if previous_valuation_rate == 0:
/ flt(qty - previous_qty) return valuation_rate
else:
return (qty * valuation_rate - previous_qty * previous_valuation_rate) \
/ flt(qty - previous_qty)
row_template = ["item_code", "warehouse", "qty", "valuation_rate"] row_template = ["item_code", "warehouse", "qty", "valuation_rate"]
@ -126,42 +129,69 @@ class DocType:
for row_num, row in enumerate(data[1:]): for row_num, row in enumerate(data[1:]):
row = webnotes._dict(zip(row_template, row)) row = webnotes._dict(zip(row_template, row))
args = { args = webnotes._dict({
"__islocal": 1, "__islocal": 1,
"item_code": row[0], "item_code": row.item_code,
"warehouse": row[1], "warehouse": row.warehouse,
"posting_date": self.doc.posting_date, "posting_date": self.doc.posting_date,
"posting_time": self.doc.posting_time, "posting_time": self.doc.posting_time,
"voucher_type": self.doc.doctype, "voucher_type": self.doc.doctype,
"voucher_no": self.doc.name, "voucher_no": self.doc.name,
"company": webnotes.conn.get_default("company") "company": webnotes.conn.get_default("company")
} })
previous_sle = get_previous_sle(args) previous_sle = get_previous_sle(args)
qty_diff = _qty_diff(row[2], previous_sle) qty_diff = _qty_diff(row.qty, previous_sle)
if get_valuation_method(row[0]) == "Moving Average": if get_valuation_method(row.item_code) == "Moving Average":
rate_diff = _rate_diff(row[3], previous_sle)
if qty_diff: if qty_diff:
actual_qty = qty_diff, incoming_rate = _get_incoming_rate(flt(row.qty), flt(row.valuation_rate),
if flt(previous_sle.valuation_rate): flt(previous_sle.qty_after_transaction),
incoming_rate = _get_incoming_rate(flt(row[2]), flt(row[3]), flt(previous_sle.valuation_rate))
flt(previous_sle.qty_after_transaction),
flt(previous_sle.valuation_rate))
else:
incoming_rate = row[3]
webnotes.model_wrapper([args]).save() # create sle
elif rate_diff: webnotes.model_wrapper([args.update({
"actual_qty": qty_diff,
"incoming_rate": incoming_rate
})]).save()
elif _rate_diff(row.valuation_rate, previous_sle) and \
previous_sle.qty_after_transaction >= 0:
# make +1, -1 entry # make +1, -1 entry
pass incoming_rate = _get_incoming_rate(flt(previous_sle.qty_after_transaction) + 1,
flt(row.valuation_rate), flt(previous_sle.qty_after_transaction),
flt(previous_sle.valuation_rate))
# +1 entry
webnotes.model_wrapper([args.copy().update({
"actual_qty": 1,
"incoming_rate": incoming_rate
})]).save()
# -1 entry
webnotes.model_wrapper([args.update({"actual_qty": -1})]).save()
# else:
# # show message that stock is negative, hence can't update valuation
else: else:
# FIFO # FIFO
# Make reverse entry previous_stock_queue = json.loads(previous_sle.stock_queue)
if previous_stock_queue != [[row.qty, row.valuation_rate]]:
# make entry as per attachment
sle_wrapper = webnotes.model_wrapper([args.copy().update({
"actual_qty": row.qty,
"incoming_rate": row.valuation_rate
})])
sle_wrapper.save()
# Make reverse entry
qty = sum((flt(fifo_item[0]) for fifo_item in previous_stock_queue))
webnotes.model_wrapper([args.update({"actual_qty": -1 * qty})]).save()
# make entry as per attachment
pass