+ 
-
+
diff --git a/cypress/fixtures/child_table_doctype.js b/cypress/fixtures/child_table_doctype.js
new file mode 100644
index 0000000000..f65e5d1765
--- /dev/null
+++ b/cypress/fixtures/child_table_doctype.js
@@ -0,0 +1,30 @@
+export default {
+ name: "Child Table Doctype",
+ actions: [],
+ custom: 1,
+ autoname: "field:title",
+ creation: "2022-02-09 20:15:21.242213",
+ doctype: "DocType",
+ editable_grid: 1,
+ engine: "InnoDB",
+ fields: [
+ {
+ fieldname: "title",
+ fieldtype: "Data",
+ in_list_view: 1,
+ label: "Title",
+ unique: 1
+ }
+ ],
+ links: [],
+ istable: 1,
+ modified: "2022-02-10 12:03:12.603763",
+ modified_by: "Administrator",
+ module: "Custom",
+ naming_rule: "By fieldname",
+ owner: "Administrator",
+ permissions: [],
+ sort_field: 'modified',
+ sort_order: 'ASC',
+ track_changes: 1
+};
\ No newline at end of file
diff --git a/cypress/fixtures/doctype_to_link.js b/cypress/fixtures/doctype_to_link.js
new file mode 100644
index 0000000000..f5335b1755
--- /dev/null
+++ b/cypress/fixtures/doctype_to_link.js
@@ -0,0 +1,45 @@
+export default {
+ name: "Doctype to Link",
+ actions: [],
+ custom: 1,
+ naming_rule: "By fieldname",
+ autoname: "field:title",
+ creation: "2022-02-09 20:15:21.242213",
+ doctype: "DocType",
+ editable_grid: 1,
+ engine: "InnoDB",
+ fields: [
+ {
+ "fieldname": "title",
+ "fieldtype": "Data",
+ "label": "Title",
+ "unique": 1
+ }
+ ],
+ links: [
+ {
+ "group": "Child Doctype",
+ "link_doctype": "Doctype With Child Table",
+ "link_fieldname": "title"
+ }
+ ],
+ modified: "2022-02-10 12:03:12.603763",
+ modified_by: "Administrator",
+ module: "Custom",
+ owner: "Administrator",
+ permissions: [
+ {
+ create: 1,
+ delete: 1,
+ email: 1,
+ print: 1,
+ read: 1,
+ role: 'System Manager',
+ share: 1,
+ write: 1
+ }
+ ],
+ sort_field: 'modified',
+ sort_order: 'ASC',
+ track_changes: 1
+};
\ No newline at end of file
diff --git a/cypress/fixtures/doctype_with_child_table.js b/cypress/fixtures/doctype_with_child_table.js
new file mode 100644
index 0000000000..bbb2127448
--- /dev/null
+++ b/cypress/fixtures/doctype_with_child_table.js
@@ -0,0 +1,46 @@
+export default {
+ name: "Doctype With Child Table",
+ actions: [],
+ custom: 1,
+ autoname: "field:title",
+ creation: "2022-02-09 20:15:21.242213",
+ doctype: "DocType",
+ editable_grid: 1,
+ engine: "InnoDB",
+ fields: [
+ {
+ fieldname: "title",
+ fieldtype: "Data",
+ label: "Title",
+ unique: 1
+ },
+ {
+ fieldname: "child_table",
+ fieldtype: "Table",
+ label: "Child Table",
+ options: "Child Table Doctype",
+ reqd: 1
+ }
+ ],
+ links: [],
+ modified: "2022-02-10 12:03:12.603763",
+ modified_by: "Administrator",
+ module: "Custom",
+ naming_rule: "By fieldname",
+ owner: "Administrator",
+ permissions: [
+ {
+ create: 1,
+ delete: 1,
+ email: 1,
+ print: 1,
+ read: 1,
+ role: 'System Manager',
+ share: 1,
+ write: 1
+ }
+ ],
+ sort_field: 'modified',
+ sort_order: 'ASC',
+ track_changes: 1
+};
diff --git a/cypress/integration/dashboard_links.js b/cypress/integration/dashboard_links.js
index 16ffd41cf4..93d10cf1fd 100644
--- a/cypress/integration/dashboard_links.js
+++ b/cypress/integration/dashboard_links.js
@@ -1,7 +1,21 @@
+import doctype_with_child_table from '../fixtures/doctype_with_child_table';
+import child_table_doctype from '../fixtures/child_table_doctype';
+import doctype_to_link from '../fixtures/doctype_to_link';
+const doctype_to_link_name = doctype_to_link.name;
+const child_table_doctype_name = child_table_doctype.name;
+
context('Dashboard links', () => {
before(() => {
cy.visit('/login');
cy.login();
+ cy.insert_doc('DocType', child_table_doctype, true);
+ cy.insert_doc('DocType', doctype_with_child_table, true);
+ cy.insert_doc('DocType', doctype_to_link, true);
+ return cy.window().its('frappe').then(frappe => {
+ return frappe.xcall("frappe.tests.ui_test_helpers.update_child_table", {
+ name: child_table_doctype_name
+ });
+ });
});
it('Adding a new contact, checking for the counter on the dashboard and deleting the created contact', () => {
@@ -62,4 +76,14 @@ context('Dashboard links', () => {
cy.findByText('Website Analytics');
});
});
+
+ it('check if child table is populated with linked field on creation from dashboard link', () => {
+ cy.new_form(doctype_to_link_name);
+ cy.fill_field("title", "Test Linking");
+ cy.findByRole("button", {name: "Save"}).click();
+
+ cy.get('.document-link .btn-new').click();
+ cy.get('.frappe-control[data-fieldname="child_table"] .rows .data-row .col[data-fieldname="doctype_to_link"]')
+ .should('contain.text', 'Test Linking');
+ });
});
diff --git a/cypress/integration/depends_on.js b/cypress/integration/depends_on.js
index 9aa6b5d89d..12f54f2b6e 100644
--- a/cypress/integration/depends_on.js
+++ b/cypress/integration/depends_on.js
@@ -55,10 +55,31 @@ context('Depends On', () => {
'read_only_depends_on': "eval:doc.test_field=='Some Other Value'",
'options': "Child Test Depends On"
},
+ {
+ "label": "Dependent Tab",
+ "fieldname": "dependent_tab",
+ "fieldtype": "Tab Break",
+ "depends_on": "eval:doc.test_field=='Show Tab'"
+ },
+ {
+ "fieldname": "tab_section",
+ "fieldtype": "Section Break",
+ },
+ {
+ "label": "Field in Tab",
+ "fieldname": "field_in_tab",
+ "fieldtype": "Data",
+ }
]
});
});
});
+ it('should show the tab on other setting field value', () => {
+ cy.new_form('Test Depends On');
+ cy.fill_field('test_field', 'Show Tab');
+ cy.get('body').click();
+ cy.findByRole("tab", {name: "Dependent Tab"}).should('be.visible');
+ });
it('should set the field as mandatory depending on other fields value', () => {
cy.new_form('Test Depends On');
cy.fill_field('test_field', 'Some Value');
diff --git a/cypress/integration/list_view.js b/cypress/integration/list_view.js
index b161af2df7..3e0d1c9d50 100644
--- a/cypress/integration/list_view.js
+++ b/cypress/integration/list_view.js
@@ -12,6 +12,7 @@ context('List View', () => {
cy.get('.list-row-container .list-row-checkbox').click({ multiple: true, force: true });
cy.get('.actions-btn-group button').contains('Actions').should('be.visible');
cy.intercept('/api/method/frappe.desk.reportview.get').as('list-refresh');
+ cy.wait(3000); // wait before you hit another refresh
cy.get('button[data-original-title="Refresh"]').click();
cy.wait('@list-refresh');
cy.get('.list-row-container .list-row-checkbox:checked').should('be.visible');
diff --git a/cypress/integration/report_view.js b/cypress/integration/report_view.js
index 4bc5784a53..6e3a28bbfc 100644
--- a/cypress/integration/report_view.js
+++ b/cypress/integration/report_view.js
@@ -29,6 +29,7 @@ context('Report View', () => {
// select the cell
cell.dblclick();
cell.get('.dt-cell__edit--col-4').findByRole('checkbox').check({ force: true });
+ cy.get('.dt-row-0 > .dt-cell--col-3').click(); // click outside
cy.wait('@value-update');
@@ -70,4 +71,4 @@ context('Report View', () => {
cy.get('.list-paging-area .btn-more').click();
cy.get('.list-paging-area .list-count').should('contain.text', '1000 of');
});
-});
\ No newline at end of file
+});
diff --git a/frappe/build.py b/frappe/build.py
index 6b93b8b93a..7a06ee3a22 100644
--- a/frappe/build.py
+++ b/frappe/build.py
@@ -1,25 +1,21 @@
-# Copyright (c) 2021, Frappe Technologies Pvt. Ltd. and Contributors
+# Copyright (c) 2022, Frappe Technologies Pvt. Ltd. and Contributors
# License: MIT. See LICENSE
import os
-import re
-import json
import shutil
+import re
import subprocess
-from subprocess import getoutput
-from io import StringIO
-from tempfile import mkdtemp, mktemp
from distutils.spawn import find_executable
-
-import frappe
-from frappe.utils.minify import JavascriptMinify
+from subprocess import getoutput
+from tempfile import mkdtemp, mktemp
+from urllib.parse import urlparse
import click
import psutil
-from urllib.parse import urlparse
-from semantic_version import Version
from requests import head
from requests.exceptions import HTTPError
+from semantic_version import Version
+import frappe
timestamps = {}
app_paths = None
@@ -32,6 +28,7 @@ class AssetsNotDownloadedError(Exception):
class AssetsDontExistError(HTTPError):
pass
+
def download_file(url, prefix):
from requests import get
@@ -277,12 +274,14 @@ def check_node_executable():
click.echo(f"{warn} Please install yarn using below command and try again.\nnpm install -g yarn")
click.echo()
+
def get_node_env():
node_env = {
"NODE_OPTIONS": f"--max_old_space_size={get_safe_max_old_space_size()}"
}
return node_env
+
def get_safe_max_old_space_size():
safe_max_old_space_size = 0
try:
@@ -296,6 +295,7 @@ def get_safe_max_old_space_size():
return safe_max_old_space_size
+
def generate_assets_map():
symlinks = {}
@@ -344,7 +344,6 @@ def clear_broken_symlinks():
os.remove(path)
-
def unstrip(message: str) -> str:
"""Pads input string on the right side until the last available column in the terminal
"""
@@ -397,94 +396,6 @@ def link_assets_dir(source, target, hard_link=False):
symlink(source, target, overwrite=True)
-def build(no_compress=False, verbose=False):
- for target, sources in get_build_maps().items():
- pack(os.path.join(assets_path, target), sources, no_compress, verbose)
-
-
-def get_build_maps():
- """get all build.jsons with absolute paths"""
- # framework js and css files
-
- build_maps = {}
- for app_path in app_paths:
- path = os.path.join(app_path, "public", "build.json")
- if os.path.exists(path):
- with open(path) as f:
- try:
- for target, sources in (json.loads(f.read() or "{}")).items():
- # update app path
- source_paths = []
- for source in sources:
- if isinstance(source, list):
- s = frappe.get_pymodule_path(source[0], *source[1].split("/"))
- else:
- s = os.path.join(app_path, source)
- source_paths.append(s)
-
- build_maps[target] = source_paths
- except ValueError as e:
- print(path)
- print("JSON syntax error {0}".format(str(e)))
- return build_maps
-
-
-def pack(target, sources, no_compress, verbose):
- outtype, outtxt = target.split(".")[-1], ""
- jsm = JavascriptMinify()
-
- for f in sources:
- suffix = None
- if ":" in f:
- f, suffix = f.split(":")
- if not os.path.exists(f) or os.path.isdir(f):
- print("did not find " + f)
- continue
- timestamps[f] = os.path.getmtime(f)
- try:
- with open(f, "r") as sourcefile:
- data = str(sourcefile.read(), "utf-8", errors="ignore")
-
- extn = f.rsplit(".", 1)[1]
-
- if (
- outtype == "js"
- and extn == "js"
- and (not no_compress)
- and suffix != "concat"
- and (".min." not in f)
- ):
- tmpin, tmpout = StringIO(data.encode("utf-8")), StringIO()
- jsm.minify(tmpin, tmpout)
- minified = tmpout.getvalue()
- if minified:
- outtxt += str(minified or "", "utf-8").strip("\n") + ";"
-
- if verbose:
- print("{0}: {1}k".format(f, int(len(minified) / 1024)))
- elif outtype == "js" and extn == "html":
- # add to frappe.templates
- outtxt += html_to_js_template(f, data)
- else:
- outtxt += "\n/*\n *\t%s\n */" % f
- outtxt += "\n" + data + "\n"
-
- except Exception:
- print("--Error in:" + f + "--")
- print(frappe.get_traceback())
-
- with open(target, "w") as f:
- f.write(outtxt.encode("utf-8"))
-
- print("Wrote %s - %sk" % (target, str(int(os.path.getsize(target) / 1024))))
-
-
-def html_to_js_template(path, content):
- """returns HTML template content as Javascript code, adding it to `frappe.templates`"""
- return """frappe.templates["{key}"] = '{content}';\n""".format(
- key=path.rsplit("/", 1)[-1][:-5], content=scrub_html_template(content))
-
-
def scrub_html_template(content):
"""Returns HTML content with removed whitespace and comments"""
# remove whitespace to a single space
@@ -496,37 +407,7 @@ def scrub_html_template(content):
return content.replace("'", "\'")
-def files_dirty():
- for target, sources in get_build_maps().items():
- for f in sources:
- if ":" in f:
- f, suffix = f.split(":")
- if not os.path.exists(f) or os.path.isdir(f):
- continue
- if os.path.getmtime(f) != timestamps.get(f):
- print(f + " dirty")
- return True
- else:
- return False
-
-
-def compile_less():
- if not find_executable("lessc"):
- return
-
- for path in app_paths:
- less_path = os.path.join(path, "public", "less")
- if os.path.exists(less_path):
- for fname in os.listdir(less_path):
- if fname.endswith(".less") and fname != "variables.less":
- fpath = os.path.join(less_path, fname)
- mtime = os.path.getmtime(fpath)
- if fpath in timestamps and mtime == timestamps[fpath]:
- continue
-
- timestamps[fpath] = mtime
-
- print("compiling {0}".format(fpath))
-
- css_path = os.path.join(path, "public", "css", fname.rsplit(".", 1)[0] + ".css")
- os.system("lessc {0} > {1}".format(fpath, css_path))
+def html_to_js_template(path, content):
+ """returns HTML template content as Javascript code, adding it to `frappe.templates`"""
+ return """frappe.templates["{key}"] = '{content}';\n""".format(
+ key=path.rsplit("/", 1)[-1][:-5], content=scrub_html_template(content))
diff --git a/frappe/commands/site.py b/frappe/commands/site.py
index 62488525b0..1684f26d49 100755
--- a/frappe/commands/site.py
+++ b/frappe/commands/site.py
@@ -447,21 +447,17 @@ def disable_user(context, email):
@pass_context
def migrate(context, skip_failing=False, skip_search_index=False):
"Run patches, sync schema and rebuild files/translations"
- from frappe.migrate import migrate
+ from frappe.migrate import SiteMigration
for site in context.sites:
click.secho(f"Migrating {site}", fg="green")
- frappe.init(site=site)
- frappe.connect()
try:
- migrate(
- context.verbose,
+ SiteMigration(
skip_failing=skip_failing,
- skip_search_index=skip_search_index
- )
+ skip_search_index=skip_search_index,
+ ).run(site=site)
finally:
print()
- frappe.destroy()
if not context.sites:
raise SiteNotSpecifiedError
diff --git a/frappe/commands/utils.py b/frappe/commands/utils.py
index e3379a43aa..7246df8aa7 100644
--- a/frappe/commands/utils.py
+++ b/frappe/commands/utils.py
@@ -742,8 +742,9 @@ def run_ui_tests(context, app, headless=False, parallel=True, with_coverage=Fals
@click.option('--profile', is_flag=True, default=False)
@click.option('--noreload', "no_reload", is_flag=True, default=False)
@click.option('--nothreading', "no_threading", is_flag=True, default=False)
+@click.option('--with-coverage', is_flag=True, default=False)
@pass_context
-def serve(context, port=None, profile=False, no_reload=False, no_threading=False, sites_path='.', site=None):
+def serve(context, port=None, profile=False, no_reload=False, no_threading=False, sites_path='.', site=None, with_coverage=False):
"Start development web server"
import frappe.app
@@ -751,8 +752,12 @@ def serve(context, port=None, profile=False, no_reload=False, no_threading=False
site = None
else:
site = context.sites[0]
-
- frappe.app.serve(port=port, profile=profile, no_reload=no_reload, no_threading=no_threading, site=site, sites_path='.')
+ with CodeCoverage(with_coverage, 'frappe'):
+ if with_coverage:
+ # unable to track coverage with threading enabled
+ no_threading = True
+ no_reload = True
+ frappe.app.serve(port=port, profile=profile, no_reload=no_reload, no_threading=no_threading, site=site, sites_path='.')
@click.command('request')
diff --git a/frappe/core/doctype/doctype/doctype.py b/frappe/core/doctype/doctype/doctype.py
index 6d0409521e..dca0a05281 100644
--- a/frappe/core/doctype/doctype/doctype.py
+++ b/frappe/core/doctype/doctype/doctype.py
@@ -786,9 +786,10 @@ def validate_links_table_fieldnames(meta):
fieldnames = tuple(field.fieldname for field in meta.fields)
for index, link in enumerate(meta.links, 1):
- link_meta = frappe.get_meta(link.link_doctype)
- if not link_meta.get_field(link.link_fieldname):
- message = _("Document Links Row #{0}: Could not find field {1} in {2} DocType").format(index, frappe.bold(link.link_fieldname), frappe.bold(link.link_doctype))
+ if not frappe.get_meta(link.link_doctype).has_field(link.link_fieldname):
+ message = _("Document Links Row #{0}: Could not find field {1} in {2} DocType").format(
+ index, frappe.bold(link.link_fieldname), frappe.bold(link.link_doctype)
+ )
frappe.throw(message, InvalidFieldNameError, _("Invalid Fieldname"))
if not link.is_child_table:
@@ -802,8 +803,15 @@ def validate_links_table_fieldnames(meta):
message = _("Document Links Row #{0}: Table Fieldname is mandatory for internal links").format(index)
frappe.throw(message, frappe.ValidationError, _("Table Fieldname Missing"))
- if link.table_fieldname not in fieldnames:
- message = _("Document Links Row #{0}: Could not find field {1} in {2} DocType").format(index, frappe.bold(link.table_fieldname), frappe.bold(meta.name))
+ if meta.name == link.parent_doctype:
+ field_exists = link.table_fieldname in fieldnames
+ else:
+ field_exists = frappe.get_meta(link.parent_doctype).has_field(link.table_fieldname)
+
+ if not field_exists:
+ message = _("Document Links Row #{0}: Could not find field {1} in {2} DocType").format(
+ index, frappe.bold(link.table_fieldname), frappe.bold(meta.name)
+ )
frappe.throw(message, frappe.ValidationError, _("Invalid Table Fieldname"))
def validate_fields_for_doctype(doctype):
diff --git a/frappe/core/doctype/doctype/test_doctype.py b/frappe/core/doctype/doctype/test_doctype.py
index 50882f51bd..9b4f733e7d 100644
--- a/frappe/core/doctype/doctype/test_doctype.py
+++ b/frappe/core/doctype/doctype/test_doctype.py
@@ -498,6 +498,13 @@ class TestDocType(unittest.TestCase):
self.assertEqual(doc.is_virtual, 1)
self.assertFalse(frappe.db.table_exists('Test Virtual Doctype'))
+ def test_default_fieldname(self):
+ fields = [{"label": "title", "fieldname": "title", "fieldtype": "Data", "default": "{some_fieldname}"}]
+ dt = new_doctype("DT with default field", fields=fields)
+ dt.insert()
+
+ dt.delete()
+
def new_doctype(name, unique=0, depends_on='', fields=None):
doc = frappe.get_doc({
"doctype": "DocType",
diff --git a/frappe/core/doctype/report/test_report.py b/frappe/core/doctype/report/test_report.py
index 5a22304f32..bf63afa5c5 100644
--- a/frappe/core/doctype/report/test_report.py
+++ b/frappe/core/doctype/report/test_report.py
@@ -3,7 +3,7 @@
import frappe, json, os
import unittest
-from frappe.desk.query_report import run, save_report
+from frappe.desk.query_report import run, save_report, add_total_row
from frappe.desk.reportview import delete_report, save_report as _save_report
from frappe.custom.doctype.customize_form.customize_form import reset_customization
from frappe.core.doctype.user_permission.test_user_permission import create_user
@@ -282,3 +282,55 @@ result = [
# Set user back to administrator
frappe.set_user('Administrator')
+
+ def test_add_total_row_for_tree_reports(self):
+ report_settings = {
+ 'tree': True,
+ 'parent_field': 'parent_value'
+ }
+
+ columns = [
+ {
+ "fieldname": "parent_column",
+ "label": "Parent Column",
+ "fieldtype": "Data",
+ "width": 10
+ },
+ {
+ "fieldname": "column_1",
+ "label": "Column 1",
+ "fieldtype": "Float",
+ "width": 10
+ },
+ {
+ "fieldname": "column_2",
+ "label": "Column 2",
+ "fieldtype": "Float",
+ "width": 10
+ }
+ ]
+
+ result = [
+ {
+ "parent_column": "Parent 1",
+ "column_1": 200,
+ "column_2": 150.50
+ },
+ {
+ "parent_column": "Child 1",
+ "column_1": 100,
+ "column_2": 75.25,
+ "parent_value": "Parent 1"
+ },
+ {
+ "parent_column": "Child 2",
+ "column_1": 100,
+ "column_2": 75.25,
+ "parent_value": "Parent 1"
+ }
+ ]
+
+ result = add_total_row(result, columns, meta=None, report_settings=report_settings)
+ self.assertEqual(result[-1][0], "Total")
+ self.assertEqual(result[-1][1], 200)
+ self.assertEqual(result[-1][2], 150.50)
diff --git a/frappe/coverage.py b/frappe/coverage.py
index 1969cae141..5f89800deb 100644
--- a/frappe/coverage.py
+++ b/frappe/coverage.py
@@ -29,6 +29,7 @@ FRAPPE_EXCLUSIONS = [
"*/commands/*",
"*/frappe/change_log/*",
"*/frappe/exceptions*",
+ "*/frappe/coverage.py",
"*frappe/setup.py",
"*/doctype/*/*_dashboard.py",
"*/patches/*",
diff --git a/frappe/custom/doctype/customize_form/test_customize_form.py b/frappe/custom/doctype/customize_form/test_customize_form.py
index 0fe39e0008..d131f06127 100644
--- a/frappe/custom/doctype/customize_form/test_customize_form.py
+++ b/frappe/custom/doctype/customize_form/test_customize_form.py
@@ -257,7 +257,7 @@ class TestCustomizeForm(unittest.TestCase):
frappe.clear_cache()
d = self.get_customize_form("User Group")
- d.append('links', dict(link_doctype='User Group Member', parent_doctype='User',
+ d.append('links', dict(link_doctype='User Group Member', parent_doctype='User Group',
link_fieldname='user', table_fieldname='user_group_members', group='Tests', custom=1))
d.run_method("save_customization")
@@ -267,7 +267,7 @@ class TestCustomizeForm(unittest.TestCase):
# check links exist
self.assertTrue([d.name for d in user_group.links if d.link_doctype == 'User Group Member'])
- self.assertTrue([d.name for d in user_group.links if d.parent_doctype == 'User'])
+ self.assertTrue([d.name for d in user_group.links if d.parent_doctype == 'User Group'])
# remove the link
d = self.get_customize_form("User Group")
diff --git a/frappe/database/database.py b/frappe/database/database.py
index c833bdeed3..dc9f20d8c2 100644
--- a/frappe/database/database.py
+++ b/frappe/database/database.py
@@ -584,7 +584,7 @@ class Database(object):
company = frappe.db.get_single_value('Global Defaults', 'default_company')
"""
- if not doctype in self.value_cache:
+ if doctype not in self.value_cache:
self.value_cache[doctype] = {}
if cache and fieldname in self.value_cache[doctype]:
diff --git a/frappe/database/postgres/schema.py b/frappe/database/postgres/schema.py
index 9487bc2fa7..bb7ff20a26 100644
--- a/frappe/database/postgres/schema.py
+++ b/frappe/database/postgres/schema.py
@@ -5,29 +5,29 @@ from frappe.database.schema import DBTable, get_definition
class PostgresTable(DBTable):
def create(self):
- add_text = ""
+ varchar_len = frappe.db.VARCHAR_LEN
+ additional_definitions = ""
# columns
column_defs = self.get_column_definitions()
if column_defs:
- add_text += ",\n".join(column_defs)
+ additional_definitions += ",\n".join(column_defs)
# child table columns
if self.meta.get("istable") or 0:
if column_defs:
- add_text += ",\n"
+ additional_definitions += ",\n"
- add_text += ",\n".join(
+ additional_definitions += ",\n".join(
(
- "parent varchar({varchar_len})",
- "parentfield varchar({varchar_len})",
- "parenttype varchar({varchar_len})"
+ f"parent varchar({varchar_len})",
+ f"parentfield varchar({varchar_len})",
+ f"parenttype varchar({varchar_len})",
)
)
- # TODO: set docstatus length
# create table
- frappe.db.sql(("""create table `%s` (
+ frappe.db.sql(f"""create table `{self.table_name}` (
name varchar({varchar_len}) not null primary key,
creation timestamp(6),
modified timestamp(6),
@@ -35,7 +35,9 @@ class PostgresTable(DBTable):
owner varchar({varchar_len}),
docstatus smallint not null default '0',
idx bigint not null default '0',
- %s)""" % (self.table_name, add_text)).format(varchar_len=frappe.db.VARCHAR_LEN))
+ {additional_definitions}
+ )"""
+ )
self.create_indexes()
frappe.db.commit()
diff --git a/frappe/desk/form/meta.py b/frappe/desk/form/meta.py
index b91dd3d481..fa6a1f313b 100644
--- a/frappe/desk/form/meta.py
+++ b/frappe/desk/form/meta.py
@@ -12,6 +12,15 @@ from frappe.translate import extract_messages_from_code, make_dict_from_messages
from frappe.utils import get_html_format
+ASSET_KEYS = (
+ "__js", "__css", "__list_js", "__calendar_js", "__map_js",
+ "__linked_with", "__messages", "__print_formats", "__workflow_docs",
+ "__form_grid_templates", "__listview_template", "__tree_js",
+ "__dashboard", "__kanban_column_fields", '__templates',
+ '__custom_js', '__custom_list_js'
+)
+
+
def get_meta(doctype, cached=True):
# don't cache for developer mode as js files, templates may be edited
if cached and not frappe.conf.developer_mode:
@@ -34,6 +43,12 @@ class FormMeta(Meta):
super(FormMeta, self).__init__(doctype)
self.load_assets()
+ def set(self, key, value, *args, **kwargs):
+ if key in ASSET_KEYS:
+ self.__dict__[key] = value
+ else:
+ super(FormMeta, self).set(key, value, *args, **kwargs)
+
def load_assets(self):
if self.get('__assets_loaded', False):
return
@@ -55,11 +70,7 @@ class FormMeta(Meta):
def as_dict(self, no_nulls=False):
d = super(FormMeta, self).as_dict(no_nulls=no_nulls)
- for k in ("__js", "__css", "__list_js", "__calendar_js", "__map_js",
- "__linked_with", "__messages", "__print_formats", "__workflow_docs",
- "__form_grid_templates", "__listview_template", "__tree_js",
- "__dashboard", "__kanban_column_fields", '__templates',
- '__custom_js', '__custom_list_js'):
+ for k in ASSET_KEYS:
d[k] = self.get(k)
# d['fields'] = d.get('fields', [])
@@ -172,7 +183,7 @@ class FormMeta(Meta):
WHERE doc_type=%s AND docstatus<2 and disabled=0""", (self.name,), as_dict=1,
update={"doctype":"Print Format"})
- self.set("__print_formats", print_formats, as_value=True)
+ self.set("__print_formats", print_formats)
def load_workflows(self):
# get active workflow
@@ -186,7 +197,7 @@ class FormMeta(Meta):
for d in workflow.get("states"):
workflow_docs.append(frappe.get_doc("Workflow State", d.state))
- self.set("__workflow_docs", workflow_docs, as_value=True)
+ self.set("__workflow_docs", workflow_docs)
def load_templates(self):
@@ -208,7 +219,7 @@ class FormMeta(Meta):
for content in self.get("__form_grid_templates").values():
messages = extract_messages_from_code(content)
messages = make_dict_from_messages(messages)
- self.get("__messages").update(messages, as_value=True)
+ self.get("__messages").update(messages)
def load_dashboard(self):
self.set('__dashboard', self.get_dashboard_data())
@@ -224,7 +235,7 @@ class FormMeta(Meta):
fields = [x['field_name'] for x in values]
fields = list(set(fields))
- self.set("__kanban_column_fields", fields, as_value=True)
+ self.set("__kanban_column_fields", fields)
except frappe.PermissionError:
# no access to kanban board
pass
diff --git a/frappe/desk/query_report.py b/frappe/desk/query_report.py
index 97bceeb725..9ed956e986 100644
--- a/frappe/desk/query_report.py
+++ b/frappe/desk/query_report.py
@@ -73,7 +73,7 @@ def get_report_result(report, filters):
return res
@frappe.read_only()
-def generate_report_result(report, filters=None, user=None, custom_columns=None):
+def generate_report_result(report, filters=None, user=None, custom_columns=None, report_settings=None):
user = user or frappe.session.user
filters = filters or []
@@ -108,7 +108,7 @@ def generate_report_result(report, filters=None, user=None, custom_columns=None)
result = get_filtered_data(report.ref_doctype, columns, result, user)
if cint(report.add_total_row) and result and not skip_total_row:
- result = add_total_row(result, columns)
+ result = add_total_row(result, columns, report_settings=report_settings)
return {
"result": result,
@@ -210,7 +210,7 @@ def get_script(report_name):
@frappe.whitelist()
@frappe.read_only()
-def run(report_name, filters=None, user=None, ignore_prepared_report=False, custom_columns=None):
+def run(report_name, filters=None, user=None, ignore_prepared_report=False, custom_columns=None, report_settings=None):
report = get_report_doc(report_name)
if not user:
user = frappe.session.user
@@ -238,7 +238,7 @@ def run(report_name, filters=None, user=None, ignore_prepared_report=False, cust
dn = ""
result = get_prepared_report_result(report, filters, dn, user)
else:
- result = generate_report_result(report, filters, user, custom_columns)
+ result = generate_report_result(report, filters, user, custom_columns, report_settings)
result["add_total_row"] = report.add_total_row and not result.get(
"skip_total_row", False
@@ -435,9 +435,19 @@ def build_xlsx_data(columns, data, visible_idx, include_indentation, ignore_visi
return result, column_widths
-def add_total_row(result, columns, meta=None):
+def add_total_row(result, columns, meta=None, report_settings=None):
total_row = [""] * len(columns)
has_percent = []
+ is_tree = False
+ parent_field = ''
+
+ if report_settings:
+ if isinstance(report_settings, (str,)):
+ report_settings = json.loads(report_settings)
+
+ is_tree = report_settings.get('tree')
+ parent_field = report_settings.get('parent_field')
+
for i, col in enumerate(columns):
fieldtype, options, fieldname = None, None, None
if isinstance(col, str):
@@ -464,12 +474,12 @@ def add_total_row(result, columns, meta=None):
for row in result:
if i >= len(row):
continue
-
cell = row.get(fieldname) if isinstance(row, dict) else row[i]
if fieldtype in ["Currency", "Int", "Float", "Percent", "Duration"] and flt(
cell
):
- total_row[i] = flt(total_row[i]) + flt(cell)
+ if not (is_tree and row.get(parent_field)):
+ total_row[i] = flt(total_row[i]) + flt(cell)
if fieldtype == "Percent" and i not in has_percent:
has_percent.append(i)
diff --git a/frappe/desk/reportview.py b/frappe/desk/reportview.py
index b0e1f901aa..1ec8ede62e 100644
--- a/frappe/desk/reportview.py
+++ b/frappe/desk/reportview.py
@@ -533,7 +533,8 @@ def get_stats(stats, doctype, filters=None):
columns = []
for tag in tags:
- if not tag in columns: continue
+ if tag not in columns:
+ continue
try:
tag_count = frappe.get_list(doctype,
fields=[tag, "count(*)"],
@@ -612,7 +613,7 @@ def scrub_user_tags(tagcount):
alltags = t.split(',')
for tag in alltags:
if tag:
- if not tag in rdict:
+ if tag not in rdict:
rdict[tag] = 0
rdict[tag] += tagdict[t]
diff --git a/frappe/desk/treeview.py b/frappe/desk/treeview.py
index 7e3efb5d48..5e8fb18fe4 100644
--- a/frappe/desk/treeview.py
+++ b/frappe/desk/treeview.py
@@ -15,7 +15,7 @@ def get_all_nodes(doctype, label, parent, tree_method, **filters):
tree_method = frappe.get_attr(tree_method)
- if not tree_method in frappe.whitelisted:
+ if tree_method not in frappe.whitelisted:
frappe.throw(_("Not Permitted"), frappe.PermissionError)
data = tree_method(doctype, parent, **filters)
diff --git a/frappe/installer.py b/frappe/installer.py
index d892ff4ddc..20db451d26 100644
--- a/frappe/installer.py
+++ b/frappe/installer.py
@@ -184,7 +184,7 @@ def install_app(name, verbose=False, set_as_patched=True):
def add_to_installed_apps(app_name, rebuild_website=True):
installed_apps = frappe.get_installed_apps()
- if not app_name in installed_apps:
+ if app_name not in installed_apps:
installed_apps.append(app_name)
frappe.db.set_global("installed_apps", json.dumps(installed_apps))
frappe.db.commit()
@@ -529,10 +529,9 @@ def extract_sql_gzip(sql_gz_path):
import subprocess
try:
- # dvf - decompress, verbose, force
original_file = sql_gz_path
decompressed_file = original_file.rstrip(".gz")
- cmd = 'gzip -dvf < {0} > {1}'.format(original_file, decompressed_file)
+ cmd = 'gzip --decompress --force < {0} > {1}'.format(original_file, decompressed_file)
subprocess.check_call(cmd, shell=True)
except Exception:
raise
diff --git a/frappe/integrations/doctype/ldap_settings/ldap_settings.py b/frappe/integrations/doctype/ldap_settings/ldap_settings.py
index 7c9c64ba3c..3d29feebac 100644
--- a/frappe/integrations/doctype/ldap_settings/ldap_settings.py
+++ b/frappe/integrations/doctype/ldap_settings/ldap_settings.py
@@ -45,8 +45,8 @@ class LDAPSettings(Document):
title=_("Misconfigured"))
if self.ldap_directory_server.lower() == 'custom':
- if not self.ldap_group_member_attribute or not self.ldap_group_mappings_section:
- frappe.throw(_("Custom LDAP Directoy Selected, please ensure 'LDAP Group Member attribute' and 'LDAP Group Mappings' are entered"),
+ if not self.ldap_group_member_attribute or not self.ldap_group_objectclass:
+ frappe.throw(_("Custom LDAP Directoy Selected, please ensure 'LDAP Group Member attribute' and 'Group Object Class' are entered"),
title=_("Misconfigured"))
else:
diff --git a/frappe/migrate.py b/frappe/migrate.py
index d13fe858f7..eabd0ff3e0 100644
--- a/frappe/migrate.py
+++ b/frappe/migrate.py
@@ -1,30 +1,54 @@
-# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
+# Copyright (c) 2022, Frappe Technologies Pvt. Ltd. and Contributors
# License: MIT. See LICENSE
import json
import os
-import sys
+from textwrap import dedent
+
import frappe
-import frappe.translate
-import frappe.modules.patch_handler
import frappe.model.sync
-from frappe.utils.fixtures import sync_fixtures
+import frappe.modules.patch_handler
+import frappe.translate
+from frappe.cache_manager import clear_global_cache
+from frappe.core.doctype.language.language import sync_languages
+from frappe.core.doctype.scheduled_job_type.scheduled_job_type import sync_jobs
+from frappe.database.schema import add_column
+from frappe.desk.notifications import clear_notifications
+from frappe.modules.patch_handler import PatchType
+from frappe.modules.utils import sync_customizations
+from frappe.search.website_search import build_index_for_all_routes
from frappe.utils.connections import check_connection
from frappe.utils.dashboard import sync_dashboards
-from frappe.cache_manager import clear_global_cache
-from frappe.desk.notifications import clear_notifications
+from frappe.utils.fixtures import sync_fixtures
from frappe.website.utils import clear_website_cache
-from frappe.core.doctype.language.language import sync_languages
-from frappe.modules.utils import sync_customizations
-from frappe.core.doctype.scheduled_job_type.scheduled_job_type import sync_jobs
-from frappe.search.website_search import build_index_for_all_routes
-from frappe.database.schema import add_column
-from frappe.modules.patch_handler import PatchType
+
+BENCH_START_MESSAGE = dedent(
+ """
+ Cannot run bench migrate without the services running.
+ If you are running bench in development mode, make sure that bench is running:
+
+ $ bench start
+
+ Otherwise, check the server logs and ensure that all the required services are running.
+ """
+)
+def atomic(method):
+ def wrapper(*args, **kwargs):
+ try:
+ ret = method(*args, **kwargs)
+ frappe.db.commit()
+ return ret
+ except Exception:
+ frappe.db.rollback()
+ raise
-def migrate(verbose=True, skip_failing=False, skip_search_index=False):
- '''Migrate all apps to the current version, will:
+ return wrapper
+
+
+class SiteMigration:
+ """Migrate all apps to the current version, will:
- run before migrate hooks
- run patches
- sync doctypes (schema)
@@ -35,70 +59,117 @@ def migrate(verbose=True, skip_failing=False, skip_search_index=False):
- sync languages
- sync web pages (from /www)
- run after migrate hooks
- '''
+ """
- service_status = check_connection(redis_services=["redis_cache"])
- if False in service_status.values():
- for service in service_status:
- if not service_status.get(service, True):
- print("{} service is not running.".format(service))
- print("""Cannot run bench migrate without the services running.
-If you are running bench in development mode, make sure that bench is running:
+ def __init__(self, skip_failing: bool = False, skip_search_index: bool = False) -> None:
+ self.skip_failing = skip_failing
+ self.skip_search_index = skip_search_index
-$ bench start
-
-Otherwise, check the server logs and ensure that all the required services are running.""")
- sys.exit(1)
-
- touched_tables_file = frappe.get_site_path('touched_tables.json')
- if os.path.exists(touched_tables_file):
- os.remove(touched_tables_file)
-
- try:
- add_column(doctype="DocType", column_name="migration_hash", fieldtype="Data")
+ def setUp(self):
+ """Complete setup required for site migration
+ """
frappe.flags.touched_tables = set()
- frappe.flags.in_migrate = True
-
+ self.touched_tables_file = frappe.get_site_path("touched_tables.json")
+ add_column(doctype="DocType", column_name="migration_hash", fieldtype="Data")
clear_global_cache()
+ if os.path.exists(self.touched_tables_file):
+ os.remove(self.touched_tables_file)
+
+ frappe.flags.in_migrate = True
+
+ def tearDown(self):
+ """Run operations that should be run post schema updation processes
+ This should be executed irrespective of outcome
+ """
+ frappe.translate.clear_cache()
+ clear_website_cache()
+ clear_notifications()
+
+ with open(self.touched_tables_file, "w") as f:
+ json.dump(list(frappe.flags.touched_tables), f, sort_keys=True, indent=4)
+
+ if not self.skip_search_index:
+ print(f"Building search index for {frappe.local.site}")
+ build_index_for_all_routes()
+
+ frappe.publish_realtime("version-update")
+ frappe.flags.touched_tables.clear()
+ frappe.flags.in_migrate = False
+
+ @atomic
+ def pre_schema_updates(self):
+ """Executes `before_migrate` hooks
+ """
for app in frappe.get_installed_apps():
- for fn in frappe.get_hooks('before_migrate', app_name=app):
+ for fn in frappe.get_hooks("before_migrate", app_name=app):
frappe.get_attr(fn)()
- frappe.modules.patch_handler.run_all(skip_failing=skip_failing, patch_type=PatchType.pre_model_sync)
+ @atomic
+ def run_schema_updates(self):
+ """Run patches as defined in patches.txt, sync schema changes as defined in the {doctype}.json files
+ """
+ frappe.modules.patch_handler.run_all(skip_failing=self.skip_failing, patch_type=PatchType.pre_model_sync)
frappe.model.sync.sync_all()
- frappe.modules.patch_handler.run_all(skip_failing=skip_failing, patch_type=PatchType.post_model_sync)
- frappe.translate.clear_cache()
+ frappe.modules.patch_handler.run_all(skip_failing=self.skip_failing, patch_type=PatchType.post_model_sync)
+
+ @atomic
+ def post_schema_updates(self):
+ """Execute pending migration tasks post patches execution & schema sync
+ This includes:
+ * Sync `Scheduled Job Type` and scheduler events defined in hooks
+ * Sync fixtures & custom scripts
+ * Sync in-Desk Module Dashboards
+ * Sync customizations: Custom Fields, Property Setters, Custom Permissions
+ * Sync Frappe's internal language master
+ * Sync Portal Menu Items
+ * Sync Installed Applications Version History
+ * Execute `after_migrate` hooks
+ """
sync_jobs()
sync_fixtures()
sync_dashboards()
sync_customizations()
sync_languages()
- frappe.get_doc('Portal Settings', 'Portal Settings').sync_menu()
-
- # syncs static files
- clear_website_cache()
-
- # updating installed applications data
- frappe.get_single('Installed Applications').update_versions()
+ frappe.get_single("Portal Settings").sync_menu()
+ frappe.get_single("Installed Applications").update_versions()
for app in frappe.get_installed_apps():
- for fn in frappe.get_hooks('after_migrate', app_name=app):
+ for fn in frappe.get_hooks("after_migrate", app_name=app):
frappe.get_attr(fn)()
- if not skip_search_index:
- # Run this last as it updates the current session
- print('Building search index for {}'.format(frappe.local.site))
- build_index_for_all_routes()
+ def required_services_running(self) -> bool:
+ """Returns True if all required services are running. Returns False and prints
+ instructions to stdout when required services are not available.
+ """
+ service_status = check_connection(redis_services=["redis_cache"])
+ are_services_running = all(service_status.values())
- frappe.db.commit()
+ if not are_services_running:
+ for service in service_status:
+ if not service_status.get(service, True):
+ print(f"Service {service} is not running.")
+ print(BENCH_START_MESSAGE)
- clear_notifications()
+ return are_services_running
- frappe.publish_realtime("version-update")
- frappe.flags.in_migrate = False
- finally:
- with open(touched_tables_file, 'w') as f:
- json.dump(list(frappe.flags.touched_tables), f, sort_keys=True, indent=4)
- frappe.flags.touched_tables.clear()
+ def run(self, site: str):
+ """Run Migrate operation on site specified. This method initializes
+ and destroys connections to the site database.
+ """
+ if not self.required_services_running():
+ raise SystemExit(1)
+
+ if site:
+ frappe.init(site=site)
+ frappe.connect()
+
+ self.setUp()
+ try:
+ self.pre_schema_updates()
+ self.run_schema_updates()
+ finally:
+ self.post_schema_updates()
+ self.tearDown()
+ frappe.destroy()
diff --git a/frappe/model/base_document.py b/frappe/model/base_document.py
index 013af4530c..8a81aa5610 100644
--- a/frappe/model/base_document.py
+++ b/frappe/model/base_document.py
@@ -33,13 +33,12 @@ def get_controller(doctype):
module_name, custom = frappe.db.get_value(
"DocType", doctype, ("module", "custom"), cache=True
- ) or ["Core", False]
+ ) or ("Core", False)
if custom:
- if frappe.db.field_exists("DocType", "is_tree"):
- is_tree = frappe.db.get_value("DocType", doctype, "is_tree", cache=True)
- else:
- is_tree = False
+ is_tree = frappe.db.get_value(
+ "DocType", doctype, "is_tree", ignore=True, cache=True
+ )
_class = NestedSet if is_tree else Document
else:
class_overrides = frappe.get_hooks('override_doctype_class')
@@ -116,14 +115,18 @@ class BaseDocument(object):
return self
def update_if_missing(self, d):
+ """Set default values for fields without existing values"""
if isinstance(d, BaseDocument):
d = d.get_valid_dict()
- if "doctype" in d:
- self.set("doctype", d.get("doctype"))
for key, value in d.items():
- # dont_update_if_missing is a list of fieldnames, for which, you don't want to set default value
- if (self.get(key) is None) and (value is not None) and (key not in self.dont_update_if_missing):
+ if (
+ value is not None
+ and self.get(key) is None
+ # dont_update_if_missing is a list of fieldnames
+ # for which you don't want to set default value
+ and key not in self.dont_update_if_missing
+ ):
self.set(key, value)
def get_db_value(self, key):
diff --git a/frappe/model/db_query.py b/frappe/model/db_query.py
index 79be261981..a6b96e8fb5 100644
--- a/frappe/model/db_query.py
+++ b/frappe/model/db_query.py
@@ -330,7 +330,7 @@ class DatabaseQuery(object):
table_name = table_name[7:]
if not table_name[0]=='`':
table_name = f"`{table_name}`"
- if not table_name in self.tables:
+ if table_name not in self.tables:
self.append_table(table_name)
def append_table(self, table_name):
@@ -428,7 +428,7 @@ class DatabaseQuery(object):
f = get_filter(self.doctype, f, additional_filters_config)
tname = ('`tab' + f.doctype + '`')
- if not tname in self.tables:
+ if tname not in self.tables:
self.append_table(tname)
if 'ifnull(' in f.fieldname:
diff --git a/frappe/model/rename_doc.py b/frappe/model/rename_doc.py
index 6ffaadc5eb..d825261617 100644
--- a/frappe/model/rename_doc.py
+++ b/frappe/model/rename_doc.py
@@ -307,7 +307,7 @@ def get_link_fields(doctype):
if not frappe.flags.link_fields:
frappe.flags.link_fields = {}
- if not doctype in frappe.flags.link_fields:
+ if doctype not in frappe.flags.link_fields:
link_fields = frappe.db.sql("""\
select parent, fieldname,
(select issingle from tabDocType dt
diff --git a/frappe/model/sync.py b/frappe/model/sync.py
index 9ba14d5e68..109260d0fe 100644
--- a/frappe/model/sync.py
+++ b/frappe/model/sync.py
@@ -117,7 +117,7 @@ def get_doc_files(files, start_path):
if os.path.isdir(os.path.join(doctype_path, docname)):
doc_path = os.path.join(doctype_path, docname, docname) + ".json"
if os.path.exists(doc_path):
- if not doc_path in files:
+ if doc_path not in files:
files.append(doc_path)
return files
diff --git a/frappe/public/js/frappe/form/controls/date.js b/frappe/public/js/frappe/form/controls/date.js
index 7ad1887d62..48f4f3b5ee 100644
--- a/frappe/public/js/frappe/form/controls/date.js
+++ b/frappe/public/js/frappe/form/controls/date.js
@@ -158,8 +158,10 @@ frappe.ui.form.ControlDate = class ControlDate extends frappe.ui.form.ControlDat
return value;
}
get_df_options() {
+ let df_options = this.df.options;
+ if (!df_options) return {};
+
let options = {};
- let df_options = this.df.options || '';
if (typeof df_options === 'string') {
try {
options = JSON.parse(df_options);
diff --git a/frappe/public/js/frappe/form/form.js b/frappe/public/js/frappe/form/form.js
index 53e86b9cde..a11ddce520 100644
--- a/frappe/public/js/frappe/form/form.js
+++ b/frappe/public/js/frappe/form/form.js
@@ -334,7 +334,7 @@ frappe.ui.form.Form = class FrappeForm {
this.doc = frappe.get_doc(this.doctype, this.docname);
// check permissions
- if(!this.has_read_permission()) {
+ if (!this.has_read_permission()) {
frappe.show_not_permitted(__(this.doctype) + " " + __(this.docname));
return;
}
@@ -1511,7 +1511,9 @@ frappe.ui.form.Form = class FrappeForm {
// update child doc
opts.child = locals[opts.child.doctype][opts.child.name];
- var std_field_list = ["doctype"].concat(frappe.model.std_fields_list);
+ var std_field_list = ["doctype"]
+ .concat(frappe.model.std_fields_list)
+ .concat(frappe.model.child_table_field_list);
for (var key in r.message) {
if (std_field_list.indexOf(key)===-1) {
opts.child[key] = r.message[key];
@@ -1662,23 +1664,17 @@ frappe.ui.form.Form = class FrappeForm {
// make new doctype from the current form
// will handover to `make_methods` if defined
// or will create and match link fields
- var me = this;
+ let me = this;
if(this.make_methods && this.make_methods[doctype]) {
return this.make_methods[doctype](this);
} else if(this.custom_make_buttons && this.custom_make_buttons[doctype]) {
this.custom_buttons[__(this.custom_make_buttons[doctype])].trigger('click');
} else {
frappe.model.with_doctype(doctype, function() {
- var new_doc = frappe.model.get_new_doc(doctype);
+ let new_doc = frappe.model.get_new_doc(doctype, null, null, true);
// set link fields (if found)
- frappe.get_meta(doctype).fields.forEach(function(df) {
- if(df.fieldtype==='Link' && df.options===me.doctype) {
- new_doc[df.fieldname] = me.doc.name;
- } else if (['Link', 'Dynamic Link'].includes(df.fieldtype) && me.doc[df.fieldname]) {
- new_doc[df.fieldname] = me.doc[df.fieldname];
- }
- });
+ me.set_link_field(doctype, new_doc);
frappe.ui.form.make_quick_entry(doctype, null, null, new_doc);
// frappe.set_route('Form', doctype, new_doc.name);
@@ -1686,6 +1682,20 @@ frappe.ui.form.Form = class FrappeForm {
}
}
+ set_link_field(doctype, new_doc) {
+ let me = this;
+ frappe.get_meta(doctype).fields.forEach(function(df) {
+ if (df.fieldtype === 'Link' && df.options === me.doctype) {
+ new_doc[df.fieldname] = me.doc.name;
+ } else if (['Link', 'Dynamic Link'].includes(df.fieldtype) && me.doc[df.fieldname]) {
+ new_doc[df.fieldname] = me.doc[df.fieldname];
+ } else if (df.fieldtype === 'Table' && df.options && df.reqd) {
+ let row = new_doc[df.fieldname][0];
+ me.set_link_field(df.options, row);
+ }
+ });
+ }
+
update_in_all_rows(table_fieldname, fieldname, value) {
// update the child value in all tables where it is missing
if(!value) return;
diff --git a/frappe/public/js/frappe/form/grid.js b/frappe/public/js/frappe/form/grid.js
index 11fda3c8b0..ea90387922 100644
--- a/frappe/public/js/frappe/form/grid.js
+++ b/frappe/public/js/frappe/form/grid.js
@@ -746,7 +746,7 @@ export default class Grid {
var df = this.visible_columns[i][0];
var colsize = this.visible_columns[i][1];
if (colsize > 1 && colsize < 11
- && !in_list(frappe.model.std_fields_list, df.fieldname)) {
+ && frappe.model.is_non_std_field(df.fieldname)) {
if (passes < 3 && ["Int", "Currency", "Float", "Check", "Percent"].indexOf(df.fieldtype) !== -1) {
// don't increase col size of these fields in first 3 passes
diff --git a/frappe/public/js/frappe/form/grid_row.js b/frappe/public/js/frappe/form/grid_row.js
index a40f428969..ec89d26213 100644
--- a/frappe/public/js/frappe/form/grid_row.js
+++ b/frappe/public/js/frappe/form/grid_row.js
@@ -5,11 +5,7 @@ export default class GridRow {
this.on_grid_fields_dict = {};
this.on_grid_fields = [];
$.extend(this, opts);
- if (this.doc && this.parent_df.options) {
- frappe.meta.make_docfield_copy_for(this.parent_df.options, this.doc.name, this.docfields);
- const docfields = frappe.meta.get_docfields(this.parent_df.options, this.doc.name);
- this.docfields = docfields.length ? docfields : opts.docfields;
- }
+ this.set_docfields();
this.columns = {};
this.columns_list = [];
this.row_check_html = '';
@@ -41,6 +37,22 @@ export default class GridRow {
this.set_data();
}
}
+
+ set_docfields(update=false) {
+ if (this.doc && this.parent_df.options) {
+ frappe.meta.make_docfield_copy_for(this.parent_df.options, this.doc.name, this.docfields);
+ const docfields = frappe.meta.get_docfields(this.parent_df.options, this.doc.name);
+ if (update) {
+ // to maintain references
+ this.docfields.forEach(df => {
+ Object.assign(df, docfields.find(d => d.fieldname === df.fieldname));
+ });
+ } else {
+ this.docfields = docfields;
+ }
+ }
+ }
+
set_data() {
this.wrapper.data({
"doc": this.doc
@@ -148,6 +160,11 @@ export default class GridRow {
}, __('Move To'), 'Update');
}
refresh() {
+ // update docfields for new record
+ if (this.frm && this.doc && this.doc.__islocal) {
+ this.set_docfields(true);
+ }
+
if(this.frm && this.doc) {
this.doc = locals[this.doc.doctype][this.doc.name];
}
@@ -323,7 +340,7 @@ export default class GridRow {
+ ${__('Add / Remove Columns')} @@ -403,10 +420,10 @@ export default class GridRow { data-label='${docfield.label}' data-type='${docfield.fieldtype}'>