nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-29 18:04:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Anand Doshi
2013-07-30 10:44:07 +05:30
parent 1fac2a98cf f90df7da02
commit f314051e30
6 changed files with 24 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
selling/utils.py
View File

@@ -190,7 +190,7 @@ def get_pos_settings(company):
if not pos_settings:
pos_settings = webnotes.conn.sql("""select * from `tabPOS Setting`
where ifnull(user,'') = '' and company = %s""", company, as_dict=1)
return pos_settings and pos_settings[0] or None
def apply_pos_settings(pos_settings, opts):