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

Merge branch 'master' of github.com:webnotes/erpnext

Browse Source
This commit is contained in:
Nabin Hait 2012-03-26 10:54:31 +05:30
commit 6d4ee80cca
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -59,8 +59,7 @@ class DocType:
self.validate_item(s[0], count) self.validate_item(s[0], count)
self.validate_warehouse(s[1], count) self.validate_warehouse(s[1], count)
# encode as ascii self.data.append(s)
self.data.append([d.encode("ascii") for d in s])
count += 1 count += 1
if not self.validated: if not self.validated:

3
erpnext/stock/doctype/warehouse/warehouse.py
View File

@ -39,7 +39,8 @@ class DocType:
self.doclist = doclist self.doclist = doclist
def get_bin(self, item_code): def get_bin(self, item_code):
bin = sql("select name from tabBin where item_code = '%s' and warehouse = '%s'" % (item_code, self.doc.name)) bin = sql("select name from tabBin where item_code = %s and \
warehouse = %s", (item_code, self.doc.name))
bin = bin and bin[0][0] or '' bin = bin and bin[0][0] or ''
if not bin: if not bin:
if not self.doc.warehouse_type : if not self.doc.warehouse_type :