-
- 
+
+ 
diff --git a/cypress/integration/rounding.js b/cypress/integration/rounding.js
new file mode 100644
index 0000000000..647b32a6a5
--- /dev/null
+++ b/cypress/integration/rounding.js
@@ -0,0 +1,44 @@
+context("Rounding behaviour", () => {
+ before(() => {
+ cy.login();
+ cy.visit("/app/");
+ });
+
+ it("Rounds floats accurately", () => {
+ cy.window()
+ .its("flt")
+ .then((flt) => {
+ let rounding_method = "Rounding Half Away From Zero";
+
+ expect(flt("0.5", 0, null, rounding_method)).eq(1);
+ expect(flt("0.3", null, null, rounding_method)).eq(0.3);
+
+ expect(flt("1.5", 0, null, rounding_method)).eq(2);
+
+ // positive rounding to integers
+ expect(flt(0.4, 0, null, rounding_method)).eq(0);
+ expect(flt(0.5, 0, null, rounding_method)).eq(1);
+ expect(flt(1.455, 0, null, rounding_method)).eq(1);
+ expect(flt(1.5, 0, null, rounding_method)).eq(2);
+
+ // negative rounding to integers
+ expect(flt(-0.5, 0, null, rounding_method)).eq(-1);
+ expect(flt(-1.5, 0, null, rounding_method)).eq(-2);
+
+ // negative precision i.e. round to nearest 10th
+ expect(flt(123, -1, null, rounding_method)).eq(120);
+ expect(flt(125, -1, null, rounding_method)).eq(130);
+ expect(flt(134.45, -1, null, rounding_method)).eq(130);
+ expect(flt(135, -1, null, rounding_method)).eq(140);
+
+ // positive multiple digit rounding
+ expect(flt(1.25, 1, null, rounding_method)).eq(1.3);
+ expect(flt(0.15, 1, null, rounding_method)).eq(0.2);
+ expect(flt(2.675, 2, null, rounding_method)).eq(2.68);
+
+ // negative multiple digit rounding
+ expect(flt(-1.25, 1, null, rounding_method)).eq(-1.3);
+ expect(flt(-0.15, 1, null, rounding_method)).eq(-0.2);
+ });
+ });
+});
diff --git a/frappe/boot.py b/frappe/boot.py
index 9594635c70..0cab7a060c 100644
--- a/frappe/boot.py
+++ b/frappe/boot.py
@@ -21,7 +21,7 @@ from frappe.social.doctype.energy_point_settings.energy_point_settings import (
is_energy_point_enabled,
)
from frappe.translate import get_lang_dict, get_messages_for_boot, get_translated_doctypes
-from frappe.utils import add_user_info, cstr, get_time_zone
+from frappe.utils import add_user_info, cstr, get_system_timezone
from frappe.utils.change_log import get_versions
from frappe.website.doctype.web_page_view.web_page_view import is_tracking_enabled
@@ -402,9 +402,9 @@ def get_link_title_doctypes():
def set_time_zone(bootinfo):
bootinfo.time_zone = {
- "system": get_time_zone(),
+ "system": get_system_timezone(),
"user": bootinfo.get("user_info", {}).get(frappe.session.user, {}).get("time_zone", None)
- or get_time_zone(),
+ or get_system_timezone(),
}
diff --git a/frappe/core/doctype/communication/communication.py b/frappe/core/doctype/communication/communication.py
index 6b948947a8..adeac35204 100644
--- a/frappe/core/doctype/communication/communication.py
+++ b/frappe/core/doctype/communication/communication.py
@@ -554,9 +554,6 @@ def update_parent_document_on_communication(doc):
parent.db_set("status", "Open")
parent.run_method("handle_hold_time", "Replied")
apply_assignment_rule(parent)
- else:
- # update the modified date for document
- parent.update_modified()
update_first_response_time(parent, doc)
set_avg_response_time(parent, doc)
diff --git a/frappe/core/doctype/report/report.js b/frappe/core/doctype/report/report.js
index 9850dbf98f..fdbda8de9c 100644
--- a/frappe/core/doctype/report/report.js
+++ b/frappe/core/doctype/report/report.js
@@ -44,6 +44,14 @@ frappe.ui.form.on("Report", {
doc.disabled ? "fa fa-check" : "fa fa-off"
);
}
+
+ frm.set_query("ref_doctype", () => {
+ return {
+ filters: {
+ istable: 0,
+ },
+ };
+ });
},
ref_doctype: function (frm) {
diff --git a/frappe/core/doctype/rq_job/rq_job.py b/frappe/core/doctype/rq_job/rq_job.py
index 8e69dd3650..af34955de8 100644
--- a/frappe/core/doctype/rq_job/rq_job.py
+++ b/frappe/core/doctype/rq_job/rq_job.py
@@ -15,7 +15,7 @@ from frappe.model.document import Document
from frappe.utils import (
cint,
compare,
- convert_utc_to_user_timezone,
+ convert_utc_to_system_timezone,
create_batch,
make_filter_dict,
)
@@ -132,14 +132,14 @@ def serialize_job(job: Job) -> frappe._dict:
queue=job.origin.rsplit(":", 1)[1],
job_name=job_name,
status=job.get_status(),
- started_at=convert_utc_to_user_timezone(job.started_at) if job.started_at else "",
- ended_at=convert_utc_to_user_timezone(job.ended_at) if job.ended_at else "",
+ started_at=convert_utc_to_system_timezone(job.started_at) if job.started_at else "",
+ ended_at=convert_utc_to_system_timezone(job.ended_at) if job.ended_at else "",
time_taken=(job.ended_at - job.started_at).total_seconds() if job.ended_at else "",
exc_info=job.exc_info,
arguments=frappe.as_json(job.kwargs),
timeout=job.timeout,
- creation=convert_utc_to_user_timezone(job.created_at),
- modified=convert_utc_to_user_timezone(modified),
+ creation=convert_utc_to_system_timezone(job.created_at),
+ modified=convert_utc_to_system_timezone(modified),
_comment_count=0,
owner=job.kwargs.get("user"),
modified_by=job.kwargs.get("user"),
diff --git a/frappe/core/doctype/rq_worker/rq_worker.py b/frappe/core/doctype/rq_worker/rq_worker.py
index 1d24001fc3..ce2f4ca8b2 100644
--- a/frappe/core/doctype/rq_worker/rq_worker.py
+++ b/frappe/core/doctype/rq_worker/rq_worker.py
@@ -8,7 +8,7 @@ from rq import Worker
import frappe
from frappe.model.document import Document
-from frappe.utils import cint, convert_utc_to_user_timezone
+from frappe.utils import cint, convert_utc_to_system_timezone
from frappe.utils.background_jobs import get_workers
@@ -66,14 +66,14 @@ def serialize_worker(worker: Worker) -> frappe._dict:
status=worker.get_state(),
pid=worker.pid,
current_job_id=worker.get_current_job_id(),
- last_heartbeat=convert_utc_to_user_timezone(worker.last_heartbeat),
- birth_date=convert_utc_to_user_timezone(worker.birth_date),
+ last_heartbeat=convert_utc_to_system_timezone(worker.last_heartbeat),
+ birth_date=convert_utc_to_system_timezone(worker.birth_date),
successful_job_count=worker.successful_job_count,
failed_job_count=worker.failed_job_count,
total_working_time=worker.total_working_time,
_comment_count=0,
- modified=convert_utc_to_user_timezone(worker.last_heartbeat),
- creation=convert_utc_to_user_timezone(worker.birth_date),
+ modified=convert_utc_to_system_timezone(worker.last_heartbeat),
+ creation=convert_utc_to_system_timezone(worker.birth_date),
utilization_percent=compute_utilization(worker),
)
diff --git a/frappe/core/doctype/system_settings/system_settings.js b/frappe/core/doctype/system_settings/system_settings.js
index 1de4dd82e7..1d5ba7ddb0 100644
--- a/frappe/core/doctype/system_settings/system_settings.js
+++ b/frappe/core/doctype/system_settings/system_settings.js
@@ -39,4 +39,21 @@ frappe.ui.form.on("System Settings", {
first_day_of_the_week(frm) {
frm.re_setup_moment = true;
},
+
+ rounding_method: function (frm) {
+ if (frm.doc.rounding_method == frappe.boot.sysdefaults.rounding_method) return;
+ let msg = __(
+ "Changing rounding method on site with data can result in unexpected behaviour."
+ );
+ msg += "