Merge branch 'develop' of https://github.com/frappe/erpnext into lms-beta-v2

erpnext/config/accounting.py

@@ -78,6 +78,11 @@ def get_data():
 					"name": "Payment Entry",
 					"description": _("Bank/Cash transactions against party or for internal transfer")
 				},
+				{
+					"type": "doctype",
+					"name": "Payment Term",
+					"description": _("Payment Terms based on conditions")
+				},
 
 				# Reports
 				{
@@ -131,6 +136,11 @@ def get_data():
 					"name": "Currency Exchange",
 					"description": _("Currency exchange rate master.")
 				},
+				{
+					"type": "doctype",
+					"name": "Exchange Rate Revaluation",
+					"description": _("Exchange Rate Revaluation master.")
+				},
 				{
 					"type": "doctype",
 					"name": "Payment Gateway Account",
@@ -232,6 +242,11 @@ def get_data():
 					"label": _("Bank Account"),
 					"name": "Bank Account",
 				},
+				{
+					"type": "doctype",
+					"label": _("Invoice Discounting"),
+					"name": "Invoice Discounting",
+				},
 				{
 					"type": "doctype",
 					"label": _("Bank Statement Transaction Entry List"),