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(Employee Advance): Return/Deduction from Salary button visibility (backport #31011) #31012

Merged

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented May 13, 2022

This is an automatic backport of pull request #31011 done by Mergify.


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

@ruchamahabal ruchamahabal merged commit 5b1d85e into version-13-hotfix May 13, 2022
@mergify mergify bot deleted the mergify/bp/version-13-hotfix/pr-31011 branch May 13, 2022 14:37
frappe-pr-bot pushed a commit that referenced this pull request May 17, 2022
# [13.30.0](v13.29.2...v13.30.0) (2022-05-17)

### Bug Fixes

* `set_missing_values` in SE and re-use the same on all SE mappings ([fe52c1f](fe52c1f))
* Add validation for SEZ and Export invoices without payment of taxes ([cb8453d](cb8453d))
* allow to use formatting for the field to_discuss in opportunity ([e126d4e](e126d4e))
* Block 0 Qty via Update Items to be consistent with form validation ([5647875](5647875))
* Calculate totals even though pricing rule is not applied on mapped doc ([678a01d](678a01d))
* **charts:** Pass fieldtype for chart data in selling reports ([917e7c3](917e7c3))
* conflicts ([87fd933](87fd933))
* conflicts ([fb62bbf](fb62bbf))
* disable pricing rules for internal transfers (backport [#31034](#31034)) ([#31036](#31036)) ([d5eb9fb](d5eb9fb))
* discount ledger entry in case of multicurrency invoice ([#31047](#31047)) ([c3417e4](c3417e4))
* dont fail repost for recoverable errors (backport [#30979](#30979)) ([#31023](#31023)) ([a019cb6](a019cb6))
* **Employee Advance:** Return/Deduction from Salary button visibility (backport [#31011](#31011)) ([#31012](#31012)) ([5b1d85e](5b1d85e))
* Failing accounting dimension patch ([b14a7b8](b14a7b8))
* german translations for Employee ([b9bda04](b9bda04))
* gl entry validation for miniscule loan penalty ([e958ef2](e958ef2))
* hide template items from sales/purchase order ([8b99f43](8b99f43))
* IN time not captured in Attendance through Employee Checkin (backport [#31029](#31029)) ([#31031](#31031)) ([477bbcc](477bbcc))
* Item rate reset on changing posting date ([#30990](#30990)) ([8ef649f](8ef649f))
* Just add one rate in GST HSN Code ([ed76687](ed76687))
* Merge Conflicts ([3abf264](3abf264))
* Multiple fixes in GSTR-1 report ([f2cbb70](f2cbb70))
* **patch:** avoid checking for return field if it doesnt exits (backport [#30995](#30995)) ([#30997](#30997)) ([a94b5c0](a94b5c0))
* per_billed for return DN (backport [#30868](#30868)) ([#30971](#30971)) ([97ea1f5](97ea1f5))
* precision loss when transferring  (backport [#30834](#30834)) ([#31032](#31032)) ([fc80a50](fc80a50))
* precision of total penalty paid ([ad21853](ad21853))
* precision of total penalty paid ([5c45737](5c45737))
* prevent bypassing forced valuation rate (backport [#30987](#30987)) ([#31020](#31020)) ([706c19d](706c19d))
* pro rata calculation for monthly depreciation ([#30989](#30989)) ([408d952](408d952))
* remove item attribute limit from variant selector (backport [#31026](#31026)) ([#31028](#31028)) ([1f016e9](1f016e9))
* Set actual qty and basic rate in SE on warehouse triggers (`get_warehouse_details`) ([30b0aee](30b0aee))
* stock analytics report shows incorrect data there's no stock movement in a period (backport [#30945](#30945)) ([#30980](#30980)) ([295ffb3](295ffb3))
* translation for status filter ([e5f8231](e5f8231))
* **translations:** Update ru translations ([#30992](#30992)) ([f797005](f797005))
* TypeError in add_indicator_for_multicompany (backport [#31042](#31042)) ([#31048](#31048)) ([e24bb1d](e24bb1d))
* unlink Attendance from Employee Checkins on cancellation (backport [#31045](#31045)) ([#31049](#31049)) ([e03fe97](e03fe97))
* UOM in HSN-wise summary of outward supply ([cd7d5cd](cd7d5cd))
* user can select disabled accounts in taxes table ([047c879](047c879))
* validate disabled accounts before posting ledger entries ([515e49b](515e49b))
* validate on hold purchase invoices in payment entry ([9fbd170](9fbd170))

### Features

* add Employee Status filter in leave balance reports ([716b525](716b525))
* add Link to Opportunity ([#30614](#30614)) ([bc23bc7](bc23bc7))
* request_for_quotation ([db4e264](db4e264))
* request_for_quotation - refactor ([b6a3e69](b6a3e69))
* select multiple values for accounting dimension (backport [#31015](#31015)) ([#31041](#31041)) ([9c21eb5](9c21eb5))
@frappe-pr-bot
Copy link
Collaborator

🎉 This PR is included in version 13.30.0 🎉

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.

2 participants