Skip to content
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

fix: alternate formula eval implementation (backport #902) #905

Merged
merged 3 commits into from
Sep 22, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Sep 22, 2023

This is an automatic backport of pull request #902 done by Mergify.
Cherry-pick of 7fb3508 has failed:

On branch mergify/bp/version-14-hotfix/pr-902
Your branch is up to date with 'origin/version-14-hotfix'.

You are currently cherry-picking commit 7fb3508e.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   hrms/payroll/doctype/salary_slip/salary_slip.py
	both modified:   hrms/payroll/doctype/salary_slip/test_salary_slip.py

no changes added to commit (use "git add" and/or "git commit -a")

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

ankush and others added 2 commits September 22, 2023 08:50
Current frappe.safe_eval transforms code so if you have nested
iterations with too much depth then it can hit recursion limit of python.

There's no workaround for this and people need large formulas in some
countries, so this is alternate implementation for that.

(cherry picked from commit 7fb3508)

# Conflicts:
#	hrms/payroll/doctype/salary_slip/salary_slip.py
#	hrms/payroll/doctype/salary_slip/test_salary_slip.py
@ankush ankush removed the conflicts label Sep 22, 2023
@codecov-commenter
Copy link

Codecov Report

Merging #905 (06f319e) into version-14-hotfix (6a252ad) will increase coverage by 0.05%.
The diff coverage is 96.00%.

@@                  Coverage Diff                  @@
##           version-14-hotfix     #905      +/-   ##
=====================================================
+ Coverage              73.53%   73.58%   +0.05%     
=====================================================
  Files                    193      193              
  Lines                   9972     9996      +24     
=====================================================
+ Hits                    7333     7356      +23     
- Misses                  2639     2640       +1     
Files Changed Coverage
hrms/payroll/doctype/salary_slip/salary_slip.py 96.00%

@ruchamahabal ruchamahabal merged commit 5eccb33 into version-14-hotfix Sep 22, 2023
7 checks passed
@mergify mergify bot deleted the mergify/bp/version-14-hotfix/pr-902 branch September 22, 2023 10:28
@frappe-pr-bot
Copy link
Collaborator

🎉 This PR is included in version 14.11.1 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants