nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-08 23:52:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Refactor multi pos profile selection in the pos invoice (#11721)

Browse Source
This commit is contained in:
rohitwaghchaure
2017-11-28 16:11:15 +05:30
committed by Nabin Hait
parent 8d9edbf133
commit c037dc775e
12 changed files with 302 additions and 163 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
erpnext/stock/get_item_details.py
View File

@@ -394,7 +394,7 @@ def get_pos_profile_item_details(company, args, pos_profile=None):
res = frappe._dict()
if not pos_profile:
pos_profile = get_pos_profile(company)
pos_profile = get_pos_profile(company, args.get('pos_profile'))
if pos_profile:
for fieldname in ("income_account", "cost_center", "warehouse", "expense_account"):
@@ -408,17 +408,32 @@ def get_pos_profile_item_details(company, args, pos_profile=None):
return res
@frappe.whitelist()
def get_pos_profile(company):
pos_profile = frappe.db.sql("""select * from `tabPOS Profile` where user = %s
and company = %s and ifnull(disabled,0) != 1""", (frappe.session['user'], company), as_dict=1)
def get_pos_profile(company, pos_profile=None, user=None):
if pos_profile:
return frappe.get_doc('POS Profile', pos_profile)
if not user:
user = frappe.session['user']
pos_profile = frappe.db.sql("""select pf.*
from
`tabPOS Profile` pf, `tabPOS Profile User` pfu
where
pfu.parent = pf.name and pfu.user = %s and pf.company = %s
and pf.disabled = 0 and pfu.default=1""", (user, company), as_dict=1)
if not pos_profile:
pos_profile = frappe.db.sql("""select * from `tabPOS Profile`
where ifnull(user,'') = '' and company = %s and ifnull(disabled,0) != 1""", company, as_dict=1)
pos_profile = frappe.db.sql("""select pf.*
from
`tabPOS Profile` pf left join `tabPOS Profile User` pfu
on
pf.name = pfu.parent
where
ifnull(pfu.user, '') = '' and pf.company = %s
and pf.disabled = 0""", (company), as_dict=1)
return pos_profile and pos_profile[0] or None
def get_serial_nos_by_fifo(args):
if frappe.db.get_single_value("Stock Settings", "automatically_set_serial_nos_based_on_fifo"):
return "\n".join(frappe.db.sql_list("""select name from `tabSerial No`