Merge branch 'develop'

frappe · Apr 25, 2017 · f7d81c7 · f7d81c7
2 parents e7125c0 + 5b73a48
commit f7d81c7
Show file tree

Hide file tree

Showing 34 changed files with 810 additions and 33 deletions.
diff --git a/erpnext/__init__.py b/erpnext/__init__.py
@@ -2,7 +2,7 @@
 from __future__ import unicode_literals
 import frappe
 
-__version__ = '8.0.17'
+__version__ = '8.0.18'
 
 def get_default_company(user=None):
 	'''Get default company for user'''

diff --git a/erpnext/accounts/doctype/bank_guarantee/__init__.py b/erpnext/accounts/doctype/bank_guarantee/__init__.py
diff --git a/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.js b/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.js
@@ -0,0 +1,30 @@
+// Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors
+// For license information, please see license.txt
+
+frappe.ui.form.on('Bank Guarantee', {
+	refresh: function(frm) {
+		cur_frm.set_query("account", function() {
+			return {
+				"filters": {
+					"account_type": "Bank",
+					"is_group": 0
+				}
+			};
+		});
+		cur_frm.set_query("project", function() {
+			return {
+				"filters": {
+					"customer": cur_frm.doc.customer
+				}
+			};
+		});
+	},
+	start_date: function(frm) {
+		end_date = frappe.datetime.add_days(cur_frm.doc.start_date, cur_frm.doc.validity - 1);
+		cur_frm.set_value("end_date", end_date);
+	},
+	validity: function(frm) {
+		end_date = frappe.datetime.add_days(cur_frm.doc.start_date, cur_frm.doc.validity - 1);
+		cur_frm.set_value("end_date", end_date);
+	}
+});