diff --git a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
index 163fb526156..bac0e998700 100755
--- a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
+++ b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
@@ -2793,6 +2793,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 1, 
+   "collapsible_depends_on": "eval:(!doc.is_return)", 
    "columns": 0, 
    "fieldname": "payment_schedule_section", 
    "fieldtype": "Section Break", 
@@ -2803,7 +2804,7 @@
    "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
-   "label": "Payment Terms Schedule", 
+   "label": "Payment Terms", 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -4012,8 +4013,8 @@
  "istable": 0, 
  "max_attachments": 0, 
  "menu_index": 0, 
- "modified": "2017-09-19 11:22:47.074420",
- "modified_by": "Administrator",
+ "modified": "2017-09-26 04:40:05.304278", 
+ "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Purchase Invoice", 
  "name_case": "Title Case", 
diff --git a/erpnext/accounts/doctype/sales_invoice/sales_invoice.json b/erpnext/accounts/doctype/sales_invoice/sales_invoice.json
index 9dbb06d4784..34768c40801 100644
--- a/erpnext/accounts/doctype/sales_invoice/sales_invoice.json
+++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice.json
@@ -2763,7 +2763,7 @@
    "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
-   "label": "Payment Schedule", 
+   "label": "Payment Terms", 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -4908,9 +4908,9 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "menu_index": 0,
- "modified": "2017-09-19 11:23:08.675028", 
- "modified_by": "Administrator",
+ "menu_index": 0, 
+ "modified": "2017-09-26 04:35:56.069952", 
+ "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Sales Invoice", 
  "name_case": "Title Case", 
diff --git a/erpnext/buying/doctype/purchase_order/purchase_order.json b/erpnext/buying/doctype/purchase_order/purchase_order.json
index 1e55f920538..0c19d2b41ad 100644
--- a/erpnext/buying/doctype/purchase_order/purchase_order.json
+++ b/erpnext/buying/doctype/purchase_order/purchase_order.json
@@ -2354,7 +2354,7 @@
    "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
-   "collapsible": 1, 
+   "collapsible": 0, 
    "columns": 0, 
    "fieldname": "payment_schedule_section", 
    "fieldtype": "Section Break", 
@@ -2365,7 +2365,7 @@
    "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
-   "label": "Payment Terms Schedule", 
+   "label": "Payment Terms", 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -3549,9 +3549,9 @@
  "is_submittable": 1, 
  "issingle": 0, 
  "istable": 0, 
- "max_attachments": 0,
- "modified": "2017-09-19 11:22:30.190589", 
- "modified_by": "Administrator",
+ "max_attachments": 0, 
+ "modified": "2017-09-26 04:41:49.329626", 
+ "modified_by": "Administrator", 
  "module": "Buying", 
  "name": "Purchase Order", 
  "owner": "Administrator", 
diff --git a/erpnext/selling/doctype/quotation/quotation.json b/erpnext/selling/doctype/quotation/quotation.json
index 0562c780f39..7fbdf26753f 100644
--- a/erpnext/selling/doctype/quotation/quotation.json
+++ b/erpnext/selling/doctype/quotation/quotation.json
@@ -2155,8 +2155,8 @@
    "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
-   "collapsible": 1, 
-   "collapsible_depends_on": "eval:!doc.__islocal", 
+   "collapsible": 0, 
+   "collapsible_depends_on": "", 
    "columns": 0, 
    "depends_on": "", 
    "fieldname": "payment_schedule_section", 
@@ -2168,7 +2168,7 @@
    "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
-   "label": "Payment Schedule", 
+   "label": "Payment Terms", 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -2850,9 +2850,9 @@
  "istable": 0, 
  "max_attachments": 1, 
  "menu_index": 0, 
- "modified": "2017-09-19 11:22:15.268846",
+ "modified": "2017-09-26 04:43:59.901399", 
  "modified_by": "Administrator", 
- "module": "Selling",
+ "module": "Selling", 
  "name": "Quotation", 
  "owner": "Administrator", 
  "permissions": [
diff --git a/erpnext/selling/doctype/sales_order/sales_order.json b/erpnext/selling/doctype/sales_order/sales_order.json
index 2b996393f17..97c5996ba86 100644
--- a/erpnext/selling/doctype/sales_order/sales_order.json
+++ b/erpnext/selling/doctype/sales_order/sales_order.json
@@ -2335,8 +2335,8 @@
    "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
-   "collapsible": 1, 
-   "collapsible_depends_on": "eval:!doc.__islocal||doc.payment_schedule", 
+   "collapsible": 0, 
+   "collapsible_depends_on": "", 
    "columns": 0, 
    "fieldname": "payment_schedule_section", 
    "fieldtype": "Section Break", 
@@ -2347,7 +2347,7 @@
    "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
-   "label": "Payment Terms Schedule", 
+   "label": "Payment Terms", 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -3875,9 +3875,9 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2017-09-19 11:21:36.332326",
+ "modified": "2017-09-26 04:43:20.642507", 
  "modified_by": "Administrator", 
- "module": "Selling",
+ "module": "Selling", 
  "name": "Sales Order", 
  "owner": "Administrator", 
  "permissions": [