fix: expense account from item group not fetched
(cherry picked from commit 86ebe58231)
Co-authored-by: Rohit Waghchaure <rohitw1991@gmail.com>
(cherry picked from commit 760b2e24f2)
* fix(Sales Order): only show permitted actions
(cherry picked from commit c29d955371)
* fix(Delivery Note): only show permitted actions
(cherry picked from commit 418bdc1dcc)
* fix: do not show zero balance stock items in stock balance report (backport #41958) (#41961)
fix: do not show zero balance stock in stock balance
(cherry picked from commit 7f7b363d48)
Co-authored-by: Rohit Waghchaure <rohitw1991@gmail.com>
* fix: add string for translation (backport #41903) (#41963)
fix: add string for translation (#41903)
fix: add string for translation
(cherry picked from commit f28c692dca)
Co-authored-by: mahsem <137205921+mahsem@users.noreply.github.com>
* refactor: remove use of can_create for Payment Request (#41647)
(cherry picked from commit 47bc5691a1)
* fix: move condition for shipment
* fix: incorrect discount on other item
When discount is applied on other item, don't update `discount_amount`
as the amount is calculated for current item
(cherry picked from commit 654764e398)
* fix: incorrect against_account upon reposting
(cherry picked from commit 20c4098399)
* fix: decimal issue in pick list (backport #41972) (#41982)
fix: decimal issue in pick list (#41972)
(cherry picked from commit 21adc7b63e)
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
* refactor: renamed number of depreciations booked to opening booked de… (#41515)
* refactor: renamed number of depreciations booked to opening booked depreciations
* feat: introduced new field for showing total number of booked depreciations
* fix: reload asset when creating asset depreciation
* chore: added nosemgrep for security checks
* feat: default account head for operating cost (backport #41985) (#41987)
* feat: default account head for operating cost (#41985)
(cherry picked from commit fd7666a029)
# Conflicts:
# erpnext/manufacturing/doctype/bom/bom.py
# erpnext/setup/doctype/company/company.json
* chore: fix conflicts
* chore: fix conflicts
* chore: fix conflicts
* chore: fix conflicts
---------
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
* perf: dont run queries unnecessarily, improved filters (#41993)
* perf: dont run queries unnecessarily, improved filters
* perf: dont run query if `in` filter is empty
(cherry picked from commit ac6d85aed6)
* chore: remove validation on payment entry
(cherry picked from commit e7740033ca)
* refactor: convert amount to base currency for advances
(cherry picked from commit c9ede1ffbe)
* refactor: for advances uses the party account in references table
(cherry picked from commit 7dce6e03c7)
* refactor(test): simpler create_account helper method
(cherry picked from commit 475e0ddeee)
* test: exc gain/loss booking on advances under asset/liability
(cherry picked from commit 827d67d02f)
* test: advance against purchase invoice
(cherry picked from commit 90c84822d0)
* refactor: validation to force accounts to be on same currency
(cherry picked from commit 0f0b4d88bc)
* refactor: validation in customer group
(cherry picked from commit 4f9a228175)
* refactor: validation in Supplier Group
(cherry picked from commit 107b614518)
* refactor: better error messages
(cherry picked from commit 83ff94b9b8)
* chore: fix test data
(cherry picked from commit 07d59443b7)
* chore: remove dead code
(cherry picked from commit 7e318c0132)
* fix(test): incorrect field for customer default billing currency
(cherry picked from commit c696d13a5e)
* refactor(test): enfore use of customer/supplier master
While using advance accounts in foreign currency, always use
Customer/Supplier master to maintain them
(cherry picked from commit 64e63887be)
* refactor(test): make and use a different party for subscription
(cherry picked from commit 3fabf4aaa4)
* fix: pricing rule with and without 'apply multiple' and priority
Either all of the pricing rules identified for an item should have
'apply multiple' enabled. If not, Priority is applied and only the
highest priority is applied
(cherry picked from commit 5e875b238c)
* test: priority takes effect on with and without apply multiple
(cherry picked from commit efebc3662e)
* feat: accounting dimension filters in gp report
(cherry picked from commit d165638bbb)
* feat(gp): group by cost center
(cherry picked from commit e26bc17c75)
* fix: Wrong Delete Batch on Purchase Receipt (backport #42007) (#42012)
fix: Wrong Delete Batch on Purchase Receipt (#42007)
(cherry picked from commit d50487ce53)
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
* fix: incorrect Difference Amount (backport #42008) (#42013)
fix: incorrect Difference Amount (#42008)
(cherry picked from commit 7d91c6cbd5)
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
* fix: valuation rate for the legacy batches (backport #42011) (#42020)
fix: valuation rate for the legacy batches (#42011)
(cherry picked from commit 9ab333d105)
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
* fix: timeout while cancelling LCV (backport #42030) (backport #42031) (#42032)
fix: timeout while cancelling LCV (backport #42030) (#42031)
fix: timeout while cancelling LCV (#42030)
fix: timeout while canelling LCV
(cherry picked from commit 21bf7fd1f8)
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
(cherry picked from commit 2e76b9f9db)
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
* fix: Stock Reservation Entry was not getting created (backport #42033) (#42035)
fix: Stock Reservation Entry was not getting created (#42033)
(cherry picked from commit 1a9899b32b)
Co-authored-by: Poorvi-R-Bhat <poorvi.r.bhat@gmail.com>
* fix: manufacturing date issue in the batch (backport #42034) (#42037)
* fix: manufacturing date issue in the batch (#42034)
(cherry picked from commit eca3e02f8d)
# Conflicts:
# erpnext/stock/doctype/purchase_receipt/test_purchase_receipt.py
* chore: fix conflicts
---------
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
* fix: fixed asset value in Fixed Asset Register (backport #41930) (#42027)
fix: fixed asset value in Fixed Asset Register (#41930)
(cherry picked from commit 1c643a0ead)
Co-authored-by: Khushi Rawat <142375893+khushi8112@users.noreply.github.com>
* feat: Turkish Chart Of Accounts (backport #41756) (#42028)
* feat: Create Turkish Chart Of Accounts
(cherry picked from commit 5c8ea86a3f)
* feat: Create Turkish Chart Of Accounts
(cherry picked from commit b401ba2c26)
---------
Co-authored-by: fzozyurt <fzozyurt@outlook.com>
* perf: code optimization to handle large asset creation (backport #42018) (#42025)
perf: code optimization to handle large asset creation (#42018)
(cherry picked from commit 5738d93f95)
Co-authored-by: Khushi Rawat <142375893+khushi8112@users.noreply.github.com>
* fix: incorrect time period in asset depreciation schedule (backport #41805) (#42043)
fix: incorrect time period in asset depreciation schedule (#41805)
* fix(wip): depreciation calculation for existing asset
* fix(wip): added validation for incorrect depreciation period
* fix: depreciation schedule time period issue for existing asset
* chore: run pre-commit checks and apply fixes
* style: apply formatting changes
* style: made some necessary changes
* chore: modified test
(cherry picked from commit 625f16dee0)
Co-authored-by: Khushi Rawat <142375893+khushi8112@users.noreply.github.com>
* chore: patch to enable total number of booked depreciations field (backport #41940) (#42042)
* chore: patch to enable total number of booked depreciations field (#41940)
* chore: patch to enable total number of booked depreciations field
* fix: conflict resolved
* refactor: replaced fb_row.db_set with set_value
(cherry picked from commit 5fdd1d3278)
# Conflicts:
# erpnext/patches.txt
* fix: resolved conflicts
* fix: removed unmerged patches
---------
Co-authored-by: Khushi Rawat <142375893+khushi8112@users.noreply.github.com>
* fix: lead status filter (backport #41816) (#42046)
fix: lead status filter (#41816)
(cherry picked from commit 8ae2b8ff8c)
Co-authored-by: Nihantra C. Patel <141945075+Nihantra-Patel@users.noreply.github.com>
* fix: unhide serial no field (backport #42045) (#42047)
* fix: unhide serial no field (#42045)
(cherry picked from commit 80c6981cfa)
# Conflicts:
# erpnext/assets/doctype/asset_capitalization_stock_item/asset_capitalization_stock_item.json
* fix: resolved conflicts
---------
Co-authored-by: Khushi Rawat <142375893+khushi8112@users.noreply.github.com>
---------
Co-authored-by: barredterra <14891507+barredterra@users.noreply.github.com>
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
Co-authored-by: Rohit Waghchaure <rohitw1991@gmail.com>
Co-authored-by: mahsem <137205921+mahsem@users.noreply.github.com>
Co-authored-by: ruthra kumar <ruthra@erpnext.com>
Co-authored-by: Khushi Rawat <142375893+khushi8112@users.noreply.github.com>
Co-authored-by: Sagar Vora <sagar@resilient.tech>
Co-authored-by: Dany Robert <danyrt@wahni.com>
Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
Co-authored-by: Poorvi-R-Bhat <poorvi.r.bhat@gmail.com>
Co-authored-by: fzozyurt <fzozyurt@outlook.com>
Co-authored-by: Nihantra C. Patel <141945075+Nihantra-Patel@users.noreply.github.com>
* chore: patch to enable total number of booked depreciations field (#41940)
* chore: patch to enable total number of booked depreciations field
* fix: conflict resolved
* refactor: replaced fb_row.db_set with set_value
(cherry picked from commit 5fdd1d3278)
# Conflicts:
# erpnext/patches.txt
* fix: resolved conflicts
* fix: removed unmerged patches
---------
Co-authored-by: Khushi Rawat <142375893+khushi8112@users.noreply.github.com>
fix: incorrect time period in asset depreciation schedule (#41805)
* fix(wip): depreciation calculation for existing asset
* fix(wip): added validation for incorrect depreciation period
* fix: depreciation schedule time period issue for existing asset
* chore: run pre-commit checks and apply fixes
* style: apply formatting changes
* style: made some necessary changes
* chore: modified test
(cherry picked from commit 625f16dee0)
Co-authored-by: Khushi Rawat <142375893+khushi8112@users.noreply.github.com>
fix: Stock Reservation Entry was not getting created (#42033)
(cherry picked from commit 1a9899b32b)
Co-authored-by: Poorvi-R-Bhat <poorvi.r.bhat@gmail.com>
Either all of the pricing rules identified for an item should have
'apply multiple' enabled. If not, Priority is applied and only the
highest priority is applied
(cherry picked from commit 5e875b238c)
