vassili/seitime-frappe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4

Merge branch 'master' into develop

Browse source
This commit is contained in:
Saurabh 2018-02-15 23:20:58 +05:30
commit 7ca5cf58ab
4 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
frappe/__init__.py
View file

@ -14,7 +14,7 @@ import os, sys, importlib, inspect, json
from .exceptions import *
from .utils.jinja import get_jenv, get_template, render_template, get_email_from_template
__version__ = '10.0.24'
__version__ = '10.0.25'
__title__ = "Frappe Framework"
local = Local()

4
frappe/email/doctype/email_account/email_account.py
View file

@ -714,10 +714,10 @@ def get_max_email_uid(email_account):
"communication_medium": "Email",
"sent_or_received": "Received",
"email_account": email_account
}, fields=["ifnull(max(uid), 0) as uid"])
}, fields=["max(uid) as uid"])
if not result:
return 1
else:
max_uid = int(result[0].get("uid", 0)) + 1
max_uid = cint(result[0].get("uid", 0)) + 1
return max_uid

4
frappe/public/js/frappe/form/multi_select_dialog.js
View file

@ -192,7 +192,7 @@ frappe.ui.form.MultiSelectDialog = Class.extend({
get_results: function() {
let me = this;
let filters = this.get_query().filters;
let filters = this.get_query ? this.get_query().filters : {};
Object.keys(this.setters).forEach(function(setter) {
filters[setter] = me.dialog.fields_dict[setter].get_value() || undefined;
me.args[setter] = filters[setter];
@ -209,7 +209,7 @@ frappe.ui.form.MultiSelectDialog = Class.extend({
filters: filters,
filter_fields: Object.keys(me.setters).concat([me.date_field]),
page_length: this.page_length + 1,
query: this.get_query().query,
query: this.get_query ? this.get_query().query : '',
as_dict: 1
}
frappe.call({

6
frappe/public/js/frappe/ui/tags.js
View file

@ -109,14 +109,14 @@ frappe.ui.Tags = class {
}
getTag(label) {
let $tag = $(`<div class="frappe-tag btn-group" data-tag-label=${label}>
let $tag = $(`<div class="frappe-tag btn-group" data-tag-label="${label}">
<button class="btn btn-default btn-xs toggle-tag"
title="${ __("toggle Tag") }"
data-tag-label=${label}>${label}
data-tag-label="${label}">${label}
</button>
<button class="btn btn-default btn-xs remove-tag"
title="${ __("Remove Tag") }"
data-tag-label=${label}>
data-tag-label="${label}">
<i class="fa fa-remove text-muted"></i>
</button></div>`);