Skip to content

Version 15 #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3,468 commits into
base: develop
Choose a base branch
from
Open

Version 15 #4

wants to merge 3,468 commits into from

Conversation

RijinRaju
Copy link
Contributor

Title: Merge Version 15 into Develop

Description:

This pull request aims to merge the version-15 branch into the develop branch.
Key Changes:
    Updated splash logo.
    Other enhancements and bug fixes.

Commits:

Develop branch:
    Last commit: [updated about section](https://github.com/thinknxg/thinknxg/commit/edc5660d0f0994f166d95da15b5e1d530fec4a82) by [Rijin Raju](https://github.com/RijinRaju)
Version-15 branch:
    Last commit: [Fix: updated splash logo](https://github.com/thinknxg/thinknxg/commit/035f9248ea5ff6c4b54acc01b288778f2aae7b9e) by [Rijin Raju](https://github.com/RijinRaju)

Testing:

Ensure all unit tests and integration tests pass.
Perform manual testing to verify the updated splash logo and other changes.

Related Issues:

None specified.

Additional Notes:

Please review the changes carefully and ensure that they align with the project requirements.

Reviewer Checklist:

Code follows the project's coding standards.
Changes are adequately tested.
Documentation is updated where necessary.
All checks have passed.

ruthra-kumar and others added 29 commits April 18, 2025 14:48
fix: remove custom font to end of font list (backport #32191)
## [15.65.2](frappe/frappe@v15.65.1...v15.65.2) (2025-04-18)

### Bug Fixes

* remove custom font from base font list ([283a0eb](frappe/frappe@283a0eb))
(cherry picked from commit b9998bbcb2e6fbe88f22f78e4fc491d4dcb1d281)
(cherry picked from commit 79a24c895efc3840060f594ef4cc47c016f56816)
…-32196

fix: language change on setup wizard doesnt load options (backport #32196)
Also adds support for data fields containing coordinates.

(cherry picked from commit 5af583c67539e381ccc00249451646ae50fabe34)
(cherry picked from commit 9bd06d79d31db96f3681f09763e4f41da27d9793)
These are already included in desk bundle.

(cherry picked from commit d014f73632c2c10bc82a32f3c7c624f30dd4a02c)
(cherry picked from commit 87a1538cef50b8e223b53207eb27072c6bfba1b0)
Map and controls are created during `setup_view`; data fetching and rendering happnes in `render`. This way we don't have to create a new map every time filters change or the view is refreshed.

(cherry picked from commit ffd04624cbf5471fb0a7d17241587ba5b0a01cb4)
Let's users view entries in their proximity.

(cherry picked from commit 36d900adebe34c2b0eaf8de94996ebe1abbacd48)
When adding and removing attachments, the comments in the timeline show redundant messages like:

When adding: You attached Added file.csv
When removing: You removed attachment Removed file.csv

Removed the "Added" and "Removed" prefix from the filenames and show correct comments as below:

When adding: You attached file.csv
When removing: You removed attachment file.csv

(cherry picked from commit df8ae332b9755571c41c15234bd16cfa5ec57c1f)
…-32194

fix: return after setting value in set_route_filters (backport #32194)
…-32178

fix: redundant comment in form timeline (backport #32178)
It works without changing language because the timezone was auto-filled on country selection.

(cherry picked from commit f7f408bfd271b883c1b3fa5bb8b337a3deb85b8d)

Co-authored-by: Suhail <63963181+BreadGenie@users.noreply.github.com>
(cherry picked from commit 83b6231f957ed24fe6ecb4718c12a482c54c7f71)
…nged (#32224) (#32225)

(cherry picked from commit d5adcf43232c352126c0f3a7e127b0fa55e1e25d)

Co-authored-by: Suhail <63963181+BreadGenie@users.noreply.github.com>
Defaults to True so that it behaves the same way as `make_custom_field`.

(cherry picked from commit 30eb14a7ddc72e256064ea05c97143281890c071)
…-32229

fix: add param `is_system_generated=True` to `make_property_setter` (backport #32229)
Signed-off-by: Akhil Narang <me@akhilnarang.dev>
(cherry picked from commit 4848fbda0b5ba01ba5c563d6b33737276979b1a9)

# Conflicts:
#	frappe/email/doctype/email_queue/email_queue.py
No point having 2 steps, if the user has ended up here they do want to send the email.

Signed-off-by: Akhil Narang <me@akhilnarang.dev>
(cherry picked from commit 81813548e905bd7c72a230eadd70af46e75e2850)

# Conflicts:
#	frappe/email/doctype/email_queue/email_queue.py
Signed-off-by: Akhil Narang <me@akhilnarang.dev>
(cherry picked from commit 9cf718b8f6c2eba65715c50a99e3814c29e4c0ce)
Signed-off-by: Akhil Narang <me@akhilnarang.dev>
(cherry picked from commit 7255c5fdf21f9ddf05b0e395d6f2c4bb5886e380)
sagarvora and others added 29 commits June 6, 2025 18:02
…-32829

fix: allow `0` to be a default value for dialog fields (backport #32829)
(cherry picked from commit 3c41ec9e435091391b7d874341baa4acb139ac7b)
(cherry picked from commit 4fe4bb462d672ddad46eb719458633f4513a1432)
…-32633

fix: handle imap abort in email server (backport #32633)
* feat: `get_settings` (#32821)

* feat: get_settings

get_cached_value doesn't work well with singles because you either need
to pass `None` or repeat doctype name... both are awekward and easy to
shoot yourself in foot with.

* refactor: Use cached settings

(cherry picked from commit caf415f13e529dd714115bef5f5698e00d60ded5)

# Conflicts:
#	frappe/__init__.py
#	frappe/tests/test_test_utils.py

* chore: conflicts

* refactor: Rename get_settings -> get_single_value

Not all single doctypes are settings, so this is better. Implicit
caching is fine, same is done for `db` APIs on singles. We *should* aim
for 100% correctness of caching implementation, especially for singles.

Thanks to @netchampfaris for the suggestion.

---------

Co-authored-by: Ankush Menat <ankush@frappe.io>
(cherry picked from commit d727b16a2b7477a6fbab527f025e127a58870c43)

# Conflicts:
#	frappe/core/doctype/communication/communication.py
…-32814

fix: show communication based on recipient and sender (backport #32814)
…-15-hotfix/pr-32539

Revert "fix: query report read permission issue (backport #32539)"
…te reports (#32854) (#32873)

Otherwise by default you can't view those reports - the report builder page doesn't work for those.

(cherry picked from commit 43eb27c8075b937272c1d4b4880a99e66ee17239)

Co-authored-by: Akhil Narang <me@akhilnarang.dev>
(cherry picked from commit ca5b4cea0b89cea3e4a7d13926a456e3c34399ee)

Co-authored-by: Aayush Dalal <aayush.dalal4314@gmail.com>
(cherry picked from commit af490b4e1235ef33980712888fdaf3a94d710c4f)

# Conflicts:
#	frappe/core/doctype/communication/communication.py
#	frappe/email/receive.py
…-32878

fix: set bcc in emails (backport #32878)
# [15.70.0](frappe/frappe@v15.69.3...v15.70.0) (2025-06-10)

### Bug Fixes

* add a retry limit to fetching messages ([dcab73a](frappe/frappe@dcab73a))
* add h4 to h6 tags in text editor text dropdown ([feed881](frappe/frappe@feed881))
* allow `0` to be a default value for dialog fields ([4160a7b](frappe/frappe@4160a7b))
* allow deleteion of docs despite workflow ([786a0e7](frappe/frappe@786a0e7))
* Get field currency based on default company if company is not available on doc ([#32445](frappe/frappe#32445)) ([#32777](frappe/frappe#32777)) ([72d342d](frappe/frappe@72d342d))
* handle imap abort in email server ([96b3d9c](frappe/frappe@96b3d9c))
* remove conflicts ([ef489a0](frappe/frappe@ef489a0))
* remove merge conflicts ([d3a7872](frappe/frappe@d3a7872))
* resolve merge conflicts ([dd61560](frappe/frappe@dd61560))
* set bcc in emails ([fb677c2](frappe/frappe@fb677c2))
* show communication based on recipient and sender ([c4b6d6e](frappe/frappe@c4b6d6e))
* Standard field falsy comparisons in db_query ([#32791](frappe/frappe#32791)) ([#32793](frappe/frappe#32793)) ([f3a2d9b](frappe/frappe@f3a2d9b))
* sync translations from crowdin ([#32683](frappe/frappe#32683)) ([3d1f27e](frappe/frappe@3d1f27e))
* throw permission error ([#32860](frappe/frappe#32860)) ([#32864](frappe/frappe#32864)) ([cfd20a4](frappe/frappe@cfd20a4))
* **UX:** show source of automatically created document ([#32768](frappe/frappe#32768)) ([#32771](frappe/frappe#32771)) ([5180c3a](frappe/frappe@5180c3a))
* **web_form:** row number column in child tables were showing the wrong title ([#32813](frappe/frappe#32813)) ([1d2ea29](frappe/frappe@1d2ea29)), closes [#32331](frappe/frappe#32331)
* **widget_dialog:** set `is_query_report` automatically for appropriate reports ([#32854](frappe/frappe#32854)) ([#32873](frappe/frappe#32873)) ([2d4108c](frappe/frappe@2d4108c))

### Features

* `frappe.get_single_value` (backport [#32821](frappe/frappe#32821)) ([#32824](frappe/frappe#32824)) ([c48c2f1](frappe/frappe@c48c2f1))

### Reverts

* Revert "fix: single checkbox to track telemetry & allow recording" ([#32749](frappe/frappe#32749)) ([#32750](frappe/frappe#32750)) ([19221ed](frappe/frappe@19221ed))
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.