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

use for update lock when updating stock entries

Browse Source
This commit is contained in:
Anand Doshi 2013-01-11 11:44:49 +05:30
parent 1b531866e0
commit 4dc7caadf2
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
stock/stock_ledger.py
View File

@ -43,7 +43,7 @@ def update_entries_after(args, verbose=1):
stock_value = 0.0 stock_value = 0.0
entries_to_fix = get_sle_after_datetime(previous_sle or \ entries_to_fix = get_sle_after_datetime(previous_sle or \
{"item_code": args["item_code"], "warehouse": args["warehouse"]}) {"item_code": args["item_code"], "warehouse": args["warehouse"]}, for_update=True)
valuation_method = get_valuation_method(args["item_code"]) valuation_method = get_valuation_method(args["item_code"])
@ -95,7 +95,7 @@ def update_entries_after(args, verbose=1):
where item_code=%s and warehouse=%s""", (valuation_rate, qty_after_transaction, where item_code=%s and warehouse=%s""", (valuation_rate, qty_after_transaction,
stock_value, args["item_code"], args["warehouse"])) stock_value, args["item_code"], args["warehouse"]))
def get_sle_before_datetime(args): def get_sle_before_datetime(args, for_update=False):
""" """
get previous stock ledger entry before current time-bucket get previous stock ledger entry before current time-bucket
@ -107,17 +107,18 @@ def get_sle_before_datetime(args):
""" """
sle = get_stock_ledger_entries(args, sle = get_stock_ledger_entries(args,
["timestamp(posting_date, posting_time) < timestamp(%(posting_date)s, %(posting_time)s)"], ["timestamp(posting_date, posting_time) < timestamp(%(posting_date)s, %(posting_time)s)"],
"desc", "limit 1") "desc", "limit 1", for_update=for_update)
return sle and sle[0] or webnotes._dict() return sle and sle[0] or webnotes._dict()
def get_sle_after_datetime(args): def get_sle_after_datetime(args, for_update=False):
"""get Stock Ledger Entries after a particular datetime, for reposting""" """get Stock Ledger Entries after a particular datetime, for reposting"""
# NOTE: using for update of
return get_stock_ledger_entries(args, return get_stock_ledger_entries(args,
["timestamp(posting_date, posting_time) > timestamp(%(posting_date)s, %(posting_time)s)"], ["timestamp(posting_date, posting_time) > timestamp(%(posting_date)s, %(posting_time)s)"],
"asc") "asc", for_update=for_update)
def get_stock_ledger_entries(args, conditions=None, order="desc", limit=None): def get_stock_ledger_entries(args, conditions=None, order="desc", limit=None, for_update=False):
"""get stock ledger entries filtered by specific posting datetime conditions""" """get stock ledger entries filtered by specific posting datetime conditions"""
if not args.get("posting_date"): if not args.get("posting_date"):
args["posting_date"] = "1900-01-01" args["posting_date"] = "1900-01-01"
@ -130,9 +131,10 @@ def get_stock_ledger_entries(args, conditions=None, order="desc", limit=None):
and ifnull(is_cancelled, 'No') = 'No' and ifnull(is_cancelled, 'No') = 'No'
%(conditions)s %(conditions)s
order by timestamp(posting_date, posting_time) %(order)s, name %(order)s order by timestamp(posting_date, posting_time) %(order)s, name %(order)s
%(limit)s""" % { %(limit)s %(for_update)s""" % {
"conditions": conditions and ("and " + " and ".join(conditions)) or "", "conditions": conditions and ("and " + " and ".join(conditions)) or "",
"limit": limit or "", "limit": limit or "",
"for_update": for_update and "for update" or "",
"order": order "order": order
}, args, as_dict=1) }, args, as_dict=1)
@ -263,7 +265,7 @@ def _raise_exceptions(args, verbose=1):
else: else:
raise webnotes.ValidationError, msg raise webnotes.ValidationError, msg
def get_previous_sle(args): def get_previous_sle(args, for_update=False):
""" """
get the last sle on or before the current time-bucket, get the last sle on or before the current time-bucket,
to get actual qty before transaction, this function to get actual qty before transaction, this function
@ -281,5 +283,5 @@ def get_previous_sle(args):
sle = get_stock_ledger_entries(args, ["name != %(sle)s", sle = get_stock_ledger_entries(args, ["name != %(sle)s",
"timestamp(posting_date, posting_time) <= timestamp(%(posting_date)s, %(posting_time)s)"], "timestamp(posting_date, posting_time) <= timestamp(%(posting_date)s, %(posting_time)s)"],
"desc", "limit 1") "desc", "limit 1", for_update=for_update)
return sle and sle[0] or {} return sle and sle[0] or {}