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

stock reco cancellation issue fxed

Browse Source
This commit is contained in:
Nabin Hait 2012-05-04 18:48:30 +05:30
parent b5d50dcc53
commit 875ccac151
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py
View File

@ -51,16 +51,16 @@ class DocType:
"""Convert csv data into list"""
count = 2
for s in data:
if s[0].strip() != 'Item Code': # remove the labels
# validate
if (submit and len(s) != 4) or (not submit and len(s) != 6):
msgprint("Data entered at Row No " + cstr(count) + " in Attachment File is not in correct format.", raise_exception=1)
self.validated = 0
self.validate_item(s[0], count)
self.validate_warehouse(s[1], count)
if count == 2: continue
# validate
if (submit and len(s) != 4) or (not submit and len(s) != 6):
msgprint("Data entered at Row No " + cstr(count) + " in Attachment File is not in correct format.", raise_exception=1)
self.validated = 0
self.validate_item(s[0], count)
self.validate_warehouse(s[1], count)
self.data.append(s)
count += 1
self.data.append(s)
count += 1
if not self.validated:
raise Exception
@ -175,7 +175,7 @@ class DocType:
"""Add diffs column in attached file"""
# add header
out = "'Item Code', 'Warehouse', 'Qty', 'Valuation Rate', 'Qty Diff', 'Val Rate Diff'"
out = "Item Code, Warehouse, Qty, Valuation Rate, Qty Diff, Val Rate Diff"
# add data
for d in self.data: