…uity (#41497)

* fix: correcting balance sheet calculation for zero liabilities and equity

* fix: correcting balance sheet calculation for zero liabilities and equity

(cherry picked from commit 3c33135)

# Conflicts:
#	erpnext/accounts/report/balance_sheet/balance_sheet.py

* fix: completed DC will not appear in a delivery trip

* fix: completed DC will not appear in a delivery trip

(cherry picked from commit 4f0214d)

# Conflicts:
#	erpnext/stock/doctype/delivery_note/delivery_note.js

…uity

…2155) (#42159)

fix: manual pick allow to pick more than available stock (#42155)

(cherry picked from commit 938dd4b)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>

(cherry picked from commit 4512432)

(cherry picked from commit 909aa8f)

(cherry picked from commit c4ae0d2)

…-42157

fix: path of automatically updates the status of asset maintenance log (backport #42157)

…-42165

fix: multiple free items on same Item Group (backport #42165)

(cherry picked from commit 406dfd5)

(cherry picked from commit 9d7be29)

(cherry picked from commit 9bd4e7b)

(cherry picked from commit eb4af58)

…-42143

refactor: validation to prevent recursion with mixed conditions (backport #42143)

(cherry picked from commit 3fab001)

…-41655

…-41975

fix: group by in item-wise purchase register (backport #41975)

(cherry picked from commit ee86212)

…-42183

fix: empty item-wise sales/purchase register reports on initial load (backport #42183)

(cherry picked from commit 97f0201)

…-42146

fix: Multiple fixes for General Ledger Report (backport #42146)

…2186) (#42198)

* fix: provision to enable do not use batch-wise valuation (#42186)

fix: provision to enable do not use batchwise valuation
(cherry picked from commit f06ba0c)

# Conflicts:
#	erpnext/stock/doctype/stock_settings/stock_settings.json

* chore: fix conflicts

---------

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>

(cherry picked from commit 13fb560)

# Conflicts:
#	erpnext/accounts/doctype/bank_statement_import/bank_statement_import.json

(cherry picked from commit b202409)

# Conflicts:
#	erpnext/accounts/doctype/bank_statement_import/bank_statement_import.json

(cherry picked from commit 07f6888)

(cherry picked from commit 1ad264d)

(cherry picked from commit 2112d8f)

(cherry picked from commit 98ad01c)

# Conflicts:
#	erpnext/accounts/doctype/bank_statement_import/bank_statement_import.json

(cherry picked from commit ba08b2e)

…on (backport #42231) (#42242)

fix: auto serial and batch bundle not creating for Asset Capitalization (#42231)

(cherry picked from commit 5f53ad3)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>

…42179)

fix: BOM Creator Recursion Error on duplicate save (#41622)

(cherry picked from commit 9cfe09b)

Co-authored-by: Richard Case <110036763+casesolved-co-uk@users.noreply.github.com>

…42245)

* fix(Stock Entry Type): reduce perms for Stock User (#42225)

(cherry picked from commit 4936514)

# Conflicts:
#	erpnext/stock/doctype/stock_entry_type/stock_entry_type.json

* chore: fix conflicts

---------

Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>

)

* fix(Putaway Rule): reduce perms for Stock User (#42227)

(cherry picked from commit 96b275c)

# Conflicts:
#	erpnext/stock/doctype/putaway_rule/putaway_rule.json

* chore: fix conflicts

---------

Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>

… (#42243)

* fix(Inventory Dimension): reduce perms for Stock User (#42226)

(cherry picked from commit edc1f84)

# Conflicts:
#	erpnext/stock/doctype/inventory_dimension/inventory_dimension.json

* chore: fix conflicts

---------

Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>

fix: actual qty in sales order (#42248)

(cherry picked from commit 1186ee1)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>

#42138) (#42252)

* fix: corrected mismatch in the Purchase Receipt Status #15620 (#42138)

(cherry picked from commit 623b4c2)

# Conflicts:
#	erpnext/stock/doctype/purchase_receipt/test_purchase_receipt.py

* chore: fix conflicts

---------

Co-authored-by: Poorvi-R-Bhat <poorvi.r.bhat@gmail.com>
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>

…s (backport #42100) (#42249)

fix: Billed Qty and Qty to Bill Calculation in Purchase Order Analysis (#42100)

(cherry picked from commit 0c76a8c)

Co-authored-by: Nihantra C. Patel <141945075+Nihantra-Patel@users.noreply.github.com>

(cherry picked from commit cd3a900)

…-42233

fix: added filter to show only submitted assets (backport #42233)

…er (backport #42236) (#42250)

fix(Holiday List): sort holidays on save to avoid disorienting the user (#42236)

fix: sort holidays on save to avoid disorienting the user
(cherry picked from commit ad13725)

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>

…-42026

fix:  Multiple fixes in Bank Statement Import (backport #42026)

…-42162

refactor: remove obsolete function call (backport #42162)

…-41497

fix: correcting balance sheet calculation for zero liabilities and equity (backport #41497)

…-41655

fix: completed DC will not appear in a delivery trip (backport #41655)

…nt entry

(cherry picked from commit c8a34cd)

…-42060

fix: updated logic for calculating tax_withholding_net_total in payment entry (backport #42060)

…types (#42258)

* fix(tds): use doctype reference when mapping keys across multiple doctypes

* fix: changes as per review

---------

Co-authored-by: ljain112 <ljain112@gmail.com>
(cherry picked from commit 5c0d52f)

# Conflicts:
#	erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py

(cherry picked from commit db807d4)

… 100

(cherry picked from commit c52fdff)

…-42258

fix(tds): use doctype reference when mapping keys across multiple doctypes (backport #42258)

…-42127

fix: removed max discount validation for sales return (backport #42127)

…-42204

fix: Reopen Project if Completion Percentage is Below 100% (backport #42204)

(cherry picked from commit 8633080)

(cherry picked from commit 9562628)

…-42247

fix: don't merge tax into stock account on purchase receipt repost (backport #42247)