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: update repay_from_salary and payroll_payable_account fields #851

Merged
merged 1 commit into from
Sep 6, 2023
Merged

fix: update repay_from_salary and payroll_payable_account fields #851

merged 1 commit into from
Sep 6, 2023

Conversation

anandbaburajan
Copy link
Contributor

@anandbaburajan anandbaburajan commented Sep 4, 2023

  • Making Loan Repayment's repay_from_salary editable
  • Moving Loan Repayment's Payroll Payable Account to a better position (among other accounts)

@ruchamahabal ruchamahabal merged commit d6c812e into frappe:develop Sep 6, 2023
7 checks passed
mergify bot pushed a commit that referenced this pull request Sep 6, 2023
(cherry picked from commit d6c812e)

# Conflicts:
#	hrms/patches.txt
#	hrms/setup.py
Comment on lines +10 to +16
if frappe.db.exists("Custom Field", {"name": "Loan Repayment-payroll_payable_account"}):
frappe.db.set_value(
"Custom Field",
{"name": "Loan Repayment-payroll_payable_account"},
"insert_after",
"payment_account",
)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this was placed with the repay from salary checkbox since its visibility is dependent on toggling the checkbox. But moving it to the accounts section for context is also fine IG.

ruchamahabal added a commit that referenced this pull request Sep 6, 2023
…kport #851) (#854)

Co-authored-by: Anand Baburajan <anandbaburajan@gmail.com>
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
fix: update repay_from_salary and payroll_payable_account fields (#851)
frappe-pr-bot pushed a commit that referenced this pull request Sep 6, 2023
## [14.10.5](v14.10.4...v14.10.5) (2023-09-06)

### Bug Fixes

* unwanted gain/loss on base currency exp claims ([94c7ddd](94c7ddd))
* update repay_from_salary and payroll_payable_account fields (backport [#851](#851)) ([#854](#854)) ([43ee8cb](43ee8cb))
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