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

Merge branch 'develop' into fetch_from_fix

Browse source
This commit is contained in:
Shariq Ansari 2023-07-11 18:23:37 +05:30 • committed by GitHub
commit dd97f76e57
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 15 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
frappe/core/doctype/doctype/doctype.py
View file

@ -1496,6 +1496,7 @@ def get_fields_not_allowed_in_list_view(meta) -> list[str]:
not_allowed_in_list_view.append("Attach Image")
if meta.istable:
not_allowed_in_list_view.remove("Button")
not_allowed_in_list_view.remove("HTML")
return not_allowed_in_list_view

13
frappe/desk/doctype/console_log/console_log.json
View file

@ -6,8 +6,7 @@
"editable_grid": 1,
"engine": "InnoDB",
"field_order": [
"script",
"output"
"script"
],
"fields": [
{
@ -16,20 +15,15 @@
"in_list_view": 1,
"label": "Script",
"read_only": 1
},
{
"fieldname": "output",
"fieldtype": "Code",
"label": "Output",
"read_only": 1
}
],
"index_web_pages_for_search": 1,
"links": [],
"modified": "2020-08-18 20:07:57.587344",
"modified": "2023-07-05 22:16:02.823955",
"modified_by": "Administrator",
"module": "Desk",
"name": "Console Log",
"naming_rule": "Expression",
"owner": "Administrator",
"permissions": [
{
@ -48,5 +42,6 @@
"quick_entry": 1,
"sort_field": "modified",
"sort_order": "DESC",
"states": [],
"track_changes": 1
}

1
frappe/desk/doctype/form_tour/form_tour.js
View file

@ -9,6 +9,7 @@ frappe.ui.form.on("Form Tour", {
frm.set_query("reference_doctype", () => {
return { filters: { istable: 0 } };
});
frm.trigger("reference_doctype");
frm.set_query("report_name", () => {
if (frm.doc.reference_doctype) {
return {

2
frappe/desk/doctype/system_console/system_console.py
View file

@ -26,7 +26,7 @@ class SystemConsole(Document):
else:
frappe.db.rollback()
frappe.get_doc(dict(doctype="Console Log", script=self.console, output=self.output)).insert()
frappe.get_doc(dict(doctype="Console Log", script=self.console)).insert()
frappe.db.commit()

4
frappe/public/js/form_builder/components/controls/TextControl.vue
View file

@ -33,12 +33,12 @@ let doctype_df = computed(() => {
}));
let options = [{ label: __("Select DocType"), value: "" }, ...doctypes.value];
return { fieldtype: "Select", label: __("Fetch Form"), options };
return { fieldtype: "Select", label: __("Fetch From"), options };
});
let field_df = computedAsync(async () => {
let options = [{ label: __("Select Field"), value: "" }];
let df = { fieldtype: "Select", label: __("Fetch Form"), options };
let df = { fieldtype: "Select", label: __("Fetch From"), options };
if (!doctype.value) return df;
let doctype_name = doctypes.value?.find(df => df.value == doctype.value).doctype_name;
if (!doctype_name) return df;

12
yarn.lock
View file

@ -3027,14 +3027,14 @@ sax@^1.2.4, sax@~1.2.4:
integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==
semver@^5.6.0:
version "5.7.1"
resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7"
integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==
version "5.7.2"
resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.2.tgz#48d55db737c3287cd4835e17fa13feace1c41ef8"
integrity sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==
semver@^6.3.0:
version "6.3.0"
resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d"
integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==
version "6.3.1"
resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.1.tgz#556d2ef8689146e46dcea4bfdd095f3434dffcb4"
integrity sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==
set-getter@^0.1.0:
version "0.1.1"