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.

Sign up for GitHub

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

Jump to bottom

chore: release v15 #42024

Merged
merged 56 commits into from
Jun 26, 2024
Merged

chore: release v15 #42024

merged 56 commits into from
Jun 26, 2024

Conversation

frappe-pr-bot
Copy link
Collaborator

Automated weekly release.

barredterra and others added 30 commits May 13, 2024 13:43
@barredterra @mergify
fix(Sales Order): only show permitted actions
a0011c5 
(cherry picked from commit c29d955)
@barredterra @mergify
fix(Delivery Note): only show permitted actions
cef6d0d 
(cherry picked from commit 418bdc1)
@mergify
Merge branch 'version-15-hotfix' into mergify/bp/version-15-hotfix/pr…
ff8027b 
…-41384
@mergify @rohitwaghchaure
fix: do not show zero balance stock items in stock balance report (ba…
c10b123 
…ckport #41958) (#41961)

fix: do not show zero balance stock in stock balance

(cherry picked from commit 7f7b363)

Co-authored-by: Rohit Waghchaure <rohitw1991@gmail.com>
@mergify @mahsem
fix: add string for translation (backport #41903) (#41963)
48dc24b 
fix: add string for translation (#41903)

fix: add string for translation
(cherry picked from commit f28c692)

Co-authored-by: mahsem <137205921+mahsem@users.noreply.github.com>
@barredterra
Merge remote-tracking branch 'upstream/version-15-hotfix' into mergif…
ddbf931 
…y/bp/version-15-hotfix/pr-41384
@barredterra
refactor: remove use of can_create for Payment Request (#41647)
9bad219 
(cherry picked from commit 47bc569)
@barredterra
fix: move condition for shipment
2180239
@barredterra
Merge pull request #41441 from frappe/mergify/bp/version-15-hotfix/pr…
7b322e7 
…-41384

fix(SO, DN): only show permitted actions (backport #41384)
@ruthra-kumar @mergify
fix: incorrect discount on other item
77f4199 
When discount is applied on other item, don't update `discount_amount`
as the amount is calculated for current item

(cherry picked from commit 654764e)
@ruthra-kumar
Merge pull request #41977 from frappe/mergify/bp/version-15-hotfix/pr…
657daf9 
…-41956

fix: incorrect discount on other item (backport #41956)
@ruthra-kumar @mergify
fix: incorrect against_account upon reposting
a41577a 
(cherry picked from commit 20c4098)
@mergify @rohitwaghchaure
fix: decimal issue in pick list (backport #41972) (#41982)
9945a90 
fix: decimal issue in pick list (#41972)

(cherry picked from commit 21adc7b)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
@ruthra-kumar
Merge pull request #41984 from frappe/mergify/bp/version-15-hotfix/pr…
9515b96 
…-41981

fix: incorrect against_account upon reposting (backport #41981)
@khushi8112
refactor: renamed number of depreciations booked to opening booked de… (
ca343f1 
#41515)

* refactor: renamed number of depreciations booked to opening booked depreciations

* feat: introduced new field for showing total number of booked depreciations
@khushi8112
fix: reload asset when creating asset depreciation
7b5d504
@khushi8112
chore: added nosemgrep for security checks
f957436
@khushi8112
Merge pull request #41989 from khushi8112/rename-number-of-depreciati…
8d299d1 
…on-v15-hotfix

refactor: renamed number of depreciations booked to opening booked depreciations
@mergify @rohitwaghchaure
feat: default account head for operating cost (backport #41985) (#41987)
44c1671 
* feat: default account head for operating cost (#41985)

(cherry picked from commit fd7666a)

# 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>
@sagarvora @mergify
perf: dont run queries unnecessarily, improved filters (#41993)
b59c91a 
* perf: dont run queries unnecessarily, improved filters

* perf: dont run query if `in` filter is empty

(cherry picked from commit ac6d85a)
@sagarvora
Merge pull request #41995 from frappe/mergify/bp/version-15-hotfix/pr…
a535933 
…-41993

perf: dont run queries unnecessarily, improved filters (backport #41993)
@ruthra-kumar @mergify
chore: remove validation on payment entry
199a649 
(cherry picked from commit e774003)
@ruthra-kumar @mergify
refactor: convert amount to base currency for advances
5d2f296 
(cherry picked from commit c9ede1f)
@ruthra-kumar @mergify
refactor: for advances uses the party account in references table
47071ce 
(cherry picked from commit 7dce6e0)
@ruthra-kumar @mergify
refactor(test): simpler create_account helper method
6ebd4ba 
(cherry picked from commit 475e0dd)
@ruthra-kumar @mergify
test: exc gain/loss booking on advances under asset/liability
259d7cd 
(cherry picked from commit 827d67d)
@ruthra-kumar @mergify
test: advance against purchase invoice
88e1c28 
(cherry picked from commit 90c8482)
@ruthra-kumar @mergify
refactor: validation to force accounts to be on same currency
78ad3f6 
(cherry picked from commit 0f0b4d8)
@ruthra-kumar @mergify
refactor: validation in customer group
4bde345 
(cherry picked from commit 4f9a228)
@ruthra-kumar @mergify
refactor: validation in Supplier Group
545d0b9 
(cherry picked from commit 107b614)
ruthra-kumar and others added 10 commits June 23, 2024 00:02
@ruthra-kumar @mergify
fix: pricing rule with and without 'apply multiple' and priority
f3aa885 
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 5e875b2)
@ruthra-kumar @mergify
test: priority takes effect on with and without apply multiple
f52f726 
(cherry picked from commit efebc36)
@ruthra-kumar
Merge pull request #41997 from frappe/mergify/bp/version-15-hotfix/pr…
bc6cbb2 
…-41844

refactor: allow foreign currency advance accounts (backport #41844)
@ruthra-kumar
Merge pull request #41998 from frappe/mergify/bp/version-15-hotfix/pr…
521cfb3 
…-41976

fix: pricing rule with and without 'apply multiple' and priority (backport #41976)
@rtdany10 @mergify
feat: accounting dimension filters in gp report
fe9dffb 
(cherry picked from commit d165638)
@rtdany10 @mergify
feat(gp): group by cost center
068ae87 
(cherry picked from commit e26bc17)
@deepeshgarg007
Merge pull request #42006 from frappe/mergify/bp/version-15-hotfix/pr…
6a0ab23 
…-41751

feat: accounting dimension filters in gp report (#41751)
@mergify @rohitwaghchaure
fix: Wrong Delete Batch on Purchase Receipt (backport #42007) (#42012)
68b318a 
fix: Wrong Delete Batch on Purchase Receipt (#42007)

(cherry picked from commit d50487c)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
@mergify @rohitwaghchaure
fix: incorrect Difference Amount (backport #42008) (#42013)
838cc5b 
fix: incorrect Difference Amount (#42008)

(cherry picked from commit 7d91c6c)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
@mergify @rohitwaghchaure
fix: valuation rate for the legacy batches (backport #42011) (#42020)
f6be19c 
fix: valuation rate for the legacy batches (#42011)

(cherry picked from commit 9ab333d)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
mergify bot and others added 10 commits June 25, 2024 18:42
@mergify
fix: timeout while cancelling LCV (backport #42030) (backport #42031) (…
068de08 
…#42032)

fix: timeout while cancelling LCV (backport #42030) (#42031)

fix: timeout while cancelling LCV (#42030)

fix: timeout while canelling LCV
(cherry picked from commit 21bf7fd)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
(cherry picked from commit 2e76b9f)

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
@mergify @Poorvi-R-Bhat
fix: Stock Reservation Entry was not getting created (backport #42033) (
e278fc6 
#42035)

fix: Stock Reservation Entry was not getting created (#42033)

(cherry picked from commit 1a9899b)

Co-authored-by: Poorvi-R-Bhat <poorvi.r.bhat@gmail.com>
@mergify @rohitwaghchaure
fix: manufacturing date issue in the batch (backport #42034) (#42037)
a981633 
* fix: manufacturing date issue in the batch (#42034)

(cherry picked from commit eca3e02)

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

* chore: fix conflicts

---------

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
@mergify @khushi8112
fix: fixed asset value in Fixed Asset Register (backport #41930) (#42027
f2feeaf 
)

fix: fixed asset value in Fixed Asset Register (#41930)

(cherry picked from commit 1c643a0)

Co-authored-by: Khushi Rawat <142375893+khushi8112@users.noreply.github.com>
@mergify @fzozyurt
feat: Turkish Chart Of Accounts (backport #41756) (#42028)
63b26e6 
* feat: Create Turkish Chart Of Accounts

(cherry picked from commit 5c8ea86)

* feat: Create Turkish Chart Of Accounts

(cherry picked from commit b401ba2)

---------

Co-authored-by: fzozyurt <fzozyurt@outlook.com>
@mergify @khushi8112
perf: code optimization to handle large asset creation (backport #42018…
c27f272 
…) (#42025)

perf: code optimization to handle large asset creation (#42018)

(cherry picked from commit 5738d93)

Co-authored-by: Khushi Rawat <142375893+khushi8112@users.noreply.github.com>
@mergify @khushi8112
fix: incorrect time period in asset depreciation schedule (backport #…
cf4d4ba 
…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 625f16d)

Co-authored-by: Khushi Rawat <142375893+khushi8112@users.noreply.github.com>
@mergify @khushi8112
chore: patch to enable total number of booked depreciations field (ba…
b294357 
…ckport #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 5fdd1d3)

# Conflicts:
#	erpnext/patches.txt

* fix: resolved conflicts

* fix: removed unmerged patches

---------

Co-authored-by: Khushi Rawat <142375893+khushi8112@users.noreply.github.com>
@mergify @Nihantra-Patel
fix: lead status filter (backport #41816) (#42046)
3536a75 
fix: lead status filter (#41816)

(cherry picked from commit 8ae2b8f)

Co-authored-by: Nihantra C. Patel <141945075+Nihantra-Patel@users.noreply.github.com>
@mergify @khushi8112
fix: unhide serial no field (backport #42045) (#42047)
482832f 
* fix: unhide serial no field (#42045)

(cherry picked from commit 80c6981)

# 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>
@nabinhait nabinhait merged commit b7eabc3 into version-15 Jun 26, 2024
11 checks passed
@frappe-pr-bot
Copy link
Collaborator Author

🎉 This PR is included in version 15.28.1 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀

@github-actions github-actions bot locked as resolved and limited conversation to collaborators Jul 13, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@deepeshgarg007 deepeshgarg007 Awaiting requested review from deepeshgarg007 deepeshgarg007 is a code owner

@rohitwaghchaure rohitwaghchaure Awaiting requested review from rohitwaghchaure rohitwaghchaure is a code owner

@s-aga-r s-aga-r Awaiting requested review from s-aga-r

@ruthra-kumar ruthra-kumar Awaiting requested review from ruthra-kumar ruthra-kumar is a code owner

Assignees
No one assigned
Labels
accounts released stock
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
8 participants
@frappe-pr-bot @nabinhait @barredterra @ruthra-kumar @khushi8112 @sagarvora @rtdany10 @deepeshgarg007