mergify[bot] e745312a10

fix: asset capitalization (backport #35832) (#35843) ...

* fix: asset capitalization (#35832)

* fix: misc asset capitalisation fixes

* chore: add location in tests and remove unnecessary code

* chore: more fixes and removals

* chore: show company and fix tests

* chore: make target qty read only on capitalization

(cherry picked from commit fb823b53d1d9a631035016fa3b33003bf8ce297a)

# Conflicts:
#	erpnext/assets/doctype/asset_capitalization/asset_capitalization.json
#	erpnext/assets/doctype/asset_capitalization/asset_capitalization.py

* chore: fixing conflicts

---------

Co-authored-by: Anand Baburajan <anandbaburajan@gmail.com>

2023-06-22 19:21:52 +05:30

..

accounts

Merge branch 'develop' of https://github.com/frappe/erpnext into ledger_preview

2023-06-22 15:43:43 +05:30

assets

fix: asset capitalization (backport #35832) (#35843)

2023-06-22 19:21:52 +05:30

bulk_transaction

chore: ERPNext setup wizard cleanup (#33675)

2023-01-27 14:40:39 +05:30

buying

Merge pull request #35591 from resilient-tech/remove-whitelisting

2023-06-20 20:29:49 +05:30

change_log

…

commands

…

communication

…

config

…

controllers

fix: Do full rollback

2023-06-22 16:07:32 +05:30

crm

refactor: Use db.set_single_value (#35668)

2023-06-13 17:30:38 +05:30

domains

…

e_commerce

fix: stock error for service item

2023-06-20 16:27:23 +05:30

erpnext_integrations

Merge pull request #35591 from resilient-tech/remove-whitelisting

2023-06-20 20:29:49 +05:30

loan_management

fix: loan interest accrual date (#35695)

2023-06-18 23:11:52 +05:30

maintenance

fix: set Phone and Email option in doctypes (#35549)

2023-06-11 19:34:41 +05:30

manufacturing

Merge pull request #35739 from s-aga-r/FIX-35493

2023-06-18 15:13:15 +05:30

patches

refactor: Use db.set_single_value (#35668)

2023-06-13 17:30:38 +05:30

portal

chore: ERPNext setup wizard cleanup (#33675)

2023-01-27 14:40:39 +05:30

projects

fix: set parent_project when creating a new timesheet (#35607)

2023-06-08 20:00:40 +05:30

public

fix: Use GET request

2023-06-22 15:58:41 +05:30

quality_management

refactor: Workspace cleanup

2023-05-30 13:17:59 +05:30

regional

fix: test case PyPDF2 (#35652)

2023-06-12 19:22:55 +05:30

selling

Merge branch 'develop' into bank-trans-party-automatch

2023-06-19 15:04:37 +02:00

setup

Merge branch 'develop' into bank-trans-party-automatch

2023-06-15 16:36:17 +02:00

shopping_cart

…

startup

fix: allow over-payment against SO (#35079)

2023-05-14 08:59:58 +05:30

stock

Merge branch 'develop' of https://github.com/frappe/erpnext into ledger_preview

2023-06-22 15:43:43 +05:30

subcontracting

fix(ux): set route options for new SBB

2023-06-16 15:04:37 +05:30

support

refactor: Use db.set_single_value (#35668)

2023-06-13 17:30:38 +05:30

telephony

…

templates

fix: stock error for service item

2023-06-20 16:27:23 +05:30

tests

refactor: Use db.set_single_value (#35668)

2023-06-13 17:30:38 +05:30

translations

chore: fr translation lead vs prospect (#35697)

2023-06-18 22:30:15 +05:30

utilities

refactor!: remove hierarchy charts

2023-06-15 13:10:19 +05:30

www

fix: Shop by category fixes (#34688)

2023-04-05 12:43:32 +05:30

__init__.py

fix(DX): Check Frappe and ERPNext major versions (#35651)

2023-06-12 19:20:52 +05:30

.stylelintrc

…

exceptions.py

…

hooks.py

fix(DX): Check Frappe and ERPNext major versions (#35651)

2023-06-12 19:20:52 +05:30

modules.txt

…

patches.txt

refactor!: Remove custom cashflow report mapper (#35523)

2023-06-02 17:48:59 +05:30