diff --git a/erpnext/stock/doctype/item_price/item_price.py b/erpnext/stock/doctype/item_price/item_price.py
index 30675b5..4c496cb 100644
--- a/erpnext/stock/doctype/item_price/item_price.py
+++ b/erpnext/stock/doctype/item_price/item_price.py
@@ -32,10 +32,16 @@
 
 	def update_price_list_details(self):
 		if self.price_list:
-			self.buying, self.selling, self.currency = \
-				frappe.db.get_value("Price List",
-					{"name": self.price_list, "enabled": 1},
-					["buying", "selling", "currency"])
+			price_list_details = frappe.db.get_value("Price List",
+				{"name": self.price_list, "enabled": 1},
+				["buying", "selling", "currency"])
+
+			if not price_list_details:
+				link = frappe.utils.get_link_to_form('Price List', self.price_list)
+				frappe.throw("The price list {0} does not exists or disabled".
+					format(link))
+
+			self.buying, self.selling, self.currency = price_list_details
 
 	def update_item_details(self):
 		if self.item_code:
diff --git a/erpnext/stock/doctype/packing_slip/packing_slip.json b/erpnext/stock/doctype/packing_slip/packing_slip.json
index 0ed039a..ec8d57c 100644
--- a/erpnext/stock/doctype/packing_slip/packing_slip.json
+++ b/erpnext/stock/doctype/packing_slip/packing_slip.json
@@ -74,7 +74,7 @@
     {
      "description": "Identification of the package for the delivery (for print)",
      "fieldname": "from_case_no",
-     "fieldtype": "Data",
+     "fieldtype": "Int",
      "in_list_view": 1,
      "label": "From Package No.",
      "no_copy": 1,
@@ -88,7 +88,7 @@
     {
      "description": "If more than one package of the same type (for print)",
      "fieldname": "to_case_no",
-     "fieldtype": "Data",
+     "fieldtype": "Int",
      "in_list_view": 1,
      "label": "To Package No.",
      "no_copy": 1,
@@ -180,7 +180,7 @@
    "icon": "fa fa-suitcase",
    "idx": 1,
    "is_submittable": 1,
-   "modified": "2019-05-31 04:45:08.082862",
+   "modified": "2019-09-09 04:45:08.082862",
    "modified_by": "Administrator",
    "module": "Stock",
    "name": "Packing Slip",
@@ -261,4 +261,4 @@
    "show_name_in_global_search": 1,
    "sort_field": "modified",
    "sort_order": "DESC"
-  }
\ No newline at end of file
+  }
diff --git a/erpnext/stock/doctype/packing_slip/packing_slip.py b/erpnext/stock/doctype/packing_slip/packing_slip.py
index 4139a19..7a5ae31 100644
--- a/erpnext/stock/doctype/packing_slip/packing_slip.py
+++ b/erpnext/stock/doctype/packing_slip/packing_slip.py
@@ -53,7 +53,6 @@
 			frappe.msgprint(_("'To Case No.' cannot be less than 'From Case No.'"),
 				raise_exception=1)
 
-
 		res = frappe.db.sql("""SELECT name FROM `tabPacking Slip`
 			WHERE delivery_note = %(delivery_note)s AND docstatus = 1 AND
 			((from_case_no BETWEEN %(from_case_no)s AND %(to_case_no)s)