Merge branch 'master' of github.com:webnotes/erpnext
This commit is contained in:
commit
aa7b05aaeb
@ -580,6 +580,7 @@ class DocType(TransactionBase):
|
|||||||
# Get Warehouse
|
# Get Warehouse
|
||||||
def get_warehouse(self):
|
def get_warehouse(self):
|
||||||
w = sql("select warehouse from `tabPOS Setting` where ifnull(user,'') = '%s' and company = '%s'" % (session['user'], self.doc.company))
|
w = sql("select warehouse from `tabPOS Setting` where ifnull(user,'') = '%s' and company = '%s'" % (session['user'], self.doc.company))
|
||||||
|
w = w and w[0][0] or ''
|
||||||
if not w:
|
if not w:
|
||||||
ps = sql("select name, warehouse from `tabPOS Setting` where ifnull(user,'') = '' and company = '%s'" % self.doc.company)
|
ps = sql("select name, warehouse from `tabPOS Setting` where ifnull(user,'') = '' and company = '%s'" % self.doc.company)
|
||||||
if not ps:
|
if not ps:
|
||||||
|
Loading…
x
Reference in New Issue
Block a user