Merge branch 'develop'

erpnext/__version__.py

@@ -1,2 +1,2 @@
 from __future__ import unicode_literals
-__version__ = '6.7.8'
+__version__ = '6.8.0'

erpnext/accounts/report/gross_profit/gross_profit.py

@@ -98,16 +98,17 @@ class GrossProfitGenerator(object):
 
 			row.base_amount = flt(row.base_net_amount)
 
+			product_bundles = []
 			if row.update_stock:
 				product_bundles = self.product_bundles.get(row.parenttype, {}).get(row.parent, frappe._dict())
 			elif row.dn_detail:
 				product_bundles = self.product_bundles.get("Delivery Note", {})\
 					.get(row.delivery_note, frappe._dict())
 				row.item_row = row.dn_detail
-			
+
 			# get buying amount
 			if row.item_code in product_bundles:
-				row.buying_amount = self.get_buying_amount_from_product_bundle(row, 
+				row.buying_amount = self.get_buying_amount_from_product_bundle(row,
 					product_bundles[row.item_code])
 			else:
 				row.buying_amount = self.get_buying_amount(row, row.item_code)
@@ -184,7 +185,7 @@ class GrossProfitGenerator(object):
 				parenttype, parent = row.parenttype, row.parent
 				if row.dn_detail:
 					parenttype, parent = "Delivery Note", row.delivery_note
-				
+
 				for i, sle in enumerate(my_sle):
 					# find the stock valution rate from stock ledger entry
 					if sle.voucher_type == parenttype and parent == sle.voucher_no and \

erpnext/change_log/v6/v6_2_0.md

@@ -1 +1 @@
-- **[Multi-currency Accounting](https://manual.erpnext.com/contents/accounts/multi-currency-accounting)**: You can now have an Account in a different currency than your Company's currency
+- **[Multi-currency Accounting](https://frappe.github.io/erpnext/user/guides/accounts/multi-currency-accounting)**: You can now have an Account in a different currency than your Company's currency

erpnext/change_log/v6/v6_8_0.md

@@ -0,0 +1,2 @@
+- Removed Stock UOM Replace Utility    
+  Replacing UOM and Conversion Factor in existing transactions broke the integrity of data. The cleaner solution is to create new Items for a different Stock UOM, and keep existing transactions as they are.

erpnext/config/docs.py

@@ -0,0 +1,28 @@
+source_link = "https://github.com/frappe/erpnext"
+docs_base_url = "https://frappe.github.io/erpnext"
+headline = "Learn ERPNext Inside Out"
+sub_heading = "Find detailed explanation for all ERPNext features"
+long_description = """
+ERPNext helps you to manage all your business information in one application and use it to manage operations and take decisions based on data.
+
+Among other things, ERPNext will help you to:
+
+- Track all Invoices and Payments.
+- Know what quantity of which product is available in stock.
+- Identify open customer queries.
+- Manage payroll.
+- Assign tasks and follow up on them.
+- Maintain a database of all your customers, suppliers and their contacts.
+- Prepare quotes.
+- Get reminders on maintenance schedules.
+- Publish your website.
+
+And a lot lot lot more."""
+
+def get_context(context):
+	context.top_bar_items = [
+		{"label": "Contents", "url": context.docs_base_url + "/contents.html", "right": 1},
+		{"label": "User Guide", "url": context.docs_base_url + "/user/guides", "right": 1},
+		{"label": "Videos", "url": context.docs_base_url + "/user/videos", "right": 1},
+		{"label": "Developer Docs", "url": context.docs_base_url + "/current", "right": 1}
+	]