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

Merge pull request #11627 from rohitwaghchaure/pos_redirect_issue

Browse Source 
[fix] POS redirect issue
This commit is contained in:
Saurabh 2017-11-17 13:55:10 +05:30 committed by GitHub
commit d40ae81fc9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
erpnext/accounts/doctype/pos_settings/pos_settings.py
View File

@ -12,8 +12,5 @@ class POSSettings(Document):
def set_link_for_pos(self): def set_link_for_pos(self):
link = 'pos' if self.use_pos_in_offline_mode else 'point-of-sale' link = 'pos' if self.use_pos_in_offline_mode else 'point-of-sale'
desktop_icon = frappe.db.get_value('Desktop Icon', frappe.db.sql(""" update `tabDesktop Icon` set link = '{0}'
{'standard': 1, 'module_name': 'POS'}, 'name') where module_name like '%pos%'""".format(link))
if desktop_icon:
frappe.db.set_value('Desktop Icon', desktop_icon, 'link', link)

2
erpnext/selling/page/point_of_sale/point_of_sale.js
View File

@ -991,7 +991,7 @@ class POSItems {
this.get_items({search_value: search_term, item_group }) this.get_items({search_value: search_term, item_group })
.then(({ items, serial_no, batch_no, barcode }) => { .then(({ items, serial_no, batch_no, barcode }) => {
if (search_term) { if (search_term && !barcode) {
this.search_index[search_term] = items; this.search_index[search_term] = items;
} }