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

feat(FnF): Option to recover asset costs instead of returning (backport #1611) #1691

Merged
merged 11 commits into from
Apr 20, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Apr 20, 2024

Consider a scenario where you allocate some assets to the employee like laptops/uniforms. In some cases, you might not want to return the asset to the company but instead, recover the asset cost and let the employee own the asset.

You can set "Action" as "Recover Cost" in such cases against the assets. This will add the Total Asset Cost for that asset to the Total Receivable Amount.

image


This is an automatic backport of pull request #1611 done by [Mergify](https://mergify.com).

(cherry picked from commit e053570)

# Conflicts:
#	hrms/hr/doctype/full_and_final_asset/full_and_final_asset.json
#	hrms/hr/doctype/full_and_final_statement/full_and_final_statement.json
- adjust column widths

- grant cancel perms to HR Manager

(cherry picked from commit 0a4ea6d)

# Conflicts:
#	hrms/hr/doctype/full_and_final_asset/full_and_final_asset.json
#	hrms/hr/doctype/full_and_final_outstanding_statement/full_and_final_outstanding_statement.json
#	hrms/hr/doctype/full_and_final_statement/full_and_final_statement.json
(cherry picked from commit 7f3f5d1)

# Conflicts:
#	hrms/hr/doctype/full_and_final_statement/full_and_final_statement.js
- fix total calculation

(cherry picked from commit 639dc7a)
(cherry picked from commit 9977a47)

# Conflicts:
#	hrms/hr/doctype/full_and_final_asset/full_and_final_asset.json
(cherry picked from commit 8851825)
(cherry picked from commit bb2c041)

# Conflicts:
#	hrms/hr/doctype/full_and_final_outstanding_statement/full_and_final_outstanding_statement.json
#	hrms/hr/doctype/full_and_final_statement/full_and_final_statement.json
@mergify mergify bot added the conflicts label Apr 20, 2024
@mergify mergify bot requested a review from ruchamahabal as a code owner April 20, 2024 09:17
Copy link
Contributor Author

mergify bot commented Apr 20, 2024

Cherry-pick of e053570 has failed:

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

You are currently cherry-picking commit e05357082.
  (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)

Changes to be committed:
	modified:   hrms/hr/doctype/full_and_final_statement/full_and_final_statement.py

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   hrms/hr/doctype/full_and_final_asset/full_and_final_asset.json
	both modified:   hrms/hr/doctype/full_and_final_statement/full_and_final_statement.json

Cherry-pick of 0a4ea6d has failed:

On branch mergify/bp/version-15-hotfix/pr-1611
Your branch is ahead of 'origin/version-15-hotfix' by 2 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit 0a4ea6d10.
  (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)

Changes to be committed:
	modified:   hrms/hr/doctype/full_and_final_statement/full_and_final_statement.py

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   hrms/hr/doctype/full_and_final_asset/full_and_final_asset.json
	both modified:   hrms/hr/doctype/full_and_final_outstanding_statement/full_and_final_outstanding_statement.json
	both modified:   hrms/hr/doctype/full_and_final_statement/full_and_final_statement.json

Cherry-pick of 7f3f5d1 has failed:

On branch mergify/bp/version-15-hotfix/pr-1611
Your branch is ahead of 'origin/version-15-hotfix' by 3 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit 7f3f5d123.
  (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/hr/doctype/full_and_final_statement/full_and_final_statement.js

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

Cherry-pick of 9977a47 has failed:

On branch mergify/bp/version-15-hotfix/pr-1611
Your branch is ahead of 'origin/version-15-hotfix' by 5 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit 9977a47c9.
  (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)

Changes to be committed:
	modified:   hrms/hr/doctype/full_and_final_statement/full_and_final_statement.py

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   hrms/hr/doctype/full_and_final_asset/full_and_final_asset.json

Cherry-pick of bb2c041 has failed:

On branch mergify/bp/version-15-hotfix/pr-1611
Your branch is ahead of 'origin/version-15-hotfix' by 8 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit bb2c04174.
  (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/hr/doctype/full_and_final_outstanding_statement/full_and_final_outstanding_statement.json
	both modified:   hrms/hr/doctype/full_and_final_statement/full_and_final_statement.json

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/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@ruchamahabal ruchamahabal merged commit 93f337f into version-15-hotfix Apr 20, 2024
6 of 7 checks passed
@mergify mergify bot deleted the mergify/bp/version-15-hotfix/pr-1611 branch April 20, 2024 09:58
@frappe-pr-bot
Copy link
Collaborator

🎉 This PR is included in version 15.20.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