Merge branch 'master' into develop
diff --git a/erpnext/__init__.py b/erpnext/__init__.py
index cee8864..2109792 100644
--- a/erpnext/__init__.py
+++ b/erpnext/__init__.py
@@ -2,7 +2,7 @@
from __future__ import unicode_literals
import frappe
-__version__ = '7.2.0'
+__version__ = '7.2.1'
def get_default_company(user=None):
'''Get default company for user'''
diff --git a/erpnext/selling/sales_common.js b/erpnext/selling/sales_common.js
index fc3cb3d..7ddf45d 100644
--- a/erpnext/selling/sales_common.js
+++ b/erpnext/selling/sales_common.js
@@ -212,7 +212,7 @@
item_code: item.item_code,
warehouse: item.warehouse,
qty: item.qty,
- serial_no:item.serial_no
+ serial_no: item.serial_no || ""
},
callback:function(r){
if (inList(['Delivery Note', 'Sales Invoice'], doc.doctype)) {
diff --git a/erpnext/stock/doctype/delivery_note_item/delivery_note_item.json b/erpnext/stock/doctype/delivery_note_item/delivery_note_item.json
index 1cb0fcd..e1ac06e 100644
--- a/erpnext/stock/doctype/delivery_note_item/delivery_note_item.json
+++ b/erpnext/stock/doctype/delivery_note_item/delivery_note_item.json
@@ -1691,7 +1691,7 @@
"issingle": 0,
"istable": 1,
"max_attachments": 0,
- "modified": "2016-11-23 12:33:37.728117",
+ "modified": "2016-12-24 12:33:37.728117",
"modified_by": "Administrator",
"module": "Stock",
"name": "Delivery Note Item",
diff --git a/erpnext/stock/get_item_details.py b/erpnext/stock/get_item_details.py
index 7bcad08..0ed6952 100644
--- a/erpnext/stock/get_item_details.py
+++ b/erpnext/stock/get_item_details.py
@@ -384,7 +384,7 @@
return {'serial_no': serial_no}
@frappe.whitelist()
-def get_bin_details_and_serial_nos(item_code, warehouse, qty, serial_no):
+def get_bin_details_and_serial_nos(item_code, warehouse, qty=None, serial_no=None):
bin_details_and_serial_nos = {}
bin_details_and_serial_nos.update(get_bin_details(item_code, warehouse))
bin_details_and_serial_nos.update(get_serial_no_details(item_code, warehouse, qty, serial_no))