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

Merge branches 'master' and 'master' of github.com:webnotes/wnframework into wsgi

Browse source
This commit is contained in:
Nabin Hait 2013-10-17 16:55:37 +05:30
commit 60ca295147
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
core/doctype/customize_form_field/customize_form_field.txt
View file

@ -2,7 +2,7 @@
{
"creation": "2013-02-22 01:27:32",
"docstatus": 0,
"modified": "2013-07-10 14:54:06",
"modified": "2013-10-16 15:38:55",
"modified_by": "Administrator",
"owner": "Administrator"
},
@ -54,7 +54,7 @@
"label": "Type",
"oldfieldname": "fieldtype",
"oldfieldtype": "Select",
"options": "Data\nSelect\nText\nSmall Text\nText Editor\nLink\nInt\nDate\nTime\nCurrency\nTable\nFloat\nCheck\nSection Break\nColumn Break\nButton\nRead Only\nCode\nHTML\nImage\nBlob\nPassword",
"options": "Button\nCheck\nCode\nColumn Break\nCurrency\nData\nDate\nDatetime\nFloat\nHTML\nImage\nInt\nLink\nLong Text\nPassword\nPercent\nRead Only\nSection Break\nSelect\nSmall Text\nTable\nText\nText Editor\nTime",
"print_hide": 0,
"reqd": 1,
"search_index": 1

4
webnotes/__init__.py
View file

@ -531,9 +531,9 @@ def load_json(obj):
return obj
def build_match_conditions(doctype, fields=None, as_condition=True, match_filters=None):
def build_match_conditions(doctype, fields=None, as_condition=True):
import webnotes.widgets.reportview
return webnotes.widgets.reportview.build_match_conditions(doctype, fields, as_condition, match_filters)
return webnotes.widgets.reportview.build_match_conditions(doctype, fields, as_condition)
def get_list(doctype, filters=None, fields=None, docstatus=None,
group_by=None, order_by=None, limit_start=0, limit_page_length=None,