Merge branch 'ShashaQin-patch-60' into develop

erpnext/stock/doctype/serial_no/serial_no.json

@@ -504,7 +504,7 @@
    "bold": 0,
    "collapsible": 0,
    "fieldname": "delivery_document_type",
-   "fieldtype": "Select", 
+   "fieldtype": "Link",
    "hidden": 0,
    "ignore_user_permissions": 0,
    "in_filter": 1,
@@ -512,7 +512,7 @@
    "label": "Delivery Document Type",
    "length": 0,
    "no_copy": 1,
-   "options": "\nDelivery Note\nSales Invoice\nStock Entry\nPurchase Receipt", 
+   "options": "DocType",
    "permlevel": 0,
    "print_hide": 0,
    "read_only": 1,
@@ -527,7 +527,7 @@
    "bold": 0,
    "collapsible": 0,
    "fieldname": "delivery_document_no",
-   "fieldtype": "Data", 
+   "fieldtype": "Dynamic Link",
    "hidden": 0,
    "ignore_user_permissions": 0,
    "in_filter": 1,
@@ -535,6 +535,7 @@
    "label": "Delivery Document No",
    "length": 0,
    "no_copy": 1,
+   "options": "delivery_document_type",
    "permlevel": 0,
    "print_hide": 0,
    "read_only": 1,
@@ -931,7 +932,7 @@
  "issingle": 0,
  "istable": 0,
  "max_attachments": 0,
- "modified": "2015-11-16 06:29:57.486475", 
+ "modified": "2015-12-14 15:53:57.486475",
  "modified_by": "Administrator",
  "module": "Stock",
  "name": "Serial No",