[change_log and fixes] set print hide, add change_log
diff --git a/erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json b/erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json
index 0a98d87..d4c40f2 100644
--- a/erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json
+++ b/erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json
@@ -717,7 +717,7 @@
"no_copy": 0,
"permlevel": 0,
"precision": "",
- "print_hide": 0,
+ "print_hide": 1,
"read_only": 0,
"report_hide": 0,
"reqd": 0,
@@ -1327,8 +1327,8 @@
"is_submittable": 0,
"issingle": 0,
"istable": 1,
- "modified": "2015-10-26 17:22:23.631195",
- "modified_by": "Administrator",
+ "modified": "2015-10-27 16:59:39.595490",
+ "modified_by": "saurabh@erpnext.com",
"module": "Accounts",
"name": "Sales Invoice Item",
"owner": "Administrator",
diff --git a/erpnext/buying/doctype/purchase_order/purchase_order.json b/erpnext/buying/doctype/purchase_order/purchase_order.json
index a866e81..121fc93 100644
--- a/erpnext/buying/doctype/purchase_order/purchase_order.json
+++ b/erpnext/buying/doctype/purchase_order/purchase_order.json
@@ -475,7 +475,7 @@
"no_copy": 0,
"permlevel": 0,
"precision": "",
- "print_hide": 0,
+ "print_hide": 1,
"read_only": 0,
"report_hide": 0,
"reqd": 0,
@@ -2238,8 +2238,8 @@
"is_submittable": 1,
"issingle": 0,
"istable": 0,
- "modified": "2015-10-26 09:09:06.796558",
- "modified_by": "Administrator",
+ "modified": "2015-10-27 16:58:53.362949",
+ "modified_by": "saurabh@erpnext.com",
"module": "Buying",
"name": "Purchase Order",
"owner": "Administrator",
diff --git a/erpnext/change_log/current/drop-ship.md b/erpnext/change_log/current/drop-ship.md
new file mode 100644
index 0000000..d6758e7
--- /dev/null
+++ b/erpnext/change_log/current/drop-ship.md
@@ -0,0 +1 @@
+- **Drop Ship** You can now implement drop shipping by creating Purchase Order from Sales Order.
\ No newline at end of file
diff --git a/erpnext/selling/doctype/sales_order_item/sales_order_item.json b/erpnext/selling/doctype/sales_order_item/sales_order_item.json
index 1118157..e8ad1e8 100644
--- a/erpnext/selling/doctype/sales_order_item/sales_order_item.json
+++ b/erpnext/selling/doctype/sales_order_item/sales_order_item.json
@@ -720,7 +720,7 @@
"no_copy": 0,
"permlevel": 0,
"precision": "",
- "print_hide": 0,
+ "print_hide": 1,
"read_only": 0,
"report_hide": 0,
"reqd": 0,
@@ -1206,8 +1206,8 @@
"is_submittable": 0,
"issingle": 0,
"istable": 1,
- "modified": "2015-10-26 17:17:04.378067",
- "modified_by": "Administrator",
+ "modified": "2015-10-27 17:00:01.005108",
+ "modified_by": "saurabh@erpnext.com",
"module": "Selling",
"name": "Sales Order Item",
"owner": "Administrator",
diff --git a/erpnext/stock/doctype/item/item.json b/erpnext/stock/doctype/item/item.json
index 0f076f4..8632d12 100644
--- a/erpnext/stock/doctype/item/item.json
+++ b/erpnext/stock/doctype/item/item.json
@@ -260,7 +260,7 @@
"no_copy": 0,
"permlevel": 0,
"precision": "",
- "print_hide": 0,
+ "print_hide": 1,
"read_only": 0,
"report_hide": 0,
"reqd": 0,
@@ -2157,11 +2157,7 @@
"issingle": 0,
"istable": 0,
"max_attachments": 1,
-<<<<<<< ac7a1da680daa876b9f107cec87150cf7a195138
"modified": "2015-10-29 02:25:26.256373",
-=======
- "modified": "2015-10-26 17:18:54.615802",
->>>>>>> [fixes] bulk close facility, rename Drop Ship to Delivered By Supplier
"modified_by": "Administrator",
"module": "Stock",
"name": "Item",