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: asset depreciation ledger (backport #37991) (backport #37992) #37997

Closed

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Nov 8, 2023

This is an automatic backport of pull request #37992 done by Mergify.
Cherry-pick of 043dc1b has failed:

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

You are currently cherry-picking commit 043dc1b14b.
  (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:   erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.js
	modified:   erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py
	modified:   erpnext/accounts/report/balance_sheet/balance_sheet.js
	modified:   erpnext/accounts/report/cash_flow/cash_flow.js
	modified:   erpnext/accounts/report/consolidated_financial_statement/consolidated_financial_statement.js
	modified:   erpnext/accounts/report/general_ledger/general_ledger.js
	modified:   erpnext/accounts/report/general_ledger/general_ledger.py
	modified:   erpnext/accounts/report/trial_balance/trial_balance.js
	modified:   erpnext/assets/report/fixed_asset_register/fixed_asset_register.js
	modified:   erpnext/assets/report/fixed_asset_register/fixed_asset_register.py
	modified:   erpnext/translations/af.csv
	modified:   erpnext/translations/am.csv
	modified:   erpnext/translations/ar.csv
	modified:   erpnext/translations/bg.csv
	modified:   erpnext/translations/bn.csv
	modified:   erpnext/translations/bs.csv
	modified:   erpnext/translations/ca.csv
	modified:   erpnext/translations/cs.csv
	modified:   erpnext/translations/da.csv
	modified:   erpnext/translations/de.csv
	modified:   erpnext/translations/el.csv
	modified:   erpnext/translations/es.csv
	modified:   erpnext/translations/et.csv
	modified:   erpnext/translations/fa.csv
	modified:   erpnext/translations/fi.csv
	modified:   erpnext/translations/fr.csv
	modified:   erpnext/translations/gu.csv
	modified:   erpnext/translations/he.csv
	modified:   erpnext/translations/hi.csv
	modified:   erpnext/translations/hr.csv
	modified:   erpnext/translations/hu.csv
	modified:   erpnext/translations/id.csv
	modified:   erpnext/translations/is.csv
	modified:   erpnext/translations/it.csv
	modified:   erpnext/translations/ja.csv
	modified:   erpnext/translations/km.csv
	modified:   erpnext/translations/kn.csv
	modified:   erpnext/translations/ko.csv
	modified:   erpnext/translations/ku.csv
	modified:   erpnext/translations/lo.csv
	modified:   erpnext/translations/lt.csv
	modified:   erpnext/translations/lv.csv
	modified:   erpnext/translations/mk.csv
	modified:   erpnext/translations/ml.csv
	modified:   erpnext/translations/mr.csv
	modified:   erpnext/translations/ms.csv
	modified:   erpnext/translations/my.csv
	modified:   erpnext/translations/nl.csv
	modified:   erpnext/translations/no.csv
	modified:   erpnext/translations/pl.csv
	modified:   erpnext/translations/ps.csv
	modified:   erpnext/translations/pt-BR.csv
	modified:   erpnext/translations/pt.csv
	modified:   erpnext/translations/ro.csv
	modified:   erpnext/translations/ru.csv
	modified:   erpnext/translations/rw.csv
	modified:   erpnext/translations/si.csv
	modified:   erpnext/translations/sk.csv
	modified:   erpnext/translations/sl.csv
	modified:   erpnext/translations/sq.csv
	modified:   erpnext/translations/sr.csv
	modified:   erpnext/translations/sv.csv
	modified:   erpnext/translations/sw.csv
	modified:   erpnext/translations/ta.csv
	modified:   erpnext/translations/te.csv
	modified:   erpnext/translations/th.csv
	modified:   erpnext/translations/tr.csv
	modified:   erpnext/translations/uk.csv
	modified:   erpnext/translations/ur.csv
	modified:   erpnext/translations/uz.csv
	modified:   erpnext/translations/vi.csv
	modified:   erpnext/translations/zh.csv
	modified:   erpnext/translations/zh_tw.csv

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.json
	both modified:   erpnext/accounts/report/financial_statements.py
	both modified:   erpnext/accounts/report/trial_balance/trial_balance.py

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


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

* fix: asset depreciation ledger (#37991)

* fix: include opening acc depr while calculating asset depr ledger report

* chore: include opening acc depr properly in acc depr amt

* chore: add cost_center in asset depr ledger report

* fix: handle finance books properly in asset depr ledger report

* chore: rename 'include default book entries' to 'include default FB entries'

(cherry picked from commit 9a171db)

# Conflicts:
#	erpnext/accounts/report/balance_sheet/balance_sheet.js
#	erpnext/accounts/report/cash_flow/cash_flow.js
#	erpnext/accounts/report/consolidated_financial_statement/consolidated_financial_statement.js
#	erpnext/accounts/report/trial_balance/trial_balance.js
#	erpnext/translations/pl.csv
#	erpnext/translations/tr.csv

* chore: fix conflict in balance_sheet.js

* chore: fix conflict in cash_flow.js

* chore: fix conflict in consolidated_financial_statement.js

* chore: fix conflict in trial_balance.js

* chore: fix conflict in tr.csv

* chore: fix conflict in pl.csv

---------

Co-authored-by: Anand Baburajan <anandbaburajan@gmail.com>
(cherry picked from commit 043dc1b)

# Conflicts:
#	erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.json
#	erpnext/accounts/report/financial_statements.py
#	erpnext/accounts/report/trial_balance/trial_balance.py
@mergify mergify bot added the conflicts label Nov 8, 2023
@mergify mergify bot deleted the mergify/bp/version-13-hotfix/pr-37992 branch November 8, 2023 18:10
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Jan 14, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant