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

Fixed MTN and Sales Return cancellation issue related to serial no

Browse Source
This commit is contained in:
Nabin Hait
2011-08-18 12:50:46 +05:30
parent b1196bcd22
commit 94d158852a
1 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
stock/doctype/stock_ledger/stock_ledger.py
View File

@@ -57,11 +57,11 @@ class DocType:
s = s.strip() s = s.strip()
sr_war = sql("select warehouse,name from `tabSerial No` where name = '%s'" % (s)) sr_war = sql("select warehouse,name from `tabSerial No` where name = '%s'" % (s))
if not sr_war: if not sr_war:
msgprint("Serial No %s does not exists",s, raise_exception = 1) msgprint("Serial No %s does not exists"%s, raise_exception = 1)
elif not sr_war[0][0]: elif not sr_war[0][0]:
msgprint("Please set a warehouse in the Serial No <b>%s</b>" % s, raise_exception = 1) msgprint("Warehouse not mentioned in the Serial No <b>%s</b>" % s, raise_exception = 1)
elif sr_war[0][0] != d.warehouse: elif (d.warehouse and sr_war[0][0] != d.warehouse) or (d.s_warehouse and sr_war[0][0] != d.s_warehouse):
msgprint("Serial No : %s for Item : %s doesn't exists in Warehouse : %s" % (s, d.item_code, d.warehouse), raise_exception = 1) msgprint("Serial No : %s for Item : %s doesn't exists in Warehouse : %s" % (s, d.item_code, d.warehouse or d.s_warehouse), raise_exception = 1)
# ------------------------------------ # ------------------------------------
@@ -119,10 +119,10 @@ class DocType:
# ---------------------------------- # ----------------------------------
# update serial no purchase details # update serial no purchase details
# ---------------------------------- # ----------------------------------
def update_serial_purchase_details(self, obj, d, serial_no, is_submit, is_transfer = 0): def update_serial_purchase_details(self, obj, d, serial_no, is_submit, purpose = ''):
exists = sql("select name, status, docstatus from `tabSerial No` where name = '%s'" % (serial_no)) exists = sql("select name, status, docstatus from `tabSerial No` where name = '%s'" % (serial_no))
if is_submit: if is_submit:
if exists and exists[0][2] != 2 and not is_transfer: if exists and exists[0][2] != 2 and purpose not in ['Material Transfer', 'Sales Return']:
msgprint("Serial No: %s already %s" % (serial_no, exists and exists[0][1]), raise_exception = 1) msgprint("Serial No: %s already %s" % (serial_no, exists and exists[0][1]), raise_exception = 1)
elif exists: elif exists:
s = Document('Serial No', exists and exists[0][0]) s = Document('Serial No', exists and exists[0][0])
@@ -133,8 +133,10 @@ class DocType:
else: else:
if exists and exists[0][1] == 'Delivered' and exists[0][2] != 2: if exists and exists[0][1] == 'Delivered' and exists[0][2] != 2:
msgprint("Serial No: %s is already delivered, you can not cancel the document." % serial_no, raise_exception=1) msgprint("Serial No: %s is already delivered, you can not cancel the document." % serial_no, raise_exception=1)
elif purpose in ['Material Transfer', 'Sales Return']:
sql("update `tabSerial No` set status = '%s', purchase_document_type = '', purchase_document_no = '', warehouse = '%s' where name = '%s'" % (purpose == 'Material Transfer' and 'In Store' or 'Delivered', d.s_warehouse, serial_no))
else: else:
sql("update `tabSerial No` set docstatus = '%s', status = '%s', purchase_document_type = '', purchase_document_no = '', purchase_date = '', purchase_rate = '', supplier = null, supplier_name = '', supplier_address = '', warehouse = null where name = '%s'" % (not is_transfer and 2 or 0, is_transfer and 'In Store' or 'Not in Use', serial_no)) sql("update `tabSerial No` set docstatus = 2, status = 'Not in Use', purchase_document_type = '', purchase_document_no = '', purchase_date = '', purchase_rate = '', supplier = null, supplier_name = '', supplier_address = '', warehouse = '' where name = '%s'" % serial_no)
# ------------------------------- # -------------------------------
@@ -233,6 +235,7 @@ class DocType:
sle.fields['warehouse_type'] = get_value('Warehouse' , args[k], 'warehouse_type') sle.fields['warehouse_type'] = get_value('Warehouse' , args[k], 'warehouse_type')
sle.fields[k] = args[k] sle.fields[k] = args[k]
sle_obj = get_obj(doc=sle) sle_obj = get_obj(doc=sle)
# validate # validate
sle_obj.validate() sle_obj.validate()
sle.save(new = 1) sle.save(new = 1)