Resolve merge conflicts from enterprise_sprint branch

2018-05-14 21:15:46 +05:30
parent 044d6908cf 8b04d431c0
commit 2ca83d61ea
463 changed files with 35469 additions and 5844 deletions
--- a/erpnext/accounts/report/accounts_payable/accounts_payable.js
+++ b/erpnext/accounts/report/accounts_payable/accounts_payable.js
@@ -10,6 +10,12 @@ frappe.query_reports["Accounts Payable"] = {
 			"options": "Company",
 			"default": frappe.defaults.get_user_default("Company")
 		},
+		{
+			"fieldname":"finance_book",
+			"label": __("Finance Book"),
+			"fieldtype": "Link",
+			"options": "Finance Book"
+		},
 		{
 			"fieldname":"supplier",
 			"label": __("Supplier"),