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

Merge branch 'master' into edge

Browse Source
This commit is contained in:
Nabin Hait 2013-03-26 15:48:45 +05:30
commit 511902fc97
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
accounts/doctype/sales_invoice/sales_invoice.py
View File

@ -321,9 +321,8 @@ class DocType(SellingController):
dtl = webnotes.conn.sql("""select * from `tabPOS Setting` where user = %s
and company = %s""", (webnotes.session['user'], self.doc.company), as_dict=1)
if not dtl:
dtl = webnotes.conn.sql("""select income_account, warehouse, cost_center,
expense_account from `tabPOS Setting` where ifnull(user,'') = ''
and company = %s""", self.doc.company, as_dict=1)
dtl = webnotes.conn.sql("""select * from `tabPOS Setting`
where ifnull(user,'') = '' and company = %s""", self.doc.company, as_dict=1)
self._pos_details = dtl
return self._pos_details