Merge branch 'hotfix'
diff --git a/erpnext/__init__.py b/erpnext/__init__.py
index 55628cc..259c0f0 100644
--- a/erpnext/__init__.py
+++ b/erpnext/__init__.py
@@ -4,7 +4,7 @@
import frappe
from erpnext.hooks import regional_overrides
-__version__ = '9.1.0'
+__version__ = '9.1.1'
def get_default_company(user=None):
'''Get default company for user'''
diff --git a/erpnext/accounts/doctype/pos_settings/pos_settings.py b/erpnext/accounts/doctype/pos_settings/pos_settings.py
index 736d36e..13a5004 100644
--- a/erpnext/accounts/doctype/pos_settings/pos_settings.py
+++ b/erpnext/accounts/doctype/pos_settings/pos_settings.py
@@ -3,7 +3,17 @@
# For license information, please see license.txt
from __future__ import unicode_literals
+import frappe
from frappe.model.document import Document
class POSSettings(Document):
- pass
\ No newline at end of file
+ def validate(self):
+ self.set_link_for_pos()
+
+ def set_link_for_pos(self):
+ link = 'pos' if self.use_pos_in_offline_mode else 'point-of-sale'
+ desktop_icon = frappe.db.get_value('Desktop Icon',
+ {'standard': 1, 'module_name': 'POS'}, 'name')
+
+ if desktop_icon:
+ frappe.db.set_value('Desktop Icon', desktop_icon, 'link', link)
\ No newline at end of file
diff --git a/erpnext/config/accounts.py b/erpnext/config/accounts.py
index 7c0f540..cdce13b 100644
--- a/erpnext/config/accounts.py
+++ b/erpnext/config/accounts.py
@@ -317,9 +317,14 @@
},
{
"type": "doctype",
+ "name": "POS Settings",
+ "description": _("Setup mode of POS (Online / Offline)")
+ },
+ {
+ "type": "doctype",
"name": "POS Profile",
"label": _("Point-of-Sale Profile"),
- "description": _("Rules to calculate shipping amount for a sale")
+ "description": _("Setup default values for POS Invoices")
},
{
"type": "doctype",
diff --git a/erpnext/selling/page/point_of_sale/point_of_sale.js b/erpnext/selling/page/point_of_sale/point_of_sale.js
index 1b0b9eb..726e80f 100644
--- a/erpnext/selling/page/point_of_sale/point_of_sale.js
+++ b/erpnext/selling/page/point_of_sale/point_of_sale.js
@@ -49,11 +49,12 @@
this.set_online_status();
},
() => this.setup_pos_profile(),
+ () => this.make_new_invoice(),
() => {
+ frappe.timeout(1);
this.make_items();
this.bind_events();
},
- () => this.make_new_invoice(),
() => this.page.set_title(__('Point of Sale'))
]);
}