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: Better budget exceeding validation messages #33713

Merged
merged 2 commits into from
Jan 21, 2023

Conversation

deepeshgarg007
Copy link
Member

@deepeshgarg007 deepeshgarg007 commented Jan 18, 2023

There are scenarios where the budget validation can be a bit deceiving.

The budget actions like "Ignore", "Warn" and "Stop" can be updated even after submitting the budget record.
Many times user updates the budget action as "Ignore" and then exceeds the yearly budget and then again updates the action as "Stop"

In such cases, the Monthly accumulated budget validation is a bit confusing to the users, first yearly budget should be checked in each case.

Made some other minor fixes in the message as well

@github-actions github-actions bot added the needs-tests This PR needs automated unit-tests. label Jan 18, 2023
@codecov
Copy link

codecov bot commented Jan 18, 2023

Codecov Report

Merging #33713 (d4ba668) into develop (d7522d4) will increase coverage by 0.01%.
The diff coverage is 92.30%.

Additional details and impacted files
@@             Coverage Diff             @@
##           develop   #33713      +/-   ##
===========================================
+ Coverage    64.14%   64.15%   +0.01%     
===========================================
  Files          819      819              
  Lines        59160    59181      +21     
===========================================
+ Hits         37946    37969      +23     
+ Misses       21214    21212       -2     
Impacted Files Coverage Δ
erpnext/accounts/doctype/budget/budget.py 92.02% <92.30%> (+0.21%) ⬆️
...e/subcontracting_receipt/subcontracting_receipt.py 91.39% <0.00%> (-0.50%) ⬇️
...ext/stock/doctype/item_attribute/item_attribute.py 88.09% <0.00%> (-0.28%) ⬇️
erpnext/stock/doctype/serial_no/serial_no.py 89.20% <0.00%> (-0.24%) ⬇️
erpnext/stock/doctype/pick_list/pick_list.py 77.94% <0.00%> (-0.08%) ⬇️
erpnext/projects/doctype/timesheet/timesheet.py 78.31% <0.00%> (ø)
erpnext/manufacturing/doctype/bom/bom.py 88.08% <0.00%> (+0.09%) ⬆️
erpnext/stock/get_item_details.py 80.78% <0.00%> (+0.17%) ⬆️
...xt/accounts/doctype/sales_invoice/sales_invoice.py 82.14% <0.00%> (+0.25%) ⬆️
...evenue_and_expense/deferred_revenue_and_expense.py 61.61% <0.00%> (+0.30%) ⬆️
... and 1 more

@deepeshgarg007 deepeshgarg007 merged commit 2f03dcb into frappe:develop Jan 21, 2023
@deepeshgarg007 deepeshgarg007 added the backport version-14-hotfix backport to version 14 label Jan 21, 2023
mergify bot pushed a commit that referenced this pull request Jan 21, 2023
* fix: Better budget exceeding validation messages

* chore: remove unwanted changes

(cherry picked from commit 2f03dcb)
deepeshgarg007 pushed a commit that referenced this pull request Jan 22, 2023
fix: Better budget exceeding validation messages (#33713)
frappe-pr-bot pushed a commit that referenced this pull request Jan 25, 2023
# [14.14.0](v14.13.0...v14.14.0) (2023-01-25)

### Bug Fixes

* Better budget exceeding validation messages ([#33713](#33713)) ([4be8375](4be8375))
* bom.json updated ([9469488](9469488))
* calculate correct amount for qty == 0 ([#33739](#33739)) ([1c1c903](1c1c903))
* don't add template item in sales/purchase transaction ([8c12f7f](8c12f7f))
* **ecommerce:** breadcrumb: fallback to `/all-products` ([#33718](#33718)) ([1a33324](1a33324))
* fb issue in asset chart, asset split and reverse_depreciation_entry_made_after_disposal ([dffdc67](dffdc67))
* hide with_operation on selection on fg_based and vice versa ([8ee6db3](8ee6db3))
* incorrect `rate` and `amount` in MR Item ([#33547](#33547)) ([ff731ea](ff731ea))
* incorrect actual qty for the packed item ([bcd1fca](bcd1fca))
* incorrect row order and accumulated_depreciation when schedule with multiple FBs is scrapped ([96f9b34](96f9b34))
* linting ([dedc9ec](dedc9ec))
* local variable 'stock_rbnb' referenced before assignment ([21cf929](21cf929))
* minor change in bom.js added ([19aa237](19aa237))
* minor changes added ([7fd8cef](7fd8cef))
* **minor:** Label updates in Statement of Accounts ([#33639](#33639)) ([8af9a2f](8af9a2f))
* missing constant definition ([219aa81](219aa81))
* not able to change default BOM in the Subcontracting Order ([ed1aed2](ed1aed2))
* Patch to update reference_due_date in Journal Entry ([#33616](#33616)) ([0740120](0740120))
* **pricing rule:** free item duplication ([#33746](#33746)) ([5a49884](5a49884))
* rewrite logic for duplicate check in Item Attribute ([6544cb8](6544cb8))
* Short closed order, receipt, and delivery note status on cancellation ([#33743](#33743)) ([89f1eef](89f1eef))
* TDS deduction in payment entry ([#33747](#33747)) ([f9a43e5](f9a43e5))
* test case added for FG_BASED OPERTING COST ([30af8c3](30af8c3))
* the frappe throw message is corrected in the group task validation ([cf43930](cf43930))
* use hash based naming for tax withheld vouchers child table (backport [#33643](#33643)) ([#33748](#33748)) ([cf6d454](cf6d454))
* web supplier quotation ([ceef2d6](ceef2d6))

### Features

* Add operating cost based on bom quanity without creating job card ([0035ee2](0035ee2))
* get items from Transit Stock Entry ([31fd6f3](31fd6f3))
@barredterra barredterra mentioned this pull request Mar 7, 2023
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Jun 15, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
backport version-14-hotfix backport to version 14 needs-tests This PR needs automated unit-tests.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant