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: Retention Bonus doc cancellation. #1189

Merged
merged 4 commits into from
Dec 26, 2023

Conversation

SajadAlimoradi
Copy link
Contributor

On cancellation, the user encounters the following error:
AttributeError - 'RetentionBonus' object has no attribute 'additional_salary'.

On cancellation, the user encounters the following error:
    AttributeError - 'RetentionBonus' object has no attribute 'additional_salary'.
@ruchamahabal ruchamahabal changed the title Fix (retention_bonus): doctype cancellation. fix: Retention Bonus doc cancellation. Dec 25, 2023
@ruchamahabal ruchamahabal merged commit e64cbde into frappe:develop Dec 26, 2023
7 of 8 checks passed
mergify bot pushed a commit that referenced this pull request Dec 26, 2023
* Fix (retention_bonus): doctype cancellation.
On cancellation, the user encounters the following error:
    AttributeError - 'RetentionBonus' object has no attribute 'additional_salary'.

* fix(retention_bonus): convert all of 'self.additional_salary' to 'additional_salary'  in cancel function

(cherry picked from commit e64cbde)
mergify bot pushed a commit that referenced this pull request Dec 26, 2023
* Fix (retention_bonus): doctype cancellation.
On cancellation, the user encounters the following error:
    AttributeError - 'RetentionBonus' object has no attribute 'additional_salary'.

* fix(retention_bonus): convert all of 'self.additional_salary' to 'additional_salary'  in cancel function

(cherry picked from commit e64cbde)
ruchamahabal pushed a commit that referenced this pull request Dec 26, 2023
* Fix (retention_bonus): doctype cancellation.
On cancellation, the user encounters the following error:
    AttributeError - 'RetentionBonus' object has no attribute 'additional_salary'.

* fix(retention_bonus): convert all of 'self.additional_salary' to 'additional_salary'  in cancel function

(cherry picked from commit e64cbde)

Co-authored-by: Sajad Alimoradi <[email protected]>
ruchamahabal pushed a commit that referenced this pull request Dec 26, 2023
* Fix (retention_bonus): doctype cancellation.
On cancellation, the user encounters the following error:
    AttributeError - 'RetentionBonus' object has no attribute 'additional_salary'.

* fix(retention_bonus): convert all of 'self.additional_salary' to 'additional_salary'  in cancel function

(cherry picked from commit e64cbde)

Co-authored-by: Sajad Alimoradi <[email protected]>
frappe-pr-bot pushed a commit that referenced this pull request Dec 27, 2023
## [14.20.1](v14.20.0...v14.20.1) (2023-12-27)

### Bug Fixes

* **Payroll:** accrual entry creation fails if any employee has no earnings (backport [#1214](#1214)) ([#1215](#1215)) ([451c622](451c622))
* Retention Bonus doc cancellation. (backport [#1189](#1189)) ([#1208](#1208)) ([a8a1341](a8a1341))
frappe-pr-bot pushed a commit that referenced this pull request Dec 27, 2023
## [15.7.1](v15.7.0...v15.7.1) (2023-12-27)

### Bug Fixes

* **Payroll:** accrual entry creation fails if any employee has no earnings (backport [#1214](#1214)) ([#1216](#1216)) ([12e5e66](12e5e66))
* Retention Bonus doc cancellation. (backport [#1189](#1189)) ([#1209](#1209)) ([40d68ea](40d68ea))
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants