Merge pull request #1856 from nabinhait/v4-hotfix
V4 hotfix
diff --git a/erpnext/accounts/doctype/sales_invoice/sales_invoice.py b/erpnext/accounts/doctype/sales_invoice/sales_invoice.py
index 614c13a..262ac22 100644
--- a/erpnext/accounts/doctype/sales_invoice/sales_invoice.py
+++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice.py
@@ -383,20 +383,20 @@
def get_warehouse(self):
- w = frappe.db.sql("""select warehouse from `tabPOS Setting`
- where ifnull(user,'') = %s and company = %s""",
- (frappe.session['user'], self.company))
- w = w and w[0][0] or ''
- if not w:
- ps = frappe.db.sql("""select name, warehouse from `tabPOS Setting`
+ user_pos_setting = frappe.db.sql("""select name, warehouse from `tabPOS Setting`
+ where ifnull(user,'') = %s and company = %s""", (frappe.session['user'], self.company))
+ warehouse = user_pos_setting[0][1] if user_pos_setting else None
+
+ if not warehouse:
+ global_pos_setting = frappe.db.sql("""select name, warehouse from `tabPOS Setting`
where ifnull(user,'') = '' and company = %s""", self.company)
- if not ps:
+
+ if global_pos_setting:
+ warehouse = global_pos_setting[0][1]
+ elif not user_pos_setting:
msgprint(_("POS Setting required to make POS Entry"), raise_exception=True)
- elif not ps[0][1]:
- msgprint(_("Warehouse required in POS Setting"))
- else:
- w = ps[0][1]
- return w
+
+ return warehouse
def on_update(self):
if cint(self.update_stock) == 1:
diff --git a/erpnext/stock/doctype/serial_no/serial_no.json b/erpnext/stock/doctype/serial_no/serial_no.json
index 3316582..8de04f0 100644
--- a/erpnext/stock/doctype/serial_no/serial_no.json
+++ b/erpnext/stock/doctype/serial_no/serial_no.json
@@ -155,7 +155,7 @@
"fieldtype": "Select",
"label": "Creation Document Type",
"no_copy": 1,
- "options": "\nPurchase Receipt\nStock Entry",
+ "options": "\nPurchase Receipt\nStock Entry\nSerial No",
"permlevel": 0,
"read_only": 1
},
@@ -418,7 +418,7 @@
"icon": "icon-barcode",
"idx": 1,
"in_create": 0,
- "modified": "2014-05-27 03:49:19.131746",
+ "modified": "2014-06-26 12:33:49.911829",
"modified_by": "Administrator",
"module": "Stock",
"name": "Serial No",