Ver código fonte

minor fixes

version-14
Nabin Hait 11 anos atrás
pai
commit
7affeb49d1
2 arquivos alterados com 8 adições e 3 exclusões
  1. +7
    -2
      webnotes/model/__init__.py
  2. +1
    -1
      webnotes/widgets/query_report.py

+ 7
- 2
webnotes/model/__init__.py Ver arquivo

@@ -105,12 +105,17 @@ def rename_field(doctype, old_fieldname, new_fieldname):
where doctype=%s and field=%s""",
(new_fieldname, doctype, old_fieldname))
else:
# copy field value
webnotes.conn.sql("""update `tab%s` set `%s`=`%s`""" % \
(doctype, new_fieldname, old_fieldname))
# update in property setter
webnotes.conn.sql("""update `tabProperty Setter` set field_name = %s
where doc_type=%s and field_name=%s""", (new_fieldname, doctype, old_fieldname))
update_users_report_view_settings(doctype, old_fieldname)
def update_users_report_view_settings(doctype, ref_fieldname):
import json
user_report_cols = webnotes.conn.sql("""select defkey, defvalue from `tabDefaultValue` where
defkey like '_list_settings:%'""")
@@ -118,7 +123,7 @@ def rename_field(doctype, old_fieldname, new_fieldname):
new_columns = []
columns_modified = False
for field, field_doctype in json.loads(value):
if field == old_fieldname and field_doctype == doctype:
if field == ref_fieldname and field_doctype == doctype:
new_columns.append([field, field_doctype])
columns_modified=True
if columns_modified:


+ 1
- 1
webnotes/widgets/query_report.py Ver arquivo

@@ -75,7 +75,7 @@ def run(report_name, filters=()):
if report.is_standard=="Yes":
method_name = webnotes.local.module_app[scrub(module)] + "." + scrub(module) \
+ ".report." + scrub(report.name) + "." + scrub(report.name) + ".execute"
columns, result = webnotes.get_attr(method_name)(filters or {})
columns, result = webnotes.get_attr(method_name)(webnotes._dict(filters))
result = get_filtered_data(report.ref_doctype, columns, result)


Carregando…
Cancelar
Salvar