Skip to content

Commit f7d81c7

Browse files
committed
Merge branch 'develop'
2 parents e7125c0 + 5b73a48 commit f7d81c7

34 files changed

+810
-33
lines changed

erpnext/__init__.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
from __future__ import unicode_literals
33
import frappe
44

5-
__version__ = '8.0.17'
5+
__version__ = '8.0.18'
66

77
def get_default_company(user=None):
88
'''Get default company for user'''

erpnext/accounts/doctype/bank_guarantee/__init__.py

Whitespace-only changes.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
// Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors
2+
// For license information, please see license.txt
3+
4+
frappe.ui.form.on('Bank Guarantee', {
5+
refresh: function(frm) {
6+
cur_frm.set_query("account", function() {
7+
return {
8+
"filters": {
9+
"account_type": "Bank",
10+
"is_group": 0
11+
}
12+
};
13+
});
14+
cur_frm.set_query("project", function() {
15+
return {
16+
"filters": {
17+
"customer": cur_frm.doc.customer
18+
}
19+
};
20+
});
21+
},
22+
start_date: function(frm) {
23+
end_date = frappe.datetime.add_days(cur_frm.doc.start_date, cur_frm.doc.validity - 1);
24+
cur_frm.set_value("end_date", end_date);
25+
},
26+
validity: function(frm) {
27+
end_date = frappe.datetime.add_days(cur_frm.doc.start_date, cur_frm.doc.validity - 1);
28+
cur_frm.set_value("end_date", end_date);
29+
}
30+
});

0 commit comments

Comments
 (0)