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

fix: incorrect POS profile selected

Browse Source
This commit is contained in:
Rohit Waghchaure 2019-04-05 00:42:48 +05:30
parent 0a57ef4bea
commit e8e3fb175d
1 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
erpnext/stock/get_item_details.py
View File

@ -667,28 +667,39 @@ def get_pos_profile_item_details(company, args, pos_profile=None, update_data=Fa
@frappe.whitelist() @frappe.whitelist()
def get_pos_profile(company, pos_profile=None, user=None): def get_pos_profile(company, pos_profile=None, user=None):
if pos_profile: if pos_profile: return frappe.get_cached_doc('POS Profile', pos_profile)
return frappe.get_cached_doc('POS Profile', pos_profile)
if not user: if not user:
user = frappe.session['user'] user = frappe.session['user']
condition = "pfu.user = %(user)s AND pfu.default=1"
if user and company:
condition = "pfu.user = %(user)s AND pf.company = %(company)s AND pfu.default=1"
pos_profile = frappe.db.sql("""SELECT pf.* pos_profile = frappe.db.sql("""SELECT pf.*
FROM FROM
`tabPOS Profile` pf LEFT JOIN `tabPOS Profile User` pfu `tabPOS Profile` pf LEFT JOIN `tabPOS Profile User` pfu
ON ON
pf.name = pfu.parent pf.name = pfu.parent
WHERE WHERE
( {cond} AND pf.disabled = 0
(pfu.user = %(user)s AND pf.company = %(company)s AND pfu.default=1) """.format(cond = condition), {
OR (pfu.user = %(user)s AND pfu.default=1)
OR (ifnull(pfu.user, '') = '' AND pf.company = %(company)s)
) AND pf.disabled = 0
""", {
'user': user, 'user': user,
'company': company 'company': company
}, as_dict=1) }, as_dict=1)
if not pos_profile and company:
pos_profile = frappe.db.sql("""SELECT pf.*
FROM
`tabPOS Profile` pf LEFT JOIN `tabPOS Profile User` pfu
ON
pf.name = pfu.parent
WHERE
pf.company = %(company)s AND pf.disabled = 0
""", {
'company': company
}, as_dict=1)
return pos_profile and pos_profile[0] or None return pos_profile and pos_profile[0] or None
def get_serial_nos_by_fifo(args, sales_order=None): def get_serial_nos_by_fifo(args, sales_order=None):