From cf024adbb210dde634df4b5e372af042a509b72f Mon Sep 17 00:00:00 2001 From: Bhavesh Maheshwari <34086262+bhavesh95863@users.noreply.github.com> Date: Mon, 21 Feb 2022 13:27:04 +0530 Subject: [PATCH 01/69] fix: ignore link validate for sort workspace --- frappe/desk/doctype/workspace/workspace.py | 1 + 1 file changed, 1 insertion(+) diff --git a/frappe/desk/doctype/workspace/workspace.py b/frappe/desk/doctype/workspace/workspace.py index b40f517350..a4357c7b87 100644 --- a/frappe/desk/doctype/workspace/workspace.py +++ b/frappe/desk/doctype/workspace/workspace.py @@ -277,6 +277,7 @@ def sort_page(workspace_pages, pages): doc = frappe.get_doc('Workspace', page.name) doc.sequence_id = seq + 1 doc.parent_page = d.get('parent_page') or "" + doc.flags.ignore_links = True doc.save(ignore_permissions=True) break From 3768572500c938ad4ca5eb4f853609762ebb4f20 Mon Sep 17 00:00:00 2001 From: Shariq Ansari Date: Fri, 25 Feb 2022 17:14:27 +0530 Subject: [PATCH 02/69] fix: print for tree view is broken --- frappe/public/css/tree.css | 2 +- .../js/frappe/views/reports/print_tree.html | 183 ++++++++++-------- 2 files changed, 100 insertions(+), 85 deletions(-) diff --git a/frappe/public/css/tree.css b/frappe/public/css/tree.css index 2aa411bc11..8b216bc321 100644 --- a/frappe/public/css/tree.css +++ b/frappe/public/css/tree.css @@ -24,7 +24,7 @@ ul.tree-children { } .tree-link .node-parent, .tree-link .node-leaf { - margin-right: 5px; + margin-right: 8px; } .tree-link.active i { color: #5e64ff; diff --git a/frappe/public/js/frappe/views/reports/print_tree.html b/frappe/public/js/frappe/views/reports/print_tree.html index 9300c8df64..c0bc55599a 100644 --- a/frappe/public/js/frappe/views/reports/print_tree.html +++ b/frappe/public/js/frappe/views/reports/print_tree.html @@ -1,91 +1,106 @@ - - - - - - - {{ title }} - - - - - + - - -
- {% if print_settings.repeat_header_footer %} - - {% endif %} + + + +
- {% if print_settings.letter_head %} -
-
{{ print_settings.letter_head.header }}
-
- {% endif %} -
- {{ tree }} + + + + + + + + + +
+ {% if print_settings.repeat_header_footer %} + -
-
- + {% endif %} + +
+ {% if print_settings.letter_head %} +
+
{{ print_settings.letter_head.header }}
+
+ {% endif %} +
+ {{ tree }} +
+
+
+ From 525f1656ad82a71be118ca6d6821f78e85c639ee Mon Sep 17 00:00:00 2001 From: Gavin D'souza Date: Tue, 1 Mar 2022 14:41:40 +0530 Subject: [PATCH 03/69] fix: Double signature in composed Email Re-do of https://github.com/frappe/frappe/pull/12520 Undone by https://github.com/frappe/frappe/pull/12878 Changes done to reflect current state of version-13 Co-authored-by: Suraj Shetty --- frappe/public/js/frappe/views/communication.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/public/js/frappe/views/communication.js b/frappe/public/js/frappe/views/communication.js index 1d219a7044..4cdc75e8cd 100755 --- a/frappe/public/js/frappe/views/communication.js +++ b/frappe/public/js/frappe/views/communication.js @@ -750,7 +750,7 @@ frappe.views.CommunicationComposer = class { signature = signature.replace(/\n/g, "
"); } - return "
" + signature; + return "
" + signature; } get_earlier_reply() { From da2dbfaae987f0646113d3b3c644a7991ff09bda Mon Sep 17 00:00:00 2001 From: Gavin D'souza Date: Tue, 1 Mar 2022 22:58:41 +0530 Subject: [PATCH 04/69] refactor!: Deprecate ignore_permissions & flags in communication.make API --- frappe/core/doctype/communication/email.py | 116 ++++++++++++++---- .../doctype/notification/notification.py | 7 +- 2 files changed, 99 insertions(+), 24 deletions(-) diff --git a/frappe/core/doctype/communication/email.py b/frappe/core/doctype/communication/email.py index 46ef7bf5d2..6a71697d37 100755 --- a/frappe/core/doctype/communication/email.py +++ b/frappe/core/doctype/communication/email.py @@ -22,12 +22,30 @@ OUTGOING_EMAIL_ACCOUNT_MISSING = _(""" @frappe.whitelist() -def make(doctype=None, name=None, content=None, subject=None, sent_or_received = "Sent", - sender=None, sender_full_name=None, recipients=None, communication_medium="Email", send_email=False, - print_html=None, print_format=None, attachments='[]', send_me_a_copy=False, cc=None, bcc=None, - flags=None, read_receipt=None, print_letterhead=True, email_template=None, communication_type=None, - ignore_permissions=False) -> Dict[str, str]: - """Make a new communication. +def make( + doctype=None, + name=None, + content=None, + subject=None, + sent_or_received="Sent", + sender=None, + sender_full_name=None, + recipients=None, + communication_medium="Email", + send_email=False, + print_html=None, + print_format=None, + attachments="[]", + send_me_a_copy=False, + cc=None, + bcc=None, + read_receipt=None, + print_letterhead=True, + email_template=None, + communication_type=None, + **kwargs, +) -> Dict[str, str]: + """Make a new communication. Checks for email permissions for specified Document. :param doctype: Reference DocType. :param name: Reference Document name. @@ -44,17 +62,69 @@ def make(doctype=None, name=None, content=None, subject=None, sent_or_received = :param send_me_a_copy: Send a copy to the sender (default **False**). :param email_template: Template which is used to compose mail . """ - is_error_report = (doctype=="User" and name==frappe.session.user and subject=="Error Report") - send_me_a_copy = cint(send_me_a_copy) + if kwargs: + from frappe.utils.commands import warn + warn( + f"Options {kwargs} used in frappe.core.doctype.communication.email.make " + "are deprecated or unsupported", + category=DeprecationWarning + ) + + if doctype and name and not frappe.has_permission(doctype=doctype, ptype="email", doc=name): + raise frappe.PermissionError( + f"You are not allowed to send emails related to: {doctype} {name}" + ) + + return _make( + doctype=doctype, + name=name, + content=content, + subject=subject, + sent_or_received=sent_or_received, + sender=sender, + sender_full_name=sender_full_name, + recipients=recipients, + communication_medium=communication_medium, + send_email=send_email, + print_html=print_html, + print_format=print_format, + attachments=attachments, + send_me_a_copy=cint(send_me_a_copy), + cc=cc, + bcc=bcc, + read_receipt=read_receipt, + print_letterhead=print_letterhead, + email_template=email_template, + communication_type=communication_type, + ) - if not ignore_permissions: - if doctype and name and not is_error_report and not frappe.has_permission(doctype, "email", name) and not (flags or {}).get('ignore_doctype_permissions'): - raise frappe.PermissionError("You are not allowed to send emails related to: {doctype} {name}".format( - doctype=doctype, name=name)) - if not sender: - sender = get_formatted_email(frappe.session.user) +def _make( + doctype=None, + name=None, + content=None, + subject=None, + sent_or_received="Sent", + sender=None, + sender_full_name=None, + recipients=None, + communication_medium="Email", + send_email=False, + print_html=None, + print_format=None, + attachments="[]", + send_me_a_copy=False, + cc=None, + bcc=None, + read_receipt=None, + print_letterhead=True, + email_template=None, + communication_type=None, +) -> Dict[str, str]: + """Internal method to make a new communication that ignores Permission checks. + """ + sender = sender or get_formatted_email(frappe.session.user) recipients = list_to_str(recipients) if isinstance(recipients, list) else recipients cc = list_to_str(cc) if isinstance(cc, list) else cc bcc = list_to_str(bcc) if isinstance(bcc, list) else bcc @@ -87,17 +157,21 @@ def make(doctype=None, name=None, content=None, subject=None, sent_or_received = if cint(send_email): if not comm.get_outgoing_email_account(): - frappe.throw(msg=OUTGOING_EMAIL_ACCOUNT_MISSING, exc=frappe.OutgoingEmailError) + frappe.throw( + msg=OUTGOING_EMAIL_ACCOUNT_MISSING, exc=frappe.OutgoingEmailError + ) - comm.send_email(print_html=print_html, print_format=print_format, - send_me_a_copy=send_me_a_copy, print_letterhead=print_letterhead) + comm.send_email( + print_html=print_html, + print_format=print_format, + send_me_a_copy=send_me_a_copy, + print_letterhead=print_letterhead, + ) emails_not_sent_to = comm.exclude_emails_list(include_sender=send_me_a_copy) - return { - "name": comm.name, - "emails_not_sent_to": ", ".join(emails_not_sent_to) - } + return {"name": comm.name, "emails_not_sent_to": ", ".join(emails_not_sent_to)} + def validate_email(doc: "Communication") -> None: """Validate Email Addresses of Recipients and CC""" diff --git a/frappe/email/doctype/notification/notification.py b/frappe/email/doctype/notification/notification.py index 2b62530847..bad32fb68f 100644 --- a/frappe/email/doctype/notification/notification.py +++ b/frappe/email/doctype/notification/notification.py @@ -186,7 +186,7 @@ def get_context(context): def send_an_email(self, doc, context): from email.utils import formataddr - from frappe.core.doctype.communication.email import make as make_communication + from frappe.core.doctype.communication.email import _make as make_communication subject = self.subject if "{" in subject: subject = frappe.render_template(self.subject, context) @@ -216,7 +216,8 @@ def get_context(context): # Add mail notification to communication list # No need to add if it is already a communication. if doc.doctype != 'Communication': - make_communication(doctype=doc.doctype, + make_communication( + doctype=doc.doctype, name=doc.name, content=message, subject=subject, @@ -228,7 +229,7 @@ def get_context(context): cc=cc, bcc=bcc, communication_type='Automated Message', - ignore_permissions=True) + ) def send_a_slack_msg(self, doc, context): send_slack_message( From 0ef99c3886020b8bb013ff20ce160bb0b69f5fb6 Mon Sep 17 00:00:00 2001 From: Gavin D'souza Date: Wed, 2 Mar 2022 18:51:30 +0530 Subject: [PATCH 05/69] fix: Add signature to Communication.content if not already added This fix adds a signature forcibly if found under the sender's User.email_signature or default outgoing email account's signature field. The previous method of adding a comment into the Email didn't work since Quill would discard comments before setting them. Adding signatures in get_formatted_html didn't seem apt since it's used in QueueBuilder to re-construct the Email before processing the Email Queue. This meant that the email content that was added in the Communication record would not be final. Now, we treat the signature as part of the Communication content. --- .../doctype/communication/communication.py | 38 +++++++++++++++++++ frappe/email/email_body.py | 8 +--- .../public/js/frappe/views/communication.js | 2 +- frappe/templates/emails/standard.html | 1 - requirements.txt | 1 + 5 files changed, 41 insertions(+), 9 deletions(-) diff --git a/frappe/core/doctype/communication/communication.py b/frappe/core/doctype/communication/communication.py index f89f0d8765..759557ae4c 100644 --- a/frappe/core/doctype/communication/communication.py +++ b/frappe/core/doctype/communication/communication.py @@ -18,6 +18,7 @@ from urllib.parse import unquote from frappe.utils.user import is_system_user from frappe.contacts.doctype.contact.contact import get_contact_name from frappe.automation.doctype.assignment_rule.assignment_rule import apply as apply_assignment_rule +from parse import compile exclude_from_linked_with = True @@ -114,6 +115,43 @@ class Communication(Document, CommunicationEmailMixin): frappe.publish_realtime('new_message', self.as_dict(), user=self.reference_name, after_commit=True) + def set_signature_in_email_content(self): + """Set sender's User.email_signature or default outgoing's EmailAccount.signature to the email + """ + if not self.content: + return + + quill_parser = compile('
{}
') + email_body = quill_parser.parse(self.content) + + if not email_body: + return + + email_body = email_body[0] + + user_email_signature = frappe.db.get_value( + "User", + self.sender, + "email_signature", + ) if self.sender else None + + signature = user_email_signature or frappe.db.get_value( + "Email Account", + {"default_outgoing": 1, "add_signature": 1}, + "signature", + ) + + if not signature: + return + + _signature = quill_parser.parse(signature)[0] if "ql-editor" in signature else None + + if (_signature or signature) not in self.content: + self.content = f'{self.content}


{signature}' + + def before_save(self): + self.set_signature_in_email_content() + def on_update(self): # add to _comment property of the doctype, so it shows up in # comments count for the list view diff --git a/frappe/email/email_body.py b/frappe/email/email_body.py index c25e996bd3..0f45e42aac 100755 --- a/frappe/email/email_body.py +++ b/frappe/email/email_body.py @@ -259,17 +259,12 @@ def get_formatted_html(subject, message, footer=None, print_html=None, email_account = email_account or EmailAccount.find_outgoing(match_by_email=sender) - signature = None - if "" not in message: - signature = get_signature(email_account) - rendered_email = frappe.get_template("templates/emails/standard.html").render({ "brand_logo": get_brand_logo(email_account) if with_container or header else None, "with_container": with_container, "site_url": get_url(), "header": get_header(header), "content": message, - "signature": signature, "footer": get_footer(email_account, footer), "title": subject, "print_html": print_html, @@ -281,8 +276,7 @@ def get_formatted_html(subject, message, footer=None, print_html=None, if unsubscribe_link: html = html.replace("", unsubscribe_link.html) - html = inline_style_in_html(html) - return html + return inline_style_in_html(html) @frappe.whitelist() def get_email_html(template, args, subject, header=None, with_container=False): diff --git a/frappe/public/js/frappe/views/communication.js b/frappe/public/js/frappe/views/communication.js index 4cdc75e8cd..1d219a7044 100755 --- a/frappe/public/js/frappe/views/communication.js +++ b/frappe/public/js/frappe/views/communication.js @@ -750,7 +750,7 @@ frappe.views.CommunicationComposer = class { signature = signature.replace(/\n/g, "
"); } - return "
" + signature; + return "
" + signature; } get_earlier_reply() { diff --git a/frappe/templates/emails/standard.html b/frappe/templates/emails/standard.html index 4a47c9cf90..2a2093e1e9 100644 --- a/frappe/templates/emails/standard.html +++ b/frappe/templates/emails/standard.html @@ -37,7 +37,6 @@

{{ content }}

-

{{ signature }}

diff --git a/requirements.txt b/requirements.txt index ba4a1a598b..c77ab1d424 100644 --- a/requirements.txt +++ b/requirements.txt @@ -29,6 +29,7 @@ maxminddb-geolite2==2018.703 num2words~=0.5.10 oauthlib~=3.1.0 openpyxl~=3.0.7 +parse~=1.19.0 passlib~=1.7.4 paytmchecksum~=1.7.0 pdfkit~=0.6.1 From 98188ddcba47931b52019fbca54316f9b2a24113 Mon Sep 17 00:00:00 2001 From: Sagar Vora Date: Wed, 2 Mar 2022 20:22:09 +0530 Subject: [PATCH 06/69] feat: allow hyphens in DocType name (again) --- frappe/core/doctype/doctype/doctype.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/frappe/core/doctype/doctype/doctype.py b/frappe/core/doctype/doctype/doctype.py index dca0a05281..5f82abac1f 100644 --- a/frappe/core/doctype/doctype/doctype.py +++ b/frappe/core/doctype/doctype/doctype.py @@ -732,9 +732,12 @@ class DocType(Document): frappe.throw(_("DocType's name should not start or end with whitespace"), frappe.NameError) # a DocType's name should not start with a number or underscore - # and should only contain letters, numbers and underscore - if not re.match(r"^(?![\W])[^\d_\s][\w ]+$", name, **flags): - frappe.throw(_("DocType's name should start with a letter and it can only consist of letters, numbers, spaces and underscores"), frappe.NameError) + # and should only contain letters, numbers, underscore, and hyphen + if not re.match(r"^(?![\W])[^\d_\s][\w -]+$", name, **flags): + frappe.throw(_( + "A DocType's name should start with a letter and can only " + "consist of letters, numbers, spaces, underscores and hyphens" + ), frappe.NameError, title="Invalid Name") validate_route_conflict(self.doctype, self.name) From 9f90d8b42a14bc3facf2d42b9ee7f85c0afa1136 Mon Sep 17 00:00:00 2001 From: Sagar Vora Date: Wed, 2 Mar 2022 20:31:41 +0530 Subject: [PATCH 07/69] test: add test for allowing hyphen in DocType name --- frappe/core/doctype/doctype/test_doctype.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/core/doctype/doctype/test_doctype.py b/frappe/core/doctype/doctype/test_doctype.py index 9b4f733e7d..cb22f581c6 100644 --- a/frappe/core/doctype/doctype/test_doctype.py +++ b/frappe/core/doctype/doctype/test_doctype.py @@ -24,7 +24,7 @@ class TestDocType(unittest.TestCase): self.assertRaises(frappe.NameError, new_doctype("8Some DocType").insert) self.assertRaises(frappe.NameError, new_doctype("Some (DocType)").insert) self.assertRaises(frappe.NameError, new_doctype("Some Doctype with a name whose length is more than 61 characters").insert) - for name in ("Some DocType", "Some_DocType"): + for name in ("Some DocType", "Some_DocType", "Some-DocType"): if frappe.db.exists("DocType", name): frappe.delete_doc("DocType", name) From 89a7dac300deb85d3f6aa080c5460f79650a5b6b Mon Sep 17 00:00:00 2001 From: Gavin D'souza Date: Thu, 3 Mar 2022 19:38:34 +0530 Subject: [PATCH 08/69] fix: Add signature only if not Communication.flags.skip_add_signature This is added to handle purposely removed signature or custom signatures added via the Email Composer or via the email.make API --- frappe/core/doctype/communication/communication.py | 3 ++- frappe/core/doctype/communication/email.py | 4 +++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/frappe/core/doctype/communication/communication.py b/frappe/core/doctype/communication/communication.py index 759557ae4c..475762f39d 100644 --- a/frappe/core/doctype/communication/communication.py +++ b/frappe/core/doctype/communication/communication.py @@ -150,7 +150,8 @@ class Communication(Document, CommunicationEmailMixin): self.content = f'{self.content}


{signature}' def before_save(self): - self.set_signature_in_email_content() + if not self.flags.skip_add_signature: + self.set_signature_in_email_content() def on_update(self): # add to _comment property of the doctype, so it shows up in diff --git a/frappe/core/doctype/communication/email.py b/frappe/core/doctype/communication/email.py index 6a71697d37..195518f40d 100755 --- a/frappe/core/doctype/communication/email.py +++ b/frappe/core/doctype/communication/email.py @@ -147,7 +147,9 @@ def _make( "read_receipt":read_receipt, "has_attachment": 1 if attachments else 0, "communication_type": communication_type, - }).insert(ignore_permissions=True) + }) + comm.flags.skip_add_signature = True + comm.insert(ignore_permissions=True) # if not committed, delayed task doesn't find the communication if attachments: From f8b67dfbf61a837fd3269e6bf64897635ebf1402 Mon Sep 17 00:00:00 2001 From: barredterra <14891507+barredterra@users.noreply.github.com> Date: Thu, 3 Mar 2022 20:28:28 +0100 Subject: [PATCH 09/69] feat: remove unused parameter "columns" --- frappe/desk/query_report.py | 6 ++---- .../email/doctype/auto_email_report/auto_email_report.py | 4 ++-- frappe/tests/test_query_report.py | 9 +-------- 3 files changed, 5 insertions(+), 14 deletions(-) diff --git a/frappe/desk/query_report.py b/frappe/desk/query_report.py index a0b0aec255..61913f3e05 100644 --- a/frappe/desk/query_report.py +++ b/frappe/desk/query_report.py @@ -352,14 +352,12 @@ def export_query(): ) return - columns = get_columns_dict(data.columns) - from frappe.utils.xlsxutils import make_xlsx data["result"] = handle_duration_fieldtype_values( data.get("result"), data.get("columns") ) - xlsx_data, column_widths = build_xlsx_data(columns, data, visible_idx, include_indentation) + xlsx_data, column_widths = build_xlsx_data(data, visible_idx, include_indentation) xlsx_file = make_xlsx(xlsx_data, "Query Report", column_widths=column_widths) frappe.response["filename"] = report_name + ".xlsx" @@ -399,7 +397,7 @@ def handle_duration_fieldtype_values(result, columns): return result -def build_xlsx_data(columns, data, visible_idx, include_indentation, ignore_visible_idx=False): +def build_xlsx_data(data, visible_idx, include_indentation, ignore_visible_idx=False): result = [[]] column_widths = [] diff --git a/frappe/email/doctype/auto_email_report/auto_email_report.py b/frappe/email/doctype/auto_email_report/auto_email_report.py index 682f0df7cf..5ffde0c37b 100644 --- a/frappe/email/doctype/auto_email_report/auto_email_report.py +++ b/frappe/email/doctype/auto_email_report/auto_email_report.py @@ -104,7 +104,7 @@ class AutoEmailReport(Document): report_data['columns'] = columns report_data['result'] = data - xlsx_data, column_widths = build_xlsx_data(columns, report_data, [], 1, ignore_visible_idx=True) + xlsx_data, column_widths = build_xlsx_data(report_data, [], 1, ignore_visible_idx=True) xlsx_file = make_xlsx(xlsx_data, "Auto Email Report", column_widths=column_widths) return xlsx_file.getvalue() @@ -113,7 +113,7 @@ class AutoEmailReport(Document): report_data['columns'] = columns report_data['result'] = data - xlsx_data, column_widths = build_xlsx_data(columns, report_data, [], 1, ignore_visible_idx=True) + xlsx_data, column_widths = build_xlsx_data(report_data, [], 1, ignore_visible_idx=True) return to_csv(xlsx_data) else: diff --git a/frappe/tests/test_query_report.py b/frappe/tests/test_query_report.py index 656894fc9b..09596ba44c 100644 --- a/frappe/tests/test_query_report.py +++ b/frappe/tests/test_query_report.py @@ -12,13 +12,6 @@ class TestQueryReport(unittest.TestCase): def test_xlsx_data_with_multiple_datatypes(self): """Test exporting report using rows with multiple datatypes (list, dict)""" - # Describe the columns - columns = { - 0: {"label": "Column A", "fieldname": "column_a"}, - 1: {"label": "Column B", "fieldname": "column_b"}, - 2: {"label": "Column C", "fieldname": "column_c"} - } - # Create mock data data = frappe._dict() data.columns = [ @@ -37,7 +30,7 @@ class TestQueryReport(unittest.TestCase): visible_idx = [0, 2, 3] # Build the result - xlsx_data, column_widths = build_xlsx_data(columns, data, visible_idx, include_indentation=0) + xlsx_data, column_widths = build_xlsx_data(data, visible_idx, include_indentation=0) self.assertEqual(type(xlsx_data), list) self.assertEqual(len(xlsx_data), 4) # columns + data From 3c4aa2a3ddeca1f8e11a7697e628d3da0289b77e Mon Sep 17 00:00:00 2001 From: barredterra <14891507+barredterra@users.noreply.github.com> Date: Thu, 3 Mar 2022 20:28:57 +0100 Subject: [PATCH 10/69] refactor: Simplify logic in `handle_duration_fieldtype_values` --- frappe/desk/query_report.py | 40 +++++++++++++++++++------------------ 1 file changed, 21 insertions(+), 19 deletions(-) diff --git a/frappe/desk/query_report.py b/frappe/desk/query_report.py index 61913f3e05..c9c2d4a4cc 100644 --- a/frappe/desk/query_report.py +++ b/frappe/desk/query_report.py @@ -371,28 +371,30 @@ def handle_duration_fieldtype_values(result, columns): if isinstance(col, str): col = col.split(":") if len(col) > 1: - if col[1]: - fieldtype = col[1] - if "/" in fieldtype: - fieldtype, options = fieldtype.split("/") - else: - fieldtype = "Data" + if not col[1]: + continue + + fieldtype = col[1] + if "/" in fieldtype: + fieldtype = fieldtype.split("/")[0] else: fieldtype = col.get("fieldtype") - if fieldtype == "Duration": - for entry in range(0, len(result)): - row = result[entry] - if isinstance(row, dict): - val_in_seconds = row[col.fieldname] - if val_in_seconds: - duration_val = format_duration(val_in_seconds) - row[col.fieldname] = duration_val - else: - val_in_seconds = row[i] - if val_in_seconds: - duration_val = format_duration(val_in_seconds) - row[i] = duration_val + if fieldtype != "Duration": + continue + + for entry in range(0, len(result)): + row = result[entry] + if isinstance(row, dict): + val_in_seconds = row[col.fieldname] + if val_in_seconds: + duration_val = format_duration(val_in_seconds) + row[col.fieldname] = duration_val + else: + val_in_seconds = row[i] + if val_in_seconds: + duration_val = format_duration(val_in_seconds) + row[i] = duration_val return result From 021bfd1dc1dcd7872c8cdfbd5d9ad3d40ec04f64 Mon Sep 17 00:00:00 2001 From: Shariq Ansari <30859809+shariquerik@users.noreply.github.com> Date: Mon, 7 Mar 2022 14:50:12 +0530 Subject: [PATCH 11/69] fix(linter): Trim Trailing Whitespace --- .../public/js/frappe/views/reports/print_tree.html | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/frappe/public/js/frappe/views/reports/print_tree.html b/frappe/public/js/frappe/views/reports/print_tree.html index c0bc55599a..adcdcc008f 100644 --- a/frappe/public/js/frappe/views/reports/print_tree.html +++ b/frappe/public/js/frappe/views/reports/print_tree.html @@ -10,15 +10,15 @@ - - + + From 86c9791813dfbdee3274d43573a2809f2cd8b505 Mon Sep 17 00:00:00 2001 From: phot0n Date: Tue, 15 Mar 2022 15:43:34 +0530 Subject: [PATCH 63/69] fix: use next sequence number for ammended doc * chore: use meta --- frappe/model/naming.py | 13 ++++++++----- frappe/public/js/frappe/form/form.js | 2 +- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/frappe/model/naming.py b/frappe/model/naming.py index 7e807f424e..dd4587fdb0 100644 --- a/frappe/model/naming.py +++ b/frappe/model/naming.py @@ -34,6 +34,10 @@ def set_new_name(doc): if autoname.lower() != "prompt" and not frappe.flags.in_import: doc.name = None + if is_autoincremented(doc.doctype, meta): + doc.name = get_next_val(doc.doctype) + return + if getattr(doc, "amended_from", None): _set_amended_name(doc) return @@ -41,10 +45,6 @@ def set_new_name(doc): elif getattr(doc.meta, "issingle", False): doc.name = doc.doctype - elif is_autoincremented(doc.doctype, meta): - doc.name = get_next_val(doc.doctype) - return - elif getattr(doc.meta, "istable", False): doc.name = make_autoname("hash", doc.doctype) @@ -73,7 +73,7 @@ def set_new_name(doc): doc.name = validate_name( doc.doctype, doc.name, - frappe.get_meta(doc.doctype).get_field("name_case") + meta.get_field("name_case") ) def is_autoincremented(doctype: str, meta: "Meta" = None): @@ -96,6 +96,9 @@ def is_autoincremented(doctype: str, meta: "Meta" = None): if not meta: meta = frappe.get_meta(doctype) + if getattr(meta, "issingle", False): + return False + if meta.autoname == "autoincrement": return True diff --git a/frappe/public/js/frappe/form/form.js b/frappe/public/js/frappe/form/form.js index 6eed16bd28..269c54631f 100644 --- a/frappe/public/js/frappe/form/form.js +++ b/frappe/public/js/frappe/form/form.js @@ -1215,7 +1215,7 @@ frappe.ui.form.Form = class FrappeForm { } is_dirty() { - return this.doc.__unsaved; + return !!this.doc.__unsaved; } is_new() { From f21f526ae6b0cb1932d380327e78f4619801fddf Mon Sep 17 00:00:00 2001 From: phot0n Date: Tue, 15 Mar 2022 16:49:33 +0530 Subject: [PATCH 64/69] fix: sider --- frappe/model/naming.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frappe/model/naming.py b/frappe/model/naming.py index dd4587fdb0..013e5a19db 100644 --- a/frappe/model/naming.py +++ b/frappe/model/naming.py @@ -35,8 +35,8 @@ def set_new_name(doc): doc.name = None if is_autoincremented(doc.doctype, meta): - doc.name = get_next_val(doc.doctype) - return + doc.name = get_next_val(doc.doctype) + return if getattr(doc, "amended_from", None): _set_amended_name(doc) From a560d3856263f77fd54666f9fd62600daac67a35 Mon Sep 17 00:00:00 2001 From: Samuel Danieli <23150094+scdanieli@users.noreply.github.com> Date: Tue, 15 Mar 2022 17:00:08 +0100 Subject: [PATCH 65/69] feat: add German translations --- frappe/translations/de.csv | 102 ++++++++++++++++++++++++++++++------- 1 file changed, 83 insertions(+), 19 deletions(-) diff --git a/frappe/translations/de.csv b/frappe/translations/de.csv index afd1b101d6..1f98d1889b 100644 --- a/frappe/translations/de.csv +++ b/frappe/translations/de.csv @@ -146,7 +146,7 @@ Monthly,Monatlich, More,Weiter, More Information,Mehr Informationen, More...,Mehr..., -Move,Bewegen, +Move,Verschieben, My Account,Mein Konto, My Profile,Mein Profil, My Settings,Meine Einstellungen, @@ -175,7 +175,7 @@ Payment Gateway,Zahlungs-Gateways, Payment Gateway Name,Name des Zahlungsgateways, Payments,Zahlungen, Period,Periode, -Pincode,Postleitzahl (PLZ), +Pincode,Postleitzahl, Plan Name,Planname, Please enable pop-ups,Bitte Pop-ups aktivieren, Please select Company,Bitte Unternehmen auswählen, @@ -1486,7 +1486,7 @@ Linked,Verknüpft, Linked With,Verknüpft mit, Linked with {0},Verknüpft mit {0}, Links,Verknüpfungen, -List,Listenansicht, +List,Liste, List Filter,Listenfilter, List View,Listenansicht, List View Setting,Einstellungen zu Listenansicht, @@ -2427,7 +2427,7 @@ Sum,Summe, Sum of {0},Summe von {0}, Support Email Address Not Specified,Support-E-Mail-Adresse nicht angegeben, Suspend Sending,Senden unterbrechen, -Switch To Desk,Switch To Desk, +Switch To Desk,Zum Desk wechseln, Symbol,Symbol, Sync,Synchronisieren, Sync on Migrate,Sync auf Migrate, @@ -2870,8 +2870,8 @@ bullhorn,Megafon, ca-central-1,ca-central-1, camera,Kamera, cancelled this document,brach die Arbeit an diesem Dokument ab, -changed value of {0},Wert von {0} geändert, -changed values for {0},Werte von {0} geändert, +changed value of {0},hat den Wert von {0} geändert, +changed values for {0},hat die Werte von {0} geändert, chevron-down,Winkel nach unten, chevron-left,Winkel nach links, chevron-right,Winkel nach rechts, @@ -3431,7 +3431,7 @@ Mandatory Depends On,Obligatorisch Hängt von ab, Map Columns,Spalten zuordnen, Map columns from {0} to fields in {1},Ordnen Sie Spalten von {0} Feldern in {1} zu., Mapping column {0} to field {1},Spalte {0} dem Feld {1} zuordnen, -Mark all as Read,Markiere alle als gelesen, +Mark all as Read,Alle als gelesen markieren, Maximum Points,Maximale Punkte, Maximum points allowed after multiplying points with the multiplier value\n(Note: For no limit leave this field empty or set 0),Maximal zulässige Punkte nach Multiplikation der Punkte mit dem Multiplikatorwert (Hinweis: Für unbegrenzte Anzahl lassen Sie dieses Feld leer oder setzen Sie 0), Me,Mir, @@ -3485,7 +3485,7 @@ Page Shortcuts,Seitenkürzel, Parent Field (Tree),Elternfeld (Baum), Parent Field must be a valid fieldname,Das übergeordnete Feld muss ein gültiger Feldname sein, Pin Globally,Global anheften, -Places,Setzt, +Places,Orte, Please check the filter values set for Dashboard Chart: {},Bitte überprüfen Sie die für das Dashboard-Diagramm festgelegten Filterwerte: {}, Please enable pop-ups in your browser,Bitte aktivieren Sie Popups in Ihrem Browser, Please find attached {0}: {1},Im Anhang finden Sie {0}: {1}, @@ -3541,7 +3541,7 @@ Select Filters,Wählen Sie Filter, Select Google Calendar to which event should be synced.,"Wählen Sie Google Kalender aus, mit dem das Ereignis synchronisiert werden soll.", Select Google Contacts to which contact should be synced.,"Wählen Sie Google-Kontakte aus, mit denen der Kontakt synchronisiert werden soll.", Select Group By...,Wählen Sie Gruppieren nach ..., -Select Mandatory,Wählen Pflicht, +Select Mandatory,Verpflichtende auswählen, Select atleast 2 actions,Wählen Sie mindestens 2 Aktionen aus, Select list item,Listenelement auswählen, Select multiple list items,Wählen Sie mehrere Listenelemente aus, @@ -3664,8 +3664,8 @@ You need to install pycups to use this feature!,"Sie müssen Pycups installieren Your Target,Dein Ziel, "browse,","Durchsuche,", cancelled this document {0},stornierte dieses Dokument {0}, -changed value of {0} {1},geänderter Wert von {0} {1}, -changed values for {0} {1},geänderte Werte für {0} {1}, +changed value of {0} {1},hat den Wert von {0} {1} geändert, +changed values for {0} {1},hat die Werte von {0} {1} geändert, choose an,wähle ein, empty,leeren, of,von, @@ -3789,14 +3789,14 @@ Reset,Zurücksetzen, Review,Rezension, Room,Zimmer, Room Type,Zimmertyp, -Save,speichern, +Save,Speichern, Search results for,Suchergebnisse für, Select All,Alles auswählen, Send,Absenden, Sending,Versand, Server Error,Serverfehler, Set,Menge, -Setup,Einstellungen, +Setup,Einrichtung, Setup Wizard,Setup-Assistent, Size,Größe, Sr,Pos, @@ -3819,7 +3819,7 @@ Warehouse,Lager, Welcome to {0},Willkommen auf {0}, Year,Jahr, Yearly,Jährlich, -You,Benutzer, +You,Sie, You can also copy-paste this link in your browser,Sie können diese Verknüpfung in Ihren Browser kopieren, and,und, {0} Name,{0} Name, @@ -3953,7 +3953,7 @@ lock,sperren, logged in,Angemeldet, message,Mitteilung, module,Modul, -move,Bewegung, +move,verschieben, music,Musik, new,Neu, now,jetzt, @@ -4135,9 +4135,9 @@ Using this console may allow attackers to impersonate you and steal your informa yesterday,gestern, {0} years ago,Vor {0} Jahren, New Chart,Neues Diagramm, -New Shortcut,Neue Verknüpfung, +New Shortcut,Neuer Schnellzugriff, Edit Chart,Diagramm bearbeiten, -Edit Shortcut,Verknüpfung bearbeiten, +Edit Shortcut,Schnellzugriff bearbeiten, Couldn't Load Desk,Schreibtisch konnte nicht geladen werden, "Something went wrong while loading Desk. Please relaod the page. If the problem persists, contact the Administrator","Beim Laden von Desk ist ein Fehler aufgetreten. Bitte überarbeiten Sie die Seite . Wenn das Problem weiterhin besteht, wenden Sie sich an den Administrator", Customize Workspace,Arbeitsbereich anpassen, @@ -4228,7 +4228,7 @@ since last month,seit letztem Monat, since last year,seit letztem Jahr, Show,Show, New Number Card,Neue Zahlenkarte, -Your Shortcuts,Ihre Verknüpfungen, +Your Shortcuts,Ihre Schnellzugriffe, You haven't added any Dashboard Charts or Number Cards yet.,Sie haben noch keine Dashboard-Diagramme oder Zahlenkarten hinzugefügt., Click On Customize to add your first widget,"Klicken Sie auf Anpassen, um Ihr erstes Widget hinzuzufügen", Are you sure you want to reset all customizations?,Möchten Sie wirklich alle Anpassungen zurücksetzen?, @@ -4650,7 +4650,7 @@ Not permitted to view {0},{0} darf nicht angezeigt werden, Camera,Kamera, Invalid filter: {0},Ungültiger Filter: {0}, Let's Get Started,Lass uns anfangen, -Reports & Masters,Berichte & Meister, +Reports & Masters,Berichte & Stammdaten, New {0} {1} added to Dashboard {2},Neues {0} {1} zum Dashboard hinzugefügt {2}, New {0} {1} created,Neue {0} {1} erstellt, New {0} Created,Neu {0} erstellt, @@ -4715,3 +4715,67 @@ Reset sorting,Sortierung zurücksetzen, Sort Ascending,Aufsteigend sortieren, Sort Descending,Absteigend sortieren, Remove column,Spalte entfernen, +Set all public,Alle als öffentlich setzen, +Set all private,Alle als privat setzen, +Library,Bibliothek, +My Device,Mein Gerät, +Drag and drop files here or upload from,Ziehen Sie Dateien hierher oder laden Sie sie von, +days,Tage, +seconds,Sekunden, +minutes,Minuten, +Copy,Kopieren, +{} Assigned,{} Zugewiesen, +Hide Saved,Gespeicherte ausblenden, +Show Saved,Gespeicherte anzeigen, +{0} created this {1},{0} erstellte dies {1}, +{0} edited this {1},{0} bearbeitete dies {1}, +Toggle Full Width,Toggle Volle Breite, +Documentation,Dokumentation, +About,Über, +Search or type a command (Ctrl + G),Suchen oder Befehl eingeben (Strg + G), +{} Pending,{} Ausstehend, +{} Available,{} Verfügbar, +{} Open,{} Offen, +Password set,Passwort gesetzt, +Your new password has been set successfully.,Ihr Passwort wurde erfolgreich aktualisiert., +You hit the rate limit because of too many requests. Please try after sometime.,Sie haben die maximale Anzahl an Anfragen erreicht. Bitte versuchen Sie es später noch einmal., +"You need {0} permission to fetch values from {1} {2}","Sie benötigen eine {0}-Berechtigung, um die Werte von {1} {2} abzurufen", +Cannot Fetch Values,Werte können nicht abgerufen werden, +You do not have Read or Select Permissions for {},Sie haben keine Lese- oder Auswahlberechtigung für {}, +Or,Oder, +{0} changed values for {1},{0} hat die Werte von {1} geändert, +{0} changed values for {1} {2},{0} hat die Werte von {1} {2} geändert, +{0} cancelled this document,{0} dieses Dokument storniert, +{0} cancelled this document {1},{0} dieses Dokument storniert {1}, +{0} submitted this document,{0} hat dieses Dokument eingereicht, +{0} submitted this document {1},{0} hat das Dokument {1} eingereicht, +Customizations Discarded,Anpassungen verworfen, +No filters selected,Keine Filter ausgewählt, +You haven't created a {0} yet,Sie haben noch kein(en) {0} erstellt, +No Data...,Keine Daten..., +Don't have an account?,Sie haben noch kein Benutzerkonto?, +{0} changed value of {1},{0} hat den Wert von {1} geändert, +Basic Info,Grundlegende Informationen, +No.,Nr.,number +No.,Nein.,opposite of yes +There are no upcoming events for you.,Es sind keine Termine für Sie geplant., +No Upcoming Events,Keine bevorstehenden Termine, +Looks like you haven’t received any notifications.,Sieht aus, als hätten Sie keine Benachrichtigungen erhalten., +No New notifications,Keine neuen Benachrichtigungen, +Overview,Übersicht, +Connections,Verknüpfungen, +Save Customizations,Anpassungen speichern, +Apply Filters,Filter anwenden, +Add a Filter,Filter hinzufügen, +Reset Customizations,Anpassungen zurücksetzen, +{} wants to access the following details from your account,{} möchte Zugriff auf die folgenden Angaben von Ihrem Account, +{0} is not a field of doctype {1},{0} ist kein Feld in Doctype {1}, +{0} from {1} to {2} in row #{3},{0} von {1} zu/bis {2} in Zeile #{3}, +{0} from {1} to {2},{0} von {1} zu/bis {2}, +{0} changed {1} to {2},{0} wurde von {1} zu {2} geändert, +{0} Map,{0} Karte, +Use HTML,HTML verwenden, +Submit on Creation,Nach Erstellung buchen, +Show Absolute Values,Absolutwerte anzeigen, +Row #{0}: Could not find field {1} in {2} DocType,Zeile #{0}: Feld {1} existiert nicht in DocType {2}, +Repeat on Days,An Tagen wiederholen, From c5963b5b7c5c3e245ce6a9cf930c1794e01d85e0 Mon Sep 17 00:00:00 2001 From: Samuel Danieli <23150094+scdanieli@users.noreply.github.com> Date: Tue, 15 Mar 2022 17:17:32 +0100 Subject: [PATCH 66/69] fix: escape , --- frappe/translations/de.csv | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/translations/de.csv b/frappe/translations/de.csv index 1f98d1889b..1131a8b5d7 100644 --- a/frappe/translations/de.csv +++ b/frappe/translations/de.csv @@ -4760,7 +4760,7 @@ No.,Nr.,number No.,Nein.,opposite of yes There are no upcoming events for you.,Es sind keine Termine für Sie geplant., No Upcoming Events,Keine bevorstehenden Termine, -Looks like you haven’t received any notifications.,Sieht aus, als hätten Sie keine Benachrichtigungen erhalten., +"Looks like you haven’t received any notifications.","Sieht aus, als hätten Sie keine Benachrichtigungen erhalten.", No New notifications,Keine neuen Benachrichtigungen, Overview,Übersicht, Connections,Verknüpfungen, From 5f1eadeb7a64cf57dfad860613523f2d060058b3 Mon Sep 17 00:00:00 2001 From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com> Date: Wed, 16 Mar 2022 08:10:05 +0000 Subject: [PATCH 67/69] fix(BackupGenerator): set missing attribute for class object (backport #16273) (#16301) This is a semi-automatic backport of pull request #16273 done by [Mergify](https://mergify.com). --- frappe/utils/backups.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/frappe/utils/backups.py b/frappe/utils/backups.py index d23804bef4..3a0c337042 100644 --- a/frappe/utils/backups.py +++ b/frappe/utils/backups.py @@ -183,8 +183,6 @@ class BackupGenerator: False, ) - self.todays_date = now_datetime().strftime("%Y%m%d_%H%M%S") - if not ( self.backup_path_conf and self.backup_path_db @@ -212,7 +210,7 @@ class BackupGenerator: partial = "-partial" if self.partial else "" ext = "tgz" if self.compress_files else "tar" enc = "-enc" if frappe.get_system_settings("encrypt_backup") else "" - + self.todays_date = now_datetime().strftime("%Y%m%d_%H%M%S") for_conf = f"{self.todays_date}-{self.site_slug}-site_config_backup{enc}.json" for_db = f"{self.todays_date}-{self.site_slug}{partial}-database{enc}.sql.gz" From 1a0fb216451f361279ec6ed95d63994d211582a9 Mon Sep 17 00:00:00 2001 From: Ankush Menat Date: Tue, 15 Mar 2022 21:42:48 +0530 Subject: [PATCH 68/69] feat: MySQL TIMESTAMP functionality for QB --- frappe/query_builder/functions.py | 22 ++++++++++++-- frappe/tests/test_query_builder.py | 47 +++++++++++++++++++++++++++++- 2 files changed, 66 insertions(+), 3 deletions(-) diff --git a/frappe/query_builder/functions.py b/frappe/query_builder/functions.py index c98df775b7..9d12358f0d 100644 --- a/frappe/query_builder/functions.py +++ b/frappe/query_builder/functions.py @@ -1,5 +1,5 @@ from pypika.functions import * -from pypika.terms import Function +from pypika.terms import Function, CustomFunction, ArithmeticExpression, Arithmetic from frappe.query_builder.utils import ImportMapper, db_type_is from frappe.query_builder.custom import GROUP_CONCAT, STRING_AGG, MATCH, TO_TSVECTOR from frappe.database.query import Query @@ -25,6 +25,24 @@ Match = ImportMapper( } ) +class _PostgresTimestamp(ArithmeticExpression): + def __init__(self, datepart, timepart, alias=None): + if isinstance(datepart, str): + datepart = Cast(datepart, "date") + if isinstance(timepart, str): + timepart = Cast(timepart, "time") + + super().__init__(operator=Arithmetic.add, + left=datepart, right=timepart, alias=alias) + + +CombineDatetime = ImportMapper( + { + db_type_is.MARIADB: CustomFunction("TIMESTAMP", ["date", "time"]), + db_type_is.POSTGRES: _PostgresTimestamp, + } +) + def _aggregate(function, dt, fieldname, filters, **kwargs): return ( @@ -46,4 +64,4 @@ def _avg(dt, fieldname, filters=None, **kwargs): return _aggregate(Avg, dt, fieldname, filters, **kwargs) def _sum(dt, fieldname, filters=None, **kwargs): - return _aggregate(Sum, dt, fieldname, filters, **kwargs) \ No newline at end of file + return _aggregate(Sum, dt, fieldname, filters, **kwargs) diff --git a/frappe/tests/test_query_builder.py b/frappe/tests/test_query_builder.py index ea700b183e..6b13da067e 100644 --- a/frappe/tests/test_query_builder.py +++ b/frappe/tests/test_query_builder.py @@ -3,7 +3,7 @@ from typing import Callable import frappe from frappe.query_builder.custom import ConstantColumn -from frappe.query_builder.functions import Coalesce, GroupConcat, Match +from frappe.query_builder.functions import Coalesce, GroupConcat, Match, CombineDatetime from frappe.query_builder.utils import db_type_is from frappe.query_builder import Case @@ -32,6 +32,27 @@ class TestCustomFunctionsMariaDB(unittest.TestCase): query.get_sql(), "SELECT `name`,'John' `User` FROM `tabDocType`" ) + def test_timestamp(self): + note = frappe.qb.DocType("Note") + self.assertEqual("TIMESTAMP(posting_date,posting_time)", CombineDatetime(note.posting_date, note.posting_time).get_sql()) + self.assertEqual("TIMESTAMP('2021-01-01','00:00:21')", CombineDatetime("2021-01-01", "00:00:21").get_sql()) + + todo = frappe.qb.DocType("ToDo") + select_query = (frappe.qb + .from_(note) + .join(todo).on(todo.refernce_name == note.name) + .select(CombineDatetime(note.posting_date, note.posting_time))) + self.assertIn("select timestamp(`tabnote`.`posting_date`,`tabnote`.`posting_time`)", str(select_query).lower()) + + select_query = select_query.orderby(CombineDatetime(note.posting_date, note.posting_time)) + self.assertIn("order by timestamp(`tabnote`.`posting_date`,`tabnote`.`posting_time`)", str(select_query).lower()) + + select_query = select_query.where(CombineDatetime(note.posting_date, note.posting_time) >= CombineDatetime("2021-01-01", "00:00:01")) + self.assertIn("timestamp(`tabnote`.`posting_date`,`tabnote`.`posting_time`)>=timestamp('2021-01-01','00:00:01')", str(select_query).lower()) + + select_query = select_query.select(CombineDatetime(note.posting_date, note.posting_time, alias="timestamp")) + self.assertIn("timestamp(`tabnote`.`posting_date`,`tabnote`.`posting_time`) `timestamp`", str(select_query).lower()) + @run_only_if(db_type_is.POSTGRES) class TestCustomFunctionsPostgres(unittest.TestCase): @@ -52,6 +73,30 @@ class TestCustomFunctionsPostgres(unittest.TestCase): query.get_sql(), 'SELECT "name",\'John\' "User" FROM "tabDocType"' ) + def test_timestamp(self): + note = frappe.qb.DocType("Note") + self.assertEqual("posting_date+posting_time", CombineDatetime(note.posting_date, note.posting_time).get_sql()) + self.assertEqual("CAST('2021-01-01' AS DATE)+CAST('00:00:21' AS TIME)", CombineDatetime("2021-01-01", "00:00:21").get_sql()) + + todo = frappe.qb.DocType("ToDo") + select_query = (frappe.qb + .from_(note) + .join(todo).on(todo.refernce_name == note.name) + .select(CombineDatetime(note.posting_date, note.posting_time))) + self.assertIn('select "tabnote"."posting_date"+"tabnote"."posting_time"', str(select_query).lower()) + + select_query = select_query.orderby(CombineDatetime(note.posting_date, note.posting_time)) + self.assertIn('order by "tabnote"."posting_date"+"tabnote"."posting_time"', str(select_query).lower()) + + select_query = select_query.where( + CombineDatetime(note.posting_date, note.posting_time) >= CombineDatetime('2021-01-01', '00:00:01') + ) + self.assertIn("""where "tabnote"."posting_date"+"tabnote"."posting_time">=cast('2021-01-01' as date)+cast('00:00:01' as time)""", + str(select_query).lower()) + + select_query = select_query.select(CombineDatetime(note.posting_date, note.posting_time, alias="timestamp")) + self.assertIn('"tabnote"."posting_date"+"tabnote"."posting_time" "timestamp"', str(select_query).lower()) + class TestBuilderBase(object): def test_adding_tabs(self): From 14a4e35d8d9eb5917fa680160fd5ca5b328ed2d2 Mon Sep 17 00:00:00 2001 From: Gavin D'souza Date: Thu, 17 Mar 2022 09:50:14 +0530 Subject: [PATCH 69/69] fix: Typo in is_downgrade's user warning Fixes https://github.com/frappe/frappe/issues/16312 --- frappe/installer.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/installer.py b/frappe/installer.py index 6ebab95a7d..d10dc78286 100644 --- a/frappe/installer.py +++ b/frappe/installer.py @@ -611,7 +611,7 @@ def is_downgrade(sql_file_path, verbose=False): downgrade = backup_version > current_version if verbose and downgrade: - print("Your site will be downgraded from Frappe {0} to {1}".format(current_version, backup_version)) + print(f"Your site will be downgraded from Frappe {backup_version} to {current_version}") return downgrade