mirror of
https://github.com/frappe/erpnext.git
synced 2026-05-21 05:59:18 +00:00
Merge branch 'version-12-hotfix' into track_settings_v12
This commit is contained in:
@@ -115,10 +115,17 @@ def get_serial_nos_data_after_transactions(args):
|
|||||||
order by posting_date, posting_time asc """, args, as_dict=1)
|
order by posting_date, posting_time asc """, args, as_dict=1)
|
||||||
|
|
||||||
for d in data:
|
for d in data:
|
||||||
if d.actual_qty > 0:
|
for sn in get_serial_nos_data(d.serial_no):
|
||||||
serial_nos.extend(get_serial_nos_data(d.serial_no))
|
if d.actual_qty > 0:
|
||||||
else:
|
if sn not in serial_nos:
|
||||||
serial_nos = list(set(serial_nos) - set(get_serial_nos_data(d.serial_no)))
|
serial_nos.append(sn)
|
||||||
|
else:
|
||||||
|
serial_nos.remove(sn)
|
||||||
|
elif d.actual_qty < 0:
|
||||||
|
if sn in serial_nos:
|
||||||
|
serial_nos.remove(sn)
|
||||||
|
else:
|
||||||
|
serial_nos.append(sn)
|
||||||
|
|
||||||
return '\n'.join(serial_nos)
|
return '\n'.join(serial_nos)
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user