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

Merge pull request #12794 from surajshetty3416/miscellaneous-fixes

Browse source
This commit is contained in:
Suraj Shetty 2021-04-04 10:50:21 +05:30 • committed by GitHub
commit 2a400b5718
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
frappe/database/database.py
View file

@ -455,9 +455,6 @@ class Database(object):
elif (not ignore) and frappe.db.is_table_missing(e):
# table not found, look in singles
out = self.get_values_from_single(fields, filters, doctype, as_dict, debug, update)
if not out and frappe.get_meta(doctype).get('is_virtual'):
# check for virtual doctype
out = self.get_value_from_virtual_doctype(fields, filters, doctype, as_dict, debug, update)
else:
raise
@ -511,9 +508,6 @@ class Database(object):
else:
return r and [[i[1] for i in r]] or []
def get_value_from_virtual_doctype(self, fields, filters, doctype, as_dict=False, debug=False, update=None):
"""Return a single value from virtual doctype."""
return frappe.get_doc(doctype).get_value(fields, filters, as_dict=as_dict, debug=debug, update=update)
def get_singles_dict(self, doctype, debug = False):
"""Get Single DocType as dict.

3
frappe/public/js/frappe/form/grid_row.js
View file

@ -5,7 +5,7 @@ export default class GridRow {
this.on_grid_fields_dict = {};
this.on_grid_fields = [];
$.extend(this, opts);
if (this.doc) {
if (this.doc && this.parent_df.options) {
this.docfields = frappe.meta.get_docfields(this.parent_df.options, this.doc.name);
}
this.columns = {};
@ -255,6 +255,7 @@ export default class GridRow {
this.grid.visible_columns.forEach((col, ci) => {
// to get update df for the row
let df = this.docfields.find(field => field.fieldname === col[0].fieldname);
let colsize = col[1];
let txt = this.doc ?
frappe.format(this.doc[df.fieldname], df, null, this.doc) :