diff --git a/erpnext/config/stock.py b/erpnext/config/stock.py
index 7d66df2360..441a3ab4ec 100644
--- a/erpnext/config/stock.py
+++ b/erpnext/config/stock.py
@@ -30,6 +30,12 @@ def get_data():
 					"onboard": 1,
 					"dependencies": ["Item"],
 				},
+				{
+					"type": "doctype",
+					"name": "Pick List",
+					"onboard": 1,
+					"dependencies": ["Item"],
+				},
 				{
 					"type": "doctype",
 					"name": "Delivery Trip"
@@ -329,5 +335,5 @@ def get_data():
 				}
 			]
 		},
-			
+
 	]
diff --git a/erpnext/manufacturing/doctype/work_order/work_order.json b/erpnext/manufacturing/doctype/work_order/work_order.json
index 63c95e7c21..0d073a2312 100644
--- a/erpnext/manufacturing/doctype/work_order/work_order.json
+++ b/erpnext/manufacturing/doctype/work_order/work_order.json
@@ -72,6 +72,7 @@
    "fieldname": "naming_series",
    "fieldtype": "Select",
    "label": "Series",
+   "no_copy": 1,
    "options": "MFG-WO-.YYYY.-",
    "print_hide": 1,
    "reqd": 1,
@@ -467,7 +468,7 @@
  "idx": 1,
  "image_field": "image",
  "is_submittable": 1,
- "modified": "2019-07-31 00:13:38.218277",
+ "modified": "2019-08-28 12:29:35.315239",
  "modified_by": "Administrator",
  "module": "Manufacturing",
  "name": "Work Order",
diff --git a/erpnext/stock/doctype/pick_list/pick_list.js b/erpnext/stock/doctype/pick_list/pick_list.js
index 0d00024a34..163ff8c2f2 100644
--- a/erpnext/stock/doctype/pick_list/pick_list.js
+++ b/erpnext/stock/doctype/pick_list/pick_list.js
@@ -3,6 +3,10 @@
 
 frappe.ui.form.on('Pick List', {
 	setup: (frm) => {
+		frm.custom_make_buttons = {
+			'Delivery Note': 'Delivery Note',
+			'Stock Entry': 'Stock Entry',
+		};
 		frm.set_query('parent_warehouse', () => {
 			return {
 				filters: {
diff --git a/erpnext/stock/doctype/pick_list/pick_list.json b/erpnext/stock/doctype/pick_list/pick_list.json
index b52e18974b..5d33378d69 100644
--- a/erpnext/stock/doctype/pick_list/pick_list.json
+++ b/erpnext/stock/doctype/pick_list/pick_list.json
@@ -1,10 +1,12 @@
 {
- "autoname": "PICK.####",
+ "autoname": "naming_series:",
  "creation": "2019-07-11 16:03:13.681045",
  "doctype": "DocType",
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
+  "naming_series",
+  "company",
   "purpose",
   "customer",
   "work_order",
@@ -12,7 +14,6 @@
   "for_qty",
   "column_break_4",
   "parent_warehouse",
-  "company",
   "section_break_4",
   "items",
   "get_item_locations",
@@ -112,10 +113,18 @@
    "fieldname": "get_item_locations",
    "fieldtype": "Button",
    "label": "Get Item Locations"
+  },
+  {
+   "fieldname": "naming_series",
+   "fieldtype": "Select",
+   "label": "Series",
+   "options": "STO-PICK-.YYYY.-",
+   "reqd": 1,
+   "set_only_once": 1
   }
  ],
  "is_submittable": 1,
- "modified": "2019-08-27 21:24:50.609986",
+ "modified": "2019-08-28 12:27:22.743705",
  "modified_by": "Administrator",
  "module": "Stock",
  "name": "Pick List",
diff --git a/erpnext/stock/doctype/pick_list_item/pick_list_item.json b/erpnext/stock/doctype/pick_list_item/pick_list_item.json
index 947737719e..4dc3ae4e3a 100644
--- a/erpnext/stock/doctype/pick_list_item/pick_list_item.json
+++ b/erpnext/stock/doctype/pick_list_item/pick_list_item.json
@@ -113,7 +113,7 @@
    "fieldname": "stock_qty",
    "fieldtype": "Float",
    "in_list_view": 1,
-   "label": "Qty as per Stock UOM",
+   "label": "Qty (Stock UOM)",
    "read_only": 1
   },
   {
@@ -171,7 +171,7 @@
   }
  ],
  "istable": 1,
- "modified": "2019-08-27 08:44:04.173333",
+ "modified": "2019-08-28 12:34:06.224534",
  "modified_by": "Administrator",
  "module": "Stock",
  "name": "Pick List Item",